diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2010-11-26 14:26:29 +1100 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2010-11-26 14:26:29 +1100 |
| commit | 8d1c56148f4b0c3088862c7afb58ab22363a7695 (patch) | |
| tree | f3a7b2cca2054c49efd9b1c5fc748ca572f279f8 /actionmailer/lib | |
| parent | e968acc21c7e60e09a8ef076a00ef22bce2813b9 (diff) | |
| parent | ad8e1ba45271ad910ba943840f6f58e973e9a046 (diff) | |
| download | rails-8d1c56148f4b0c3088862c7afb58ab22363a7695.tar.gz rails-8d1c56148f4b0c3088862c7afb58ab22363a7695.tar.bz2 rails-8d1c56148f4b0c3088862c7afb58ab22363a7695.zip | |
Merge branch 'master' of github.com:lifo/docrails
* 'master' of github.com:lifo/docrails:
Fix missing word in ActionMailer::Base documentation.
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index d13ae3dd3a..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> |