[Python-checkins] r81453 - in python/branches/release31-maint: Doc/library/os.rst

[georg.brandl]

Author: georg.brandl
Date: Sat May 22 00:05:15 2010
New Revision: 81453

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/os.rst

Modified: python/branches/release31-maint/Doc/library/os.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/os.rst	(original)
+++ python/branches/release31-maint/Doc/library/os.rst	Sat May 22 00:05:15 2010
@@ -2073,8 +2073,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`.
 
 
 .. _os-miscfunc: