Ticket #14816: inline_model_admin_docs_fix.diff

docs/ref/contrib/admin/index.txt

@@ -1060 +1060 @@
 ``InlineModelAdmin`` options
 -----------------------------
 
-The ``InlineModelAdmin`` class is a subclass of ``ModelAdmin`` so it inherits
-all the same functionality as well as some of its own:
+``InlineModelAdmin`` shares many of the same features as ``ModelAdmin``, and adds some of
+its own (the shared features are actually defined in the ``BaseModelAdmin`` superclass). The
+shared features are:
+
+- :attr:`~ModelAdmin.form`
+- :attr:`~ModelAdmin.fieldsets`
+- :attr:`~ModelAdmin.fields`
+- :attr:`~ModelAdmin.exclude`
+- :attr:`~ModelAdmin.filter_horizontal` and :attr:`~ModelAdmin.filter_vertical`
+- :attr:`~ModelAdmin.prepopulated_fields`
+- :attr:`~ModelAdmin.radio_fields`
+- :attr:`~ModelAdmin.raw_id_fields`
+  
+.. versionadded:: 1.1
+
+- :meth:`~ModelAdmin.formfield_for_foreignkey`
+- :meth:`~ModelAdmin.formfield_for_manytomany`
+
+.. versionadded:: 1.2
+
+- :attr:`~ModelAdmin.readonly_fields`
+- :attr:`~ModelAdmin.formfield_overrides`
+  
+
+The ``InlineModelAdmin`` class adds:
 
 .. attribute:: InlineModelAdmin.model
 
@@ -1146 +1169 @@
     Defaults to ``True``.
 
 
+.. method:: InlineModelAdmin.queryset(self, request)
+
+    The ``queryset`` method on an ``InlineModelAdmin`` returns a
+    :class:`~django.db.models.QuerySet` of all model instances that can be
+    edited by the inline admin control.
+
+
 Working with a model with two or more foreign keys to the same parent model
 ---------------------------------------------------------------------------