Merged revisions 69078-69079 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69078 | brett.cannon | 2009-01-28 16:54:11 -0800 (Wed, 28 Jan 2009) | 2 lines

  Clarify some __del__ stuff.
........
  r69079 | brett.cannon | 2009-01-28 16:54:32 -0800 (Wed, 28 Jan 2009) | 2 lines

  Minor spelling mistake in datetime docs.
........

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 570ed9efdc9e23e848f38015e6c5e2ee4f1640da..637326dfd701d95101afaa5fbe1f7e76ad7723a6 100644 (file)
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1269,7 +1269,7 @@ Example:
 :class:`tzinfo` Objects
 -----------------------
 
-:class:`tzinfo` is an abstract base clase, meaning that this class should not be
+:class:`tzinfo` is an abstract base class, meaning that this class should not be
 instantiated directly.  You need to derive a concrete subclass, and (at least)
 supply implementations of the standard :class:`tzinfo` methods needed by the
 :class:`datetime` methods you use.  The :mod:`datetime` module does not supply

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 068f0fdae281b6d16874864c62c6a028d990fe1d..fae73525fcbfd47ef4803a148c75d750eb156d2d 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1249,7 +1249,9 @@ Basic customization
       is printed to ``sys.stderr`` instead.  Also, when :meth:`__del__` is invoked in
       response to a module being deleted (e.g., when execution of the program is
       done), other globals referenced by the :meth:`__del__` method may already have
-      been deleted.  For this reason, :meth:`__del__` methods should do the absolute
+      been deleted or in the process of being torn down (e.g. the import
+      machinery shutting down).  For this reason, :meth:`__del__` methods
+      should do the absolute
       minimum needed to maintain external invariants.  Starting with version 1.5,
       Python guarantees that globals whose name begins with a single underscore are
       deleted from their module before other globals are deleted; if no other