From efdcf0b9159639f768205f79cc096107e7181862 Mon Sep 17 00:00:00 2001
From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Sun, 3 Sep 2006 02:45:58 +0000
Subject: [PATCH] Move superuser section above DB-specific area, combine
 wording into one paragraph.

---
 config/index.php | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/config/index.php b/config/index.php
index 48ca26bd48..b4c23bc46b 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1120,13 +1120,28 @@ if( count( $errs ) ) {
 	<p class="config-desc">
 		If you only have a single user account and database available,
 		enter those here. If you have database root access (see below)
-		you can specify new accounts/databases to be created.
-	</p>
-	<p>
-		This account will not be created if it pre-exists. If this is the case, ensure that it
+		you can specify new accounts/databases to be created. This account 
+		will not be created if it pre-exists. If this is the case, ensure that it
 		has SELECT, INSERT, UPDATE and DELETE permissions on the MediaWiki database.
 	</p>
 
+	<div class="config-input">
+		<?php
+		aField( $conf, "RootUser", "Superuser account:", "superuser" );
+		?>
+	</div>
+	<div class="config-input">
+		<?php
+		aField( $conf, "RootPW", "Superuser password:", "password" );
+		?>
+	</div>
+	
+	<p class="config-desc">
+		If the database user specified above does not exist, or does not have access to create
+		the database (if needed) or tables within it, please provide details of a superuser account,
+		such as <strong>root</strong>, which does. Leave the password set to <strong>-</strong> if this is not needed.
+	</p>
+
 	<?php database_switcher('mysql'); ?>
 	<div class="config-input"><?php
 		aField( $conf, "DBprefix", "Database table prefix:" );
@@ -1170,23 +1185,6 @@ if( count( $errs ) ) {
 	</div>
 	</div>
 
-	<div class="config-input">
-		<?php
-		aField( $conf, "RootUser", "Superuser account:", "superuser" );
-		?>
-	</div>
-	<div class="config-input">
-		<?php
-		aField( $conf, "RootPW", "Superuser password:", "password" );
-		?>
-	</div>
-	
-	<p class="config-desc">
-		If the database user specified above does not exist, or does not have access to create
-		the database (if needed) or tables within it, please provide details of a superuser account,
-		such as <strong>root</strong>, which does. Leave the password set to <strong>-</strong> if this is not needed.
-	</p>
-
 	<div class="config-input" style="padding:2em 0 3em">
 		<label class='column'>&nbsp;</label>
 		<input type="submit" value="Install MediaWiki!" class="btn-install" />
-- 
2.20.1