From d1f85555008f4444927c92ea3d9b1286079ef650 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 12 Feb 2012 15:18:24 +0000 Subject: [PATCH] Fixed #16150 -- Added 'feed_url' and clarified 'link' in the Feed reference docs. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17516 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/contrib/syndication.txt | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt index e66bb46206..18e447d481 100644 --- a/docs/ref/contrib/syndication.txt +++ b/docs/ref/contrib/syndication.txt @@ -388,16 +388,33 @@ This example illustrates all possible attributes and methods for a def link(self, obj): """ - # Takes the object returned by get_object() and returns the feed's - # link as a normal Python string. + # Takes the object returned by get_object() and returns the URL + # of the HTML version of the feed as a normal Python string. """ def link(self): """ - Returns the feed's link as a normal Python string. + Returns the URL of the HTML version of the feed as a normal Python + string. """ - link = '/foo/bar/' # Hard-coded link. + link = '/blog/' # Hard-coded URL. + + # FEED_URL -- One of the following three is optional. The framework + # looks for them in this order. + + def feed_url(self, obj): + """ + # Takes the object returned by get_object() and returns the feed's + # own URL as a normal Python string. + """ + + def feed_url(self): + """ + Returns the feed's own URL as a normal Python string. + """ + + feed_url = '/blog/rss/' # Hard-coded URL. # GUID -- One of the following three is optional. The framework looks # for them in this order. This property is only used for Atom feeds