Changeset 391 for python/trunk/Doc/library/basehttpserver.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/basehttpserver.rst (modified) (3 diffs)

python/trunk/Doc/library/basehttpserver.rst

@@ -7 +7 @@
 .. note::
    The :mod:`BaseHTTPServer` module has been merged into :mod:`http.server` in
-   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
-   converting your sources to 3.0.
+   Python 3.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to Python 3.
 
 
@@ -19 +19 @@
    module: CGIHTTPServer
 
+**Source code:** :source:`Lib/BaseHTTPServer.py`
+
+--------------
+
 This module defines two classes for implementing HTTP servers (Web servers).
 Usually, this module isn't used directly, but is used as a basis for building
@@ -237 +241 @@
       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.