summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2015-05-02 08:47:28 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2015-05-02 08:47:28 (GMT)
commit3b4d30a27bd6b72bcf8b160e8e3ca860265b1655 (patch)
treedf73fc5efac2c9f3d3bc88d49834ce5593960407
parent2e02875544647cef4f1b137ce6247212985b88a4 (diff)
parentbbd95a9361cfa8a97d94f6d598e84dfc5e17a1f6 (diff)
downloadcpython-3b4d30a27bd6b72bcf8b160e8e3ca860265b1655.zip
cpython-3b4d30a27bd6b72bcf8b160e8e3ca860265b1655.tar.gz
cpython-3b4d30a27bd6b72bcf8b160e8e3ca860265b1655.tar.bz2
Closes #24060: Merged documentation update from 3.4.
-rw-r--r--Doc/library/logging.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 7915c27..bf821ab 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -486,7 +486,9 @@ Formatter Objects
responsible for converting a :class:`LogRecord` to (usually) a string which can
be interpreted by either a human or an external system. The base
:class:`Formatter` allows a formatting string to be specified. If none is
-supplied, the default value of ``'%(message)s'`` is used.
+supplied, the default value of ``'%(message)s'`` is used, which just includes
+the message in the logging call. To have additional items of information in the
+formatted output (such as a timestamp), keep reading.
A Formatter can be initialized with a format string which makes use of knowledge
of the :class:`LogRecord` attributes - such as the default value mentioned above