aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-28 11:45:15 +0200
committerOscar Del Ben <info@oscardelben.com>2012-04-28 11:45:15 +0200
commit4e69a1579ea74fe2823f6fb2f055db97480492e5 (patch)
treed8a5834a0ed5a372969f26db753a30785777a5c2 /actionmailer
parent943410197cca4235212ca0fc409820378a40890c (diff)
parent0297e8e4ddc034bcb8ed477efff91d8fe104cb39 (diff)
downloadrails-4e69a1579ea74fe2823f6fb2f055db97480492e5.tar.gz
rails-4e69a1579ea74fe2823f6fb2f055db97480492e5.tar.bz2
rails-4e69a1579ea74fe2823f6fb2f055db97480492e5.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