aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/README.rdoc
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2014-11-01 01:07:43 +0530
committerVipul A M <vipulnsward@gmail.com>2014-11-01 01:08:31 +0530
commitd3e410070d846578eac060d6a585978675c04759 (patch)
tree6dd61de67f0f6d67df699d226a2c172c938be831 /actionmailer/README.rdoc
parent0249c360a301fb927472e6e59264d435ff3b9c24 (diff)
downloadrails-d3e410070d846578eac060d6a585978675c04759.tar.gz
rails-d3e410070d846578eac060d6a585978675c04759.tar.bz2
rails-d3e410070d846578eac060d6a585978675c04759.zip
- Changed redundant user of `deliver` to `deliver_now`
- Wrapped text in setting defaults section. Also added break, to a sentence. [ci skip]
Diffstat (limited to 'actionmailer/README.rdoc')
-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.