Issue #11639: Configuration function documentation referred to logging.XXX rather than logging.config.XXX.
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 17a761a..6b6c7ea 100644
--- 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