[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-398-g269981c

[Marc Delisle]

The branch, master has been updated
       via  269981cbd7a94b0b393301a117a848b04462f135 (commit)
      from  4c214a105bbdc91168e2404601e9cf961aab52ed (commit)


- Log -----------------------------------------------------------------
commit 269981cbd7a94b0b393301a117a848b04462f135
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Mar 19 17:17:11 2011 -0400

    Mention JSON support requirement (needed for Inline edit and user preferences)

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

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

diff --git a/Documentation.html b/Documentation.html
index d912e9c..d3f68cd 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -60,7 +60,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
         <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
                 (<a href="#faq1_31">see
 			<abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
-		and the Standard PHP Library (SPL) extension.
+		, the Standard PHP Library (SPL) extension and JSON support.
                 </li>
 		<li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
         <li>For proper support of multibyte strings (eg. UTF-8, which is


hooks/post-receive
-- 
phpMyAdmin