summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--docs/ref/templates/builtins.txt4
2 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 3f60b25de0..0a48176631 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -473,6 +473,7 @@ answer newbie questions, and generally made Django that much better:
Leo Soto <leo.soto@gmail.com>
Wiliam Alves de Souza <wiliamsouza83@gmail.com>
Don Spaulding <donspauldingii@gmail.com>
+ Calvin Spealman <ironfroggy@gmail.com>
Bjørn Stabell <bjorn@exoweb.net>
Georgi Stanojevski <glisha@gmail.com>
starrynight <cmorgh@gmail.com>
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 4e5c124bd6..cddc9dd0ed 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2285,7 +2285,8 @@ If ``value`` is ``Joel is a slug``, the output would be::
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 @@ For example::
========== ====================== ==================================
Value Argument Outputs
========== ====================== ==================================
+``True`` ``yes``
``True`` ``"yeah,no,maybe"`` ``yeah``
``False`` ``"yeah,no,maybe"`` ``no``
``None`` ``"yeah,no,maybe"`` ``maybe``