aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/layout.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2007-12-05 22:19:10 +0000
committerMarcel Molina <marcel@vernix.org>2007-12-05 22:19:10 +0000
commit57c9630944b43b9d91fd7cc8287253f06bbfaf26 (patch)
treecd22df8b77656f6171cc542c2e47014fae181b83 /actionpack/lib/action_controller/layout.rb
parent5af446346aaa4450b3057f3c7b9abfbfd605cc4e (diff)
downloadrails-57c9630944b43b9d91fd7cc8287253f06bbfaf26.tar.gz
rails-57c9630944b43b9d91fd7cc8287253f06bbfaf26.tar.bz2
rails-57c9630944b43b9d91fd7cc8287253f06bbfaf26.zip
Adding missing space to documentation of the layout method. Closes #7126 [orangechicken, jeremymcanally]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8317 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
-rw-r--r--actionpack/lib/action_controller/layout.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index cbe0ea6587..b960e64c1d 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -165,7 +165,7 @@ module ActionController #:nodoc:
# variable. The preferred notation now is to use <tt>yield</tt>, as documented above.
module ClassMethods
# If a layout is specified, all rendered actions will have their result rendered
- # when the layout<tt>yield</tt>'s. This layout can itself depend on instance variables assigned during action
+ # when the layout <tt>yield</tt>s. This layout can itself depend on instance variables assigned during action
# performance and have access to them as any normal template would.
def layout(template_name, conditions = {}, auto = false)
add_layout_conditions(conditions)