Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Added 'New in Django development version' note to docs/syndication_fe…

…eds.txt changes from [5643]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0c5d001531f81a8a6ea25d07eccf06f5a8087e2a 1 parent 74fe707
Adrian Holovaty authored July 12, 2007

Showing 1 changed file with 11 additions and 7 deletions. Show diff stats Hide diff stats

  1. 18  docs/syndication_feeds.txt
18  docs/syndication_feeds.txt
@@ -418,18 +418,20 @@ This example illustrates all possible attributes and methods for a ``Feed`` clas
418 418
 
419 419
         # GUID -- One of the following three is optional. The framework looks
420 420
         # for them in this order. This property is only used for Atom feeds
421  
-        # (where it is the feed-level id element). If not provided, the feed
422  
-        # link is used as the id.
  421
+        # (where it is the feed-level ID element). If not provided, the feed
  422
+        # link is used as the ID.
  423
+        #
  424
+        # (New in Django development version)
423 425
 
424 426
         def feed_guid(self, obj):
425 427
             """
426 428
             Takes the object returned by get_object() and returns the globally
427  
-            unique id for the feed as a normal Python string.
  429
+            unique ID for the feed as a normal Python string.
428 430
             """
429 431
 
430 432
         def feed_guid(self):
431 433
             """
432  
-            Returns the feed's globally unique id as a normal Python string.
  434
+            Returns the feed's globally unique ID as a normal Python string.
433 435
             """
434 436
 
435 437
         feed_guid = '/foo/bar/1234' # Hard-coded guid.
@@ -575,15 +577,17 @@ This example illustrates all possible attributes and methods for a ``Feed`` clas
575 577
             """
576 578
 
577 579
         # ITEM_GUID -- The following method is optional. This property is
578  
-        # only used for Atom feeds (it is the id element for an item in an
  580
+        # only used for Atom feeds (it is the ID element for an item in an
579 581
         # Atom feed). If not provided, the item's link is used by default.
  582
+        #
  583
+        # (New in Django development version)
580 584
 
581 585
         def item_guid(self, obj):
582 586
             """
583  
-            Takes an item, as return by items(), and returns the item's id.
  587
+            Takes an item, as return by items(), and returns the item's ID.
584 588
             """
585 589
 
586  
-        # ITEM AUTHOR NAME --One of the following three is optional. The
  590
+        # ITEM AUTHOR NAME -- One of the following three is optional. The
587 591
         # framework looks for them in this order.
588 592
 
589 593
         def item_author_name(self, item):

0 notes on commit 0c5d001

Please sign in to comment.
Something went wrong with that request. Please try again.