summaryrefslogtreecommitdiffstats
path: root/Doc/using/mac.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-09-09 20:28:31 (GMT)
committerGeorg Brandl <georg@python.org>2008-09-09 20:28:31 (GMT)
commitc0f10f34b13a8b70a776015c6be07b913209582f (patch)
tree66423de4fcd31bee6b6799ad3002cbe71d175313 /Doc/using/mac.rst
parent98064078f7c665466adc0f4733f1c28b90e60505 (diff)
downloadcpython-c0f10f34b13a8b70a776015c6be07b913209582f.zip
cpython-c0f10f34b13a8b70a776015c6be07b913209582f.tar.gz
cpython-c0f10f34b13a8b70a776015c6be07b913209582f.tar.bz2
#3472: update Mac-bundled Python version info.
Diffstat (limited to 'Doc/using/mac.rst')
-rw-r--r--Doc/using/mac.rst13
1 files changed, 8 insertions, 5 deletions
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
index 7811f37..b009e88 100644
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -25,10 +25,10 @@ installers for the latest 2.3 release for Mac OS 9 and related documentation.
Getting and Installing MacPython
================================
-Mac OS X 10.4 comes with Python 2.3 pre-installed by Apple. However, you are
-encouraged to install the most recent version of Python from the Python website
-(http://www.python.org). A "universal binary" build of Python 2.5, which runs
-natively on the Mac's new Intel and legacy PPC CPU's, is available there.
+Mac OS X 10.5 comes with Python 2.5.1 pre-installed by Apple. If you wish, you
+are invited to install the most recent version of Python from the Python website
+(http://www.python.org). A current "universal binary" build of Python, which
+runs natively on the Mac's new Intel and legacy PPC CPU's, is available there.
What you get after installing is a number of things:
@@ -46,7 +46,10 @@ What you get after installing is a number of things:
The Apple-provided build of Python is installed in
:file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python`,
respectively. You should never modify or delete these, as they are
-Apple-controlled and are used by Apple- or third-party software.
+Apple-controlled and are used by Apple- or third-party software. Remember that
+if you choose to install a newer Python version from python.org, you will have
+two different but functional Python installations on your computer, so it will
+be important that your paths and usages are consistent with what you want to do.
IDLE includes a help menu that allows you to access Python documentation. If you
are completely new to Python you should start reading the tutorial introduction