Fixing merge conflict

3 files changed, 23 insertions, 6 deletions

diff --git a/doc/help/Search.md b/doc/help/Search.md
new file mode 100644
index 000000000..f36e079bd
--- /dev/null
+++ b/doc/help/Search.md
@@ -0,0 +1,11 @@
+# Search
+
+The search box in Mattermost brings back results from any channel of which you’re a member. No results are returned from channels where you are not a member - even if they are open channels.
+
+Some things to know about search: 
+
+- Multiple search terms are connected with “OR” by default. Typing in `Mattermost website` returns results containing “Mattermost” or “website”
+- You can use quotes to return search results for exact terms, like `"Mattermost website"` will only return messages containing the entire phrase `"Mattermost website"` and not return messages with only `Mattermost` or `website`
+- You can use the `*` character for wildcard searches that match within words. For example: Searching for `rea*` brings back messages containing `reach`, `reason` and other words starting with `rea`.
+
+Search in Mattermost uses the full text search features in MySQL and Postgres databases. Special cases that are not supported in default full text search, such as searching for IP addresses like `10.100.200.101`, can be added in future as the search feature evolves. 
diff --git a/doc/install/Troubleshooting.md b/doc/install/Troubleshooting.md
index 6a7260ddf..21839c86f 100644
--- a/doc/install/Troubleshooting.md
+++ b/doc/install/Troubleshooting.md
@@ -1,12 +1,16 @@
-### Mattermost Troubleshooting
+# Mattermost Troubleshooting
 
 #### Important notes
 
-1. **DO NOT manipulate the Mattermost database**
+##### **DO NOT manipulate the Mattermost database**
   - In particular, DO NOT delete data from the database, as Mattermost is designed to stop working if data integrity has been compromised. The system is designed to archive content continously and generally assumes data is never deleted. 
 
 
 #### Common Issues 
 
-1. Error message in logs when attempting to sign-up: `x509: certificate signed by unknown authority`
+##### Error message in logs when attempting to sign-up: `x509: certificate signed by unknown authority`
   - This error may appear when attempt to use a self-signed certificate to setup SSL, which is not yet supported by Mattermost. You can resolve this issue by setting up a load balancer like Ngnix. A ticket exists to [add support for self-signed certificates in future](x509: certificate signed by unknown authority). 
+
+##### Lost System Administrator account
+  - If the System Administrator account becomes unavailable, a person leaving the organization for example, you can set a new system admin from the commandline using `./platform -assign_role -team_name="yourteam" -email="you@example.com" -role="system_admin"`
+
diff --git a/doc/install/Upgrade-Guide.md b/doc/install/Upgrade-Guide.md
index e86cf8166..cecd45353 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.