diff options
| author | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-15 15:18:43 -0400 |
|---|---|---|
| committer | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-15 15:18:43 -0400 |
| commit | 74b4d3f5219c401be755c61c83e57e4f0ff550e4 (patch) | |
| tree | 32df1dd9f1f1bc7a2302e94d49166ea6ede9982c /actionmailer | |
| parent | 33b46079bc34e19c4de66963317edafb6ff2c0b5 (diff) | |
| parent | c86915450af4ee800ca3eba474fe6d01c865c4c3 (diff) | |
| download | rails-74b4d3f5219c401be755c61c83e57e4f0ff550e4.tar.gz rails-74b4d3f5219c401be755c61c83e57e4f0ff550e4.tar.bz2 rails-74b4d3f5219c401be755c61c83e57e4f0ff550e4.zip | |
Merge branch 'master' of github.com:lifo/docrails
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 fff44e50c1..44c7382f72 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -395,7 +395,7 @@ module ActionMailer #:nodoc: end # Wraps an email delivery inside of Active Support Notifications instrumentation. This - # method is actually called by the <tt>Mail::Message</tt> object itself through a call back + # method is actually called by the <tt>Mail::Message</tt> object itself through a callback # when you call <tt>:deliver</tt> on the Mail::Message, calling +deliver_mail+ directly # and passing a Mail::Message will do nothing except tell the logger you sent the email. def deliver_mail(mail) #:nodoc: |