Merge branch 'master' into aggregateinternal

[ikiwiki.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 03d04176d4bd722ef9a409aa872d72a3714d6ba4..10cb3da1d5e26f1c6392ecfa51aaa3cf52f8ea43 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -174,8 +174,12 @@ use IkiWiki::Setup::Standard {
        # pages anonymous users can edit
        #anonok_pagespec => "*",
        
-       # For use with the aggregate plugin, to allow aggregation to be
-       # triggered via the web.
+       # For use with the aggregate plugin.
+       # Enable aggregation to internal pages. New wikis should set this to 1,
+       # but if you use aggregate already, read the aggregate plugin docs
+       # before enabling it.
+       #aggregateinternal => 1,
+       # Allow aggregation to be triggered via the web.
        #aggregate_webtrigger => 1,
        
        # For use with the pinger plugin, how many seconds to wait before
@@ -195,4 +199,8 @@ use IkiWiki::Setup::Standard {
        #amazon_s3_location => "EU",
        # Uncomment if you need to store each index file twice.
        #amazon_s3_dupindex => 1,
+       
+       # For use with the attachment plugin, a program that returns
+       # nonzero if its standard input contains an virus.
+       #virus_checker => "clamdscan -",
 }