Merged revisions 80472 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80472 | ezio.melotti | 2010-04-25 20:48:01 +0300 (Sun, 25 Apr 2010) | 9 lines

  Merged revisions 79786 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79786 | ezio.melotti | 2010-04-05 11:02:54 +0300 (Mon, 05 Apr 2010) | 1 line

    Fix markup, punctuation and whitespaces in _winreg.rst.
  ........
................

Doc/library/winreg.rst

@@ -32,7 +32,7 @@ This module offers the following functions:
 .. function:: ConnectRegistry(computer_name, key)
 
    Establishes a connection to a predefined registry handle on another computer,
-   and returns a :dfn:`handle object`
+   and returns a :ref:`handle object <handle-object>`.
 
    *computer_name* is the name of the remote computer, of the form
    ``r"\\computername"``.  If ``None``, the local computer is used.
@@ -45,7 +45,8 @@ This module offers the following functions:
 
 .. function:: CreateKey(key, sub_key)
 
-   Creates or opens the specified key, returning a :dfn:`handle object`
+   Creates or opens the specified key, returning a
+   :ref:`handle object <handle-object>`.
 
    *key* is an already open key, or one of the predefined :const:`HKEY_\*`
    constants.
@@ -174,7 +175,7 @@ This module offers the following functions:
 
    A call to LoadKey() fails if the calling process does not have the
    :const:`SE_RESTORE_PRIVILEGE` privilege. Note that privileges are different than
-   permissions - see the Win32 documentation for more details.
+   permissions -- see the Win32 documentation for more details.
 
    If *key* is a handle returned by :func:`ConnectRegistry`, then the path
    specified in *fileName* is relative to the remote computer.
@@ -185,7 +186,7 @@ This module offers the following functions:
 
 .. function:: OpenKey(key, sub_key[, res[, sam]])
 
-   Opens the specified key, returning a :dfn:`handle object`
+   Opens the specified key, returning a :ref:`handle object <handle-object>`.
 
    *key* is an already open key, or any one of the predefined :const:`HKEY_\*`
    constants.
@@ -204,8 +205,8 @@ This module offers the following functions:
 
 .. function:: OpenKeyEx()
 
-   The functionality of :func:`OpenKeyEx` is provided via :func:`OpenKey`, by the
+   The functionality of :func:`OpenKeyEx` is provided via :func:`OpenKey`,
-   use of default arguments.
+   by the use of default arguments.
 
 
 .. function:: QueryInfoKey(key)
@@ -234,7 +235,7 @@ This module offers the following functions:
 
 .. function:: QueryValue(key, sub_key)
 
-   Retrieves the unnamed value for a key, as a string
+   Retrieves the unnamed value for a key, as a string.
 
    *key* is an already open key, or one of the predefined :const:`HKEY_\*`
    constants.
@@ -251,8 +252,8 @@ This module offers the following functions:
 
 .. function:: QueryValueEx(key, value_name)
 
-   Retrieves the type and data for a specified value name associated with  an open
+   Retrieves the type and data for a specified value name associated with
-   registry key.
+   an open registry key.
 
    *key* is an already open key, or one of the predefined :const:`HKEY_\*`
    constants.
@@ -286,7 +287,7 @@ This module offers the following functions:
    If *key* represents a key on a remote computer, the path described by
    *file_name* is relative to the remote computer. The caller of this method must
    possess the :const:`SeBackupPrivilege` security privilege.  Note that
-   privileges are different than permissions  - see the Win32 documentation for
+   privileges are different than permissions -- see the Win32 documentation for
    more details.
 
    This function passes NULL for *security_attributes* to the API.
@@ -359,7 +360,7 @@ This module offers the following functions:
    | :const:`REG_SZ`                  | A null-terminated string.                   |
    +----------------------------------+---------------------------------------------+
 
-   *reserved* can be anything - zero is always passed to the  API.
+   *reserved* can be anything -- zero is always passed to the API.
 
    *value* is a string that specifies the new value.
 
@@ -388,7 +389,7 @@ All registry functions in this module return one of these objects.
 All registry functions in this module which accept a handle object also accept
 an integer, however, use of the handle object is encouraged.
 
-Handle objects provide semantics for :meth:`__bool__` - thus  ::
+Handle objects provide semantics for :meth:`__bool__` -- thus ::
 
    if handle:
        print("Yes")