1 --- diffutils-3.6/doc/diffutils.texi.orig 2017-05-06 23:36:17.000000000 +0200
2 +++ diffutils-3.6/doc/diffutils.texi 2017-06-08 18:40:24.143120198 +0200
5 @c Debian install-info (up through at least version 1.9.20) uses only the
6 @c first dircategory. Put this one first, as it is more useful in practice.
7 -@dircategory Individual utilities
8 +@dircategory File utilities:
10 -* cmp: (diffutils)Invoking cmp. Compare 2 files byte by byte.
11 -* diff: (diffutils)Invoking diff. Compare 2 files line by line.
12 -* diff3: (diffutils)Invoking diff3. Compare 3 files line by line.
13 -* patch: (diffutils)Invoking patch. Apply a patch to a file.
14 -* sdiff: (diffutils)Invoking sdiff. Merge 2 files side-by-side.
17 -@dircategory Text creation and manipulation
19 -* Diffutils: (diffutils). Comparing and merging files.
20 +* cmp: (diffutils)cmp. Compare 2 files byte by byte
21 +* diff: (diffutils)diff. Compare 2 files line by line
22 +* diff3: (diffutils)diff3. Compare 3 files line by line
23 +* patch: (diffutils)patch. Apply a patch to a file
24 +* sdiff: (diffutils)sdiff. Merge 2 files side-by-side
25 +* Diffutils: (diffutils). Comparing and merging files
30 * Merging with patch:: Using @command{patch} to change old files into new ones.
31 * Making Patches:: Tips for making and using patch distributions.
33 -* Invoking cmp:: Compare two files byte by byte.
34 -* Invoking diff:: Compare two files line by line.
35 -* Invoking diff3:: Compare three files line by line.
36 -* Invoking patch:: Apply a diff file to an original.
37 -* Invoking sdiff:: Side-by-side merge of file differences.
38 +* cmp:: Compare two files byte by byte.
39 +* diff:: Compare two files line by line.
40 +* diff3:: Compare three files line by line.
41 +* patch:: Apply a diff file to an original.
42 +* sdiff:: Side-by-side merge of file differences.
44 * Standards conformance:: Conformance to the POSIX standard.
45 * Projects:: If you've found a bug or other shortcoming.
47 the @option{-s}, @option{--quiet}, or @option{--silent} option to
48 suppress that information, so that @command{cmp}
49 produces no output and reports whether the files differ using only its
50 -exit status (@pxref{Invoking cmp}).
51 +exit status (@pxref{cmp}).
54 Unlike @command{diff}, @command{cmp} cannot compare directories; it can only
56 option to show the values of each differing byte in the two files.
57 With GNU @command{cmp}, you can also use the @option{-b} or
58 @option{--print-bytes} option to show the ASCII representation of
59 -those bytes. @xref{Invoking cmp}, for more information.
60 +those bytes. @xref{cmp}, for more information.
62 If @command{diff3} thinks that any of the files it is comparing is binary
63 (a non-text file), it normally reports an error, because such
65 on whether they are two-way or three-way, and lines are annotated by
66 their location in the input files.
68 -@xref{Invoking diff3}, for more information on how to run @command{diff3}.
69 +@xref{diff3}, for more information on how to run @command{diff3}.
72 * Sample diff3 Input:: Sample @command{diff3} input for examples.
74 With @command{sdiff}, you can merge two files interactively based on a
75 side-by-side @option{-y} format comparison (@pxref{Side by Side}). Use
76 @option{--output=@var{file}} (@option{-o @var{file}}) to specify where to
77 -put the merged text. @xref{Invoking sdiff}, for more details on the
78 +put the merged text. @xref{sdiff}, for more details on the
79 options to @command{sdiff}.
81 Another way to merge files interactively is to use the Emacs Lisp
83 normally replaces each file @var{f} with its new version, putting reject
84 hunks (if any) into @samp{@var{f}.rej}.
86 -@xref{Invoking patch}, for detailed information on the options to
87 +@xref{patch}, for detailed information on the options to
92 lines for proper operation when patches do not exactly match the input
97 @chapter Invoking @command{cmp}
98 @cindex invoking @command{cmp}
99 @cindex @command{cmp} invocation
100 @@ -3665,7 +3661,7 @@
101 (@samp{Yi} is a GNU extension to IEC 60027-2.)
106 @chapter Invoking @command{diff}
107 @cindex invoking @command{diff}
108 @cindex @command{diff} invocation
109 @@ -4043,7 +4039,7 @@
110 Ignore white space at line end. @xref{White Space}.
113 -@node Invoking diff3
115 @chapter Invoking @command{diff3}
116 @cindex invoking @command{diff3}
117 @cindex @command{diff3} invocation
118 @@ -4166,7 +4162,7 @@
119 @xref{Which Changes}.
122 -@node Invoking patch
124 @chapter Invoking @command{patch}
125 @cindex invoking @command{patch}
126 @cindex @command{patch} invocation
127 @@ -4386,7 +4382,7 @@
131 -@node Invoking sdiff
133 @chapter Invoking @command{sdiff}
134 @cindex invoking @command{sdiff}
135 @cindex @command{sdiff} invocation