diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-02-16 23:38:41 +0100 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-02-16 23:38:41 +0100 |
| commit | 27ffb3e11e089645f9e374808063313ed7a08722 (patch) | |
| tree | 5be9c41488615bd5ab9a857ed258253ea283f501 | |
| parent | e57cf65d092c1a6458c3a468b017018905018eeb (diff) | |
| parent | 4005b0809260fbd36cb8652c7d726a5ee417c6f6 (diff) | |
| download | rpg-27ffb3e11e089645f9e374808063313ed7a08722.tar.gz rpg-27ffb3e11e089645f9e374808063313ed7a08722.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into authpluginconfig
| -rw-r--r-- | lib/plugins/authldap/lang/en/settings.php | 4 | ||||
| -rw-r--r-- | lib/plugins/config/lang/en/intro.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/plugins/authldap/lang/en/settings.php b/lib/plugins/authldap/lang/en/settings.php index f20b7d2a3..bca666e9f 100644 --- a/lib/plugins/authldap/lang/en/settings.php +++ b/lib/plugins/authldap/lang/en/settings.php @@ -3,8 +3,8 @@ $lang['server'] = 'Your LDAP server. Either hostname (<code>localhost</code $lang['port'] = 'LDAP server port if no full URL was given above'; $lang['usertree'] = 'Where to finde the user accounts. Eg. <code>ou=People, dc=server, dc=tld</code>'; $lang['grouptree'] = 'Where to find the user groups. Eg. <code>ou=Group, dc=server, dc=tld</code>'; -$lang['userfilter'] = 'LDAP filter to search for user accounts. Eg. <code>(&(uid=%{user})(objectClass=posixAccount))</code>'; -$lang['groupfilter'] = 'LDAP filter to search for groups. Eg. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>'; +$lang['userfilter'] = 'LDAP filter to search for user accounts. Eg. <code>(&(uid=%{user})(objectClass=posixAccount))</code>'; +$lang['groupfilter'] = 'LDAP filter to search for groups. Eg. <code>(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))</code>'; $lang['version'] = 'The protocol version to use. You may need to set this to <code>3</code>'; $lang['starttls'] = 'Use TLS connections?'; $lang['referrals'] = 'Shall referrals be followed?'; diff --git a/lib/plugins/config/lang/en/intro.txt b/lib/plugins/config/lang/en/intro.txt index c83a80205..7cf46cee3 100644 --- a/lib/plugins/config/lang/en/intro.txt +++ b/lib/plugins/config/lang/en/intro.txt @@ -4,6 +4,6 @@ Use this page to control the settings of your DokuWiki installation. For help o Settings shown with a light red background are protected and can not be altered with this plugin. Settings shown with a blue background are the default values and settings shown with a white background have been set locally for this particular installation. Both blue and white settings can be altered. -Remember to press the **SAVE** button before leaving this page otherwise your changes will be lost. +Remember to press the **Save** button before leaving this page otherwise your changes will be lost. |