aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2014-11-04 13:20:22 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2014-11-04 13:20:22 +0000
commit9887a2cfe52f30d4a91e0d16fe57ecf96537b98c (patch)
treeeab3c5a32eebd6e913b3960ac8b9c7f927264c56 /actionmailer/lib/action_mailer/base.rb
parent70177618afd704884e669454173456e41411f136 (diff)
parentb670fadb978c8a12c3414ed842cd49e4fde2cec0 (diff)
downloadrails-9887a2cfe52f30d4a91e0d16fe57ecf96537b98c.tar.gz
rails-9887a2cfe52f30d4a91e0d16fe57ecf96537b98c.tar.bz2
rails-9887a2cfe52f30d4a91e0d16fe57ecf96537b98c.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r--actionmailer/lib/action_mailer/base.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 798241aaf8..a70bf1544a 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -84,7 +84,8 @@ module ActionMailer
# name as the method in your mailer model. For example, in the mailer defined above, the template at
# <tt>app/views/notifier/welcome.text.erb</tt> would be used to generate the email.
#
- # Variables defined in the model are accessible as instance variables in the view.
+ # Variables defined in the methods of your mailer model are accessible as instance variables in their
+ # corresponding view.
#
# Emails by default are sent in plain text, so a sample view for our model example might look like this:
#
@@ -702,8 +703,8 @@ module ActionMailer
# The main method that creates the message and renders the email templates. There are
# two ways to call this method, with a block, or without a block.
#
- # Both methods accept a headers hash. This hash allows you to specify the most used headers
- # in an email message, these are:
+ # It accepts a headers hash. This hash allows you to specify
+ # the most used headers in an email message, these are:
#
# * +:subject+ - The subject of the message, if this is omitted, Action Mailer will
# ask the Rails I18n class for a translated +:subject+ in the scope of