summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-08-20 08:26:16 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-08-20 08:26:16 (GMT)
commit8fbab9f163727934ed258942fcb920605aa9777a (patch)
tree4fadba0c0890aec7a2ab169b44093906d9de525d /Doc
parent09808e753066f372727b7d4dca9dcbc01f47cd53 (diff)
parentd210a70dd92aa3beca9d24a7a40d25681cf48fbd (diff)
downloadcpython-8fbab9f163727934ed258942fcb920605aa9777a.zip
cpython-8fbab9f163727934ed258942fcb920605aa9777a.tar.gz
cpython-8fbab9f163727934ed258942fcb920605aa9777a.tar.bz2
Merge spelling fixes from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-protocol.rst2
-rw-r--r--Doc/library/email.contentmanager.rst2
-rw-r--r--Doc/library/xml.dom.pulldom.rst2
-rw-r--r--Doc/whatsnew/2.7.rst2
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
index bd6ddb6..a38d1e0 100644
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -11,7 +11,7 @@ Transports
Transports are classes provided by :mod:`asyncio` in order to abstract
various kinds of communication channels. You generally won't instantiate
-a transport yourself; instead, you will call a :class:`AbstractEventLoop` method
+a transport yourself; instead, you will call an :class:`AbstractEventLoop` method
which will create the transport and try to initiate the underlying
communication channel, calling you back when it succeeds.
diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst
index cd63728..c25d073 100644
--- a/Doc/library/email.contentmanager.rst
+++ b/Doc/library/email.contentmanager.rst
@@ -347,7 +347,7 @@ Currently the email package provides only one concrete content manager,
.. method:: get_content(msg, errors='replace')
- Return the payload of the part as either a string (for ``text`` parts), a
+ Return the payload of the part as either a string (for ``text`` parts), an
:class:`~email.message.EmailMessage` object (for ``message/rfc822``
parts), or a ``bytes`` object (for all other non-multipart types). Raise
a :exc:`KeyError` if called on a ``multipart``. If the part is a
diff --git a/Doc/library/xml.dom.pulldom.rst b/Doc/library/xml.dom.pulldom.rst
index c3339ed..b502554 100644
--- a/Doc/library/xml.dom.pulldom.rst
+++ b/Doc/library/xml.dom.pulldom.rst
@@ -74,7 +74,7 @@ and switch to DOM-related processing.
.. function:: parse(stream_or_string, parser=None, bufsize=None)
Return a :class:`DOMEventStream` from the given input. *stream_or_string* may be
- either a file name, or a file-like object. *parser*, if given, must be a
+ either a file name, or a file-like object. *parser*, if given, must be an
:class:`~xml.sax.xmlreader.XMLReader` object. This function will change the
document handler of the
parser and activate namespace support; other parser configuration (like
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 86f0197..534ed0f 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -532,7 +532,7 @@ implemented by Vinay Sajip, are:
calling ``log.getChild('network.listen')`` is equivalent to
``getLogger('app.network.listen')``.
-* The :class:`~logging.LoggerAdapter` class gained a
+* The :class:`~logging.LoggerAdapter` class gained an
:meth:`~logging.LoggerAdapter.isEnabledFor` method that takes a
*level* and returns whether the underlying logger would
process a message of that level of importance.