diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-02 23:00:59 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-02 23:00:59 +0530 |
| commit | eeda8403fd222c1109618834e4fe31a45e6531ca (patch) | |
| tree | 3938573377fdbcd0a956408f8bc8363adec1713a /actionpack/lib/action_dispatch | |
| parent | 67790644372ad3a771810f1d6d99687d795789ea (diff) | |
| parent | 44284a613b3efe2319db3f84090c0004505942c1 (diff) | |
| download | rails-eeda8403fd222c1109618834e4fe31a45e6531ca.tar.gz rails-eeda8403fd222c1109618834e4fe31a45e6531ca.tar.bz2 rails-eeda8403fd222c1109618834e4fe31a45e6531ca.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index a5c1501f61..0c43954d81 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1036,12 +1036,12 @@ module ActionDispatch # # This generates the following comments routes: # - # GET /photos/:id/comments/new - # POST /photos/:id/comments - # GET /photos/:id/comments/:id - # GET /photos/:id/comments/:id/edit - # PUT /photos/:id/comments/:id - # DELETE /photos/:id/comments/:id + # GET /photos/:photo_id/comments/new + # POST /photos/:photo_id/comments + # GET /photos/:photo_id/comments/:id + # GET /photos/:photo_id/comments/:id/edit + # PUT /photos/:photo_id/comments/:id + # DELETE /photos/:photo_id/comments/:id # # === Options # Takes same options as <tt>Base#match</tt> as well as: |