diff -r 84c8127453cf Doc/extending/building.rst
--- a/Doc/extending/building.rst	Sat Oct 06 03:40:10 2012 +0200
+++ b/Doc/extending/building.rst	Sat Oct 06 01:43:03 2012 -0700
@@ -94,7 +94,7 @@
 information in different ways to the compiler. For example, on Unix, this may
 result in the compilation commands ::
 
-   gcc -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -fPIC -DMAJOR_VERSION=1 -DMINOR_VERSION=0 -I/usr/local/include -I/usr/local/include/python2.2 -c demo.c -o build/temp.linux-i686-2.2/demo.o
+   gcc -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -fPIC -DMAJOR_VERSION=1 -DMINOR_VERSION=0 -I/usr/local/include -I/usr/local/include/python3.4 -c demo.c -o build/temp.linux-i686-2.2/demo.o
 
    gcc -shared build/temp.linux-i686-2.2/demo.o -L/usr/local/lib -ltcl83 -o build/lib.linux-i686-2.2/demo.so
 
diff -r 84c8127453cf Doc/faq/extending.rst
--- a/Doc/faq/extending.rst	Sat Oct 06 03:40:10 2012 +0200
+++ b/Doc/faq/extending.rst	Sat Oct 06 01:43:03 2012 -0700
@@ -235,7 +235,7 @@
 --------------------------------------------------------------------------------------
 
 Most packaged versions of Python don't include the
-:file:`/usr/lib/python2.{x}/config/` directory, which contains various files
+:file:`/usr/lib/python3.{x}/config/` directory, which contains various files
 required for compiling Python extensions.
 
 For Red Hat, install the python-devel RPM to get the necessary files.
diff -r 84c8127453cf Doc/howto/urllib2.rst
--- a/Doc/howto/urllib2.rst	Sat Oct 06 03:40:10 2012 +0200
+++ b/Doc/howto/urllib2.rst	Sat Oct 06 01:43:03 2012 -0700
@@ -161,7 +161,7 @@
 
 Some websites [#]_ dislike being browsed by programs, or send different versions
 to different browsers [#]_ . By default urllib identifies itself as
-``Python-urllib/x.y`` (where ``x`` and ``y`` are the major and minor version
+``Python-urllib/X.Y`` (where ``X`` and ``Y`` are the major and minor version
 numbers of the Python release,
 e.g. ``Python-urllib/2.5``), which may confuse the site, or just plain
 not work. The way a browser identifies itself is through the
diff -r 84c8127453cf Doc/library/site.rst
--- a/Doc/library/site.rst	Sat Oct 06 03:40:10 2012 +0200
+++ b/Doc/library/site.rst	Sat Oct 06 01:43:03 2012 -0700
@@ -60,7 +60,7 @@
    triple: path; configuration; file
 
 For example, suppose ``sys.prefix`` and ``sys.exec_prefix`` are set to
-:file:`/usr/local`.  The Python X.Y library is then installed in
+:file:`/usr/local`.  The Python |version| library is then installed in
 :file:`/usr/local/lib/python{X.Y}`.  Suppose this has
 a subdirectory :file:`/usr/local/lib/python{X.Y}/site-packages` with three
 subsubdirectories, :file:`foo`, :file:`bar` and :file:`spam`, and two path
diff -r 84c8127453cf Doc/library/sysconfig.rst
--- a/Doc/library/sysconfig.rst	Sat Oct 06 03:40:10 2012 +0200
+++ b/Doc/library/sysconfig.rst	Sat Oct 06 01:43:03 2012 -0700
@@ -232,18 +232,18 @@
 
     $ python -m sysconfig
     Platform: "macosx-10.4-i386"
-    Python version: "3.2"
+    Python version: "3"
     Current installation scheme: "posix_prefix"
 
     Paths:
             data = "/usr/local"
             include = "/Users/tarek/Dev/svn.python.org/py3k/Include"
             platinclude = "."
-            platlib = "/usr/local/lib/python3.2/site-packages"
-            platstdlib = "/usr/local/lib/python3.2"
-            purelib = "/usr/local/lib/python3.2/site-packages"
+            platlib = "/usr/local/lib/python3.4/site-packages"
+            platstdlib = "/usr/local/lib/python3.4"
+            purelib = "/usr/local/lib/python3.4/site-packages"
             scripts = "/usr/local/bin"
-            stdlib = "/usr/local/lib/python3.2"
+            stdlib = "/usr/local/lib/python3.4"
 
     Variables:
             AC_APPLE_UNIVERSAL_BUILD = "0"
diff -r 84c8127453cf Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst	Sat Oct 06 03:40:10 2012 +0200
+++ b/Doc/tutorial/interpreter.rst	Sat Oct 06 01:43:03 2012 -0700
@@ -10,13 +10,13 @@
 Invoking the Interpreter
 ========================
 
-The Python interpreter is usually installed as :file:`/usr/local/bin/python3.4`
+The Python interpreter is usually installed as :file:`/usr/local/bin/python34`
 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:
 
 .. code-block:: text
 
-   python3.4
+   python3
 
 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
@@ -95,7 +95,7 @@
 prints a welcome message stating its version number and a copyright notice
 before printing the first prompt::
 
-   $ python3.4
+   $ python3
    Python 3.4 (default, Sep 24 2012, 09:25:04)
    [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
@@ -149,7 +149,7 @@
 On BSD'ish Unix systems, Python scripts can be made directly executable, like
 shell scripts, by putting the line ::
 
-   #! /usr/bin/env python3.4
+   #! /usr/bin/env python3
 
 (assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning
 of the script and giving the file an executable mode.  The ``#!`` must be the