[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28944: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/502f5d53fb4a
changeset:   105630:502f5d53fb4a
branch:      3.6
parent:      105626:ab3d870aa3bc
parent:      105629:a89469328b78
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Dec 15 05:38:25 2016 +0300
summary:
  Issue #28944: Merge from 3.5

files:
  Doc/library/stdtypes.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2160,7 +2160,7 @@
 +------------+-----------------------------------------------------+-------+
 | ``'o'``    | Signed octal value.                                 | \(1)  |
 +------------+-----------------------------------------------------+-------+
-| ``'u'``    | Obsolete type -- it is identical to ``'d'``.        | \(7)  |
+| ``'u'``    | Obsolete type -- it is identical to ``'d'``.        | \(6)  |
 +------------+-----------------------------------------------------+-------+
 | ``'x'``    | Signed hexadecimal (lowercase).                     | \(2)  |
 +------------+-----------------------------------------------------+-------+
@@ -2225,8 +2225,7 @@
 (5)
    If precision is ``N``, the output is truncated to ``N`` characters.
 
-
-(7)
+(6)
    See :pep:`237`.
 
 Since Python strings have an explicit length, ``%s`` conversions do not assume

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