gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2012-11-12 14:36:20 +01:00
commit fc096914eb
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
doc/config.rst
View File

@ -1039,19 +1039,6 @@ Generic settings
are longer than 1000 characters. Also, if a query's length exceeds this
limit, this query is not saved in the history.
.. config:option:: $cfg['OBGzip']
:type: string/boolean
:default: ``'auto'``
Defines whether to use GZip output buffering for increased speed in
:abbr:`HTTP (HyperText Transfer Protocol)` transfers. Set to
true/false for enabling/disabling. When set to 'auto' (string),
phpMyAdmin tries to enable output buffering and will automatically
disable it if your browser has some problems with buffering. IE6 with
a certain patch is known to cause data corruption when having enabled
buffering.
.. config:option:: $cfg['PersistentConnections']
:type: boolean
@ -1868,6 +1855,19 @@ Languages
Web server settings
-------------------
.. config:option:: $cfg['OBGzip']
:type: string/boolean
:default: ``'auto'``
Defines whether to use GZip output buffering for increased speed in
:abbr:`HTTP (HyperText Transfer Protocol)` transfers. Set to
true/false for enabling/disabling. When set to 'auto' (string),
phpMyAdmin tries to enable output buffering and will automatically
disable it if your browser has some problems with buffering. IE6 with
a certain patch is known to cause data corruption when having enabled
buffering.
.. config:option:: $cfg['TrustedProxies']
:type: array