Removed versionadded/changed annotations for 1.6.

8 files changed, 4 insertions, 74 deletions

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 6df99742b6..7ebe90060b 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -17,10 +17,6 @@ Overview
 The admin is enabled in the default project template used by
 :djadmin:`startproject`.
 
-.. versionchanged:: 1.6
-
-    In previous versions, the admin wasn't enabled by default.
-
 For reference, here are the requirements:
 
 1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS` setting.
@@ -419,8 +415,6 @@ subclass::
 
     .. admonition:: Note
 
-        .. versionchanged:: 1.6
-
         If you define the ``Meta.model`` attribute on a
         :class:`~django.forms.ModelForm`, you must also define the
         ``Meta.fields`` attribute (or the ``Meta.exclude`` attribute). However,
@@ -693,9 +687,7 @@ subclass::
               list_display = ('full_name',)
 
 
-    * .. versionadded:: 1.6
-
-      The field names in ``list_display`` will also appear as CSS classes in
+    * The field names in ``list_display`` will also appear as CSS classes in
       the HTML output, in the form of ``column-<field_name>`` on each ``<th>``
       element. This can be used to set column widths in a CSS file for example.
 
@@ -918,8 +910,6 @@ subclass::
     the list of objects on the admin change list page. This can save you a
     bunch of database queries.
 
-    .. versionchanged:: 1.6
-
     The value should be either a boolean, a list or a tuple. Default is
     ``False``.
 
@@ -978,8 +968,6 @@ subclass::
 
 .. attribute:: ModelAdmin.preserve_filters
 
-    .. versionadded:: 1.6
-
     The admin now preserves filters on the list view after creating, editing
     or deleting an object. You can restore the previous behavior of clearing
     filters by setting this attribute to ``False``.
@@ -1286,8 +1274,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_search_results(request, queryset, search_term)
 
-    .. versionadded:: 1.6
-
     The ``get_search_results`` method modifies the list of objects displayed in
     to those that match the provided search term. It accepts the request, a
     queryset that applies the current filters, and the user-provided search term.
@@ -1598,8 +1584,6 @@ templates used by the :class:`ModelAdmin` views:
 
     .. admonition:: Note
 
-        .. versionchanged:: 1.6
-
         If you define the ``Meta.model`` attribute on a
         :class:`~django.forms.ModelForm`, you must also define the
         ``Meta.fields`` attribute (or the ``Meta.exclude`` attribute). However,
@@ -1659,10 +1643,6 @@ templates used by the :class:`ModelAdmin` views:
                     return qs
                 return qs.filter(author=request.user)
 
-    .. versionchanged:: 1.6
-
-        The ``get_queryset`` method was previously named ``queryset``.
-
 .. method:: ModelAdmin.message_user(request, message, level=messages.INFO, extra_tags='', fail_silently=False)
 
     Sends a message to the user using the :mod:`django.contrib.messages`
@@ -1817,10 +1797,6 @@ To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
 in your own admin JavaScript without including a second copy, you can use the
 ``django.jQuery`` object on changelist and add/edit views.
 
-.. versionchanged:: 1.6
-
-    The embedded jQuery has been upgraded from 1.4.2 to 1.9.1.
-
 The :class:`ModelAdmin` class requires jQuery by default, so there is no need
 to add jQuery to your ``ModelAdmin``’s list of media resources unless you have
 a specific need. For example, if you require the jQuery library to be in the
@@ -1975,8 +1951,6 @@ The ``InlineModelAdmin`` class adds:
     The dynamic link will not appear if the number of currently displayed forms
     exceeds ``max_num``, or if the user does not have JavaScript enabled.
 
-    .. versionadded:: 1.6
-
     :meth:`InlineModelAdmin.get_extra` also allows you to customize the number
     of extra forms.
 
@@ -1988,8 +1962,6 @@ The ``InlineModelAdmin`` class adds:
     doesn't directly correlate to the number of objects, but can if the value
     is small enough. See :ref:`model-formsets-max-num` for more information.
 
-    .. versionadded:: 1.6
-
     :meth:`InlineModelAdmin.get_max_num` also allows you to customize the
     maximum number of extra forms.
 
@@ -2035,8 +2007,6 @@ The ``InlineModelAdmin`` class adds:
 
 .. method:: InlineModelAdmin.get_extra(request, obj=None, **kwargs)
 
-    .. versionadded:: 1.6
-
     Returns the number of extra inline forms to use. By default, returns the
     :attr:`InlineModelAdmin.extra` attribute.
 
@@ -2055,8 +2025,6 @@ The ``InlineModelAdmin`` class adds:
 
 .. method:: InlineModelAdmin.get_max_num(request, obj=None, **kwargs)
 
-    .. versionadded:: 1.6
-
     Returns the maximum number of extra inline forms to use. By default,
     returns the :attr:`InlineModelAdmin.max_num` attribute.
 
@@ -2551,11 +2519,6 @@ your URLconf. Specifically, add these four patterns:
     url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', name='password_reset_confirm'),
     url(r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete', name='password_reset_complete'),
 
-.. versionchanged:: 1.6
-
-    The pattern for :func:`~django.contrib.auth.views.password_reset_confirm`
-    changed as the ``uid`` is now base 64 encoded.
-
 (This assumes you've added the admin at ``admin/`` and requires that you put
 the URLs starting with ``^admin/`` before the line that includes the admin app
 itself).
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index 34dcb010d5..534edb1f09 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -143,23 +143,12 @@ Methods
         :meth:`~django.contrib.auth.models.User.set_unusable_password()`
         were used.
 
-        .. versionchanged:: 1.6
-
-            In Django 1.4 and 1.5, a blank string was unintentionally stored
-            as an unusable password.
-
     .. method:: check_password(raw_password)
 
         Returns ``True`` if the given raw string is the correct password for
         the user. (This takes care of the password hashing in making the
         comparison.)
 
-        .. versionchanged:: 1.6
-
-            In Django 1.4 and 1.5, a blank string was unintentionally
-            considered to be an unusable password, resulting in this method
-            returning ``False`` for such a password.
-
     .. method:: set_unusable_password()
 
         Marks the user as having no password set.  This isn't the same as
diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt
index ee4f7f1318..ccb9ccaa8e 100644
--- a/docs/ref/contrib/contenttypes.txt
+++ b/docs/ref/contrib/contenttypes.txt
@@ -291,8 +291,6 @@ model:
 
     .. attribute:: GenericForeignKey.for_concrete_model
 
-       .. versionadded:: 1.6
-
        If ``False``, the field will be able to reference proxy models. Default
        is ``True``. This mirrors the ``for_concrete_model`` argument to
        :meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_model`.
@@ -508,11 +506,9 @@ The :mod:`django.contrib.contenttypes.forms` module provides:
     :func:`~django.forms.models.modelformset_factory` and
     :func:`~django.forms.models.inlineformset_factory`.
 
-    .. versionadded:: 1.6
-
-        The ``for_concrete_model`` argument corresponds to the
-        :class:`~django.contrib.contenttypes.fields.GenericForeignKey.for_concrete_model`
-        argument on ``GenericForeignKey``.
+    The ``for_concrete_model`` argument corresponds to the
+    :class:`~django.contrib.contenttypes.fields.GenericForeignKey.for_concrete_model`
+    argument on ``GenericForeignKey``.
 
     .. versionchanged:: 1.7
 
diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index 1506b3c189..2934893776 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -260,8 +260,6 @@ wizard's ``as_view()`` method takes a list of your
         (r'^contact/$', ContactWizard.as_view([ContactForm1, ContactForm2])),
     )
 
-.. versionchanged:: 1.6
-
 You can also pass the form list as a class attribute named ``form_list``::
 
     class ContactWizard(WizardView):
@@ -317,8 +315,6 @@ The ``urls.py`` file would contain something like::
         (r'^checkout/$', OrderWizard.as_view(FORMS, condition_dict={'cc': pay_by_credit_card})),
     )
 
-.. versionchanged:: 1.6
-
 The ``condition_dict`` can be passed as attribute for the ``as_view()`
 method or as a class attribute named ``condition_dict``::
 
@@ -493,8 +489,6 @@ Advanced ``WizardView`` methods
 
 .. method:: WizardView.render_goto_step(step, goto_step, **kwargs)
 
-    .. versionadded:: 1.6
-
     This method is called when the step should be changed to something else
     than the next step. By default, this method just stores the requested
     step ``goto_step`` in the storage and then renders the new step.
@@ -598,8 +592,6 @@ Providing initial data for the forms
     The ``initial_dict`` can also take a list of dictionaries for a specific
     step if the step is a ``FormSet``.
 
-    .. versionchanged:: 1.6
-
     The ``initial_dict`` can also be added as a class attribute named
     ``initial_dict`` to avoid having the initial data in the ``urls.py``.
 
diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt
index c689f3df64..9ef33e03db 100644
--- a/docs/ref/contrib/gis/forms-api.txt
+++ b/docs/ref/contrib/gis/forms-api.txt
@@ -7,8 +7,6 @@ GeoDjango Forms API
 .. module:: django.contrib.gis.forms
    :synopsis: GeoDjango forms API.
 
-.. versionadded:: 1.6
-
 GeoDjango provides some specialized form fields and widgets in order to visually
 display and edit geolocalized data on a map. By default, they use
 `OpenLayers`_-powered maps, with a base WMS layer provided by `Metacarta`_.
diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt
index 487e1dd86c..a020efe1e9 100644
--- a/docs/ref/contrib/messages.txt
+++ b/docs/ref/contrib/messages.txt
@@ -354,8 +354,6 @@ example::
 Adding messages in Class Based Views
 ------------------------------------
 
-.. versionadded:: 1.6
-
 .. class:: views.SuccessMessageMixin
 
     Adds a success message attribute to
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 7d1aa4adbf..3e330a0f70 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -249,10 +249,6 @@ To do this, you can use the sites framework. A simple example::
 Enabling the sites framework
 ============================
 
-.. versionchanged:: 1.6
-
-    In previous versions, the sites framework was enabled by default.
-
 To enable the sites framework, follow these steps:
 
 1. Add ``'django.contrib.sites'`` to your :setting:`INSTALLED_APPS`
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 277e51c71e..61adfef35d 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -139,8 +139,6 @@ into those elements.
 
   .. method:: Feed.get_context_data(**kwargs)
 
-    .. versionadded:: 1.6
-
       There is also a way to pass additional information to title and description
       templates, if you need to supply more than the two variables mentioned
       before. You can provide your implementation of ``get_context_data`` method