summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/ref/class-based-views/mixins-date-based.txt5
-rw-r--r--docs/ref/templates/builtins.txt4
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/ref/class-based-views/mixins-date-based.txt b/docs/ref/class-based-views/mixins-date-based.txt
index 1a1a4d531b..7003adfa06 100644
--- 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
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:
================ ======================================== =====================