[Python-checkins] cpython (merge 3.2 -> default): #12277: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/7e57c95898d3
changeset:   72968:7e57c95898d3
parent:      72966:5ea81e4c58a7
parent:      72967:b41def1851b6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Oct 18 13:00:36 2011 +0300
summary:
  #12277: merge with 3.2.

files:
  Doc/library/os.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2168,7 +2168,7 @@
    ineffective, 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:`listdir` 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

-- 
Repository URL: http://hg.python.org/cpython