From: Georg Brandl <georg@python.org>
Date: Fri, 21 May 2010 22:04:28 +0000 (+0000)
Subject: Merged revisions 81450 via svnmerge from
X-Git-Tag: v2.6.6rc1~257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86a33341c0cf2cf1660f10dcfd5adf428e9213aa;p=thirdparty%2FPython%2Fcpython.git

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 eb9cb193bcb3..92b443e352c1 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2350,8 +2350,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`.
 
    .. versionadded:: 2.4