Skip to content
Browse files

Apply #3111 to stable. Correct docs for automatic layout assignment. …

…Closes #2610.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3112 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 371fa97 commit 78e95faec5ddd3dcf0759e7e8f4117af9af8644a Marcel Molina committed Nov 20, 2005
Showing with 5 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +3 −1 actionpack/lib/action_controller/layout.rb
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan]
+
* Update to Prototype 1.4.0_rc4. Closes #2943 (old Array.prototype.reverse behavior can be obtained by passing false as an argument). [Sam Stephenson]
* Update to Prototype 1.4.0_rc3. Closes #1893, #2505, #2550, #2748, #2783. [Sam Stephenson]
View
4 actionpack/lib/action_controller/layout.rb
@@ -66,7 +66,9 @@ class << self
# <tt>app/views/layouts/weblog.rhtml</tt> or <tt>app/views/layouts/weblog.rxml</tt> exists then it will be automatically set as
# the layout for your WeblogController. You can create a layout with the name <tt>application.rhtml</tt> or <tt>application.rxml</tt>
# and this will be set as the default controller if there is no layout with the same name as the current controller and there is
- # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour.
+ # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour
+ # for the controller where the layout is set. Explicitly setting the layout in a parent class, though, will not override the
+ # child class's layout assignement if the child class has a layout with the same name.
#
# == Inheritance for layouts
#

0 comments on commit 78e95fa

Please sign in to comment.
Something went wrong with that request. Please try again.