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

…ing. Backport of 43a2ec7 from master
django · Sep 21, 2013 · e94efee · e94efee
1 parent 0ad178c
commit e94efee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/docs/ref/class-based-views/mixins-date-based.txt b/docs/ref/class-based-views/mixins-date-based.txt
@@ -4,6 +4,11 @@ Date-based mixins
 
 .. currentmodule:: django.views.generic.dates
 
+.. note::
+    All the date formatting attributes in these mixins use
+    :func:`~time.strftime` format characters. Do not try to use the format
+    characters from the :ttag:`now` template tag as they are not compatible.
+
 YearMixin
 ---------
 

diff --git 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:
 
 ================  ========================================  =====================