Commit 2777cd37 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #11973 -- Corrected some misleading documentation regarding the...

[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
parent dcd58497
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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.