[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-271-gdb22f56

[Marc Delisle]

The branch, master has been updated
       via  db22f56fd2584508bc77cb03922020183ac8bb49 (commit)
      from  34d01c91073384ab28713fc8a599d5df6978e08e (commit)


- Log -----------------------------------------------------------------
commit db22f56fd2584508bc77cb03922020183ac8bb49
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jan 28 04:12:07 2012 -0500

    Document MaxRows behavior when a LIMIT clause is present

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

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

diff --git a/Documentation.html b/Documentation.html
index 8fafa5f..3389933 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1661,8 +1661,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         "show all (rows)" button in browse mode or not.</dd>
 
     <dt id="cfg_MaxRows">$cfg['MaxRows'] integer</dt>
-    <dd>Number of rows displayed when browsing a result set. If the result set
-        contains more rows, "Previous" and "Next" links will be shown.</dd>
+    <dd>Number of rows displayed when browsing a result set and no LIMIT
+    clause is used. If the result set contains more rows, "Previous" and "Next" links will be shown.</dd>
 
     <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt>
     <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order,


hooks/post-receive
-- 
phpMyAdmin