committing changes for conflict test

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

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index d72cac71a5c37a68c4c81acf8ffe8e404b1ea725..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,7 +54,7 @@ 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 has a block to configure a svnwraper. This
+   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
    sets up a [[post-commit]] hook to update the wiki.
 
    When you're satisfied, run `ikiwiki --setup ikiwiki.setup`, and it


@@ -62,7 +62,7 @@ optional support for commits from the web.
 
 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, uncomment the block for the cgiwrapper, make
+   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!
 
    sure the filename for the cgi wrapper is ok, run 
    `ikiwiki --setup ikiwiki.setup`, and you're done!