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

Tue Mar 29 02:16:56 CEST 2011

http://hg.python.org/cpython/rev/f494339674e7
changeset: 69035:f494339674e7
branch: 2.7
parent: 69032:b19d76d9d2a7
parent: 69034:bfa2a8d91859
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Tue Mar 29 01:15:37 2011 +0100
summary:
 Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX.
files:
 Doc/library/logging.rst | 18 ++++++++++++++++--
 1 files changed, 16 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
@@ -2880,8 +2880,13 @@
 in :mod:`logging` itself) and defining handlers which are declared either in
 :mod:`logging` or :mod:`logging.handlers`.
 
+<<<<<<< local
 .. 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.
@@ -2923,6 +2928,8 @@
 in the default, uncustomized state.
 
 .. versionadded:: 2.7
+=======
+>>>>>>> other
 
 .. function:: fileConfig(fname[, defaults])
 
@@ -2955,8 +2962,13 @@
 :func:`listen`.
 
 
+<<<<<<< local
 .. _logging-config-dictschema:
-
+=======
+.. currentmodule:: logging
+>>>>>>> other
+
+<<<<<<< local
 Configuration dictionary schema
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -3351,6 +3363,8 @@
 to ``config_dict['handlers']['myhandler']['mykey']['123']`` if that
 fails.
 
+=======
+>>>>>>> other
 .. _logging-config-fileformat:
 
 Configuration file format
-- 
Repository URL: http://hg.python.org/cpython
