Merge pull request #25850 from ojab/layout_doc_fix

Mention that layout can call a Proc [ci skip]
This commit is contained in:
Rafael Mendonça França 2016-07-17 03:49:35 -03:00
commit b0770523e1
No known key found for this signature in database
GPG Key ID: FC23B6D0F1EEE948
1 changed files with 4 additions and 1 deletions

View File

@ -248,11 +248,14 @@ module ActionView
#
# 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
# Proc:: call the passed Proc
# false:: There is no layout
# true:: raise an ArgumentError
# nil:: Force default layout behavior with inheritance
#
# Return value of Proc & Symbol arguments should be String, false, true or nil
# with the same meaning as described above.
# ==== Parameters
# * <tt>layout</tt> - The layout to use.
#