summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt12
-rw-r--r--docs/releases/1.7.txt12
2 files changed, 17 insertions, 7 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 8ec6f16666..d5856a2c68 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -228,9 +228,9 @@ details on these changes.
* ``ModelAdmin.get_formsets`` will be removed.
-* Remove the backward compatible shims introduced to rename the
+* The backward compatibility shim introduced to rename the
``BaseMemcachedCache._get_memcache_timeout()`` method to
- ``get_backend_timeout()``.
+ ``get_backend_timeout()`` will be removed.
* The ``--natural`` and ``-n`` options for :djadmin:`dumpdata` will be removed.
Use :djadminopt:`--natural-foreign` instead.
@@ -263,8 +263,10 @@ details on these changes.
``requires_system_checks``. Admin validators will be replaced by admin
checks.
-* ``ModelAdmin.validator`` will be removed in favor of the new ``checks``
- attribute.
+* The ``ModelAdmin.validator_class`` and ``default_validator_class`` attributes
+ will be removed.
+
+* ``ModelAdmin.validate()`` will be removed.
* ``django.db.backends.DatabaseValidation.validate_field`` will be removed in
favor of the ``check_field`` method.
@@ -294,6 +296,8 @@ details on these changes.
* Private API ``django.test.utils.TestTemplateLoader`` will be removed.
+* The ``django.contrib.contenttypes.generic`` module will be removed.
+
.. _deprecation-removed-in-1.8:
1.8
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 4b89aebc3c..7277af52d2 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -1694,10 +1694,16 @@ value of the former flag is used. Defining both ``requires_system_checks`` and
The ``check()`` method has replaced the old ``validate()`` method.
-``ModelAdmin.validator``
-~~~~~~~~~~~~~~~~~~~~~~~~
+``ModelAdmin`` validators
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``ModelAdmin.validator_class`` and ``default_validator_class`` attributes
+are deprecated in favor of the new ``checks_class`` attribute.
+
+The ``ModelAdmin.validate()`` method is deprecated in favor of
+``ModelAdmin.check()``.
-``ModelAdmin.validator`` is deprecated in favor of new ``checks`` attribute.
+The ``django.contrib.admin.validation`` module is deprecated.
``django.db.backends.DatabaseValidation.validate_field``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~