Merging appropriate 2.1.1 fixes back into the main trunk.

1 files changed, 12 insertions, 16 deletions

diff --git a/Mac/ReadMe b/Mac/ReadMe
index adf6214..86b7a45 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,11 +1,9 @@
-How to install Python 2.1 on your Macintosh
--------------------------------------------
+How to install Python 2.1.1 on your Macintosh
+---------------------------------------------
 
 This is a MacPython that can run on classic MacOS (from 8.1
 onwards) and natively on MacOSX. The installer tries to work out whether you can
-use the Carbon version or not. This is also the first MacPython distribution
-to be packaged as an active installer, which only downloads the parts you actually
-need. Let me hear about problems in these areas.
+use the Carbon version or not.
 
 You should definitely read the Relnotes file too.
 
@@ -13,8 +11,6 @@ A special note about the active installer: do not background it, it may hang
 your machine. This is a general problem with Vise active installers, MindVision
 are working on it.
 
-If you installed a 2.1 beta on MacOSX you MUST read the uninstall section below.
-
 ------
 
 If this is your first encounter with Python: you definitely need the
@@ -30,7 +26,7 @@ now. The documentation is in HTML format, start with index.html.
 
 Caveats
 -------
-Aside from the general new Python 2.1 features compared to 2.0 the main
+Aside from the general new Python 2.1.1 features compared to 2.0 the main
 feature of this release is Carbon support.
 
 This installer installs MacPython for classic PPC MacOS, MacPython for Carbon
@@ -82,8 +78,8 @@ After installing
 It is probably a good idea to run the automatic tests. Start
 Python and "import test.autotest". 
 
-Two tests will fail on MacOS9, both with MemoryErrors:
-test_longexp and test_zlib (on MacOSX nothing should fail).
+Three tests will fail on MacOS9, all with MemoryErrors:
+test_longexp, test_sha and test_zlib (on MacOSX nothing should fail).
 
 If you increase the PythonInterpreter memory
 partition size they will pass (but for longexp you have to increase it by an
@@ -108,7 +104,7 @@ Uninstalling
 
 Two items are installed in the system folder: the interpreter shared
 libraries PythonCore and PythonCoreCarbon lives in the Extensions folder and the
-"Python 2.1 Preferences" file in the Python subfolder in the
+"Python 2.1.1 Preferences" file in the Python subfolder in the
 Preferences folder. All the rest of Python lives in the folder you
 installed in.
 
@@ -117,7 +113,7 @@ in OSX that is triggered by Python: if any orphaned aliases are left in
 /Library/CFMSupport your machine will start to behave very badly. 2.1
 beta installers triggered this problem if you simply threw away your Python folder,
 so if you installed a 2.1beta you should clean out the aliases in /Library/CFMSupport
-too. This final 2.1 installer always copies the shared libraries on OSX, so it does
+too. The final 2.1 installer always copied the shared libraries on OSX, so it does
 not have the problem anymore.
 
 Things to see
@@ -157,9 +153,9 @@ that this means you can keep your older version around if you are unsure
 whether to upgrade. The bad news is that your old preference settings
 are lost and you have to set them again.
 
-After you are satisfied that 2.1 works as expected you can trash
+After you are satisfied that 2.1.1 works as expected you can trash
 anything in the system folder that has "python" in the name and not
-"2.1".
+"2.1.1".
 
 As of 2.1 the ConfigurePython applets will try to detect incompatible preferences
 files and offer to remove them. This means that re-running ConfigurePython after
@@ -191,8 +187,8 @@ course. Mac-specific thanks go to the pythonmac-sig, Just van Rossum,
 Corran Webster, Tony Ingraldi, Erik van Blokland, Bill Bedford, Chris
 Stern, Gordon Worley, Oliver Steele, M. Papillon, Steven Majewski, David
 Goodger, Chris Barker, Luc Lefebvre, Tattoo Mabonzo K., Russell Finn,
-Tom Bridgman Russel Owen and all the other people who provided feedback,
-code or both!
+Tom Bridgman, Russel Owen, Pascal Oberndoerfer and all the other people
+who provided feedback, code or both!
 
 MacPython includes waste, a TextEdit replacement which is (c) 1998 Marco Piovanelli.