summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew/2.1.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-18 08:20:22 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-18 08:20:22 (GMT)
commit2fec611a70ba862a4127b7656a6d98d48850c3af (patch)
treee8d3470232edc34a9e7adbe609f261150cc08b0c /Doc/whatsnew/2.1.rst
parentd91e676fd58a25420a3dc8705472dc6bf9ca46e2 (diff)
parentbae5d81f5d1f388aad48c2ce1aee8682b157e1bd (diff)
downloadcpython-2fec611a70ba862a4127b7656a6d98d48850c3af.zip
cpython-2fec611a70ba862a4127b7656a6d98d48850c3af.tar.gz
cpython-2fec611a70ba862a4127b7656a6d98d48850c3af.tar.bz2
Issue #24314: Merge doc links from 3.5
Diffstat (limited to 'Doc/whatsnew/2.1.rst')
-rw-r--r--Doc/whatsnew/2.1.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst
index 6e192dc..6aae726 100644
--- a/Doc/whatsnew/2.1.rst
+++ b/Doc/whatsnew/2.1.rst
@@ -442,8 +442,8 @@ Python syntax::
f.grammar = "A ::= B (C D)*"
The dictionary containing attributes can be accessed as the function's
-:attr:`__dict__`. Unlike the :attr:`__dict__` attribute of class instances, in
-functions you can actually assign a new dictionary to :attr:`__dict__`, though
+:attr:`~object.__dict__`. Unlike the :attr:`~object.__dict__` attribute of class instances, in
+functions you can actually assign a new dictionary to :attr:`~object.__dict__`, though
the new value is restricted to a regular Python dictionary; you *can't* be
tricky and set it to a :class:`UserDict` instance, or any other random object
that behaves like a mapping.