summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-05-29 23:36:40 (GMT)
committerBrian Curtin <brian@python.org>2012-05-29 23:36:40 (GMT)
commitd648fa26278dee504afbaf8491d399246c5887a8 (patch)
treeeb9409c1d503706200fa5d72a933636be882aa3b
parent5e86eed33e572cc37c19e6b330e960b8b859443c (diff)
parent13c70345ca3767e6b83ef36998fc4953c01fb65a (diff)
downloadcpython-d648fa26278dee504afbaf8491d399246c5887a8.zip
cpython-d648fa26278dee504afbaf8491d399246c5887a8.tar.gz
cpython-d648fa26278dee504afbaf8491d399246c5887a8.tar.bz2
Fix #14943. Merge 3.2
-rw-r--r--Doc/library/winreg.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
index 376752e..f7756da 100644
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -271,7 +271,7 @@ This module offers the following functions:
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 @@ This module offers the following functions:
*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.