merge from fb225c289bf0

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index 49c617f191cca07e5b3b950e9d4963586fc90332..26f587eaf3c97b11d1e25c398ad9b5d1cf423c5f 100644 (file)
--- 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 20f8dc6e7a1bc37c40515048f2a1a16a2b23d56c..d20c39d9a7ce9e0acaff2799405c1a5a87211ea0 100755 (executable)
--- 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