diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
| commit | 5e60e6571384a809598f3118fdc02dac1fd9d7b8 (patch) | |
| tree | 3cfccbc36f0133124181ab965480a1352d86ca79 /actionmailer/lib | |
| parent | 51a9703b1e80caa30d699f30615f023079874623 (diff) | |
| parent | 1a50cc31639f35fd82a4a24821b9fc49dc7eadc9 (diff) | |
| download | rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.gz rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.bz2 rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 8c5c838384..9e3437685d 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -209,7 +209,7 @@ module ActionMailer #:nodoc: # # <%= image_tag attachments['photo.png'].url -%> # - # As we are using ActionView's +image_tag+ method, you can pass in any other options you want: + # As we are using Action View's +image_tag+ method, you can pass in any other options you want: # # <h1>Please Don't Cringe</h1> # @@ -739,7 +739,7 @@ module ActionMailer #:nodoc: end # This module will complain if the user tries to set default_url_options - # directly instead of through the config object. In ActionMailer's Railtie, + # directly instead of through the config object. In Action Mailer's Railtie, # we include the url_helpers of the router, which will override this module extend DeprecatedUrlOptions |