From 91008ea2a588d2962f74601480322475f3a1c7d1 Mon Sep 17 00:00:00 2001
From: lfbrock <lfbrock@users.noreply.github.com>
Date: Fri, 9 Jun 2017 17:19:27 -0400
Subject: Fix spelling of single sign-on (#6621)

* Create signup_controller.jsx

* Create email_authentication_settings.jsx

* Create en.json
---
 webapp/components/admin_console/email_authentication_settings.jsx | 2 +-
 webapp/components/signup/signup_controller.jsx                    | 2 +-
 2 files changed, 2 insertions(+), 2 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 2361a3ab8..6c25c15c5 100644
--- a/webapp/components/admin_console/email_authentication_settings.jsx
+++ b/webapp/components/admin_console/email_authentication_settings.jsx
@@ -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 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.'
                         />
                     }
                     value={this.state.enableSignUpWithEmail}
diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx
index e9024a389..af35c5d8d 100644
--- a/webapp/components/signup/signup_controller.jsx
+++ b/webapp/components/signup/signup_controller.jsx
@@ -169,7 +169,7 @@ export default class SignupController extends React.Component {
                         <span>
                             <FormattedMessage
                                 id='signup.gitlab'
-                                defaultMessage='GitLab Single-Sign-On'
+                                defaultMessage='GitLab Single Sign-On'
                             />
                         </span>
                     </span>
-- 
cgit v1.2.3-1-g7c22