Merged revisions 81452 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r81452 | georg.brandl | 2010-05-22 00:04:32 +0200 (Sa, 22 Mai 2010) | 9 lines

  Merged revisions 81450 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81450 | georg.brandl | 2010-05-22 00:03:29 +0200 (Sa, 22 Mai 2010) | 1 line

    #8709: mention Windows support for os.devnull.
  ........
................

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 28d8c53b9d677a98698f4e8df08bf093339e60f3..63bacd3dd117cd2bff53005324ed62220c88e47d 100644 (file)
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2073,8 +2073,8 @@ Higher-level operations on pathnames are defined in the :mod:`os.path` module.
 
 .. data:: devnull
 
-   The file path of the null device. For example: ``'/dev/null'`` for POSIX.
-   Also available via :mod:`os.path`.
+   The file path of the null device. For example: ``'/dev/null'`` for
+   POSIX, ``'nul'`` for Windows.  Also available via :mod:`os.path`.
 
 
 .. _os-miscfunc: