diff options
Diffstat (limited to 'docs/topics/forms')
| -rw-r--r-- | docs/topics/forms/formsets.txt | 14 | ||||
| -rw-r--r-- | docs/topics/forms/index.txt | 11 | ||||
| -rw-r--r-- | docs/topics/forms/modelforms.txt | 14 |
3 files changed, 6 insertions, 33 deletions
diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt index 0e32d6131f..44d3154683 100644 --- a/docs/topics/forms/formsets.txt +++ b/docs/topics/forms/formsets.txt @@ -118,13 +118,6 @@ affect validation. If ``validate_max=True`` is passed to the :func:`~django.forms.formsets.formset_factory`, then ``max_num`` will affect validation. See :ref:`validate_max`. -.. versionchanged:: 1.6 - - The ``validate_max`` parameter was added to - :func:`~django.forms.formsets.formset_factory`. Also, the behavior of - ``FormSet`` was brought in line with that of ``ModelFormSet`` so that it - displays initial data regardless of ``max_num``. - Formset validation ------------------ @@ -169,8 +162,6 @@ the expected error message appears for the second item. .. method:: BaseFormSet.total_error_count() -.. versionadded:: 1.6 - To check how many errors there are in the formset, we can use the ``total_error_count`` method:: @@ -344,11 +335,6 @@ excessive. truncated entirely. This is to protect against memory exhaustion attacks using forged POST requests. -.. versionchanged:: 1.6 - - The ``validate_max`` parameter was added to - :func:`~django.forms.formsets.formset_factory`. - ``validate_min`` ~~~~~~~~~~~~~~~~ diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt index 441ab2eea3..9d93083f91 100644 --- a/docs/topics/forms/index.txt +++ b/docs/topics/forms/index.txt @@ -317,14 +317,11 @@ attributes, which can be useful in your templates: The label of the field, e.g. ``Email address``. ``{{ field.label_tag }}`` - The field's label wrapped in the appropriate HTML ``<label>`` tag. + The field's label wrapped in the appropriate HTML ``<label>`` tag. This + includes the form's :attr:`~django.forms.Form.label_suffix`. For example, + the default ``label_suffix`` is a colon:: - .. versionchanged:: 1.6 - - This includes the form's :attr:`~django.forms.Form.label_suffix`. For - example, the default ``label_suffix`` is a colon:: - - <label for="id_email">Email address:</label> + <label for="id_email">Email address:</label> ``{{ field.id_for_label }}`` The ID that will be used for this field (``id_email`` in the example diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt index d01fc64cb2..642616d438 100644 --- a/docs/topics/forms/modelforms.txt +++ b/docs/topics/forms/modelforms.txt @@ -501,10 +501,6 @@ widget:: The ``widgets`` dictionary accepts either widget instances (e.g., ``Textarea(...)``) or classes (e.g., ``Textarea``). -.. versionadded:: 1.6 - - The ``labels``, ``help_texts`` and ``error_messages`` options were added. - Similarly, you can specify the ``labels``, ``help_texts`` and ``error_messages`` attributes of the inner ``Meta`` class if you want to further customize a field. @@ -610,8 +606,6 @@ the field declaratively and setting its ``validators`` parameter:: Enabling localization of fields ------------------------------- -.. versionadded:: 1.6 - By default, the fields in a ``ModelForm`` will not localize their data. To enable localization for fields, you can use the ``localized_fields`` attribute on the ``Meta`` class. @@ -818,8 +812,6 @@ exclude:: Specifying widgets to use in the form with ``widgets`` ------------------------------------------------------ -.. versionadded:: 1.6 - Using the ``widgets`` parameter, you can specify a dictionary of values to customize the ``ModelForm``’s widget class for a particular field. This works the same way as the ``widgets`` dictionary on the inner ``Meta`` @@ -831,8 +823,6 @@ class of a ``ModelForm`` works:: Enabling localization for fields with ``localized_fields`` ---------------------------------------------------------- -.. versionadded:: 1.6 - Using the ``localized_fields`` parameter, you can enable localization for fields in the form. @@ -1196,9 +1186,9 @@ Notice how we pass ``instance`` in both the ``POST`` and ``GET`` cases. Specifying widgets to use in the inline form -------------------------------------------- -.. versionadded:: 1.6 ``inlineformset_factory`` uses ``modelformset_factory`` and passes most of its arguments to ``modelformset_factory``. This means you can use the ``widgets`` parameter in much the same way as passing it to -``modelformset_factory``. See `Specifying widgets to use in the form with widgets`_ above. +``modelformset_factory``. See `Specifying widgets to use in the form with +widgets`_ above. |
