Browse files

Fixed #21133 --Clarifed documentation about strftime formatting.

  • Loading branch information...
1 parent a991b01 commit 43a2ec7999dcb0c9b09552b9b44741e89f87bc33 @funkybob funkybob committed with timgraham Sep 21, 2013
Showing with 9 additions and 0 deletions.
  1. +5 −0 docs/ref/class-based-views/mixins-date-based.txt
  2. +4 −0 docs/ref/templates/builtins.txt
View
5 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
---------
View
4 docs/ref/templates/builtins.txt
@@ -1251,6 +1251,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:
================ ======================================== =====================

0 comments on commit 43a2ec7

Please sign in to comment.