diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-03 21:59:50 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-03 21:59:50 -0600 |
| commit | 686ef924b6f687ecc8b41673fc33f59db6b81657 (patch) | |
| tree | 7ff12f9a9ad9285bd99a780d493e2c1eca062ebc /web/react | |
| parent | f7c21cb83415bea0c92826bc46d89a8947e10397 (diff) | |
| parent | 274d16870c485fbb40782a83ac309977f9d32b44 (diff) | |
| download | chat-686ef924b6f687ecc8b41673fc33f59db6b81657.tar.gz chat-686ef924b6f687ecc8b41673fc33f59db6b81657.tar.bz2 chat-686ef924b6f687ecc8b41673fc33f59db6b81657.zip | |
Merge pull request #1794 from esethna/patch-48
Docs and help text changes
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/admin_console/team_settings.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/team_general_tab.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx index 7991b9a01..9d958ce91 100644 --- a/web/react/components/admin_console/team_settings.jsx +++ b/web/react/components/admin_console/team_settings.jsx @@ -206,7 +206,7 @@ export default class TeamSettings extends React.Component { defaultValue={this.props.config.TeamSettings.RestrictCreationToDomains} onChange={this.handleChange} /> - <p className='help-text'>{'Teams can only be created from a specific domain (e.g. "mattermost.org") or list of comma-separated domains (e.g. "corp.mattermost.com, mattermost.org").'}</p> + <p className='help-text'>{'Teams and user accounts can only be created from a specific domain (e.g. "mattermost.org") or list of comma-separated domains (e.g. "corp.mattermost.com, mattermost.org").'}</p> </div> </div> diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx index dc615f2e8..cc06a940e 100644 --- a/web/react/components/team_general_tab.jsx +++ b/web/react/components/team_general_tab.jsx @@ -424,7 +424,7 @@ export default class GeneralTab extends React.Component { </div> </div> </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 className='setting-list__hint'>{'The Invite Code is used as part of the URL in the team invitation link created by **Get Team Invite Link** in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.'}</div> </div> ); |