Merge pull request #618 from mattermost/it33-patch-2

Multiple documentation improvements

CHANGELOG.md

@@ -62,10 +62,10 @@ Preview of Slack import functionality supports the processing of an "Export" fil
 
 Limitations: 
 
-- Slack does not currently export any files or images that 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 currently export any content from your 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. These issues are being addressed in Mattermost v0.8.0.
-  
+- 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). These issues are being addressed in [Mattermost v0.8.0 Migration Support](https://mattermost.atlassian.net/browse/PLT-22?filter=10002).
+
 ### New Features 
 
 GitLab Mattermost 
@@ -117,7 +117,7 @@ Many thanks to our external contributors. In no particular order:
 - [zackify](https://github.com/zackify)
 - [willstacey](https://github.com/willstacey)
 
-Special thanks to the GitLab Mattermost Alpha early adopter community who have influenced this release, and who play a pivotal role in bringing Mattermost to over 100,000 organizations using GitLab today. In no particular order: 
+Special thanks to the GitLab Mattermost early adopter community who influenced this release, and who play a pivotal role in bringing Mattermost to over 100,000 organizations using GitLab today. In no particular order: 
 
 - [cifvts](http://forum.mattermost.org/users/cifvts/activity)
 - [Chryb](https://gitlab.com/u/Chryb)

doc/README.md

@@ -1,5 +1,9 @@
 # Mattermost Documentation 
 
+## General Information 
+
+- [Mattermost Release Numbering Scheme](install/release-numbering.md)
+
 ## Administrator Documentation 
 
 ### Installation 

doc/install/release-numbering.md

@@ -0,0 +1,17 @@
+### Mattermost Release Numbering 
+
+Mattermost numbers its stable releases based on the following format: 
+
+  `[Version Number].[Major Build Number].[Minor Build Number]`
+
+Version Number:
+
+- Indicates a major system release (e.g. 1.x.x, 2.x.x)
+
+Major Build Number:
+
+- Indicates significant new functionality, (e.g. 0.5.x, 0.6.x, 0.7.x)
+
+Minor Build Number:
+
+- Indicates bugfix/security releases (e.g. 1.2.5, 1.2.6)

doc/install/single-container-install.md

@@ -1,10 +1,7 @@
-# Single Container Installation and Upgrade 
+# Local Machine Setup and Upgrade
 
 The following install instructions are for single-container installs of Mattermost using Docker for exploring product functionality and upgrading to newer versions.
 
-Local Machine Setup (Docker)
------------------------------
-
 ### Mac OSX ###
 
 1. Install Boot2Docker using instructions at: http://docs.docker.com/installation/mac/  
@@ -89,7 +86,7 @@ There are a few configuration settings you might want to adjust when setting up
 
 The default single-container Docker instance for Mattermost is designed for product evaluation, and sets `ByPassEmail=true` so the product can run without enabling email, when doing so maybe difficult. 
 	
-To see the product's full functionality, [enabling SMTP email is recommended](doc/config/smtp-email-setup.md).
+To see the product's full functionality, [enabling SMTP email is recommended](/doc/config/smtp-email-setup.md).
 
 ## Upgrading Mattermost