aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-05-04 17:51:15 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-05-04 17:51:15 +0530
commit3d9673d8f6fdb5e330b2a276df288834058a5260 (patch)
treefba92ce97bba236916bab79489eb68c8788390c9 /actionpack/lib/action_dispatch
parentb24f1ce13884a86d6d93d0b16e1fc3716360b65a (diff)
parent616de66c55b58479e7da4271a0c990529395440e (diff)
downloadrails-3d9673d8f6fdb5e330b2a276df288834058a5260.tar.gz
rails-3d9673d8f6fdb5e330b2a276df288834058a5260.tar.bz2
rails-3d9673d8f6fdb5e330b2a276df288834058a5260.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index d75bb1c2de..ee02f4b531 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -68,7 +68,7 @@ module ActionDispatch
# This generates, among other things, the method <tt>users_path</tt>. By default,
# this method is accessible from your controllers, views and mailers. If you need
# to access this auto-generated method from other places (such as a model), then
- # you can do that by including ActionController::UrlFor in your class:
+ # you can do that by including Rails.application.routes.url_helpers in your class:
#
# class User < ActiveRecord::Base
# include Rails.application.routes.url_helpers