summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-12 16:19:45 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-12 16:19:45 (GMT)
commit3121e32952fad83a90fc20bbd408fcbb603e5fb3 (patch)
tree65e3a87ba5af091c257de3984c739a68ea7acafc
parenta713079ed82b0bfd841562fd7ac043313feb8ef6 (diff)
parenta3b255f275b09d5e12b43832c022df35a4fed9ac (diff)
downloadcpython-3121e32952fad83a90fc20bbd408fcbb603e5fb3.zip
cpython-3121e32952fad83a90fc20bbd408fcbb603e5fb3.tar.gz
cpython-3121e32952fad83a90fc20bbd408fcbb603e5fb3.tar.bz2
#17653: merge with 3.3.
-rw-r--r--Doc/library/socketserver.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index e7f668c..500b3cb 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -166,7 +166,7 @@ Server Objects
.. method:: BaseServer.service_actions()
- This is called in the :meth:`serve_forever` loop. This method is can be
+ This is called in the :meth:`serve_forever` loop. This method can be
overridden by subclasses or mixin classes to perform actions specific to
a given service, such as cleanup actions.