[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1498-g534d93f

Marc Delisle lem9 at users.sourceforge.net
Sun Jan 30 14:46:40 CET 2011


The branch, master has been updated
       via  534d93fa4600c4edab647a0cbb2b260bef2d3994 (commit)
      from  a7ec18fde9b382a1e3b82e2f0df98db701a95bc4 (commit)


- Log -----------------------------------------------------------------
commit 534d93fa4600c4edab647a0cbb2b260bef2d3994
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jan 30 08:45:50 2011 -0500

    MariaDB support explicitely stated
    Fixed minor typos

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

Summary of changes:
 Documentation.html |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 5ace8bc..9630c69 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2743,13 +2743,15 @@ setfacl -d -m "g:www-data:rwx" tmp
     connect to your MySQL server using PHP's classic
     <a href="http://php.net/mysql">MySQL extension</a> as well as the
     <a href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that
-    is available in php 5.0. The latter one should be used unless you have 
+    is available in php 5.0. The latter one should be used unless you have a
     good reason not to do so.<br />
-    When compiling php, we strongly recommend that you manually link the MySQL
+    When compiling PHP, we strongly recommend that you manually link the MySQL
     extension of your choice to a MySQL client library of at least the same
     minor version since the one that is bundled with some PHP distributions is
     rather old and might cause problems <a href="#faq1_17a">
-       (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.</p>
+        (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br />
+    MariaDB is also supported (version 5.2 was tested).
+    </p>
 
 <h5 id="faq1_17a">
     <a href="#faq1_17a">1.17a I cannot connect to the MySQL server. It always returns the error


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list