web commit by buo: Removing previous installation fixes compile failure.

[ikiwiki.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 33710d1d773b2175f77ec84effae0b9d170ef6f5..997dcd18e84d3a4cc0919812d28692edcdc28db6 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -99,7 +99,7 @@ use IkiWiki::Setup::Standard {
        # 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,
@@ -167,4 +167,20 @@ use IkiWiki::Setup::Standard {
        # 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.
+       
+       # For use with the amazon S3 plugin, your public access key id.
+       #amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
+       # And a file holding your secret key. This file *must* not be
+       # readable by others!
+       #amazon_s3_key_file => "/home/me/.hide/.s3_key
+       # The globally unique name of the bucket to use to store the wiki.
+       #amazon_s3_bucket => "mywiki",
+       # A prefix to prepend to each page name.
+       #amazon_s3_prefix => "wiki/",
+       # Uncomment to use the S3 European datacenter.
+       #amazon_s3_location => "EU",
 }