From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 7 Sep 2016 18:02:11 +0000 (-0400)
Subject: Merge: #26209: Clarify type of *localaddr*/*remoteadr* in smtpd docs.
X-Git-Tag: v3.6.0b1~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2195d537b37c1bc12759c6ed85aba2846e7ab574;p=thirdparty%2FPython%2Fcpython.git

Merge: #26209: Clarify type of *localaddr*/*remoteadr* in smtpd docs.
---

2195d537b37c1bc12759c6ed85aba2846e7ab574
diff --cc Doc/library/smtpd.rst
index 1c255ddb942c,080411b66407..e383201aab14
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@@ -29,12 -29,13 +29,13 @@@ SMTPServer Object
  
  
  .. class:: SMTPServer(localaddr, remoteaddr, data_size_limit=33554432,\
 -                      map=None, enable_SMTPUTF8=False, decode_data=True)
 +                      map=None, enable_SMTPUTF8=False, decode_data=False)
  
     Create a new :class:`SMTPServer` object, which binds to local address
-    *localaddr*.  It will treat *remoteaddr* as an upstream SMTP relayer.  It
-    inherits from :class:`asyncore.dispatcher`, and so will insert itself into
-    :mod:`asyncore`'s event loop on instantiation.
+    *localaddr*.  It will treat *remoteaddr* as an upstream SMTP relayer.  Both
+    *localaddr* and *remoteaddr* should be a :ref:`(host, port) <host_port>`
+    tuple.  The object inherits from :class:`asyncore.dispatcher`, and so will
+    insert itself into :mod:`asyncore`'s event loop on instantiation.
  
     *data_size_limit* specifies the maximum number of bytes that will be
     accepted in a ``DATA`` command.  A value of ``None`` or ``0`` means no