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 eb48bf1913b763f3b1567eeffa0837072e6533ea..970725a1c50d1bafe74b3485cc252527b390b39c 100644 (file)
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2194,8 +2194,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: