summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-09-13 08:31:07 -0400
committerYury Selivanov <yselivanov@sprymix.com>2015-09-13 08:31:07 -0400
commit1cecec5da5cd332afb9e574e72ac9d17e9697f59 (patch)
treeff45de42c329ecd8f41008233656f398d4457d03
parente1487104109c5889d7d4229f0cf2ff6372f86d71 (diff)
parent73953d8670bf25015a2c4b3b9578bedadc022514 (diff)
downloadcpython-git-1cecec5da5cd332afb9e574e72ac9d17e9697f59.tar.gz
Merge 3.5
-rw-r--r--Doc/whatsnew/3.5.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index b442f70269..697dd44731 100644
--- 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::