web commit by http://ethan.betacantrips.com/: cool

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 52b112a44c9e3430425788a6eb2b395f1ffc171d..a25d9f50ec18e19dab46e1fe86eb618b0ffb4123 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -29,6 +29,8 @@ use IkiWiki::Setup::Standard {
        #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"
@@ -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.
@@ -96,13 +96,13 @@ use IkiWiki::Setup::Standard {
        
        # To add plugins, list them here.
        #add_plugins => [qw{goodstuff openid search wikitext camelcase
-       #                   htmltidy fortune sidebar map rst}],
+       #                   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.