Commit 361038ee authored by Alex Morozov's avatar Alex Morozov Committed by Tim Graham
Browse files

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

Backport of 5abed864 from master
parent 2315f5f4

docs/ref/contrib/admin/admindocs.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

=====================

docs/ref/settings.txt

+6 −3
Original line number Diff line number Diff line
@@ -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

docs/ref/templates/api.txt

+2 −0
Original line number Diff line number Diff line
@@ -707,6 +707,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

docs/topics/logging.txt

+3 −1
Original line number Diff line number Diff line
@@ -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.