summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorlfbrock <lfbrock@users.noreply.github.com>2016-07-06 13:35:35 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-06 13:35:35 -0400
commitfd880ad047d7bb199115c2000a85c0e0ec3aedfa (patch)
treed0d5f37f66f8a1471be25141a1b7f76b8d42b390 /webapp/components/admin_console
parent292705acdf6a86df4b2089e7f9dafb2e05c5f836 (diff)
downloadchat-fd880ad047d7bb199115c2000a85c0e0ec3aedfa.tar.gz
chat-fd880ad047d7bb199115c2000a85c0e0ec3aedfa.tar.bz2
chat-fd880ad047d7bb199115c2000a85c0e0ec3aedfa.zip
Update ldap_settings.jsx (#3508)
* Update ldap_settings.jsx Changed help text for consistency * Update en.json
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/ldap_settings.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index 5bb6bb20a..dd7ceb07e 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -213,7 +213,7 @@ export default class LdapSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.ldap.userFilterDisc'
- defaultMessage='Optionally enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).'
+ defaultMessage='(Optional) Enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).'
/>
}
value={this.state.userFilter}