[Python-checkins] bpo-33832: Add "magic method" glossary entry (GH-7630)

[Éric Araujo]

https://github.com/python/cpython/commit/f760610bddd7e8f8ac0914d5d59ef806bc16a73b
commit: f760610bddd7e8f8ac0914d5d59ef806bc16a73b
branch: master
author: Andre Delfino <adelfino at gmail.com>
committer: Éric Araujo <merwok at netwok.org>
date: 2019-03-26T21:21:27-04:00
summary:

bpo-33832: Add "magic method" glossary entry (GH-7630)

files:
A Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst
M Doc/glossary.rst

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 31cdba2444be..5810a6b79978 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -663,6 +663,11 @@ Glossary
       :term:`finder`. See :pep:`302` for details and
       :class:`importlib.abc.Loader` for an :term:`abstract base class`.
 
+   magic method
+      .. index:: pair: magic; method
+
+      An informal synonym for :term:`special method`.
+
    mapping
       A container object that supports arbitrary key lookups and implements the
       methods specified in the :class:`~collections.abc.Mapping` or
@@ -1004,6 +1009,8 @@ Glossary
       (subscript) notation uses :class:`slice` objects internally.
 
    special method
+      .. index:: pair: special; method
+
       A method that is called implicitly by Python to execute a certain
       operation on a type, such as addition.  Such methods have names starting
       and ending with double underscores.  Special methods are documented in
diff --git a/Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst b/Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst
new file mode 100644
index 000000000000..3d1c63acca3b
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-06-15-15-57-37.bpo-33832.xBFhKw.rst
@@ -0,0 +1 @@
+Add glossary entry for 'magic method'.