From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 5 Dec 2011 00:46:35 +0000 (+0100)
Subject: s/SOCKSTREAM/TCP/
X-Git-Tag: v3.2.3rc1~310
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b73ca4b3d5d53f949636eb5678ea31569adbdba;p=thirdparty%2FPython%2Fcpython.git

s/SOCKSTREAM/TCP/
---

diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
index f2da3978f782..e2703f59598f 100644
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -298,7 +298,7 @@ When Sockets Die
 
 Probably the worst thing about using blocking sockets is what happens when the
 other side comes down hard (without doing a ``close``). Your socket is likely to
-hang. SOCKSTREAM is a reliable protocol, and it will wait a long, long time
+hang. TCP is a reliable protocol, and it will wait a long, long time
 before giving up on a connection. If you're using threads, the entire thread is
 essentially dead. There's not much you can do about it. As long as you aren't
 doing something dumb, like holding a lock while doing a blocking read, the