summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-02-01 21:17:39 (GMT)
committerBrian Curtin <brian@python.org>2012-02-01 21:17:39 (GMT)
commitb4bef305fd1d40ce4912922c1787db8cddb42a8f (patch)
tree8d9683ec6cd04710592bbaf00fb37ad753a62410 /Doc
parent1d4ae48f48b2da82a89769a714644eb55a541888 (diff)
downloadcpython-b4bef305fd1d40ce4912922c1787db8cddb42a8f.zip
cpython-b4bef305fd1d40ce4912922c1787db8cddb42a8f.tar.gz
cpython-b4bef305fd1d40ce4912922c1787db8cddb42a8f.tar.bz2
merge from fb225c289bf0
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