aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/action_mailer_basics.textile
diff options
context:
space:
mode:
authorAditya Sanghi <asanghi@me.com>2010-11-14 18:27:08 +0530
committerAditya Sanghi <asanghi@me.com>2010-11-14 18:27:08 +0530
commit330d65d31222148019855d6914e35c8cd9f90cd5 (patch)
treea121aed9d825884ff1268ab6e74215ab49dac315 /railties/guides/source/action_mailer_basics.textile
parentabf225423cbe11fcb0460a40bd49263694eaef06 (diff)
downloadrails-330d65d31222148019855d6914e35c8cd9f90cd5.tar.gz
rails-330d65d31222148019855d6914e35c8cd9f90cd5.tar.bz2
rails-330d65d31222148019855d6914e35c8cd9f90cd5.zip
deliver_* is no more
Diffstat (limited to 'railties/guides/source/action_mailer_basics.textile')
-rw-r--r--railties/guides/source/action_mailer_basics.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index 41738827b2..8d2ce44e93 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -446,7 +446,7 @@ The following configuration options are best made in one of the environment file
|sendmail_settings|Allows you to override options for the :sendmail delivery method.<ul><li>:location - The location of the sendmail executable. Defaults to /usr/sbin/sendmail.</li><li>:arguments - The command line arguments to be passed to sendmail. Defaults to -i -t.</li></ul>|
|raise_delivery_errors|Whether or not errors should be raised if the email fails to be delivered.|
|delivery_method|Defines a delivery method. Possible values are :smtp (default), :sendmail, :file and :test.|
-|perform_deliveries|Determines whether deliver_* methods are actually carried out. By default they are, but this can be turned off to help functional testing.|
+|perform_deliveries|Determines whether deliveries are actually carried out when the +deliver+ method is invoked on the Mail message. By default they are, but this can be turned off to help functional testing.|
|deliveries|Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful for unit and functional testing.|
h4. Example Action Mailer Configuration