Merge 3.5

1st1 · 1st1 · commit 0ae505e7d397 · 2015-09-09T13:50:12.000-04:00
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
@@ -596,12 +596,8 @@ argparse
 * :class:`~argparse.ArgumentParser` now allows to disable
   :ref:`abbreviated usage <prefix-matching>` of long options by setting
   :ref:`allow_abbrev` to ``False``.
-  (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson.)
-
-* New *allow_abbrev* parameter for :class:`~argparse.ArgumentParser` to
-  allow long options to be abbreviated if the abbreviation is unambiguous.
-  (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and
-  Daniel Eriksson in :issue:`14910`.)
+  (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson
+  in :issue:`14910`.)
 
 bz2
 ---
