diff --git a/Documentation.html b/Documentation.html
index d46c8a2ad..29b489e81 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -433,7 +433,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
'HTTP' authentication mode
- Uses HTTP Basic authentication
- method and allows you to login as any valid MySQL user.
+ method and allows you to log in as any valid MySQL user.
- Is supported with most PHP configurations. For
IIS
(ISAPI)
@@ -458,9 +458,9 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
IIS).
- Obviously, the user must enable cookies in the browser, but this is
now a requirement for all authentication modes.
- - With this mode, the user can truly logout of phpMyAdmin and login back
+
- With this mode, the user can truly log out of phpMyAdmin and log in back
with the same username.
- - If you want to login to arbitrary server see
+
- If you want to log in to arbitrary server see
$cfg['AllowArbitraryServer'] directive.
- As mentioned in the requirements section, having
@@ -661,7 +661,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
2.2.3 allows you to log in as any valid MySQL user with the
help of cookies. Username and password are stored in
cookies during the session and password is deleted when it
- ends. This can also allow you to login in arbitrary server if
+ ends. This can also allow you to log in in arbitrary server if
$cfg['AllowArbitraryServer'] enabled.
- 'HTTP' authentication (was called 'advanced' in older versions)
@@ -669,7 +669,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
allows you to log in as any valid MySQL user via HTTP-Auth.
- 'signon' authentication mode
($auth_type = 'signon')
- as introduced in 2.10.0 allows you to login from prepared PHP
+ as introduced in 2.10.0 allows you to log in from prepared PHP
session data. This is useful for implementing single signon
from another application. Sample way how to seed session is in
signon example:
scripts/signon.php
. You need to
@@ -696,7 +696,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
id="cfg_Servers_nopassword">$cfg['Servers'][$i]['nopassword'] boolean
-
- Allow attempt to login without password when login with password
+ Allow attempt to log in without password when a login with password
fails. This can be used together with http authentication, when
authentication is done some other way and phpMyAdmin gets user name
from auth and uses empty password for connecting to MySQL. Password
@@ -1024,7 +1024,7 @@ ALTER TABLE `pma_column_comments`
- Name of session which will be used for signon authentication method.
- $cfg['Servers'][$i]['SignonURL'] string
- - URL where user will be redirected for login for signon authentication method. Should be absolute including protocol.
+
- URL where user will be redirected to log in for signon authentication method. Should be absolute including protocol.
- $cfg['Servers'][$i]['LogoutURL'] string
- URL where user will be redirected after logout (doesn't affect config authentication method). Should be absolute including protocol.
@@ -1106,7 +1106,7 @@ ALTER TABLE `pma_column_comments`
- $cfg['LoginCookieDeleteAll'] boolean
- If enabled (default), logout deletes cookies for all servers,
otherwise only for current one. Setting this to false makes it easy to
- forget to logout from other server, when you are using more of
+ forget to log out from other server, when you are using more of
them.
- $cfg['UseDbSearch'] boolean
@@ -1123,7 +1123,7 @@ ALTER TABLE `pma_column_comments`
comments. Defaults to TRUE.
-
$cfg['AllowArbitraryServer'] boolean
- - If enabled allows you to login to arbitrary servers using cookie auth.
+
- If enabled allows you to log in to arbitrary servers using cookie auth.
NOTE: Please use this carefully, as this may allow users access to
@@ -1856,7 +1856,7 @@ ALTER TABLE `pma_column_comments`
- $cfg['SQLValidator']['username'] string
$cfg['SQLValidator']['password'] string
- - The SOAP service allows you to login with anonymous
+
- The SOAP service allows you to log in with anonymous
and any password, so we use those by default. Instead, if
you have an account with them, you can put your login details
here, and it will be used in place of the anonymous login.
@@ -2460,7 +2460,7 @@ ALTER TABLE `pma_column_comments`
+ and I cannot log in using cookie auth.
In php.ini, set mysql.max_links higher than 1.
@@ -2738,7 +2738,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
+ cookie authentication, I'm asked to log in again. What's wrong?
Check the value you set for the
$cfg['PmaAbsoluteUri']
@@ -2836,7 +2836,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
+ who logged out can not log in again in with the same nick.
This is related to the authentication mechanism (protocol) used by
phpMyAdmin. To bypass this problem: just close all the opened
@@ -3052,7 +3052,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
and/or
$cfg['Servers'][$i]['controlpass']
are wrong.
- - The username/password you specify in the login-dialog are invalid.
+ - The username/password you specify in the login dialog are invalid.
- You have already setup a security mechanism for the
phpMyAdmin-directory, eg. a .htaccess file. This would interfere with
phpMyAdmin's authentication, so remove it.
@@ -3227,8 +3227,8 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
+ I cannot manage two servers: I log in to the first one, then the other one,
+ but if I switch back to the first, I have to log in on each operation.
This is a bug in Internet Explorer, other browsers do not behave this way.