summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-01-28 13:51:00 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-01-28 13:51:00 +0000
commit2777cd37a8ceb04e3d4b28de674f9600ff0e0b4a (patch)
tree1b08ef2371ed355489010ee34d210aebb8b5f0a2 /docs/ref
parentdcd58497da04f653a3ed0c5c2ca44bc757d77113 (diff)
[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. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/syndication.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index c27666303c..43a399a15b 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -572,18 +572,18 @@ This example illustrates all possible attributes and methods for a
# 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.