diff --git a/Documentation.html b/Documentation.html
index a33e6f1f9..2d0ef9105 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -255,7 +255,7 @@
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.
+ to MySQL servers older than 4.1.2. See the controluser directive.
For 'HTTP' and 'cookie' modes, phpMyAdmin needs a controluser that has
only the SELECT privilege on the mysql.user (all
@@ -303,8 +303,8 @@ GRANT SELECT (
GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
- (this of course requires you to have a special DB for phpMyAdmin, the
- contents will be explained later)
+ (this of course requires that your linked-tables infrastructure be set up).
+
Of course, the above queries only work if your MySQL version supports
the GRANT command. This is the case since 3.22.11.
@@ -1056,6 +1056,20 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
+ $cfg['LeftFrameDBTree'] boolean
+
+ In light mode, defines whether to display the names of databases (in the
+ selector) using a tree, see also $cfg['LeftFrameDBSeparator'].
+
+
+
+ $cfg['LeftFrameDBSeparator'] string
+
+ The string used to separate the parts of the database name when showing
+ them in a tree.
+
+
+
$cfg['LeftFrameTableSeparator'] string
Defines a string to be used to nest table spaces. Defaults to '__'.