diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-15 21:20:28 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-15 21:20:28 +0530 |
| commit | 5cc178a291a363a4c6b15fd826a7551a23a87786 (patch) | |
| tree | 57722307b666c4f69d2d6c60e5dbca242b898936 /actionmailer/lib | |
| parent | 8f8397e0a4ea2bbc27d4bba60088286217314807 (diff) | |
| parent | 561e5ab82eb24335f76961d437a16f09b4a15474 (diff) | |
| download | rails-5cc178a291a363a4c6b15fd826a7551a23a87786.tar.gz rails-5cc178a291a363a4c6b15fd826a7551a23a87786.tar.bz2 rails-5cc178a291a363a4c6b15fd826a7551a23a87786.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/form_helper.rb
railties/lib/rails/info_controller.rb
Diffstat (limited to 'actionmailer/lib')
| -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 6056399cd2..4a61bac0a5 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -314,7 +314,7 @@ module ActionMailer # These options are specified on the class level, like # <tt>ActionMailer::Base.raise_delivery_errors = true</tt> # - # * <tt>default</tt> - You can pass this in at a class level as well as within the class itself as + # * <tt>default_options</tt> - You can pass this in at a class level as well as within the class itself as # per the above section. # # * <tt>logger</tt> - the logger is used for generating information on the mailing run if available. |