summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-01-10 06:34:40 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-01-10 06:34:40 (GMT)
commit656a8415aab27752ddddfd7310de4b04e172fe95 (patch)
treeef447f3c8f70c2bc175505de4b9035f8600d2011
parentc0a732e901733c669df67cc58ad2c8010138ca6f (diff)
parent3858a1c18c029f3c35a3e0a55de058b6efc06629 (diff)
downloadcpython-656a8415aab27752ddddfd7310de4b04e172fe95.zip
cpython-656a8415aab27752ddddfd7310de4b04e172fe95.tar.gz
cpython-656a8415aab27752ddddfd7310de4b04e172fe95.tar.bz2
merge from 3.5
Issue23675 - A tiny clarification in the MRO glossary term.
-rw-r--r--Doc/glossary.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 648c679..ad71c37 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -626,7 +626,8 @@ Glossary
method resolution order
Method Resolution Order is the order in which base classes are searched
for a member during lookup. See `The Python 2.3 Method Resolution Order
- <https://www.python.org/download/releases/2.3/mro/>`_.
+ <https://www.python.org/download/releases/2.3/mro/>`_ for details of the
+ algorithm used by the Python interpreter since the 2.3 release.
module
An object that serves as an organizational unit of Python code. Modules