From: Brian Curtin <brian@python.org>
Date: Wed, 1 Feb 2012 21:17:39 +0000 (-0600)
Subject: merge from fb225c289bf0
X-Git-Tag: v2.7.3rc1~107^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4bef305fd1d40ce4912922c1787db8cddb42a8f;p=python

merge from fb225c289bf0
---

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index 49c617f191..26f587eaf3 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -197,8 +197,8 @@ Windows Platform
 .. function:: win32_ver(release='', version='', csd='', ptype='')
 
    Get additional version information from the Windows Registry and return a tuple
-   ``(version, csd, ptype)`` referring to version number, CSD level and OS type
-   (multi/single processor).
+   ``(version, csd, ptype)`` referring to version number, CSD level
+   (service pack) and OS type (multi/single processor).
 
    As a hint: *ptype* is ``'Uniprocessor Free'`` on single processor NT machines
    and ``'Multiprocessor Free'`` on multi processor machines. The *'Free'* refers
diff --git a/Lib/platform.py b/Lib/platform.py
index 20f8dc6e7a..d20c39d9a7 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -554,7 +554,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
 
     """ Get additional version information from the Windows Registry
         and return a tuple (version,csd,ptype) referring to version
-        number, CSD level and OS type (multi/single
+        number, CSD level (service pack), and OS type (multi/single
         processor).
 
         As a hint: ptype returns 'Uniprocessor Free' on single