Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 039ebb127bb451d0d0783c229c11d82cd5b806c7..a151050e734665cf2b0f1351525f82049ab00ef7 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -23,6 +23,7 @@ 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]]",
        #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.
        #svnpath => "trunk",
 
        # Git stuff.


@@ -98,7 +99,7 @@ use IkiWiki::Setup::Standard {
        # Allow generating feeds even if not generated by default?
        #allowrss => 1,
        #allowatom => 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
+       # Urls to ping with XML-RPC when feeds are updated

        #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
        # Include discussion links on all pages?
        discussion => 1,
        #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
        # Include discussion links on all pages?
        discussion => 1,


@@ -158,4 +159,16 @@ use IkiWiki::Setup::Standard {
        #       mirror1 => "http://hostname1",
        #       mirror2 => "http://hostname2/mirror",
        #},
        #       mirror1 => "http://hostname1",
        #       mirror2 => "http://hostname2/mirror",
        #},

+       
+       # For use with the anonok plugin, a PageSpec specifying what
+       # pages anonymous users can edit
+       #anonok_pagespec => "*",
+       
+       # For use with the aggregate plugin, to allow aggregation to be
+       # triggered via the web.
+       #aggregate_webtrigger => 1,
+       
+       # For use with the pinger plugin, how many seconds to wait before
+       # timing out.
+       #pinger_timeout => 15.

 }
 }