diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-11 23:10:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 23:10:33 -0400 |
| commit | 90982d850eea56a97ff7c3b6dacba61d60729741 (patch) | |
| tree | 119a1045771a02ae65ee769f6cccc2bf5fe15e3b | |
| parent | abdfe2b667da72f0f6b67871d43cafe1dbf23baf (diff) | |
| parent | 1f6d86464c252d38cf390ac2cf37b6024b5bf4d7 (diff) | |
| download | rails-90982d850eea56a97ff7c3b6dacba61d60729741.tar.gz rails-90982d850eea56a97ff7c3b6dacba61d60729741.tar.bz2 rails-90982d850eea56a97ff7c3b6dacba61d60729741.zip | |
Merge pull request #33848 from sharang-d/patch-2
Update action_mailer_basics.md
| -rw-r--r-- | guides/source/action_mailer_basics.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md index 406615f681..041a427f7c 100644 --- a/guides/source/action_mailer_basics.md +++ b/guides/source/action_mailer_basics.md @@ -787,7 +787,7 @@ files (environment.rb, production.rb, etc...) |`sendmail_settings`|Allows you to override options for the `:sendmail` delivery method.<ul><li>`:location` - The location of the sendmail executable. Defaults to `/usr/sbin/sendmail`.</li><li>`:arguments` - The command line arguments to be passed to sendmail. Defaults to `-i`.</li></ul>| |`raise_delivery_errors`|Whether or not errors should be raised if the email fails to be delivered. This only works if the external email server is configured for immediate delivery.| |`delivery_method`|Defines a delivery method. Possible values are:<ul><li>`:smtp` (default), can be configured by using `config.action_mailer.smtp_settings`.</li><li>`:sendmail`, can be configured by using `config.action_mailer.sendmail_settings`.</li><li>`:file`: save emails to files; can be configured by using `config.action_mailer.file_settings`.</li><li>`:test`: save emails to `ActionMailer::Base.deliveries` array.</li></ul>See [API docs](http://api.rubyonrails.org/classes/ActionMailer/Base.html) for more info.| -|`perform_deliveries`|Determines whether deliveries are actually carried out when the `deliver` method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing. If this value is `false`, `deliveries` array will not be populated even if delivery_method is :test.| +|`perform_deliveries`|Determines whether deliveries are actually carried out when the `deliver` method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing. If this value is `false`, `deliveries` array will not be populated even if `delivery_method` is `:test`.| |`deliveries`|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.| |`default_options`|Allows you to set default values for the `mail` method options (`:from`, `:reply_to`, etc.).| |