aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-12-13 03:33:06 +0000
committerMarcel Molina <marcel@vernix.org>2007-12-13 03:33:06 +0000
commitb4dd1e6879affc33e4595509fa49f3531759e54d (patch)
tree24609eac6e65d7d7e658505a216441c74eb9348c
parentd98728e09132cfceea89436eb1a120cbe5a2219d (diff)
downloadrails-b4dd1e6879affc33e4595509fa49f3531759e54d.tar.gz
rails-b4dd1e6879affc33e4595509fa49f3531759e54d.tar.bz2
rails-b4dd1e6879affc33e4595509fa49f3531759e54d.zip
Explain how the layout macro behaves when passed a path that contains a directory. Closes #10492 [loincloth]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8378 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/lib/action_controller/layout.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index b960e64c1d..63a68c1080 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -124,7 +124,8 @@ module ActionController #:nodoc:
# class WeblogController < ActionController::Base
# layout "weblog_standard"
#
- # If no directory is specified for the template name, the template will by default by looked for in +app/views/layouts/+.
+ # If no directory is specified for the template name, the template will by default be looked for in +app/views/layouts/+.
+ # Otherwise, it will be looked up relative to the template root.
#
# == Conditional layouts
#