aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2010-06-29 19:09:10 +0200
committerWincent Colaiuta <win@wincent.com>2010-06-30 17:07:19 +0200
commit52c56f9f7ec46ee39f1a6319ff4017e2492683ed (patch)
treef671439158a00b211b3bcb75bacf1ae34e980476 /actionmailer/lib/action_mailer
parent8fbb5177a7a3618d7b40bccbb3b36876a10a8918 (diff)
downloadrails-52c56f9f7ec46ee39f1a6319ff4017e2492683ed.tar.gz
rails-52c56f9f7ec46ee39f1a6319ff4017e2492683ed.tar.bz2
rails-52c56f9f7ec46ee39f1a6319ff4017e2492683ed.zip
docs: note that mail() accepts arbitrary headers
The documentation makes it sound like mail() only accepts a limited set of headers in the headers hash, but it in fact accepts any arbitrary headers, and there is a test ("can pass random headers in as a hash to mail") for it in the test suite. Signed-off-by: Wincent Colaiuta <win@wincent.com>
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 3b6e2c6387..11fa978b9c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -535,7 +535,9 @@ module ActionMailer #:nodoc:
# :reply_to => 'bounces@test.lindsaar.net'
# end
#
- # If you need other headers not listed above, use the <tt>headers['name'] = value</tt> method.
+ # If you need other headers not listed above, you can either pass them in
+ # as part of the headers hash or use the <tt>headers['name'] = value</tt>
+ # method.
#
# When a <tt>:return_path</tt> is specified as header, that value will be used as the 'envelope from'
# address for the Mail message. Setting this is useful when you want delivery notifications