aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides
diff options
context:
space:
mode:
authorTima Maslyuchenko <dudapip3@gmail.com>2012-02-26 19:32:24 +0200
committerTima Maslyuchenko <dudapip3@gmail.com>2012-02-26 19:32:24 +0200
commitd4b35934d173fca4fad54ca8e88d1366462b2432 (patch)
tree2d1ee5855d5f7cf70bbb00cbdac249ce170dd85a /railties/guides
parenta3a73c4465f8860bf9c98809f41e8dd54466287c (diff)
parent3689b57e0d0a0c66611a2be7a74a3ea6f444469c (diff)
downloadrails-d4b35934d173fca4fad54ca8e88d1366462b2432.tar.gz
rails-d4b35934d173fca4fad54ca8e88d1366462b2432.tar.bz2
rails-d4b35934d173fca4fad54ca8e88d1366462b2432.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides')
-rw-r--r--railties/guides/source/layouts_and_rendering.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index be352cfe3d..1943fa185e 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -359,7 +359,7 @@ class ProductsController < ApplicationController
end
</ruby>
-With this declaration, all of the methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
+With this declaration, all of the views belonging to controller, +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
To assign a specific layout for the entire application, use a +layout+ declaration in your +ApplicationController+ class: