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/react | |
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/react')
-rw-r--r-- | web/react/components/admin_console/ldap_settings.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/admin_console/ldap_settings.jsx b/web/react/components/admin_console/ldap_settings.jsx index 535c264dd..4cd19c886 100644 --- a/web/react/components/admin_console/ldap_settings.jsx +++ b/web/react/components/admin_console/ldap_settings.jsx @@ -20,7 +20,7 @@ var holders = defineMessages({ }, baseEx: { id: 'admin.ldap.baseEx', - defaultMessage: 'Ex "dc=mydomain,dc=com"' + defaultMessage: 'Ex "ou=Unit Name,dc=corp,dc=example,dc=com"' }, firstnameAttrEx: { id: 'admin.ldap.firstnameAttrEx', @@ -32,7 +32,7 @@ var holders = defineMessages({ }, emailAttrEx: { id: 'admin.ldap.emailAttrEx', - defaultMessage: 'Ex "mail"' + defaultMessage: 'Ex "mail" or "userPrincipalName"' }, usernameAttrEx: { id: 'admin.ldap.usernameAttrEx', @@ -581,4 +581,4 @@ LdapSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(LdapSettings);
\ No newline at end of file +export default injectIntl(LdapSettings); |