From 80ac40c6d4a674b6c5fa16bfa5cb5f95e89c3094 Mon Sep 17 00:00:00 2001
From: ojab <ojab@ojab.ru>
Date: Fri, 15 Jul 2016 20:10:29 +0000
Subject: Mention that layout can call a Proc [ci skip]

Also document return values for Proc/Symbol arguments
---
 actionview/lib/action_view/layouts.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'actionview')

diff --git a/actionview/lib/action_view/layouts.rb b/actionview/lib/action_view/layouts.rb
index a74a5e05f3..bcb357a06f 100644
--- a/actionview/lib/action_view/layouts.rb
+++ b/actionview/lib/action_view/layouts.rb
@@ -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 meaning as described above.
       # ==== Parameters
       # * <tt>layout</tt> - The layout to use.
       #
-- 
cgit v1.2.3