Merge branch 'master' of http://github.com/rails/rails

1 files changed, 2 insertions, 2 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 11fa978b9c..ed4bea0c77 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -737,13 +737,13 @@ module ActionMailer #:nodoc:
         raise "You can no longer call ActionMailer::Base.default_url_options " \
               "directly. You need to set config.action_mailer.default_url_options. " \
               "If you are using ActionMailer standalone, you need to include the " \
-              "url_helpers of a router directly."
+              "routing url_helpers directly."
       end
     end
 
     # This module will complain if the user tries to set default_url_options
     # 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
+    # we include the router's url_helpers, which will override this module.
     extend DeprecatedUrlOptions
 
     ActiveSupport.run_load_hooks(:action_mailer, self)