From 24c0bc52d260db4146525c6720be0f9be2c5fd0f Mon Sep 17 00:00:00 2001
From: Jeroen van Dijk <jeroen@jeevidee.nl>
Date: Wed, 21 Jul 2010 17:10:24 +0200
Subject: Mention that ActionMailer::Base.default_url_options is now deprecated

---
 actionmailer/lib/action_mailer/base.rb | 9 ++++-----
 1 file 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
-- 
cgit v1.2.3