X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/52f12d39c53a65a092b45cae527160f2145ada66..529c2da4c322c579682245cdccdcaafc3fd0b2d7:/doc/setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2c3a979ed..13f8500c4 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -121,29 +121,32 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
    [[toggleable id=git text="""
 	When using Git, you probably want to set up two repositories, of which
 	one should be bare (meaning that it does not have a working tree
-	checked out). We call the bare repository the "repo" and the other the
-	"srcdir". There are [other
+	checked out). We call the bare repository the "repository" and the
+	other will be the "srcdir" (which `ikiwiki` uses to compile the wiki).
+	There are [other
 	ways](http://blog.madduck.net/vcs/2007.07.11_publishing-git-repositories)
 	to do the following, but this might be easiest:
 
 			REPOSITORY=~/wiki.git
 			cd $SRCDIR
 			git init
-			echo .ikiwiki > .gitignore
+			echo /.ikiwiki > .gitignore
 			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
-			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
-			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