[Python-checkins] cpython (2.7): Issue #11639: Configuration function documentation referred to logging.XXX

Tue Mar 29 02:22:39 CEST 2011

http://hg.python.org/cpython/rev/1a5aab273332
changeset: 69036:1a5aab273332
branch: 2.7
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Tue Mar 29 01:21:48 2011 +0100
summary:
 Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX.
files:
 Doc/library/logging.rst | 23 ++++++-----------------
 1 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2880,13 +2880,10 @@
 in :mod:`logging` itself) and defining handlers which are declared either in
 :mod:`logging` or :mod:`logging.handlers`.
 
-<<<<<<< local
+.. currentmodule:: logging.config
+
 .. function:: dictConfig(config)
-=======
-.. currentmodule:: logging.config
->>>>>>> other
-
-<<<<<<< local
+
 Takes the logging configuration from a dictionary. The contents of
 this dictionary are described in :ref:`logging-config-dictschema`
 below.
@@ -2928,8 +2925,6 @@
 in the default, uncustomized state.
 
 .. versionadded:: 2.7
-=======
->>>>>>> other
 
 .. function:: fileConfig(fname[, defaults])
 
@@ -2961,14 +2956,10 @@
 This is typically called before calling :meth:`join` on the return value from
 :func:`listen`.
 
-
-<<<<<<< local
+.. currentmodule:: logging
+
 .. _logging-config-dictschema:
-=======
-.. currentmodule:: logging
->>>>>>> other
-
-<<<<<<< local
+
 Configuration dictionary schema
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -3363,8 +3354,6 @@
 to ``config_dict['handlers']['myhandler']['mykey']['123']`` if that
 fails.
 
-=======
->>>>>>> other
 .. _logging-config-fileformat:
 
 Configuration file format
-- 
Repository URL: http://hg.python.org/cpython
