Merged revisions 59423-59440 via svnmerge from

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

........
  r59427 | georg.brandl | 2007-12-08 18:56:07 +0100 (Sat, 08 Dec 2007) | 2 lines

  Adapt style.
........
  r59435 | brett.cannon | 2007-12-09 06:09:37 +0100 (Sun, 09 Dec 2007) | 2 lines

  Use a versionchanged directive.
........
  r59436 | georg.brandl | 2007-12-09 09:54:02 +0100 (Sun, 09 Dec 2007) | 2 lines

  #1575: the Mac readme is now one level up.
........
  r59437 | georg.brandl | 2007-12-09 09:59:45 +0100 (Sun, 09 Dec 2007) | 2 lines

  Remove all tabs in that file.
........

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index b9d842480bc4c267558d7d1d15c581d58652ab63..6d12d0f8b608325f8c0c30b343ff57341dc4c35b 100644 (file)
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -56,7 +56,7 @@ Glossary
       it's almost certain you can safely ignore them.
     
    context manager
-      Objects which control the environment seen in a :keyword:`with`
+      An objects that controls the environment seen in a :keyword:`with`
       statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
       See :pep:`343`.
 

diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index 9a10385ebb400b0b6f0addb60ef7a64aa5a9d2e9..c3c030951dcdb170dccdd5be128973538d099aae 100644 (file)
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -198,8 +198,8 @@ Available Functions
 
    *module_globals*, if supplied, should be the global namespace in use by the code
    for which the warning is issued.  (This argument is used to support displaying
-   source for modules found in zipfiles or other non-filesystem import sources, and
-   was added in Python 2.5.)
+   source for modules found in zipfiles or other non-filesystem import
+   sources).
 
 
 .. function:: showwarning(message, category, filename, lineno[, file])