From: Chris Jerdonek <chris.jerdonek@gmail.com>
Date: Tue, 25 Sep 2012 11:33:24 +0000 (-0700)
Subject: Issue #16015: Merge and update from 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbe508870f9394b2c215795326f2b706f5a9dbca;p=python

Issue #16015: Merge and update from 3.2.
---

dbe508870f9394b2c215795326f2b706f5a9dbca
diff --cc Doc/tutorial/interpreter.rst
index 8f08cd8fda,d61dafcaf1..cdc2bf2f1a
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@@ -10,11 -10,13 +10,13 @@@ Using the Python Interprete
  Invoking the Interpreter
  ========================
  
 -The Python interpreter is usually installed as :file:`/usr/local/bin/python3.2`
 +The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3`
  on those machines where it is available; putting :file:`/usr/local/bin` in your
- Unix shell's search path makes it possible to start it by typing the command ::
+ Unix shell's search path makes it possible to start it by typing the command:
+ 
+ .. code-block:: text
  
 -   python3.2
 +   python3.3
  
  to the shell. [#]_ Since the choice of the directory where the interpreter lives
  is an installation option, other places are possible; check with your local
@@@ -93,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.2
 -   Python 3.2.3 (default, May  3 2012, 15:54:42)
 +   $ python3.3
-    Python 3.3 (py3k, Sep 12 2007, 12:21:02)
-    [GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
++   Python 3.3 (default, Sep 24 2012, 09:25:04)
+    [GCC 4.6.3] on linux2
     Type "help", "copyright", "credits" or "license" for more information.
     >>>