diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-01 22:19:37 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-01 22:19:37 -0600 |
| commit | 2744efdc8b2efa89251ff5219809baa7b8cf8a16 (patch) | |
| tree | d81c3ca7255dfb79803caddaa91a70802a795d3d | |
| parent | dc5cf37d7379e297196dbe542b958b1114ef840e (diff) | |
| parent | cf82b2e034cb99afde9c19babbb96276d3804c5b (diff) | |
| download | rails-2744efdc8b2efa89251ff5219809baa7b8cf8a16.tar.gz rails-2744efdc8b2efa89251ff5219809baa7b8cf8a16.tar.bz2 rails-2744efdc8b2efa89251ff5219809baa7b8cf8a16.zip | |
Merge pull request #21451 from kishore-mohan/typo-helper-description
Typo on helper description and action_controller_overview
| -rw-r--r-- | actionpack/lib/action_controller/metal/helpers.rb | 4 | ||||
| -rw-r--r-- | guides/source/action_controller_overview.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb index fcaf3e6425..d3853e2e83 100644 --- a/actionpack/lib/action_controller/metal/helpers.rb +++ b/actionpack/lib/action_controller/metal/helpers.rb @@ -7,8 +7,8 @@ module ActionController # extract complicated logic or reusable functionality is strongly encouraged. By default, each controller # will include all helpers. These helpers are only accessible on the controller through <tt>.helpers</tt> # - # In previous versions of \Rails the controller will include a helper whose - # name matches that of the controller, e.g., <tt>MyController</tt> will automatically + # In previous versions of \Rails the controller will include a helper which + # matches the name of the controller, e.g., <tt>MyController</tt> will automatically # include <tt>MyHelper</tt>. To return old behavior set +config.action_controller.include_all_helpers+ to +false+. # # Additional helpers can be specified using the +helper+ class method in ActionController::Base or any diff --git a/guides/source/action_controller_overview.md b/guides/source/action_controller_overview.md index b4ca0df0de..19bdea2b8a 100644 --- a/guides/source/action_controller_overview.md +++ b/guides/source/action_controller_overview.md @@ -1114,7 +1114,7 @@ Rescue Most likely your application is going to contain bugs or otherwise throw an exception that needs to be handled. For example, if the user follows a link to a resource that no longer exists in the database, Active Record will throw the `ActiveRecord::RecordNotFound` exception. -Rails' default exception handling displays a "500 Server Error" message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application: +Rails default exception handling displays a "500 Server Error" message for all exceptions. If the request was made locally, a nice traceback and some added information gets displayed so you can figure out what went wrong and deal with it. If the request was remote Rails will just display a simple "500 Server Error" message to the user, or a "404 Not Found" if there was a routing error or a record could not be found. Sometimes you might want to customize how these errors are caught and how they're displayed to the user. There are several levels of exception handling available in a Rails application: ### The Default 500 and 404 Templates |