diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 17:19:26 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 17:19:26 (GMT) |
| commit | 89672bf129b3621a2b4d0997961d42e4abee430c (patch) | |
| tree | 480722793aafddfb3bd82665b31c831b7224a63b /Doc | |
| parent | 3686db104c7f3cf03864df6951c6ad9011fb6ea3 (diff) | |
| parent | 6647a719bc96223f402c07d32d16cbd0b48046bd (diff) | |
| download | cpython-89672bf129b3621a2b4d0997961d42e4abee430c.zip cpython-89672bf129b3621a2b4d0997961d42e4abee430c.tar.gz cpython-89672bf129b3621a2b4d0997961d42e4abee430c.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/platform.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index a6a98f1..e27f2ad 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -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 |