summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/import/slack-import.md5
-rw-r--r--doc/install/single-container-install.md2
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/import/slack-import.md b/doc/import/slack-import.md
index 14528e4b9..c30de0567 100644
--- a/doc/import/slack-import.md
+++ b/doc/import/slack-import.md
@@ -1,5 +1,7 @@
#### Slack Import (Preview)
+*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.
Mattermost currently supports the processing of an "Export" file from Slack containing account information and public channel archives from a Slack team.
@@ -9,7 +11,8 @@ Mattermost currently supports the processing of an "Export" file from Slack cont
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).
-- Newly added markdown suppport in Slack's Posts 2.0 feature is not yet supported.
+
diff --git a/doc/install/single-container-install.md b/doc/install/single-container-install.md
index fa5265773..304467678 100644
--- a/doc/install/single-container-install.md
+++ b/doc/install/single-container-install.md
@@ -5,7 +5,7 @@ The following install instructions are for single-container installs of Mattermo
### Mac OSX ###
1. Install Docker Toolbox using instructions at: http://docs.docker.com/installation/mac/
- 1. Start Docker Toolbox from the command line and run: `docker-machine create -d virtualbox dev”`
+ 1. Start Docker Toolbox from the command line and run: `docker-machine create -d virtualbox dev`
2. Get your Docker IP address with: `docker-machine ip dev`
3. Use `sudo nano /etc/hosts` to add `<Docker IP> dockerhost` to your /etc/hosts file
4. Run: `docker-machine env dev` and copy the export statements to your ~/.bash\_profile by running `sudo nano ~/.bash_profile`. Then run: `source ~/.bash_profile`