From: Eric Smith <eric@trueblade.com>
Date: Wed, 27 Jan 2010 00:56:30 +0000 (+0000)
Subject: Merged revisions 77767 via svnmerge from
X-Git-Tag: v3.2a1~1804
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7338a3934687d68576dfd587c77cc61317f6f6d1;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 1278248188e0..e9d4e1616e2b 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*.