diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-03-24 17:15:10 +0530 |
| commit | 014498e1d74decd57d44d45c187fa4f4b968b811 (patch) | |
| tree | 948610d910d28fc976cdffffd533879a16b01557 /actionmailer | |
| parent | 780ab582091cf06ded9540a5d4fef23086e9bac3 (diff) | |
| parent | 2fab826db055f7b59bb83b834d730d69c8c7b25e (diff) | |
| download | rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.gz rails-014498e1d74decd57d44d45c187fa4f4b968b811.tar.bz2 rails-014498e1d74decd57d44d45c187fa4f4b968b811.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/ruby_on_rails_guides_guidelines.textile
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 64f82f24a2..4af2d0a4a8 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -14,15 +14,15 @@ module ActionMailer #:nodoc: # # $ rails generate mailer Notifier # - # The generated model inherits from <tt>ActionMailer::Base</tt>. Emails are defined by creating methods - # within the model which are then used to set variables to be used in the mail template, to - # change options on the mail, or to add attachments. + # The generated model inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods + # used to generate an email message. In these methods, you can setup variables to be used in + # the mailer views, options on the mail itself such as the <tt>:from</tt> address, and attachments. # # Examples: # # class Notifier < ActionMailer::Base # default :from => 'no-reply@example.com', - # :return_path => 'system@example.com' + # :return_path => 'system@example.com' # # def welcome(recipient) # @account = recipient |