diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-25 22:42:38 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-25 22:42:38 -0700 |
| commit | 70b5918734d996a2b5b3710c2ed519f77f4764d4 (patch) | |
| tree | 12aac9f88de68cb79404a3985e6bfe774ad8f066 /doc | |
| parent | 473221dbada7ad7739d6a969d9d3d5c9c276941b (diff) | |
| parent | ae2898107d275176126ab07ca1886fd7fd7ddad4 (diff) | |
| download | chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.gz chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.tar.bz2 chat-70b5918734d996a2b5b3710c2ed519f77f4764d4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/help/Search.md | 6 | ||||
| -rw-r--r-- | doc/install/SMTP-Email-Setup.md | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/doc/help/Search.md b/doc/help/Search.md index f36e079bd..02ecf7d40 100644 --- a/doc/help/Search.md +++ b/doc/help/Search.md @@ -8,4 +8,8 @@ Some things to know about search: - 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. +#### Limitations + +- Search in Mattermost uses the full text search features included in either a MySQL or Postgres database, which has some limitations + - 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 + - Searches with fewer than three characters will return no results, so for searching in Chinese try adding * to the end of queries diff --git a/doc/install/SMTP-Email-Setup.md b/doc/install/SMTP-Email-Setup.md index b958a6a96..bb57d95ba 100644 --- a/doc/install/SMTP-Email-Setup.md +++ b/doc/install/SMTP-Email-Setup.md @@ -12,7 +12,8 @@ To enable email, configure an SMTP email service as follows: 2. If you don't have an SMTP service, here are simple instructions to set one up with [Amazon Simple Email Service (SES)](https://aws.amazon.com/ses/): 2. Go to [Amazon SES console](https://console.aws.amazon.com/ses) then `SMTP Settings > Create My SMTP Credentials` 3. Copy the `Server Name`, `Port`, `SMTP Username`, and `SMTP Password` for Step 2 below. - 4. From the `Domains` menu set up and verify a new domain, then enable `Generate DKIM Settings` for the domain. + 4. From the `Domains` menu set up and verify a new domain, then enable `Generate DKIM Settings` for the domain. + 1. We recommend you set up _[Sender Policy Framework](https://en.wikipedia.org/wiki/Sender_Policy_Framework) (SPF)_ and/or _[Domain Keys Identified Mail](https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail) (DKIM)_ for your email domain. 5. Choose an sender address like `mattermost@example.com` and click `Send a Test Email` to verify setup is working correctly. 2. **Configure SMTP settings** @@ -57,7 +58,11 @@ To enable email, configure an SMTP email service as follows: * Information needed ##### Hotmail -* Information needed +* Set **SMTP Username** to **your_email@hotmail.com** +* Set **SMTP Password** to **your_password** +* Set **SMTP Server** to **smtp-mail.outlook.com** +* Set **SMTP Port** to **587** +* Set **Connection Security** to **STARTTLS** ### Troubleshooting SMTP @@ -91,4 +96,4 @@ Connected to mail.example.com. 250-STARTTLS 250-PIPELINING 250 8BITMIME -```
\ No newline at end of file +``` |