aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-05-01 19:06:03 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-05-01 19:06:03 +0530
commit42ff22f33a8963f1a1352f98e83b9918aa1a160d (patch)
tree3f43a8acee3ab20de78c4c9e30792296fddd06e4 /actionmailer
parent3cc6995e714bc763b40eb3e1d710c1e5ded44384 (diff)
parent339602b219e1fd842599f6750eb965f327a995c4 (diff)
downloadrails-42ff22f33a8963f1a1352f98e83b9918aa1a160d.tar.gz
rails-42ff22f33a8963f1a1352f98e83b9918aa1a160d.tar.bz2
rails-42ff22f33a8963f1a1352f98e83b9918aa1a160d.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/README.rdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc
index 755717cfba..cf10bfffdb 100644
--- a/actionmailer/README.rdoc
+++ b/actionmailer/README.rdoc
@@ -22,12 +22,12 @@ the email.
This can be as simple as:
class Notifier < ActionMailer::Base
- delivers_from 'system@loudthinking.com'
+ default from: 'system@loudthinking.com'
def welcome(recipient)
@recipient = recipient
- mail(:to => recipient,
- :subject => "[Signed up] Welcome #{recipient}")
+ mail(to: recipient,
+ subject: "[Signed up] Welcome #{recipient}")
end
end