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

[antoine.pitrou]

http://hg.python.org/cpython/rev/b4c203ee4306
changeset:   74250:b4c203ee4306
branch:      3.2
parent:      74248:25c2d24e1b11
parent:      74246:4a30d36a9c69
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Jan 03 22:49:56 2012 +0100
summary:
  Merge

files:
  Doc/library/socketserver.rst |  7 ++++---
  1 files changed, 4 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,13 +153,14 @@
 
 .. method:: BaseServer.serve_forever(poll_interval=0.5)
 
-   Handle requests until an explicit :meth:`shutdown` request.  Polls for
-   shutdown every *poll_interval* seconds.
+   Handle requests until an explicit :meth:`shutdown` request.
+   Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`.
+   If you need to do periodic tasks, do them in another thread.
 
 
 .. 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 wait until it does.
 
 
 .. attribute:: BaseServer.address_family

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