[Python-checkins] cpython (merge 3.2 -> default): Issue #14641: merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/caf39de79819
changeset:   76502:caf39de79819
parent:      76498:86b4b54bb0fa
parent:      76501:9bb9604519ce
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Mon Apr 23 19:45:45 2012 +0200
summary:
  Issue #14641: merge with 3.2

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


diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -153,7 +153,7 @@
 there, you may wait forever for the reply, because the request may still be in
 your output buffer.
 
-Now we come the major stumbling block of sockets - ``send`` and ``recv`` operate
+Now we come to the major stumbling block of sockets - ``send`` and ``recv`` operate
 on the network buffers. They do not necessarily handle all the bytes you hand
 them (or expect from them), because their major focus is handling the network
 buffers. In general, they return when the associated network buffers have been
@@ -164,7 +164,7 @@
 When a ``recv`` returns 0 bytes, it means the other side has closed (or is in
 the process of closing) the connection.  You will not receive any more data on
 this connection. Ever.  You may be able to send data successfully; I'll talk
-about that some on the next page.
+more about this later.
 
 A protocol like HTTP uses a socket for only one transfer. The client sends a
 request, then reads a reply.  That's it. The socket is discarded. This means that

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