diff options
author | Martin Panter <vadmium+py@gmail.com> | 2015-10-31 12:23:03 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2015-10-31 12:23:03 (GMT) |
commit | ff9998839735fe764bac4d19deb3cfd4ef725ba0 (patch) | |
tree | 76a5bc6e61f8545889119e974b3f0d84ea6f787c /Doc | |
parent | 7003696d5db4963bb1cf86ab4e32118ebb266d17 (diff) | |
parent | 0e5eba25c76aa7936102975a8bfbd42f70a3b9e3 (diff) | |
download | cpython-ff9998839735fe764bac4d19deb3cfd4ef725ba0.zip cpython-ff9998839735fe764bac4d19deb3cfd4ef725ba0.tar.gz cpython-ff9998839735fe764bac4d19deb3cfd4ef725ba0.tar.bz2 |
Merge typo fixes from 3.5
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/ssl.rst | 2 | ||||
-rw-r--r-- | Doc/library/tracemalloc.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/3.4.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/3.5.rst | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 4075134..391d4c8 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -880,7 +880,7 @@ SSL sockets also have the following additional methods and attributes: The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the low-level methods that read and write unencrypted, application-level data - and and decrypt/encrypt it to encrypted, wire-level data. These methods + and decrypt/encrypt it to encrypted, wire-level data. These methods require an active SSL connection, i.e. the handshake was completed and :meth:`SSLSocket.unwrap` was not called. diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst index 13c81a7..861be37 100644 --- a/Doc/library/tracemalloc.rst +++ b/Doc/library/tracemalloc.rst @@ -464,7 +464,7 @@ Snapshot All inclusive filters are applied at once, a trace is ignored if no inclusive filters match it. A trace is ignored if at least one exclusive - filter matchs it. + filter matches it. .. classmethod:: load(filename) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 7faea32..7d9bc0d 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -2076,7 +2076,7 @@ using ``-Wd``). Deprecations in the Python API ------------------------------ -* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importilb` +* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importlib` methods and functions are deprecated: :meth:`importlib.find_loader` is replaced by :func:`importlib.util.find_spec`; :meth:`importlib.machinery.PathFinder.find_module` is replaced by diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index c820666..e1ae801 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -860,7 +860,7 @@ The :class:`~collections.deque` class now defines :meth:`~collections.deque.copy`, as well as supports ``+`` and ``*`` operators. This allows deques to be recognized as a :class:`~collections.abc.MutableSequence` and improves their substitutability for lists. -(Contributed by Raymond Hettinger :issue:`23704`.) +(Contributed by Raymond Hettinger in :issue:`23704`.) Docstrings produced by :func:`~collections.namedtuple` can now be updated:: @@ -889,7 +889,7 @@ of :class:`tuple`, :class:`list`, etc. A new :class:`~collections.abc.Generator` abstract base class. (Contributed by Stefan Behnel in :issue:`24018`.) -New :class:`~collections.abc.Awaitable` :class:`~collections.abc.Coroutine`, +New :class:`~collections.abc.Awaitable`, :class:`~collections.abc.Coroutine`, :class:`~collections.abc.AsyncIterator`, and :class:`~collections.abc.AsyncIterable` abstract base classes. (Contributed by Yury Selivanov in :issue:`24184`.) @@ -1727,7 +1727,7 @@ the TLS handshake. The new :meth:`SSLSocket.selected_alpn_protocol() <ssl.SSLSocket.selected_alpn_protocol>` returns the protocol that was selected during the TLS handshake. -:data:`~ssl.HAS_ALPN` flag indicates whether APLN support is present. +:data:`~ssl.HAS_ALPN` flag indicates whether ALPN support is present. Other Changes @@ -1782,7 +1782,7 @@ subprocess ---------- The new :func:`~subprocess.run` function has been added. -It runs the specified command and and returns a +It runs the specified command and returns a :class:`~subprocess.CompletedProcess` object, which describes a finished process. The new API is more consistent and is the recommended approach to invoking subprocesses in Python code that does not need to maintain |