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

[terry.reedy]

https://hg.python.org/cpython/rev/7756e9125cdd
changeset:   98908:7756e9125cdd
parent:      98904:e36da7323f8f
parent:      98907:d09923a9fdd0
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Oct 30 19:41:41 2015 -0400
summary:
  Merge with 3.5

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


diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst
--- a/Doc/library/difflib.rst
+++ b/Doc/library/difflib.rst
@@ -98,9 +98,9 @@
       *wrapcolumn* is an optional keyword to specify column number where lines are
       broken and wrapped, defaults to ``None`` where lines are not wrapped.
 
-      *linejunk* and *charjunk* are optional keyword arguments passed into ``ndiff()``
+      *linejunk* and *charjunk* are optional keyword arguments passed into :func:`ndiff`
       (used by :class:`HtmlDiff` to generate the side by side HTML differences).  See
-      ``ndiff()`` documentation for argument default values and descriptions.
+      :func:`ndiff` documentation for argument default values and descriptions.
 
    The following methods are public:
 

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