From: Georg Brandl <georg@python.org>
Date: Sun, 23 Mar 2014 22:04:45 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~2039
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60fa3533eb498a4f5fa2fd1b47ced11e56d44c20;p=python

merge with 3.4
---

60fa3533eb498a4f5fa2fd1b47ced11e56d44c20
diff --cc Doc/tutorial/interpreter.rst
index aa84061507,9ab77f8009..662501077d
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@@ -95,9 -95,9 +95,9 @@@ with the *secondary prompt*, by defaul
  prints a welcome message stating its version number and a copyright notice
  before printing the first prompt::
  
 -   $ python3.4
 -   Python 3.4 (default, Mar 16 2014, 09:25:04)
 +   $ 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.
     >>>