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