summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorAlex Morozov <inductor2000@mail.ru>2015-11-11 11:26:07 +0300
committerTim Graham <timograham@gmail.com>2015-11-17 10:18:03 -0500
commit361038ee03b3b8513470990fc1851a51f56ecd6c (patch)
tree558a03c7c25a2d4bfa403267c2b5870ecec862b5 /docs/ref/settings.txt
parent2315f5f45fcd7dbceef32d011d0d7ee5b8e6a4a8 (diff)
[1.9.x] Fixed #25710 -- Clarified the docs about what INTERNAL_IPS does.
Backport of 5abed864ee1cd31a0b920768b4abe85b26b43a4d from master
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 75ea880932..c2fec40dee 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1579,9 +1579,12 @@ Default: ``[]`` (Empty list)
A list of IP addresses, as strings, that:
-* See debug comments, when :setting:`DEBUG` is ``True``
-* Receive X headers in admindocs if the ``XViewMiddleware`` is installed (see
- :doc:`/ref/contrib/admin/admindocs`)
+* Allow the :func:`~django.template.context_processors.debug` context processor
+ to add some variables to the template context.
+* Can use the :ref:`admindocs bookmarklets <admindocs-bookmarklets>` even if
+ not logged in as a staff user.
+* Are marked as "internal" (as opposed to "EXTERNAL") in
+ :class:`~django.utils.log.AdminEmailHandler` emails.
.. setting:: LANGUAGE_CODE