Merge pull request #1794 from esethna/patch-48

Docs and help text changes

4 files changed, 5 insertions, 3 deletions

diff --git a/doc/help/README.md b/doc/help/README.md
index 23c8b192d..fc11aebaa 100644
--- a/doc/help/README.md
+++ b/doc/help/README.md
@@ -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
diff --git a/doc/help/Team-Settings.md b/doc/help/Team-Settings.md
index fead9f4ca..99960a575 100644
--- a/doc/help/Team-Settings.md
+++ b/doc/help/Team-Settings.md
@@ -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
 
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>
             );