[Python-checkins] cpython (merge 3.2 -> default): Fix #14943. Merge 3.2

[brian.curtin]

http://hg.python.org/cpython/rev/29e0f08ef065
changeset:   77239:29e0f08ef065
parent:      77237:4dd878993b88
parent:      77238:fcb6c4a4ac0e
user:        Brian Curtin <brian at python.org>
date:        Tue May 29 18:36:40 2012 -0500
summary:
  Fix #14943. Merge 3.2

files:
  Doc/library/winreg.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -271,7 +271,7 @@
    specified in *file_name* is relative to the remote computer.
 
 
-.. function:: OpenKey(key, sub_key, reserved=0, access=KEY_ALL_ACCESS)
+.. function:: OpenKey(key, sub_key, reserved=0, access=KEY_READ)
 
    Opens the specified key, returning a :ref:`handle object <handle-object>`.
 
@@ -280,9 +280,9 @@
 
    *sub_key* is a string that identifies the sub_key to open.
 
-   *res* is a reserved integer, and must be zero.  The default is zero.
+   *reserved* is a reserved integer, and must be zero.  The default is zero.
 
-   *sam* is an integer that specifies an access mask that describes the desired
+   *access* is an integer that specifies an access mask that describes the desired
    security access for the key.  Default is :const:`KEY_READ`.  See :ref:`Access
    Rights <access-rights>` for other allowed values.
 

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