[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-15-g43e41e0

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  43e41e0654c6d85e9311796631fddbf15f568cd3 (commit)
      from  6ea94679499b0e48f6801d0b06c381556f2712c3 (commit)


- Log -----------------------------------------------------------------
commit 43e41e0654c6d85e9311796631fddbf15f568cd3
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Jul 2 12:28:44 2010 -0400

    document MemoryLimit as being a string value

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

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

diff --git a/Documentation.html b/Documentation.html
index b930104..1afb497 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1300,7 +1300,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         This setting is used while importing/exporting dump files and in the
         Synchronize feature but has no effect when PHP is running in safe mode.</dd>
 
-    <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt>
+    <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt>
     <dd>Set the number of bytes a script is allowed to allocate. If set
         to zero, no limit is imposed.<br />
         This setting is used while importing/exporting dump files and at some


hooks/post-receive
-- 
phpMyAdmin