1 files changed, 20 insertions, 66 deletions

diff --git a/engine/settings.example.php b/engine/settings.example.php
index 4f47872cb..3b139d710 100644
--- a/engine/settings.example.php
+++ b/engine/settings.example.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Defines database creditials.
+ * Defines database credentials.
  *
  * Most of Elgg's configuration is stored in the database.  This file contains the
  * credentials to connect to the database, as well as a few optional configuration
@@ -35,21 +35,21 @@ if (!isset($CONFIG)) {
  * @global string $CONFIG->dbuser
  * @name $CONFIG->dbuser
  */
-$CONFIG->dbuser = '{{CONFIG_DBUSER}}';
+$CONFIG->dbuser = '{{dbuser}}';
 
 /**
  * The database password
  *
  * @global string $CONFIG->dbpass
  */
-$CONFIG->dbpass = '{{CONFIG_DBPASS}}';
+$CONFIG->dbpass = '{{dbpassword}}';
 
 /**
  * The database name
  *
  * @global string $CONFIG->dbname
  */
-$CONFIG->dbname = '{{CONFIG_DBNAME}}';
+$CONFIG->dbname = '{{dbname}}';
 
 /**
  * The database host.
@@ -58,7 +58,7 @@ $CONFIG->dbname = '{{CONFIG_DBNAME}}';
  *
  * @global string $CONFIG->dbhost
  */
-$CONFIG->dbhost = '{{CONFIG_DBHOST}}';
+$CONFIG->dbhost = '{{dbhost}}';
 
 /**
  * The database prefix
@@ -69,65 +69,8 @@ $CONFIG->dbhost = '{{CONFIG_DBHOST}}';
  *
  * @global string $CONFIG->dbprefix
  */
-$CONFIG->dbprefix = '{{CONFIG_DBPREFIX}}';
+$CONFIG->dbprefix = '{{dbprefix}}';
 
-/**
- * Multiple database connections
- *
- * Here you can set up multiple connections for reads and writes. To do this, uncomment out
- * the lines below.
- *
- * @todo Does this work?
- */
-
-/*
-
-// Yes! We want to split reads and writes
-$CONFIG->db->split = true;
-
-// READS
-// Database username
-$CONFIG->db['read']->dbuser = "";
-
-// Database password
-$CONFIG->db['read']->dbpass = "";
-
-// Database name
-$CONFIG->db['read']->dbname = "";
-
-// Database server
-// (For most configurations, you can leave this as 'localhost')
-$CONFIG->db['read']->dbhost = "localhost";
-
-// WRITES
-// Database username
-$CONFIG->db['write']->dbuser = "";
-
-// Database password
-$CONFIG->db['write']->dbpass = "";
-
-// Database name
-$CONFIG->db['write']->dbname = "";
-
-// Database server
-// (For most configurations, you can leave this as 'localhost')
-$CONFIG->db['write']->dbhost = "localhost";
-
- */
-
-/*
- * For extra connections for both reads and writes, you can turn both
- * $CONFIG->db['read'] and $CONFIG->db['write'] into an array, eg:
- *
- * 	$CONFIG->db['read'][0]->dbhost = "localhost";
- *
- * Note that the array keys must be numeric and consecutive, i.e., they start
- * at 0, the next one must be at 1, etc.
- */
-
-/*
- * Optional configuration
- */
 
 /**
  * Memcache setup (optional)
@@ -137,7 +80,8 @@ $CONFIG->db['write']->dbhost = "localhost";
  * 	1) One or more memcache servers (http://www.danga.com/memcached/)
  *  2) PHP memcache wrapper (http://uk.php.net/manual/en/memcache.setup.php)
  *
- * Note: Multiple server support is only available on server 1.2.1 or higher with PECL library > 2.0.0
+ * Note: Multiple server support is only available on server 1.2.1
+ * or higher with PECL library > 2.0.0
  */
 //$CONFIG->memcache = true;
 //
@@ -146,6 +90,7 @@ $CONFIG->db['write']->dbhost = "localhost";
 //	array('server2', 11211)
 //);
 
+
 /**
  * Use non-standard headers for broken MTAs.
  *
@@ -162,8 +107,17 @@ $CONFIG->broken_mta = FALSE;
  *
  * Elgg stores each query and its results in a query cache.
  * On large sites or long-running scripts, this cache can grow to be
- * large.  To disable query caching, set this to FALSE.
+ * large.  To disable query caching, set this to TRUE.
  *
  * @global bool $CONFIG->db_disable_query_cache
  */
-$CONFIG->db_disable_query_cache = FALSE;
\ No newline at end of file
+$CONFIG->db_disable_query_cache = FALSE;
+
+/**
+ * Minimum password length
+ *
+ * This value is used when validating a user's password during registration.
+ *
+ * @global int $CONFIG->min_password_length
+ */
+$CONFIG->min_password_length = 6;