aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/filters.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-26 13:20:46 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-26 13:20:46 +0000
commit82f1e19e4c493920e692309d15f66677ac8063e5 (patch)
treef6d4808b55e22adfadb2bdb27ea3325f71b5cb18 /actionpack/lib/action_controller/filters.rb
parent0b92d38c0083c2077d0533014678ed017026fac1 (diff)
downloadrails-82f1e19e4c493920e692309d15f66677ac8063e5.tar.gz
rails-82f1e19e4c493920e692309d15f66677ac8063e5.tar.bz2
rails-82f1e19e4c493920e692309d15f66677ac8063e5.zip
Fixed docs (closes #2468)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2749 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/filters.rb')
-rw-r--r--actionpack/lib/action_controller/filters.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb
index bf4c16b89d..6bbb91ae8b 100644
--- a/actionpack/lib/action_controller/filters.rb
+++ b/actionpack/lib/action_controller/filters.rb
@@ -41,7 +41,7 @@ module ActionController #:nodoc:
#
# Now any actions performed on the BankController will have the audit method called before. On the VaultController,
# first the audit method is called, then the verify_credentials method. If the audit method returns false, then
- # verify_credentials and the intended action is never called.
+ # verify_credentials and the intended action are never called.
#
# == Filter types
#
@@ -74,7 +74,7 @@ module ActionController #:nodoc:
#
# As you can see, the block expects to be passed the controller after it has assigned the request to the internal variables.
# This means that the block has access to both the request and response objects complete with convenience methods for params,
- # session, template, and assigns. Note: The inline method doesn't strictly has to be a block. Any object that responds to call
+ # session, template, and assigns. Note: The inline method doesn't strictly have to be a block; any object that responds to call
# and returns 1 or -1 on arity will do (such as a Proc or an Method object).
#
# == Filter chain ordering
@@ -143,7 +143,7 @@ module ActionController #:nodoc:
# end
# end
#
- # When setting conditions on inline method (proc) filters the condition must come first and be placed in parenthesis.
+ # When setting conditions on inline method (proc) filters the condition must come first and be placed in parentheses.
#
# class UserPreferences < ActionController::Base
# before_filter(:except => :new) { # some proc ... }