summaryrefslogtreecommitdiffstats
path: root/doc/install/SMTP-Email-Setup.md
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-10-27 20:15:33 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-10-27 20:15:33 +0500
commit179c4ea684af8d2a021cc6f0042bc4408f39b0bb (patch)
tree7789805249e5c962f1175f301beb74272dee30c0 /doc/install/SMTP-Email-Setup.md
parent68b02ffb9eeb7a414feae8ed89b4011ccecf96bc (diff)
parent50eb3d9fe46d6364b6f12201edfe0a401be3ccdd (diff)
downloadchat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.gz
chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.bz2
chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.zip
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'doc/install/SMTP-Email-Setup.md')
-rw-r--r--doc/install/SMTP-Email-Setup.md11
1 files changed, 8 insertions, 3 deletions
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
+```