[Python-checkins] cpython (merge 3.5 -> default): Issue #26547: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/45544b868f7b
changeset:   102150:45544b868f7b
parent:      102148:21cb299a9626
parent:      102149:79e4593ce746
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Fri Jun 24 09:12:20 2016 +0300
summary:
  Issue #26547: Merge from 3.5

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1472,7 +1472,7 @@
    Objects such as modules and instances have an updateable :attr:`~object.__dict__`
    attribute; however, other objects may have write restrictions on their
    :attr:`~object.__dict__` attributes (for example, classes use a
-   dictproxy to prevent direct dictionary updates).
+   :class:`types.MappingProxyType` to prevent direct dictionary updates).
 
    Without an argument, :func:`vars` acts like :func:`locals`.  Note, the
    locals dictionary is only useful for reads since updates to the locals

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