From: Éric Araujo <merwok@netwok.org>
Date: Wed, 27 Apr 2011 14:32:36 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~2487
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0abb8b74d911607d8535bd79a042918295627454;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

0abb8b74d911607d8535bd79a042918295627454
diff --cc Doc/library/sys.rst
index 914db8d10078,ecac1fed1c4a..ba781b3a6d0e
--- a/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