merge from fb225c289bf0
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index 49c617f..26f587e 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -197,8 +197,8 @@
.. 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 20f8dc6..d20c39d 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -554,7 +554,7 @@
""" 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