From: Richard Oudkerk <shibturn@gmail.com>
Date: Fri, 17 Aug 2012 13:42:43 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.0rc1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67a58cc51570ef67002fa1244782be115f888aac;p=python

Merge
---

67a58cc51570ef67002fa1244782be115f888aac
diff --cc Doc/library/multiprocessing.rst
index 6cf0b612dc,e93d121a5f..33a351128c
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@@ -1865,11 -1768,10 +1865,11 @@@ multiple connections at the same time
     generally be omitted since it can usually be inferred from the format of
     *address*. (See :ref:`multiprocessing-address-formats`)
  
-    If *authenticate* is ``True`` or *authkey* is a string then digest
+    If *authenticate* is ``True`` or *authkey* is a byte string then digest
     authentication is used.  The key used for authentication will be either
-    *authkey* or ``current_process().authkey)`` if *authkey* is ``None``.
+    *authkey* or ``current_process().authkey`` if *authkey* is ``None``.
 -   If authentication fails then :exc:`AuthenticationError` is raised.  See
 +   If authentication fails then
 +   :exc:`~multiprocessing.AuthenticationError` is raised.  See
     :ref:`multiprocessing-auth-keys`.
  
  .. class:: Listener([address[, family[, backlog[, authenticate[, authkey]]]]])