diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-05-04 01:07:24 -0500 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2016-05-04 01:07:24 -0500 |
commit | 3de5078fa6f201151194c682a1ce37426b97ecda (patch) | |
tree | ed4eaf0a8915f56184770c2c944a1985727b239d /actionpack/lib | |
parent | 08e86b4b055c3b527ebc3f3fdaaa2198ce919cd4 (diff) | |
parent | 6cb854f70717071529b293e4a3f4dc577fe89006 (diff) | |
download | rails-3de5078fa6f201151194c682a1ce37426b97ecda.tar.gz rails-3de5078fa6f201151194c682a1ce37426b97ecda.tar.bz2 rails-3de5078fa6f201151194c682a1ce37426b97ecda.zip |
Merge pull request #24845 from tomkadwill/action_controller_typos
Fix actionpack typos [ci skip]
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 04e5922ce8..56a8d2e5f4 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -229,7 +229,7 @@ module ActionController HttpAuthentication::Digest::ControllerMethods, HttpAuthentication::Token::ControllerMethods, - # Before callbacks should also be executed the earliest as possible, so + # Before callbacks should also be executed as early as possible, so # also include them at the bottom. AbstractController::Callbacks, diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index 2775a24e56..5ff4a658ad 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -13,11 +13,11 @@ module ActionController # # ApplicationController.renderer.render template: '...' # - # You can use a shortcut on controller to replace previous example with: + # You can use this shortcut in a controller, instead of the previous example: # # ApplicationController.render template: '...' # - # #render method allows you to use any options as when rendering in controller. + # #render allows you to use the same options that you can use when rendering in a controller. # For example, # # FooController.render :action, locals: { ... }, assigns: { ... } |