[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads.

[alexandre.vassalotti]

http://hg.python.org/cpython/rev/9ca47b3babe5
changeset:   87668:9ca47b3babe5
branch:      2.7
parent:      87667:fbb97f6eb3b3
parent:      87659:b6377ca8087a
user:        Alexandre Vassalotti <alexandre at peadrop.com>
date:        Sat Nov 30 16:56:36 2013 -0800
summary:
  Merge heads.

files:
  Doc/library/logging.rst |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- 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)

-- 
Repository URL: http://hg.python.org/cpython