diff --git a/Documentation.html b/Documentation.html
index 3bc7995e5..e016864df 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -293,9 +293,9 @@
- Note: starting with phpMyAdmin 2.6.1, configuring the controluser
- to enable HTTP and cookie authentication applies only
- to MySQL servers older than 4.1.2. See the controluser directive.
+ Note: starting with phpMyAdmin 2.6.1, this section is only applicable if
+ your MySQL server is older than 4.1.2,
+ or is running with --skip-show-database.
For 'HTTP' and 'cookie' modes, phpMyAdmin needs a controluser that has
only the SELECT privilege on the mysql.user (all
@@ -553,14 +553,11 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
$cfg['Servers'][$i]['controlpass'] string
- Note: starting with phpMyAdmin 2.6.1, configuring the controluser
- to enable HTTP and cookie authentication applies only
- to MySQL servers older than 4.1.2.
-
This special account is used for 2 distinct purposes: to make possible
all relational features
(see $cfg['Servers'][$i]['pmadb']) and, for a
- MySQL server older than 4.1.2, to enable a multi-user installation
+ MySQL server older than 4.1.2 or running with
+ --skip-show-database, to enable a multi-user installation
(http or cookie authentication mode).
When using HTTP or cookie authentication modes (or 'config'
@@ -575,11 +572,6 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
Please see the install section on
"Using authentication modes" for more information.
- Note that if you try login to phpMyAdmin with this
- "controluser", you could get some errors, depending the exact
- privileges you gave to the "controluser". phpMyAdmin does not
- support a direct login with the "controluser".
-
In phpMyAdmin versions before 2.2.5, those were called
"stduser/stdpass".