diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-27 07:43:59 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-27 07:43:59 +0100 |
| commit | fd83f9d51583c080072dc9fd00f02ad742e265d4 (patch) | |
| tree | 30a14f36d955e5f33eda81c7410023618a1a3d5b /actionmailer | |
| parent | ce9456eca0c4ea77a42aaad5e8080842c1c01422 (diff) | |
| parent | c8c95fc519f9d0e23e012d4434e6c3fe0f6e2a62 (diff) | |
| download | rails-fd83f9d51583c080072dc9fd00f02ad742e265d4.tar.gz rails-fd83f9d51583c080072dc9fd00f02ad742e265d4.tar.bz2 rails-fd83f9d51583c080072dc9fd00f02ad742e265d4.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
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 0bf60a2c24..00226148ed 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -234,8 +234,8 @@ module ActionMailer #:nodoc: # default :sender => 'system@example.com' # end # - # You can pass in any header value that a <tt>Mail::Message</tt>, out of the box, <tt>ActionMailer::Base</tt> - # sets the following: + # You can pass in any header value that a <tt>Mail::Message</tt> accepts. Out of the box, + # <tt>ActionMailer::Base</tt> sets the following: # # * <tt>:mime_version => "1.0"</tt> # * <tt>:charset => "UTF-8",</tt> @@ -273,7 +273,7 @@ module ActionMailer #:nodoc: # = Configuration options # # These options are specified on the class level, like - # <tt>ActionMailer::Base.template_root = "/my/templates"</tt> + # <tt>ActionMailer::Base.raise_delivery_errors = true</tt> # # * <tt>default</tt> - You can pass this in at a class level as well as within the class itself as # per the above section. |