Visitar URL original
Merge config.default.php with Config\Settings classes · phpmyadmin/phpmyadmin@25cce47 · GitHub
Skip to content

Commit 25cce47

Browse files
committed
Merge config.default.php with Config\Settings classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 11f483e commit 25cce47

13 files changed

Lines changed: 2581 additions & 2937 deletions

File tree

‎doc/config.rst‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Configuration
88
All configurable data is placed in :file:`config.inc.php` in phpMyAdmin's
99
toplevel directory. If this file does not exist, please refer to the
1010
:ref:`setup` section to create one. This file only needs to contain the
11-
parameters you want to change from their corresponding default value in
12-
:file:`libraries/config.default.php` (this file is not intended for changes).
11+
parameters you want to change from their corresponding default value.
1312

1413
.. seealso::
1514

@@ -231,9 +230,7 @@ Server connection settings
231230
added which contains the login information for the different servers. The
232231
first :config:option:`$cfg['Servers'][$i]['host']` contains the hostname of
233232
the first server, the second :config:option:`$cfg['Servers'][$i]['host']`
234-
the hostname of the second server, etc. In
235-
:file:`libraries/config.default.php`, there is only one section for server
236-
definition, however you can put as many as you need in
233+
the hostname of the second server, etc. You can put as many sections for server definition as you need in
237234
:file:`config.inc.php`, copy that block or needed parts (you don't have to
238235
define all settings, just those you need to change).
239236

@@ -3985,6 +3982,6 @@ reCaptcha using Turnstile
39853982
$cfg['CaptchaLoginPublicKey'] = '0xxxxxxxxxxxxxxxxxxxxxx';
39863983
$cfg['CaptchaLoginPrivateKey'] = '0x4AAAAAAAA_xx_xxxxxxxxxxxxxxxxxxxx';
39873984
$cfg['CaptchaSiteVerifyURL'] = 'https://challenges.cloudflare.com/turnstile/v0/siteverify';
3988-
3989-
.. seealso:: `Cloudflare Dashboard <https://dash.cloudflare.com/>`
3990-
.. seealso:: `Turnstile Developer Guide <https://developers.cloudflare.com/turnstile/get-started/>`
3985+
3986+
.. seealso:: `Cloudflare Dashboard <https://dash.cloudflare.com/>`
3987+
.. seealso:: `Turnstile Developer Guide <https://developers.cloudflare.com/turnstile/get-started/>`

0 commit comments

Comments
 (0)