summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-04-23 17:45:45 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-04-23 17:45:45 (GMT)
commit8c52ab597f6f3fc17bdcd157ed53c88e016ae2bb (patch)
tree7bafb533bdac25f9eb0633f426cb77ffed773fb9 /Doc/howto
parenta82c960c17f4d72ed0e41db58fc6557df40852a0 (diff)
parentcfdba61c3c51cff0e63e5cf8997a1eeb5d5f1a5a (diff)
downloadcpython-8c52ab597f6f3fc17bdcd157ed53c88e016ae2bb.zip
cpython-8c52ab597f6f3fc17bdcd157ed53c88e016ae2bb.tar.gz
cpython-8c52ab597f6f3fc17bdcd157ed53c88e016ae2bb.tar.bz2
Issue #14641: merge with 3.2
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/sockets.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
index d240008..ca6528b 100644
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -153,7 +153,7 @@ I'm not going to talk about it here, except to warn you that you need to use
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 @@ been completely dealt with.
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