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

Ticket #7126: fixed_space_and_removed_apostrophe_in_layout_documentation.2.diff

File fixed_space_and_removed_apostrophe_in_layout_documentation.2.diff, 0.9 kB (added by jeremymcanally, 1 year ago)

Fixed to apply cleanly on edge

  • actionpack/lib/action_controller/layout.rb

    old new  
    165165    # variable. The preferred notation now is to use <tt>yield</tt>, as documented above. 
    166166    module ClassMethods 
    167167      # If a layout is specified, all rendered actions will have their result rendered   
    168       # when the layout<tt>yield</tt>'s. This layout can itself depend on instance variables assigned during action 
     168      # when the layout <tt>yield</tt>s. This layout can itself depend on instance variables assigned during action 
    169169      # performance and have access to them as any normal template would. 
    170170      def layout(template_name, conditions = {}, auto = false) 
    171171        add_layout_conditions(conditions)