procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typos.

Browse source
This commit is contained in:
Eli Zaretskii 2006-05-31 20:23:15 +00:00
parent 6916401640
commit 12e2242536
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
man/ChangeLog
View file

@ -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.

6
man/ediff.texi
View file

@ -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}.