Merge pull request #2417 from adamloving/doc-fixes

Minor fixes to documentation and comments

app/assets/javascripts/discourse/routes/user_index_route.js

@@ -1,5 +1,5 @@
 /**
-  If we request /user/eviltrout without a sub route.
+  If we request /users/eviltrout without a sub route.
 
   @class UserIndexRoute
   @extends Discourse.Route

config/discourse_defaults.conf

@@ -1,7 +1,7 @@
 #
 # DO NOT EDIT THIS FILE
 # If you need to make changes create a file called discourse.conf in this directory with your changes
-# On inport this file will be imported using ERB
+# On import this file will be imported using ERB
 #
 
 # Discourse supports multiple mechanisms for production config.

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
 

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