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:00 -0400
commite94efee946bb440a4ea9fbe89dcb58972a87e8b3 (patch)
tree650211325ab5c4d8d3a0735394d4b284b1b86b49 /docs/ref/templates
parent0ad178c43d7ac377480cc5fd5e3204f912603a49 (diff)
[1.6.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 3c64efb508..e92a46e163 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1245,6 +1245,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:
================ ======================================== =====================