[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

https://hg.python.org/cpython/rev/ecde84db7022
changeset:   96221:ecde84db7022
parent:      96219:0308ee35181c
parent:      96220:645a03e93008
user:        Raymond Hettinger <python at rcn.com>
date:        Fri May 22 16:38:16 2015 -0700
summary:
  merge

files:
  Doc/reference/lexical_analysis.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -632,8 +632,7 @@
 Some examples of integer literals::
 
    7     2147483647                        0o177    0b100110111
-   3     79228162514264337593543950336     0o377    0x100000000
-         79228162514264337593543950336              0xdeadbeef
+   3     79228162514264337593543950336     0o377    0xdeadbeef
 
 
 .. _floating:

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