merge 3.2

This commit is contained in:
Benjamin Peterson 2012-01-03 16:26:34 -06:00
commit c095956ca5
2 changed files with 5 additions and 5 deletions

View file

@ -172,7 +172,7 @@ Server Objects
.. method:: BaseServer.shutdown()
Tell 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