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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-04-18 16:39:36 +02:00
commit 91f3a670c4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/config.rst
View File

@ -296,8 +296,6 @@ Server connection settings
Directory containing trusted SSL CA certificates in PEM format.
.. seealso:: :ref:`example-google-ssl`
.. config:option:: $cfg['Servers'][$i]['ssl_ciphers']
:type: string
@ -305,8 +303,6 @@ Server connection settings
List of allowable ciphers for SSL connections to the MySQL server.
.. seealso:: :ref:`example-google-ssl`
.. config:option:: $cfg['Servers'][$i]['ssl_verify']
:type: boolean
@ -2942,3 +2938,11 @@ server certificates and tell phpMyAdmin to use them:
$cfg['Servers'][$i]['ssl_ca'] = '../server-ca.pem';
// Disable SSL verification (see above note)
$cfg['Servers'][$i]['ssl_verify'] = false;
.. seealso::
:config:option:`$cfg['Servers'][$i]['ssl']`,
:config:option:`$cfg['Servers'][$i]['ssl_key']`,
:config:option:`$cfg['Servers'][$i]['ssl_cert']`,
:config:option:`$cfg['Servers'][$i]['ssl_ca']`,
:config:option:`$cfg['Servers'][$i]['ssl_verify']`