From a35a18066c9650f2eb2272cd97d25fce7e97632f Mon Sep 17 00:00:00 2001 From: lindy65 Date: Mon, 23 Nov 2015 13:55:04 +0200 Subject: Update Team-Settings.md Fixed a few typos and grammatical errors. --- doc/help/Team-Settings.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'doc/help') diff --git a/doc/help/Team-Settings.md b/doc/help/Team-Settings.md index 7e6cf5dd5..7c8665565 100644 --- a/doc/help/Team-Settings.md +++ b/doc/help/Team-Settings.md @@ -1,6 +1,6 @@ ## Team Settings -The Team Settings menu offers Team Administrators, Team Owners and System Administrators to adjust settings applying to a specific team. +The Team Settings menu offers Team Administrators, Team Owners and System Administrators the ability to adjust settings applied to a specific team. The following settings are found in a Team Site from the **Three-Dot** menu at the top of the left sidebar under **Team Settings**. @@ -14,7 +14,7 @@ Your **Team Name** is displayed on the sign-in page, and in the top of the left- #### Allow anyone to sign-up from login page -Setting this option to **Yes** a link to the account creation page is included on the sign-in page of this team. +Setting this option to **Yes** shows a link to the account creation page on the sign-in page of this team. Team Administrators would set this to **Yes** when they: 1. Operate on a closed network and want to make sign-up easy. @@ -22,7 +22,7 @@ Team Administrators would set this to **Yes** when they: 3. Operate on the open internet and want to allow anyone to sign-up. Team Administrators would set this to **No** when they: - 1. Operate on the open internet and want a small, private team that is email-invite-only + 1. Operate on the open internet and want a small, private team that is email-invite-only. #### Include this team in the Team Directory @@ -34,7 +34,7 @@ Team Administrators would set this to **Yes** when they: 3. Operate on the open internet and want to allow anyone to sign-up to their team from the Home Page of the Mattermost server. Team Administrators would set this to **No** when they: - 1. Operate on the open internet and want a small, private team that is email-invite-only + 1. Operate on the open internet and want a small, private team that is email-invite-only. #### Invite Code @@ -48,15 +48,15 @@ When allowing anyone to sign-up from the login page, the **Invite Code** is used The Slack Import feature in Mattermost is in "Beta" and focus is on supporting migration of teams of less than 100 registered users. To use: -1. Generate a Slack "Export" file from **Slack > Team Settings > Import/Export Data > Export > Start Export** +1. Generate a Slack "Export" file from **Slack > Team Settings > Import/Export Data > Export > Start Export**. 2. In Mattermost go to **Team Settings > Import > Import from Slack**. _Team Owner_ or _Team Administrator_ role is required to access this menu option. 3. Click **Select file** to upload Slack export file and click **Import**. -4. Emails and usernames from Slack are used to create new Mattermost accounts +4. Emails and usernames from Slack are used to create new Mattermost accounts. -5. Slack users can activate their new Mattermost accounts by using Mattermost's Password Reset screen with their email addresses from Slack to set new passwords for their Mattermost accounts +5. Slack users can activate their new Mattermost accounts by using Mattermost's Password Reset screen with their email addresses from Slack to set new passwords for their Mattermost accounts. 6. Once logged in, the Mattermost users will have access to previous Slack messages in the public channels imported from Slack. @@ -67,4 +67,4 @@ The Slack Import feature in Mattermost is in "Beta" and focus is on supporting m - Newly added markdown suppport in Slack's Posts 2.0 feature announced on September 28, 2015 is not yet supported. - Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI. - Slack does not export any content from private groups or direct messages that your team has stored in Slack's database. -- In Beta, Slack accounts with username or email address collisions with existing Mattermost accounts will not import and mentions do not resolve as Mattermost usernames (still shows Slack ID). No pre-check or roll-back is currently offered. +- In Beta, Slack accounts with usernames or email addresses identical to existing Mattermost accounts will not import and mentions do not resolve as Mattermost usernames (still shows Slack ID). No pre-check or roll-back is currently offered. -- cgit v1.2.3-1-g7c22