diff --git a/django/contrib/admindocs/templates/admin_doc/bookmarklets.html b/django/contrib/admindocs/templates/admin_doc/bookmarklets.html index 819beea326..937b0e2bc5 100644 --- a/django/contrib/admindocs/templates/admin_doc/bookmarklets.html +++ b/django/contrib/admindocs/templates/admin_doc/bookmarklets.html @@ -15,24 +15,12 @@ {% blocktrans %}

To install bookmarklets, drag the link to your bookmarks toolbar, or right-click the link and add it to your bookmarks. Now you can -select the bookmarklet from any page in the site. Note that some of these -bookmarklets require you to be viewing the site from a computer designated -as "internal" (talk to your system administrator if you aren't sure if -your computer is "internal").

+select the bookmarklet from any page in the site.

{% endblocktrans %}

{% trans "Documentation for this page" %}

{% trans "Jumps you from any page to the documentation for the view that generates that page." %}

- -

{% trans "Show object ID" %}

-

{% trans "Shows the content-type and unique ID for pages that represent a single object." %}

- -

{% trans "Edit this object (current window)" %}

-

{% trans "Jumps to the admin page for pages that represent a single object." %}

- -

{% trans "Edit this object (new window)" %}

-

{% trans "As above, but opens the admin page in a new window." %}

{% endblock %} diff --git a/docs/ref/contrib/admin/admindocs.txt b/docs/ref/contrib/admin/admindocs.txt index 040dc25fe0..76060ae28e 100644 --- a/docs/ref/contrib/admin/admindocs.txt +++ b/docs/ref/contrib/admin/admindocs.txt @@ -141,22 +141,13 @@ template is stored. Included Bookmarklets ===================== -Several useful bookmarklets are available from the ``admindocs`` page: +One bookmarklet is available from the ``admindocs`` page: Documentation for this page Jumps you from any page to the documentation for the view that generates that page. -Show object ID - Shows the content-type and unique ID for pages that represent a single - object. - -Edit this object - Jumps to the admin page for pages that represent a single object. - -Using these bookmarklets requires that you are either logged into the -:mod:`Django admin ` as a +Using this bookmarklet requires that ``XViewMiddleware`` is installed and that +you are logged into the :mod:`Django admin ` as a :class:`~django.contrib.auth.models.User` with -:attr:`~django.contrib.auth.models.User.is_staff` set to ``True``, or that the -``XViewMiddleware`` is installed and you are accessing the site from an IP -address listed in :setting:`INTERNAL_IPS`. +:attr:`~django.contrib.auth.models.User.is_staff` set to ``True``.