diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
commit | 435b088f5aa5d6bc38369dd9c9d067e21e5b7de1 (patch) | |
tree | 3f64164d58791c4762c5fc5d4ca5240e0aecfebf /railties/doc/guides/source | |
parent | 6ff506ffbc438a92cb6d3cb4351a0a463d57424a (diff) | |
parent | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (diff) | |
download | rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.gz rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.bz2 rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/doc/guides/source')
-rw-r--r-- | railties/doc/guides/source/layouts_and_rendering.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/doc/guides/source/layouts_and_rendering.txt b/railties/doc/guides/source/layouts_and_rendering.txt index 2cba53b94c..8f1fae5007 100644 --- a/railties/doc/guides/source/layouts_and_rendering.txt +++ b/railties/doc/guides/source/layouts_and_rendering.txt @@ -313,7 +313,7 @@ With those declarations, the +inventory+ layout would be used only for the +inde Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example: -+application.rb+: ++application_controller.rb+: [source, ruby] ------------------------------------------------------- |