aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2010-04-04 17:34:13 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2010-04-04 17:34:13 +0100
commit48b2451142355b22de5f8130b3debdd4e53e2ba2 (patch)
treeee3b1bcf44803333799873385c5f246efef06128
parent824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8 (diff)
downloadrails-48b2451142355b22de5f8130b3debdd4e53e2ba2.tar.gz
rails-48b2451142355b22de5f8130b3debdd4e53e2ba2.tar.bz2
rails-48b2451142355b22de5f8130b3debdd4e53e2ba2.zip
Update various documentation examples to use new routing DSL
-rw-r--r--actionpack/lib/action_controller/record_identifier.rb2
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb2
-rw-r--r--actionpack/lib/action_view/helpers/atom_feed_helper.rb4
-rwxr-xr-xactiverecord/lib/active_record/base.rb2
4 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 7fdaffe3eb..fe2f6cee70 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -6,7 +6,7 @@ module ActionController
# the view actions to a higher logical level. Example:
#
# # routes
- # map.resources :posts
+ # resources :posts
#
# # view
# <% div_for(post) do %> <div id="post_45" class="post">
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index dd86aa3e87..fb236dce53 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -63,7 +63,7 @@ module ActionDispatch
# named routes. For example, suppose that you have a 'users' resource in your
# <b>routes.rb</b>:
#
- # map.resources :users
+ # resources :users
#
# 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
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 58c3a8752e..52806f206a 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -9,8 +9,8 @@ module ActionView
#
# config/routes.rb:
# Basecamp::Application.routes.draw do |map|
- # map.resources :posts
- # map.root :controller => "posts"
+ # resources :posts
+ # root :to => "posts#index"
# end
#
# app/controllers/posts_controller.rb:
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 37b379af9e..5f741c6ae7 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1572,7 +1572,7 @@ module ActiveRecord #:nodoc:
# or nil if this record's unsaved.
#
# For example, suppose that you have a User model, and that you have a
- # <tt>map.resources :users</tt> route. Normally, +user_path+ will
+ # <tt>resources :users</tt> route. Normally, +user_path+ will
# construct a path with the user object's 'id' in it:
#
# user = User.find_by_name('Phusion')