web commit by http://subvert.org.uk/~bma/: link to patch.

[git.ikiwiki.info.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 98806b583801c5f43325da2e10fd7a5dd0b9a57a..364b704fb27f3215901085262fed3eccb16cec08 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
        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
                        cd $SRCDIR
                        git init
                        echo /.ikiwiki > .gitignore


@@ -149,6 +147,8 @@ This tutorial will walk you through setting up a wiki with ikiwiki.
 
        If at any point you commit changes in `$SRCDIR`, make sure to `git
        push` them to the `$REPOSITORY`.
 
        If at any point you commit changes in `$SRCDIR`, make sure to `git
        push` them to the `$REPOSITORY`.

+
+       Finally, see [[Git_pitfalls]] if you experience problems.

    """]]
 
    [[toggle id=tla text="TLA"]]
    """]]
 
    [[toggle id=tla text="TLA"]]


@@ -208,7 +208,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
    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
 
    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