Merge branch 'master' into 19072-classmethod-descriptor

python · rhettinger · Aug 24, 2019 · Jul 23, 2018 · Jul 23, 2018 · Aug 24, 2019
commit a0131820db8ea4f3bc003c75b5a98b3ef6b4971f
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
@@ -223,8 +223,7 @@ are always available.  They are listed here in alphabetical order.
 
    Class methods are different than C++ or Java static methods. If you want those,
    see :func:`staticmethod` in this section.
-   For more information on class methods, consult the documentation on the standard
-   type hierarchy in :ref:`types`.
+   For more information on class methods, see :ref:`types`.
 
    .. versionchanged:: 3.9
    Class methods can now wrap other :term:`descriptors <descriptor>` such as