summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-10-02 01:47:57 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-10-02 01:47:57 (GMT)
commit6e7bd6545384c8939ddc87aded6a20b8dd096e9e (patch)
tree8e74f7e2f79c1e4e2d66a6a7b2b7e139749a6bcd /Lib
parent3b635cd4476422fbef7e1da1e1de66bbb939d648 (diff)
parent258fabefdefecc83914fc16f79f1131d8ee2dc80 (diff)
downloadcpython-6e7bd6545384c8939ddc87aded6a20b8dd096e9e.zip
cpython-6e7bd6545384c8939ddc87aded6a20b8dd096e9e.tar.gz
cpython-6e7bd6545384c8939ddc87aded6a20b8dd096e9e.tar.bz2
Merge #11109: clean up docs, add whatsnew entry, and fix Justin's last name.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/socketserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 261e28e..a21318d 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -562,7 +562,7 @@ class ForkingMixIn:
self.collect_children()
def service_actions(self):
- """Collect the zombie child processes regularly in the ForkingMixin.
+ """Collect the zombie child processes regularly in the ForkingMixIn.
service_actions is called in the BaseServer's serve_forver loop.
"""