diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-10-30 23:41:28 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-10-30 23:41:28 (GMT) |
| commit | c02948126c851b53109e4c0b4b11f26a62cceba9 (patch) | |
| tree | 7ae07ec2713726d560bab512edc61817ea837b22 /Doc/library | |
| parent | 3f209b63f5c639a9413a32655bfd6f424675e399 (diff) | |
| parent | 3e8a7ad7fc6224f8cae7d1c43d676d2093442611 (diff) | |
| download | cpython-c02948126c851b53109e4c0b4b11f26a62cceba9.zip cpython-c02948126c851b53109e4c0b4b11f26a62cceba9.tar.gz cpython-c02948126c851b53109e4c0b4b11f26a62cceba9.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Doc/library')
| -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 38245e7..c3dd4d3 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: |