From 9644f2450dacd8c62ce7bd908d093cd5b0a7a8c7 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Mon, 17 Aug 2015 12:18:35 +1200
Subject: [PATCH] Issue #24774: Fix docstring in http.server.test.

Patch from Chiu-Hsiang Hsu.
---
 Lib/http/server.py | 3 +--
 Misc/ACKS          | 1 +
 Misc/NEWS          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 47655e758ae..ce0f6cfe77f 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -1211,8 +1211,7 @@ def test(HandlerClass=BaseHTTPRequestHandler,
          ServerClass=HTTPServer, protocol="HTTP/1.0", port=8000, bind=""):
     """Test the HTTP request handler class.
 
-    This runs an HTTP server on port 8000 (or the first command line
-    argument).
+    This runs an HTTP server on port 8000 (or the port argument).
 
     """
     server_address = (bind, port)
diff --git a/Misc/ACKS b/Misc/ACKS
index f5868f9647d..6e80a33a72c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -610,6 +610,7 @@ Alan Hourihane
 Ken Howard
 Brad Howes
 Mike Hoy
+Chiu-Hsiang Hsu
 Chih-Hao Huang
 Christian Hudon
 Lawrence Hudson
diff --git a/Misc/NEWS b/Misc/NEWS
index 9c4ea332cf8..0388197c2f6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu.
+
 - Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
   Patch from Łukasz Langa.