Removed versionadded/changed annotations for 1.8.

4 files changed, 5 insertions, 39 deletions

diff --git a/docs/ref/class-based-views/mixins-editing.txt b/docs/ref/class-based-views/mixins-editing.txt
index 832f42ccd4..29e1f05a8e 100644
--- a/docs/ref/class-based-views/mixins-editing.txt
+++ b/docs/ref/class-based-views/mixins-editing.txt
@@ -114,11 +114,6 @@ ModelFormMixin
     :exc:`~django.core.exceptions.ImproperlyConfigured` exception will be
     raised.
 
-    .. versionchanged:: 1.8
-
-        Previously if both ``fields`` and ``form_class`` were specified,
-        ``fields`` was silently ignored.
-
     **Mixins**
 
     * :class:`django.views.generic.edit.FormMixin`
@@ -142,11 +137,6 @@ ModelFormMixin
         result in an :exc:`~django.core.exceptions.ImproperlyConfigured`
         exception.
 
-        .. versionchanged:: 1.8
-
-            Previously, omitting this attribute was allowed and resulted in
-            a form with all fields of the model.
-
     .. attribute:: success_url
 
         The URL to redirect to when the form is successfully processed.
diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt
index 8d64604841..6c4cdadedf 100644
--- a/docs/ref/class-based-views/mixins-multiple-object.txt
+++ b/docs/ref/class-based-views/mixins-multiple-object.txt
@@ -74,8 +74,6 @@ MultipleObjectMixin
 
     .. attribute:: ordering
 
-        .. versionadded:: 1.8
-
         A string or list of strings specifying the ordering to apply to the ``queryset``.
         Valid values are the same as those for :meth:`~django.db.models.query.QuerySet.order_by`.
 
@@ -120,8 +118,6 @@ MultipleObjectMixin
 
     .. method:: get_ordering()
 
-        .. versionadded:: 1.8
-
         Returns a string (or iterable of strings) that defines the ordering that
         will be applied to the ``queryset``.
 
diff --git a/docs/ref/class-based-views/mixins-simple.txt b/docs/ref/class-based-views/mixins-simple.txt
index ba18a1325b..9550c22ed4 100644
--- a/docs/ref/class-based-views/mixins-simple.txt
+++ b/docs/ref/class-based-views/mixins-simple.txt
@@ -51,8 +51,6 @@ TemplateResponseMixin
 
     .. attribute:: template_engine
 
-        .. versionadded:: 1.8
-
         The :setting:`NAME <TEMPLATES-NAME>` of a template engine to use for
         loading the template. ``template_engine`` is passed as the ``using``
         keyword argument to ``response_class``. Default is ``None``, which
@@ -61,25 +59,11 @@ TemplateResponseMixin
     .. attribute:: response_class
 
         The response class to be returned by ``render_to_response`` method.
-        Default is
-        :class:`TemplateResponse <django.template.response.TemplateResponse>`.
-        The template and context of ``TemplateResponse`` instances can be
-        altered later (e.g. in
+        Default is :class:`TemplateResponse
+        <django.template.response.TemplateResponse>`. The template and context
+        of ``TemplateResponse`` instances can be altered later (e.g. in
         :ref:`template response middleware <template-response-middleware>`).
 
-        .. versionchanged:: 1.8
-
-            In older versions of Django, ``TemplateResponse`` used
-            :class:`~django.template.RequestContext` in such a way that values
-            from template context processors would override template variables
-            defined in your views. For example, if you subclassed
-            :class:`DetailView <django.views.generic.detail.DetailView>` and
-            set ``context_object_name`` to ``user``, the
-            ``django.contrib.auth.context_processors.auth`` context processor
-            would overwrite your variable with the current user. Now, for
-            consistency with the ``render()`` shortcut, values in the context
-            provided by the class override values from context processors.
-
         If you need custom template loading or custom context object
         instantiation, create a ``TemplateResponse`` subclass and assign it to
         ``response_class``.
diff --git a/docs/ref/class-based-views/mixins-single-object.txt b/docs/ref/class-based-views/mixins-single-object.txt
index 8296064c15..e7370b3ba8 100644
--- a/docs/ref/class-based-views/mixins-single-object.txt
+++ b/docs/ref/class-based-views/mixins-single-object.txt
@@ -53,8 +53,6 @@ SingleObjectMixin
 
     .. attribute:: query_pk_and_slug
 
-        .. versionadded:: 1.8
-
         If ``True``, causes :meth:`get_object()` to perform its lookup using
         both the primary key and the slug. Defaults to ``False``.
 
@@ -81,10 +79,8 @@ SingleObjectMixin
         :attr:`slug_url_kwarg` argument, and performs a slug lookup using the
         :attr:`slug_field`.
 
-        .. versionchanged:: 1.8
-
-            When :attr:`query_pk_and_slug` is ``True``, ``get_object()`` will
-            perform its lookup using both the primary key and the slug.
+        When :attr:`query_pk_and_slug` is ``True``, ``get_object()`` will
+        perform its lookup using both the primary key and the slug.
 
     .. method:: get_queryset()