Merge fixes for #13614, #13512 and #7719 from 3.2
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 71702e5..106cc52 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -992,6 +992,12 @@
destination of the symlink will be copied. *update* and *verbose* are the same
as for :func:`copy_file`.
+ 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 --git a/Doc/library/abc.rst b/Doc/library/abc.rst
index db3adbd..6f23596 100644
--- a/Doc/library/abc.rst
+++ b/Doc/library/abc.rst
@@ -129,7 +129,7 @@
The :mod:`abc` module also provides the following decorators:
-.. decorator:: abstractmethod(function)
+.. decorator:: abstractmethod
A decorator indicating abstract methods.
@@ -203,7 +203,7 @@
multiple-inheritance.
-.. decorator:: abstractclassmethod(function)
+.. decorator:: abstractclassmethod
A subclass of the built-in :func:`classmethod`, indicating an abstract
classmethod. Otherwise it is similar to :func:`abstractmethod`.
@@ -224,7 +224,7 @@
: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 --git a/Doc/library/io.rst b/Doc/library/io.rst
index 810e56f..98e0358 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -232,7 +232,7 @@
Note that calling any method (even inquiries) on a closed stream is
undefined. Implementations may raise :exc:`ValueError` in this case.
- :class:`IOBase` (and its subclasses) support the iterator protocol, meaning
+ :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
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 73914e3..93273c4 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -833,7 +833,7 @@
For other systems, the values are:
================ ===========================
- System :data:`platform` value
+ System ``platform`` value
================ ===========================
Linux ``'linux'``
Windows ``'win32'``