diff options
author | Christian Heimes <christian@cheimes.de> | 2008-02-25 13:19:43 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2008-02-25 13:19:43 (GMT) |
commit | dcca98d483f8a86c187c4d72f2e220a56ed0a1c0 (patch) | |
tree | 0e15f7a9733e30f544e8922470f317fb7a0dccb3 /Doc/library | |
parent | 23daade028eca9287f7072a6af26871f99088fe9 (diff) | |
download | cpython-dcca98d483f8a86c187c4d72f2e220a56ed0a1c0.zip cpython-dcca98d483f8a86c187c4d72f2e220a56ed0a1c0.tar.gz cpython-dcca98d483f8a86c187c4d72f2e220a56ed0a1c0.tar.bz2 |
Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61058-61061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61058 | neal.norwitz | 2008-02-25 02:45:37 +0100 (Mon, 25 Feb 2008) | 1 line
Fix indentation
........
r61059 | brett.cannon | 2008-02-25 06:33:07 +0100 (Mon, 25 Feb 2008) | 2 lines
Add minor markup for a string.
........
r61060 | brett.cannon | 2008-02-25 06:33:33 +0100 (Mon, 25 Feb 2008) | 2 lines
Fix a minor typo in a docstring.
........
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/logging.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 27f6189..7cdbbd2 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -243,8 +243,8 @@ With the logger object configured, the following methods create log messages: little more verbose for logging messages than using the log level convenience methods listed above, but this is how to log at custom log levels. -:func:`getLogger` returns a reference to a logger instance with a name of name -if a name is provided, or root if not. The names are period-separated +:func:`getLogger` returns a reference to a logger instance with the specified +if it it is provided, or ``root`` if not. The names are period-separated hierarchical structures. Multiple calls to :func:`getLogger` with the same name will return a reference to the same logger object. Loggers that are further down in the hierarchical list are children of loggers higher up in the list. @@ -296,7 +296,7 @@ Formatters ^^^^^^^^^^ Formatter objects configure the final order, structure, and contents of the log -message. Unlike the base logging.Handler class, application code may +message. Unlike the base :class:`logging.Handler` class, application code may instantiate formatter classes, although you could likely subclass the formatter if your application needs special behavior. The constructor takes two optional arguments: a message format string and a date format string. If there is no |