diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-28 00:04:45 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-28 00:04:45 +0530 |
| commit | 33b55cfbdbbab1de171a44c6845a2c236325e229 (patch) | |
| tree | b0df784ed46c1e5fe642bd5ede938a70ab8513b8 /actionmailer | |
| parent | 9a7e2b8d44b80e3380fb5ab042a861e84c8fe35c (diff) | |
| parent | a775853d6aabaadcd343b2f61bcbc7c7e2c59363 (diff) | |
| download | rails-33b55cfbdbbab1de171a44c6845a2c236325e229.tar.gz rails-33b55cfbdbbab1de171a44c6845a2c236325e229.tar.bz2 rails-33b55cfbdbbab1de171a44c6845a2c236325e229.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/README.rdoc | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index f48e77b4c7..dc74b590f7 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -59,6 +59,8 @@ generated would look like this: Mr. david@loudthinking.com + Thank you for signing up! + In previous version of Rails you would call <tt>create_method_name</tt> and <tt>deliver_method_name</tt>. Rails 3.0 has a much simpler interface, you simply call the method and optionally call +deliver+ on the return value. diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index cb289fd693..ac49702ced 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -100,12 +100,12 @@ module ActionMailer #:nodoc: # You can even use Action Pack helpers in these views. For example: # # You got a new note! - # <%= truncate(@note.body, 25) %> + # <%= truncate(@note.body, :length => 25) %> # # If you need to access the subject, from or the recipients in the view, you can do that through message object: # # You got a new note from <%= message.from %>! - # <%= truncate(@note.body, 25) %> + # <%= truncate(@note.body, :length => 25) %> # # # = Generating URLs |