Merge branch 'master' into PLT-44

1 files changed, 16 insertions, 0 deletions

diff --git a/doc/install/Upgrade-Guide.md b/doc/install/Upgrade-Guide.md
new file mode 100644
index 000000000..e86cf8166
--- /dev/null
+++ b/doc/install/Upgrade-Guide.md
@@ -0,0 +1,16 @@
+# Mattermost Upgrade Guide
+
+### Upgrading Mattermost v0.7 to v1.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: 
+
+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
+
+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. 
+
+Optionally, you can use the new [System Console user interface](https://github.com/mattermost/platform/blob/master/doc/install/Configuration-Settings.md) to make changes to your new `config.json` file. 
+
+
+