[Python-checkins] r81451 - in python/branches/release26-maint: Doc/library/os.rst
georg.brandl
python-checkins at python.org
Sat May 22 00:04:28 CEST 2010
Author: georg.brandl
Date: Sat May 22 00:04:28 2010
New Revision: 81451
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/library/os.rst
Modified: python/branches/release26-maint/Doc/library/os.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/os.rst (original)
+++ python/branches/release26-maint/Doc/library/os.rst Sat May 22 00:04:28 2010
@@ -2350,8 +2350,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`.
.. versionadded:: 2.4
More information about the Python-checkins
mailing list