diff options
author | Brian Curtin <brian@python.org> | 2012-02-01 21:24:10 (GMT) |
---|---|---|
committer | Brian Curtin <brian@python.org> | 2012-02-01 21:24:10 (GMT) |
commit | 090ec3c7fccbb7d5ddc026043b84a56be011adf5 (patch) | |
tree | 4b91703d0b26fccd78099ab35cffc9fb94d11602 /Doc | |
parent | 023fe334bbb61fd4912dd6f3e02e19528333ac62 (diff) | |
parent | 10dda6e029b70aa95c51fe7ba2a61b729527c73b (diff) | |
download | cpython-090ec3c7fccbb7d5ddc026043b84a56be011adf5.zip cpython-090ec3c7fccbb7d5ddc026043b84a56be011adf5.tar.gz cpython-090ec3c7fccbb7d5ddc026043b84a56be011adf5.tar.bz2 |
merge. again.
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 929936e..85eca9a 100644 --- 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 |