[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

[senthil.kumaran]

http://hg.python.org/cpython/rev/618b681660e0
changeset:   70897:618b681660e0
parent:      70895:2d5de8f19957
parent:      70896:d310cc1c3a5d
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jun 19 18:23:17 2011 -0700
summary:
  merge from 3.2

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


diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -157,8 +157,8 @@
 
       Called on listening channels (passive openers) when a connection has been
       established with a new remote endpoint that has issued a :meth:`connect`
-      call for the local endpoint.  *conn* is a *new* socket object usable to
-      send and receive data on the connection, and *address* is the address
+      call for the local endpoint.  *sock* is a *new* socket object usable to
+      send and receive data on the connection, and *addr* is the address
       bound to the socket on the other end of the connection.
 
       .. versionadded:: 3.2

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