diff --git a/ChangeLog b/ChangeLog
index 36b7fc1d1..c017e3beb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
+2006-04-11 Marc Delisle
+ * Documentation.html: clarification about config.default.php
+
2006-04-11 Sebastian Mendel
* index.php, libraries\Table.class.php, libraries\auth\cookie.auth.lib.php,
libraries\auth\http.auth.lib.php, libraries\common.lib.php,
diff --git a/Documentation.html b/Documentation.html
index 51907bd0c..37114e23a 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -293,6 +293,10 @@ chmod o+w config/config.inc.php # give it world writable permissions
tweaking may be required because, as of 2.7.0, using those old config files
is no longer supported.
+ You should not copy libraries/config.default.php
+ over config.inc.php because the default configuration file
+ is version-specific.
+
Using authentication modes