aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Dijk <jeroen@jeevidee.nl>2010-07-21 17:10:24 +0200
committerJeroen van Dijk <jeroen@jeevidee.nl>2010-07-21 17:10:24 +0200
commit24c0bc52d260db4146525c6720be0f9be2c5fd0f (patch)
tree20b183f44909d359a1b0cd4741c2a4d7d7661fdb
parent6914d67ed15d41a239407e3c724b670d95a740a6 (diff)
downloadrails-24c0bc52d260db4146525c6720be0f9be2c5fd0f.tar.gz
rails-24c0bc52d260db4146525c6720be0f9be2c5fd0f.tar.bz2
rails-24c0bc52d260db4146525c6720be0f9be2c5fd0f.zip
Mention that ActionMailer::Base.default_url_options is now deprecated
-rw-r--r--actionmailer/lib/action_mailer/base.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 7f2ed5ba64..7bbde53306 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -125,14 +125,13 @@ module ActionMailer #:nodoc:
# make sense to generate relative URLs in email messages.
#
# It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt>
- # option in the <tt>ActionMailer::Base.default_url_options</tt> hash as follows:
- #
- # ActionMailer::Base.default_url_options[:host] = "example.com"
- #
- # This can also be set as a configuration option in <tt>config/application.rb</tt>:
+ # option as a configuration option in <tt>config/application.rb</tt>:
#
# config.action_mailer.default_url_options = { :host => "example.com" }
#
+ # Setting <tt>ActionMailer::Base.default_url_options</tt> directly is now deprecated, use the configuration
+ # option mentioned above to set the default host.
+ #
# If you do decide to set a default <tt>:host</tt> for your mailers you will want to use the
# <tt>:only_path => false</tt> option when using <tt>url_for</tt>. This will ensure that absolute URLs are
# generated because the <tt>url_for</tt> view helper will, by default, generate relative URLs when a