diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-20 23:20:44 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-20 23:20:44 +0530 |
| commit | af1b5c54cfb74caddd6ffab171d26da9a5c885d1 (patch) | |
| tree | 2e029d8df73d62c456fce667a647dabf93397863 /actionmailer | |
| parent | ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94 (diff) | |
| parent | 274c3fad5087306a64ca91d044756221f5ff862c (diff) | |
| download | rails-af1b5c54cfb74caddd6ffab171d26da9a5c885d1.tar.gz rails-af1b5c54cfb74caddd6ffab171d26da9a5c885d1.tar.bz2 rails-af1b5c54cfb74caddd6ffab171d26da9a5c885d1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index ac49702ced..8f2c567e3e 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -524,7 +524,7 @@ module ActionMailer #:nodoc: # # * <tt>:subject</tt> - The subject of the message, if this is omitted, Action Mailer will # ask the Rails I18n class for a translated <tt>:subject</tt> in the scope of - # <tt>[:actionmailer, mailer_scope, action_name]</tt> or if this is missing, will translate the + # <tt>[mailer_scope, action_name]</tt> or if this is missing, will translate the # humanized version of the <tt>action_name</tt> # * <tt>:to</tt> - Who the message is destined for, can be a string of addresses, or an array # of addresses. |