From e30665eae97d5be6cb3ca285fa94d01d0e24c90a Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Wed, 30 Dec 2015 10:59:03 -0700 Subject: Update Team-Settings.md Update documentation on the Invite Code. --- doc/help/Team-Settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/help/Team-Settings.md b/doc/help/Team-Settings.md index fead9f4ca..4c014c9c2 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 invititation 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 -- cgit v1.2.3-1-g7c22 From ac26e51d681fd926942ae7366ff0f6235871d17f Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Wed, 30 Dec 2015 11:01:20 -0700 Subject: Update Team-Settings.md fix typo --- doc/help/Team-Settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/help/Team-Settings.md b/doc/help/Team-Settings.md index 4c014c9c2..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 -The **Invite Code** is used as part of the URL in the team invititation 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. +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 -- cgit v1.2.3-1-g7c22 From b91d9150f50b246f609afacfbde6aa255035f5d2 Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Wed, 30 Dec 2015 12:10:20 -0700 Subject: Update team_general_tab.jsx help text for invite code in team settings --- web/react/components/team_general_tab.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -
{'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.'}
+
{'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.'}
); -- cgit v1.2.3-1-g7c22 From 35c33d43fe18e69d298e40949aacd14be1533439 Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Wed, 30 Dec 2015 12:12:48 -0700 Subject: Update team_settings.jsx help text for restrict domains --- web/react/components/admin_console/team_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} /> -

{'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").'}

+

{'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").'}

-- cgit v1.2.3-1-g7c22 From 274d16870c485fbb40782a83ac309977f9d32b44 Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Wed, 30 Dec 2015 15:50:58 -0700 Subject: Update README.md index for docs/help menu Add "notifications" and "creating teams" to readme index --- doc/help/README.md | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3-1-g7c22