Skip to content

Commit 5fe204c

Browse files
Merge branch 'main' into fix-issue-137759
2 parents 207cccd + 4e08a9f commit 5fe204c

24 files changed

+1436
-594
lines changed

Doc/library/concurrent.futures.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ Executor Objects
101101
executor has started running will be completed prior to this method
102102
returning. The remaining futures are cancelled.
103103

104-
You can avoid having to call this method explicitly if you use the
105-
:keyword:`with` statement, which will shutdown the :class:`Executor`
106-
(waiting as if :meth:`Executor.shutdown` were called with *wait* set to
107-
``True``)::
104+
You can avoid having to call this method explicitly if you use the executor
105+
as a :term:`context manager` via the :keyword:`with` statement, which
106+
will shutdown the :class:`Executor` (waiting as if :meth:`Executor.shutdown`
107+
were called with *wait* set to ``True``)::
108108

109109
import shutil
110110
with ThreadPoolExecutor(max_workers=4) as e:

Doc/library/constants.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,17 @@ should not be used in programs.
9797
exit(code=None)
9898

9999
Objects that when printed, print a message like "Use quit() or Ctrl-D
100-
(i.e. EOF) to exit", and when called, raise :exc:`SystemExit` with the
100+
(i.e. EOF) to exit", and when accessed directly in the interactive
101+
interpreter or called as functions, raise :exc:`SystemExit` with the
101102
specified exit code.
102103

103104
.. data:: help
104105
:noindex:
105106

106107
Object that when printed, prints the message "Type help() for interactive
107-
help, or help(object) for help about object.", and when called,
108-
acts as described :func:`elsewhere <help>`.
108+
help, or help(object) for help about object.", and when accessed directly
109+
in the interactive interpreter, invokes the built-in help system
110+
(see :func:`help`).
109111

110112
.. data:: copyright
111113
credits

Doc/library/pdb.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ The debugger's prompt is ``(Pdb)``, which is the indicator that you are in debug
7575
arguments of the ``p`` command.
7676

7777

78+
.. _pdb-cli:
7879
.. program:: pdb
7980

8081
You can also invoke :mod:`pdb` from the command line to debug other scripts. For

0 commit comments

Comments
 (0)