[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/aac01a983952
changeset:   86129:aac01a983952
parent:      86127:a3d09c19bb93
parent:      86128:7caae256dff6
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 19:27:17 2013 +0200
summary:
  merge with 3.3

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1612,8 +1612,8 @@
    The default *mode* is ``0o777`` (octal).  On some systems, *mode* is
    ignored.  Where it is used, the current umask value is first masked out.
 
-   If *exists_ok* is ``False`` (the default), an :exc:`OSError` is raised if
-   the target directory already exists.  If *exists_ok* is ``True`` an
+   If *exist_ok* is ``False`` (the default), an :exc:`OSError` is raised if
+   the target directory already exists.  If *exist_ok* is ``True`` an
    :exc:`OSError` is still raised if the umask-masked *mode* is different from
    the existing mode, on systems where the mode is used.  :exc:`OSError` will
    also be raised if the directory creation fails.

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