From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 29 Mar 2018 08:33:47 +0000 (-0700)
Subject: FIX documentation and NEWS of ThreadedHTTPServer. (GH-6207) (GH-6302)
X-Git-Tag: v3.7.0b3~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a48614bee55fea4c46c3b493b56d2ac4d41b3eff;p=python

FIX documentation and NEWS of ThreadedHTTPServer. (GH-6207) (GH-6302)

(cherry picked from commit 79c3bab35cce55e6d175aff96a845bc6d932b203)

Co-authored-by: Julien Palard <julien@palard.fr>
---

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 4fe46cba69..278ae55375 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -37,8 +37,11 @@ handler.  Code to create and run the server looks like this::
 
    This class is identical to HTTPServer but uses threads to handle
    requests by using the :class:`~socketserver.ThreadingMixin`. This
-   is usefull to handle web browsers pre-opening sockets, on which
-   :class:`HTTPServer` would wait indefinitly.
+   is useful to handle web browsers pre-opening sockets, on which
+   :class:`HTTPServer` would wait indefinitely.
+
+   .. versionadded:: 3.7
+
 
 The :class:`HTTPServer` and :class:`ThreadedHTTPServer` must be given
 a *RequestHandlerClass* on instantiation, of which this module
diff --git a/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst b/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
index e876f40813..581ac8266b 100644
--- a/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
+++ b/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
@@ -1,2 +1,2 @@
 http.server now exposes a ThreadedHTTPServer class and uses it when the
-module is invoked to cope with web browsers pre-opening sockets.
+module is run with ``-m`` to cope with web browsers pre-opening sockets.