From c74dfeb484028c88c14a66142205ea4d6961dd8f Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 5 Sep 2015 21:41:50 -0700 Subject: [PATCH 1/5] Documenting release numbering scheme --- doc/install/release-numbering.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/install/release-numbering.md diff --git a/doc/install/release-numbering.md b/doc/install/release-numbering.md new file mode 100644 index 0000000000..71374f7ef0 --- /dev/null +++ b/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) From bb9d44829e64b0382657cc45519201cf7acd97a3 Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 5 Sep 2015 21:44:37 -0700 Subject: [PATCH 2/5] Adding link to release numbering scheme --- doc/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/README.md b/doc/README.md index ac00dc9760..36d16b7447 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,5 +1,9 @@ # Mattermost Documentation +## General Information + +- [Mattermost Release Numbering Scheme](install/release-numbering.md) + ## Administrator Documentation ### Installation From 77d73baf132eeb04467eb0355ed1b2aee13df284 Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 5 Sep 2015 23:04:02 -0700 Subject: [PATCH 3/5] Renaming to Local Machine Setup Also fixing broken link --- doc/install/single-container-install.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/install/single-container-install.md b/doc/install/single-container-install.md index 3e307ca74c..772f3becf8 100644 --- a/doc/install/single-container-install.md +++ b/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 From aee65d0552b3e5faa3fe2c28327e431367e80204 Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 5 Sep 2015 23:11:41 -0700 Subject: [PATCH 4/5] Minor wording tweaks --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bac990fb97..ff25abeb42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) From 1c394f32a1c1b85e194c99bc77b31e36e7567994 Mon Sep 17 00:00:00 2001 From: it33 Date: Sun, 6 Sep 2015 08:24:05 -0700 Subject: [PATCH 5/5] Adding link to migration support epic --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff25abeb42..5876dc894a 100644 --- a/CHANGELOG.md +++ b/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