1 files changed, 9 insertions, 13 deletions
diff --git a/guides/source/routing.md b/guides/source/routing.md
index 714c0b609e..14f23d4020 100644
--- a/guides/source/routing.md
+++ b/guides/source/routing.md
@@ -5,11 +5,11 @@ This guide covers the user-facing features of Rails routing.
 
 After reading this guide, you will know:
 
-* Understand the code in `routes.rb`.
-* Construct your own routes, using either the preferred resourceful style or the `match` method.
-* Identify what parameters to expect an action to receive.
-* Automatically create paths and URLs using route helpers.
-* Use advanced techniques such as constraints and Rack endpoints.
+* How to interpret the code in `routes.rb`.
+* How to construct your own routes, using either the preferred resourceful style or the `match` method.
+* What parameters to expect an action to receive.
+* How to automatically create paths and URLs using route helpers.
+* Advanced techniques such as constraints and Rack endpoints.
 
 --------------------------------------------------------------------------------
 
@@ -471,7 +471,7 @@ resources :photos do
 end
 ```
 
-This will recognize `/photos/1/preview` with GET, and route to the `preview` action of `PhotosController`. It will also create the `preview_photo_url` and `preview_photo_path` helpers.
+This will recognize `/photos/1/preview` with GET, and route to the `preview` action of `PhotosController`, with the resource id value passed in `params[:id]`. It will also create the `preview_photo_url` and `preview_photo_path` helpers.
 
 Within the block of member routes, each route name specifies the HTTP verb that it will recognize. You can use `get`, `patch`, `put`, `post`, or `delete` here. If you don't have multiple `member` routes, you can also pass `:on` to a route, eliminating the block:
 
@@ -481,6 +481,8 @@ resources :photos do
 end
 ```
 
+You can leave out the `:on` option, this will create the same member route except that the resource id value will be available in `params[:photo_id]` instead of `params[:id]`.
+
 #### Adding Collection Routes
 
 To add a route to the collection:
@@ -733,12 +735,6 @@ get '*a/foo/*b', to: 'test#index'
 
 would match `zoo/woo/foo/bar/baz` with `params[:a]` equals `'zoo/woo'`, and `params[:b]` equals `'bar/baz'`.
 
-NOTE: Starting from Rails 3.1, wildcard segments will always match the optional format segment by default. For example if you have this route:
-
-```ruby
-get '*pages', to: 'pages#show'
-```
-
 NOTE: By requesting `'/foo/bar.json'`, your `params[:pages]` will be equals to `'foo/bar'` with the request format of JSON. If you want the old 3.0.x behavior back, you could supply `format: false` like this:
 
 ```ruby
@@ -797,7 +793,7 @@ root to: 'pages#main'
 root 'pages#main' # shortcut for the above
 ```
 
-You should put the `root` route at the top of the file, because it is the most popular route and should be matched first. You also need to delete the `public/index.html` file for the root route to take effect.
+You should put the `root` route at the top of the file, because it is the most popular route and should be matched first.
 
 NOTE: The `root` route only routes `GET` requests to the action.