summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt6
-rw-r--r--docs/releases/4.0.txt2
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index e787349d5f..f77273625c 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -2241,13 +2241,17 @@ jQuery
Django admin JavaScript makes use of the `jQuery`_ library.
To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
-(version 3.5.1) is namespaced as ``django.jQuery``. If you want to use jQuery
+(version 3.6.0) is namespaced as ``django.jQuery``. If you want to use jQuery
in your own admin JavaScript without including a second copy, you can use the
``django.jQuery`` object on changelist and add/edit views. Also, your own admin
forms or widgets depending on ``django.jQuery`` must specify
``js=['admin/js/jquery.init.js', …]`` when :ref:`declaring form media assets
<assets-as-a-static-definition>`.
+.. versionchanged:: 4.0
+
+ jQuery was upgraded from 3.5.1 to 3.6.0.
+
The :class:`ModelAdmin` class requires jQuery by default, so there is no need
to add jQuery to your ``ModelAdmin``’s list of media resources unless you have
a specific need. For example, if you require the jQuery library to be in the
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
index cf8fb3dff4..de7ec8d93e 100644
--- a/docs/releases/4.0.txt
+++ b/docs/releases/4.0.txt
@@ -138,6 +138,8 @@ Minor features
* The :attr:`.InlineModelAdmin.verbose_name_plural` attribute now fallbacks to
the :attr:`.InlineModelAdmin.verbose_name` + ``'s'``.
+* jQuery is upgraded from version 3.5.1 to 3.6.0.
+
:mod:`django.contrib.admindocs`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~