From 26ec8ffc3edc01fde2189f3465112c88fee5435b Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Fri, 18 Aug 2017 15:02:06 -0400
Subject: Rename SAML in the System Console to SAML 2.0 + access token string
 fixes (#7182)

* Update en.json

* Update en.json

* Update admin_sidebar.jsx

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

(limited to 'webapp/components/admin_console/saml_settings.jsx')

diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index 2358660da..98c02e571 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -144,7 +144,7 @@ export default class SamlSettings extends AdminSettings {
         return (
             <FormattedMessage
                 id='admin.authentication.saml'
-                defaultMessage='SAML'
+                defaultMessage='SAML 2.0'
             />
         );
     }
@@ -318,13 +318,13 @@ export default class SamlSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.saml.enableTitle'
-                            defaultMessage='Enable Login With SAML:'
+                            defaultMessage='Enable Login With SAML 2.0:'
                         />
                     }
                     helpText={
                         <FormattedHTMLMessage
                             id='admin.saml.enableDescription'
-                            defaultMessage='When true, Mattermost allows login using SAML. Please see <a href="http://docs.mattermost.com/deployment/sso-saml.html" target="_blank">documentation</a> to learn more about configuring SAML for Mattermost.'
+                            defaultMessage='When true, Mattermost allows login using SAML 2.0. Please see <a href="http://docs.mattermost.com/deployment/sso-saml.html" target="_blank">documentation</a> to learn more about configuring SAML for Mattermost.'
                         />
                     }
                     value={this.state.enable}
-- 
cgit v1.2.3-1-g7c22

