Merge branch 'master' into autoconfig

[ikiwiki.git] / IkiWiki / Plugin / amazon_s3.pm

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index b7470ca7950da421c91cd0d98b7300b82e86b7b4..9cb74fb1e805e14dfc5fae71cfd1dd694655aea5 100644 (file)
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -43,7 +43,7 @@ sub getopt () { #{{{
 sub getsetup () { #{{{
        return
                 amazon_s3_key_id => {
-                       type => "boolean",
+                       type => "string",
                        default => "",
                        description => "public access key id",
                        safe => 1,
@@ -82,7 +82,7 @@ sub getsetup () { #{{{
                amazon_s3_dupindex => {
                        type => "boolean",
                        default => 0,
-                       description => "store each index file twice, to allow urls ending in \"/index.html\" and \"/\"",
+                       description => "store each index file twice? (to allow urls ending in \"/index.html\" and \"/\")",
                        safe => 1,
                        rebuild => 1,
                },