From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 4 Feb 2014 16:42:04 +0000 (+0000)
Subject: Closes #20509: Merged documentation update from 3.3.
X-Git-Tag: v3.4.0rc1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8b24d756aec00d5659667096e2fd58cde9118de;p=python

Closes #20509: Merged documentation update from 3.3.
---

d8b24d756aec00d5659667096e2fd58cde9118de
diff --cc Doc/library/logging.config.rst
index 8c15ee2761,453fab5694..5fb1b7a4f4
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@@ -80,23 -80,12 +80,25 @@@ in :mod:`logging` itself) and defining 
  
  .. function:: fileConfig(fname, defaults=None, disable_existing_loggers=True)
  
-    Reads the logging configuration from a :mod:`configparser`\-format file.
 -   Reads the logging configuration from a :mod:`configparser`\-format file
 -   named *fname*. The format of the file should be as described in
 -   :ref:`logging-config-fileformat`. This function can be called several times
 -   from an application, allowing an end user to select from various pre-canned
 -   configurations (if the developer provides a mechanism to present the choices
 -   and load the chosen configuration).
++   Reads the logging configuration from a :mod:`configparser`\-format file. The
++   format of the file should be as described in
++   :ref:`logging-config-fileformat`.
 +   This function can be called several times from an application, allowing an
 +   end user to select from various pre-canned configurations (if the developer
 +   provides a mechanism to present the choices and load the chosen
 +   configuration).
 +
 +   :param fname: A filename, or a file-like object, or an instance derived
 +                 from :class:`~configparser.RawConfigParser`. If a
 +                 ``RawConfigParser``-derived instance is passed, it is used as
 +                 is. Otherwise, a :class:`~configparser.Configparser` is
 +                 instantiated, and the configuration read by it from the
 +                 object passed in ``fname``. If that has a :meth:`readline`
 +                 method, it is assumed to be a file-like object and read using
 +                 :meth:`~configparser.ConfigParser.read_file`; otherwise,
 +                 it is assumed to be a filename and passed to
 +                 :meth:`~configparser.ConfigParser.read`.
 +
  
     :param defaults: Defaults to be passed to the ConfigParser can be specified
                      in this argument.