Skip to content

Commit e844625

Browse files
committed
Incorporate William's feedback and suggestions from phpmyadmin#19881
Signed-off-by: Isaac Bennetch <[email protected]>
1 parent 63516aa commit e844625

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

docs/config.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Server connection settings
296296
:type: string
297297
:default: ``''``
298298

299-
The path to the socket to use. Leave blank for the PHP default socket. To determine
299+
The path to the socket to use. Leave blank for the system default socket used by PHP. To determine
300300
the correct socket, check your MySQL configuration or, using the
301301
:command:`mysql` command–line client, issue the ``status`` command. Among the
302302
resulting information displayed will be the socket used.
@@ -737,7 +737,7 @@ Server connection settings
737737

738738
Sets a custom, descriptive label for the server which will be shown
739739
in multiple locations instead of the host name.
740-
With auth_type cookie,
740+
When ``$cfg['Servers'][$i]['auth_type'] = 'cookie';``,
741741
this string will be displayed instead of the hostname in the
742742
pull-down menu on the main page.
743743
For HTTP
@@ -797,8 +797,10 @@ Server connection settings
797797
:type: string or false
798798
:default: ``''``
799799

800-
You can describe, in a special 'relation' table,
801-
which column is a key in another table (a foreign key). phpMyAdmin
800+
When the database table type does not natively support relations, this table
801+
can be used by phpMyAdmin to create a similar effect. Internal relations are used
802+
only by phpMyAdmin. For more information, refer to the :ref:`relations` user guide.
803+
phpMyAdmin
802804
currently uses this to:
803805

804806
* make clickable, when you browse the master table, the data values that
@@ -1474,7 +1476,7 @@ Server connection settings
14741476

14751477
The performance penalty for using ``INFORMATION_SCHEMA`` has largely been
14761478
resolved in most database servers, so for most users keeping this set to
1477-
false is recommended.
1479+
``false`` is recommended.
14781480

14791481
.. note::
14801482

docs/setup.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ Config authentication mode
12081208
loading the phpMyAdmin site. This is by design but could allow any
12091209
user to access your installation. Use of some restriction method is
12101210
suggested, perhaps a :term:`.htaccess` file with the HTTP-AUTH directive or disallowing
1211-
incoming HTTP requests at ones router or firewall.
1211+
incoming HTTP requests at one's router or firewall.
12121212

12131213
.. _securing:
12141214

@@ -1247,7 +1247,7 @@ are always ways to make your installation more secure:
12471247
or :config:option:`$cfg['Servers'][$i]['AllowRoot']` to deny root user access.
12481248
* Enable :ref:`2fa` for your account.
12491249
* Consider hiding connection errors from the login page by setting
1250-
:config:option:`$cfg['Servers'][$i]['hide_connection_errors']` to true.
1250+
:config:option:`$cfg['Servers'][$i]['hide_connection_errors']` to ``true``.
12511251
* Consider hiding phpMyAdmin behind an authentication proxy, so that
12521252
users need to authenticate prior to providing MySQL credentials
12531253
to phpMyAdmin. You can achieve this by configuring your web server to request

0 commit comments

Comments
 (0)