Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-10-11 14:40:08 +02:00
commit b311e2d77a
2 changed files with 2 additions and 1 deletions

View File

@ -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

View File

@ -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>