From 0157e613bdadaea6b0e0b9db7e8e3000282f09f4 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Tue, 20 Sep 2016 00:00:07 -0400
Subject: Add a link to OAuth 2 docs in help texts (#4034)

* Update installed_oauth_apps.jsx

* Update custom_integrations_settings.jsx

* Update confirm_integration.jsx

* Update installed_oauth_apps.jsx

* Update en.json

* Change FormattedMessage to FormattedHTMLMessage

* Fix proper coding of links in en.json

* Update en.json
---
 .../integrations/components/confirm_integration.jsx      |  4 ++--
 .../integrations/components/installed_oauth_apps.jsx     | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'webapp/components/integrations')

diff --git a/webapp/components/integrations/components/confirm_integration.jsx b/webapp/components/integrations/components/confirm_integration.jsx
index b9274f2e4..de419341e 100644
--- a/webapp/components/integrations/components/confirm_integration.jsx
+++ b/webapp/components/integrations/components/confirm_integration.jsx
@@ -154,9 +154,9 @@ export default class ConfirmIntegration extends React.Component {
                 helpText = [];
                 helpText.push(
                     <p>
-                        <FormattedMessage
+                        <FormattedHTMLMessage
                             id='add_oauth_app.doneHelp'
-                            defaultMessage='Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application.'
+                            defaultMessage='Your OAuth 2.0 application has been set up. Please use the following Client ID and Client Secret when requesting authorization for your application (see <a href="https://docs.mattermost.com/developer/oauth-2-0-applications.html">documentation</a> for further details).'
                         />
                     </p>
                 );
diff --git a/webapp/components/integrations/components/installed_oauth_apps.jsx b/webapp/components/integrations/components/installed_oauth_apps.jsx
index 7a3b512dd..39ef347e2 100644
--- a/webapp/components/integrations/components/installed_oauth_apps.jsx
+++ b/webapp/components/integrations/components/installed_oauth_apps.jsx
@@ -82,7 +82,21 @@ export default class InstalledOAuthApps extends React.Component {
                 helpText={
                     <FormattedMessage
                         id='installed_oauth_apps.help'
-                        defaultMessage='OAuth 2.0 Applications are available to everyone on your server.'
+                        defaultMessage='Create OAuth 2.0 applications to securely integrate bots and third-party applications with Mattermost. Please see {link} to learn more.'
+                        values={{
+                            link: (
+                                <a
+                                    target='_blank'
+                                    rel='noopener noreferrer'
+                                    href='https://docs.mattermost.com/developer/oauth-2-0-applications.html'
+                                >
+                                    <FormattedMessage
+                                        id='installed_oauth_apps.helpLink'
+                                        defaultMessage='documentation'
+                                    />
+                                </a>
+                            )
+                        }}
                     />
                 }
                 addText={
-- 
cgit v1.2.3-1-g7c22