aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-11-26 20:57:04 +0000
committerMarcel Molina <marcel@vernix.org>2007-11-26 20:57:04 +0000
commita0c925c0a37c2ef4d8774dcce93c3da187e2d76d (patch)
tree0901c8b3008a9e9f9dd89e29d6bfd2b96751010a /actionpack/lib/action_controller
parent87e506da535118d77b58484a4e6e2d1cd9e13b53 (diff)
downloadrails-a0c925c0a37c2ef4d8774dcce93c3da187e2d76d.tar.gz
rails-a0c925c0a37c2ef4d8774dcce93c3da187e2d76d.tar.bz2
rails-a0c925c0a37c2ef4d8774dcce93c3da187e2d76d.zip
Minor inconsistency in description of render example. Closes #10029 [ScottSchram]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8215 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 9b77f0fb55..3193362fc8 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -764,11 +764,11 @@ module ActionController #:nodoc:
# render :text => "Explosion!", :status => 500
#
# # Renders the clear text "Hi there!" within the current active layout (if one exists)
- # render :text => "Explosion!", :layout => true
+ # render :text => "Hi there!", :layout => true
#
# # Renders the clear text "Hi there!" within the layout
# # placed in "app/views/layouts/special.r(html|xml)"
- # render :text => "Explosion!", :layout => "special"
+ # render :text => "Hi there!", :layout => "special"
#
# The :text option can also accept a Proc object, which can be used to manually control the page generation. This should
# generally be avoided, as it violates the separation between code and content, and because almost everything that can be