Branch merge

diff --cc Doc/library/sys.rst
index 148630cceefde15747913afaacd575c577254983,acf57638191eb5667f5d16a263e3edcfc2808529..c61fedb45aa7913e1336d7e3735c31cf4015d9a5
--- 1/Doc/library/sys.rst
--- 2/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@@ -447,32 -447,9 +447,32 @@@ 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.
  
 +   The ``hexversion`` is a 32-bit number with the following layout
 +
 +   +-------------------------+------------------------------------------------+
 +   | bits (big endian order) | meaning                                        |
 +   +=========================+================================================+
 +   | :const:`1-8`            |  ``PY_MAJOR_VERSION``  (the ``2`` in           |
 +   |                         |  ``2.1.0a3``)                                  |
 +   +-------------------------+------------------------------------------------+
 +   | :const:`9-16`           |  ``PY_MINOR_VERSION``  (the ``1`` in           |
 +   |                         |  ``2.1.0a3``)                                  |
 +   +-------------------------+------------------------------------------------+
 +   | :const:`17-24`          |  ``PY_MICRO_VERSION``  (the ``0`` in           |
 +   |                         |  ``2.1.0a3``)                                  |
 +   +-------------------------+------------------------------------------------+
 +   | :const:`25-28`          |  ``PY_RELEASE_LEVEL``  (``0xA`` for alpha,     |
 +   |                         |  ``0xB`` for beta, ``0xC`` for gamma and       |
 +   |                         |  ``0xF`` for final)                            |
 +   +-------------------------+------------------------------------------------+
 +   | :const:`29-32`          |  ``PY_RELEASE_SERIAL``  (the ``3`` in          |
 +   |                         |  ``2.1.0a3``)                                  |
 +   +-------------------------+------------------------------------------------+
 +
 +   thus ``2.1.0a3`` is hexversion ``0x020100a3``
  
  .. data:: int_info