summaryrefslogtreecommitdiff
path: root/docs/ref/templates/builtins.txt
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-01 21:39:26 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-01 21:39:26 +0000
commitd981cb4e66245bbe4c5a91e8a5d3747fcf9a6a88 (patch)
treea64c0abd312e59aaa2bfd7c41a95e242376a3af8 /docs/ref/templates/builtins.txt
parentac371ccac8dada9f97fd66fc9780c085e7f04470 (diff)
Fixed #7262 - Added ISO 8601 and microsecond format string to utils.dateformat. Thanks zegor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/templates/builtins.txt')
-rw-r--r--docs/ref/templates/builtins.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index b7afa15f7f..51ef03c886 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -637,6 +637,7 @@ Available format strings:
A ``'AM'`` or ``'PM'``. ``'AM'``
b Month, textual, 3 letters, lowercase. ``'jan'``
B Not implemented.
+ c ISO 8601 Format. ``2008-01-02 10:30:00.000123``
d Day of the month, 2 digits with ``'01'`` to ``'31'``
leading zeros.
D Day of the week, textual, 3 letters. ``'Fri'``
@@ -673,6 +674,7 @@ Available format strings:
month, 2 characters.
t Number of days in the given month. ``28`` to ``31``
T Time zone of this machine. ``'EST'``, ``'MDT'``
+ u Microseconds. ``0`` to ``999999``
U Seconds since the Unix Epoch
(January 1 1970 00:00:00 UTC).
w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday)