diff options
| author | Zachary Scott <e@zzak.io> | 2014-07-13 11:48:38 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-07-13 11:48:38 -0700 |
| commit | 9ce01dbfd133cb65f565b39764ab11a3b5287bbd (patch) | |
| tree | 8628518a5baf6dfaa7dd646e235f9b4c14b34754 /actionmailer | |
| parent | ccac6082bd4265f4827cc8bf9748c983d0a1c6c6 (diff) | |
| parent | dfee0327b5528caacfe277ccf4d0168b7b96cc05 (diff) | |
| download | rails-9ce01dbfd133cb65f565b39764ab11a3b5287bbd.tar.gz rails-9ce01dbfd133cb65f565b39764ab11a3b5287bbd.tar.bz2 rails-9ce01dbfd133cb65f565b39764ab11a3b5287bbd.zip | |
Merge pull request #16155 from mechanicles/fix-typos
[ci skip] Fix typos like `a html` to `an html` and 'an mail' to 'an email'.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 135cf35ac0..048f2ddc35 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -394,7 +394,7 @@ module ActionMailer # implement for a custom delivery agent. # # * <tt>perform_deliveries</tt> - Determines whether emails are actually sent from Action Mailer when you - # call <tt>.deliver</tt> on an mail message or on an Action Mailer method. This is on by default but can + # call <tt>.deliver</tt> on an email message or on an Action Mailer method. This is on by default but can # be turned off to aid in functional testing. # # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with |