[ci skip] Make all tables have Controller#Action, change a tense in sentence.

1 files changed, 93 insertions, 90 deletions

diff --git a/guides/source/routing.md b/guides/source/routing.md
index 37525c48a6..19784823f7 100644
--- a/guides/source/routing.md
+++ b/guides/source/routing.md
@@ -89,15 +89,15 @@ resources :photos
 
 creates seven different routes in your application, all mapping to the `Photos` controller:
 
-| HTTP Verb | Path             | Action  | Used for                                     |
-| --------- | ---------------- | ------- | -------------------------------------------- |
-| GET       | /photos          | index   | display a list of all photos                 |
-| GET       | /photos/new      | new     | return an HTML form for creating a new photo |
-| POST      | /photos          | create  | create a new photo                           |
-| GET       | /photos/:id      | show    | display a specific photo                     |
-| GET       | /photos/:id/edit | edit    | return an HTML form for editing a photo      |
-| PATCH/PUT | /photos/:id      | update  | update a specific photo                      |
-| DELETE    | /photos/:id      | destroy | delete a specific photo                      |
+| HTTP Verb | Path             | Controller#Action | Used for                                     |
+| --------- | ---------------- | ----------------- | -------------------------------------------- |
+| GET       | /photos          | photos#index      | display a list of all photos                 |
+| GET       | /photos/new      | photos#new        | return an HTML form for creating a new photo |
+| POST      | /photos          | photos#create     | create a new photo                           |
+| GET       | /photos/:id      | photos#show       | display a specific photo                     |
+| GET       | /photos/:id/edit | photos#edit       | return an HTML form for editing a photo      |
+| PATCH/PUT | /photos/:id      | photos#update     | update a specific photo                      |
+| DELETE    | /photos/:id      | photos#destroy    | delete a specific photo                      |
 
 NOTE: Because the router uses the HTTP verb and URL to match inbound requests, four URLs map to seven different actions.
 
@@ -152,14 +152,14 @@ resource :geocoder
 
 creates six different routes in your application, all mapping to the `Geocoders` controller:
 
-| HTTP Verb | Path           | Action  | Used for                                      |
-| --------- | -------------- | ------- | --------------------------------------------- |
-| GET       | /geocoder/new  | new     | return an HTML form for creating the geocoder |
-| POST      | /geocoder      | create  | create the new geocoder                       |
-| GET       | /geocoder      | show    | display the one and only geocoder resource    |
-| GET       | /geocoder/edit | edit    | return an HTML form for editing the geocoder  |
-| PATCH/PUT | /geocoder      | update  | update the one and only geocoder resource     |
-| DELETE    | /geocoder      | destroy | delete the geocoder resource                  |
+| HTTP Verb | Path           | Controller#Action | Used for                                      |
+| --------- | -------------- | ----------------- | --------------------------------------------- |
+| GET       | /geocoder/new  | geocoders#new     | return an HTML form for creating the geocoder |
+| POST      | /geocoder      | geocoders#create  | create the new geocoder                       |
+| GET       | /geocoder      | geocoders#show    | display the one and only geocoder resource    |
+| GET       | /geocoder/edit | geocoders#edit    | return an HTML form for editing the geocoder  |
+| PATCH/PUT | /geocoder      | geocoders#update  | update the one and only geocoder resource     |
+| DELETE    | /geocoder      | geocoders#destroy | delete the geocoder resource                  |
 
 NOTE: Because you might want to use the same controller for a singular route (`/account`) and a plural route (`/accounts/45`), singular resources map to plural controllers. So that, for example, `resource :photo` and `resources :photos` creates both singular and plural routes that map to the same controller (`PhotosController`).
 
@@ -189,15 +189,15 @@ end
 
 This will create a number of routes for each of the `posts` and `comments` controller. For `Admin::PostsController`, Rails will create:
 
-| HTTP Verb | Path                  | Action  | Used for                  |
-| --------- | --------------------- | ------- | ------------------------- |
-| GET       | /admin/posts          | index   | admin_posts_path          |
-| GET       | /admin/posts/new      | new     | new_admin_post_path       |
-| POST      | /admin/posts          | create  | admin_posts_path          |
-| GET       | /admin/posts/:id      | show    | admin_post_path(:id)      |
-| GET       | /admin/posts/:id/edit | edit    | edit_admin_post_path(:id) |
-| PATCH/PUT | /admin/posts/:id      | update  | admin_post_path(:id)      |
-| DELETE    | /admin/posts/:id      | destroy | admin_post_path(:id)      |
+| HTTP Verb | Path                  | Controller#Action   | Named Helper              |
+| --------- | --------------------- | ------------------- | ------------------------- |
+| GET       | /admin/posts          | admin/posts#index   | admin_posts_path          |
+| GET       | /admin/posts/new      | admin/posts#new     | new_admin_post_path       |
+| POST      | /admin/posts          | admin/posts#create  | admin_posts_path          |
+| GET       | /admin/posts/:id      | admin/posts#show    | admin_post_path(:id)      |
+| GET       | /admin/posts/:id/edit | admin/posts#edit    | edit_admin_post_path(:id) |
+| PATCH/PUT | /admin/posts/:id      | admin/posts#update  | admin_post_path(:id)      |
+| DELETE    | /admin/posts/:id      | admin/posts#destroy | admin_post_path(:id)      |
 
 If you want to route `/posts` (without the prefix `/admin`) to `Admin::PostsController`, you could use:
 
@@ -229,15 +229,15 @@ resources :posts, path: '/admin/posts'
 
 In each of these cases, the named routes remain the same as if you did not use `scope`. In the last case, the following paths map to `PostsController`:
 
-| HTTP Verb | Path                  | Action  | Named Helper        |
-| --------- | --------------------- | ------- | ------------------- |
-| GET       | /admin/posts          | index   | posts_path          |
-| GET       | /admin/posts/new      | new     | new_post_path       |
-| POST      | /admin/posts          | create  | posts_path          |
-| GET       | /admin/posts/:id      | show    | post_path(:id)      |
-| GET       | /admin/posts/:id/edit | edit    | edit_post_path(:id) |
-| PATCH/PUT | /admin/posts/:id      | update  | post_path(:id)      |
-| DELETE    | /admin/posts/:id      | destroy | post_path(:id)      |
+| HTTP Verb | Path                  | Controller#Action | Named Helper        |
+| --------- | --------------------- | ----------------- | ------------------- |
+| GET       | /admin/posts          | posts#index       | posts_path          |
+| GET       | /admin/posts/new      | posts#new         | new_post_path       |
+| POST      | /admin/posts          | posts#create      | posts_path          |
+| GET       | /admin/posts/:id      | posts#show        | post_path(:id)      |
+| GET       | /admin/posts/:id/edit | posts#edit        | edit_post_path(:id) |
+| PATCH/PUT | /admin/posts/:id      | posts#update      | post_path(:id)      |
+| DELETE    | /admin/posts/:id      | posts#destroy     | post_path(:id)      |
 
 ### Nested Resources
 
@@ -263,15 +263,15 @@ 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/: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                      |
+| HTTP Verb | Path                                 | Controller#Action | Used for                                                                   |
+| --------- | ------------------------------------ | ----------------- | -------------------------------------------------------------------------- |
+| GET       | /magazines/:magazine_id/ads          | ads#index         | display a list of all ads for a specific magazine                          |
+| GET       | /magazines/:magazine_id/ads/new      | ads#new           | return an HTML form for creating a new ad belonging to a specific magazine |
+| POST      | /magazines/:magazine_id/ads          | ads#create        | create a new ad belonging to a specific magazine                           |
+| GET       | /magazines/:magazine_id/ads/:id      | ads#show          | display a specific ad belonging to a specific magazine                     |
+| GET       | /magazines/:magazine_id/ads/:id/edit | ads#edit          | return an HTML form for editing an ad belonging to a specific magazine     |
+| PATCH/PUT | /magazines/:magazine_id/ads/:id      | ads#update        | update a specific ad belonging to a specific magazine                      |
+| DELETE    | /magazines/:magazine_id/ads/:id      | ads#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)`).
 
@@ -350,15 +350,15 @@ end
 
 The comments resource here will have the following routes generated for it:
 
-| HTTP Verb | Path                                   | Named Helper        |
-| --------- | -------------------------------------- | ------------------- |
-| GET       | /posts/:post_id/comments(.:format)     | post_comments       |
-| POST      | /posts/:post_id/comments(.:format)     | post_comments       |
-| GET       | /posts/:post_id/comments/new(.:format) | new_post_comment    |
-| GET       | /sekret/comments/:id/edit(.:format)    | edit_comment        |
-| GET       | /sekret/comments/:id(.:format)         | comment             |
-| PATCH/PUT | /sekret/comments/:id(.:format)         | comment             |
-| DELETE    | /sekret/comments/:id(.:format)         | comment             |
+| HTTP Verb | Path                                   | Controller#Action | Named Helper        |
+| --------- | -------------------------------------- | ----------------- | ------------------- |
+| GET       | /posts/:post_id/comments(.:format)     | comments#index    | post_comments       |
+| POST      | /posts/:post_id/comments(.:format)     | comments#create   | post_comments       |
+| GET       | /posts/:post_id/comments/new(.:format) | comments#new      | new_post_comment    |
+| GET       | /sekret/comments/:id/edit(.:format)    | comments#edit     | edit_comment        |
+| GET       | /sekret/comments/:id(.:format)         | comments#show     | comment             |
+| PATCH/PUT | /sekret/comments/:id(.:format)         | comments#update   | comment             |
+| DELETE    | /sekret/comments/:id(.:format)         | comments#destroy  | comment             |
 
 The `:shallow_prefix` option adds the specified parameter to the named helpers:
 
@@ -372,15 +372,15 @@ end
 
 The comments resource here will have the following routes generated for it:
 
-| HTTP Verb | Path                                   | Named Helper        |
-| --------- | -------------------------------------- | ------------------- |
-| GET       | /posts/:post_id/comments(.:format)     | post_comments       |
-| POST      | /posts/:post_id/comments(.:format)     | post_comments       |
-| GET       | /posts/:post_id/comments/new(.:format) | new_post_comment    |
-| GET       | /comments/:id/edit(.:format)           | edit_sekret_comment |
-| GET       | /comments/:id(.:format)                | sekret_comment      |
-| PATCH/PUT | /comments/:id(.:format)                | sekret_comment      |
-| DELETE    | /comments/:id(.:format)                | sekret_comment      |
+| HTTP Verb | Path                                   | Controller#Action | Named Helper        |
+| --------- | -------------------------------------- | ----------------- | ------------------- |
+| GET       | /posts/:post_id/comments(.:format)     | comments#index    | post_comments       |
+| POST      | /posts/:post_id/comments(.:format)     | comments#create   | post_comments       |
+| GET       | /posts/:post_id/comments/new(.:format) | comments#new      | new_post_comment    |
+| GET       | /comments/:id/edit(.:format)           | comments#edit     | edit_sekret_comment |
+| GET       | /comments/:id(.:format)                | comments#show     | sekret_comment      |
+| PATCH/PUT | /comments/:id(.:format)                | comments#update   | sekret_comment      |
+| DELETE    | /comments/:id(.:format)                | comments#destroy  | sekret_comment      |
 
 ### Routing concerns
 
@@ -485,7 +485,10 @@ end
 
 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:
+Within the block of member routes, each route name specifies the HTTP verb
+will be recognized. 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:
 
 ```ruby
 resources :photos do
@@ -842,15 +845,15 @@ resources :photos, controller: 'images'
 
 will recognize incoming paths beginning with `/photos` but route to the `Images` controller:
 
-| HTTP Verb | Path             | Action  | Named Helper         |
-| --------- | ---------------- | ------- | -------------------- |
-| GET       | /photos          | index   | photos_path          |
-| GET       | /photos/new      | new     | new_photo_path       |
-| POST      | /photos          | create  | photos_path          |
-| GET       | /photos/:id      | show    | photo_path(:id)      |
-| GET       | /photos/:id/edit | edit    | edit_photo_path(:id) |
-| PATCH/PUT | /photos/:id      | update  | photo_path(:id)      |
-| DELETE    | /photos/:id      | destroy | photo_path(:id)      |
+| HTTP Verb | Path             | Controller#Action | Named Helper         |
+| --------- | ---------------- | ----------------- | -------------------- |
+| GET       | /photos          | images#index      | photos_path          |
+| GET       | /photos/new      | images#new        | new_photo_path       |
+| POST      | /photos          | images#create     | photos_path          |
+| GET       | /photos/:id      | images#show       | photo_path(:id)      |
+| GET       | /photos/:id/edit | images#edit       | edit_photo_path(:id) |
+| PATCH/PUT | /photos/:id      | images#update     | photo_path(:id)      |
+| DELETE    | /photos/:id      | images#destroy    | photo_path(:id)      |
 
 NOTE: Use `photos_path`, `new_photo_path`, etc. to generate paths for this resource.
 
@@ -900,15 +903,15 @@ resources :photos, as: 'images'
 
 will recognize incoming paths beginning with `/photos` and route the requests to `PhotosController`, but use the value of the :as option to name the helpers.
 
-| HTTP Verb | Path             | Action  | Named Helper         |
-| --------- | ---------------- | ------- | -------------------- |
-| GET       | /photos          | index   | images_path          |
-| GET       | /photos/new      | new     | new_image_path       |
-| POST      | /photos          | create  | images_path          |
-| GET       | /photos/:id      | show    | image_path(:id)      |
-| GET       | /photos/:id/edit | edit    | edit_image_path(:id) |
-| PATCH/PUT | /photos/:id      | update  | image_path(:id)      |
-| DELETE    | /photos/:id      | destroy | image_path(:id)      |
+| HTTP Verb | Path             | Controller#Action | Named Helper         |
+| --------- | ---------------- | ----------------- | -------------------- |
+| GET       | /photos          | photos#index      | images_path          |
+| GET       | /photos/new      | photos#new        | new_image_path       |
+| POST      | /photos          | photos#create     | images_path          |
+| GET       | /photos/:id      | photos#show       | image_path(:id)      |
+| GET       | /photos/:id/edit | photos#edit       | edit_image_path(:id) |
+| PATCH/PUT | /photos/:id      | photos#update     | image_path(:id)      |
+| DELETE    | /photos/:id      | photos#destroy    | image_path(:id)      |
 
 ### Overriding the `new` and `edit` Segments
 
@@ -1005,15 +1008,15 @@ end
 
 Rails now creates routes to the `CategoriesController`.
 
-| HTTP Verb | Path                       | Action  | Used for                |
-| --------- | -------------------------- | ------- | ----------------------- |
-| GET       | /kategorien                | index   | categories_path         |
-| GET       | /kategorien/neu            | new     | new_category_path       |
-| POST      | /kategorien                | create  | categories_path         |
-| GET       | /kategorien/:id            | show    | category_path(:id)      |
-| GET       | /kategorien/:id/bearbeiten | edit    | edit_category_path(:id) |
-| PATCH/PUT | /kategorien/:id            | update  | category_path(:id)      |
-| DELETE    | /kategorien/:id            | destroy | category_path(:id)      |
+| HTTP Verb | Path                       | Controller#Action  | Named Helper            |
+| --------- | -------------------------- | ------------------ | ----------------------- |
+| GET       | /kategorien                | categories#index   | categories_path         |
+| GET       | /kategorien/neu            | categories#new     | new_category_path       |
+| POST      | /kategorien                | categories#create  | categories_path         |
+| GET       | /kategorien/:id            | categories#show    | category_path(:id)      |
+| GET       | /kategorien/:id/bearbeiten | categories#edit    | edit_category_path(:id) |
+| PATCH/PUT | /kategorien/:id            | categories#update  | category_path(:id)      |
+| DELETE    | /kategorien/:id            | categories#destroy | category_path(:id)      |
 
 ### Overriding the Singular Form