aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-12-09 00:01:28 -0500
committerFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-12-09 00:01:28 -0500
commit4d6a314a220840872483e2ded191cada582dfd7d (patch)
tree9c9610e15c1f3c0cfdbb67b4e24de505b17a8344 /actionmailer
parent07e2f0e53eb622d78e31e17f38598b5be41995e5 (diff)
downloadrails-4d6a314a220840872483e2ded191cada582dfd7d.tar.gz
rails-4d6a314a220840872483e2ded191cada582dfd7d.tar.bz2
rails-4d6a314a220840872483e2ded191cada582dfd7d.zip
use default_options= instead of default to avoid confusion
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index dcf13e927c..04274065dc 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -314,7 +314,7 @@ module ActionMailer
# These options are specified on the class level, like
# <tt>ActionMailer::Base.raise_delivery_errors = true</tt>
#
- # * <tt>default</tt> - You can pass this in at a class level as well as within the class itself as
+ # * <tt>default_options</tt> - You can pass this in at a class level as well as within the class itself as
# per the above section.
#
# * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.