From ecb82dbd1286f0cc722c082eada862b35fe92105 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Wed, 19 Jul 2017 16:54:50 -0400
Subject: PLT-6958: Update Email Auth System Console settings texts (#6948)

* Update email_authentication_settings.jsx

* Update en.json
---
 webapp/components/admin_console/email_authentication_settings.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webapp/components')

diff --git a/webapp/components/admin_console/email_authentication_settings.jsx b/webapp/components/admin_console/email_authentication_settings.jsx
index 6c25c15c5..9cc3ab3d7 100644
--- a/webapp/components/admin_console/email_authentication_settings.jsx
+++ b/webapp/components/admin_console/email_authentication_settings.jsx
@@ -37,7 +37,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
         return (
             <FormattedMessage
                 id='admin.authentication.email'
-                defaultMessage='Email'
+                defaultMessage='Email Authentication'
             />
         );
     }
@@ -56,7 +56,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.email.allowSignupDescription'
-                            defaultMessage='When true, Mattermost allows team creation and account signup using email and password.  This value should be false only when you want to limit signup to a single sign-on service like OAuth or AD/LDAP.'
+                            defaultMessage='When true, Mattermost allows account creation using email and password. This value should be false only when you want to limit sign up to a single sign-on service like AD/LDAP, SAML or GitLab.'
                         />
                     }
                     value={this.state.enableSignUpWithEmail}
@@ -90,7 +90,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.email.allowUsernameSignInDescription'
-                            defaultMessage='When true, Mattermost allows users to sign in using their username and password.  This setting is typically only used when email verification is disabled.'
+                            defaultMessage='When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.'
                         />
                     }
                     value={this.state.enableSignInWithUsername}
-- 
cgit v1.2.3-1-g7c22