Merge 3.4 (Issue #25461)

vstinner · vstinner · commit 4487a46727b9 · 2015-10-23T12:39:20.000+02:00
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
@@ -2529,9 +2529,9 @@ features:
    recurse into the subdirectories whose names remain in *dirnames*; this can be
    used to prune the search, impose a specific order of visiting, or even to inform
    :func:`walk` about directories the caller creates or renames before it resumes
-   :func:`walk` again.  Modifying *dirnames* when *topdown* is ``False`` is
-   ineffective, because in bottom-up mode the directories in *dirnames* are
-   generated before *dirpath* itself is generated.
+   :func:`walk` again.  Modifying *dirnames* when *topdown* is ``False`` has
+   no effect on the behavior of the walk, because in bottom-up mode the directories
+   in *dirnames* are generated before *dirpath* itself is generated.
 
    By default, errors from the :func:`listdir` call are ignored.  If optional
    argument *onerror* is specified, it should be a function; it will be called with
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -1246,6 +1246,7 @@ Rusty Russell
 Nick Russo
 James Rutherford
 Chris Ryland
+Bernt Røskar Brenna
 Constantina S.
 Patrick Sabin
 Sébastien Sablé
