From 3732ed24145c1ac77e99bcf85bccda3af095e696 Mon Sep 17 00:00:00 2001
From: Larry Hastings <larry@hastings.org>
Date: Sat, 15 Mar 2014 21:13:56 -0700
Subject: Merge in all documentation changes since branching 3.4.0rc1.

---
 Doc/library/pydoc.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Doc/library/pydoc.rst')

diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst
index e100865515..3f520e892d 100644
--- a/Doc/library/pydoc.rst
+++ b/Doc/library/pydoc.rst
@@ -84,3 +84,8 @@ Reference Manual pages.
 
 .. versionchanged:: 3.2
    Added the ``-b`` option, deprecated the ``-g`` option.
+
+.. versionchanged:: 3.4
+   :mod:`pydoc` now uses :func:`inspect.signature` rather than
+   :func:`inspect.getfullargspec` to extract signature information from
+   callables.
-- 
cgit v1.2.1