summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-21 22:05:15 (GMT)
committerGeorg Brandl <georg@python.org>2010-05-21 22:05:15 (GMT)
commitc52eeab0620628e329aa5979529f15722dbc9e81 (patch)
tree139ad7668f14d29c4feb7f07eaa7e0e794b64515 /Doc
parente86cd3471848f7da8f56089607eb40c0f9b5b120 (diff)
downloadcpython-c52eeab0620628e329aa5979529f15722dbc9e81.zip
cpython-c52eeab0620628e329aa5979529f15722dbc9e81.tar.gz
cpython-c52eeab0620628e329aa5979529f15722dbc9e81.tar.bz2
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. ........ ................
Diffstat (limited to 'Doc')
-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 28d8c53..63bacd3 100644
--- 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: