diff --git a/ChangeLog b/ChangeLog index e42e2d03b8..47be4444a5 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,10 @@ $Source$ * left.php3: - improved the js object detection system; - fixed some bugs with the patch from Korakot. - * Documentation.html, lines 469-475: added the $cfgShowTooltip entry. + * Documentation.html: + - lines 238-244: added warning for Mac users thanks to + "g-doggie" ; + - lines 476-482: added the $cfgShowTooltip entry. 2001-10-04 Korakot Chaovavanich * table comment(description) as tooltip (request #464084). diff --git a/Documentation.html b/Documentation.html index 0004d3d59c..97f5f7f43e 100755 --- a/Documentation.html +++ b/Documentation.html @@ -72,7 +72,7 @@ -

phpMyAdmin 2.2.1-dev Documentation

+

phpMyAdmin 2.2.1-rc1 Documentation

@@ -235,6 +235,13 @@

Configuration

+

+ Warning for Mac users: php seems not to like + Mac end of lines character ("\r"). So ensure you choose the option + that allows to use the *nix end of line character ("\n") in your + text editor before registering a script you have modified. +

+

All configurable data is placed in config.inc.php3.

$cfgPmaAbsoluteUri string