Merge 3.2

diff --cc Doc/library/sys.rst
index 914db8d10078fbbe036b3d3106f6c6080695d2bb,ecac1fed1c4a8c769bd703e22b1542e33b7b90b2..ba781b3a6d0ec9cc064c3b0ca3c80f0a1a07f756
--- 1/Doc/library/sys.rst
--- 2/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@@ -540,8 -549,8 +540,8 @@@ always available
  
     This is called ``hexversion`` since it only really looks meaningful when viewed
     as the result of passing it to the built-in :func:`hex` function.  The
-    ``version_info`` value may be used for a more human-friendly encoding of the
-    same information.
 -   struct sequence  :data:`sys.version_info` may be used for a more human-friendly
 -   encoding of the same information.
++   :term:`struct sequence`  :data:`sys.version_info` may be used for a more
++   human-friendly encoding of the same information.
  
     The ``hexversion`` is a 32-bit number with the following layout