Fix typos.

diff --git a/man/ChangeLog b/man/ChangeLog
index cb462c465fb4a7f89a92fb127c8fa479758a9be7..e406caef57d156ed5ed06aa49093066630f97ec6 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-31  Michael Ernst  <mernst@alum.mit.edu>
+
+       * ediff.texi: Fix typos.
+
 2006-05-31  Richard Stallman  <rms@gnu.org>
 
        * basic.texi (Moving Point): Fix previous change.

diff --git a/man/ediff.texi b/man/ediff.texi
index 3179447fd9a4e5db23bc06cd474c49bfb43d535c..c92ea91a36190203773e5eccf41337692f660e9c 100644 (file)
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -135,7 +135,7 @@ The architecture and the interface are, of course, drastically different.
 @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 @@ identical to its default setting, as originally decided by Ediff.  For
 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 @@ problem.
 @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
 @code{ediff-ignore-case}.