From cbef65bb62997258146d73a54990789e000ce6f3 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 11 Apr 2006 17:23:30 +0000
Subject: [PATCH] clarification about config.default.php

---
 ChangeLog          | 3 +++
 Documentation.html | 4 ++++
 2 files changed, 7 insertions(+)

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  <lem9@users.sourceforge.net>
+    * Documentation.html: clarification about config.default.php
+
 2006-04-11 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * 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.</p>
 
+<p> You should <strong>not</strong> copy <tt>libraries/config.default.php</tt>
+    over <tt>config.inc.php</tt> because the default configuration file
+    is version-specific.</p>
+
 <h3 id="authentication_modes">Using authentication modes</h3>
 
 <ul><li><abbr title="HyperText Transfer Protocol">HTTP</abbr> and cookie