merge with 3.3

89672bf1 · Georg Brandl · 3686db10 · 6647a719 · 89672bf1
Commit 89672bf1 authored Oct 06, 2013 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/library/platform.rst Doc/library/platform.rst +2 -2

No files found.
--- 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