summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-07-04 08:46:49 -0400
committerTim Graham <timograham@gmail.com>2015-07-04 08:49:05 -0400
commit73cbf08159236c0529e02ed11b2a733c5102bfe2 (patch)
tree8d82f127738b83dab59c3c8fbd11cc4bb83f236e /docs/ref
parente2acbfb69b58b66224cc9d35492dbb5aaa579029 (diff)
[1.8.x] Fixed #25051 -- Clarified return type of {% now %} tag.
Backport of a871cf422d8f7a15d3029684538136e0c92f99dc from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/templates/builtins.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index b4ca36b5e4..b0bcfc92c5 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -810,8 +810,8 @@ This would display as "It is the 4th of September".
You can also use the syntax ``{% now "Y" as current_year %}`` to store the
-output inside a variable. This is useful if you want to use ``{% now %}``
-inside a template tag like :ttag:`blocktrans` for example::
+output (as a string) inside a variable. This is useful if you want to use
+``{% now %}`` inside a template tag like :ttag:`blocktrans` for example::
{% now "Y" as current_year %}
{% blocktrans %}Copyright {{ current_year }}{% endblocktrans %}