diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/helpers.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1687f5af2f..33f2d3d8da 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix incorrect path in helper rdoc. Closes #9926 [viktor tron] + * Partials also set 'object' to the default partial variable. #8823 [Nick Retallack, Jeremy Kemper] * Request profiler. [Jeremy Kemper] diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb index 0e71832144..a1fba0c8a0 100644 --- a/actionpack/lib/action_controller/helpers.rb +++ b/actionpack/lib/action_controller/helpers.rb @@ -87,8 +87,8 @@ module ActionController #:nodoc: # When the argument is a +Module+, it will be included directly in the template class. # helper FooHelper # => includes FooHelper # - # When the argument is the symbol <tt>:all</tt>, the controller will includes all helpers from - # <tt>app/views/helpers/**/*.rb</tt> under +RAILS_ROOT+. + # When the argument is the symbol <tt>:all</tt>, the controller will include all helpers from + # <tt>app/helpers/**/*.rb</tt> under +RAILS_ROOT+. # helper :all # # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available |