Merge with 3.2.

3 files changed, 23 insertions, 10 deletions

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index d2986e4..acdde6d 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -710,6 +710,8 @@ always available.
 
       if sys.platform.startswith('freebsd'):
           # FreeBSD-specific code here...
+      elif sys.platform.startswith('linux'):
+          # Linux-specific code here...
 
    For other systems, the values are:
 
@@ -726,7 +728,9 @@ always available.
 
    .. versionchanged:: 3.3
       On Linux, :attr:`sys.platform` doesn't contain the major version anymore.
-      It is always ``'linux'``, instead of ``'linux2'`` or ``'linux3'``.
+      It is always ``'linux'``, instead of ``'linux2'`` or ``'linux3'``.  Since
+      older Python versions include the version number, it is recommended to
+      always use the ``startswith`` idiom presented above.
 
    .. seealso::
       :attr:`os.name` has a coarser granularity.  :func:`os.uname` gives
@@ -735,6 +739,7 @@ always available.
       The :mod:`platform` module provides detailed checks for the
       system's identity.
 
+
 .. data:: prefix
 
    A string giving the site-specific directory prefix where the platform
diff --git a/Doc/license.rst b/Doc/license.rst
index 9119f18..5050ff0 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -106,10 +106,18 @@ been GPL-compatible; the table below summarizes the various releases.
 +----------------+--------------+------------+------------+-----------------+
 | 3.1.1          | 3.1          | 2009       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
-| 3.1.2          | 3.1          | 2010       | PSF        | yes             |
+| 3.1.2          | 3.1.1        | 2010       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
+| 3.1.3          | 3.1.2        | 2010       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
+| 3.1.4          | 3.1.3        | 2011       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
 | 3.2            | 3.1          | 2011       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
+| 3.2.1          | 3.2          | 2011       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
+| 3.2.2          | 3.2.1        | 2011       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
 | 3.3            | 3.2          | 2012       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
 
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
index 8211d62..c8fd9c4 100644
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -286,10 +286,10 @@ documenting/rest,130,`,`Link text <http://target>`_
 documenting/rest,187,.. function:,.. function:: foo(x)
 documenting/rest,187,:bar,:bar: no
 documenting/rest,208,.. rubric:,.. rubric:: Footnotes
-faq/programming,762,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
-faq/programming,762,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
-faq/programming,762,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr("
-faq/programming,1047,::,for x in sequence[::-1]:
+faq/programming,,:reduce,"print((lambda Ru,Ro,Iu,Io,IM,Sx,Sy:reduce(lambda x,y:x+y,map(lambda y,"
+faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
+faq/programming,,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr("
+faq/programming,,::,for x in sequence[::-1]:
 faq/windows,229,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
 faq/windows,393,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
 library/bisect,32,:hi,all(val >= x for val in a[i:hi])
@@ -310,10 +310,10 @@ library/urllib.request,,:lang,"xmlns=""http://www.w3.org/1999/xhtml"" xml:lang="
 library/xmlrpc.client,103,:pass,http://user:pass@host:port/path
 library/xmlrpc.client,103,:port,http://user:pass@host:port/path
 library/xmlrpc.client,103,:pass,user:pass
-license,717,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-license,717,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-license,879,`,"``Software''), to deal in the Software without restriction, including"
-license,879,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
+license,,`,* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+license,,`,* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+license,,`,"``Software''), to deal in the Software without restriction, including"
+license,,`,"THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,"
 reference/lexical_analysis,704,`,$       ?       `
 whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
 whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"