[Python-checkins] cpython (merge 3.5 -> default): merge from 3.5

[senthil.kumaran]

https://hg.python.org/cpython/rev/60d4c3a29201
changeset:   99823:60d4c3a29201
parent:      99821:2c8062da7250
parent:      99822:9ba001cb107b
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sat Jan 09 22:34:40 2016 -0800
summary:
  merge from 3.5

Issue23675 - A tiny clarification in the MRO glossary term.

files:
  Doc/glossary.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -626,7 +626,8 @@
    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

-- 
Repository URL: https://hg.python.org/cpython