[Python-checkins] closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/fa5157e0499f7afdb59e220e3f4fdbf44adb5ac8
commit: fa5157e0499f7afdb59e220e3f4fdbf44adb5ac8
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-04-02T20:39:14-07:00
summary:

closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)

(cherry picked from commit badb894bbbb8aaa8b669c4a6f675a0bc7d98e188)

Co-authored-by: Andrés Delfino <34587441+andresdelfino at users.noreply.github.com>

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index b2722168bc21..b3179acac0d8 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2725,7 +2725,7 @@ features:
    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
+   By default, errors from the :func:`scandir` call are ignored.  If optional
    argument *onerror* is specified, it should be a function; it will be called with
    one argument, an :exc:`OSError` instance.  It can report the error to continue
    with the walk, or raise the exception to abort the walk.  Note that the filename