Merge pull request rails#24845 from tomkadwill/action_controller_typos

Fix actionpack typos [ci skip]
kabelak · May 4, 2016 · 3de5078 · 3de5078
2 parents 08e86b4 + 6cb854f
commit 3de5078
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -229,7 +229,7 @@ def self.without_modules(*modules)
       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
@@ -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: { ... }