Merge commit 'origin/master'

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index affc3ec167a26b9acb90c8e746edd3a32bd3bd28..1b8e4b12a723797876c01e598f2d881927834cc7 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -21,7 +21,7 @@ of questions.
 Wait for it to tell you an url for your new wiki.. Done!
 
 (If the CGI doesn't seem to let you edit pages, you might need to
-[[configure_apache|apache_cgi]]).)
+[[configure_apache|tips/apache_cgi]] or [[configure_lighttpd|tips/lighttpd_cgi]].)
 
 ## Decide where your wiki's files will go.
 
@@ -183,7 +183,7 @@ about using the git repositories.
 [[!toggleable id=monotone text="""
        # This assumes that you have already used "mtn genkey you@hostname".
        REPOSITORY=~/wiki.monotone
-       ikiwiki-makerepo git $SRCDIR $REPOSITORY
+       ikiwiki-makerepo monotone $SRCDIR $REPOSITORY
 """]]
 
 ## Configure ikiwiki to use revision control.