user configuration error

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index e2974cfd59f89ed3ccb18c503071ca23eb11e7e0..2c9b0207162c91147eefda756427d2f247b0ad9f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -44,12 +44,14 @@ use IkiWiki::Setup::Standard {
 
        # Bazaar stuff.
        #rcs => "bzr",
-       #historyurl => ??,
-       #diffurl => ??,
+       #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)
@@ -88,12 +90,20 @@ use IkiWiki::Setup::Standard {
                #       wrapper => "/git/wiki.git/hooks/post-update",
                #       wrappermode => "06755",
                #},
+               #{
+               #       # 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?
@@ -123,6 +133,8 @@ use IkiWiki::Setup::Standard {
        # 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