aboutsummaryrefslogtreecommitdiffstats
path: root/railties/doc/guides/html/layouts_and_rendering.html
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-12-19 14:27:43 +0000
committerPratik Naik <pratiknaik@gmail.com>2008-12-19 14:27:43 +0000
commitc3f53f412cd170fc295b46e48aa81837ad15ec83 (patch)
tree79de6effe9874f3d17eada3666c13b5f76fa537c /railties/doc/guides/html/layouts_and_rendering.html
parent89b75814045e811d52b19278ae27b5f45c6d9dd6 (diff)
downloadrails-c3f53f412cd170fc295b46e48aa81837ad15ec83.tar.gz
rails-c3f53f412cd170fc295b46e48aa81837ad15ec83.tar.bz2
rails-c3f53f412cd170fc295b46e48aa81837ad15ec83.zip
Merge docrails
Diffstat (limited to 'railties/doc/guides/html/layouts_and_rendering.html')
-rw-r--r--railties/doc/guides/html/layouts_and_rendering.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/doc/guides/html/layouts_and_rendering.html b/railties/doc/guides/html/layouts_and_rendering.html
index 7138c45853..30c114ef82 100644
--- a/railties/doc/guides/html/layouts_and_rendering.html
+++ b/railties/doc/guides/html/layouts_and_rendering.html
@@ -642,7 +642,7 @@ end</tt></pre>
<div class="para"><p>With those declarations, the <tt>inventory</tt> layout would be used only for the <tt>index</tt> method, the <tt>product</tt> layout would be used for everything else except the <tt>rss</tt> method, and the <tt>rss</tt> method will have its layout determined by the automatic layout rules.</p></div>
<h5 id="_layout_inheritance">Layout Inheritance</h5>
<div class="para"><p>Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:</p></div>
-<div class="para"><p><tt>application.rb</tt>:</p></div>
+<div class="para"><p><tt>application_controller.rb</tt>:</p></div>
<div class="listingblock">
<div class="content"><!-- Generator: GNU source-highlight 2.9
by Lorenzo Bettini