diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-01-22 01:53:30 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-01-22 01:53:30 -0800 |
| commit | 75cd7bc3c2fe1dca24dd1b03d61e9ff173b3d65f (patch) | |
| tree | 1e5d3b6eb2ae66bc9a85e79b897b2f03c70088cc /guides/source/configuring.md | |
| parent | a4ce0659433cc83c5b098c4e900b5214787e99b0 (diff) | |
| parent | 9e63ead4ae3ba19dcb128f769414be8b21f65f7b (diff) | |
| download | rails-75cd7bc3c2fe1dca24dd1b03d61e9ff173b3d65f.tar.gz rails-75cd7bc3c2fe1dca24dd1b03d61e9ff173b3d65f.tar.bz2 rails-75cd7bc3c2fe1dca24dd1b03d61e9ff173b3d65f.zip | |
Merge pull request #13728 from semenyukdmitriy/master
Added missing `file` delivery method to the Configuration Guide
Diffstat (limited to 'guides/source/configuring.md')
| -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 412aecadd5..4afd0600c4 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -406,7 +406,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. The allowed values are `:smtp` (default), `:sendmail`, and `:test`. +* `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.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. |