summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCollin Anderson <cmawebsite@gmail.com>2014-12-22 20:31:56 -0500
committerCollin Anderson <cmawebsite@gmail.com>2014-12-22 20:32:00 -0500
commita58cfe8e719163bde76e8a1f56588f6ada1b8c20 (patch)
tree0ea38c96b3a0ce259cae58b84422369f09183ffd /docs
parent01ab84c61330ffa5ac87c637249611c5e5343e57 (diff)
Upgrade jQuery from 1.11.1 to 1.11.2
refs #23355
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt4
-rw-r--r--docs/releases/1.8.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 6d631b77b0..fb8b6ac150 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1848,13 +1848,13 @@ 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.1) is namespaced as ``django.jQuery``. If you want to use jQuery
+(version 1.11.2) 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.
.. versionchanged:: 1.8
- The embedded jQuery has been upgraded from 1.9.1 to 1.11.1.
+ The embedded jQuery has been upgraded from 1.9.1 to 1.11.2.
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
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 3a7cfea8e7..25d71e1235 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -116,7 +116,7 @@ Minor features
<django.contrib.admin.ModelAdmin.delete_view>` displays a summary of objects
to be deleted on the deletion confirmation page.
-* The jQuery library embedded in the admin has been upgraded to version 1.11.1.
+* The jQuery library embedded in the admin has been upgraded to version 1.11.2.
* You can now specify :attr:`AdminSite.site_url
<django.contrib.admin.AdminSite.site_url>` in order to display a link to the