From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 18:43:47 +0000 (-0400)
Subject: turn booleans into questions
X-Git-Tag: 2.60~207
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49e86d2562dafdfcff4d3ba0d75f80ff0d734b95;p=ikiwiki.git

turn booleans into questions
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6a72a0144..7b6c4d622 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -116,7 +116,7 @@ sub getsetup () { #{{{
 	discussion => {
 		type => "boolean",
 		default => 1,
-		description => "enable Discussion pages",
+		description => "enable Discussion pages?",
 		safe => 1,
 		rebuild => 1,
 	},
@@ -166,14 +166,14 @@ sub getsetup () { #{{{
 	verbose => {
 		type => "boolean",
 		default => 0,
-		description => "display verbose messages when building",
+		description => "display verbose messages when building?",
 		safe => 1,
 		rebuild => 0,
 	},
 	syslog => {
 		type => "boolean",
 		default => 0,
-		description => "log to syslog",
+		description => "log to syslog?",
 		safe => 1,
 		rebuild => 0,
 	},
@@ -245,7 +245,7 @@ sub getsetup () { #{{{
 	hardlink => {
 		type => "boolean",
 		default => 0,
-		description => "attempt to hardlink source files (optimisation for large files)",
+		description => "attempt to hardlink source files? (optimisation for large files)",
 		safe => 0, # paranoia
 		rebuild => 0,
 	},
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index be62d8a1a..0886fd753 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -43,14 +43,14 @@ sub getsetup () { #{{{
 		aggregateinternal => {
 			type => "boolean",
 			default => 0,
-			description => "enable aggregation to internal pages",
+			description => "enable aggregation to internal pages?",
 			safe => 0, # enabling needs manual transition
 			rebuild => 0,
 		},
 		aggregate_webtrigger => {
 			type => "boolean",
 			default => 0,
-			description => "allow aggregation to be triggered via the web",
+			description => "allow aggregation to be triggered via the web?",
 			safe => 1,
 			rebuild => 0,
 		},
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index b7470ca79..9cb74fb1e 100644
--- 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,
 		},
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4d96001ed..f8150fd72 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -50,28 +50,28 @@ sub getsetup () { #{{{
 		rss => {
 			type => "boolean",
 			default => 0,
-			description => "enable rss feeds by default",
+			description => "enable rss feeds by default?",
 			safe => 1,
 			rebuild => 1,
 		},
 		atom => {
 			type => "boolean",
 			default => 0,
-			description => "enable atom feeds by default",
+			description => "enable atom feeds by default?",
 			safe => 1,
 			rebuild => 1,
 		},
 		allowrss => {
 			type => "boolean",
 			default => 0,
-			description => "allow rss feeds to be used",
+			description => "allow rss feeds to be used?",
 			safe => 1,
 			rebuild => 1,
 		},
 		allowatom => {
 			type => "boolean",
 			default => 0,
-			description => "allow atom feeds to be used",
+			description => "allow atom feeds to be used?",
 			safe => 1,
 			rebuild => 1,
 		},
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 920d90e5e..59cb93bc4 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,7 +16,7 @@ sub getsetup () { #{{{
 		multimarkdown => {
 			type => "boolean",
 			default => 0,
-			description => "enable use of multimarkdown features",
+			description => "enable multimarkdown features?",
 			safe => 1,
 			rebuild => 1,
 		},