Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
Crack
2010-07-19 16:04:50 +02:00
69 changed files with 10556 additions and 3027 deletions

View File

@@ -1887,7 +1887,7 @@ $cfg['TrustedProxies'] =
editing.</dd>
<dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
<dd>Maximum number of characters shown in any non-numeric column on browse view.
<dd>Maximum number of characters shown in any non-numeric field on browse view.
Can be turned off by a toggle button on the browse page.</dd>
<dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean
@@ -2188,7 +2188,7 @@ setfacl -d -m "g:www-data:rwx" tmp
<dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
<dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>
<dt id="cfg_TitleDefault">$cfg['TitleDefault'] string</dt>
<dd>Allows you to specify windows' title bar. Following magic strings can
<dd>Allows you to specify window's title bar. Following magic string can
be used to get special values:
<dl>
<dt><code>@HTTP_HOST@</code></dt>