aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2017-08-26 16:41:32 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2017-08-26 16:41:32 +0000
commit4b95976f15ecd2d3a9655cb22b00a247253dfb08 (patch)
tree4faf484943af0cfe09530813830a98f199cd4cd1 /actionpack
parenta8bc4bd41edab5175514d9195b87d76e646a388a (diff)
parent98877d1bdfdb4bfbbdc9738cb898d2b3ac7eba31 (diff)
downloadrails-4b95976f15ecd2d3a9655cb22b00a247253dfb08.tar.gz
rails-4b95976f15ecd2d3a9655cb22b00a247253dfb08.tar.bz2
rails-4b95976f15ecd2d3a9655cb22b00a247253dfb08.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 57a5bc681e..2b43ade081 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -473,7 +473,7 @@ module ActionDispatch
# <tt>params[<:param>]</tt>.
# In your router:
#
- # resources :user, param: :name
+ # resources :users, param: :name
#
# You can override <tt>ActiveRecord::Base#to_param</tt> of a related
# model to construct a URL: