web commit by joey

[ikiwiki.git] / doc / setup.mdwn

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index cc830c0b965f06063fa6d3b1702e2dcf326bb7e3..a54a733886b5d47dc5b91ae4e15b5802773312d4 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -28,7 +28,7 @@ optional support for commits from the web.
 5. Build your wiki for the first time.
 
                ikiwiki --verbose ~/wikiwc/ \
 5. Build your wiki for the first time.
 
                ikiwiki --verbose ~/wikiwc/ \

-                  /usr/lib/ikiwiki/templates ~/public_html/wiki/ \
+                  /usr/share/ikiwiki/templates ~/public_html/wiki/ \

                   --url=http://host/~you/wiki/
 
    Replace the url with the right url to your wiki. You should now
                   --url=http://host/~you/wiki/
 
    Replace the url with the right url to your wiki. You should now


@@ -54,16 +54,17 @@ optional support for commits from the web.
    directories, and read through and configure the rest of the file to your
    liking.
 
    directories, and read through and configure the rest of the file to your
    liking.
 

-   Note that the default file will enable a [[post-commit]] hook to
-   update the wiki, but has cgi support turned off.
+   Note that the default file has a block to configure a svn wrapper. This
+   sets up a [[post-commit]] hook to update the wiki.

 
 

-   When you're satisfied, run `ikiwiki --setup ikiwiki.setup`, and it will
-   generate the subversion [[post-commit]] hook and update your wiki.
+   When you're satisfied, run `ikiwiki --setup ikiwiki.setup`, and it
+   will set everything up and update your wiki.

 
 8. Set up [[CGI]] to allow editing the wiki from the web.
 
 
 8. Set up [[CGI]] to allow editing the wiki from the web.
 

-   Just edit ikiwiki.setup, change cgiwrapper to 1, and optioanlly anonok
-   to 1, run `ikiwiki --setup ikiwiki.setup`, and you're done!
+   Just edit ikiwiki.setup, uncomment the block for the cgi wrapper, make
+   sure the filename for the cgi wrapper is ok, run 
+   `ikiwiki --setup ikiwiki.setup`, and you're done!

 
 9. Add [[PageHistory]] links to the top of pages. This requires you to have
    setup [[ViewCVS]] or something similar to access your [[Subversion]]
 
 9. Add [[PageHistory]] links to the top of pages. This requires you to have
    setup [[ViewCVS]] or something similar to access your [[Subversion]]