github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-07 20:54:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correct docs for automatic layout assignment. Closes #2610.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Marcel Molina
2005-11-20 18:50:09 +00:00
parent dfa8aa0e1e
commit 55a3979a09
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan]
* Always create new AR sessions rather than trying too hard to avoid database traffic. #2731 [Jeremy Kemper]
* 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]

4
actionpack/lib/action_controller/layout.rb
View File

@@ -66,7 +66,9 @@ module ActionController #:nodoc:
# <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
#