summaryrefslogtreecommitdiff
path: root/Doc/library/socket.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-14 09:54:57 +0000
committerMartin Panter <vadmium+py@gmail.com>2017-01-14 09:54:57 +0000
commit4659ddc433205a4e02e365b9b299221d7ac12113 (patch)
treed1ff48bf6faeda88d32af413d9230220666fa960 /Doc/library/socket.rst
parent758c7d044bb98da9e98654fa91961f54a915712d (diff)
parent8f1378366e9fc0d7f22fda302f04bf822ae34cc1 (diff)
downloadcpython-git-4659ddc433205a4e02e365b9b299221d7ac12113.tar.gz
Merge doc fixes from 3.5
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r--Doc/library/socket.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 9c10867160..c21cb7fd10 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1342,8 +1342,8 @@ to sockets.
to transmit as opposed to sending the file until EOF is reached. File
position is updated on return or also in case of error in which case
:meth:`file.tell() <io.IOBase.tell>` can be used to figure out the number of
- bytes which were sent. The socket must be of :const:`SOCK_STREAM` type. Non-
- blocking sockets are not supported.
+ bytes which were sent. The socket must be of :const:`SOCK_STREAM` type.
+ Non-blocking sockets are not supported.
.. versionadded:: 3.5