Merge branch 'master' into schema-alteration

1 files changed, 10 insertions, 2 deletions

diff --git a/docs/ref/forms/models.txt b/docs/ref/forms/models.txt
index dd0a422fd0..9b3480758a 100644
--- a/docs/ref/forms/models.txt
+++ b/docs/ref/forms/models.txt
@@ -25,6 +25,14 @@ Model Form Functions
 
     See :ref:`modelforms-factory` for example usage.
 
+    .. versionchanged:: 1.6
+
+    You must provide the list of fields explicitly, either via keyword arguments
+    ``fields`` or ``exclude``, or the corresponding attributes on the form's
+    inner ``Meta`` class. See :ref:`modelforms-selecting-fields` for more
+    information. Omitting any definition of the fields to use will result in all
+    fields being used, but this behaviour is deprecated.
+
 .. function:: modelformset_factory(model, form=ModelForm, formfield_callback=None, formset=BaseModelFormSet, extra=1, can_delete=False, can_order=False, max_num=None, fields=None, exclude=None, widgets=None, validate_max=False)
 
     Returns a ``FormSet`` class for the given ``model`` class.
@@ -42,7 +50,7 @@ Model Form Functions
 
     .. versionchanged:: 1.6
 
-    The ``widgets`` and the ``validate_max`` parameters were added.
+        The ``widgets`` and the ``validate_max`` parameters were added.
 
 .. function:: inlineformset_factory(parent_model, model, form=ModelForm, formset=BaseInlineFormSet, fk_name=None, fields=None, exclude=None, extra=3, can_order=False, can_delete=True, max_num=None, formfield_callback=None, widgets=None, validate_max=False)
 
@@ -57,4 +65,4 @@ Model Form Functions
 
     .. versionchanged:: 1.6
 
-    The ``widgets`` and the ``validate_max`` parameters were added.
+        The ``widgets`` and the ``validate_max`` parameters were added.