summaryrefslogtreecommitdiffstats
path: root/Doc/library/socket.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-14 09:56:00 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-14 09:56:00 (GMT)
commit446a498a63f95c7a50781de0b1dc13cdb096d655 (patch)
tree187ee53a476ecc8038be1758360ff9d779a7e9fd /Doc/library/socket.rst
parent94b39ceb736997eb924dc509ea0ef55f4a19c706 (diff)
parent674b099eaa6bb1f5c5dfc88dea01e0e592976601 (diff)
downloadcpython-446a498a63f95c7a50781de0b1dc13cdb096d655.zip
cpython-446a498a63f95c7a50781de0b1dc13cdb096d655.tar.gz
cpython-446a498a63f95c7a50781de0b1dc13cdb096d655.tar.bz2
Merge doc fixes from 3.6
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 252b6db..ef5eec3 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1354,8 +1354,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