diff options
author | Xavier Noria <fxn@hashref.com> | 2011-06-11 00:59:46 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-06-11 00:59:46 +0200 |
commit | 4699c933019680e11616756b49ab2dad1e53dcda (patch) | |
tree | 355c27c2beecb1f628001b90919a31502c5b9c68 /actionmailer | |
parent | 6c58585ff5b667de4f29860e4b06e743e0614891 (diff) | |
parent | 029290f3def838c5293929d5bc42d3b6e5662d32 (diff) | |
download | rails-4699c933019680e11616756b49ab2dad1e53dcda.tar.gz rails-4699c933019680e11616756b49ab2dad1e53dcda.tar.bz2 rails-4699c933019680e11616756b49ab2dad1e53dcda.zip |
Merge branch 'master' of git://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 ccc25c775b..3b4e59d703 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -365,7 +365,7 @@ module ActionMailer #:nodoc: Mail.register_observer(delivery_observer) end - # Register an Inteceptor which will be called before mail is sent. + # Register an Interceptor which will be called before mail is sent. # Either a class or a string can be passed in as the Interceptor. If a string is passed in # it will be <tt>constantize</tt>d. def register_interceptor(interceptor) |