diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-06-08 00:22:36 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-06-08 00:22:36 +0200 |
| commit | a1e78cfc36960569cf8cd380d9656ac6c14015ae (patch) | |
| tree | bb2bcd984f3ceb89eeb3dbb295c4c149db0bf266 /actionmailer/lib | |
| parent | 97036eb5ba8012c80925ea94b0bb43647c78c905 (diff) | |
| parent | 645f003be724502f87d0c6767dc97aaa982bad42 (diff) | |
| download | rails-a1e78cfc36960569cf8cd380d9656ac6c14015ae.tar.gz rails-a1e78cfc36960569cf8cd380d9656ac6c14015ae.tar.bz2 rails-a1e78cfc36960569cf8cd380d9656ac6c14015ae.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 3afdbea42a..ccc25c775b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -213,14 +213,14 @@ module ActionMailer #:nodoc: # = Observing and Intercepting Mails # # Action Mailer provides hooks into the Mail observer and interceptor methods. These allow you to - # register objects that are called during the mail delivery life cycle. + # register classes that are called during the mail delivery life cycle. # - # An observer object must implement the <tt>:delivered_email(message)</tt> method which will be + # An observer class must implement the <tt>:delivered_email(message)</tt> method which will be # called once for every email sent after the email has been sent. # - # An interceptor object must implement the <tt>:delivering_email(message)</tt> method which will be + # An interceptor class must implement the <tt>:delivering_email(message)</tt> method which will be # called before the email is sent, allowing you to make modifications to the email before it hits - # the delivery agents. Your object should make any needed modifications directly to the passed + # the delivery agents. Your class should make any needed modifications directly to the passed # in Mail::Message instance. # # = Default Hash |