Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-02-01 02:50:30 +01:00
commit 97a41c8158

View File

@ -1359,7 +1359,7 @@ Server connection settings
An associative array of session cookie parameters of other authentication system.
It is not needed if the other system doesn't use session_set_cookie_params().
Keys should include 'lifetime', 'path', 'domain', 'secure' or 'httponly'.
Valid values are mentioned in `session_get_cookie_params <https://php.net/manual/en/
Valid values are mentioned in `session_get_cookie_params <https://secure.php.net/manual/en/
function.session-get-cookie-params.php>`_, they should be set to same values as the
other application uses. Takes effect only if
:config:option:`$cfg['Servers'][$i]['SignonScript']` is not configured.