diff --git a/Documentation.html b/Documentation.html
index 580123135..1bd5dc6a6 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -420,10 +420,11 @@
         <br /><br />
     </dd>
 
-    <dt><b>$cfgConfirm </b>boolean</dt>
+
+    <dt><b>$cfgOBGzip </b>boolean</dt>
     <dd>
-        Whether a warning (&quot;Are your really sure..&quot;) should be
-        displayed when you're about to loose data.
+        Defines whether to use gzip output buffering for increased
+        speed in HTTP transfers.
         <br /><br />
     </dd>
 
@@ -434,21 +435,17 @@
         <br /><br />
     </dd>
 
-    <dt><b>$cfgShowBlob </b>boolean</dt>
+    <dt><b>$cfgSkipLockedTables </b>boolean</dt>
     <dd>
-        Defines whether <tt>BLOB</tt> fields are shown when browsing a table's
-        content or not.
+        Mark used tables and make it possible to show databases with locked
+        tables (since 3.23.30).
         <br /><br />
     </dd>
 
-    <dt><b>$cfgProtectBlob </b>boolean</dt>
+    <dt><b>$cfgShowSQL </b>boolean</dt>
     <dd>
-        Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> fields are protected
-        from edition when browsing a table's content or not.
-        Valid values are:<br />
-        - <tt>FALSE</tt> to allow edition of all fields;
-        - <tt>blob</tt> to allow edition of all fields except <tt>BLOBS</TT>;
-        - <tt>all</tt> to disallow edition of all <tt>BINARY</tt> or <tt>BLOB</tt> fields.
+        Defines whether sql-queries generated by phpMyAdmin should be displayed
+        or not.
         <br /><br />
     </dd>
 
@@ -461,17 +458,24 @@
         <br /><br />
      </dd>
 
-    <dt><b>$cfgShowSQL </b>boolean</dt>
+    <dt><b>$cfgConfirm </b>boolean</dt>
     <dd>
-        Defines whether sql-queries generated by phpMyAdmin should be displayed
-        or not.
+        Whether a warning (&quot;Are your really sure..&quot;) should be
+        displayed when you're about to loose data.
         <br /><br />
     </dd>
 
-    <dt><b>$cfgSkipLockedTables </b>boolean</dt>
+    <dt><b>$cfgShowStats </b>boolean</dt>
     <dd>
-        Mark used tables and make it possible to show databases with locked
-        tables (since 3.23.30).
+        Defines whether to display space usage and statistics about databases
+        and tables or not.
+        <br /><br />
+    </dd>
+
+    <dt><b>$cfgShowBlob </b>boolean</dt>
+    <dd>
+        Defines whether <tt>BLOB</tt> fields are shown when browsing a table's
+        content or not.
         <br /><br />
     </dd>
 
@@ -498,10 +502,14 @@
         <br /><br />
     </dd>
 
-    <dt><b>$cfgOBGzip </b>boolean</dt>
+    <dt><b>$cfgProtectBinary </b>boolean</dt>
     <dd>
-        Defines whether to use gzip output buffering for increased
-        speed in HTTP transfers.
+        Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> fields are protected
+        from edition when browsing a table's content or not.
+        Valid values are:<br />
+        - <tt>FALSE</tt> to allow edition of all fields;<br />
+        - <tt>blob</tt> to allow edition of all fields except <tt>BLOBS</TT>;<br />
+        - <tt>all</tt> to disallow edition of all <tt>BINARY</tt> or <tt>BLOB</tt> fields.
         <br /><br />
     </dd>
 
diff --git a/config.inc.php3 b/config.inc.php3
index f5e6aec6e..16b670e6f 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -94,18 +94,19 @@ unset($cfgServers[0]);
 /**
  * Other core phpMyAdmin settings
  */
-$cfgConfirm               = TRUE;   // confirm 'DROP TABLE' & 'DROP DATABASE'
+$cfgOBGzip 		          = TRUE;   // use GZIP output buffering if possible
 $cfgPersistentConnections = FALSE;  // use persistent connections to MySQL database
-$cfgShowBlob              = FALSE;  // display blob field contents in browse mode
-$cfgProtectBinary         = 'blob'; // disallow editing of binary fields in edit mode
-                                    // valid values are:
-                                    //   FALSE  allow editing
-                                    //   'blob' allow editing except for BLOB fields
-                                    //   'all'  disallow editing
-$cfgAllowUserDropDatabase = FALSE;  // disallow users to delete their own database
-$cfgShowSQL               = TRUE;   // show SQL queries as run
 $cfgSkipLockedTables      = FALSE;  // mark used tables, make possible to show
                                     // locked tables (since MySQL 3.23.30)
+$cfgShowSQL               = TRUE;   // show SQL queries as run
+$cfgAllowUserDropDatabase = FALSE;  // disallow users to delete their own database
+$cfgConfirm               = TRUE;   // confirm 'DROP TABLE' & 'DROP DATABASE'
+
+$cfgShowStats             = TRUE;   // allow to display statistics and space usage in
+                                    // the pages about database details and table
+                                    // properties
+
+$cfgShowBlob              = FALSE;  // display blob field contents in browse mode
 $cfgShowAll               = FALSE;  // allows to display all the rows in browse mode
 $cfgMaxRows               = 30;     // maximum number of rows to display in browse mode
 $cfgOrder                 = 'ASC';  // default for 'ORDER BY' clause (valid
@@ -113,7 +114,13 @@ $cfgOrder                 = 'ASC';  // default for 'ORDER BY' clause (valid
                                     // descending order for fields of type
                                     // TIME, DATE, DATETIME & TIMESTAMP,
                                     // ascending order else-)
-$cfgOBGzip 		          = TRUE;   // GZIP output buffering
+
+$cfgProtectBinary         = 'blob'; // disallow editing of binary fields in edit mode
+                                    // valid values are:
+                                    //   FALSE  allow editing
+                                    //   'blob' allow editing except for BLOB fields
+                                    //   'all'  disallow editing
+
 $cfgGZipDump              = TRUE;   // Allow the use of gzip/bzip compression
 $cfgBZipDump              = TRUE;   // for dump files