Author: aaugustin
Date: 2012-02-12 07:18:24 -0800 (Sun, 12 Feb 2012)
New Revision: 17516
Modified:
django/trunk/docs/ref/contrib/syndication.txt
Log:
Fixed #16150 -- Added 'feed_url' and clarified 'link' in the Feed reference
docs.
Modified: django/trunk/docs/ref/contrib/syndication.txt
===================================================================
--- django/trunk/docs/ref/contrib/syndication.txt 2012-02-12 15:10:08 UTC
(rev 17515)
+++ django/trunk/docs/ref/contrib/syndication.txt 2012-02-12 15:18:24 UTC
(rev 17516)
@@ -388,17 +388,34 @@
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
# (where it is the feed-level ID element). If not provided, the feed
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@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.
