diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-09 11:41:09 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-09 11:41:09 -0500 |
| commit | e938b71e60eda12b779fc06fee9aaaea43eb551b (patch) | |
| tree | 7e4891be8fd19a0e01145f85da60caa6824ff96a /webapp | |
| parent | 93a526f7ed5464e18e11137f798d09c0561b16a8 (diff) | |
| download | chat-e938b71e60eda12b779fc06fee9aaaea43eb551b.tar.gz chat-e938b71e60eda12b779fc06fee9aaaea43eb551b.tar.bz2 chat-e938b71e60eda12b779fc06fee9aaaea43eb551b.zip | |
SAML help text improvement (#5003)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/saml_settings.jsx | 4 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx index 1391df0b6..ad7a82553 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -296,9 +296,9 @@ export default class SamlSettings extends AdminSettings { <SettingsGroup> <div className='banner'> <div className='banner__content'> - <FormattedMessage + <FormattedHTMLMessage id='admin.saml.bannerDesc' - defaultMessage='If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.' + defaultMessage='User attributes in SAML server, including user deactivation or removal, are updated in Mattermost during user login. Learn more at: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>' /> </div> </div> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 416b268de..41c4d680a 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -597,7 +597,7 @@ "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.", "admin.saml.assertionConsumerServiceURLEx": "E.g.: \"https://<your-mattermost-url>/login/sso/saml\"", "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:", - "admin.saml.bannerDesc": "If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.", + "admin.saml.bannerDesc": "User attributes in SAML server, including user deactivation or removal, are updated in Mattermost during user login. Learn more at: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>", "admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.", "admin.saml.emailAttrEx": "E.g.: \"Email\" or \"PrimaryEmail\"", "admin.saml.emailAttrTitle": "Email Attribute:", |