summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/utils/dateformat.py2
-rw-r--r--docs/templates.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 9a296c3f2d..bfca46b3d5 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -170,7 +170,7 @@ class DateFormat(TimeFormat):
return u"%+03d%02d" % (seconds // 3600, (seconds // 60) % 60)
def r(self):
- "RFC 822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
+ "RFC 2822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
return self.format('D, j M Y H:i:s O')
def S(self):
diff --git a/docs/templates.txt b/docs/templates.txt
index 5d5f657747..39735fcbed 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -740,7 +740,7 @@ Available format strings:
if they're zero and the special-case
strings 'midnight' and 'noon' if
appropriate. Proprietary extension.
- r RFC 822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
+ r RFC 2822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'``
S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'``
month, 2 characters.