From 429a7d6c88f295e946fcd323276398f5a7684674 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 6 Jul 2001 11:18:55 +0000
Subject: [PATCH] updates

---
 Documentation.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index da49c71e4..811a543b8 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -100,16 +100,16 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
 <p>  Quick Install:
 <ol>
 <li> Untar or unzip the distribution (be sure to untar the subdirectories)
-        tar xvf phpMyAdmin_x.x.x.tar </li>
+        tar xzvf phpMyAdmin_x.x.x.tar.gz </li>
 <li> Open the file config.inc.php3 in your favourite editor and change
         the values for host, user and password to fit your environment.
-        Have a lok at Documentation.html for an explanation of all values.</li>
+        Have a look at Documentation.html for an explanation of all values.</li>
 <li> It is recommended that you protect the directory in which
         you installed phpMyAdmin (unless it's on a closed intranet), 
         for example with HTTP-AUTH (in a .htaccess-file). </li>
 <li> Open the file <www.your-host.com>/<your-install-dir>/index.php3
         in your browser. phpMyAdmin should now display a welcome screen 
-        and your databases.</li>
+        and your databases, or a login dialog if using advanced authentication.</li>
 </ol>
 
   Installation notes:
@@ -131,7 +131,11 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
 </ul>
 </p>
 
-
+<p>Upgrading from an older version:
+<ul>
+ <li> Please do not copy your older config.inc.php3 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.
+</ul>
+</p>
 
 <a name="config"></a><br>
 <hr noshade width="100%"><font size="+1">
@@ -162,8 +166,8 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
   Whether basic or advanced authentication should be used for this server. Basic 
   authentication ($adv_auth = false) is the plain old way: username and password 
   are stored in config.inc.php3. Advanced authentication $adv_auth = true) as 
-  introduced in 1.3.0 allows you to log in as any valid MySQL user via HTTP-Auth. 
-  All you have to provide in config.inc is a standard user which can connect to 
+  introduced in 1.3.0 allows you to log in as any valid MySQL user via HTTP-Auth. <p> Please note that this authentication mode is only supported with PHP running as an Apache module, and not with cgi.  
+<p>  All you have to provide in config.inc is a standard user which can connect to 
   MySQL and read the mysql user/db table (see $cfgServers[n]['stduser']).<br>
   Using advanced authentication is recommended:</p>
 <ul>