summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-04-23 19:44:51 +0200
committerSandro Tosi <sandro.tosi@gmail.com>2012-04-23 19:44:51 +0200
commitda999d29ab11b20c231ca85748ba387a43fe1f70 (patch)
treef1280cd68f642aa287ae0a6db5585d3250dee2ac
parentc313b1d9b0a8afe47fdd58d4685fa3d19ab79e57 (diff)
downloadcpython-git-da999d29ab11b20c231ca85748ba387a43fe1f70.tar.gz
Issue #14641: minor fixes to sockets Howto; patch by Dionysios Kalofonos
-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 f15d6597ea..c4b3f71af7 100644
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -156,7 +156,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
@@ -167,7 +167,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