Merge fixes for #13614, #13512 and #7719 from 3.2

diff --cc Doc/distutils/apiref.rst
index 71702e5586b073cf0fcb09ec49ecd48b9d179ee9,74fba4ada7fa44f5ae419ebba8416384aca8de91..106cc52df5950037df9704c6ae040dabd01e49e6
--- 1/Doc/distutils/apiref.rst
--- 2/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@@ -992,6 -992,12 +992,12 @@@ directories
     destination of the symlink will be copied.  *update* and *verbose* are the same
     as for :func:`copy_file`.
  
 -   .. versionchanged:: 3.2.4
+    Files in *src* that begin with :file:`.nfs` are skipped (more information on
+    these files is available in answer D2 of the `NFS FAQ page
+    <http://nfs.sourceforge.net/#section_d>`_.
+ 
++   .. versionchanged:: 3.3.1
+       NFS files are ignored.
  
  .. function:: remove_tree(directory[, verbose=0, dry_run=0])
  

diff --cc Doc/library/abc.rst
index db3adbda5a7d7302a209c5e4583e493e85195ffc,dcec19a3a76615aaf788b7984a472df8f0b8f389..6f235962c9e11804f2537e533ea87451b12df6a6
--- 1/Doc/library/abc.rst
--- 2/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@@ -127,9 -124,9 +127,9 @@@ This module provides the following clas
     available as a method of ``Foo``, so it is provided separately.
  
  
 -It also provides the following decorators:
 +The :mod:`abc` module also provides the following decorators:
  
- .. decorator:: abstractmethod(function)
+ .. decorator:: abstractmethod
  
     A decorator indicating abstract methods.
  
@@@ -219,12 -174,9 +219,12 @@@
                ...
  
     .. versionadded:: 3.2
 +   .. deprecated:: 3.3
 +       It is now possible to use :class:`classmethod` with
 +       :func:`abstractmethod`, making this decorator redundant.
  
  
- .. decorator:: abstractstaticmethod(function)
+ .. decorator:: abstractstaticmethod
  
     A subclass of the built-in :func:`staticmethod`, indicating an abstract
     staticmethod. Otherwise it is similar to :func:`abstractmethod`.

diff --cc Doc/library/io.rst
index 810e56f2360ab4e3bb4fc1b9abeaf50de8d4ae42,1939352bc128909536810c9ccfd0f764b5e8ba67..98e03585c46ea7c3ffd33846b753f0ce627c4eef
--- 1/Doc/library/io.rst
--- 2/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@@ -230,15 -234,15 +230,15 @@@ I/O Base Classe
     :class:`str` data.
  
     Note that calling any method (even inquiries) on a closed stream is
 -   undefined.  Implementations may raise :exc:`IOError` in this case.
 +   undefined.  Implementations may raise :exc:`ValueError` in this case.
  
-    :class:`IOBase` (and its subclasses) support the iterator protocol, meaning
 -   IOBase (and its subclasses) supports the iterator protocol, meaning that an
 -   :class:`IOBase` object can be iterated over yielding the lines in a stream.
 -   Lines are defined slightly differently depending on whether the stream is
 -   a binary stream (yielding bytes), or a text stream (yielding character
 -   strings).  See :meth:`~IOBase.readline` below.
++   :class:`IOBase` (and its subclasses) supports the iterator protocol, meaning
 +   that an :class:`IOBase` object can be iterated over yielding the lines in a
 +   stream.  Lines are defined slightly differently depending on whether the
 +   stream is a binary stream (yielding bytes), or a text stream (yielding
 +   character strings).  See :meth:`~IOBase.readline` below.
  
 -   IOBase is also a context manager and therefore supports the
 +   :class:`IOBase` is also a context manager and therefore supports the
     :keyword:`with` statement.  In this example, *file* is closed after the
     :keyword:`with` statement's suite is finished---even if an exception occurs::
  

diff --cc Doc/library/sys.rst
index 73914e36846c88683bfbe24fd00b5c76e40911d0,a3c14e63179a4938ade63db6b67e6a4e734cd79f..93273c45688bc756dd7236176c12e284c07d157d
--- 1/Doc/library/sys.rst
--- 2/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@@ -830,24 -729,25 +830,24 @@@ always available
        elif sys.platform.startswith('linux'):
            # Linux-specific code here...
  
 -   .. versionchanged:: 3.2.2
 -      Since lots of code check for ``sys.platform == 'linux2'``, and there is
 -      no essential change between Linux 2.x and 3.x, ``sys.platform`` is always
 -      set to ``'linux2'``, even on Linux 3.x.  In Python 3.3 and later, the
 -      value will always be set to ``'linux'``, so it is recommended to always
 -      use the ``startswith`` idiom presented above.
 -
     For other systems, the values are:
  
 -   ====================== ===========================
 -   System                 ``platform`` value
 -   ====================== ===========================
 -   Linux (2.x *and* 3.x)  ``'linux2'``
 -   Windows                ``'win32'``
 -   Windows/Cygwin         ``'cygwin'``
 -   Mac OS X               ``'darwin'``
 -   OS/2                   ``'os2'``
 -   OS/2 EMX               ``'os2emx'``
 -   ====================== ===========================
 +   ================ ===========================
-    System           :data:`platform` value
++   System           ``platform`` value
 +   ================ ===========================
 +   Linux            ``'linux'``
 +   Windows          ``'win32'``
 +   Windows/Cygwin   ``'cygwin'``
 +   Mac OS X         ``'darwin'``
 +   OS/2             ``'os2'``
 +   OS/2 EMX         ``'os2emx'``
 +   ================ ===========================
 +
 +   .. versionchanged:: 3.3
 +      On Linux, :attr:`sys.platform` doesn't contain the major version anymore.
 +      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::
  

diff --cc Misc/ACKS
index 1fe98c9dc058d1aef99d7110fbd263f2baf180f8,4fc365900819e5d2802eb37d273a1c9528e89034..b200044742a2332a3dc51735e0b97d8dfa4d462e
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -564,9 -513,9 +565,10 @@@ Julien Jehanne
  Drew Jenkins
  Flemming Kjær Jensen
  Philip H. Jensen
+ Philip Jenvey
  MunSic Jeong
  Chris Jerdonek
 +Jim Jewett
  Pedro Diaz Jimenez
  Orjan Johansen
  Fredrik Johansson
@@@ -677,14 -615,14 +679,15 @@@ Simon La
  Julia Lawall
  Chris Lawrence
  Brian Leair
 +Mathieu Leduc-Hamel
 +Christopher Lee
 +Inyeol Lee
  James Lee
  John J. Lee
 -Inyeol Lee
  Thomas Lee
 -Christopher Lee
  Tennessee Leeuwenburg
  Luc Lefebvre
+ Pierre Paul Lefebvre
  Glyph Lefkowitz
  Vincent Legoll
  Kip Lehman

diff --cc Misc/NEWS
Simple merge