diff --git a/Documentation.html b/Documentation.html index 550b28489..7d6e5924b 100755 --- a/Documentation.html +++ b/Documentation.html @@ -8,7 +8,7 @@ - phpMyAdmin 2.5.4-rc2 - Documentation + phpMyAdmin 2.5.5-dev - Documentation @@ -31,7 +31,7 @@
-

phpMyAdmin 2.5.4-rc2 Documentation

+

phpMyAdmin 2.5.5-dev Documentation

@@ -1088,7 +1088,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' Defaults to TRUE.

- +
$cfg['AllowArbitraryServer'] boolean
If enabled allows you to login to arbitrary server using cookie auth. @@ -2519,7 +2519,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge AddType application/x-httpd-php .php

- In the case we saw, one set of directives was in + In the case we saw, one set of directives was in /etc/httpd/conf/httpd.conf, while the other set was in /etc/httpd/conf/addon-modules/php.conf.
The recommended way is with AddType, so just comment out @@ -3389,7 +3389,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge

Upgrading to MySQL 4 usually gives users those global privileges: CREATE - TEMPORARY TABLES, SHOW DATABASES, LOCK TABLES. Those privileges also + TEMPORARY TABLES, SHOW DATABASES, LOCK TABLES. Those privileges also enables users to see all the database names, until you upgrade the grant tables as described in the MySQL manual, section 2.5.6. See this bug report.

diff --git a/README b/README index 568cd9956..3be235c82 100755 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to administrate MySQL over the WWW. - Version 2.5.4-rc1 + Version 2.5.5-dev ----------------- http://www.phpmyadmin.net/ @@ -32,7 +32,7 @@ phpMyAdmin - Readme Requirements: PHP3 (>= 3.0.8), PHP4 or PHP5 MySQL (tested with 3.21.x, 3.22.x, 3.23.x, 4.0.x and 4.1.x) - Note: The implemented MySQL 4.1.x support is experimental! + Note: The implemented MySQL 4.1.x support is experimental! a web-browser (doh!) Summary: diff --git a/libraries/defines_php.lib.php3 b/libraries/defines_php.lib.php3 index d47e5b363..bd8b0f9f3 100644 --- a/libraries/defines_php.lib.php3 +++ b/libraries/defines_php.lib.php3 @@ -16,7 +16,7 @@ */ // phpMyAdmin release if (!defined('PMA_VERSION')) { - define('PMA_VERSION', '2.5.4-rc2'); + define('PMA_VERSION', '2.5.5-dev'); } // php version @@ -96,7 +96,7 @@ function PMA_dl($module) { } else { return FALSE; } - + } // Whether GD2 is present diff --git a/translators.html b/translators.html index be2370fd9..be8ea069b 100644 --- a/translators.html +++ b/translators.html @@ -5,7 +5,7 @@ - phpMyAdmin 2.5.4-rc2 - Official translators + phpMyAdmin 2.5.5-dev - Official translators