summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2015-11-20 13:46:45 -0700
committerEric Sethna <eric@spinpunch.com>2015-11-20 13:46:45 -0700
commit924fc2a6e9d5bd671a9965e9f1084e8f4c79db06 (patch)
tree0b0871033a6a78c1c29d39eb6c79403c7d10561b /web/react/components
parentfc346bcb05626ed1cdc925ed03b7bcc748f69184 (diff)
downloadchat-924fc2a6e9d5bd671a9965e9f1084e8f4c79db06.tar.gz
chat-924fc2a6e9d5bd671a9965e9f1084e8f4c79db06.tar.bz2
chat-924fc2a6e9d5bd671a9965e9f1084e8f4c79db06.zip
Update user_settings_general.jsx
Clarify email help text
Diffstat (limited to 'web/react/components')
-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) {