merge. again.

This commit is contained in:
Brian Curtin 2012-02-01 15:24:10 -06:00
commit 090ec3c7fc
2 changed files with 3 additions and 3 deletions

View File

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

View File

@ -549,7 +549,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