Merge 3.2

diff --cc Doc/library/socket.rst
index 17a99e2b373d1c22abec8131f323de767be57c7a,ef81c4d4f70d147168f4da6c82212aadc7f59636..f507958fab7816ed5fc17a3c5263ba03d3e84485
--- 1/Doc/library/socket.rst
--- 2/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@@ -64,27 -64,22 +64,27 @@@ Socket addresses are represented as fol
    tuple, and the fields depend on the address type. The general tuple form is
    ``(addr_type, v1, v2, v3 [, scope])``, where:
  
-   - *addr_type* is one of TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, or
-     TIPC_ADDR_ID.
-   - *scope* is one of TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, and
-     TIPC_NODE_SCOPE.
-   - If *addr_type* is TIPC_ADDR_NAME, then *v1* is the server type, *v2* is
+   - *addr_type* is one of :const:`TIPC_ADDR_NAMESEQ`, :const:`TIPC_ADDR_NAME`,
+     or :const:`TIPC_ADDR_ID`.
+   - *scope* is one of :const:`TIPC_ZONE_SCOPE`, :const:`TIPC_CLUSTER_SCOPE`, and
+     :const:`TIPC_NODE_SCOPE`.
+   - If *addr_type* is :const:`TIPC_ADDR_NAME`, then *v1* is the server type, *v2* is
      the port identifier, and *v3* should be 0.
  
-     If *addr_type* is TIPC_ADDR_NAMESEQ, then *v1* is the server type, *v2*
+     If *addr_type* is :const:`TIPC_ADDR_NAMESEQ`, then *v1* is the server type, *v2*
      is the lower port number, and *v3* is the upper port number.
  
-     If *addr_type* is TIPC_ADDR_ID, then *v1* is the node, *v2* is the
+     If *addr_type* is :const:`TIPC_ADDR_ID`, then *v1* is the node, *v2* is the
      reference, and *v3* should be set to 0.
  
-     If *addr_type* is TIPC_ADDR_ID, then *v1* is the node, *v2* is the
+     If *addr_type* is :const:`TIPC_ADDR_ID`, then *v1* is the node, *v2* is the
      reference, and *v3* should be set to 0.
  
 +- A tuple ``(interface, )`` is used for the :const:`AF_CAN` address family,
 +  where *interface* is a string representing a network interface name like
 +  ``'can0'``. The network interface name ``''`` can be used to receive packets
 +  from all network interfaces of this family.
 +
  - Certain other address families (:const:`AF_BLUETOOTH`, :const:`AF_PACKET`)
    support specific representations.
  

diff --cc Lib/inspect.py
Simple merge

diff --cc Lib/test/regrtest.py
index cfae1f00e837e0964e4c64209ad80dcdb76b87b4,c3d2a2b1e2d39b56a11035c9452ff29d1b92ac16..af114168a998d38391d5c55ce5f01353f6dfd4f2
--- 1/Lib/test/regrtest.py
--- 2/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@@ -177,7 -165,7 +177,8 @@@ import packaging.databas
  import platform
  import random
  import re
+ import shutil
 +import signal
  import sys
  import sysconfig
  import tempfile

diff --cc Misc/ACKS
index b8e5881b943b1aab385559741fc5c726a2949bf8,4effde36afe68964fb6c9bc5d2b9675a94c55d96..70a42e20136c451aa27ef635578873b0cdee5fe2
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -975,9 -903,9 +975,10 @@@ Oren Tiros
  Jason Tishler
  Christian Tismer
  Frank J. Tobin
 -R Lindsay Todd
  Bennett Todd
 +R Lindsay Todd
 +Eugene Toder
+ Erik Tollerud
  Matias Torchinsky
  Sandro Tosi
  Richard Townsend

diff --cc Misc/NEWS
Simple merge

diff --cc Misc/python.man
Simple merge