summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2014-02-04 16:42:04 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2014-02-04 16:42:04 (GMT)
commitd8b24d756aec00d5659667096e2fd58cde9118de (patch)
treed0d98ca451a95b54abc7d7b0e937b7b4b1c1bf94
parente9e89076474f50a120ddbc554b8e517420e47e33 (diff)
parent6068b6c977ad30349b6c747109b8748674ec4918 (diff)
downloadcpython-d8b24d756aec00d5659667096e2fd58cde9118de.zip
cpython-d8b24d756aec00d5659667096e2fd58cde9118de.tar.gz
cpython-d8b24d756aec00d5659667096e2fd58cde9118de.tar.bz2
Closes #20509: Merged documentation update from 3.3.
-rw-r--r--Doc/library/logging.config.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
index 8c15ee2..5fb1b7a 100644
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -80,7 +80,9 @@ in :mod:`logging` itself) and defining handlers which are declared either in
.. 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. 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