Merge pull request #1794 from esethna/patch-48

Docs and help text changes
Этот коммит содержится в:
Corey Hulen
2016-01-03 21:59:50 -06:00
родитель f7c21cb834 274d16870c
Коммит 686ef924b6
4 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@@ -2,6 +2,7 @@
- Getting Started
- [Sign-in](Sign-in.md)
- [Creating Teams](Creating-Teams.md)
- User Interface
- Main Menu
@@ -17,6 +18,7 @@
- [Channel Types](Channels.md#channel-types)
- [Managing Channels](Channels.md#managing-channels)
- [Channel Settings](Channels.md#channel-settings)
- [Notifications](Notifications.md)
- System Console
- Team

Просмотреть файл

@@ -38,7 +38,7 @@ Team Administrators would set this to **No** when they:
#### Invite Code
When allowing anyone to sign-up from the login page, the **Invite Code** is used as part of the sign-up process. Clicking **Re-Generate** will invalidate the previous invitations and invitation URLs.
The **Invite Code** is used as part of the URL in the team invitation link retrieved from the **Main Menu** > **Get Team Invite Link**. Click **Re-Generate** and then **Save** to generate a new team invitation link and invalidate the previous link.
### Import

Просмотреть файл

@@ -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>

Просмотреть файл

@@ -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>
);