Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 3112

Show
Ignore:
Timestamp:
11/20/05 18:55:26 (3 years ago)
Author:
marcel
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/stable/actionpack/CHANGELOG

    r3091 r3112  
    11*SVN* 
     2 
     3* Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan] 
    24 
    35* 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] 
  • branches/stable/actionpack/lib/action_controller/layout.rb

    r2777 r3112  
    6767    # the layout for your WeblogController. You can create a layout with the name <tt>application.rhtml</tt> or <tt>application.rxml</tt> 
    6868    # 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  
    69     # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour.  
     69    # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour 
     70    # for the controller where the layout is set. Explicitly setting the layout in a parent class, though, will not override the  
     71    # child class's layout assignement if the child class has a layout with the same name.  
    7072    # 
    7173    # == Inheritance for layouts