diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-01-22 20:14:43 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-01-22 20:14:43 +0000 |
commit | f3cf476f8cb920bb83ad8c48321d138b0fa55464 (patch) | |
tree | 0b461dd811ef762c0a6ffe8722d4e30caf7927e4 /guides | |
parent | 9bb5f5fbe109331f8021ae141b7cd935f98eb1df (diff) | |
parent | 4e1bc571346854e10b6965c79cf52dfc238684fe (diff) | |
download | rails-f3cf476f8cb920bb83ad8c48321d138b0fa55464.tar.gz rails-f3cf476f8cb920bb83ad8c48321d138b0fa55464.tar.bz2 rails-f3cf476f8cb920bb83ad8c48321d138b0fa55464.zip |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'guides')
-rw-r--r-- | guides/source/configuring.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 0b24d4d06a..8a21d4062a 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -485,7 +485,7 @@ There are a number of settings available on `config.action_mailer`: * `config.action_mailer.raise_delivery_errors` specifies whether to raise an error if email delivery cannot be completed. It defaults to true. -* `config.action_mailer.delivery_method` defines the delivery method and defaults to `:smtp`. See the [configuration section in the Action Mailer guide](http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration) for more info. +* `config.action_mailer.delivery_method` defines the delivery method and defaults to `:smtp`. See the [configuration section in the Action Mailer guide](action_mailer_basics.html#action-mailer-configuration) for more info. * `config.action_mailer.perform_deliveries` specifies whether mail will actually be delivered and is true by default. It can be convenient to set it to false for testing. |