test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.6.x] Fixed #20677 - Typos in generic_inlineformset_factory docs. 

Thanks Riley Strong for the report.

Backport of 3fd0ee5b46 from master
This commit is contained in:
Tim Graham 2013-06-29 14:14:32 -04:00
parent 59be2c6875
commit b930733a67
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/contenttypes/generic.py
View File

@ -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

6
docs/ref/contrib/contenttypes.txt
View File

@ -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`.