releasing version 2.31.1

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9bf54298199d130dc3187c97c784df20c7e45e6e..c96a45f78d091a23a905d82e5dfd33f3d7e27a14 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -42,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)
@@ -85,10 +92,13 @@ use IkiWiki::Setup::Standard {
                #},
        ],
 
-       # 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?