aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-04-04 13:36:15 -0700
committerXavier Noria <fxn@hashref.com>2010-04-04 13:36:15 -0700
commit723e91e9fd594856aa7bcd38b04d04acd03039be (patch)
treec35f6fa19af20a64643249115732ba185db8bdc3 /actionpack/lib/action_controller
parentb546945b51d1e5765b4bf4eba0bd8413ea8e4198 (diff)
parent00884a59013a658082dab41da5ff41add31b8c43 (diff)
downloadrails-723e91e9fd594856aa7bcd38b04d04acd03039be.tar.gz
rails-723e91e9fd594856aa7bcd38b04d04acd03039be.tar.bz2
rails-723e91e9fd594856aa7bcd38b04d04acd03039be.zip
Merge commit 'docrails/master'
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/record_identifier.rb2
1 files changed, 1 insertions, 1 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">