diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-01-03 22:26:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-01-03 22:26:34 (GMT) |
| commit | c095956ca58b25fe2a4929de538e2eaf1a609852 (patch) | |
| tree | 7fb90af54294cea112febc7d1079f1858a62e91b /Doc/library | |
| parent | f3ac50b778a8068f518804eda0f8966f7cabc1e1 (diff) | |
| parent | a8d7037e32499bc9593c86668ae99f21d9e7d53a (diff) | |
| download | cpython-c095956ca58b25fe2a4929de538e2eaf1a609852.zip cpython-c095956ca58b25fe2a4929de538e2eaf1a609852.tar.gz cpython-c095956ca58b25fe2a4929de538e2eaf1a609852.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/socketserver.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 091af03..c7bc0d5 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -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 |