aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorClaudio B. <claudiob@users.noreply.github.com>2015-06-28 09:13:08 -0700
committerClaudio B. <claudiob@users.noreply.github.com>2015-06-28 09:13:08 -0700
commitaba43b7da1f45465fc3753225e5c73046342d4ec (patch)
tree0b324f7bc3aea16397f0549c35388a84a12a3893 /guides
parentfd495a8d180b4fdeff55292f961e0b35071d42e3 (diff)
parentd9212f640863dc23cf86a89b37de7f278e9f9ba0 (diff)
downloadrails-aba43b7da1f45465fc3753225e5c73046342d4ec.tar.gz
rails-aba43b7da1f45465fc3753225e5c73046342d4ec.tar.bz2
rails-aba43b7da1f45465fc3753225e5c73046342d4ec.zip
Merge pull request #20726 from yui-knk/fix/doc_controller
[ci skip] Fix action_controller_overview
Diffstat (limited to 'guides')
-rw-r--r--guides/source/action_controller_overview.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/action_controller_overview.md b/guides/source/action_controller_overview.md
index d506722f75..09fbdc0d32 100644
--- a/guides/source/action_controller_overview.md
+++ b/guides/source/action_controller_overview.md
@@ -738,7 +738,7 @@ You can choose not to yield and build the response yourself, in which case the a
While the most common way to use filters is by creating private methods and using *_action to add them, there are two other ways to do the same thing.
-The first is to use a block directly with the *\_action methods. The block receives the controller as an argument, and the `require_login` filter from above could be rewritten to use a block:
+The first is to use a block directly with the *\_action methods. The block receives the controller as an argument. The `require_login` filter from above could be rewritten to use a block:
```ruby
class ApplicationController < ActionController::Base