diff options
| author | Tim Graham <timograham@gmail.com> | 2013-06-29 14:14:32 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-06-29 14:17:38 -0400 |
| commit | 62a9abeff05e4af61878bff7ff615cd298cf0d7e (patch) | |
| tree | 871ba783288ff67a51e062fb781b3ca74659781d | |
| parent | def1881370dad3bef7808c9ab00800d0b17e8b92 (diff) | |
[1.5.x] Fixed #20677 - Typos in generic_inlineformset_factory docs.
Thanks Riley Strong for the report.
Backport of 3fd0ee5b46 from master
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 4 | ||||
| -rw-r--r-- | 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 5690e6b773..e83c83a8ee 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -432,8 +432,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 # Avoid a circular import. diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt index fb85653ce8..966661576a 100644 --- a/docs/ref/contrib/contenttypes.txt +++ b/docs/ref/contrib/contenttypes.txt @@ -497,8 +497,8 @@ 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`. |