summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorJoseph Dougherty <joseph@jwdougherty.com>2014-09-16 23:30:11 -0400
committerBaptiste Mispelon <bmispelon@gmail.com>2014-09-17 09:24:05 +0200
commit9a66244bd8c8b7202ff51f4aa6069f716ab64317 (patch)
treefaf5e863e8e3047b23e4e17879d1530257feaf52 /docs/ref
parent452587aba858820bdde317083a8a67abf56dcec0 (diff)
[1.6.x] Fixed #23499 -- Error in built-in template tag "now" documentation
Backport of ab8248361e0a7b4fc7684eaaa5891e16b8562683 from master.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/templates/builtins.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index aa2bf66b70..6578a7ae3a 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -770,11 +770,11 @@ Example::
It is {% now "jS F Y H:i" %}
Note that you can backslash-escape a format string if you want to use the
-"raw" value. In this example, "f" is backslash-escaped, because otherwise
-"f" is a format string that displays the time. The "o" doesn't need to be
-escaped, because it's not a format character::
+"raw" value. In this example, both "o" and "f" are backslash-escaped, because
+otherwise each is a format string that displays the year and the time,
+respectively::
- It is the {% now "jS o\f F" %}
+ It is the {% now "jS \o\f F" %}
This would display as "It is the 4th of September".