Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Thanks Riley Strong for the report.

Backport of 3fd0ee5 from master
  • Loading branch information...
commit b930733a67cbc1235daf675de06d73e3b6406113 1 parent 59be2c6
Tim Graham authored June 29, 2013
4  django/contrib/contenttypes/generic.py
@@ -434,8 +434,8 @@ def generic_inlineformset_factory(model, form=ModelForm,
434 434
     """
435 435
     Returns a ``GenericInlineFormSet`` for the given kwargs.
436 436
 
437  
-    You must provide ``ct_field`` and ``object_id`` if they different from the
438  
-    defaults ``content_type`` and ``object_id`` respectively.
  437
+    You must provide ``ct_field`` and ``fk_field`` if they are different from
  438
+    the defaults ``content_type`` and ``object_id`` respectively.
439 439
     """
440 440
     opts = model._meta
441 441
     # if there is no field called `ct_field` let the exception propagate
6  docs/ref/contrib/contenttypes.txt
@@ -506,9 +506,9 @@ information.
506 506
     Returns a ``GenericInlineFormSet`` using
507 507
     :func:`~django.forms.models.modelformset_factory`.
508 508
 
509  
-    You must provide ``ct_field`` and ``object_id`` if they different from the
510  
-    defaults, ``content_type`` and ``object_id`` respectively. Other parameters
511  
-    are similar to those documented in
  509
+    You must provide ``ct_field`` and ``fk_field`` if they are different from
  510
+    the defaults, ``content_type`` and ``object_id`` respectively. Other
  511
+    parameters are similar to those documented in
512 512
     :func:`~django.forms.models.modelformset_factory` and
513 513
     :func:`~django.forms.models.inlineformset_factory`.
514 514
 

0 notes on commit b930733

Please sign in to comment.
Something went wrong with that request. Please try again.