Added RemovedInDjango21Warning

2 files changed, 13 insertions, 2 deletions

diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
index 7627426080..7872124cd6 100644
--- a/django/utils/deprecation.py
+++ b/django/utils/deprecation.py
@@ -4,14 +4,17 @@ import inspect
 import warnings
 
 
-class RemovedInDjango20Warning(PendingDeprecationWarning):
+class RemovedInDjango20Warning(DeprecationWarning):
     pass
 
 
-class RemovedInNextVersionWarning(DeprecationWarning):
+class RemovedInDjango21Warning(PendingDeprecationWarning):
     pass
 
 
+RemovedInNextVersionWarning = RemovedInDjango20Warning
+
+
 class warn_about_renamed_method(object):
     def __init__(self, class_name, old_method_name, new_method_name, deprecation_warning):
         self.class_name = class_name
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 99c9db5e50..6f11348832 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -7,6 +7,14 @@ in a backward incompatible way, following their deprecation, as per the
 :ref:`deprecation policy <internal-release-deprecation-policy>`. More details
 about each item can often be found in the release notes of two versions prior.
 
+.. _deprecation-removed-in-2.1:
+
+2.1
+---
+
+See the :ref:`Django 1.11 release notes<deprecated-features-1.11>` for more
+details on these changes.
+
 .. _deprecation-removed-in-2.0:
 
 2.0