Merge commit 'upstream/master'

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

diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn
index 3a389ca3a081a09dd29dbe9541144d7c4d68a8a6..6715f0c29b44a4a37f8f620b41c0b1ce2cd9eade 100644 (file)
--- a/doc/tips/nearlyfreespeech.mdwn
+++ b/doc/tips/nearlyfreespeech.mdwn
@@ -42,7 +42,12 @@ Use `wget` to [[download]] the ikiwiki tarball. Then unpack it:
 
 ## Install perl modules
 
-Use CPAN to install the perl modules it uses into your home directory:
+As an optional step, you can use CPAN to install the perl modules ikiwiki
+uses into your home directory. This should not be necessary, mostly,
+because the system has most modules installed already.
+
+So, you might want to skip this step and come back to it later if ikiwiki
+doesn't work.
 
        PERL5LIB=`pwd`/ikiwiki:`pwd`/ikiwiki/cpan:`pwd`/lib/perl5 PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
        
@@ -71,16 +76,15 @@ Here is an example of how I set up a wiki:
 
        mkdir ~/wiki
        cd ~/wiki
-       cp ~/ikiwiki/doc/ikiwiki.setup .
        cp -r ~/ikiwiki/doc/examples/blog/* .
+       ikiwiki -dumpsetup ikiwiki.setup
        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
+       # 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
@@ -94,7 +98,7 @@ dollars.
 
 rm -rf ~/ikiwiki*.tar.gz ~/.cpan ~/ikiwiki ~/man ~/lib/perl5/5.8.8
 
-That should cut things down to less than 4 megabytes. If you want to save
+That should cut things down to less than 2 megabytes. If you want to save
 even more space, delete unused perl modules from ~/lib/perl5
 
 ## Enjoy!