Skip to content
Browse files

Merge pull request #16586 from seuros/master

Fix typo in rdoc [ci skip]
  • Loading branch information...
2 parents 0baed94 + d162934 commit b66bb42dc172716d29fb33c97799f1786af3ce9f @rafaelfranca rafaelfranca committed Aug 20, 2014
Showing with 16 additions and 16 deletions.
  1. +4 −4 actionmailer/lib/action_mailer/base.rb
  2. +12 −12 actionmailer/lib/action_mailer/message_delivery.rb
View
8 actionmailer/lib/action_mailer/base.rb
@@ -138,20 +138,20 @@ module ActionMailer
# Once a mailer action and template are defined, you can deliver your message or create it and save it
# for delivery later:
#
- # Notifier.welcome(david).deliver_now # sends the email
- # mail = Notifier.welcome(david) # => an ActionMailer::MessageDeliver object
+ # Notifier.welcome('david').deliver_now # sends the email
+ # mail = Notifier.welcome('david') # => an ActionMailer::MessageDeliver object
# mail.deliver_now # sends the email
#
# The <tt>ActionMailer::MessageDeliver</tt> class is a wrapper around a <tt>Mail::Message</tt> object. If
# you want direct access to the <tt>Mail::Message</tt> object you can call the <tt>message</tt> method on
# the <tt>ActionMailer::MessageDeliver</tt> object.
#
- # Notifier.welcome(david).message # => a Mail::Message object
+ # Notifier.welcome('david').message # => a Mail::Message object
#
# ActionMailer is nicely integrated with ActiveJob so you can send emails in the background (example: outside
# of the request-response cycle, so the user doesn't have to wait on it):
#
- # Notifier.welcome(david).deliver_later # enqueue the email sending to ActiveJob
+ # Notifier.welcome('david').deliver_later # enqueue the email sending to ActiveJob
#
# You never instantiate your mailer class. Rather, you just call the method you defined on the class itself.
#
View
24 actionmailer/lib/action_mailer/message_delivery.rb
@@ -7,10 +7,10 @@ module ActionMailer
# around a lazy created Mail::Message. You can get direct access to the
# Mail::Message, deliver the email or schedule the email to be sent through ActiveJob.
#
- # Notifier.welcome(david) # an ActionMailer::MessageDeliver object
- # Notifier.welcome(david).deliver_now # sends the email
- # Notifier.welcome(david).deliver_later # enqueue the deliver email job to ActiveJob
- # Notifier.welcome(david).message # a Mail::Message object
+ # Notifier.welcome('david') # an ActionMailer::MessageDeliver object
+ # Notifier.welcome('david').deliver_now # sends the email
+ # Notifier.welcome('david').deliver_later # enqueue the deliver email job to ActiveJob
+ # Notifier.welcome('david').message # a Mail::Message object
class MessageDelivery < Delegator
def initialize(mailer, mail_method, *args) #:nodoc:
@mailer = mailer
@@ -38,9 +38,9 @@ def message
#
# ==== Examples
#
- # Notifier.welcome(david).deliver_later
- # Notifier.welcome(david).deliver_later(in: 1.hour)
- # Notifier.welcome(david).deliver_later(at: 10.hours.from_now)
+ # Notifier.welcome('david').deliver_later
+ # Notifier.welcome('david').deliver_later(in: 1.hour)
+ # Notifier.welcome('david').deliver_later(at: 10.hours.from_now)
#
# ==== Options
# * <tt>in</tt> - Enqueue the message to be delivered with a delay
@@ -54,9 +54,9 @@ def deliver_later!(options={})
#
# ==== Examples
#
- # Notifier.welcome(david).deliver_later
- # Notifier.welcome(david).deliver_later(in: 1.hour)
- # Notifier.welcome(david).deliver_later(at: 10.hours.from_now)
+ # Notifier.welcome('david').deliver_later
+ # Notifier.welcome('david').deliver_later(in: 1.hour)
+ # Notifier.welcome('david').deliver_later(at: 10.hours.from_now)
#
# ==== Options
# * <tt>in</tt> - Enqueue the message to be delivered with a delay
@@ -68,15 +68,15 @@ def deliver_later(options={})
# Delivers a message. The message will be sent bypassing checking perform_deliveries
# and raise_delivery_errors, so use with caution.
#
- # Notifier.welcome(david).deliver_now!
+ # Notifier.welcome('david').deliver_now!
#
def deliver_now!
message.deliver!
end
# Delivers a message:
#
- # Notifier.welcome(david).deliver_now
+ # Notifier.welcome('david').deliver_now
#
def deliver_now
message.deliver

0 comments on commit b66bb42

Please sign in to comment.
Something went wrong with that request. Please try again.