Merged revisions 71814-71817,71901-71903 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71814 | georg.brandl | 2009-04-23 10:44:57 +0200 (Do, 23 Apr 2009) | 1 line
#5820: fix bug in usage of getreader().
........
r71815 | georg.brandl | 2009-04-23 10:49:39 +0200 (Do, 23 Apr 2009) | 1 line
Fix rewrapping accident.
........
r71816 | georg.brandl | 2009-04-23 10:49:56 +0200 (Do, 23 Apr 2009) | 1 line
#5813: add a reference to the "future statements" section.
........
r71817 | georg.brandl | 2009-04-23 10:52:03 +0200 (Do, 23 Apr 2009) | 1 line
Add link to PEP 236.
........
r71901 | georg.brandl | 2009-04-25 16:50:25 +0200 (Sa, 25 Apr 2009) | 1 line
#3320: fix spelling.
........
r71902 | georg.brandl | 2009-04-25 16:51:31 +0200 (Sa, 25 Apr 2009) | 1 line
#5834: use "failure" instead of "error" because the two have different meanings in unittest context.
........
r71903 | georg.brandl | 2009-04-25 17:05:04 +0200 (Sa, 25 Apr 2009) | 1 line
#5821: add some capabilities of TarFile's file-like object.
........
diff --git a/Doc/includes/mp_distributing.py b/Doc/includes/mp_distributing.py
index ef1e862..9a88825 100644
--- a/Doc/includes/mp_distributing.py
+++ b/Doc/includes/mp_distributing.py
@@ -38,7 +38,7 @@
return _logger
_logger = logging.getLogger('distributing')
-_logger.propogate = 0
+_logger.propagate = 0
_formatter = logging.Formatter(util.DEFAULT_LOGGING_FORMAT)
_handler = logging.StreamHandler()