[1.2.X] Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report.

Backport of [15124] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15125 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 7 insertions, 4 deletions

diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt
index b6956512ad..d98dd9a8cd 100644
--- a/docs/ref/contrib/contenttypes.txt
+++ b/docs/ref/contrib/contenttypes.txt
@@ -359,12 +359,15 @@ relations, you'll need to calculate them without using the aggregation API.
 Generic relations in forms and admin
 ------------------------------------
 
-:mod:`django.contrib.contenttypes.generic` provides both a
-:class:`~django.contrib.contenttypes.generic.GenericInlineFormSet`
-and :class:`~django.contrib.contenttypes.generic.GenericInlineModelAdmin`.
+:mod:`django.contrib.contenttypes.generic` provides
+:class:`~django.contrib.contenttypes.generic.GenericInlineFormSet`,
+:class:`~django.contrib.contenttypes.generic.GenericTabularInline`
+and :class:`~django.contrib.contenttypes.generic.GenericStackedInline`
+(the last two subclasses of :class:`~django.contrib.contenttypes.generic.GenericInlineModelAdmin`).
 This enables the use of generic relations in forms and the admin. See the
 :doc:`model formset </topics/forms/modelforms>` and
-:doc:`admin </ref/contrib/admin/index>` documentation for more information.
+:ref:`admin <using-generic-relations-as-an-inline>` documentation for more
+information.
 
 .. class:: generic.GenericInlineModelAdmin