Removed versionadded/changed annotations for 1.6.

1 files changed, 7 insertions, 18 deletions

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