[Python-checkins] cpython (merge 3.4 -> default): Closes #24060: Merged documentation update from 3.4.

[vinay.sajip]

https://hg.python.org/cpython/rev/1c72e9c1b3b4
changeset:   95836:1c72e9c1b3b4
parent:      95833:6f6e78931875
parent:      95835:88c141233d1e
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sat May 02 09:47:28 2015 +0100
summary:
  Closes #24060: Merged documentation update from 3.4.

files:
  Doc/library/logging.rst |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -486,7 +486,9 @@
 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

-- 
Repository URL: https://hg.python.org/cpython