mirror of https://github.com/django/django.git
Added 'New in Django development version' note to docs/syndication_feeds.txt changes from [5643]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
74fe707e04
commit
0c5d001531
|
@ -418,18 +418,20 @@ This example illustrates all possible attributes and methods for a ``Feed`` clas
|
||||||
|
|
||||||
# GUID -- One of the following three is optional. The framework looks
|
# GUID -- One of the following three is optional. The framework looks
|
||||||
# for them in this order. This property is only used for Atom feeds
|
# 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
|
# (where it is the feed-level ID element). If not provided, the feed
|
||||||
# link is used as the id.
|
# link is used as the ID.
|
||||||
|
#
|
||||||
|
# (New in Django development version)
|
||||||
|
|
||||||
def feed_guid(self, obj):
|
def feed_guid(self, obj):
|
||||||
"""
|
"""
|
||||||
Takes the object returned by get_object() and returns the globally
|
Takes the object returned by get_object() and returns the globally
|
||||||
unique id for the feed as a normal Python string.
|
unique ID for the feed as a normal Python string.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def feed_guid(self):
|
def feed_guid(self):
|
||||||
"""
|
"""
|
||||||
Returns the feed's globally unique id as a normal Python string.
|
Returns the feed's globally unique ID as a normal Python string.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
feed_guid = '/foo/bar/1234' # Hard-coded guid.
|
feed_guid = '/foo/bar/1234' # Hard-coded guid.
|
||||||
|
@ -575,15 +577,17 @@ This example illustrates all possible attributes and methods for a ``Feed`` clas
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# ITEM_GUID -- The following method is optional. This property is
|
# ITEM_GUID -- The following method is optional. This property is
|
||||||
# only used for Atom feeds (it is the id element for an item in an
|
# only used for Atom feeds (it is the ID element for an item in an
|
||||||
# Atom feed). If not provided, the item's link is used by default.
|
# Atom feed). If not provided, the item's link is used by default.
|
||||||
|
#
|
||||||
|
# (New in Django development version)
|
||||||
|
|
||||||
def item_guid(self, obj):
|
def item_guid(self, obj):
|
||||||
"""
|
"""
|
||||||
Takes an item, as return by items(), and returns the item's id.
|
Takes an item, as return by items(), and returns the item's ID.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# ITEM AUTHOR NAME --One of the following three is optional. The
|
# ITEM AUTHOR NAME -- One of the following three is optional. The
|
||||||
# framework looks for them in this order.
|
# framework looks for them in this order.
|
||||||
|
|
||||||
def item_author_name(self, item):
|
def item_author_name(self, item):
|
||||||
|
|
Loading…
Reference in New Issue