[1.8.x] Renamed RemovedInDjango20Warning to RemovedInDjango110Warning.

4 files changed, 6 insertions, 6 deletions

diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 9a5ebd5454..31460db03a 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -621,7 +621,7 @@ Session invalidation on password change
     is enabled in :setting:`MIDDLEWARE_CLASSES`. It's included if
     ``settings.py`` was generated by :djadmin:`startproject` on Django ≥ 1.7.
 
-    Session verification will become mandatory in Django 2.0 regardless of
+    Session verification will become mandatory in Django 1.10 regardless of
     whether or not ``SessionAuthenticationMiddleware`` is enabled. If you have
     a pre-1.7 project or one generated using a template that doesn't include
     ``SessionAuthenticationMiddleware``, consider enabling it before then after
@@ -1076,7 +1076,7 @@ implementation details see :ref:`using-the-views`.
     .. deprecated:: 1.8
 
         The ``is_admin_site`` argument is deprecated and will be removed in
-        Django 2.0.
+        Django 1.10.
 
     **Template context:**
 
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index 3f3db308d9..e0fc3aa573 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -49,7 +49,7 @@ Optional arguments
     .. versionchanged:: 1.8
 
        The ``context`` argument used to be called ``dictionary``. That name
-       is deprecated in Django 1.8 and will be removed in Django 2.0.
+       is deprecated in Django 1.8 and will be removed in Django 1.10.
 
 ``context_instance``
     The context instance to render the template with. By default, the template
@@ -146,7 +146,7 @@ Optional arguments
     .. versionchanged:: 1.8
 
        The ``context`` argument used to be called ``dictionary``. That name
-       is deprecated in Django 1.8 and will be removed in Django 2.0.
+       is deprecated in Django 1.8 and will be removed in Django 1.10.
 
 ``context_instance``
     The context instance to render the template with. By default, the template
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 9220cda737..ede30bde9f 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1236,7 +1236,7 @@ Language prefix in URL patterns
 .. deprecated:: 1.8
 
     The ``prefix`` argument to ``i18n_patterns()`` has been deprecated and will
-    not be supported in Django 2.0. Simply pass a list of
+    not be supported in Django 1.10. Simply pass a list of
     :func:`django.conf.urls.url` instances instead.
 
 This function can be used in your root URLconf and Django will automatically
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index 7a0fc77373..2bb3606d19 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -273,7 +273,7 @@ templates, Django provides a shortcut function which automates the process.
         .. versionchanged:: 1.8
 
             The ``context`` argument used to be called ``dictionary``. That name
-            is deprecated in Django 1.8 and will be removed in Django 2.0.
+            is deprecated in Django 1.8 and will be removed in Django 1.10.
 
             ``context`` is now optional. An empty context will be used if it
             isn't provided.