summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2016-09-06 17:13:54 -0600
committerenahum <nahumhbl@gmail.com>2016-09-06 20:13:54 -0300
commit0e9c9b254f9df48a58145aaac4176352413d5551 (patch)
treeef10ce792c58b173aba02aa1eb901f2fc57af89a /webapp/components/admin_console
parent51501f920c092791c7d83ac7067874547a37c96a (diff)
downloadchat-0e9c9b254f9df48a58145aaac4176352413d5551.tar.gz
chat-0e9c9b254f9df48a58145aaac4176352413d5551.tar.bz2
chat-0e9c9b254f9df48a58145aaac4176352413d5551.zip
SiteURL help text update (#3977)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/configuration_settings.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx
index b41aa4397..db976e041 100644
--- a/webapp/components/admin_console/configuration_settings.jsx
+++ b/webapp/components/admin_console/configuration_settings.jsx
@@ -6,7 +6,7 @@ import React from 'react';
import * as Utils from 'utils/utils.jsx';
import AdminSettings from './admin_settings.jsx';
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
import SettingsGroup from './settings_group.jsx';
import TextSetting from './text_setting.jsx';
import ReloadConfigButton from './reload_config.jsx';
@@ -67,9 +67,9 @@ export default class ConfigurationSettings extends AdminSettings {
}
placeholder={Utils.localizeMessage('admin.service.siteURLExample', 'Ex "https://mattermost.example.com:1234"')}
helpText={
- <FormattedMessage
+ <FormattedHTMLMessage
id='admin.service.siteURLDescription'
- defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.'
+ defaultMessage='The URL, including port number and protocol, that users will use to access Mattermost. This field can be left blank unless you are configuring email batching in <b>Notifications > Email</b>. When blank, the URL is automatically configured based on incoming traffic.'
/>
}
value={this.state.siteURL}