[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Ediff manual typos

From: Michael Ernst
Subject: Ediff manual typos
Date: Wed, 31 May 2006 09:15:13 -0400

This patch to the Ediff manual removes 2.5 spurious sentences (apparently
an accidental cut-and-paste error) and fixes two other small typos.

                    -Michael Ernst

ChangeLog entry:

2006-05-31  Michael Ernst  <address@hidden>

        * ediff.texi: Fix typos.

Index: man/ediff.texi
RCS file: /sources/emacs/emacs/man/ediff.texi,v
retrieving revision 1.43
diff -u -r1.43 ediff.texi
--- man/ediff.texi      25 Mar 2006 23:13:20 -0000      1.43
+++ man/ediff.texi      31 May 2006 13:12:36 -0000
@@ -135,7 +135,7 @@
 @chapter Major Entry Points
 When Ediff starts up, it displays a small control window, which accepts the
-Ediff commands and two or three windows displaying the files to be compared
+Ediff commands, and two or three windows displaying the files to be compared
 or merged. The control window can be in its own small frame or it can be
 part of a bigger frame that displays other buffers. In any case, it is
 important that the control window be active (i.e., be the one receiving the
@@ -829,7 +829,7 @@
 instance, if Ediff is merging according to the `combined' policy, then the
 merge region is skipped over if it is different from the combination of the
 regions in buffers A and B.  (Warning: swapping buffers A and B will confuse
-things in this respect).  If the merge region is marked as `prefer-A' then
+things in this respect.)  If the merge region is marked as `prefer-A' then
 this region will be skipped if it differs from the current difference
 region in buffer A, etc.
@@ -1599,8 +1599,6 @@
 @vindex ediff-ignore-case
 Finally, Ediff can be told to ignore the case of the letters. This behavior
 can be toggled with @kbd{#c} and it is controlled with three variables:
-Toggle case sensitivity in the diff program. All diffs are recomputed.
-Case sensitivity is controlled by the variables
 @code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, and

reply via email to

[Prev in Thread] Current Thread [Next in Thread]