From 7b504b6a9c39819814f640823403c6d3835682de Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 13 Apr 2016 14:38:01 -0400
Subject: Updating LDAP help text (#2704)

---
 webapp/components/admin_console/ldap_settings.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webapp/components/admin_console')

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