From 717e8197ffd378d644d868a1b5e9f96c5385b41e Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 2 Sep 2016 09:29:06 -0600
Subject: Label and help text change to icon and username override (#3932)

* Update custom_integrations_settings.jsx

* Update en.json

* Update custom_integrations_settings.jsx
---
 .../admin_console/custom_integrations_settings.jsx           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/webapp/components/admin_console/custom_integrations_settings.jsx b/webapp/components/admin_console/custom_integrations_settings.jsx
index 1371e5aac..a40076925 100644
--- a/webapp/components/admin_console/custom_integrations_settings.jsx
+++ b/webapp/components/admin_console/custom_integrations_settings.jsx
@@ -145,13 +145,13 @@ export default class WebhookSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.overrideTitle'
-                            defaultMessage='Enable webhooks and slash commands to override usernames:'
+                            defaultMessage='Enable integrations to override usernames:'
                         />
                     }
                     helpText={
-                        <FormattedMessage
+                        <FormattedHTMLMessage
                             id='admin.service.overrideDescription'
-                            defaultMessage='When true, webhooks and slash commands will be allowed to change the username they are posting as. Note, combined with allowing icon overriding, this could open users up to phishing attacks.'
+                            defaultMessage='When true, webhooks, slash commands and other integrations, such as <a href="https://docs.mattermost.com/integrations/zapier.html" target="_blank">Zapier</a>, will be allowed to change the username they are posting as. Note: Combined with allowing integrations to override profile picture icons, users may be able to perform phishing attacks by attempting to impersonate other users.'
                         />
                     }
                     value={this.state.enablePostUsernameOverride}
@@ -162,13 +162,13 @@ export default class WebhookSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.iconTitle'
-                            defaultMessage='Enable webhooks and slash commands to override profile picture icons:'
+                            defaultMessage='Enable integrations to override profile picture icons:'
                         />
                     }
                     helpText={
-                        <FormattedMessage
+                        <FormattedHTMLMessage
                             id='admin.service.iconDescription'
-                            defaultMessage='When true, webhooks and slash commands will be allowed to change the icon they post with. Note, combined with allowing username overriding, this could open users up to phishing attacks.'
+                            defaultMessage='When true, webhooks, slash commands and other integrations, such as <a href="https://docs.mattermost.com/integrations/zapier.html" target="_blank">Zapier</a>, will be allowed to change the profile picture they post with. Note: Combined with allowing integrations to override usernames, users may be able to perform phishing attacks by attempting to impersonate other users.'
                         />
                     }
                     value={this.state.enablePostIconOverride}
-- 
cgit v1.2.3-1-g7c22