web commit by http://www.larted.org.uk/~dom/: new bugrep

[ikiwiki.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 98806b583801c5f43325da2e10fd7a5dd0b9a57a..f5dd8832e9c6e2f72df81f45ae7ed6d58006d916 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -128,9 +128,7 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
        to do the following, but this might be easiest:
 
                        REPOSITORY=~/wiki.git
-                       mkdir $REPOSITORY
-                       cd $REPOSITORY
-                       git --bare init --shared
+                       GIT_DIR=$REPOSITORY git --bare init --shared
                        cd $SRCDIR
                        git init
                        echo /.ikiwiki > .gitignore
@@ -148,7 +146,10 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
        `ssh`.
 
        If at any point you commit changes in `$SRCDIR`, make sure to `git
-       push` them to the `$REPOSITORY`.
+       push` them to the `$REPOSITORY`. ikiwiki will do this automatically
+       for any changes made via the web.
+
+       Finally, see [[Git_pitfalls]] if you experience problems.
    """]]
 
    [[toggle id=tla text="TLA"]]
@@ -208,7 +209,7 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
    you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
    subversion. Uncomment the block for the wrapper for your revision
    control system, and configure the wrapper path in that block
-   appropriately (for Git, it should be `$REPO/hooks/post-update`).
+   appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`).
 
    Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more.
    Now you should be able to edit files in $SRCDIR, and use your revision