3 files changed, 67 insertions, 0 deletions
diff --git a/doc/help/Manage-Team.md b/doc/help/Manage-Team.md
new file mode 100644
index 000000000..b45ea4283
--- /dev/null
+++ b/doc/help/Manage-Team.md
@@ -0,0 +1,37 @@
+# Manage Team 
+
+The Manage Team 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. 
+
+### System Admin
+
+The System Administrator is typically a member of the IT staff and has the follow privileges: 
+
+- Access to the System Console from the main menu in any team site. 
+- Change any setting on the Mattermost server available in the System Console.
+- Promote and demote other users to and from the System Admin role.
+- This role also has all the privileges of the Team Administrator as described below
+
+The first user added to a newly installed Mattermost system is assigned the System Admin role. 
+
+### Team Admin 
+
+The Team Administrator is typically a non-technical end user and has the following privileges: 
+
+- 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
+
+### Member 
+
+This is the default role given to end users who join the system. Members have basic permissions to use the Mattermost team site.
+
+### Inactive 
+
+This status is given to users whose accounts are marked inactive. These users can no longer log into the system. 
+
+Because Mattermost is designed as a system-of-record, there is not an option to delete users from the Mattermost system, as such an operation could compromise the integrity of message archives. 
+
diff --git a/doc/help/README.md b/doc/help/README.md
new file mode 100644
index 000000000..d07424c70
--- /dev/null
+++ b/doc/help/README.md
@@ -0,0 +1,12 @@
+# Help
+
+The help section of the Mattermost documentation is intended for use by end users learning about the Mattermost concepts, usage, terminology and user interface.
+
+_Note: Help documentation is a work-in-progress. Community contributions highly welcome. Please see [guidelines for contributing](https://forum.mattermost.org/t/help-improve-mattermost-documentation/194)._
+
+## Team Site Main Menu 
+
+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)
+
diff --git a/doc/help/Slack-Import.md b/doc/help/Slack-Import.md
new file mode 100644
index 000000000..a3b672b04
--- /dev/null
+++ b/doc/help/Slack-Import.md
@@ -0,0 +1,18 @@
+#### 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 "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.   
+
+- In the feature preview, emails and usernames from Slack are used to create new Mattermost accounts, connected to messages history in imported Slack channels. Users can activate these accounts and by going to the Password Reset screen in Mattermost to set new credentials. 
+- Once logged in, users will have access to previous Slack messages shared in public channels, now imported to Mattermost.  
+
+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 shows Slack ID).
+