diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-10-30 19:41:41 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-10-30 19:41:41 -0400 |
| commit | 7003696d5db4963bb1cf86ab4e32118ebb266d17 (patch) | |
| tree | cd1650a53eed668be7013e289fc0a9e297f254ef | |
| parent | 4df429618de4b94519b453637e1eee9538d85d18 (diff) | |
| parent | c02948126c851b53109e4c0b4b11f26a62cceba9 (diff) | |
| download | cpython-git-7003696d5db4963bb1cf86ab4e32118ebb266d17.tar.gz | |
Merge with 3.5
| -rw-r--r-- | Doc/library/difflib.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/difflib.rst b/Doc/library/difflib.rst index 38245e776a..c3dd4d3a19 100644 --- a/Doc/library/difflib.rst +++ b/Doc/library/difflib.rst @@ -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: |