From 4b89b90e93486d7ff99ccc429bc24c46adb0cb9f Mon Sep 17 00:00:00 2001
From: coreyhaines <coreyhaines@gmail.com>
Date: Tue, 6 Mar 2012 20:43:48 -0600
Subject: In a nested resource route, the parent resource param is
 <resource_name>_id

---
 railties/guides/source/routing.textile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'railties/guides/source/routing.textile')

diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index 42665114be..001b507c3b 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -234,14 +234,14 @@ end
 
 In addition to the routes for magazines, this declaration will also route ads to an +AdsController+. The ad URLs require a magazine:
 
-|_.HTTP Verb |_.Path                      |_.action |_.used for                                                                 |
-|GET         |/magazines/:id/ads          |index    |display a list of all ads for a specific magazine                          |
-|GET         |/magazines/:id/ads/new      |new      |return an HTML form for creating a new ad belonging to a specific magazine |
-|POST        |/magazines/:id/ads          |create   |create a new ad belonging to a specific magazine                           |
-|GET         |/magazines/:id/ads/:id      |show     |display a specific ad belonging to a specific magazine                     |
-|GET         |/magazines/:id/ads/:id/edit |edit     |return an HTML form for editing an ad belonging to a specific magazine     |
-|PATCH/PUT   |/magazines/:id/ads/:id      |update   |update a specific ad belonging to a specific magazine                      |
-|DELETE      |/magazines/:id/ads/:id      |destroy  |delete a specific ad belonging to a specific magazine                      |
+|_.HTTP Verb |_.Path                               |_.action |_.used for                                                                 |
+|GET         |/magazines/:magazine_id/ads          |index    |display a list of all ads for a specific magazine                          |
+|GET         |/magazines/:magazine_id/ads/new      |new      |return an HTML form for creating a new ad belonging to a specific magazine |
+|POST        |/magazines/:magazine_id/ads          |create   |create a new ad belonging to a specific magazine                           |
+|GET         |/magazines/:magazine_id/ads/:id      |show     |display a specific ad belonging to a specific magazine                     |
+|GET         |/magazines/:magazine_id/ads/:id/edit |edit     |return an HTML form for editing an ad belonging to a specific magazine     |
+|PATCH/PUT   |/magazines/:magazine_id/ads/:id      |update   |update a specific ad belonging to a specific magazine                      |
+|DELETE      |/magazines/:magazine_id/ads/:id      |destroy  |delete a specific ad belonging to a specific magazine                      |
 
 This will also create routing helpers such as +magazine_ads_url+ and +edit_magazine_ad_path+. These helpers take an instance of Magazine as the first parameter (+magazine_ads_url(@magazine)+).
 
-- 
cgit v1.2.3


From f434fa846ecd564e1bb6f82025a94c03c22eff59 Mon Sep 17 00:00:00 2001
From: coreyhaines <coreyhaines@gmail.com>
Date: Tue, 6 Mar 2012 20:46:47 -0600
Subject: Left off a : when specifying the :namespace option for a :controller
 path segment

---
 railties/guides/source/routing.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/guides/source/routing.textile')

diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index 001b507c3b..1d4cb9f783 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -389,7 +389,7 @@ match ':controller/:action/:id/:user_id'
 
 An incoming path of +/photos/show/1/2+ will be dispatched to the +show+ action of the +PhotosController+. +params[:id]+ will be +"1"+, and +params[:user_id]+ will be +"2"+.
 
-NOTE: You can't use +namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
+NOTE: You can't use +:namespace+ or +:module+ with a +:controller+ path segment. If you need to do this then use a constraint on :controller that matches the namespace you require. e.g:
 
 <ruby>
 match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
-- 
cgit v1.2.3

