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

[raymond.hettinger]

https://hg.python.org/cpython/rev/fac5562ae9c6
changeset:   99328:fac5562ae9c6
parent:      99326:e5e507a357a6
parent:      99327:f611e2244c69
user:        Raymond Hettinger <python at rcn.com>
date:        Mon Nov 23 22:19:12 2015 -0800
summary:
  merge

files:
  Doc/library/collections.rst |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -934,6 +934,9 @@
    >>> Book.title.__doc__ = 'Title of first printing'
    >>> Book.authors.__doc__ = 'List of authors sorted by last name'
 
+.. versionchanged:: 3.5
+   Property docstrings became writeable.
+
 Default values can be implemented by using :meth:`_replace` to
 customize a prototype instance:
 

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