[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5330-g638fe75

[Marc Delisle]

The branch, master has been updated
       via  638fe75a8b36df3049d4cc1dec7e734c71feff6c (commit)
       via  104b0ee99ac77845511c91dcaefe4f315c3c4435 (commit)
      from  f95dc8d8a1ee0221e330d72fe4f2857f52b2f463 (commit)


- Log -----------------------------------------------------------------
commit 638fe75a8b36df3049d4cc1dec7e734c71feff6c
Merge: f95dc8d8a1ee0221e330d72fe4f2857f52b2f463 104b0ee99ac77845511c91dcaefe4f315c3c4435
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jul 7 09:47:12 2010 -0400

    fix merge conflict

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 755308b..1d5b25e 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -396,7 +396,7 @@ rm -rf config                      # remove not needed directory
         In cookie mode, the password is stored, encrypted with the blowfish
         algorithm, in a temporary cookie.</li>
 
-    <li id="pmausr">Note: starting with phpMyAdmin 2.6.1, this section is only applicable if
+    <li id="pmausr">Note: this section is only applicable if
         your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
 
         For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
@@ -715,7 +715,7 @@ since this link provides funding for phpMyAdmin.
     <dd>This special account is used for 2 distinct purposes: to make possible
         all relational features (see
         <a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>)
-        and, for a MySQL server previous to 4.1.2 or running with
+        and, for a MySQL server running with
         <tt>--skip-show-database</tt>, to enable a multi-user installation
         (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
         authentication mode).<br /><br />


hooks/post-receive
-- 
phpMyAdmin