summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2018-10-31 00:26:06 (GMT)
committerGitHub <noreply@github.com>2018-10-31 00:26:06 (GMT)
commit3f819ca138db6945ee4271bf13e42db9f9b3b1e4 (patch)
tree7eab13b4f9da0c8936d423cd633594cf83ba870f /Doc/library
parent68f323715e6627c550d1e8ffed7e36f1bb4aa42b (diff)
downloadcpython-3f819ca138db6945ee4271bf13e42db9f9b3b1e4.zip
cpython-3f819ca138db6945ee4271bf13e42db9f9b3b1e4.tar.gz
cpython-3f819ca138db6945ee4271bf13e42db9f9b3b1e4.tar.bz2
bpo-35110: Fix unintentional spaces around hyphens and dashes. (GH-10231)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/codecs.rst8
-rw-r--r--Doc/library/datetime.rst7
-rw-r--r--Doc/library/email.compat32-message.rst4
-rw-r--r--Doc/library/email.message.rst4
-rw-r--r--Doc/library/logging.rst2
-rw-r--r--Doc/library/optparse.rst10
-rw-r--r--Doc/library/os.rst10
-rw-r--r--Doc/library/ossaudiodev.rst3
-rw-r--r--Doc/library/stat.rst6
-rw-r--r--Doc/library/string.rst8
-rw-r--r--Doc/library/termios.rst4
11 files changed, 33 insertions, 33 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 65f41f6..7cfec63 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1121,10 +1121,10 @@ particular, the following variants typically exist:
| | ks_c-5601, ks_c-5601-1987, | |
| | ksx1001, ks_x-1001 | |
+-----------------+--------------------------------+--------------------------------+
-| gb2312 | chinese, csiso58gb231280, euc- | Simplified Chinese |
-| | cn, euccn, eucgb2312-cn, | |
-| | gb2312-1980, gb2312-80, iso- | |
-| | ir-58 | |
+| gb2312 | chinese, csiso58gb231280, | Simplified Chinese |
+| | euc-cn, euccn, eucgb2312-cn, | |
+| | gb2312-1980, gb2312-80, | |
+| | iso-ir-58 | |
+-----------------+--------------------------------+--------------------------------+
| gbk | 936, cp936, ms936 | Unified Chinese |
+-----------------+--------------------------------+--------------------------------+
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 0363111..db3a652 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -276,9 +276,10 @@ Supported operations:
| ``+t1`` | Returns a :class:`timedelta` object with the |
| | same value. (2) |
+--------------------------------+-----------------------------------------------+
-| ``-t1`` | equivalent to :class:`timedelta`\ |
-| | (-*t1.days*, -*t1.seconds*, |
-| | -*t1.microseconds*), and to *t1*\* -1. (1)(4) |
+| ``-t1`` | equivalent to |
+| | :class:`timedelta`\ (-*t1.days*, |
+| | -*t1.seconds*, -*t1.microseconds*), |
+| | and to *t1*\* -1. (1)(4) |
+--------------------------------+-----------------------------------------------+
| ``abs(t)`` | equivalent to +\ *t* when ``t.days >= 0``, and|
| | to -*t* when ``t.days < 0``. (2) |
diff --git a/Doc/library/email.compat32-message.rst b/Doc/library/email.compat32-message.rst
index 2e189dc..d884950 100644
--- a/Doc/library/email.compat32-message.rst
+++ b/Doc/library/email.compat32-message.rst
@@ -149,8 +149,8 @@ Here are the methods of the :class:`Message` class:
.. method:: is_multipart()
- Return ``True`` if the message's payload is a list of sub-\
- :class:`Message` objects, otherwise return ``False``. When
+ Return ``True`` if the message's payload is a list of
+ sub-\ :class:`Message` objects, otherwise return ``False``. When
:meth:`is_multipart` returns ``False``, the payload should be a string
object (which might be a CTE encoded binary payload. (Note that
:meth:`is_multipart` returning ``True`` does not necessarily mean that
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
index 261d0d6..ff54045 100644
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -130,8 +130,8 @@ message objects.
.. method:: is_multipart()
- Return ``True`` if the message's payload is a list of sub-\
- :class:`EmailMessage` objects, otherwise return ``False``. When
+ Return ``True`` if the message's payload is a list of
+ sub-\ :class:`EmailMessage` objects, otherwise return ``False``. When
:meth:`is_multipart` returns ``False``, the payload should be a string
object (which might be a CTE encoded binary payload). Note that
:meth:`is_multipart` returning ``True`` does not necessarily mean that
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 3a3428a..5adde29 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -904,7 +904,7 @@ re-entrant, and so cannot be invoked from such signal handlers.
Module-Level Functions
----------------------
-In addition to the classes described above, there are a number of module- level
+In addition to the classes described above, there are a number of module-level
functions.
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index e9b82ee..4f7bd43 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -388,8 +388,8 @@ flag that is turned on with ``-v`` and off with ``-q``::
parser.add_option("-q", action="store_false", dest="verbose")
Here we have two different options with the same destination, which is perfectly
-OK. (It just means you have to be a bit careful when setting default values---
-see below.)
+OK. (It just means you have to be a bit careful when setting default
+values---see below.)
When :mod:`optparse` encounters ``-v`` on the command line, it sets
``options.verbose`` to ``True``; when it encounters ``-q``,
@@ -525,9 +525,9 @@ help message:
default: ``"Usage: %prog [options]"``, which is fine if your script doesn't
take any positional arguments.
-* every option defines a help string, and doesn't worry about line-wrapping---
- :mod:`optparse` takes care of wrapping lines and making the help output look
- good.
+* every option defines a help string, and doesn't worry about
+ line-wrapping---\ :mod:`optparse` takes care of wrapping lines and making
+ the help output look good.
* options that take a value indicate this fact in their automatically-generated
help message, e.g. for the "mode" option::
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 6a9fe36..401e9cb 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -3776,11 +3776,11 @@ written in Python, such as a mail server's external command delivery program.
.. function:: wait3(options)
Similar to :func:`waitpid`, except no process id argument is given and a
- 3-element tuple containing the child's process id, exit status indication, and
- resource usage information is returned. Refer to :mod:`resource`.\
- :func:`~resource.getrusage` for details on resource usage information. The
- option argument is the same as that provided to :func:`waitpid` and
- :func:`wait4`.
+ 3-element tuple containing the child's process id, exit status indication,
+ and resource usage information is returned. Refer to
+ :mod:`resource`.\ :func:`~resource.getrusage` for details on resource usage
+ information. The option argument is the same as that provided to
+ :func:`waitpid` and :func:`wait4`.
.. availability:: Unix.
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
index 522bb7e..a7d3dac 100644
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -153,8 +153,7 @@ and (read-only) attributes:
number of bytes written. If the audio device is in blocking mode (the
default), the entire data is always written (again, this is different from
usual Unix device semantics). If the device is in non-blocking mode, some
- data may not be written
- ---see :meth:`writeall`.
+ data may not be written---see :meth:`writeall`.
.. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/stat.rst b/Doc/library/stat.rst
index b256312..c8f6904 100644
--- a/Doc/library/stat.rst
+++ b/Doc/library/stat.rst
@@ -81,9 +81,9 @@ mode:
.. function:: S_IMODE(mode)
- Return the portion of the file's mode that can be set by :func:`os.chmod`\
- ---that is, the file's permission bits, plus the sticky bit, set-group-id, and
- set-user-id bits (on systems that support them).
+ Return the portion of the file's mode that can be set by
+ :func:`os.chmod`\ ---that is, the file's permission bits, plus the sticky
+ bit, set-group-id, and set-user-id bits (on systems that support them).
.. function:: S_IFMT(mode)
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 7ed52ab..d0ef089 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -458,11 +458,11 @@ The available integer presentation types are:
+---------+----------------------------------------------------------+
| ``'o'`` | Octal format. Outputs the number in base 8. |
+---------+----------------------------------------------------------+
- | ``'x'`` | Hex format. Outputs the number in base 16, using lower- |
- | | case letters for the digits above 9. |
+ | ``'x'`` | Hex format. Outputs the number in base 16, using |
+ | | lower-case letters for the digits above 9. |
+---------+----------------------------------------------------------+
- | ``'X'`` | Hex format. Outputs the number in base 16, using upper- |
- | | case letters for the digits above 9. |
+ | ``'X'`` | Hex format. Outputs the number in base 16, using |
+ | | upper-case letters for the digits above 9. |
+---------+----------------------------------------------------------+
| ``'n'`` | Number. This is the same as ``'d'``, except that it uses |
| | the current locale setting to insert the appropriate |
diff --git a/Doc/library/termios.rst b/Doc/library/termios.rst
index 7693ecd..d75a87c 100644
--- a/Doc/library/termios.rst
+++ b/Doc/library/termios.rst
@@ -51,8 +51,8 @@ The module defines the following functions:
.. function:: tcsendbreak(fd, duration)
- Send a break on file descriptor *fd*. A zero *duration* sends a break for 0.25
- --0.5 seconds; a nonzero *duration* has a system dependent meaning.
+ Send a break on file descriptor *fd*. A zero *duration* sends a break for
+ 0.25--0.5 seconds; a nonzero *duration* has a system dependent meaning.
.. function:: tcdrain(fd)