From 5e57ff485c45ff91cb824b61431f648210037119 Mon Sep 17 00:00:00 2001
From: Adam Loving <adamloving@gmail.com>
Date: Tue, 3 Jun 2014 16:18:32 -0700
Subject: [PATCH] Update development docs regarding SMTP
---
docs/DEVELOPER-ADVANCED.md | 10 ++++++++++
docs/DEVELOPMENT-OSX-NATIVE.md | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index d9c8b36c3..363988b70 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -121,6 +121,16 @@ Edit /etc/postgresql/9.1/main/pg_hba.conf to have this:
# Press enter to accept all the defaults
/etc/init.d/redis_6379 start
+## Sending email (SMTP)
+
+By default, development.rb will attempt to connect locally to send email.
+
+```rb
+config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
+```
+
+Set up [MailCatcher](https://github.com/sj26/mailcatcher) so the app can intercept
+outbound email and you can verify what is being sent.
## Phantomjs
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index 270a76e33..7e4404435 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -173,6 +173,16 @@ ImageMagick is used for generating avatars (including for test fixtures).
brew install imagemagick
+## Sending email (SMTP)
+
+By default, development.rb will attempt to connect locally to send email.
+
+```rb
+config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
+```
+
+Set up [MailCatcher](https://github.com/sj26/mailcatcher) so the app can intercept
+outbound email and you can verify what is being sent.
## Setting up your Discourse