aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/renderer.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-05-04 01:07:24 -0500
committerRafael França <rafaelmfranca@gmail.com>2016-05-04 01:07:24 -0500
commit3de5078fa6f201151194c682a1ce37426b97ecda (patch)
treeed4eaf0a8915f56184770c2c944a1985727b239d /actionpack/lib/action_controller/renderer.rb
parent08e86b4b055c3b527ebc3f3fdaaa2198ce919cd4 (diff)
parent6cb854f70717071529b293e4a3f4dc577fe89006 (diff)
downloadrails-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/action_controller/renderer.rb')
-rw-r--r--actionpack/lib/action_controller/renderer.rb4
1 files changed, 2 insertions, 2 deletions
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: { ... }