Author: kmtracey
Date: 2011-11-12 10:47:51 -0800 (Sat, 12 Nov 2011)
New Revision: 17086

Modified:
   django/trunk/AUTHORS
   django/trunk/docs/ref/templates/builtins.txt
Log:
Fix #17179: Document that yesno filter's default argument is "yes,no,maybe". 
Thanks CarlFK and calvinspealman.

Modified: django/trunk/AUTHORS
===================================================================
--- django/trunk/AUTHORS        2011-11-12 17:37:29 UTC (rev 17085)
+++ django/trunk/AUTHORS        2011-11-12 18:47:51 UTC (rev 17086)
@@ -473,6 +473,7 @@
     Leo Soto <[email protected]>
     Wiliam Alves de Souza <[email protected]>
     Don Spaulding <[email protected]>
+    Calvin Spealman <[email protected]>
     Bjørn Stabell <[email protected]>
     Georgi Stanojevski <[email protected]>
     starrynight <[email protected]>

Modified: django/trunk/docs/ref/templates/builtins.txt
===================================================================
--- django/trunk/docs/ref/templates/builtins.txt        2011-11-12 17:37:29 UTC 
(rev 17085)
+++ django/trunk/docs/ref/templates/builtins.txt        2011-11-12 18:47:51 UTC 
(rev 17086)
@@ -2285,7 +2285,8 @@
 yesno
 ^^^^^
 
-Given a string mapping values for true, false and (optionally) None,
+Maps values for true, false and (optionally) None, to the strings "yes", "no",
+"maybe", or a custom mapping passed as a comma-separated list, and
 returns one of those strings according to the value:
 
 For example::
@@ -2295,6 +2296,7 @@
 ==========  ======================  ==================================
 Value       Argument                Outputs
 ==========  ======================  ==================================
+``True``                            ``yes``
 ``True``    ``"yeah,no,maybe"``     ``yeah``
 ``False``   ``"yeah,no,maybe"``     ``no``
 ``None``    ``"yeah,no,maybe"``     ``maybe``

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to