aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-27 23:14:45 -0700
committerXavier Noria <fxn@hashref.com>2011-05-27 23:14:45 -0700
commit6a3eabe96b84f1df75dac79907f08d2f65dbf7d8 (patch)
tree0237a1bf6b6f52f2296aac31067c39ccbbe6bf1a /actionmailer/lib/action_mailer
parentb7baf1211f83f7dd008f156f1f5cfc62b52bf458 (diff)
parent9a67a117b36374ac94ceee99ea0b2f724deb0b5b (diff)
downloadrails-6a3eabe96b84f1df75dac79907f08d2f65dbf7d8.tar.gz
rails-6a3eabe96b84f1df75dac79907f08d2f65dbf7d8.tar.bz2
rails-6a3eabe96b84f1df75dac79907f08d2f65dbf7d8.zip
Merge pull request #1371 from FLOChip/typo
Typo in ActionMailer::Base
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 220cee3da1..3afdbea42a 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -22,16 +22,16 @@ module ActionMailer #:nodoc:
#
# Examples:
#
- # class Notifier < ActionMailer::Base
- # default :from => 'no-reply@example.com',
+ # class Notifier < ActionMailer::Base
+ # default :from => 'no-reply@example.com',
# :return_path => 'system@example.com'
#
- # def welcome(recipient)
- # @account = recipient
- # mail(:to => recipient.email_address_with_name,
- # :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
- # end
- # end
+ # def welcome(recipient)
+ # @account = recipient
+ # mail(:to => recipient.email_address_with_name,
+ # :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
+ # end
+ # end
#
# Within the mailer method, you have access to the following methods:
#
@@ -366,7 +366,7 @@ module ActionMailer #:nodoc:
end
# Register an Inteceptor which will be called before mail is sent.
- # Either a class or a string can be passed in as the Observer. If a string is passed in
+ # 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)
delivery_interceptor = (interceptor.is_a?(String) ? interceptor.constantize : interceptor)