Merge heads.
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index f3fda14..68e359e 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -837,8 +837,10 @@
effect is to disable all logging calls of severity *lvl* and below, so that
if you call it with a value of INFO, then all INFO and DEBUG events would be
discarded, whereas those of severity WARNING and above would be processed
- according to the logger's effective level. To undo the effect of a call to
- ``logging.disable(lvl)``, call ``logging.disable(logging.NOTSET)``.
+ according to the logger's effective level. If
+ ``logging.disable(logging.NOTSET)`` is called, it effectively removes this
+ overriding level, so that logging output again depends on the effective
+ levels of individual loggers.
.. function:: addLevelName(lvl, levelName)