fix broken example config file and detect this breakage

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index d0a2829a1ae9f9401599854da86fbcc5ddec902e..9e4d00726120592b8d7a3cb1c164a2b38bbc1858 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -7,16 +7,17 @@
 
 use IkiWiki::Setup::Standard {
        wikiname => "MyWiki",
-
+       #adminuser => ["yourname", ],
+       
        # Be sure to customise these..
        srcdir => "/path/to/source",
        destdir => "/var/www/wiki",
-       templatedir => "/usr/share/ikiwiki/templates",
-
+       
        url => "http://myhost/wiki",
        cgiurl => "http://myhost/ikiwiki.cgi",
        #historyurl => "http://svn.myhost/trunk/[[file]]",
        #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
+       #templatedir => "/usr/share/ikiwiki/templates",
        
        # Whether to integrate with svn.
        svn => 1,
@@ -29,18 +30,20 @@ use IkiWiki::Setup::Standard {
                        # post-commit hook script, which may not be
                        # what you want.
                        wrapper => "/svn/wiki/hooks/post-commit",
-                       wrappermode => 04755,
-               },
-               {
-                       # The cgi wrapper.
-                       #cgiwrapper => {
-                       #       cgi => 1,
-                       #       wrapper => "/var/www/wiki/ikiwiki.cgi",
-                       #       wrappermode => 06755,
-                       #},
+                       wrappermode => "04755",
                },
+               #{
+               #       # The cgi wrapper.
+               #       cgi => 1,
+               #       wrapper => "/var/www/wiki/ikiwiki.cgi",
+               #       wrappermode => "06755",
+               #},
        ],
        
        # Can anonymous web users edit pages?
        #anonok => 1,
+       # Generate rss feeds for pages?
+       rss => 1,
+       # Use the Hyper Estraier search engine?
+       #hyperestraier => 1,
 }