Merge lp:~edb/quam-plures/rearrange_config_array into lp:quam-plures

[EdB]

Easy branch: re-ordered the bits in the app_db_config array so that they match the order you are asked to provide them during installation. Also changed the comment on each of those lines to match the field name on the install screen. Trivial, but I'm a friggin retard about stuff like that.

Oh and totally wiped out a todo of some sort.

[Yabs (yabs)]

Aesthetic, but doesn't cause problems.

Would be really cool if others did the occasional review, then I'd be able to spend my free time coding instead of reviewing your branches ( not a dig at you ;) )

¥

review: Approve

[Yabs (yabs)]

Ohh yeah, bonus points for killing a todo :D

¥

=== modified file 'qp_config/_main_config.template.php'
--- qp_config/_main_config.template.php	2010-06-26 18:16:49 +0000
+++ qp_config/_main_config.template.php	2011-01-13 08:21:16 +0000
@@ -22,14 +22,6 @@
 if( !defined('QP_CONFIG_LOADED') ) die( 'Please, do not access this page directly.' );
 
 
-// TODO: dh> this file was meant to be used for things where you only need the basic config..
-// fp> also:
-// - At least _admin.php should only be called when in the backoffice.
-// - Also we should probably start by moving as many conf options to the backoffice as possible and see how much stuff is left in conf files
-//    Note: some stuff does not make sense in the back-office (for example stuff that depends on the physical path where the files are installed)
-// - In view of reorganization, please list (all or examples) of situations where only a subset of the conf should be loaded.
-
-
 /**
  * Maintenance mode. Set this to 1 in order to temporarily disable access to the application.
  *
@@ -53,10 +45,10 @@
  * Fill in your database details (check carefully or nothing will work!)
  */
 $app_db_config = array(
-	'user'          => 'demouser',     // your MySQL username
-	'password'      => 'demopass',     // ...and password
-	'name'          => 'quamplures',   // the name of the database
-	'host'          => 'localhost',    // MySQL Server (typically 'localhost')
+	'host'          => 'localhost',    // "MySQL Host/Server" (typically 'localhost')
+	'name'          => 'quamplures',   // "MySQL Database"
+	'user'          => 'demouser',     // "MySQL Username"
+	'password'      => 'demopass',     // "MySQL Password"
 );