aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-31 17:42:06 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-31 17:42:06 -0200
commit23a132960ce5cee88a35e090764318856b48ac16 (patch)
tree60f01c07ba5eced2d2a3d63728b828c9ed13e90f
parent6af9411c2d49b87906b0d138f5213070144a2f6d (diff)
parentd3e410070d846578eac060d6a585978675c04759 (diff)
downloadrails-23a132960ce5cee88a35e090764318856b48ac16.tar.gz
rails-23a132960ce5cee88a35e090764318856b48ac16.tar.bz2
rails-23a132960ce5cee88a35e090764318856b48ac16.zip
Merge pull request #17462 from vipulnsward/actionmailer-doc-fix
AM README fixes [ci skip]
-rw-r--r--actionmailer/README.rdoc9
1 files changed, 7 insertions, 2 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc
index 3b8e3ed749..b4eb40f54d 100644
--- a/actionmailer/README.rdoc
+++ b/actionmailer/README.rdoc
@@ -61,7 +61,7 @@ generated would look like this:
Thank you for signing up!
-In order to send mails, you simply call the method and then call +deliver+ on the return value.
+In order to send mails, you simply call the method and then call +deliver_now+ on the return value.
Calling the method returns a Mail Message object:
@@ -74,7 +74,12 @@ Or you can just chain the methods together like:
== Setting defaults
-It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from <tt>ActionMailer::Base</tt>. This method accepts a Hash as the parameter. You can use any of the headers email messages have, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
+It is possible to set default values that will be used in every method in your Action Mailer class.
+To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from
+<tt>ActionMailer::Base</tt>. This method accepts a Hash as the parameter. You can use any of the headers, email messages
+have, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer
+does this out of the box for you, so you won't need to worry about that.
+Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
Note that every value you set with this method will get overwritten if you use the same key in your mailer method.