summaryrefslogtreecommitdiff
path: root/docs
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:46:49 -0400
commita871cf422d8f7a15d3029684538136e0c92f99dc (patch)
treec29791a82dc9f13f6864a51bf34e9660f264ec0e /docs
parentf5d5867a4a6aeddd58ff855a01ab4e438d938ac1 (diff)
Fixed #25051 -- Clarified return type of {% now %} tag.
Diffstat (limited to 'docs')
-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 95ec7c19cd..7f77491c5d 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -814,8 +814,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 %}