Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.6.x] Fixed #21133 -- Clarifed documentation about strftime formatt…

…ing.

Backport of 43a2ec7 from master
  • Loading branch information...
commit e94efee946bb440a4ea9fbe89dcb58972a87e8b3 1 parent 0ad178c
Curtis Maloney authored September 21, 2013 timgraham committed September 21, 2013
5  docs/ref/class-based-views/mixins-date-based.txt
@@ -4,6 +4,11 @@ Date-based mixins
4 4
 
5 5
 .. currentmodule:: django.views.generic.dates
6 6
 
  7
+.. note::
  8
+    All the date formatting attributes in these mixins use
  9
+    :func:`~time.strftime` format characters. Do not try to use the format
  10
+    characters from the :ttag:`now` template tag as they are not compatible.
  11
+
7 12
 YearMixin
8 13
 ---------
9 14
 
4  docs/ref/templates/builtins.txt
@@ -1245,6 +1245,10 @@ Formats a date according to the given format.
1245 1245
 Uses a similar format as PHP's ``date()`` function (http://php.net/date)
1246 1246
 with some differences.
1247 1247
 
  1248
+.. note::
  1249
+    These format characters are not used in Django outside of templates. They
  1250
+    were designed to be compatible with PHP to ease transitioning for designers.
  1251
+
1248 1252
 Available format strings:
1249 1253
 
1250 1254
 ================  ========================================  =====================

0 notes on commit e94efee

Please sign in to comment.
Something went wrong with that request. Please try again.