diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-10 21:57:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-10 21:57:34 (GMT) |
| commit | 9aa4299882500ca3206514bced135c0a1083355d (patch) | |
| tree | 2a224e759cc42db9cfb80d0d96e630f0c29e9db3 /Doc/using/mac.rst | |
| parent | 5e19e4441335a70c9087402e9c487b66c9daca94 (diff) | |
| download | cpython-9aa4299882500ca3206514bced135c0a1083355d.zip cpython-9aa4299882500ca3206514bced135c0a1083355d.tar.gz cpython-9aa4299882500ca3206514bced135c0a1083355d.tar.bz2 | |
Merged revisions 66337,66347,66350,66352,66358 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66337 | vinay.sajip | 2008-09-09 08:42:08 -0500 (Tue, 09 Sep 2008) | 1 line
Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging.
........
r66347 | georg.brandl | 2008-09-09 14:26:00 -0500 (Tue, 09 Sep 2008) | 2 lines
Fix varname in docstring. #3822.
........
r66350 | georg.brandl | 2008-09-09 15:28:31 -0500 (Tue, 09 Sep 2008) | 2 lines
#3472: update Mac-bundled Python version info.
........
r66352 | benjamin.peterson | 2008-09-09 15:55:01 -0500 (Tue, 09 Sep 2008) | 4 lines
Fix #3634 invalid return value from _weakref.ref(Exception).__init__
Reviewers: Amaury, Antoine, Benjamin
........
r66358 | benjamin.peterson | 2008-09-09 18:16:48 -0500 (Tue, 09 Sep 2008) | 1 line
use the latest pygments version
........
Diffstat (limited to 'Doc/using/mac.rst')
| -rw-r--r-- | Doc/using/mac.rst | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 7da2914..052a489a 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -17,10 +17,10 @@ the IDE and the Package Manager that are worth pointing out. Getting and Installing MacPython ================================ -Mac OS X 10.5 comes with Python 2.5 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: @@ -38,7 +38,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 |