mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 66337,66347,66350,66352,66358 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2008-09-10 21:57:34 +00:00
parent 5e19e44413
commit 9aa4299882
5 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Doc/using/mac.rst
View file

@ -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