* Add canedit hook, allowing arbitrary controls over when a page can be

[ikiwiki.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index c6aa08ddd0fa108f0d3586673e5a347dd8679152..a25d9f50ec18e19dab46e1fe86eb618b0ffb4123 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -19,16 +19,18 @@ 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",
        #historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
        #diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
+       #gitorigin_branch => "origin",
+       #gitmaster_branch => "master",
 
        # Tla stuff.
        #rcs => "tla"
@@ -47,16 +49,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
@@ -69,8 +71,6 @@ use IkiWiki::Setup::Standard {
                #},
        ],
        
-       # Can anonymous web users edit pages?
-       #anonok => 1,
        # Generate rss feeds for blogs?
        rss => 1,
        # Generate atom feeds for blogs?
@@ -81,7 +81,7 @@ use IkiWiki::Setup::Standard {
        discussion => 1,
        # To exclude files matching a regexp from processing. This adds to
        # the default exclude list.
-       #exclude => qr/\*.wav/,
+       #exclude => qr/*\.wav/,
        # Time format (for strftime)
        #timeformat => '%c',
        # Locale to use. Must be a UTF-8 locale.
@@ -91,17 +91,18 @@ 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 anonok}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth}],
 
        # For use with the tag plugin, make all tags be located under a
        # base page.
-       #tagbase => "tag".
+       #tagbase => "tag",
        
        # For use with the search plugin if your estseek.cgi is located 
        # somewhere else.
@@ -110,4 +111,10 @@ use IkiWiki::Setup::Standard {
        # For use with the openid plugin, to give an url to a page users
        # can use to signup for an OpenID.
        #openidsignup => "http://myopenid.com/",
+       
+       # For use with the mirrorlist plugin, a list of mirrors.
+       #mirrorlist => {
+       #       mirror1 => "http://hostname1",
+       #       mirror2 => "http://hostname2/mirror",
+       #},
 }