aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/base.rb
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-02-18 22:02:34 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-02-18 22:02:34 +0530
commit2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3 (patch)
tree1c1f928ff506c4a605356e2b1da522e08ff12020 /actionpack/lib/abstract_controller/base.rb
parent2f689d462d8e94365724c5575b14ab997e11bb43 (diff)
parent709f33d6042463bd4dbfb16f6f8946785556d5ab (diff)
downloadrails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.tar.gz
rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.tar.bz2
rails-2cb86cdb8a0e1d66a646ce81c8e9a065427f89e3.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/abstract_controller/base.rb')
-rw-r--r--actionpack/lib/abstract_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index fd6a46fbec..3d915cf513 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -42,8 +42,8 @@ module AbstractController
controller.public_instance_methods(true)
end
- # The list of hidden actions to an empty array. Defaults to an
- # empty array. This can be modified by other modules or subclasses
+ # The list of hidden actions. Defaults to an empty array.
+ # This can be modified by other modules or subclasses
# to specify particular actions as hidden.
#
# ==== Returns