summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-24 08:59:28 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-24 08:59:28 -0500
commitd4354dbb2f766e2fe1d2ef8cad3bca4fc907ce6d (patch)
tree77b51ba4484d52dddb9bc218b5af0ef0af96dc7c /web
parent4020c37b53c1a1035cec1124a91235bd3e481081 (diff)
parent924fc2a6e9d5bd671a9965e9f1084e8f4c79db06 (diff)
downloadchat-d4354dbb2f766e2fe1d2ef8cad3bca4fc907ce6d.tar.gz
chat-d4354dbb2f766e2fe1d2ef8cad3bca4fc907ce6d.tar.bz2
chat-d4354dbb2f766e2fe1d2ef8cad3bca4fc907ce6d.zip
Merge pull request #1482 from esethna/patch-20
Update user_settings_general.jsx
Diffstat (limited to 'web')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index b3ec7ddd7..962efd7a2 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -438,12 +438,12 @@ export default class UserSettingsGeneralTab extends React.Component {
if (this.props.activeSection === 'email') {
const emailEnabled = global.window.mm_config.SendEmailNotifications === 'true';
const emailVerificationEnabled = global.window.mm_config.RequireEmailVerification === 'true';
- let helpText = 'Email is used for notifications, and requires verification if changed.';
+ let helpText = 'Email is used for sign-in, notifications, and password reset. Email requires verification if changed.';
if (!emailEnabled) {
helpText = <div className='setting-list__hint text-danger'>{'Email has been disabled by your system administrator. No notification emails will be sent until it is enabled.'}</div>;
} else if (!emailVerificationEnabled) {
- helpText = 'Email is used for notifications.';
+ helpText = 'Email is used for sign-in, notifications, and password reset.';
} else if (this.state.emailChangeInProgress) {
const newEmail = UserStore.getCurrentUser().email;
if (newEmail) {