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

diff --cc Doc/library/smtpd.rst
index 1c255ddb942ca8ea6500a45da1fd03213cf48ffb,080411b66407104e59447e03705483d1e585f112..e383201aab1461c597e7d0ba0ec05e5d738aa4a8
--- 1/Doc/library/smtpd.rst
--- 2/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

diff --cc Doc/library/socket.rst
Simple merge