Author: russellm
Date: 2010-01-28 07:51:00 -0600 (Thu, 28 Jan 2010)
New Revision: 12339

Modified:
   django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt
Log:
[1.1.X] Fixed #11973 -- Corrected some misleading documentation regarding the 
feed_copyright attribute on feeds.

Backport of a small part of r12338 from trunk.

Modified: django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt
===================================================================
--- django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt     
2010-01-28 13:46:18 UTC (rev 12338)
+++ django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt     
2010-01-28 13:51:00 UTC (rev 12339)
@@ -572,18 +572,18 @@
         # COPYRIGHT NOTICE -- One of the following three is optional. The
         # framework looks for them in this order.
 
-        def copyright(self, obj):
+        def feed_copyright(self, obj):
             """
             Takes the object returned by get_object() and returns the feed's
             copyright notice as a normal Python string.
             """
 
-        def copyright(self):
+        def feed_copyright(self):
             """
             Returns the feed's copyright notice as a normal Python string.
             """
 
-        copyright = 'Copyright (c) 2007, Sally Smith' # Hard-coded copyright 
notice.
+        feed_copyright = 'Copyright (c) 2007, Sally Smith' # Hard-coded 
copyright notice.
 
         # TTL -- One of the following three is optional. The framework looks
         # for them in this order. Ignored for Atom feeds.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to