Browse files

Merge branch 'master' of github.com:lifo/docrails

  • Loading branch information...
2 parents 129ba87 + 23c4efb commit 5dee3919b559a9a9038da5c87bd24181911ec0c1 @grantm grantm committed Mar 10, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 actionpack/lib/abstract_controller/layouts.rb
View
3 actionpack/lib/abstract_controller/layouts.rb
@@ -238,8 +238,7 @@ def conditional_layout?
#
# If the specified layout is a:
# String:: the String is the template name
- # Symbol:: call the method specified by the symbol, which will return
- # the template name
+ # Symbol:: call the method specified by the symbol, which will return the template name
# false:: There is no layout
# true:: raise an ArgumentError
#

0 comments on commit 5dee391

Please sign in to comment.