merge from 3.2

8d132c88 · Brian Curtin · ed27785b · 10dda6e0 · 8d132c88 · 8d132c88
Commit 8d132c88 authored Feb 01, 2012 by Brian Curtin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Doc/library/platform.rst Doc/library/platform.rst +2 -2

Lib/platform.py Lib/platform.py +1 -1

No files found.
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -188,8 +188,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

--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -475,7 +475,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