From 0c5d001531f81a8a6ea25d07eccf06f5a8087e2a Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 12 Jul 2007 04:43:29 +0000 Subject: [PATCH] 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 --- docs/syndication_feeds.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/syndication_feeds.txt b/docs/syndication_feeds.txt index 2af287cf84..fe70f2ae7d 100644 --- a/docs/syndication_feeds.txt +++ b/docs/syndication_feeds.txt @@ -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 # 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 - # link is used as the id. + # (where it is the feed-level ID element). If not provided, the feed + # link is used as the ID. + # + # (New in Django development version) def feed_guid(self, obj): """ 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): """ - 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. @@ -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 - # 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. + # + # (New in Django development version) 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. def item_author_name(self, item):