diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-28 00:56:17 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-28 00:56:17 +0530 |
| commit | 43af34c0f6c81d4d93be1bc1e743c202e8244485 (patch) | |
| tree | 1792c580a3138baf710b632110861f5d68f4de63 /actionmailer | |
| parent | 50b1399b3128fcba73bf3478e22d187090921872 (diff) | |
| parent | fc3d15dcb0c4265d1aaeedfc51d8a8c8e382347a (diff) | |
| download | rails-43af34c0f6c81d4d93be1bc1e743c202e8244485.tar.gz rails-43af34c0f6c81d4d93be1bc1e743c202e8244485.tar.bz2 rails-43af34c0f6c81d4d93be1bc1e743c202e8244485.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) |