merge with 3.3

diff --cc Doc/using/mac.rst
index 075a359d16cebc9e05d0a3e790665bba59c02ec2,3e1b74df0b42d9d79771815062dfe439f2babab2..5be439f3d61582aa4e21901abd1edfe15adf44b4
--- 1/Doc/using/mac.rst
--- 2/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@@ -24,7 -25,7 +25,7 @@@ there
  
  What you get after installing is a number of things:
  
- * A :file:`MacPython 2.5` folder in your :file:`Applications` folder. In here
 -* A :file:`MacPython 3.3` folder in your :file:`Applications` folder. In here
++* A :file:`MacPython 3.4` folder in your :file:`Applications` folder. In here
    you find IDLE, the development environment that is a standard part of official
    Python distributions; PythonLauncher, which handles double-clicking Python
    scripts from the Finder; and the "Build Applet" tool, which allows you to
@@@ -92,7 -93,7 +93,7 @@@ aware of: programs that talk to the Aqu
  anything that has a GUI) need to be run in a special way. Use :program:`pythonw`
  instead of :program:`python` to start such scripts.
  
- With Python 2.5, you can use either :program:`python` or :program:`pythonw`.
 -With Python 3.3, you can use either :program:`python` or :program:`pythonw`.
++With Python 3.4, you can use either :program:`python` or :program:`pythonw`.
  
  
  Configuration
@@@ -159,7 -158,7 +158,7 @@@ http://www.riverbankcomputing.co.uk/sof
  Distributing Python Applications on the Mac
  ===========================================
  
- The "Build Applet" tool that is placed in the MacPython 2.5 folder is fine for
 -The "Build Applet" tool that is placed in the MacPython 3.3 folder is fine for
++The "Build Applet" tool that is placed in the MacPython 3.4 folder is fine for
  packaging small Python scripts on your own machine to run as a standard Mac
  application. This tool, however, is not robust enough to distribute Python
  applications to other users.