diff options
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/README.txt | 2 | ||||
-rw-r--r-- | Doc/copyright.rst | 2 | ||||
-rw-r--r-- | Doc/library/configparser.rst | 12 | ||||
-rw-r--r-- | Doc/library/logging.rst | 4 | ||||
-rw-r--r-- | Doc/license.rst | 4 |
5 files changed, 11 insertions, 13 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index d32d1ed..ef1c1f7 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -127,7 +127,7 @@ The Python source is copyrighted, but you can freely use and copy it as long as you don't change or remove the copyright notice: ---------------------------------------------------------------------- -Copyright (c) 2000-2008 Python Software Foundation. +Copyright (c) 2000-2011 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 893b541..ff6b677 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2010 Python Software Foundation. All rights reserved. +Copyright © 2001-2011 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index 7f68de7..867f091 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -79,12 +79,9 @@ write-back, as will be the keys within each section. The basic configuration object. When *defaults* is given, it is initialized into the dictionary of intrinsic defaults. When *dict_type* is given, it will be used to create the dictionary objects for the list of sections, for the - options within a section, and for the default values. This class does not + options within a section, and for the default values. This class does not support the magical interpolation behavior. - All option names are passed through the :meth:`optionxform` method. Its - default implementation converts option names to lower case. - .. versionadded:: 2.3 .. versionchanged:: 2.6 @@ -101,9 +98,10 @@ write-back, as will be the keys within each section. *defaults*. All option names used in interpolation will be passed through the - :meth:`optionxform` method just like any other option name reference. Using - the default implementation of :meth:`optionxform`, the values ``foo %(bar)s`` - and ``foo %(BAR)s`` are equivalent. + :meth:`optionxform` method just like any other option name reference. For + example, using the default implementation of :meth:`optionxform` (which converts + option names to lower case), the values ``foo %(bar)s`` and ``foo %(BAR)s`` are + equivalent. .. class:: SafeConfigParser([defaults[, dict_type]]) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 6674dfa..c95b8de 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -2545,8 +2545,6 @@ logging module using these functions or by making calls to the main API (defined in :mod:`logging` itself) and defining handlers which are declared either in :mod:`logging` or :mod:`logging.handlers`. -.. currentmodule:: logging.config - .. function:: fileConfig(fname[, defaults]) @@ -2580,8 +2578,6 @@ in :mod:`logging` itself) and defining handlers which are declared either in :func:`listen`. -.. currentmodule:: logging - .. _logging-config-fileformat: Configuration file format diff --git a/Doc/license.rst b/Doc/license.rst index 6ab673c..a9cec20 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -104,6 +104,10 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+-----------+------------+-----------------+ | 2.6.5 | 2.6.4 | 2010 | PSF | yes | +----------------+--------------+-----------+------------+-----------------+ +| 2.6.6 | 2.6.5 | 2010 | PSF | yes | ++----------------+--------------+-----------+------------+-----------------+ +| 2.6.7 | 2.6.6 | 2011 | PSF | yes | ++----------------+--------------+-----------+------------+-----------------+ .. note:: |