Skip to content

Commit bd769d7

Browse files
committed
Merge remote-tracking branch 'upstream/3.11' into 3.11
2 parents ff844aa + 6258c3c commit bd769d7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Doc/library/socket.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ to sockets.
16881688
much data, if any, was successfully sent.
16891689

16901690
.. versionchanged:: 3.5
1691-
The socket timeout is no more reset each time data is sent successfully.
1691+
The socket timeout is no longer reset each time data is sent successfully.
16921692
The socket timeout is now the maximum total duration to send all data.
16931693

16941694
.. versionchanged:: 3.5
@@ -1911,8 +1911,8 @@ can be changed by calling :func:`setdefaulttimeout`.
19111911

19121912
* In *non-blocking mode*, operations fail (with an error that is unfortunately
19131913
system-dependent) if they cannot be completed immediately: functions from the
1914-
:mod:`select` can be used to know when and whether a socket is available for
1915-
reading or writing.
1914+
:mod:`select` module can be used to know when and whether a socket is available
1915+
for reading or writing.
19161916

19171917
* In *timeout mode*, operations fail if they cannot be completed within the
19181918
timeout specified for the socket (they raise a :exc:`timeout` exception)
@@ -2101,7 +2101,7 @@ manager protocol instead, open a socket with::
21012101
socket.socket(socket.AF_CAN, socket.SOCK_DGRAM, socket.CAN_BCM)
21022102

21032103
After binding (:const:`CAN_RAW`) or connecting (:const:`CAN_BCM`) the socket, you
2104-
can use the :meth:`socket.send`, and the :meth:`socket.recv` operations (and
2104+
can use the :meth:`socket.send` and :meth:`socket.recv` operations (and
21052105
their counterparts) on the socket object as usual.
21062106

21072107
This last example might require special privileges::

0 commit comments

Comments
 (0)