Removed IPAddressField per deprecation timeline; refs #20439.

8 files changed, 11 insertions, 38 deletions

diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index b519b0afab..03f280bd2e 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -95,8 +95,11 @@ Fields
 * **fields.E160**: The options ``auto_now``, ``auto_now_add``, and ``default``
   are mutually exclusive. Only one of these options may be present.
 * **fields.W161**: Fixed default value provided.
+* **fields.E900**: ``IPAddressField`` has been removed except for support in
+  historical migrations.
 * **fields.W900**: ``IPAddressField`` has been deprecated. Support for it
-  (except in historical migrations) will be removed in Django 1.9.
+  (except in historical migrations) will be removed in Django 1.9. *This check
+  appeared in Django 1.7 and 1.8*.
 
 File Fields
 ~~~~~~~~~~~
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index eee3f9f9b8..0a80a3c9f3 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -719,22 +719,6 @@ For each field, we describe the default widget used if you don't specify
 
     These control the range of values permitted in the field.
 
-``IPAddressField``
-~~~~~~~~~~~~~~~~~~
-
-.. class:: IPAddressField(**kwargs)
-
-    .. deprecated:: 1.7
-        This field has been deprecated in favor of
-        :class:`~django.forms.GenericIPAddressField`.
-
-    * Default widget: :class:`TextInput`
-    * Empty value: ``''`` (an empty string)
-    * Normalizes to: A Unicode object.
-    * Validates that the given value is a valid IPv4 address, using a regular
-      expression.
-    * Error message keys: ``required``, ``invalid``
-
 ``GenericIPAddressField``
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 3fd9d0aace..6068fe0f7c 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -892,18 +892,6 @@ An integer. Values from ``-2147483648`` to ``2147483647`` are safe in all
 databases supported by Django. The default form widget for this field is a
 :class:`~django.forms.TextInput`.
 
-``IPAddressField``
-------------------
-
-.. class:: IPAddressField([**options])
-
-.. deprecated:: 1.7
-    This field has been deprecated in favor of
-    :class:`~django.db.models.GenericIPAddressField`.
-
-An IP address, in string format (e.g. "192.0.2.30"). The default form widget
-for this field is a :class:`~django.forms.TextInput`.
-
 ``GenericIPAddressField``
 -------------------------
 
diff --git a/docs/releases/1.4.11.txt b/docs/releases/1.4.11.txt
index 8cfcdbaeed..d6d65f7789 100644
--- a/docs/releases/1.4.11.txt
+++ b/docs/releases/1.4.11.txt
@@ -96,7 +96,7 @@ field classes did not correctly convert their arguments:
 
 * :class:`~django.db.models.FilePathField`
 * :class:`~django.db.models.GenericIPAddressField`
-* :class:`~django.db.models.IPAddressField`
+* ``IPAddressField``
 
 These three fields have been updated to convert their arguments to the
 correct types before querying.
diff --git a/docs/releases/1.5.6.txt b/docs/releases/1.5.6.txt
index 3bffb1c7ad..7c3cd3a75d 100644
--- a/docs/releases/1.5.6.txt
+++ b/docs/releases/1.5.6.txt
@@ -95,7 +95,7 @@ field classes did not correctly convert their arguments:
 
 * :class:`~django.db.models.FilePathField`
 * :class:`~django.db.models.GenericIPAddressField`
-* :class:`~django.db.models.IPAddressField`
+* ``IPAddressField``
 
 These three fields have been updated to convert their arguments to the
 correct types before querying.
diff --git a/docs/releases/1.6.3.txt b/docs/releases/1.6.3.txt
index a3eada7cf2..80438acb4b 100644
--- a/docs/releases/1.6.3.txt
+++ b/docs/releases/1.6.3.txt
@@ -95,7 +95,7 @@ field classes did not correctly convert their arguments:
 
 * :class:`~django.db.models.FilePathField`
 * :class:`~django.db.models.GenericIPAddressField`
-* :class:`~django.db.models.IPAddressField`
+* ``IPAddressField``
 
 These three fields have been updated to convert their arguments to the
 correct types before querying.
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 538394b2a3..01a11d9a96 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -876,10 +876,8 @@ Miscellaneous
   :class:`~django.forms.ModelMultipleChoiceField`.
 
 * Some :attr:`~django.forms.Field.error_messages` for
-  :class:`~django.forms.IntegerField`,
-  :class:`~django.forms.EmailField`,
-  :class:`~django.forms.IPAddressField`,
-  :class:`~django.forms.GenericIPAddressField`, and
+  :class:`~django.forms.IntegerField`, :class:`~django.forms.EmailField`,
+  ``IPAddressField``, :class:`~django.forms.GenericIPAddressField`, and
   :class:`~django.forms.SlugField` have been suppressed because they
   duplicated error messages already provided by validators tied to the fields.
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 09b967dfe5..63aa7722b8 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -1591,8 +1591,8 @@ better handle the case of selectively showing inlines on a ``ModelAdmin``.
 ``IPAddressField``
 ~~~~~~~~~~~~~~~~~~
 
-The :class:`django.db.models.IPAddressField` and
-:class:`django.forms.IPAddressField` fields have been deprecated in favor of
+The ``django.db.models.IPAddressField`` and ``django.forms.IPAddressField``
+fields have been deprecated in favor of
 :class:`django.db.models.GenericIPAddressField` and
 :class:`django.forms.GenericIPAddressField`.