diff options
| author | Marcel Molina <marcel@vernix.org> | 2007-11-26 20:57:04 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2007-11-26 20:57:04 +0000 |
| commit | a0c925c0a37c2ef4d8774dcce93c3da187e2d76d (patch) | |
| tree | 0901c8b3008a9e9f9dd89e29d6bfd2b96751010a | |
| parent | 87e506da535118d77b58484a4e6e2d1cd9e13b53 (diff) | |
| download | rails-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
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 53a8b17908..a8762b2730 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Minor inconsistency in description of render example. Closes #10029 [ScottSchram] + * Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods. [rick] * Refactor sanitizer helpers into HTML classes and make it easy to swap them out with custom implementations. Closes #10129. [rick] 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 |