summaryrefslogtreecommitdiffstats
path: root/Doc/library/multiprocessing.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-29 09:05:06 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-29 09:05:06 (GMT)
commite501a93c18085a0ae0000a759438dcf3c162ddb6 (patch)
tree6ce860fadb4cd92c8c1df44297b07dde7c41d1d1 /Doc/library/multiprocessing.rst
parent2bac3b778f0a3efe374334b9694e99ed48431414 (diff)
parent8d56c026a5dd724318be005465366d5140fa6fe7 (diff)
downloadcpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.zip
cpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.tar.gz
cpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.tar.bz2
Issue #27125: Merge typo fixes from 3.5
Also merge changes from Issue #27117; no actual code changes to 3.6.
Diffstat (limited to 'Doc/library/multiprocessing.rst')
-rw-r--r--Doc/library/multiprocessing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index b2b02b0..fcf4e14 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -2484,7 +2484,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