[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20803-gd297e0b

[Marc Delisle]

The branch, master has been updated
       via  d297e0b574615da467c4614cb6ea622b18dd5656 (commit)
       via  4a99b6a4942c02d0b1121650dc9f93fb83a42dac (commit)
      from  37edc1dece4fadfa962db7c26e2f557a0ba49859 (commit)


- Log -----------------------------------------------------------------
commit d297e0b574615da467c4614cb6ea622b18dd5656
Merge: 37edc1d 4a99b6a
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Oct 11 07:45:42 2011 -0400

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index a279813..e1ae966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 - bug #3418849 [interface] Inline edit shows dropdowns even after closing
 - bug [view] View renaming did not work
 - bug [navi] Wrong icon for view (MySQL 5.5)
+- bug #3420229 [doc] Missing documentation section
 
 3.4.6.0 (not yet released)
 - patch #3404173 InnoDB comment display with tooltips/aliases
diff --git a/Documentation.html b/Documentation.html
index 83aecef..9aeaa66 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2368,7 +2368,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <dt id="cfg_DBG">$cfg['DBG']</dt>
     <dd><b>DEVELOPERS ONLY!</b></dd>
 
-    <dt id="cfg_DBG_enable_sql">$cfg['DBG']['sql'] boolean</dt>
+    <dt id="cfg_DBG_sql">$cfg['DBG']['sql'] boolean</dt>
     <dd><b>DEVELOPERS ONLY!</b><br />
         Enable logging queries and execution times to be displayed in the bottom
         of main page (right frame).</dd>


hooks/post-receive
-- 
phpMyAdmin