innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.8.x] Fixed #25710 -- Clarified the docs about what INTERNAL_IPS does. 

Backport of 5abed864ee from master
This commit is contained in:
Alex Morozov 2015-11-11 11:26:07 +03:00 committed by Tim Graham
parent 583d3c081a
commit b4aa38d106
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/ref/contrib/admin/admindocs.txt
View File

@ -137,6 +137,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 check if the specified template exists and to show where on the filesystem that
template is stored. template is stored.
.. _admindocs-bookmarklets:
Included Bookmarklets Included Bookmarklets
===================== =====================

9
docs/ref/settings.txt
View File

@ -1656,9 +1656,12 @@ Default: ``()`` (Empty tuple)
A tuple of IP addresses, as strings, that: A tuple of IP addresses, as strings, that:
* See debug comments, when :setting:`DEBUG` is ``True`` * Allow the :func:`~django.template.context_processors.debug` context processor
* Receive X headers in admindocs if the ``XViewMiddleware`` is installed (see to add some variables to the template context.
:doc:`/ref/contrib/admin/admindocs`) * 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 .. setting:: LANGUAGE_CODE

2
docs/ref/templates/api.txt
View File

@ -661,6 +661,8 @@ variables:
django.template.context_processors.debug django.template.context_processors.debug
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. function:: debug
If this processor is enabled, every ``RequestContext`` will contain these two If this processor is enabled, every ``RequestContext`` will contain these two
variables -- but only if your :setting:`DEBUG` setting is set to ``True`` and 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 the request's IP address (``request.META['REMOTE_ADDR']``) is in the

4
docs/topics/logging.txt
View File

@ -555,7 +555,9 @@ Python logging module.
message it receives. message it receives.
If the log record contains a ``request`` attribute, the full details 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 If the log record contains stack trace information, that stack
trace will be included in the email. trace will be included in the email.