summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-29 08:13:58 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-29 08:13:58 (GMT)
commitb44c4520d965788aa6d24edab36d89103b0a1aea (patch)
tree2c649fcb5f7518dace35b8241c9f4ffd60eda14f /Doc
parent6ee36a5a8cf7aff3a2b5f3ab50bb46a31c377750 (diff)
downloadcpython-b44c4520d965788aa6d24edab36d89103b0a1aea.zip
cpython-b44c4520d965788aa6d24edab36d89103b0a1aea.tar.gz
cpython-b44c4520d965788aa6d24edab36d89103b0a1aea.tar.bz2
Issue #27125: Fix various errors like “will [be] inherited”
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/allocation.rst2
-rw-r--r--Doc/library/multiprocessing.rst4
-rw-r--r--Doc/library/shlex.rst3
-rw-r--r--Doc/whatsnew/2.6.rst2
4 files changed, 6 insertions, 5 deletions
diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst
index 32a414b..7f7435f 100644
--- a/Doc/c-api/allocation.rst
+++ b/Doc/c-api/allocation.rst
@@ -98,7 +98,7 @@ Allocating Objects on the Heap
Create a new module object based on a name and table of functions,
returning the new module object. If *doc* is non-*NULL*, it will be used
to define the docstring for the module. If *self* is non-*NULL*, it will
- passed to the functions of the module as their (otherwise *NULL*) first
+ be passed to the functions of the module as their (otherwise *NULL*) first
parameter. (This was added as an experimental feature, and there are no
known uses in the current version of Python.) For *apiver*, the only value
which should be passed is defined by the constant
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 82a0201..e33f85f 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -2137,9 +2137,9 @@ connection is established both ends will demand proof that the other knows the
authentication key. (Demonstrating that both ends are using the same key does
**not** involve sending the key over the connection.)
-If authentication is requested but do authentication key is specified then the
+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/shlex.rst b/Doc/library/shlex.rst
index be08e01..fad6b76 100644
--- a/Doc/library/shlex.rst
+++ b/Doc/library/shlex.rst
@@ -231,7 +231,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/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index f004195..4d06bc3 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -3150,7 +3150,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`,