Index: doc/library/socketserver.rst
===================================================================
--- doc/library/socketserver.rst	(revision 76294)
+++ doc/library/socketserver.rst	(working copy)
@@ -156,13 +156,16 @@
 
 .. 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.
+   This method must be called after :meth:`serve_forever` has started and 
+   is running in another thread, or this call will deadlock.
 
    .. versionadded:: 2.6