summaryrefslogtreecommitdiff
path: root/Doc/library/logging.config.rst
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-08-17 00:40:38 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-08-17 00:40:38 +0100
commit07b16615bc0181cb6f1334ee170c196cdb3b288a (patch)
treea5775dc4f4a710ae04ea92b3b5a233c451490804 /Doc/library/logging.config.rst
parente06d47c70cbef8ae77efe0e64cde3e682b66cb05 (diff)
parent67f39777fa2c14f0e632adda8c5945cec569b46e (diff)
downloadcpython-git-07b16615bc0181cb6f1334ee170c196cdb3b288a.tar.gz
Issue #18759: Merged updates from 3.3.
Diffstat (limited to 'Doc/library/logging.config.rst')
-rw-r--r--Doc/library/logging.config.rst14
1 files changed, 8 insertions, 6 deletions
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index 16d3294832..37f29a09fb 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -122,8 +122,9 @@ in :mod:`logging` itself) and defining handlers which are declared either in
configurations. If no port is specified, the module's default
:const:`DEFAULT_LOGGING_CONFIG_PORT` is used. Logging configurations will be
sent as a file suitable for processing by :func:`fileConfig`. Returns a
- :class:`Thread` instance on which you can call :meth:`start` to start the
- server, and which you can :meth:`join` when appropriate. To stop the server,
+ :class:`~threading.Thread` instance on which you can call
+ :meth:`~threading.Thread.start` to start the server, and which you can
+ :meth:`~threading.Thread.join` when appropriate. To stop the server,
call :func:`stopListening`.
The ``verify`` argument, if specified, should be a callable which should
@@ -203,11 +204,11 @@ otherwise, the context is used to determine what to instantiate.
* *formatters* - the corresponding value will be a dict in which each
key is a formatter id and each value is a dict describing how to
- configure the corresponding Formatter instance.
+ configure the corresponding :class:`~logging.Formatter` instance.
The configuring dict is searched for keys ``format`` and ``datefmt``
(with defaults of ``None``) and these are used to construct a
- :class:`logging.Formatter` instance.
+ :class:`~logging.Formatter` instance.
* *filters* - the corresponding value will be a dict in which each key
is a filter id and each value is a dict describing how to configure
@@ -741,8 +742,9 @@ format string, with a comma separator. An example time in ISO8601 format is
The ``class`` entry is optional. It indicates the name of the formatter's class
(as a dotted module and class name.) This option is useful for instantiating a
-:class:`Formatter` subclass. Subclasses of :class:`Formatter` can present
-exception tracebacks in an expanded or condensed format.
+:class:`~logging.Formatter` subclass. Subclasses of
+:class:`~logging.Formatter` can present exception tracebacks in an expanded or
+condensed format.
.. note:: Due to the use of :func:`eval` as described above, there are
potential security risks which result from using the :func:`listen` to send