Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #16150 -- Added 'feed_url' and clarified 'link' in the Feed ref…

…erence docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17516 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d1f85555008f4444927c92ea3d9b1286079ef650 1 parent 03c8006
Aymeric Augustin authored February 12, 2012

Showing 1 changed file with 21 additions and 4 deletions. Show diff stats Hide diff stats

  1. 25  docs/ref/contrib/syndication.txt
25  docs/ref/contrib/syndication.txt
@@ -388,16 +388,33 @@ This example illustrates all possible attributes and methods for a
388 388
 
389 389
         def link(self, obj):
390 390
             """
391  
-            # Takes the object returned by get_object() and returns the feed's
392  
-            # link as a normal Python string.
  391
+            # Takes the object returned by get_object() and returns the URL
  392
+            # of the HTML version of the feed as a normal Python string.
393 393
             """
394 394
 
395 395
         def link(self):
396 396
             """
397  
-            Returns the feed's link as a normal Python string.
  397
+            Returns the URL of the HTML version of the feed as a normal Python
  398
+            string.
  399
+            """
  400
+
  401
+        link = '/blog/' # Hard-coded URL.
  402
+
  403
+        # FEED_URL -- One of the following three is optional. The framework
  404
+        # looks for them in this order.
  405
+
  406
+        def feed_url(self, obj):
  407
+            """
  408
+            # Takes the object returned by get_object() and returns the feed's
  409
+            # own URL as a normal Python string.
  410
+            """
  411
+
  412
+        def feed_url(self):
  413
+            """
  414
+            Returns the feed's own URL as a normal Python string.
398 415
             """
399 416
 
400  
-        link = '/foo/bar/' # Hard-coded link.
  417
+        feed_url = '/blog/rss/' # Hard-coded URL.
401 418
 
402 419
         # GUID -- One of the following three is optional. The framework looks
403 420
         # for them in this order. This property is only used for Atom feeds

0 notes on commit d1f8555

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