[Python-checkins] cpython (merge 3.5 -> default): Issue #24423: merger from 3.5

[ned.deily]

https://hg.python.org/cpython/rev/3156dd82df2d
changeset:   96580:3156dd82df2d
parent:      96578:a1b76c1c3be8
parent:      96579:4e7dcf64bba7
user:        Ned Deily <nad at acm.org>
date:        Wed Jun 10 15:44:18 2015 -0700
summary:
  Issue #24423: merger from 3.5

files:
  Doc/whatsnew/3.5.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -1065,8 +1065,8 @@
   in Python 3.5, all old `.pyo` files from previous versions of Python are
   invalid regardless of this PEP.
 
- * The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux
-   3.6 and greater.
+* The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux
+  3.6 and greater.
 
 * The `pygettext.py` Tool now uses the standard +NNNN format for timezones in
   the POT-Creation-Date header.

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