[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/30c7467ee5c8
changeset:   86122:30c7467ee5c8
parent:      86118:77e5df9c1899
parent:      86121:4ef84ad5ca74
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 19:19:26 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/platform.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -194,8 +194,8 @@
 .. 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

-- 
Repository URL: http://hg.python.org/cpython