[Python-checkins] cpython (merge 3.3 -> default): #17653: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/5118304a4c9c
changeset:   83273:5118304a4c9c
parent:      83271:eead4be1bdd9
parent:      83272:26639365e62b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Apr 12 19:19:45 2013 +0300
summary:
  #17653: merge with 3.3.

files:
  Doc/library/socketserver.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -166,7 +166,7 @@
 
 .. 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.
 

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