summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-02-01 21:22:50 (GMT)
committerBrian Curtin <brian@python.org>2012-02-01 21:22:50 (GMT)
commit3c8807bd5e29139728ea1532d330a767f373bc00 (patch)
tree7d5086c658be4ab44457bf4117dfd34ccad52988 /Doc
parent0518f470b1bb99b0b8878224942ebf1e18d1e74f (diff)
parentb4bef305fd1d40ce4912922c1787db8cddb42a8f (diff)
downloadcpython-3c8807bd5e29139728ea1532d330a767f373bc00.zip
cpython-3c8807bd5e29139728ea1532d330a767f373bc00.tar.gz
cpython-3c8807bd5e29139728ea1532d330a767f373bc00.tar.bz2
merge.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/platform.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index 49c617f..26f587e 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -197,8 +197,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