Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #10510 -- Added missing versionadded marker for formfield_for_f…

…oreignkey docs. Thanks to onno.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c4eb2883bc4226ae7e20a2f5f0420fb98517ec64 1 parent 0175719
Russell Keith-Magee authored March 24, 2009

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

  1. 16  docs/ref/contrib/admin/index.txt
16  docs/ref/contrib/admin/index.txt
@@ -38,13 +38,13 @@ There are five steps in activating the Django admin site:
38 38
        ``ModelAdmin`` classes.
39 39
 
40 40
     5. Hook the ``AdminSite`` instance into your URLconf.
41  
-    
  41
+
42 42
 Other topics
43 43
 ------------
44 44
 
45 45
 .. toctree::
46 46
    :maxdepth: 1
47  
-   
  47
+
48 48
    actions
49 49
 
50 50
 ``ModelAdmin`` objects
@@ -427,16 +427,16 @@ edit and save multiple rows at once.
427 427
 
428 428
     ``list_editable`` interacts with a couple of other options in particular
429 429
     ways; you should note the following rules:
430  
-    
  430
+
431 431
         * To use ``list_editable`` you must have defined ``ordering`` defined on
432 432
           either your model or your ``ModelAdmin``.
433  
-        
  433
+
434 434
         * Any field in ``list_editable`` must also be in ``list_display``. You
435 435
           can't edit a field that's not displayed!
436  
-          
  436
+
437 437
         * The same field can't be listed in both ``list_editable`` and
438 438
           ``list_display_links`` -- a field can't be both a form and a link.
439  
-        
  439
+
440 440
     You'll get a validation error if any of these rules are broken.
441 441
 
442 442
 ``list_filter``
@@ -770,6 +770,8 @@ This wrapping will protect ``self.my_view`` from unauthorized access.
770 770
 ``formfield_for_foreignkey(self, db_field, request, **kwargs)``
771 771
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
772 772
 
  773
+.. versionadded:: 1.1
  774
+
773 775
 The ``formfield_for_foreignkey`` method on a ``ModelAdmin`` allows you to
774 776
 override the default formfield for a foreign key field. For example, to
775 777
 return a subset of objects for this foreign key field based on the user::
@@ -1207,7 +1209,7 @@ Django-powered Web site. Just create multiple instances of ``AdminSite`` and
1207 1209
 root each one at a different URL.
1208 1210
 
1209 1211
 .. versionchanged:: 1.1
1210  
-    The method for hooking ``AdminSite`` instances into urls has changed in 
  1212
+    The method for hooking ``AdminSite`` instances into urls has changed in
1211 1213
     Django 1.1.
1212 1214
 
1213 1215
 In this example, the URLs ``/basic-admin/`` and ``/advanced-admin/`` feature

0 notes on commit c4eb288

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