[Python-checkins] cpython (merge 2.6 -> 2.7): Merged solution for #11786 from 2.6

[lukasz.langa]

http://hg.python.org/cpython/rev/a6b772599594
changeset:   69671:a6b772599594
branch:      2.7
parent:      69658:e19d2e3a3a58
parent:      69670:c7ce67c9237a
user:        Łukasz Langa <lukasz at langa.pl>
date:        Thu Apr 28 17:40:19 2011 +0200
summary:
  Merged solution for #11786 from 2.6

files:
  Doc/library/configparser.rst |  10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -96,6 +96,9 @@
    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
@@ -116,10 +119,9 @@
    *defaults*.
 
    All option names used in interpolation will be passed through the
-   :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.
+   :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.
 
    .. versionadded:: 2.3
 

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