diff options
| author | Jason Fox <jfoxny@gmail.com> | 2011-06-15 09:39:59 -0700 |
|---|---|---|
| committer | Jason Fox <jfoxny@gmail.com> | 2011-06-15 09:39:59 -0700 |
| commit | 1adb38b6c3da1f651fbf6afced320b122b81dbc1 (patch) | |
| tree | dce4548cc104e99703d99e4d9b9e6bde8b7897a4 | |
| parent | 77c8cd75162e0771dd45930a4309d3183707731a (diff) | |
| parent | b62c5493d1e8c06c3189f47c29515c8bc8b5e123 (diff) | |
| download | rails-1adb38b6c3da1f651fbf6afced320b122b81dbc1.tar.gz rails-1adb38b6c3da1f651fbf6afced320b122b81dbc1.tar.bz2 rails-1adb38b6c3da1f651fbf6afced320b122b81dbc1.zip | |
Merge pull request #47 from jasonfox/master
Fixed two errors in the doc
| -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 3b4e59d703..085afb57c1 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -57,7 +57,7 @@ module ActionMailer #:nodoc: # will accept (any valid Email header including optional fields). # # The mail method, if not passed a block, will inspect your views and send all the views with - # the same name as the method, so the above action would send the +welcome.text.plain.erb+ view + # the same name as the method, so the above action would send the +welcome.text.erb+ view # file as well as the +welcome.text.html.erb+ view file in a +multipart/alternative+ email. # # If you want to explicitly render only certain templates, pass a block: @@ -88,7 +88,7 @@ module ActionMailer #:nodoc: # # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same # name as the method in your mailer model. For example, in the mailer defined above, the template at - # <tt>app/views/notifier/signup_notification.text.plain.erb</tt> would be used to generate the email. + # <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. # @@ -153,7 +153,7 @@ module ActionMailer #:nodoc: # by the content type. Each such detected template will be added as separate part to the message. # # For example, if the following templates exist: - # * signup_notification.text.plain.erb + # * signup_notification.text.erb # * signup_notification.text.html.erb # * signup_notification.text.xml.builder # * signup_notification.text.yaml.erb @@ -178,7 +178,7 @@ module ActionMailer #:nodoc: # end # end # - # Which will (if it had both a <tt>welcome.text.plain.erb</tt> and <tt>welcome.text.html.erb</tt> + # Which will (if it had both a <tt>welcome.text.erb</tt> and <tt>welcome.text.html.erb</tt> # template in the view directory), send a complete <tt>multipart/mixed</tt> email with two parts, # the first part being a <tt>multipart/alternative</tt> with the text and HTML email parts inside, # and the second being a <tt>application/pdf</tt> with a Base64 encoded copy of the file.pdf book |