summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorlfbrock <lfbrock@users.noreply.github.com>2016-09-30 06:15:07 -0700
committerJoram Wilander <jwawilander@gmail.com>2016-09-30 09:15:07 -0400
commita2516743f3f3be6be73b612ff4b0374011a80e87 (patch)
tree1a0ea939b3f791ad77917c0f9401755e7c70a228 /webapp/components/admin_console
parent13bd14d626f7bb2a347d3acdf456f945f1a6258e (diff)
downloadchat-a2516743f3f3be6be73b612ff4b0374011a80e87.tar.gz
chat-a2516743f3f3be6be73b612ff4b0374011a80e87.tar.bz2
chat-a2516743f3f3be6be73b612ff4b0374011a80e87.zip
Update LDAP help text (#4124)
* Update ldap_settings.jsx * Update en.json
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/ldap_settings.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index ce0088bb7..2664a6df0 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -254,7 +254,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.firstnameAttrDesc'
- defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost.'
+ defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.'
/>
}
value={this.state.firstNameAttribute}
@@ -273,7 +273,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.lastnameAttrDesc'
- defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost.'
+ defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.'
/>
}
value={this.state.lastNameAttribute}
@@ -292,7 +292,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.nicknameAttrDesc'
- defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.'
+ defaultMessage='(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost. When set, users will not be able to edit their nickname, since it is synchronized with the LDAP server. When left blank, users can set their own nickname in Account Settings.'
/>
}
value={this.state.nicknameAttribute}