meta branch merge required

[git.ikiwiki.info.git] / doc / tips / nearlyfreespeech.mdwn

diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn
index 435743bf9c1331e0e33c72e2727ed667ba5a733d..4b3b02eac8acbb2e35cfa4c930c9b5c7808f0bac 100644 (file)
--- a/doc/tips/nearlyfreespeech.mdwn
+++ b/doc/tips/nearlyfreespeech.mdwn
@@ -76,16 +76,16 @@ Here is an example of how I set up a wiki:
 
        mkdir ~/wiki
        cd ~/wiki
 
        mkdir ~/wiki
        cd ~/wiki

-       cp ~/ikiwiki/doc/ikiwiki.setup .

        cp -r ~/ikiwiki/doc/examples/blog/* .
        cp -r ~/ikiwiki/doc/examples/blog/* .

+       ikiwiki -dumpsetup ikiwiki.setup

        nano ikiwiki.setup
        # Set destdir to /home/htdocs
        # Set srcdir to /home/private/wiki
        nano ikiwiki.setup
        # Set destdir to /home/htdocs
        # Set srcdir to /home/private/wiki

-       # Set url to http://yoursite.nfshost.com/ , set cgiurl likewise
-       # Uncomment the `rcs => "git"` line, and the cgi and git
-       # post-update wrapper blocks.
-       # Set the cgi wrapper path to /home/htdocs/ikiwiki.cgi
-       # Set the git wrapper path to /home/private/wiki.git/hooks/post-update
+       # Set url to http://yoursite.nfshost.com/
+       # Set cgiurl to http://yoursite.nfshost.com/ikiwiki.cgi
+       # Uncomment the `rcs => "git"` line.
+       # Set the cgi_wrapper path to /home/htdocs/ikiwiki.cgi
+       # Set the git_wrapper path to /home/private/wiki.git/hooks/post-update

        # Configure the rest to your liking and save the file.
        ikiwiki-makerepo git . ../wiki.git
        ikiwiki -setup ikiwiki.setup
        # Configure the rest to your liking and save the file.
        ikiwiki-makerepo git . ../wiki.git
        ikiwiki -setup ikiwiki.setup