[Python-checkins] cpython (merge 3.3 -> default): Issue #20301: Merge with 3.3

[zach.ware]

http://hg.python.org/cpython/rev/3baee069c5ff
changeset:   88612:3baee069c5ff
parent:      88609:7a76781e619d
parent:      88611:da35a4e724e5
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jan 21 13:50:13 2014 -0600
summary:
  Issue #20301: Merge with 3.3

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


diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -146,7 +146,7 @@
    *reserved* is a reserved integer, and must be zero. The default is zero.
 
    *access* is an integer that specifies an access mask that describes the desired
-   security access for the key.  Default is :const:`KEY_ALL_ACCESS`.  See
+   security access for the key.  Default is :const:`KEY_WOW64_64KEY`.  See
    :ref:`Access Rights <access-rights>` for other allowed values.
 
    *This method can not delete keys with subkeys.*

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