web commit from 85.177.35.89: poll vote (It's fast enough)

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 1377315aeba52bc1bc790bb11e8fb379418a3b27..2c9b0207162c91147eefda756427d2f247b0ad9f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -23,7 +23,6 @@ use IkiWiki::Setup::Standard {
        #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",
 
        # Git stuff.
@@ -43,9 +42,16 @@ use IkiWiki::Setup::Standard {
        #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
        #diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
 
+       # Bazaar stuff.
+       #rcs => "bzr",
+       #historyurl => "", 
+       #diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
+
        # Monotone stuff
        #rcs => "monotone",
        #mtnkey => "web\@machine.company.com",
+       #historyurl => "http://viewmtn.example.com/",
+       #diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
        # Set if you want the wiki to sync on update and commit.
        #mtnsync => 0,
        # The path to your workspace (defaults to the srcdir itself)
@@ -72,8 +78,6 @@ use IkiWiki::Setup::Standard {
                #       # what you want.
                #       wrapper => "/svn/wikirepo/hooks/post-commit",
                #       wrappermode => "04755",
-               #       # Enable mail notifications of commits.
-               #       notify => 1,
                #       # Log to syslog since svn post-commit hooks
                #       # hide output and errors.
                #       syslog => 1,
@@ -85,15 +89,21 @@ use IkiWiki::Setup::Standard {
                #       # what you want.
                #       wrapper => "/git/wiki.git/hooks/post-update",
                #       wrappermode => "06755",
-               #       # Enable mail notifications of commits.
-               #       notify => 1,
+               #},
+               #{
+               #       # The monotone netsync hook.
+               #       wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
+               #       wrappermode => "06755",
                #},
        ],
 
-       # Generate rss feeds for blogs?
-       rss => 1,
-       # Generate atom feeds for blogs?
-       atom => 1,
+       # Default to generating rss feeds for blogs?
+       #rss => 1,
+       # Default to generating atom feeds for blogs?
+       #atom => 1,
+       # Allow generating feeds even if not generated by default?
+       #allowrss => 1,
+       #allowatom => 1,
        # Urls to ping with XML-RPC when rss feeds are updated
        #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
        # Include discussion links on all pages?
@@ -119,7 +129,12 @@ use IkiWiki::Setup::Standard {
        # Simple spam prevention: require an account-creation password.
        #account_creation_password => "example",
        # Uncomment to force ikiwiki to run with a particular umask.
-       #umask => 022
+       #umask => 022,
+       # Default settings for the recentchanges page.
+       #recentchangespage => "recentchanges",
+       #recentchangesnum => 100,
+       # Use new '!'-prefixed preprocessor directive syntax
+       #prefix_directives => 0,
 
        # To add plugins, list them here.
        #add_plugins => [qw{goodstuff search wikitext camelcase