summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2010-01-27 00:56:30 (GMT)
committerEric Smith <eric@trueblade.com>2010-01-27 00:56:30 (GMT)
commit7338a3934687d68576dfd587c77cc61317f6f6d1 (patch)
tree5b15191bfdcce46e316408427c3caa0b3a0f599f
parentf7bb57875acfd86a2864b3c305d90a083fa97fef (diff)
downloadcpython-7338a3934687d68576dfd587c77cc61317f6f6d1.zip
cpython-7338a3934687d68576dfd587c77cc61317f6f6d1.tar.gz
cpython-7338a3934687d68576dfd587c77cc61317f6f6d1.tar.bz2
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. ........
-rw-r--r--Doc/library/sys.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 1278248..e9d4e16 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -394,7 +394,7 @@ always available.
.. 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*.