1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Description: Correct typos
Author: Y Giridhar Appaji Nag <giridhar@appaji.net>
--- a/doc/xxdiff-doc.html
+++ b/doc/xxdiff-doc.html
@@ -1960,7 +1960,7 @@
MergedFilename: "%L.merge"
</PRE>
<BLOCKQUOTE>
-Default merged filename. %L, %M, %R can be used as placeholders for left, middle and right filenames repectively. Note that ClearCase suffixes are stripped automatically.
+Default merged filename. %L, %M, %R can be used as placeholders for left, middle and right filenames respectively. Note that ClearCase suffixes are stripped automatically.
</BLOCKQUOTE>
</div></div>
--- a/src/doc.html
+++ b/src/doc.html
@@ -823,7 +823,7 @@
</div>
<div class="section" id="reporting-bugs">
<h1><a class="toc-backref" href="#id54">16 Reporting bugs</a></h1>
-<p>All bug reports and feature requests should be submitted throught the
+<p>All bug reports and feature requests should be submitted through the
SourceForge bug tracking system at the following URL
<a class="reference external" href="http://sourceforge.net/bugs/?group_id=2198">http://sourceforge.net/bugs/?group_id=2198</a>. Please avoid sending the author
email about xxdiff bugs. Please use this bug tracking system, it is extremely
--- a/src/doc.txt
+++ b/src/doc.txt
@@ -979,7 +979,7 @@
==============
-All bug reports and feature requests should be submitted throught the
+All bug reports and feature requests should be submitted through the
SourceForge bug tracking system at the following URL
http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author
email about xxdiff bugs. Please use this bug tracking system, it is extremely
--- a/src/resParser.cpp
+++ b/src/resParser.cpp
@@ -213,7 +213,7 @@
{ "MergedFilename", MERGED_FILENAME,
"Default merged filename. %L, %M, %R can be used as placeholders for \
-left, middle and right filenames repectively. Note that ClearCase suffixes \
+left, middle and right filenames respectively. Note that ClearCase suffixes \
are stripped automatically." },
};
|
