Fixed #25289 -- Updated admin's jQuery to 2.1.4.

2 files changed, 30 insertions, 4 deletions

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index c2b02baed1..236841dc69 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1887,7 +1887,7 @@ jQuery
 Django admin JavaScript makes use of the `jQuery`_ library.
 
 To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
-(version 1.11.2) is namespaced as ``django.jQuery``. If you want to use jQuery
+(version 2.1.4) 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.
 
@@ -1895,6 +1895,12 @@ in your own admin JavaScript without including a second copy, you can use the
 
     The embedded jQuery has been upgraded from 1.9.1 to 1.11.2.
 
+.. versionchanged:: 1.9
+
+    The embedded jQuery has been upgraded from 1.11.2 to 2.1.4. This drops
+    support for Internet Explorer 8 and below. You can restore support by
+    :ref:`including your own version of jQuery 1.X <admin-browser-support-19>`.
+
 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/1.9.txt b/docs/releases/1.9.txt
index 5179075f64..85420bc941 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -912,12 +912,32 @@ resulting in SQL like ``"related_id IN (SELECT id FROM ...)"``.
 This implicit ``__in`` no longer happens so the "IN" SQL is now "=", and if the
 subquery returns multiple results, at least some databases will throw an error.
 
+.. _admin-browser-support-19:
+
+``contrib.admin`` browser support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The admin no longer supports Internet Explorer 8 and below, as these browsers
+have reached end-of-life.
+
+CSS and images to support Internet Explorer 6 and 7 have been removed. PNG and
+GIF icons have been replaced with SVG icons, which are not supported by
+Internet Explorer 8 and earlier.
+
+The jQuery library embedded in the admin has been upgraded from version 1.11.2
+to 2.1.4. jQuery 2.x has the same API as jQuery 1.x, but does not support
+Internet Explorer 6, 7, or 8, allowing for better performance and a smaller
+file size. If you need to support IE8 and must also use the latest version of
+Django, you can override the admin's copy of jQuery with your own by creating
+a Django application with this structure::
+
+    app/static/admin/js/vendor/
+        jquery.js
+        jquery.min.js
+
 Miscellaneous
 ~~~~~~~~~~~~~
 
-* CSS and images in ``contrib.admin`` to support Internet Explorer 6 & 7 have
-  been removed as these browsers have reached end-of-life.
-
 * The jQuery static files in ``contrib.admin`` have been moved into a
   ``vendor/jquery`` subdirectory.