merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 19:19:26 +02:00
commit 89672bf129
1 changed files with 2 additions and 2 deletions

View File

@ -194,8 +194,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
(service pack) and OS type (multi/single processor).
``(release, version, csd, ptype)`` referring to OS release, 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