Merge pull request #2389 from mattermost/2.1-ldap-help-text

Update BaseDN and Email LDAP settings help text + localization

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);