[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/f2b9f1d1dd6e
changeset:   74199:f2b9f1d1dd6e
parent:      74197:7010fa9bd190
parent:      74198:d6f3e0b3c6fa
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Dec 30 13:47:49 2011 -0600
summary:
  merge 3.2

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


diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -65,7 +65,7 @@
    If this evaluates to false, logging messages are not passed to the handlers
    of ancestor loggers.
 
-   The constructor sets this attribute to 1.
+   The constructor sets this attribute to ``True``.
 
 
 .. method:: Logger.setLevel(lvl)

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