aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-06-11 00:59:46 +0200
committerXavier Noria <fxn@hashref.com>2011-06-11 00:59:46 +0200
commit4699c933019680e11616756b49ab2dad1e53dcda (patch)
tree355c27c2beecb1f628001b90919a31502c5b9c68 /actionpack/lib/action_dispatch
parent6c58585ff5b667de4f29860e4b06e743e0614891 (diff)
parent029290f3def838c5293929d5bc42d3b6e5662d32 (diff)
downloadrails-4699c933019680e11616756b49ab2dad1e53dcda.tar.gz
rails-4699c933019680e11616756b49ab2dad1e53dcda.tar.bz2
rails-4699c933019680e11616756b49ab2dad1e53dcda.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 187a98342e..70ea419e81 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1105,9 +1105,9 @@ module ActionDispatch
#
# The +comments+ resource here will have the following routes generated for it:
#
- # post_comments GET /sekret/posts/:post_id/comments(.:format)
- # post_comments POST /sekret/posts/:post_id/comments(.:format)
- # new_post_comment GET /sekret/posts/:post_id/comments/new(.:format)
+ # post_comments GET /posts/:post_id/comments(.:format)
+ # post_comments POST /posts/:post_id/comments(.:format)
+ # new_post_comment GET /posts/:post_id/comments/new(.:format)
# edit_comment GET /sekret/comments/:id/edit(.:format)
# comment GET /sekret/comments/:id(.:format)
# comment PUT /sekret/comments/:id(.:format)