Permalink
Browse files

Merge branch 'master' of github.com:lifo/docrails

* 'master' of github.com:lifo/docrails:
  Fix missing word in ActionMailer::Base documentation.
  • Loading branch information...
2 parents e968acc + ad8e1ba commit 8d1c56148f4b0c3088862c7afb58ab22363a7695 @radar radar committed Nov 26, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 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>

0 comments on commit 8d1c561

Please sign in to comment.