aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-06-08 00:30:07 +0200
committerXavier Noria <fxn@hashref.com>2011-06-08 00:30:07 +0200
commitf8cfa7afdba2c14eec5a2a25f7c63050441e2a90 (patch)
treef31edfc32bf9b2d239ce521a44c041c5ff9d0f08
parenta1e78cfc36960569cf8cd380d9656ac6c14015ae (diff)
parenta4679839adbccfdff38bd60b3757f1e31d60102b (diff)
downloadrails-f8cfa7afdba2c14eec5a2a25f7c63050441e2a90.tar.gz
rails-f8cfa7afdba2c14eec5a2a25f7c63050441e2a90.tar.bz2
rails-f8cfa7afdba2c14eec5a2a25f7c63050441e2a90.zip
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
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)