diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2016-04-14 02:14:58 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2016-04-14 02:14:58 +0530 |
| commit | aeffcf25b46da47a9d3b22b0bd9a9f4d98d5d7eb (patch) | |
| tree | cf42ce0057f865b46c01bfbdd703117a5563ecf4 /actionmailer | |
| parent | 65246f9b1d8a53c940270ceb66c1ca3eb3b28aa4 (diff) | |
| parent | d2f87d7000cc5e043e6f0ec2484eb1d68345c314 (diff) | |
| download | rails-aeffcf25b46da47a9d3b22b0bd9a9f4d98d5d7eb.tar.gz rails-aeffcf25b46da47a9d3b22b0bd9a9f4d98d5d7eb.tar.bz2 rails-aeffcf25b46da47a9d3b22b0bd9a9f4d98d5d7eb.zip | |
Merge pull request #24525 from tomkadwill/action-mailer-base-docs2
Update ActionMailer base documentation [ci skip]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 3df524580c..4bb7842297 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -144,7 +144,7 @@ module ActionMailer # mail.deliver_now # generates and sends the email now # # The <tt>ActionMailer::MessageDelivery</tt> class is a wrapper around a delegate that will call - # your method to generate the mail. If you want direct access to delegator, or <tt>Mail::Message</tt>, + # your method to generate the mail. If you want direct access to the delegator, or <tt>Mail::Message</tt>, # you can call the <tt>message</tt> method on the <tt>ActionMailer::MessageDelivery</tt> object. # # NotifierMailer.welcome(User.first).message # => a Mail::Message object @@ -163,7 +163,7 @@ module ActionMailer # # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use # multipart templates, where each template is named after the name of the action, followed by the content - # type. Each such detected template will be added as a separate part to the message. + # type. Each such detected template will be added to the message, as a separate part. # # For example, if the following templates exist: # * signup_notification.text.erb @@ -288,7 +288,7 @@ module ActionMailer # end # # Note that the proc is evaluated right at the start of the mail message generation, so if you - # set something in the default using a proc, and then set the same thing inside of your + # set something in the default hash using a proc, and then set the same thing inside of your # mailer method, it will get overwritten by the mailer method. # # It is also possible to set these default options that will be used in all mailers through |