aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-01-27 00:37:22 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-01-27 00:38:12 +1100
commitccea6ab07d38c5bc2de341c3f08d199ef55bccc6 (patch)
treed04ca9c4176aa11cab5395c8c970fd2c4d7a8479 /actionmailer/lib
parent1133757a95f5cee0044cca6f360f5d63df3bb583 (diff)
downloadrails-ccea6ab07d38c5bc2de341c3f08d199ef55bccc6.tar.gz
rails-ccea6ab07d38c5bc2de341c3f08d199ef55bccc6.tar.bz2
rails-ccea6ab07d38c5bc2de341c3f08d199ef55bccc6.zip
Fixing up tests and docs to use defaults :from => 'name' instead of defaults({:from => 'name'})
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index f677ab629e..669e49c91c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -23,7 +23,8 @@ module ActionMailer #:nodoc:
# Examples:
#
# class Notifier < ActionMailer::Base
- # defaults({:from => 'system@example.com'})
+ # defaults :from => 'no-reply@example.com',
+ # :return_path => 'system@example.com'
#
# def welcome(recipient)
# @account = recipient