[Python-checkins] r70170 - in python/branches/release26-maint: Mac/BuildScript/resources/ReadMe.txt Mac/BuildScript/resources/Welcome.rtf

[ronald.oussoren]

Author: ronald.oussoren
Date: Wed Mar  4 22:13:03 2009
New Revision: 70170

Log:
Merged revisions 70169 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70169 | ronald.oussoren | 2009-03-04 22:12:17 +0100 (Wed, 04 Mar 2009) | 2 lines
  
  Fix for issue 5226.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Mac/BuildScript/resources/ReadMe.txt
   python/branches/release26-maint/Mac/BuildScript/resources/Welcome.rtf

Modified: python/branches/release26-maint/Mac/BuildScript/resources/ReadMe.txt
==============================================================================
--- python/branches/release26-maint/Mac/BuildScript/resources/ReadMe.txt	(original)
+++ python/branches/release26-maint/Mac/BuildScript/resources/ReadMe.txt	Wed Mar  4 22:13:03 2009
@@ -14,10 +14,9 @@
 
 MacPython consists of the Python programming language
 interpreter, plus a set of programs to allow easy
-access to it for Mac users (an integrated development
-environment, an applet builder), plus a set of pre-built 
-extension modules that open up specific Macintosh technologies 
-to Python programs (Carbon, AppleScript, Quicktime, more).
+access to it for Mac users including an integrated development
+environment, IDLE, plus a set of pre-built extension modules
+that open up specific Macintosh technologies to Python programs.
 
 The installer puts the applications in "Python $VERSION" 
 in your Applications folder, command-line tools in
@@ -25,7 +24,7 @@
 $PYTHONFRAMEWORKINSTALLDIR.
 
 More information on MacPython can be found at
-http://www.cwi.nl/~jack/macpython and
-http://pythonmac.org/.  More information on
-Python in general can be found at
+http://www.python.org/download/mac/.
+
+More information on Python in general can be found at
 http://www.python.org.

Modified: python/branches/release26-maint/Mac/BuildScript/resources/Welcome.rtf
==============================================================================
--- python/branches/release26-maint/Mac/BuildScript/resources/Welcome.rtf	(original)
+++ python/branches/release26-maint/Mac/BuildScript/resources/Welcome.rtf	Wed Mar  4 22:13:03 2009
@@ -10,9 +10,9 @@
 \f1\b Mac OS X $MACOSX_DEPLOYMENT_TARGET
 \f0\b0 .\
 \
-MacPython consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac users (an integrated development environment, an applet builder), plus a set of pre-built extension modules that open up specific Macintosh technologies to Python programs (Carbon, AppleScript, Quicktime, more).\
+MacPython consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac users including an integrated development environment \b IDLE\b0  plus a set of pre-built extension modules that open up specific Macintosh technologies to Python programs.\
 \
 See the ReadMe file for more information.\
 \
 \
-This package will by default update your shell profile to ensure that this version of Python is on the search path of your shell. Please deselect the "Shell profile updater" package on the package customization screen  if you want to avoid this modification. }
\ No newline at end of file
+This package will by default update your shell profile to ensure that this version of Python is on the search path of your shell. Please deselect the "Shell profile updater" package on the package customization screen if you want to avoid this modification.  Double-click \b Update Shell Profile\b0  at any time to make $FULL_VERSION the default Python.}
\ No newline at end of file