diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/module.rst | 2 | ||||
| -rw-r--r-- | Doc/howto/pyporting.rst | 2 | ||||
| -rw-r--r-- | Doc/library/enum.rst | 4 | ||||
| -rw-r--r-- | Doc/library/tkinter.tix.rst | 2 | ||||
| -rw-r--r-- | Doc/library/typing.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.5.rst | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst index 97a6354..904b4b1 100644 --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -129,7 +129,7 @@ which export an initialization function), or compiled-in modules (where the initialization function is added using :c:func:`PyImport_AppendInittab`). See :ref:`building` or :ref:`extending-with-embedding` for details. -The initialization function can either pass pass a module definition instance +The initialization function can either pass a module definition instance to :c:func:`PyModule_Create`, and return the resulting module object, or request "multi-phase initialization" by returning the definition struct itself. diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst index c6fc03e..c479f22 100644 --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -390,7 +390,7 @@ your tests under multiple Python interpreters is tox_. You can then integrate tox with your continuous integration system so that you never accidentally break Python 2 or 3 support. -You may also want to use use the ``-bb`` flag with the Python 3 interpreter to +You may also want to use the ``-bb`` flag with the Python 3 interpreter to trigger an exception when you are comparing bytes to strings or bytes to an int (the latter is available starting in Python 3.5). By default type-differing comparisons simply return ``False``, but if you made a mistake in your diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 8a02a55..60467b4 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -314,8 +314,8 @@ Then:: >>> str(Mood.funky) 'my custom str! 1' -The rules for what is allowed are as follows: names that start and end with a -with a single underscore are reserved by enum and cannot be used; all other +The rules for what is allowed are as follows: names that start and end with +a single underscore are reserved by enum and cannot be used; all other attributes defined within an enumeration will become members of this enumeration, with the exception of special methods (:meth:`__str__`, :meth:`__add__`, etc.) and descriptors (methods are also descriptors). diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst index 9da7959..d66f595 100644 --- a/Doc/library/tkinter.tix.rst +++ b/Doc/library/tkinter.tix.rst @@ -142,7 +142,7 @@ Basic Widgets The `LabelEntry <http://tix.sourceforge.net/dist/current/man/html/TixCmd/tixLabelEntry.htm>`_ - widget packages an entry widget and a label into one mega widget. It can be used + widget packages an entry widget and a label into one mega widget. It can be used to simplify the creation of "entry-form" type of interface. .. Python Demo of: diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 6798d9a..25d7794 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -297,7 +297,7 @@ The module defines the following classes, functions and decorators: .. class:: Tuple - Tuple type; ``Tuple[X, Y]`` is the is the type of a tuple of two items + Tuple type; ``Tuple[X, Y]`` is the type of a tuple of two items with the first item of type X and the second of type Y. Example: ``Tuple[T1, T2]`` is a tuple of two elements corresponding diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 6edc1b1..1e5c9d1 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -1322,7 +1322,7 @@ kernel version of 2.6.36 or later and glibc of 2.13 or later, provides the ability to query or set the resource limits for processes other than the one making the call. (Contributed by Christian Heimes in :issue:`16595`.) -On Linux kernel version 2.6.36 or later, there are there are also some new +On Linux kernel version 2.6.36 or later, there are also some new Linux specific constants: :attr:`~resource.RLIMIT_MSGQUEUE`, :attr:`~resource.RLIMIT_NICE`, :attr:`~resource.RLIMIT_RTPRIO`, :attr:`~resource.RLIMIT_RTTIME`, and :attr:`~resource.RLIMIT_SIGPENDING`. diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 73a6dd1..052c742 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -1690,7 +1690,7 @@ messages. (Contributed by Gavin Chappell and Maciej Szulik in :issue:`16914`.) Both the :meth:`SMTP.sendmail() <smtplib.SMTP.sendmail>` and :meth:`SMTP.send_message() <smtplib.SMTP.send_message>` methods now -support support :rfc:`6531` (SMTPUTF8). +support :rfc:`6531` (SMTPUTF8). (Contributed by Milan Oberkirch and R. David Murray in :issue:`22027`.) |