Fix various typos in help messages.

I've obviously not proof-read this...

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/ReadMe.c b/ReadMe.c
index 9c3465ad11168937f9dcffe738d3fbd794ebbc58..5e401077b581258ac911fcd431c7b5590b7b0c77 100644 (file)
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -60,7 +60,7 @@ char Usage[] =
 char Help[] =  "\n"
 "Wiggle - apply patches that 'patch' rejects.\n"
 "\n"
-"Wiggle provides three distinct but related functions:\n"
+"Wiggle provides four distinct but related functions:\n"
 "merge, diff, extract, and browse.\n"
 "To get more detailed help on a function, select the function\n"
 "before requesting help.  e.g.\n"
@@ -95,7 +95,7 @@ char Help[] =  "\n"
 char HelpExtract[] = "\n"
 "wiggle --extract -[123] [--patch]  merge-or-patch\n"
 "\n"
-"The extract function allows one banch of a patch or merge file\n"
+"The extract function allows one branch of a patch or merge file\n"
 "to be extracted.  A 'patch' is the output of 'diff -c' or 'diff -u'.\n"
 "Either the before (-1) or after (-2) branch can be extracted.\n"
 "\n"
@@ -121,7 +121,7 @@ char HelpDiff[] = "\n"
 "second is treated as a patch and the first or (with -2) second branch\n"
 "is extracted and compared against the first file.\n"
 "\n"
-"--reverse (-R) with cause diff two swap the two files before comparing\n"
+"--reverse (-R) with cause diff to swap the two files before comparing\n"
 "them.\n"
 "\n";
 
@@ -135,7 +135,7 @@ char HelpMerge[] = "\n"
 "output unresolvable conflicts in the resulting merge by showing\n"
 "whole-line differences.\n"
 "With the --lines option, the files are compared line-wise much\n"
-"like 'merge'.  With the --words option, files are compared\n"
+"like 'merge'.  With the (default) --words option, files are compared\n"
 "word-wise and unresolvable conflicts are reported word-wise.\n"
 "\n"
 "If --merge is given one file, it is treated as a merge (merge -A\n"

diff --git a/vpatch.c b/vpatch.c
index eb3fd02d31ca139457fa259d339287b635382972..fca88b071b1f03a2e93b223beaf75db5d5195f0f 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -81,7 +81,7 @@ unsigned int a_delete, a_added, a_common, a_sep, a_void,
  * We display help in an insert, leaving 5 columns left and right,
  * and 2 rows top and bottom, but at most 58x15 plus border
  * In help mode:
- *   SPC or RTN move down or to next page
+ *   SPC or RTN moves down or to next page
  *   BKSPC goes backwards
  *   'q' returns to origin screen
  *   '?' show help on help
@@ -94,7 +94,7 @@ char *help_help[] = {
        "   You are viewing the help page for the help viewer.",
        "You normally get here by typing '?'",
        "",
-       "The following keystokes work in help the help viewer:",
+       "The following keystrokes work in the help viewer:",
        "  ?     display this help message",
        "  q     return to previous view",
        "  SPC   move forward through help document",
@@ -146,8 +146,8 @@ static void help_window(char *page1[], char *page2[])
        mvaddch(top-1, left+cols,  '\\');
        mvaddch(top+rows, left-1, '\\');
        mvaddch(top+rows, left+cols, '/');
-       mvaddstr(top-1, left + cols/2 - 2, "HELP");
-       mvaddstr(top+rows, left+cols/2 - 16, "Press SPACE for more, ? for help");
+       mvaddstr(top-1, left + cols/2 - 9, "HELP - 'q' to exit");
+       mvaddstr(top+rows, left+cols/2 - 17, "Press SPACE for more, '?' for help");
        (void)attrset(A_NORMAL);
 
        while (1) {
@@ -894,7 +894,7 @@ static void draw_mline(int mode, int row, int start, int cols,
 }
 
 static char *merge_help[] = {
-       "This view shows a the merge of the patch with the",
+       "This view shows the merge of the patch with the",
        "original file.  It is like a full-context diff showing",
        "removed lines with a '-' prefix and added lines with a",
        "'+' prefix.",
@@ -922,7 +922,7 @@ static char *diff_help[] = {
        NULL
 };
 static char *orig_help[] = {
-       "This is the 'original' view which simple shows",
+       "This is the 'original' view which simply shows",
        "the original file before applying the patch.",
        "Sections of code that would be changed by the patch",
        "are highlighted in red.",
@@ -970,14 +970,14 @@ static char *merge_window_help[] = {
        "  Highlight Colours and Keystroke commands",
        "",
        "In all different views of a merge, highlight colours",
-       "are used to show which parts of line were added,",
+       "are used to show which parts of lines were added,",
        "removed, already changed, unchanged or in conflict.",
-       "Colours are their use are:",
+       "Colours and their use are:",
        " normal              unchanged text",
        " red background      text that was removed or changed",
-       " blue background     text that was added or result",
+       " blue background     text that was added or the result",
        "                     of a change",
-       " yellow background   used in side-by-side of a line",
+       " yellow background   used in side-by-side for a line",
        "                     which has no match on the other",
        "                     side",
        " blue foreground     text in the original which did not",
@@ -990,7 +990,7 @@ static char *merge_window_help[] = {
        "                     underlined indicating that it",
        "                     was involved in a conflict",
        ""
-       "While viewing a merge various keystroke command can",
+       "While viewing a merge various keystroke commands can",
        "be used to move around and change the view.  Basic",
        "movement commands from both 'vi' and 'emacs' are",
        "available:",
@@ -1005,7 +1005,7 @@ static char *merge_window_help[] = {
        " ?                   Display help message",
        " ESC-<  0-G          Go to start of file",
        " ESC->  G            Go to end of file",
-       " q                   Return to list of files",
+       " q                   Return to list of files or exit",
        " control-L           recenter current line",
        " control-V           page down",
        " ESC-v               page up",