summaryrefslogtreecommitdiff
path: root/docs/topics
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:07 -0500
commitb4aa38d106e903a21773d3486885fd8d2fa8a660 (patch)
tree210b47dff02d7906edf58d17f8317adabf5a3a76 /docs/topics
parent583d3c081a2869cfad78c4993988bcded3775524 (diff)
[1.8.x] Fixed #25710 -- Clarified the docs about what INTERNAL_IPS does.
Backport of 5abed864ee1cd31a0b920768b4abe85b26b43a4d from master
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/logging.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt
index d88b1de064..67e1d104ad 100644
--- a/docs/topics/logging.txt
+++ b/docs/topics/logging.txt
@@ -555,7 +555,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.