diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-04-13 14:38:01 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-13 14:38:01 -0400 |
| commit | 7b504b6a9c39819814f640823403c6d3835682de (patch) | |
| tree | b7ff8620cd3cd8f89ae5afe1fe6c1680d771d512 /webapp | |
| parent | 2628f45740d901961e4633d862f9d1c155930504 (diff) | |
| download | chat-7b504b6a9c39819814f640823403c6d3835682de.tar.gz chat-7b504b6a9c39819814f640823403c6d3835682de.tar.bz2 chat-7b504b6a9c39819814f640823403c6d3835682de.zip | |
Updating LDAP help text (#2704)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/ldap_settings.jsx | 4 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index 85651c60d..e5abec95f 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/webapp/components/admin_console/ldap_settings.jsx @@ -373,7 +373,7 @@ class LdapSettings extends React.Component { <p className='help-text'> <FormattedMessage id='admin.ldap.userFilterDisc' - defaultMessage='LDAP Filter to use when searching for user objects.' + 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))).' /> </p> </div> @@ -537,7 +537,7 @@ class LdapSettings extends React.Component { <p className='help-text'> <FormattedMessage id='admin.ldap.skipCertificateVerificationDesc' - defaultMessage='Skips the certificate verificaiton step for TLS or STARTTLS connections. Not recommented for production enviroments where TLS is required. For testing only.' + defaultMessage='Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.' /> </p> } diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 457034769..75d516f90 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -277,12 +277,12 @@ "admin.ldap.serverDesc": "The domain or IP address of LDAP server.", "admin.ldap.serverEx": "Ex \"10.0.0.23\"", "admin.ldap.serverTitle": "LDAP Server:", - "admin.ldap.skipCertificateVerification": "Skip Vertificate Verification", - "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verificaiton step for TLS or STARTTLS connections. Not recommented for production enviroments where TLS is required. For testing only.", + "admin.ldap.skipCertificateVerification": "Skip Certificate Verification", + "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.", "admin.ldap.title": "LDAP Settings", "admin.ldap.true": "true", "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.", - "admin.ldap.userFilterDisc": "LDAP Filter to use when searching for user objects.", + "admin.ldap.userFilterDisc": "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))).", "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"", "admin.ldap.userFilterTitle": "User Filter:", "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"", |