diff --git a/Documentation.html b/Documentation.html
index 36e3fbff7..c6b58c10c 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -461,6 +461,11 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
$cfg['Servers'][$i]['controlpass'] string
+ This special account is used for 2 distinct purposes: to make possible
+ a multi-user installation (http or cookie authentication mode) and
+ also for all relational features (see
+ $cfg['Servers'][$i]['pmadb']).
+
When using HTTP or cookie authentication modes (or 'config'
authentication mode since phpMyAdmin 2.2.1), you need to supply the
details of a MySQL account that has SELECT privilege on the
diff --git a/config.inc.php b/config.inc.php
index 4a1afe491..f48dbb2de 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -75,7 +75,10 @@ $cfg['Servers'][$i]['compress'] = FALSE; // Use compressed protocol f
$cfg['Servers'][$i]['controluser'] = ''; // MySQL control user settings
// (this user must have read-only
$cfg['Servers'][$i]['controlpass'] = ''; // access to the "mysql/user"
- // and "mysql/db" tables)
+ // and "mysql/db" tables).
+ // The controluser is also
+ // used for all relational
+ // features (pmadb)
$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (config, http or cookie based)?
$cfg['Servers'][$i]['user'] = 'root'; // MySQL user
$cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index 7c2fa5c9f..6674a85a3 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -8,6 +8,9 @@
-- too many users might just use this script and end #
-- up with having the same password for the controluser) #
-- #
+-- This user "pma" must be defined in config.inc.php #
+-- (controluser/controlpass) #
+-- #
-- Please dont forget to set up the tablenames in #
-- config.inc.php #
-- #