From 71a244b06fb43084f5bf19cb622c0c5eecab6e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 7 Jun 2004 15:04:42 +0000
Subject: [PATCH] Described older config.inc.php support (RFE #968177).

---
 ChangeLog          |  2 ++
 Documentation.html | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af1a76bf4..78e96b95c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ $Source$
       libraries/display_export.lib.php, libraries/export/xls.php,
       Documentation.html: EXPERIMENTAL native MS Excel export support, using
       PEAR module Spreadsheet_Excel_Writer (RFE #968110).
+    * Documentation.html: Described older config.inc.php support (RFE
+      #968177).
 
 2004-06-07 Alexander M. Turek  <me@derrabus.de>
     * css/phpmyadmin.css.php: beautifications.
diff --git a/Documentation.html b/Documentation.html
index a13ab0a02..a6e44d056 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -140,7 +140,7 @@
     end of lines character (&quot;<tt>\r</tt>&quot;).
 </p>
 
-<p><b>Quick Install:</b></p>
+<h3>Quick Install</h3>
 <ol>
     <li> Untar or unzip the distribution (be sure to unzip the subdirectories):
          <tt>tar -xzvf phpMyAdmin_x.x.x.tar.gz</tt> in your webserver's
@@ -177,15 +177,19 @@
 
 </ol>
 
-<p><b>Upgrading from an older version:</b></p>
+<h3>Upgrading from an older version</h3>
 <ul>
-    <li>Please do not copy your older <i>config.inc.php</i> over the new one: it may
-        offer new configuration variables, and the new version may depend on
-        these for normal behavior.  It is suggested instead to insert your site
-        values in the new one.</li>
+    <li>
+        You can safely copy your older <i>config.inc.php</i> over a new one, if
+        you can live with default values for possible new parameters (you can
+        check release notes to see what new features were added). This
+        compatibility will stay for long time, current version supports
+        importing config files from 2.2 and maybe even older (nobody has tried
+        that).
+    </li>
 </ul>
 
-<p><b>Using authentication modes:</b></p>
+<h3>Using authentication modes</h3>
 <ul>
     <li>HTTP and cookie authentication modes are recommended in a <b>multi-user
         environment</b> where you want to give users access to their own
@@ -278,7 +282,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
     </li>
 </ul>
 
-<p><b>'http' authentication mode:</b></p>
+<h4>'http' authentication mode</h4>
 <ul>
     <li>Was called 'advanced' in versions before 2.2.3.</li>
     <li>Introduced in 1.3.0, it uses Basic HTTP authentication method and
@@ -289,7 +293,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
         with 'http' authentication mode.</li>
 </ul>
 
-<p><b>'cookie' authentication mode:</b></p>
+<h4>'cookie' authentication mode</h4>
 <ul>
     <li>You can use this method as a replacement for the HTTP
         authentication (for example, if you're running IIS).
@@ -301,7 +305,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
     <tt><a href="#AllowArbitraryServer">$cfg['AllowArbitraryServer']</a></tt> directive.</li>
 </ul>
 
-<p><b>'config' authentication mode:</b></p>
+<h4>'config' authentication mode</h4>
 <ul>
     <li>This mode is the less secure one because it requires you to fill the
         <tt><a href="#servers_user">$cfg['Servers'][$i]['user']</a></tt> and