diff options
| author | Corey Hulen <corey@hulen.com> | 2016-03-08 12:11:17 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-03-08 12:11:17 -0800 |
| commit | 8e28f873e89bb0ad2eb85e8d12efbcb97ae325a9 (patch) | |
| tree | 4dcad696566a7edc41f5fbaf01a00b8abdec96bb /web/static/i18n/en.json | |
| parent | a1ec47eb780f6d244d1d3d50e6078f907e8b7fd7 (diff) | |
| parent | 3478368065dee24a343dc1ce3d5c6e9c90325064 (diff) | |
| download | chat-8e28f873e89bb0ad2eb85e8d12efbcb97ae325a9.tar.gz chat-8e28f873e89bb0ad2eb85e8d12efbcb97ae325a9.tar.bz2 chat-8e28f873e89bb0ad2eb85e8d12efbcb97ae325a9.zip | |
Merge pull request #2389 from mattermost/2.1-ldap-help-text
Update BaseDN and Email LDAP settings help text + localization
Diffstat (limited to 'web/static/i18n/en.json')
| -rw-r--r-- | web/static/i18n/en.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 4c6fa0eae..58a19ea1b 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -152,14 +152,14 @@ "admin.ldap.bannerDesc": "If a user attribute changes on the LDAP server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from an LDAP server. Synchronization with LDAP servers is planned in a future release.", "admin.ldap.bannerHeading": "Note:", "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.", - "admin.ldap.baseEx": "Ex \"dc=mydomain,dc=com\"", + "admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"", "admin.ldap.baseTitle": "BaseDN:", "admin.ldap.bindPwdDesc": "Password of the user given in \"Bind Username\".", "admin.ldap.bindPwdTitle": "Bind Password:", "admin.ldap.bindUserDesc": "The username used to perform the LDAP search. This should typically be an account created specifically for use with Mattermost. It should have access limited to read the portion of the LDAP tree specified in the BaseDN field.", "admin.ldap.bindUserTitle": "Bind Username:", "admin.ldap.emailAttrDesc": "The attribute in the LDAP server that will be used to populate the email addresses of users in Mattermost.", - "admin.ldap.emailAttrEx": "Ex \"mail\"", + "admin.ldap.emailAttrEx": "Ex \"mail\" or \"userPrincipalName\"", "admin.ldap.emailAttrTitle": "Email Attribute:", "admin.ldap.enableDesc": "When true, Mattermost allows login using LDAP", "admin.ldap.enableTitle": "Enable Login With LDAP:", |