diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-04-27 14:21:16 +0200 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-04-27 14:21:16 +0200 |
| commit | fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a (patch) | |
| tree | 05fc3bc5c7df89712f1f11e7f94306100265e74f /actionmailer | |
| parent | f4447607f20c420d9c341b19064c07d5b7aa6cee (diff) | |
| parent | 39574aa582337baa32a58caae7b2671cb52ae718 (diff) | |
| download | rails-fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a.tar.gz rails-fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a.tar.bz2 rails-fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer')
| -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 c508512ff6..e24a7f52d5 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -486,7 +486,7 @@ module ActionMailer #:nodoc: self.class.mailer_name end - # Allows you to pass random and unusual headers to the new +Mail::Message+ object + # Allows you to pass random and unusual headers to the new <tt>Mail::Message</tt> object # which will add them to itself. # # headers['X-Special-Domain-Specific-Header'] = "SecretValue" @@ -497,7 +497,7 @@ module ActionMailer #:nodoc: # headers 'X-Special-Domain-Specific-Header' => "SecretValue", # 'In-Reply-To' => incoming.message_id # - # The resulting Mail::Message will have the following in it's header: + # The resulting Mail::Message will have the following in its header: # # X-Special-Domain-Specific-Header: SecretValue def headers(args=nil) |