[1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning.

7 files changed, 10 insertions, 10 deletions

diff --git a/docs/ref/class-based-views/mixins-editing.txt b/docs/ref/class-based-views/mixins-editing.txt
index 024b89cd2b..85a868ea18 100644
--- a/docs/ref/class-based-views/mixins-editing.txt
+++ b/docs/ref/class-based-views/mixins-editing.txt
@@ -157,7 +157,7 @@ ModelFormMixin
 
             Support for the new brace-based Python formatting syntax has been
             added. The old ``%(slug)s`` placeholder syntax support has been
-            deprecated and will be removed in Django 2.0.
+            deprecated and will be removed in Django 1.10.
 
     .. method:: get_form_class()
 
@@ -251,7 +251,7 @@ DeletionMixin
 
             Support for the new brace-based Python formatting syntax has been
             added. The old ``%(slug)s`` placeholder syntax support has been
-            deprecated and will be removed in Django 2.0.
+            deprecated and will be removed in Django 1.10.
 
     .. method:: get_success_url()
 
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 55a8bc049e..b6cb05b847 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -852,7 +852,7 @@ For each field, we describe the default widget used if you don't specify
     .. deprecated:: 1.8
 
         The optional argument ``error_message`` is also accepted for backwards
-        compatibility but will be removed in Django 2.0. The preferred way to
+        compatibility but will be removed in Django 1.10. The preferred way to
         provide an error message is to use the :attr:`~Field.error_messages`
         argument, passing a dictionary with ``'invalid'`` as a key and the error
         message as the value.
diff --git a/docs/ref/models/meta.txt b/docs/ref/models/meta.txt
index d972e9b5eb..d8f711b810 100644
--- a/docs/ref/models/meta.txt
+++ b/docs/ref/models/meta.txt
@@ -151,7 +151,7 @@ Migrating from the old API
 
 As part of the formalization of the ``Model._meta`` API (from the
 :class:`django.db.models.options.Options` class), a number of methods and
-properties have been deprecated and will be removed in Django 2.0.
+properties have been deprecated and will be removed in Django 1.10.
 
 These old APIs can be replicated by either:
 
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 8c865edb71..53a5dda00c 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -126,7 +126,7 @@ Default: ``()`` (Empty tuple)
 .. deprecated:: 1.8
 
     This setting, along with the :ttag:`ssi` template tag, is deprecated and
-    will be removed in Django 2.0.
+    will be removed in Django 1.10.
 
 .. versionchanged:: 1.8
 
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 1caec9a634..b4ca36b5e4 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -990,7 +990,7 @@ ssi
 
 .. deprecated:: 1.8
 
-    This tag has been deprecated and will be removed in Django 2.0. Use the
+    This tag has been deprecated and will be removed in Django 1.10. Use the
     :ttag:`include` tag instead.
 
 Outputs the contents of a given file into the page.
@@ -1135,7 +1135,7 @@ by the context as to the current application.
 .. deprecated:: 1.8
 
     The dotted Python path syntax is deprecated and will be removed in
-    Django 2.0::
+    Django 1.10::
 
         {% url 'path.to.some_view' v1 v2 %}
 
@@ -2327,7 +2327,7 @@ contains ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then
 
     An older, more restrictive and verbose input format is also supported:
     ``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``.
-    Support for this syntax will be removed in Django 2.0.
+    Support for this syntax will be removed in Django 1.10.
 
 .. templatefilter:: upper
 
diff --git a/docs/ref/templates/upgrading.txt b/docs/ref/templates/upgrading.txt
index 33057d36bd..887c2719e7 100644
--- a/docs/ref/templates/upgrading.txt
+++ b/docs/ref/templates/upgrading.txt
@@ -150,7 +150,7 @@ You should write::
 Passing a :class:`~django.template.Context` or a
 :class:`~django.template.RequestContext` is still possible when the template
 is loaded by a :class:`~django.template.backends.django.DjangoTemplates`
-backend but it's deprecated and won't be supported in Django 2.0.
+backend but it's deprecated and won't be supported in Django 1.10.
 
 If you're loading a template while you're rendering another template with the
 Django template language and you have access to the current context, for
diff --git a/docs/ref/urls.txt b/docs/ref/urls.txt
index 222f41a76e..073db4c00c 100644
--- a/docs/ref/urls.txt
+++ b/docs/ref/urls.txt
@@ -119,7 +119,7 @@ parameter is useful.
 .. deprecated:: 1.8
 
     Support for string ``view`` arguments is deprecated and will be removed in
-    Django 2.0. Pass the callable  instead.
+    Django 1.10. Pass the callable  instead.
 
     The ``prefix`` parameter has the same meaning as the first argument to
     ``patterns()`` and is only relevant when you're passing a string as the