summaryrefslogtreecommitdiff
path: root/docs/ref/templates
diff options
context:
space:
mode:
authorCurtis Maloney <curtis@tinbrain.net>2013-09-21 13:54:48 +1000
committerTim Graham <timograham@gmail.com>2013-09-21 06:56:17 -0400
commitb8e7730f3e25a0bcabca82bf5a2e06411ffcc92e (patch)
treed06dd090acddf8b8e748ed7b0258e59e63f0b77b /docs/ref/templates
parentb541cf24d03b694bccce337cbc93aaa0c3a08307 (diff)
[1.5.x] Fixed #21133 -- Clarifed documentation about strftime formatting.
Backport of 43a2ec7999 from master
Diffstat (limited to 'docs/ref/templates')
-rw-r--r--docs/ref/templates/builtins.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 1572b15604..0e9f586d1e 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1201,6 +1201,10 @@ Formats a date according to the given format.
Uses a similar format as PHP's ``date()`` function (http://php.net/date)
with some differences.
+.. note::
+ These format characters are not used in Django outside of templates. They
+ were designed to be compatible with PHP to ease transitioning for designers.
+
Available format strings:
================ ======================================== =====================