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

[georg.brandl]

http://hg.python.org/cpython/rev/fa89769a4279
changeset:   89940:fa89769a4279
parent:      89938:0128b25068de
parent:      89939:f2dc5e60a293
user:        Georg Brandl <georg at python.org>
date:        Sun Mar 23 23:04:45 2014 +0100
summary:
  merge with 3.4

files:
  Doc/tutorial/interpreter.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -97,7 +97,7 @@
 
    $ python3.5
    Python 3.5 (default, Sep 16 2015, 09:25:04)
-   [GCC 4.8.2] on linux2
+   [GCC 4.8.2] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
 

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