diff --git a/Documentation.html b/Documentation.html index e99bfca61..7b9c0e211 100644 --- a/Documentation.html +++ b/Documentation.html @@ -328,14 +328,14 @@ chmod o-rw config.inc.php # remove world read and write permissions

Upgrading from an older version

Simply copy ./config.inc.php from your previous installation into the newly - unpacked one. Configuration files from very old versions (2.3.0 or older) may + unpacked one. Configuration files from very old versions (2.3.0 or before) may require some tweaking as some options have been changed or removed.

You should not copy libraries/config.default.php over config.inc.php because the default configuration file is version-specific.

-

If you have upgraded your MySQL server from a version older than 4.1.2 to +

If you have upgraded your MySQL server from a version previous to 4.1.2 to version 4.1.2 or newer and if you use the pmadb/linked table infrastructure, you should run the SQL script found in scripts/upgrade_tables_mysql_4_1_2+.sql.

@@ -364,7 +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 older than 4.1.2, or is running with + your MySQL server is previous to 4.1.2, or is running with --skip-show-database.

    For 'HTTP' and 'cookie' @@ -643,7 +643,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
    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 or running with + and, for a MySQL server previous to 4.1.2 or running with --skip-show-database, to enable a multi-user installation (HTTP or cookie authentication mode).

    @@ -679,7 +679,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real ends. This can also allow you to log in in arbitrary server if $cfg['AllowArbitraryServer'] enabled.
  • -
  • 'HTTP' authentication (was called 'advanced' in older versions and can be written also as 'http') +
  • 'HTTP' authentication (was called 'advanced' in previous versions and can be written also as 'http') ($auth_type = 'HTTP') as introduced in 1.3.0 allows you to log in as any valid MySQL user via HTTP-Auth.
  • 'signon' authentication mode @@ -2436,7 +2436,7 @@ $cfg['TrustedProxies'] = 1.15 I have problems with mysql.user field names. -

    In older MySQL versions, the User and Password fields +

    In previous MySQL versions, the User and Password fields were named user and password. Please modify your field names to align with current standards.

    @@ -3442,7 +3442,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(

    Click on a database name in the left frame, the properties will be displayed. Select "Import" from the list of tabs in the right–hand frame (or "SQL" if your phpMyAdmin - version is older than 2.7.0). In the "Location of the text file" section, type in + version is previous to 2.7.0). In the "Location of the text file" section, type in the path to your dump filename, or use the Browse button. Then click Go.

    With version 2.7.0, the import engine has been re–written, if possible it is suggested