Merged fix for #15803 from 3.2 through 3.3

2 files changed, 4 insertions, 4 deletions

diff --git a/Lib/configparser.py b/Lib/configparser.py
index ea8465286c..f18b287893 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -99,10 +99,9 @@ ConfigParser -- responsible for parsing a list of
         yes, on for True).  Returns False or True.
 
     items(section=_UNSET, raw=False, vars=None)
-        If section is given, return a list of tuples with (section_name,
-        section_proxy) for each section, including DEFAULTSECT. Otherwise,
-        return a list of tuples with (name, value) for each option
-        in the section.
+        If section is given, return a list of tuples with (name, value) for
+        each option in the section. Otherwise, return a list of tuples with
+        (section_name, section_proxy) for each section, including DEFAULTSECT.
 
     remove_section(section)
         Remove the given file section and all its options.
diff --git a/Misc/ACKS b/Misc/ACKS
index 521ead6a64..80d496ebd2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1202,6 +1202,7 @@ Matias Torchinsky
 Sandro Tosi
 Richard Townsend
 David Townshend
+Nathan Trapuzzano
 Laurence Tratt
 Alberto Trevino
 Matthias Troffaes