Skip to content

Commit 761a129

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 1fb6f71 + 01c3c0e commit 761a129

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

doc/config.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Basic settings
111111

112112
.. note::
113113

114-
When logging to a file, make sure it's permissions are correctly set
114+
When logging to a file, make sure its permissions are correctly set
115115
for a web server user, the setup should closely match instructions
116116
described in :config:option:`$cfg['TempDir']`:
117117

@@ -444,7 +444,7 @@ Server connection settings
444444
there is a chance your SSL connection will fail due to validation.
445445
Setting this to ``false`` will disable the validation check.
446446

447-
Since PHP 5.6.0 it also verifies whether server name matches CN of it's
447+
Since PHP 5.6.0 it also verifies whether server name matches CN of its
448448
certificate. There is currently no way to disable just this check without
449449
disabling complete SSL verification.
450450

doc/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ through DatabaseInterface::escapeSring().
7373
Brute force attack
7474
++++++++++++++++++
7575

76-
phpMyAdmin on it's own does not rate limit authentication attempts in any way.
76+
phpMyAdmin on its own does not rate limit authentication attempts in any way.
7777
This is caused by need to work in stateless environment, where there is no way
7878
to protect against such kind of things.
7979

0 commit comments

Comments
 (0)