From 3c599bdbd1d7fd3436fff47d1338593dff3e58a2 Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Tue, 29 Mar 2011 01:21:48 +0100 Subject: [PATCH] Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX. --- Doc/library/logging.rst | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 6b6c7ead766..4feae2d6f54 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -2880,13 +2880,10 @@ logging module using these functions or by making calls to the main API (defined 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 +.. function:: dictConfig(config) + 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 :mod:`logging` itself) and defining handlers which are declared either in in the default, uncustomized state. .. versionadded:: 2.7 -======= ->>>>>>> other .. function:: fileConfig(fname[, defaults]) @@ -2961,14 +2956,10 @@ in :mod:`logging` itself) and defining handlers which are declared either in This is typically called before calling :meth:`join` on the return value from :func:`listen`. - -<<<<<<< local -.. _logging-config-dictschema: -======= .. currentmodule:: logging ->>>>>>> other -<<<<<<< local +.. _logging-config-dictschema: + Configuration dictionary schema ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3363,8 +3354,6 @@ the system will attempt to retrieve the value from to ``config_dict['handlers']['myhandler']['mykey']['123']`` if that fails. -======= ->>>>>>> other .. _logging-config-fileformat: Configuration file format