p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.5.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 def1881370
commit 62a9abeff0
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

@ -432,8 +432,8 @@ def generic_inlineformset_factory(model, form=ModelForm,
""" """
Returns a ``GenericInlineFormSet`` for the given kwargs. Returns a ``GenericInlineFormSet`` for the given kwargs.
You must provide ``ct_field`` and ``object_id`` if they different from the You must provide ``ct_field`` and ``fk_field`` if they are different from
defaults ``content_type`` and ``object_id`` respectively. the defaults ``content_type`` and ``object_id`` respectively.
""" """
opts = model._meta opts = model._meta
# Avoid a circular import. # Avoid a circular import.

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

@ -497,8 +497,8 @@ information.
Returns a ``GenericInlineFormSet`` using Returns a ``GenericInlineFormSet`` using
:func:`~django.forms.models.modelformset_factory`. :func:`~django.forms.models.modelformset_factory`.
You must provide ``ct_field`` and ``object_id`` if they different from the You must provide ``ct_field`` and ``fk_field`` if they are different from
defaults, ``content_type`` and ``object_id`` respectively. Other parameters the defaults, ``content_type`` and ``object_id`` respectively. Other
are similar to those documented in parameters are similar to those documented in
:func:`~django.forms.models.modelformset_factory` and :func:`~django.forms.models.modelformset_factory` and
:func:`~django.forms.models.inlineformset_factory`. :func:`~django.forms.models.inlineformset_factory`.