Author: gwilson
Date: 2007-11-03 20:14:58 -0500 (Sat, 03 Nov 2007)
New Revision: 6640

Modified:
   django/trunk/django/utils/dateformat.py
   django/trunk/docs/templates.txt
Log:
Fixed #5869 -- Corrected documentation for `now` template tag's "r" format 
character.  Thanks, [EMAIL PROTECTED]


Modified: django/trunk/django/utils/dateformat.py
===================================================================
--- django/trunk/django/utils/dateformat.py     2007-11-04 00:48:10 UTC (rev 
6639)
+++ django/trunk/django/utils/dateformat.py     2007-11-04 01:14:58 UTC (rev 
6640)
@@ -170,7 +170,7 @@
         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):

Modified: django/trunk/docs/templates.txt
===================================================================
--- django/trunk/docs/templates.txt     2007-11-04 00:48:10 UTC (rev 6639)
+++ django/trunk/docs/templates.txt     2007-11-04 01:14:58 UTC (rev 6640)
@@ -740,7 +740,7 @@
                       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.


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to