From 51c8045145b29fed604f716d4d17958aa803b5ea Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 24 Mar 2014 11:42:56 -0400
Subject: Removed versionadded/changed annotations for 1.6.

---
 docs/ref/forms/api.txt        | 25 +++++++------------------
 docs/ref/forms/fields.txt     | 15 +++++----------
 docs/ref/forms/formsets.txt   |  4 ----
 docs/ref/forms/models.txt     | 10 ----------
 docs/ref/forms/validation.txt |  2 --
 docs/ref/forms/widgets.txt    | 18 ++++--------------
 6 files changed, 16 insertions(+), 58 deletions(-)

(limited to 'docs/ref/forms')

diff --git a/docs/ref/forms/api.txt b/docs/ref/forms/api.txt
index 53e47ed0c2..f2136b202d 100644
--- a/docs/ref/forms/api.txt
+++ b/docs/ref/forms/api.txt
@@ -623,10 +623,6 @@ By default, ``auto_id`` is set to the string ``'id_%s'``.
 A translatable string (defaults to a colon (``:``) in English) that will be
 appended after any label name when a form is rendered.
 
-.. versionchanged:: 1.6
-
-    The default ``label_suffix`` is translatable.
-
 It's possible to customize that character, or omit it entirely, using the
 ``label_suffix`` parameter::
 
@@ -647,8 +643,6 @@ Note that the label suffix is added only if the last character of the
 label isn't a punctuation character (in English, those are ``.``, ``!``, ``?``
 or ``:``).
 
-.. versionadded:: 1.6
-
 You can also customize the ``label_suffix`` on a per-field basis using the
 ``label_suffix`` parameter to :meth:`~django.forms.BoundField.label_tag`.
 
@@ -795,18 +789,13 @@ Optionally, you can provide the ``contents`` parameter which will replace the
 auto-generated label tag. An optional ``attrs`` dictionary may contain
 additional attributes for the ``<label>`` tag.
 
-.. versionchanged:: 1.6
-
-    The label now includes the form's :attr:`~django.forms.Form.label_suffix`
-    (a colon, by default).
-
-.. versionadded:: 1.6
-
-    The optional ``label_suffix`` parameter allows you to override the form's
-    :attr:`~django.forms.Form.label_suffix`. For example, you can use an empty
-    string to hide the label on selected fields. If you need to do this in a
-    template, you could write a custom filter to allow passing parameters to
-    ``label_tag``.
+The HTML that's generated includes the form's
+:attr:`~django.forms.Form.label_suffix` (a colon, by default). The optional
+``label_suffix`` parameter allows you to override the form's
+:attr:`~django.forms.Form.label_suffix`. For example, you can use an empty
+string to hide the label on selected fields. If you need to do this in a
+template, you could write a custom filter to allow passing parameters to
+``label_tag``.
 
 .. versionchanged:: 1.8
 
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 4b092f4b4f..10547a1664 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -481,11 +481,8 @@ For each field, we describe the default widget used if you don't specify
 
     The ``max_value`` and ``min_value`` error messages may contain
     ``%(limit_value)s``, which will be substituted by the appropriate limit.
-
-    .. versionchanged:: 1.6
-
-        Similarly, the ``max_digits``, ``max_decimal_places`` and
-        ``max_whole_digits`` error messages may contain ``%(max)s``.
+    Similarly, the ``max_digits``, ``max_decimal_places`` and
+    ``max_whole_digits`` error messages may contain ``%(max)s``.
 
     Takes four optional arguments:
 
@@ -1105,11 +1102,9 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
     * Error message keys: ``required``, ``list``, ``invalid_choice``,
       ``invalid_pk_value``
 
-    .. versionchanged:: 1.6
-
-        The ``invalid_choice`` message may contain ``%(value)s`` and the
-        ``invalid_pk_value`` message may contain ``%(pk)s``, which will be
-        substituted by the appropriate values.
+    The ``invalid_choice`` message may contain ``%(value)s`` and the
+    ``invalid_pk_value`` message may contain ``%(pk)s``, which will be
+    substituted by the appropriate values.
 
     Allows the selection of one or more model objects, suitable for
     representing a many-to-many relation. As with :class:`ModelChoiceField`,
diff --git a/docs/ref/forms/formsets.txt b/docs/ref/forms/formsets.txt
index 342375b4ee..449e7bf33a 100644
--- a/docs/ref/forms/formsets.txt
+++ b/docs/ref/forms/formsets.txt
@@ -11,10 +11,6 @@ Formset Functions
 
     See :ref:`formsets` for example usage.
 
-    .. versionchanged:: 1.6
-
-    The ``validate_max`` parameter was added.
-
     .. versionchanged:: 1.7
 
     The ``min_num`` and ``validate_min`` parameters were added.
diff --git a/docs/ref/forms/models.txt b/docs/ref/forms/models.txt
index 9700c1ed38..f9bf847068 100644
--- a/docs/ref/forms/models.txt
+++ b/docs/ref/forms/models.txt
@@ -61,11 +61,6 @@ Model Form Functions
 
     See :ref:`model-formsets` for example usage.
 
-    .. versionchanged:: 1.6
-
-        The ``widgets``, ``validate_max``, ``localized_fields``, ``labels``,
-        ``help_texts``, and ``error_messages`` 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, localized_fields=None, labels=None, help_texts=None, error_messages=None)
 
     Returns an ``InlineFormSet`` using :func:`modelformset_factory` with
@@ -76,8 +71,3 @@ Model Form Functions
     the ``parent_model``, you must specify a ``fk_name``.
 
     See :ref:`inline-formsets` for example usage.
-
-    .. versionchanged:: 1.6
-
-        The ``widgets``, ``validate_max`` and ``localized_fields``, ``labels``,
-        ``help_texts``, and ``error_messages`` parameters were added.
diff --git a/docs/ref/forms/validation.txt b/docs/ref/forms/validation.txt
index 6ee9bb17a5..13c1e5a68d 100644
--- a/docs/ref/forms/validation.txt
+++ b/docs/ref/forms/validation.txt
@@ -113,8 +113,6 @@ for all remaining fields are still executed.
 Raising ``ValidationError``
 ---------------------------
 
-.. versionchanged:: 1.6
-
 In order to make error messages flexible and easy to override, consider the
 following guidelines:
 
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 7ed30e030a..93149090a1 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -409,8 +409,6 @@ These widgets make use of the HTML elements ``input`` and ``textarea``.
 
 .. class:: NumberInput
 
-    .. versionadded:: 1.6
-
     Text input: ``<input type="number" ...>``
 
     Beware that not all browsers support entering localized numbers in
@@ -422,8 +420,6 @@ These widgets make use of the HTML elements ``input`` and ``textarea``.
 
 .. class:: EmailInput
 
-    .. versionadded:: 1.6
-
     Text input: ``<input type="email" ...>``
 
 ``URLInput``
@@ -431,8 +427,6 @@ These widgets make use of the HTML elements ``input`` and ``textarea``.
 
 .. class:: URLInput
 
-    .. versionadded:: 1.6
-
     Text input: ``<input type="url" ...>``
 
 ``PasswordInput``
@@ -649,10 +643,8 @@ Selector and checkbox widgets
     simply includes ``{{ myform.beatles }}`` -- they'll be output in a ``<ul>``
     with ``<li>`` tags, as above.
 
-.. versionchanged:: 1.6
-
-The outer ``<ul>`` container will now receive the ``id`` attribute defined on
-the widget.
+    The outer ``<ul>`` container will receive the ``id`` attribute defined on
+    the widget.
 
 .. versionchanged:: 1.7
 
@@ -675,10 +667,8 @@ the widget.
           ...
         </ul>
 
-.. versionchanged:: 1.6
-
-The outer ``<ul>`` container will now receive the ``id`` attribute defined on
-the widget.
+    The outer ``<ul>`` container will receive the ``id`` attribute defined on
+    the widget.
 
 Like :class:`RadioSelect`, you can now loop over the individual checkboxes making
 up the lists. See the documentation of :class:`RadioSelect` for more details.
-- 
cgit v1.3