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

[Miss Islington (bot)]

https://github.com/python/cpython/commit/6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24
commit: 6cbb4c0795099b79f0a7c7d20df4ba1c1ec0ac24
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-03-26T18:26:14-07:00
summary:

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

(cherry picked from commit f760610bddd7e8f8ac0914d5d59ef806bc16a73b)

Co-authored-by: Andre Delfino <adelfino at gmail.com>

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 9e6bf233bbcf..43abf5047543 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -490,6 +490,11 @@ Glossary
       :meth:`load_module`. A loader is typically returned by a
       :term:`finder`. See :pep:`302` for details.
 
+   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.Mapping` or
@@ -698,6 +703,8 @@ Glossary
       versions, :meth:`__getslice__` and :meth:`__setslice__`).
 
    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'.