aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/ChangeLog4
-rw-r--r--man/files.texi8
2 files changed, 8 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 59507f016f..8e6077263b 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-05 Richard Stallman <[email protected]>
+
+ * files.texi (Diff Mode): Minor cleanup.
+
2006-05-05 Karl Berry <[email protected]>
* texinfo.tex (\definetextfonsizexi, \definetextfonsizex): new cmds.
diff --git a/man/files.texi b/man/files.texi
index 607746dfca..60c1378321 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -2217,10 +2217,10 @@ provides a powerful interface for merging files.
@findex diff-mode
@cindex patches, editing
- The @samp{*diff*} buffer uses Diff mode (@pxref{Diff Mode}). Diff
-mode is also useful for editing patches and comparisons produced by
-the @command{diff} program. To select Diff mode manually, type
-@kbd{M-x diff-mode}.
+ Diff mode is used for the output of @kbd{M-x diff}; it is also
+useful for editing patches and comparisons produced by the
+@command{diff} program. To select Diff mode manually, type @kbd{M-x
+diff-mode}.
One general feature of Diff mode is that manual edits to the patch
automatically correct line numbers, including those in the hunk