aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/configuring.md
diff options
context:
space:
mode:
authorStan Lo <a22301613@yahoo.com.tw>2016-02-25 13:41:09 +0800
committerStan Lo <a22301613@yahoo.com.tw>2016-02-25 13:41:09 +0800
commit4e82346756bd504ec1ab347f447fc56faa5e006e (patch)
treeda2fb1dc7f7ae45832ea318275fd974786f7d51f /guides/source/configuring.md
parent50e4433b051829350984f0c5eb1271243f6d229d (diff)
downloadrails-4e82346756bd504ec1ab347f447fc56faa5e006e.tar.gz
rails-4e82346756bd504ec1ab347f447fc56faa5e006e.tar.bz2
rails-4e82346756bd504ec1ab347f447fc56faa5e006e.zip
Update config.force_ssl's documentation
Diffstat (limited to 'guides/source/configuring.md')
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 3f522386d3..12f3b648a5 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -104,7 +104,7 @@ application. Accepts a valid week day symbol (e.g. `:monday`).
you don't want shown in the logs, such as passwords or credit card
numbers. New applications filter out passwords by adding the following `config.filter_parameters+=[:password]` in `config/initializers/filter_parameter_logging.rb`.
-* `config.force_ssl` forces all requests to be served over HTTPS by using the `ActionDispatch::SSL` middleware. This can be configured by setting `config.ssl_options` - see the [ActionDispatch::SSL documentation](http://edgeapi.rubyonrails.org/classes/ActionDispatch/SSL.html) for details.
+* `config.force_ssl` forces all requests to be served over HTTPS by using the `ActionDispatch::SSL` middleware, and sets `config.action_mailer.default_url_options` to be `{ protocol: 'https' }`. This can be configured by setting `config.ssl_options` - see the [ActionDispatch::SSL documentation](http://edgeapi.rubyonrails.org/classes/ActionDispatch/SSL.html) for details.
* `config.log_formatter` defines the formatter of the Rails logger. This option defaults to an instance of `ActiveSupport::Logger::SimpleFormatter` for all modes except production, where it defaults to `Logger::Formatter`.