Author: eric.smith Date: Wed Jan 27 01:56:30 2010 New Revision: 77769 Log: Merged revisions 77767 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77767 | eric.smith | 2010-01-26 19:55:16 -0500 (Tue, 26 Jan 2010) | 1 line Fix type on getwindowsversion documentation. Thanks Taggnostr. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/library/sys.rst Modified: python/branches/py3k/Doc/library/sys.rst ============================================================================== --- python/branches/py3k/Doc/library/sys.rst (original) +++ python/branches/py3k/Doc/library/sys.rst Wed Jan 27 01:56:30 2010 @@ -394,7 +394,7 @@ .. function:: getwindowsversion() - Return a named tuple containing describing the Windows version + Return a named tuple describing the Windows version currently running. The named elements are *major*, *minor*, *build*, *platform*, *service_pack*, *service_pack_minor*, *service_pack_major*, *suite_mask*, and *product_type*.