From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 22:36:56 +0000 (-0400)
Subject: reorder
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/2bffce0d899322c8139f117e302a3b23456af3f5

reorder
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5724518da..4410fc985 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -94,10 +94,26 @@ sub getsetup () { #{{{
 		safe => 0, # don't allow overriding
 		rebuild => 0,
 	},
-	discussion => {
-		type => "boolean",
-		default => 1,
-		description => "enable Discussion pages?",
+	default_plugins => {
+		type => "internal",
+		default => [qw{mdwn link inline htmlscrubber passwordauth
+				openid signinedit lockedit conditional
+				recentchanges parentlinks}],
+		description => "plugins to enable by default",
+		safe => 1,
+		rebuild => 1,
+	},
+	add_plugins => {
+		type => "string",
+		default => [],
+		description => "plugins to add to the default configuration",
+		safe => 1,
+		rebuild => 1,
+	},
+	disable_plugins => {
+		type => "string",
+		default => [],
+		description => "plugins to disable",
 		safe => 1,
 		rebuild => 1,
 	},
@@ -171,6 +187,13 @@ sub getsetup () { #{{{
 		safe => 0, # changing requires manual transition
 		rebuild => 1,
 	},
+	discussion => {
+		type => "boolean",
+		default => 1,
+		description => "enable Discussion pages?",
+		safe => 1,
+		rebuild => 1,
+	},
 	default_pageext => {
 		type => "string",
 		default => "mdwn",
@@ -319,29 +342,6 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
-	default_plugins => {
-		type => "internal",
-		default => [qw{mdwn link inline htmlscrubber passwordauth
-				openid signinedit lockedit conditional
-				recentchanges parentlinks}],
-		description => "plugins to enable by default",
-		safe => 1,
-		rebuild => 1,
-	},
-	add_plugins => {
-		type => "string",
-		default => [],
-		description => "plugins to add to the default configuration",
-		safe => 1,
-		rebuild => 1,
-	},
-	disable_plugins => {
-		type => "string",
-		default => [],
-		description => "plugins to disable",
-		safe => 1,
-		rebuild => 1,
-	},
 	libdir => {
 		type => "internal",
 		default => undef,