summaryrefslogtreecommitdiffstats
path: root/doc/install
diff options
context:
space:
mode:
authorit33 <iantien@gmail.com>2015-10-21 14:52:55 -0700
committerit33 <iantien@gmail.com>2015-10-21 14:52:55 -0700
commit01a2ad2ccf8ad2fb2fa028732ce28b2d0f9db701 (patch)
tree9db0a737731a54d7f52c92c584052ec8e4dc6db0 /doc/install
parent7d94eb1dcabea72712050d8a7059d7c7ee674f0c (diff)
downloadchat-01a2ad2ccf8ad2fb2fa028732ce28b2d0f9db701.tar.gz
chat-01a2ad2ccf8ad2fb2fa028732ce28b2d0f9db701.tar.bz2
chat-01a2ad2ccf8ad2fb2fa028732ce28b2d0f9db701.zip
Update Upgrade-Guide.md
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/Upgrade-Guide.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/install/Upgrade-Guide.md b/doc/install/Upgrade-Guide.md
index e86cf8166..1845f3ad3 100644
--- a/doc/install/Upgrade-Guide.md
+++ b/doc/install/Upgrade-Guide.md
@@ -1,12 +1,14 @@
# Mattermost Upgrade Guide
-### Upgrading Mattermost v0.7 to v1.1
+### Upgrading Mattermost v0.7 to v1.1.1
-If you've manually changed Mattermost v0.7 configuration by updating the `config.json` file, you'll need to port those changes to Mattermost v1.1:
+_Note: [Mattermost v1.1.1](https://github.com/mattermost/platform/releases/tag/v1.1.1) is a special release of Mattermost v1.1 that upgrades the database to Mattermost v1.1 from EITHER Mattermost v0.7 or Mattermost v1.0. THe following instructions are for upgrading from Mattermost v0.7 to v1.1.1 and skipping the upgrade to Mattermost v1.0._
+
+If you've manually changed Mattermost v0.7 configuration by updating the `config.json` file, you'll need to port those changes to Mattermost v1.1.1:
1. Go to the `config.json` file that you manually updated and note any differences from the [default `config.json` file in Mattermost 0.7](https://github.com/mattermost/platform/blob/v0.7.0/config/config.json).
-2. For each setting that you changed, check [the changelog documentation](https://github.com/mattermost/platform/blob/master/CHANGELOG.md#configjson-changes-from-v07-to-v10) on whether the configuration setting has changed between v0.7 and v1.1
+2. For each setting that you changed, check [the changelog documentation](https://github.com/mattermost/platform/blob/master/CHANGELOG.md#configjson-changes-from-v07-to-v10) on whether the configuration setting has changed between v0.7 and v1.1.1
3. Update your new [`config.json` file in Mattermost v1.1](https://github.com/mattermost/platform/blob/v1.1.0/config/config.json), based on your preferences and the changelog documentation above.