summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/checks.txt4
-rw-r--r--docs/ref/contrib/admin/index.txt6
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index f6fedf87d3..4627367823 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -759,6 +759,8 @@ with the admin site:
referenced by ``<modeladmin>.autocomplete_fields``.
* **admin.E040**: ``<modeladmin>`` must define ``search_fields``, because
it's referenced by ``<other_modeladmin>.autocomplete_fields``.
+* **admin.E041**: The value of ``delete_confirmation_max_display`` must be a
+ non-negative integer or ``None``.
``ModelAdmin``
~~~~~~~~~~~~~~
@@ -819,8 +821,6 @@ with the admin site:
method for the ``<action>`` action.
* **admin.E130**: ``__name__`` attributes of actions defined in
``<modeladmin>`` must be unique. Name ``<name>`` is not unique.
-* **admin.E131**: The value of ``delete_confirmation_max_display`` must be a
- non-negative integer or ``None``.
``InlineModelAdmin``
~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index e814e0aca0..875739cffa 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1403,8 +1403,10 @@ default templates used by the :class:`ModelAdmin` views:
relationship hierarchy. This is purely a display setting and does not
affect the total number of objects retrieved from the database.
- This applies to both :meth:`delete_view` and the ``delete_selected``
- action. By default, this is ``None`` (no truncation).
+ This applies to :meth:`delete_view` and the ``delete_selected``
+ action if specified for ``ModelAdmin``, and to protected deletion
+ validation messages if specified for ``InlineModelAdmin``. By default,
+ this is ``None`` (no truncation).
.. attribute:: ModelAdmin.object_history_template