Merge 3.5

1st1 · 1st1 · commit 1cecec5da5cd · 2015-09-13T08:31:07.000-04:00
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
@@ -911,7 +911,7 @@ configparser
 ------------
 
 Config parsers can be customized by providing a dictionary of converters in the
-constructor, or  All converters defined in config parser (either by subclassing or
+constructor.  All converters defined in config parser (either by subclassing or
 by providing in a constructor) will be available on all section proxies.
 
 Example::
