web commit from 66.249.65.168: poll vote (Accept both)

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index c6aa08ddd0fa108f0d3586673e5a347dd8679152..d23010fd58bc9b92163d5bad4af0be3bb956ce9f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -19,11 +19,11 @@ use IkiWiki::Setup::Standard {
        #templatedir => "/usr/share/ikiwiki/templates",
        
        # Subversion stuff.
-       rcs => "svn",
+       #rcs => "svn",
        #historyurl => "http://svn.example.org/trunk/[[file]]",
        #diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-       svnrepo => "/svn/wiki",
-       svnpath => "trunk",
+       #svnrepo => "/svn/wiki",
+       #svnpath => "trunk",
 
        # Git stuff.
        #rcs => "git",
@@ -47,16 +47,16 @@ use IkiWiki::Setup::Standard {
                #       wrapper => "/var/www/wiki/ikiwiki.cgi",
                #       wrappermode => "06755",
                #},
-               {
-                       # The svn post-commit wrapper.
-                       # Note that this will overwrite any existing
-                       # post-commit hook script, which may not be
-                       # what you want.
-                       wrapper => "/svn/wikirepo/hooks/post-commit",
-                       wrappermode => "04755",
-                       # Enable mail notifications of commits.
-                       notify => 1,
-               },
+               #{
+               #       # The svn post-commit wrapper.
+               #       # Note that this will overwrite any existing
+               #       # post-commit hook script, which may not be
+               #       # what you want.
+               #       wrapper => "/svn/wikirepo/hooks/post-commit",
+               #       wrappermode => "04755",
+               #       # Enable mail notifications of commits.
+               #       notify => 1,
+               #},
                #{
                #       # The git post-update wrapper.
                #       # Note that this will overwrite any existing
@@ -91,11 +91,12 @@ use IkiWiki::Setup::Standard {
        # Logging settings:
        verbose => 0,
        syslog => 0,
+       # To link to user pages in a subdirectory of the wiki.
+       #userdir => "users",
        
        # To add plugins, list them here.
-       #add_plugins => [qw{meta tag pagecount brokenlinks search smiley
-       #                   wikitext camelcase pagestats htmltidy fortune
-       #                   sidebar map rst toc linkmap openid}],
+       #add_plugins => [qw{goodstuff openid search wikitext camelcase
+       #                   htmltidy fortune sidebar map rst}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth}],