diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-05-29 04:13:35 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-05-29 04:13:35 +0000 |
commit | 14e7f6bc9d922445a66a2db68be0b203ee51d67d (patch) | |
tree | 26ff0e97bd9fb77b9d0f2aced3a0daa2e69fb465 /Doc/library | |
parent | 8d22ae2902dac801eb328489488293efda265dc6 (diff) | |
download | cpython-14e7f6bc9d922445a66a2db68be0b203ee51d67d.tar.gz |
Issue #27125: Fix various errors like ?will [be] inherited?
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/collections.rst | 2 | ||||
-rw-r--r-- | Doc/library/multiprocessing.rst | 2 | ||||
-rw-r--r-- | Doc/library/os.rst | 2 | ||||
-rw-r--r-- | Doc/library/shlex.rst | 3 | ||||
-rw-r--r-- | Doc/library/typing.rst | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 8b97b65b1c..b8f0621d1a 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -56,7 +56,7 @@ The class can be used to simulate nested scopes and is useful in templating. dictionary is provided so that a new chain always has at least one mapping. The underlying mappings are stored in a list. That list is public and can - accessed or updated using the *maps* attribute. There is no other state. + be accessed or updated using the *maps* attribute. There is no other state. Lookups search the underlying mappings successively until a key is found. In contrast, writes, updates, and deletions only operate on the first mapping. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 42049c4c6b..be6c28ce0c 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -2478,7 +2478,7 @@ the connection.) If authentication is requested but no authentication key is specified then the return value of ``current_process().authkey`` is used (see -:class:`~multiprocessing.Process`). This value will automatically inherited by +:class:`~multiprocessing.Process`). This value will be automatically inherited by any :class:`~multiprocessing.Process` object that the current process creates. This means that (by default) all processes of a multi-process program will share a single authentication key which can be used when setting up connections diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 0ff6857469..e6b6465eb9 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3486,7 +3486,7 @@ operating system. .. data:: SCHED_RESET_ON_FORK - This flag can OR'ed with any other scheduling policy. When a process with + This flag can be OR'ed with any other scheduling policy. When a process with this flag set forks, its child's scheduling policy and priority are reset to the default. diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst index e40a10daa5..bf543185d4 100644 --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -244,7 +244,8 @@ variables which either control lexical analysis or can be used for debugging: This attribute is ``None`` by default. If you assign a string to it, that string will be recognized as a lexical-level inclusion request similar to the ``source`` keyword in various shells. That is, the immediately following token - will opened as a filename and input taken from that stream until EOF, at which + will be opened as a filename and input will + be taken from that stream until EOF, at which point the :meth:`~io.IOBase.close` method of that stream will be called and the input source will again become the original input stream. Source requests may be stacked any number of levels deep. diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 119af88e7e..6798d9ab59 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -156,7 +156,7 @@ You can use multiple inheritance with :class:`Generic`:: class LinkedList(Sized, Generic[T]): ... -When inheriting from generic classes, some type variables could fixed:: +When inheriting from generic classes, some type variables could be fixed:: from typing import TypeVar, Mapping |