# HG changeset patch
# Parent a444464a2e8710e77da1cca7e8e59ace44eab3c3

diff -r a444464a2e87 Doc/library/inspect.rst
--- a/Doc/library/inspect.rst	Thu May 14 18:47:17 2015 -0400
+++ b/Doc/library/inspect.rst	Fri May 15 06:27:54 2015 +0000
@@ -360,6 +360,9 @@
    a class, a method, a property or a descriptor, retrieve the documentation
    string from the inheritance hierarchy.
 
+   .. versionchanged:: 3.5
+      Documentation strings are now inherited if not overridden.
+
 
 .. function:: getcomments(object)
 
diff -r a444464a2e87 Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst	Thu May 14 18:47:17 2015 -0400
+++ b/Doc/whatsnew/3.5.rst	Fri May 15 06:27:54 2015 +0000
@@ -877,8 +877,8 @@
   in Python 3.5, all old `.pyo` files from previous versions of Python are
   invalid regardless of this PEP.
 
- * The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux
-   3.6 and greater.
+* The :mod:`socket` module now exports the CAN_RAW_FD_FRAMES constant on linux
+  3.6 and greater.
 
 * The `pygettext.py` Tool now uses the standard +NNNN format for timezones in
   the POT-Creation-Date header.
@@ -888,6 +888,13 @@
   program depends on patching the module level variable to capture the debug
   output, you will need to update it to capture sys.stderr instead.
 
+* The :func:`inspect.getdoc` function now returns documentation strings
+  inherited from base classes.  Documentation strings no longer need to be
+  duplicated if the inherited documentation is appropriate.  To suppress an
+  inherited string, an empty string must be specified (or the documentation
+  may be filled in).  This change affects the output of the :mod:`pydoc`
+  module and the :func:`help` function.
+
 
 Changes in the C API
 --------------------