summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-14 08:24:20 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-14 08:24:20 (GMT)
commit8f1378366e9fc0d7f22fda302f04bf822ae34cc1 (patch)
treef213d643e990d5763f33959a00fa8e5f0bcc731a /Doc/library
parent536d70ed331c3192578b73b2b243bc1dbbd8ec2a (diff)
downloadcpython-8f1378366e9fc0d7f22fda302f04bf822ae34cc1.zip
cpython-8f1378366e9fc0d7f22fda302f04bf822ae34cc1.tar.gz
cpython-8f1378366e9fc0d7f22fda302f04bf822ae34cc1.tar.bz2
Avoid line breaks after hyphens, otherwise they are turned into spaces
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/logging.config.rst4
-rw-r--r--Doc/library/logging.handlers.rst8
-rw-r--r--Doc/library/quopri.rst4
-rw-r--r--Doc/library/socket.rst4
4 files changed, 10 insertions, 10 deletions
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index a68a890..a7928a0 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -105,8 +105,8 @@ in :mod:`logging` itself) and defining handlers which are declared either in
:param disable_existing_loggers: If specified as ``False``, loggers which
exist when this call is made are left
enabled. The default is ``True`` because this
- enables old behaviour in a backward-
- compatible way. This behaviour is to
+ enables old behaviour in a
+ backward-compatible way. This behaviour is to
disable any existing loggers unless they or
their ancestors are explicitly named in the
logging configuration.
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 0c02d3d..b16eef0 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -900,8 +900,8 @@ possible, while any potentially slow operations (such as sending an email via
.. class:: QueueHandler(queue)
Returns a new instance of the :class:`QueueHandler` class. The instance is
- initialized with the queue to send messages to. The queue can be any queue-
- like object; it's used as-is by the :meth:`enqueue` method, which needs
+ initialized with the queue to send messages to. The queue can be any
+ queue-like object; it's used as-is by the :meth:`enqueue` method, which needs
to know how to send messages to it.
@@ -956,8 +956,8 @@ possible, while any potentially slow operations (such as sending an email via
Returns a new instance of the :class:`QueueListener` class. The instance is
initialized with the queue to send messages to and a list of handlers which
- will handle entries placed on the queue. The queue can be any queue-
- like object; it's passed as-is to the :meth:`dequeue` method, which needs
+ will handle entries placed on the queue. The queue can be any queue-like
+ object; it's passed as-is to the :meth:`dequeue` method, which needs
to know how to get messages from it. If ``respect_handler_level`` is ``True``,
a handler's level is respected (compared with the level for the message) when
deciding whether to pass messages to that handler; otherwise, the behaviour
diff --git a/Doc/library/quopri.rst b/Doc/library/quopri.rst
index ef2b5f2..a3f94a0 100644
--- a/Doc/library/quopri.rst
+++ b/Doc/library/quopri.rst
@@ -32,8 +32,8 @@ sending a graphics file.
.. function:: encode(input, output, quotetabs, header=False)
- Encode the contents of the *input* file and write the resulting quoted-
- printable data to the *output* file. *input* and *output* must be
+ Encode the contents of the *input* file and write the resulting quoted-printable
+ data to the *output* file. *input* and *output* must be
:term:`binary file objects <file object>`. *quotetabs*, a flag which controls
whether to encode embedded spaces and tabs must be provideda and when true it
encodes such embedded whitespace, and when false it leaves them unencoded.
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 530000b..f8ba847 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1288,8 +1288,8 @@ to sockets.
to transmit as opposed to sending the file until EOF is reached. File
position is updated on return or also in case of error in which case
:meth:`file.tell() <io.IOBase.tell>` can be used to figure out the number of
- bytes which were sent. The socket must be of :const:`SOCK_STREAM` type. Non-
- blocking sockets are not supported.
+ bytes which were sent. The socket must be of :const:`SOCK_STREAM` type.
+ Non-blocking sockets are not supported.
.. versionadded:: 3.5