From b930733a67cbc1235daf675de06d73e3b6406113 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 29 Jun 2013 14:14:32 -0400 Subject: [PATCH] [1.6.x] Fixed #20677 - Typos in generic_inlineformset_factory docs. Thanks Riley Strong for the report. Backport of 3fd0ee5b46 from master --- django/contrib/contenttypes/generic.py | 4 ++-- docs/ref/contrib/contenttypes.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 26db4ab171..e14aa5ecee 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -434,8 +434,8 @@ def generic_inlineformset_factory(model, form=ModelForm, """ Returns a ``GenericInlineFormSet`` for the given kwargs. - You must provide ``ct_field`` and ``object_id`` if they different from the - defaults ``content_type`` and ``object_id`` respectively. + You must provide ``ct_field`` and ``fk_field`` if they are different from + the defaults ``content_type`` and ``object_id`` respectively. """ opts = model._meta # if there is no field called `ct_field` let the exception propagate diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt index de9c5dcbd6..199401c64a 100644 --- a/docs/ref/contrib/contenttypes.txt +++ b/docs/ref/contrib/contenttypes.txt @@ -506,9 +506,9 @@ information. Returns a ``GenericInlineFormSet`` using :func:`~django.forms.models.modelformset_factory`. - You must provide ``ct_field`` and ``object_id`` if they different from the - defaults, ``content_type`` and ``object_id`` respectively. Other parameters - are similar to those documented in + You must provide ``ct_field`` and ``fk_field`` if they are different from + the defaults, ``content_type`` and ``object_id`` respectively. Other + parameters are similar to those documented in :func:`~django.forms.models.modelformset_factory` and :func:`~django.forms.models.inlineformset_factory`.