summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-16 08:52:55 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-16 08:52:55 -0500
commit675e4e714971af7bc0525ad9dfe2eef3f7ed7562 (patch)
tree5d102d56a209b3c7aefaa4033b3b934241b3dff2 /web
parent5872a1c094d5cbba49d32b9714d11f0c6b46f552 (diff)
parent046055ff99d0d3d39e58c28ddbb1713913ee2519 (diff)
downloadchat-675e4e714971af7bc0525ad9dfe2eef3f7ed7562.tar.gz
chat-675e4e714971af7bc0525ad9dfe2eef3f7ed7562.tar.bz2
chat-675e4e714971af7bc0525ad9dfe2eef3f7ed7562.zip
Merge pull request #1428 from mattermost/PLT-951
PLT-951 updating help text
Diffstat (limited to 'web')
-rw-r--r--web/react/components/team_general_tab.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx
index 587ef5ec2..a50859489 100644
--- a/web/react/components/team_general_tab.jsx
+++ b/web/react/components/team_general_tab.jsx
@@ -393,7 +393,7 @@ export default class GeneralTab extends React.Component {
</div>
</div>
</div>
- <div className='setting-list__hint'>{'When allowing open invites this code is used as part of the signup process. Changing this code will invalidate the previous open signup link.'}</div>
+ <div className='setting-list__hint'>{'Your Invite Code is used in the URL sent to people to join your team. Regenerating your Invite Code will invalidate the URLs in previous invitations, unless "Allow anyone to sign-up from login page" is enabled.'}</div>
</div>
);
@@ -452,6 +452,7 @@ export default class GeneralTab extends React.Component {
server_error={serverError}
client_error={clientError}
updateSection={this.onUpdateNameSection}
+ extraInfo='Set the name of the team as it appears on your sign-in screen and at the top of the left-hand sidebar.'
/>
);
} else {