diff --git a/Documentation.html b/Documentation.html
index ed2d6b2e7..a45de69e2 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -309,7 +309,7 @@ chmod o-rw config.inc.php # remove world read and write permissions
FAQ 1.23).
If you already had this infrastructure and upgraded to MySQL 4.1.2
- or later, please use ./scripts/upgrade_tables_mysql_4_1_2+.sql.
+ or newer, please use ./scripts/upgrade_tables_mysql_4_1_2+.sql.
You can use your phpMyAdmin to create the tables for you. Please be aware
that you may need special (administrator) privileges to create the database
@@ -364,8 +364,7 @@ chmod o-rw config.inc.php # remove world read and write permissions
algorithm, in a temporary cookie.
Note: starting with phpMyAdmin 2.6.1, this section is only applicable if
- your MySQL server is previous to 4.1.2, or is running with
- --skip-show-database.
+ your MySQL server is running with --skip-show-database.
For 'HTTP' and 'cookie'
modes, phpMyAdmin needs a controluser that has only the
@@ -401,26 +400,14 @@ GRANT SELECT ON mysql.host TO 'pma'@'localhost';
GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)
ON mysql.tables_priv TO 'pma'@'localhost';
- If you are using an old MySQL version (below 4.0.2), please replace
- the first GRANT SELECT query by this one:
-
-
-GRANT SELECT (
- Host, User, Select_priv, Insert_priv, Update_priv, Delete_priv,
- Create_priv, Drop_priv, Reload_priv, Shutdown_priv, Process_priv,
- File_priv, Grant_priv, References_priv, Index_priv, Alter_priv
- ) ON mysql.user TO 'pma'@'localhost';
-
- ... and if you want to use the many new relation and bookmark features:
+ If you want to use the many new relation and bookmark features:
GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
(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.
+ infrastructure be set up).
Then each of the true users should be granted a set of privileges
on a set of particular databases. Normally you shouldn't give global
@@ -648,7 +635,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
mysqli :
The improved MySQL extension. This extension became available
with php 5.0.0 and is the recommended way to connect to a server
- running MySQL 4.1.x.
+ running MySQL 4.1.x or newer.
$cfg['Servers'][$i]['compress'] boolean
Whether to use a compressed protocol for the MySQL server connection