aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-02 00:29:20 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-02 01:51:03 +0200
commitf7ba614c2db31933cbc12eda87518de3eca0228c (patch)
tree8aabbf6e719a3eff1eaec47988512eda3e8341b3 /actionmailer/lib/action_mailer
parentf8720a04d129668c7554c1a7270fba5418510b47 (diff)
downloadrails-f7ba614c2db31933cbc12eda87518de3eca0228c.tar.gz
rails-f7ba614c2db31933cbc12eda87518de3eca0228c.tar.bz2
rails-f7ba614c2db31933cbc12eda87518de3eca0228c.zip
Unify routes naming by renaming router to routes
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
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..8b86d83301 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."
+ "url_helpers of a routes 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 url_helpers of the routes, which will override this module
extend DeprecatedUrlOptions
ActiveSupport.run_load_hooks(:action_mailer, self)