summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-04-29 05:44:14 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-04-29 05:44:14 (GMT)
commit4ca008b643781e56a8ad0c5a812212f2953d3cd0 (patch)
tree918be3e01216ce58f5a74333157f026786d61ae9
parent660a94972000675b4c2be3e8485cac319476f228 (diff)
parentdb727b4a7792c5887fc7b198b23e497d758f39e3 (diff)
downloadcpython-4ca008b643781e56a8ad0c5a812212f2953d3cd0.zip
cpython-4ca008b643781e56a8ad0c5a812212f2953d3cd0.tar.gz
cpython-4ca008b643781e56a8ad0c5a812212f2953d3cd0.tar.bz2
issue6085 - update docs in default branch
-rw-r--r--Doc/library/http.server.rst2
-rw-r--r--Lib/http/server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 6665c93..d947ed2 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -248,7 +248,7 @@ of which this module provides three different variants:
to create custom error logging mechanisms. The *format* argument is a
standard printf-style format string, where the additional arguments to
:meth:`log_message` are applied as inputs to the formatting. The client
- address and current date and time are prefixed to every message logged.
+ ip address and current date and time are prefixed to every message logged.
.. method:: version_string()
diff --git a/Lib/http/server.py b/Lib/http/server.py
index b6b2997..c1b0596 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -518,7 +518,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
specified as subsequent arguments (it's just like
printf!).
- The client host and current date/time are prefixed to
+ The client ip and current date/time are prefixed to
every message.
"""