summaryrefslogtreecommitdiff
path: root/docs
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:16:29 -0500
commit5abed864ee1cd31a0b920768b4abe85b26b43a4d (patch)
tree2f89dc49bcfb8fa6c61e39b6dbdacaef1e145f49 /docs
parent92eced62cdbc0d74567d3b67f8d18d5f4e5603d1 (diff)
Fixed #25710 -- Clarified the docs about what INTERNAL_IPS does.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/admindocs.txt1
-rw-r--r--docs/ref/settings.txt9
-rw-r--r--docs/ref/templates/api.txt2
-rw-r--r--docs/topics/logging.txt4
4 files changed, 12 insertions, 4 deletions
diff --git a/docs/ref/contrib/admin/admindocs.txt b/docs/ref/contrib/admin/admindocs.txt
index fbb185ff4b..891852d0a4 100644
--- a/docs/ref/contrib/admin/admindocs.txt
+++ b/docs/ref/contrib/admin/admindocs.txt
@@ -144,6 +144,7 @@ Django's :ref:`template loaders <template-loaders>`. This can be a handy way to
check if the specified template exists and to show where on the filesystem that
template is stored.
+.. _admindocs-bookmarklets:
Included Bookmarklets
=====================
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a0dfc7e83f..ff3d420433 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1528,9 +1528,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
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index aaa08cc70b..6427b21753 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -691,6 +691,8 @@ variables:
django.template.context_processors.debug
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. function:: debug
+
If this processor is enabled, every ``RequestContext`` will contain these two
variables -- but only if your :setting:`DEBUG` setting is set to ``True`` and
the request's IP address (``request.META['REMOTE_ADDR']``) is in the
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index 2e8da1db4e..6f8ef7bfa7 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -572,7 +572,9 @@ Python logging module.
message it receives.
If the log record contains a ``request`` attribute, the full details
- of the request will be included in the email.
+ of the request will be included in the email. The email subject will be
+ include the phrase "internal IP" if the client's IP address is in the
+ :setting:`INTERNAL_IPS` setting; if not, it will include "EXTERNAL IP".
If the log record contains stack trace information, that stack
trace will be included in the email.