diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-03 21:50:16 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-03 21:50:16 (GMT) |
| commit | f3ac50b778a8068f518804eda0f8966f7cabc1e1 (patch) | |
| tree | 3bceb332fee955b704dfe59cbc0c51d826edb580 | |
| parent | 72aeec35a14b6a708e7cbacdf48a07adf999f215 (diff) | |
| parent | 9b5626d52c6b8eed3fab84555fea18b44eecac72 (diff) | |
| download | cpython-f3ac50b778a8068f518804eda0f8966f7cabc1e1.zip cpython-f3ac50b778a8068f518804eda0f8966f7cabc1e1.tar.gz cpython-f3ac50b778a8068f518804eda0f8966f7cabc1e1.tar.bz2 | |
Merge
| -rw-r--r-- | Doc/library/socketserver.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 497e3ee..091af03 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -153,8 +153,8 @@ Server Objects .. method:: BaseServer.serve_forever(poll_interval=0.5) - Handle requests until an explicit :meth:`shutdown` request. Polls for - shutdown every *poll_interval* seconds. It also calls + Handle requests until an explicit :meth:`shutdown` request. + Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It also calls :meth:`service_actions` which may be used by a subclass or Mixin to provide various cleanup actions. For e.g. ForkingMixin class uses :meth:`service_actions` to cleanup the zombie child processes. @@ -172,7 +172,7 @@ Server Objects .. method:: BaseServer.shutdown() - Tells the :meth:`serve_forever` loop to stop and waits until it does. + Tell the :meth:`serve_forever` loop to stop and waits until it does. .. attribute:: BaseServer.address_family |