Merge last minute 2.2c1 changes from branch to trunk.
diff --git a/Misc/NEWS b/Misc/NEWS
index 903ff37..5c55d2c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,13 @@
 
 Type/class unification and new-style classes
 
+- Guido's tutorial introduction to the new type/class features has
+  been extensively updated.  See
+
+      http://www.python.org/2.2/descrintro.html
+
+  That remains the primary documentation in this area.
+
 - Fixed a leak: instance variables declared with __slots__ were never
   deleted!
 
@@ -73,10 +80,27 @@
 
 - The charset alias windows_1252 has been added.
 
+- types.StringTypes is a tuple containing the defined string types;
+  usually this will be (str, unicode), but if Python was compiled
+  without Unicode support it will be just (str,).
+
+- The pulldom and minidom modules were synchronized to PyXML.
+
 Tools/Demos
 
+- A new script called Tools/scripts/google.py was added, which fires
+  off a search on Google.
+
 Build
 
+- Note that release builds of Python should arrange to define the
+  preprocessor symbol NDEBUG on the command line (or equivalent).
+  In the 2.2 pre-release series we tried to define this by magic in
+  Python.h instead, but it proved to cause problems for extension
+  authors.  The Unix, Windows and Mac builds now all define NDEBUG in
+  release builds via cmdline (or equivalent) instead.  Ports to
+  other platforms should do likewise.
+
 - It is no longer necessary to use --with-suffix when building on a
   case-insensitive file system (such as Mac OS X HFS+). In the build
   directory an extension is used, but not in the installed python.
@@ -105,6 +129,12 @@
 - In unix-Python on Mac OS X (and darwin) sys.platform is now "darwin",
   without any trailing digits.
 
+- Changed logic for finding python home in Mac OS X framework Pythons.
+  Now sys.executable points to the executable again, in stead of to
+  the shared library. The latter is used only for locating the python
+  home.
+
+
 What's New in Python 2.2b2?
 Release date: 16-Nov-2001
 ===========================