summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-29 04:13:35 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-29 04:13:35 (GMT)
commit8d56c026a5dd724318be005465366d5140fa6fe7 (patch)
tree9e1efdce69034e7c5088bcf176a7bcf5144c560f /Doc
parente8a175eaa067d0f434933d2f003260a6d739c2d1 (diff)
downloadcpython-8d56c026a5dd724318be005465366d5140fa6fe7.zip
cpython-8d56c026a5dd724318be005465366d5140fa6fe7.tar.gz
cpython-8d56c026a5dd724318be005465366d5140fa6fe7.tar.bz2
Issue #27125: Fix various errors like “will [be] inherited”
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/collections.rst2
-rw-r--r--Doc/library/multiprocessing.rst2
-rw-r--r--Doc/library/os.rst2
-rw-r--r--Doc/library/shlex.rst3
-rw-r--r--Doc/library/typing.rst2
-rw-r--r--Doc/whatsnew/2.6.rst2
6 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 8b97b65..b8f0621 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 42049c4..be6c28c 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 0ff6857..e6b6465 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 e40a10d..bf54318 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 119af88..6798d9a 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
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 6aadcf0..4ab1656 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -3154,7 +3154,7 @@ Port-Specific Changes: Mac OS X
:func:`macostools.touched` function to be removed because it depended on the
:mod:`macfs` module. (:issue:`1490190`)
-* Many other Mac OS modules have been deprecated and will removed in
+* Many other Mac OS modules have been deprecated and will be removed in
Python 3.0:
:mod:`_builtinSuites`,
:mod:`aepack`,