Git commit 09fdc25112044528a1714808bb4791528308b84a by Yuri Chornoivan.
Committed on 15/02/2018 at 06:47.
Pushed by yurchor into branch 'master'.
Fix minor typos
M +25 -27 doc/en/index.docbook
https://commits.kde.org/kdiff3/09fdc25112044528a1714808bb4791528308b84a
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index be55c80..57858a7 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -162,7 +162,7 @@ This screenshot shows during a directory merge:
More Features
Line-By-Line And Char-By-Char Diff-Viewer
-By using the possiblities of a graphical color display shows
+By using the possibilities of a graphical color display shows
exactly what the difference is. When you have to do many code-reviews, you
will like this.
@@ -436,9 +436,9 @@ They will appear in the usage help like in this
example:
For these situations you can manually instruct to align certain
lines.
Mark the text for which you want to improve the alignment with the mouse as
you would
for copy and paste in the first diff view and then choose "Add Manual Diff
Alignment"
- in the "Diffview"-menu (keyboard shortcut "Ctrl-Y") . An orange bar will
appear in
+ in the "Diffview"-menu (keyboard shortcut
Y). An orange bar will appear in
the summary column next to the chosen text. Repeat this for the second and
- (if available) third diff view. will immediately recalculate the
differences everytime you do this.
+ (if available) third diff view. will immediately recalculate the
differences everytime you do this,
and will align the chosen lines. Of course some of the previously matching
lines in between
might not match anymore.
@@ -585,7 +585,7 @@ history entry. If there are no other empty lines, this is a
sufficient criterion
Just set an empty "History entry start regular expression". If the empty line
criterion
isn't sufficient, you can specify a regular expression to detect the history
entry start.
-Note that will remove duplicate history entrys. If a history entry
appeared several times
+Note that will remove duplicate history entries. If a history entry
appeared several times
in the history of a input file, only one entry will remain in the output.
If you want to sort the history, then you have to specify how the sort key
should be built.
@@ -780,7 +780,7 @@ For more information also see Merge Settings
All:Print
everything.
Current:Print a page starting at
the first visible line in the window.
- (On systems without this option this can be achived by specifying page
number 1 for printing.)
+ (On systems without this option this can be achieved by specifying page
number 1 for printing.)
Selection:
Before choosing to print select text with the mouse (like for copy and
paste)
in one of the diff input windows to define the start and end line. If
no text
@@ -1307,7 +1307,7 @@ But it won't warn you if a
Line-Matching-Preprocessor-command is active. The mer
all conflicts are solved. If you disabled "Show White Space" then the
differences that
were removed with the Line-Matching-Preprocessor-command will also be
invisible. If the
Save-button remains disabled during a merge (because of remaining conflicts),
make sure to enable
-"Show White Space". If you don't wan't to merge these less important
differences manually
+"Show White Space". If you don't want to merge these less important
differences manually
you can select "Choose [A|B|C] For All Unsolved White space Conflicts" in the
Merge-menu.
@@ -1569,7 +1569,7 @@ So this is what this program can do for you: ...
"Show Identical Files": Files that have been detected
equal in all input directories.
"Show Different Files": Files that exist in two or more
directories but are not equal.
"Show Files only in A": Files that exist only in A, but
not in B or C.
- "Show Files only in B": Files that exist only in B, but
not in A or B.
+ "Show Files only in B": Files that exist only in B, but
not in A or C.
"Show Files only in C": Files that exist only in C, but
not in A or B.
@@ -1753,7 +1753,7 @@ So this is what this program can do for you: ...
Split/Full Screen Mode
Usually the directory merge list view remains visible while a single file
- is compared or merged. With the mouse you can move the the splitter bar that
+ is compared or merged. With the mouse you can move the splitter bar that
separates the file list from the text-diff windows. If you don't want this,
you can disable "Split Screen View" in the "Directory"-menu. Then you can
use "Toggle View" in the "Directory"-menu to switch between the file list
@@ -1782,7 +1782,7 @@ So this is what this program can do for you: ...
file selected thus will be marked with an "A", the second and third with
"B" and "C"
regardless on what column they are in. Only up to three files can be chosen
like this.
-
