From 7b504b6a9c39819814f640823403c6d3835682de Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 13 Apr 2016 14:38:01 -0400 Subject: Updating LDAP help text (#2704) --- webapp/components/admin_console/ldap_settings.jsx | 4 ++-- 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 {

@@ -537,7 +537,7 @@ class LdapSettings extends React.Component {

} 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\"", -- cgit v1.2.3-1-g7c22