[Python-checkins] cpython (merge 3.6 -> default): Fixed double hyphens that are rendered to literal en-dashes in the documenation.

Sun Dec 4 03:22:54 EST 2016

https://hg.python.org/cpython/rev/16350c1f81a1
changeset: 105451:16350c1f81a1
parent: 105446:954cb987b4dc
parent: 105450:e646fcfae272
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Dec 04 10:22:36 2016 +0200
summary:
 Fixed double hyphens that are rendered to literal en-dashes in the documenation.
files:
 Doc/howto/logging-cookbook.rst | 4 ++--
 Doc/library/asyncio.rst | 4 ++--
 Doc/library/hashlib-blake2.rst | 2 +-
 Doc/library/importlib.rst | 4 ++--
 Doc/library/logging.rst | 2 +-
 Doc/library/msvcrt.rst | 4 ++--
 Doc/library/selectors.rst | 4 ++--
 Doc/library/winreg.rst | 2 +-
 Doc/tutorial/stdlib2.rst | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1088,7 +1088,7 @@
 formatted log output in place of "%(message)s" or "{message}" or "$message".
 It's a little unwieldy to use the class names whenever you want to log
 something, but it's quite palatable if you use an alias such as __ (double
-underscore – not to be confused with _, the single underscore used as a
+underscore --- not to be confused with _, the single underscore used as a
 synonym/alias for :func:`gettext.gettext` or its brethren).
 
 The above classes are not included in Python, though they're easy enough to
@@ -1209,7 +1209,7 @@
 at module level). It's probably one too many things to think about. Developers
 could also add the filter to a :class:`~logging.NullHandler` attached to their
 top-level logger, but this would not be invoked if an application developer
-attached a handler to a lower-level library logger – so output from that
+attached a handler to a lower-level library logger --- so output from that
 handler would not reflect the intentions of the library developer.
 
 In Python 3.2 and later, :class:`~logging.LogRecord` creation is done through a
diff --git a/Doc/library/asyncio.rst b/Doc/library/asyncio.rst
--- a/Doc/library/asyncio.rst
+++ b/Doc/library/asyncio.rst
@@ -1,5 +1,5 @@
-:mod:`asyncio` -- Asynchronous I/O, event loop, coroutines and tasks
-====================================================================
+:mod:`asyncio` --- Asynchronous I/O, event loop, coroutines and tasks
+=====================================================================
 
 .. module:: asyncio
 :synopsis: Asynchronous I/O, event loop, coroutines and tasks.
diff --git a/Doc/library/hashlib-blake2.rst b/Doc/library/hashlib-blake2.rst
--- a/Doc/library/hashlib-blake2.rst
+++ b/Doc/library/hashlib-blake2.rst
@@ -280,7 +280,7 @@
 function providing less collision resistance than expected. Randomized
 hashing offers the signer additional protection by reducing the likelihood
 that a preparer can generate two or more messages that ultimately yield the
- same hash value during the digital signature generation process – even if
+ same hash value during the digital signature generation process --- even if
 it is practical to find collisions for the hash function. However, the use
 of randomized hashing may reduce the amount of security provided by a
 digital signature when all portions of the message are prepared
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -1,5 +1,5 @@
-:mod:`importlib` -- The implementation of :keyword:`import`
-===========================================================
+:mod:`importlib` --- The implementation of :keyword:`import`
+============================================================
 
 .. module:: importlib
 :synopsis: The implementation of the import machinery.
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -561,7 +561,7 @@
 handled by a strptime format string (``'%Y-%m-%d %H:%M:%S'``), and the
 part after the comma is a millisecond value. Because strptime does not
 have a format placeholder for milliseconds, the millisecond value is
- appended using another format string, ``'%s,%03d'`` – and both of these
+ appended using another format string, ``'%s,%03d'`` --- and both of these
 format strings have been hardcoded into this method. With the change,
 these strings are defined as class-level attributes which can be
 overridden at the instance level when desired. The names of the
diff --git a/Doc/library/msvcrt.rst b/Doc/library/msvcrt.rst
--- a/Doc/library/msvcrt.rst
+++ b/Doc/library/msvcrt.rst
@@ -1,5 +1,5 @@
-:mod:`msvcrt` -- Useful routines from the MS VC++ runtime
-=========================================================
+:mod:`msvcrt` --- Useful routines from the MS VC++ runtime
+==========================================================
 
 .. module:: msvcrt
 :platform: Windows
diff --git a/Doc/library/selectors.rst b/Doc/library/selectors.rst
--- a/Doc/library/selectors.rst
+++ b/Doc/library/selectors.rst
@@ -1,5 +1,5 @@
-:mod:`selectors` -- High-level I/O multiplexing
-===============================================
+:mod:`selectors` --- High-level I/O multiplexing
+================================================
 
 .. module:: selectors
 :synopsis: High-level I/O multiplexing.
diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -1,4 +1,4 @@
-:mod:`winreg` -- Windows registry access
+:mod:`winreg` --- Windows registry access
 =========================================
 
 .. module:: winreg
diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -1,8 +1,8 @@
 .. _tut-brieftourtwo:
 
 *********************************************
-Brief Tour of the Standard Library -- Part II
-*********************************************
+Brief Tour of the Standard Library --- Part II
+**********************************************
 
 This second tour covers more advanced modules that support professional
 programming needs. These modules rarely occur in small scripts.
-- 
Repository URL: https://hg.python.org/cpython
