summaryrefslogtreecommitdiffstats
path: root/doc/help
diff options
context:
space:
mode:
Diffstat (limited to 'doc/help')
-rw-r--r--doc/help/Manage-Members.md (renamed from doc/help/Manage-Team.md)8
-rw-r--r--doc/help/README.md2
-rw-r--r--doc/help/Slack-Import.md6
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/help/Manage-Team.md b/doc/help/Manage-Members.md
index b45ea4283..04243f9fb 100644
--- a/doc/help/Manage-Team.md
+++ b/doc/help/Manage-Members.md
@@ -1,10 +1,10 @@
-# Manage Team
+# Manage Members
-The Manage Team menu is used to change the user roles assigned to members belonging to a team.
+The Manage Members menu is used to change the user roles assigned to members belonging to a team.
## User Roles
-The following user roles are assigned from the **Manage Team** menu option in the team site main menu.
+The following user roles are assigned from the **Manage Members** menu option in the team site main menu.
### System Admin
@@ -23,7 +23,7 @@ The Team Administrator is typically a non-technical end user and has the followi
- Access to the "Team Settings" menu from the team site main menu
- Ability to change the team name and import data from Slack export files
-- Access to the "Manage Team" menu and change user roles to the levels of Team Administrator, Member and Inactive
+- Access to the "Manage Members" menu and change user roles to the levels of Team Administrator, Member and Inactive
### Member
diff --git a/doc/help/README.md b/doc/help/README.md
index d07424c70..9271d64dd 100644
--- a/doc/help/README.md
+++ b/doc/help/README.md
@@ -8,5 +8,5 @@ _Note: Help documentation is a work-in-progress. Community contributions highly
You can access the **Team Site Main Menu** by clicking on the three vertical dots at the top of the left sidebar in a team site. Here we describe the various options available from the menu:
-- [Manage Teams](Manage-Team.md)
+- [Manage Members](Manage-Members.md)
diff --git a/doc/help/Slack-Import.md b/doc/help/Slack-Import.md
index d8d6170c4..a3b672b04 100644
--- a/doc/help/Slack-Import.md
+++ b/doc/help/Slack-Import.md
@@ -1,8 +1,8 @@
-#### Slack Import (Alpha)
+#### Slack Import (Beta)
*Note: As a SaaS service, Slack is able to change its export format quickly. If you encounter issues not mentioned in the documentation below, please let us know by [filing an issue](https://github.com/mattermost/platform/issues).*
-The Slack Import feature in Mattermost is in "Preview" and focus is on supporting migration of teams of less than 100 registered users. The feature can be accessed from by Team Administrators and Team Owners via the `Team Settings -> Import` menu option.
+The Slack Import feature in Mattermost is in "Beta" and focus is on supporting migration of teams of less than 100 registered users. The feature can be accessed from by Team Administrators and Team Owners via the `Team Settings -> Import` menu option.
Mattermost currently supports the processing of an "Export" file from Slack containing account information and public channel archives from a Slack team.
@@ -14,5 +14,5 @@ Limitations:
- 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.
-- The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still show Slack ID).
+- The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still shows Slack ID).