Django

Code

Changeset 5650

Show
Ignore:
Timestamp:
07/11/07 23:43:29 (1 year ago)
Author:
adrian
Message:

Added 'New in Django development version' note to docs/syndication_feeds.txt changes from [5643]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/docs/syndication_feeds.txt

    r5643 r5650  
    419419        # GUID -- One of the following three is optional. The framework looks 
    420420        # 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) 
    423425 
    424426        def feed_guid(self, obj): 
    425427            """ 
    426428            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. 
    428430            """ 
    429431 
    430432        def feed_guid(self): 
    431433            """ 
    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. 
    433435            """ 
    434436 
    …… 
    576578 
    577579        # 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 
    579581        # Atom feed). If not provided, the item's link is used by default. 
     582        # 
     583        # (New in Django development version) 
    580584 
    581585        def item_guid(self, obj): 
    582586            """ 
    583             Takes an item, as return by items(), and returns the item's id. 
    584             """ 
    585  
    586         # ITEM AUTHOR NAME --One of the following three is optional. The 
     587            Takes an item, as return by items(), and returns the item's ID. 
     588            """ 
     589 
     590        # ITEM AUTHOR NAME -- One of the following three is optional. The 
    587591        # framework looks for them in this order. 
    588592