traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2015-10-30 19:41:41 -04:00
parent 4df429618d c02948126c
commit 7003696d5d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/difflib.rst
View File

@ -98,9 +98,9 @@ diffs. For comparing directories and files, see also, the :mod:`filecmp` module.
*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: