diff options
| author | Megan Bowra-Dean <megan@rabidtech.co.nz> | 2013-05-17 17:48:25 +1200 |
|---|---|---|
| committer | Megan Bowra-Dean <megan@rabidtech.co.nz> | 2013-05-17 17:48:25 +1200 |
| commit | 94b97f6154e3a86fe4520dc685d010a533105650 (patch) | |
| tree | 57464c24d9e6f15dcafe8461ae4617727f2e0e27 | |
| parent | fb1f0bf9be2d682b29b29739c4592eb792599d3f (diff) | |
| download | rails-94b97f6154e3a86fe4520dc685d010a533105650.tar.gz rails-94b97f6154e3a86fe4520dc685d010a533105650.tar.bz2 rails-94b97f6154e3a86fe4520dc685d010a533105650.zip | |
Fix documentation for ActionMailer template names.
ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
| -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 6da0064148..c363eca8ea 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -151,9 +151,9 @@ module ActionMailer # :nodoc: # # For example, if the following templates exist: # * signup_notification.text.erb - # * signup_notification.text.html.erb - # * signup_notification.text.xml.builder - # * signup_notification.text.yaml.erb + # * signup_notification.html.erb + # * signup_notification.xml.builder + # * signup_notification.yaml.erb # # Each would be rendered and added as a separate part to the message, with the corresponding content # type. The content type for the entire message is automatically set to <tt>multipart/alternative</tt>, @@ -175,7 +175,7 @@ module ActionMailer # :nodoc: # end # end # - # Which will (if it had both a <tt>welcome.text.erb</tt> and <tt>welcome.text.html.erb</tt> + # Which will (if it had both a <tt>welcome.text.erb</tt> and <tt>welcome.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 |