web commit by http://madduck.myopenid.com/: incorporate fjp's suggestions

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index de4a0dd82bfe2c1053a20dbb2798e4fda7b52117..13f8500c42c81cfb2dd7661f072d5cb54d3b9fd3 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -134,17 +134,19 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
                        git add .
                        git commit -m'Initial commit'
                        # if you expect $REPOSITORY to receive pushs from multiple
                        git add .
                        git commit -m'Initial commit'
                        # if you expect $REPOSITORY to receive pushs from multiple

-                       # clones, then it is advisable to stop git performing
-                       # fast forwards -- this is to avoid overwriting the
-                       # remote ref and losing commits from there.
+                       # clones, then it is advisable to only accept fast
+                       # forwards -- this is to avoid overwriting the remote
+                       # ref and losing commits from there.

                        git config receive.denyNonFastForwards true
                        git config core.bare true
                        mv .git $REPOSITORY
                        git config receive.denyNonFastForwards true
                        git config core.bare true
                        mv .git $REPOSITORY

-                       mv .ikiwiki ..
+                       # we want to preserve the current .ikiwiki directory,
+                       # so temporarily move it to a safe location
+                       mv .ikiwiki ../ikiwiki.sv

                        cd ..
                        rm -r $SRCDIR
                        git clone -l -s $REPOSITORY $SRCDIR
                        cd ..
                        rm -r $SRCDIR
                        git clone -l -s $REPOSITORY $SRCDIR

-                       mv .ikiwiki $SRCDIR
+                       mv ikiwiki.sv $SRCDIR/.ikiwiki

 
        It is **paramount** that you **never** push to the Git repository in
        `$SRCDIR` ([this FAQ entry explains
 
        It is **paramount** that you **never** push to the Git repository in
        `$SRCDIR` ([this FAQ entry explains