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 6b6c7ea..4feae2d 100644
--- 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
-.. 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 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
-.. _logging-config-dictschema:
-=======
.. currentmodule:: logging
->>>>>>> other
-<<<<<<< local
+.. _logging-config-dictschema:
+
Configuration dictionary schema
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -3363,8 +3354,6 @@
to ``config_dict['handlers']['myhandler']['mykey']['123']`` if that
fails.
-=======
->>>>>>> other
.. _logging-config-fileformat:
Configuration file format