web commit by joey: remove dup

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 7a561434e12a64f27a5361ffc36e3f8995eac2a9..5353c37b89a3d439da2c5869b1a1edeb0a861583 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -12,12 +12,12 @@ use IkiWiki::Setup::Standard {
        # Be sure to customise these..
        srcdir => "/path/to/source",
        destdir => "/var/www/wiki",
        # 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]]",
        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,
        
        # Whether to integrate with svn.
        svn => 1,


@@ -30,18 +30,22 @@ use IkiWiki::Setup::Standard {
                        # post-commit hook script, which may not be
                        # what you want.
                        wrapper => "/svn/wiki/hooks/post-commit",
                        # 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.
+               #       cgiwrapper => {
+               #               cgi => 1,
+               #               wrapper => "/var/www/wiki/ikiwiki.cgi",
+               #               wrappermode => "06755",
+               #       },
+               #},

        ],
        
        # Can anonymous web users edit pages?
        #anonok => 1,
        ],
        
        # Can anonymous web users edit pages?
        #anonok => 1,

+       # Generate rss feeds for pages?
+       rss => 1,
+       # Use the Hyper Estraier search engine?
+       #hyperestraier => 1,

 }
 }