diff options
| -rw-r--r-- | Doc/library/configparser.rst | 8 | ||||
| -rw-r--r-- | Doc/library/logging.rst | 12 | ||||
| -rw-r--r-- | Doc/library/shlex.rst | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index 911f8dc..50373fc 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -1,14 +1,20 @@ - :mod:`ConfigParser` --- Configuration file parser ================================================= .. module:: ConfigParser + :synopsis: Old name for the configparser module. + +.. module:: configparser :synopsis: Configuration file parser. .. moduleauthor:: Ken Manheimer <klm@zope.com> .. moduleauthor:: Barry Warsaw <bwarsaw@python.org> .. moduleauthor:: Eric S. Raymond <esr@thyrsus.com> .. sectionauthor:: Christopher G. Petrilli <petrilli@amber.org> +.. note:: + The :mod:`ConfigParser` module has been renamed to :mod:`configparser` in + Python 3.0. It is importable under both names in Python 2.6 and the rest of + the 2.x series. .. index:: pair: .ini; file diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 371ece3..b2686aa 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -2240,12 +2240,12 @@ in :mod:`logging` itself) and defining handlers which are declared either in .. function:: fileConfig(fname[, defaults]) - Reads the logging configuration from a ConfigParser-format file named *fname*. - This function can be called several times from an application, allowing an end - user the ability to select from various pre-canned configurations (if the - developer provides a mechanism to present the choices and load the chosen - configuration). Defaults to be passed to ConfigParser can be specified in the - *defaults* argument. + Reads the logging configuration from a :mod:`configparser`\-format file named + *fname*. This function can be called several times from an application, + allowing an end user the ability to select from various pre-canned + configurations (if the developer provides a mechanism to present the choices + and load the chosen configuration). Defaults to be passed to the ConfigParser + can be specified in the *defaults* argument. .. function:: listen([port]) diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst index 0ae77c1..1dfafbd 100644 --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -63,7 +63,7 @@ The :mod:`shlex` module defines the following class: .. seealso:: - Module :mod:`ConfigParser` + Module :mod:`configparser` Parser for configuration files similar to the Windows :file:`.ini` files. |