From 1e29fc466ea5b264cff71c3fac6edf09b0b51e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 2 Jun 2008 13:21:47 +0000
Subject: [PATCH] Complete docs for controuser/controlpass.

---
 libraries/config.default.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 9eb90e9bb..f0b5da960 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -47,7 +47,7 @@ $cfg['PmaAbsoluteUri'] = '';
 $cfg['PmaNoRelation_DisableWarning'] = false;
 
 /**
- * Disable the default warning that is displayed if Suhosin is detected 
+ * Disable the default warning that is displayed if Suhosin is detected
  *
  * @global boolean $cfg['SuhosinDisableWarning']
  */
@@ -130,12 +130,15 @@ $cfg['Servers'][$i]['compress'] = false;
 
 /**
  * MySQL control user settings (this user must have read-only
+ * access to the "mysql/user" and "mysql/db" tables). The controluser is also
+ * used for all relational features (pmadb)
  *
  * @global string $cfg['Servers'][$i]['controluser']
  */
 $cfg['Servers'][$i]['controluser'] = '';
 
 /**
+ * MySQL control user settings (this user must have read-only
  * access to the "mysql/user" and "mysql/db" tables). The controluser is also
  * used for all relational features (pmadb)
  *
@@ -341,22 +344,22 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array();
  * by default most user will be fine with SHOW DATABASES,
  * for servers with a huge amount of databases it is possible to
  * define a command which executes faster but with less information
- * 
- * especially when accessing database servers from ISPs changing this command 
+ *
+ * especially when accessing database servers from ISPs changing this command
  * can result in a great speed improvement
- * 
+ *
  * false will disable fetching databases from the server, only databases in
  * $cfg['Servers'][$i]['only_db'] will be displayed
- * 
+ *
  * #user# will be replaced by current user
- * 
+ *
  * examples:
  * 'SHOW DATABASES'
  * "SHOW DATABASES LIKE '#user#\_%'"
  * 'SELECT DISTINCT TABLE_SCHEMA FROM information_schema.SCHEMA_PRIVILEGES'
  * 'SELECT SCHEMA_NAME FROM information_schema.SCHEMATA'
  * false
- * 
+ *
  * @global array $cfg['Servers'][$i]['ShowDatabasesCommand']
  */
 $cfg['Servers'][$i]['ShowDatabasesCommand'] = 'SHOW DATABASES';