diff options
author | luzpaz <luzpaz@users.noreply.github.com> | 2017-11-05 13:37:50 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-11-05 13:37:50 (GMT) |
commit | a5293b4ff2c1b5446947b4986f98ecf5d52432d4 (patch) | |
tree | be2f5e686be63814c02eabc61a899631ec7a08ac /Doc | |
parent | cf296537f164abeacd83011239881f75f290ed31 (diff) | |
download | cpython-a5293b4ff2c1b5446947b4986f98ecf5d52432d4.zip cpython-a5293b4ff2c1b5446947b4986f98ecf5d52432d4.tar.gz cpython-a5293b4ff2c1b5446947b4986f98ecf5d52432d4.tar.bz2 |
Fix miscellaneous typos (#4275)
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/asyncio-task.rst | 2 | ||||
-rw-r--r-- | Doc/library/sys.rst | 2 | ||||
-rw-r--r-- | Doc/library/unittest.mock.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/3.1.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/3.3.rst | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index 5298c11..fbb31b8 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -374,7 +374,7 @@ Task running in different threads. While a task waits for the completion of a future, the event loop executes a new task. - The cancellation of a task is different from the cancelation of a + The cancellation of a task is different from the cancellation of a future. Calling :meth:`cancel` will throw a :exc:`~concurrent.futures.CancelledError` to the wrapped coroutine. :meth:`~Future.cancelled` only returns ``True`` if the diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 853e91b..faf540c 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -1336,7 +1336,7 @@ always available. | | * ``None`` if this information is unknown | +------------------+---------------------------------------------------------+ | :const:`version` | Name and version of the thread library. It is a string, | - | | or ``None`` if these informations are unknown. | + | | or ``None`` if this information is unknown. | +------------------+---------------------------------------------------------+ .. versionadded:: 3.3 diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index 6fdfdc4..b6eb8cc 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -2374,7 +2374,7 @@ Sealing mocks any new attribute on the sealed mock. The sealing process is performed recursively. If a mock instance is assigned to an attribute instead of being dynamically created - it wont be considered in the sealing chain. This allows to prevent seal from fixing + it won't be considered in the sealing chain. This allows to prevent seal from fixing part of the mock object. >>> mock = Mock() diff --git a/Doc/whatsnew/3.1.rst b/Doc/whatsnew/3.1.rst index 5c31401..919fbee 100644 --- a/Doc/whatsnew/3.1.rst +++ b/Doc/whatsnew/3.1.rst @@ -69,7 +69,7 @@ modules. The :mod:`configparser` module uses them by default. This lets configuration files be read, modified, and then written back in their original order. The *_asdict()* method for :func:`collections.namedtuple` now returns an ordered dictionary with the values appearing in the same order as -the underlying tuple indicies. The :mod:`json` module is being built-out with +the underlying tuple indices. The :mod:`json` module is being built-out with an *object_pairs_hook* to allow OrderedDicts to be built by the decoder. Support was also added for third-party tools like `PyYAML <http://pyyaml.org/>`_. diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index 93b297c..b82227d 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1504,7 +1504,7 @@ argument taking an iterable of handlers to be added to the root logger. A class level attribute :attr:`~logging.handlers.SysLogHandler.append_nul` has been added to :class:`~logging.handlers.SysLogHandler` to allow control of the appending of the ``NUL`` (``\000``) byte to syslog records, since for some -deamons it is required while for others it is passed through to the log. +daemons it is required while for others it is passed through to the log. @@ -2003,7 +2003,7 @@ sys --- The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct -sequence` holding informations about the thread implementation +sequence` holding information about the thread implementation (:issue:`11223`). @@ -2040,7 +2040,7 @@ class instance, are now classes and may be subclassed. (Contributed by Éric Araujo in :issue:`10968`.) The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword -argument to override the default behavior of inheriting the ``deamon`` flag +argument to override the default behavior of inheriting the ``daemon`` flag value from the parent thread (:issue:`6064`). The formerly private function ``_thread.get_ident`` is now available as the |