summaryrefslogtreecommitdiffstats
path: root/Doc/library/os.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-21 22:04:32 (GMT)
committerGeorg Brandl <georg@python.org>2010-05-21 22:04:32 (GMT)
commit850a990ee5aaac070635a005d245e7fa57b1dc19 (patch)
treeced55ab9da18723696d0c777c64fc82391433f63 /Doc/library/os.rst
parent25106ce6e9a5b6f381f70c960032cc3717e03536 (diff)
downloadcpython-850a990ee5aaac070635a005d245e7fa57b1dc19.zip
cpython-850a990ee5aaac070635a005d245e7fa57b1dc19.tar.gz
cpython-850a990ee5aaac070635a005d245e7fa57b1dc19.tar.bz2
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. ........
Diffstat (limited to 'Doc/library/os.rst')
-rw-r--r--Doc/library/os.rst4
1 files changed, 2 insertions, 2 deletions
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 @@ 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: