summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doc/library/2to3.rst1
-rw-r--r--Doc/library/difflib.rst11
-rw-r--r--Doc/library/logging.rst4
3 files changed, 14 insertions, 2 deletions
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index db60a76232..a959d67c94 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -345,6 +345,7 @@ and off individually. They are described here in more detail.
:synopsis: the 2to3 library
.. moduleauthor:: Guido van Rossum
.. moduleauthor:: Collin Winter
+.. moduleauthor:: Benjamin Peterson <benjamin@python.org>
.. note::
diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst
index addd813564..d749e14582 100644
--- a/Doc/library/difflib.rst
+++ b/Doc/library/difflib.rst
@@ -577,8 +577,15 @@ If you want to know how to change the first sequence into the second, use
insert a[8:8] b[8:17]
equal a[8:29] b[17:38]
-See also the function :func:`get_close_matches` in this module, which shows how
-simple code building on :class:`SequenceMatcher` can be used to do useful work.
+.. seealso::
+
+ * The :func:`get_close_matches` function in this module which shows how
+ simple code building on :class:`SequenceMatcher` can be used to do useful
+ work.
+
+ * `Simple version control recipe
+ <http://code.activestate.com/recipes/576729/>`_ for a small application
+ built with :class:`SequenceMatcher`.
.. _differ-objects:
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index f79b627efd..3e648f826b 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2316,6 +2316,10 @@ needing to be done by its clients. It achieves this though using threading
locks; there is one lock to serialize access to the module's shared data, and
each handler also creates a lock to serialize access to its underlying I/O.
+If you are implementing asynchronous signal handlers using the :mod:`signal`
+module, you may not be able to use logging from within such handlers. This is
+because lock implementations in the :mod:`threading` module are not always
+re-entrant, and so cannot be invoked from such signal handlers.
Configuration
-------------