[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/65ac469d30e6
changeset:   74251:65ac469d30e6
parent:      74249:ace54f5e75d7
parent:      74247:4c243c8ecd10
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Jan 03 22:50:16 2012 +0100
summary:
  Merge

files:
  Doc/library/socketserver.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -153,8 +153,8 @@
 
 .. 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 @@
 
 .. 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

-- 
Repository URL: http://hg.python.org/cpython