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. ........ ................

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. ........ ................
5d4a60fc · Georg Brandl · bbd5a7a7 · 5d4a60fc
Commit 5d4a60fc authored May 21, 2010 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/library/os.rst Doc/library/os.rst +2 -2

No files found.
--- 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: