Merge docrails

1 files changed, 5 insertions, 17 deletions

diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index bb6cb437b7..16720b915b 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -68,29 +68,17 @@ module ActionController
   # 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 in two ways.
-  #
-  # The first way is to include ActionController::UrlWriter in your class:
+  # you can do that by including ActionController::UrlWriter in your class:
   #
   #   class User < ActiveRecord::Base
-  #     include ActionController::UrlWriter         # !!!
+  #     include ActionController::UrlWriter
   #
-  #     def name=(value)
-  #       write_attribute('name', value)
-  #       write_attribute('base_uri', users_path)   # !!!
+  #     def base_uri
+  #       user_path(self)
   #     end
   #   end
   #
-  # The second way is to access them through ActionController::UrlWriter.
-  # The autogenerated named routes methods are available as class methods:
-  #
-  #   class User < ActiveRecord::Base
-  #     def name=(value)
-  #       write_attribute('name', value)
-  #       path = ActionController::UrlWriter.users_path   # !!!
-  #       write_attribute('base_uri', path)               # !!!
-  #     end
-  #   end
+  #   User.find(1).base_uri # => "/users/1"
   module UrlWriter
     def self.included(base) #:nodoc:
       ActionController::Routing::Routes.install_helpers(base)