summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-03-19 22:51:07 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-03-19 22:51:07 +0000
commit2f190b3aeb45c5b22173b0f922b997dff38250aa (patch)
tree0d2f609b146d782cd333ab189dcf4f1c5c183770
parentae0475367c079624b6386cd421356b02995caebe (diff)
don't lock before setup
-rw-r--r--basewiki/index.mdwn2
-rwxr-xr-xikiwiki2
2 files changed, 2 insertions, 2 deletions
diff --git a/basewiki/index.mdwn b/basewiki/index.mdwn
index 5eb94b443..ea78c23c9 100644
--- a/basewiki/index.mdwn
+++ b/basewiki/index.mdwn
@@ -1,4 +1,4 @@
-Welcome to the your new wiki.
+Welcome to your new wiki.
All wikis are supposed to have a [[SandBox]], so this one does too.
diff --git a/ikiwiki b/ikiwiki
index 9c59c5c3a..4d022284e 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -1281,8 +1281,8 @@ sub setup () { # {{{
} #}}}
# main {{{
-lockwiki();
setup() if $config{setup};
+lockwiki();
if ($config{wrapper}) {
gen_wrapper(%config);
exit;