Branch merge

merwok · merwok · commit 6e5222d5f87b · 2011-08-16T19:13:58.000+02:00
diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst
@@ -6,6 +6,9 @@
 .. moduleauthor:: Raymond Hettinger <python at rcn.com>
 .. sectionauthor:: Raymond Hettinger <python at rcn.com>
 
+.. versionadded:: 3.3
+   Formerly, this module was part of the :mod:`collections` module.
+
 .. testsetup:: *
 
    from collections import *
@@ -20,8 +23,6 @@ This module provides :term:`abstract base classes <abstract base class>` that
 can be used to test whether a class provides a particular interface; for
 example, whether it is hashable or whether it is a mapping.
 
-.. versionchanged:: 3.3
-   Formerly, this module was part of the :mod:`collections` module.
 
 .. _collections-abstract-base-classes:
 
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
@@ -72,7 +72,7 @@ The class can be used to simulate nested scopes and is useful in templating.
 
       A user updateable list of mappings.  The list is ordered from
       first-searched to last-searched.  It is the only stored state and can
-      modified to change which mappings are searched.  The list should
+      be modified to change which mappings are searched.  The list should
       always contain at least one mapping.
 
    .. method:: new_child()
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1359,7 +1359,7 @@ funny:
 		-o -name .hgignore \
 		-o -name .bzrignore \
 		-o -name MANIFEST \
-		-print
+		-o -print
 
 # Perform some verification checks on any modified files.
 patchcheck:
