Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.11] Improve some grammar in the socket docs (GH-103254) #103258

Merged
merged 1 commit into from
Apr 4, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Doc/library/socket.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,7 @@ to sockets.
much data, if any, was successfully sent.

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

.. versionchanged:: 3.5
Expand Down Expand Up @@ -1911,8 +1911,8 @@ can be changed by calling :func:`setdefaulttimeout`.

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

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

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

This last example might require special privileges::
Expand Down