diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
| commit | 6d2e4ee96c22502380dc94bebdead56133143b9e (patch) | |
| tree | d25bddeda96903d0a6ec75ca087898875fa2981d /actionmailer/lib | |
| parent | b75fca9e57423eec81384ff3e35f38fd4f7fe47f (diff) | |
| parent | 7e075e62479a0eccad6eaf7a7c20f45347860c83 (diff) | |
| download | rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.gz rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.bz2 rails-6d2e4ee96c22502380dc94bebdead56133143b9e.zip | |
Merge remote branch 'docrails/master'
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 ed4bea0c77..7f2ed5ba64 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -129,7 +129,7 @@ module ActionMailer #:nodoc: # # ActionMailer::Base.default_url_options[:host] = "example.com" # - # This can also be set as a configuration option in <tt>config/environment.rb</tt>: + # This can also be set as a configuration option in <tt>config/application.rb</tt>: # # config.action_mailer.default_url_options = { :host => "example.com" } # |