From: Jari Aalto Date: Tue, 8 Apr 2014 06:23:56 +0000 (+0300) Subject: man: Correct preceeding to preceding X-Git-Tag: v1.1~5 X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=920f58a366c391185a44fe1b441b807c66a4d3f6;p=wiggle.git man: Correct preceeding to preceding Signed-off-by: Jari Aalto Signed-off-by: NeilBrown --- diff --git a/TODO b/TODO index 09af8d6..6236a0b 100644 --- a/TODO +++ b/TODO @@ -40,7 +40,7 @@ ----------------------------------- p - md.c - wait_event_interruptible - The preceeding tabs aren't noticed as being the same... + The preceding tabs aren't noticed as being the same... ----------------------------------- @@ -236,7 +236,7 @@ DONE - blank after end and before begining ----------------------------------- p - md.c - wait_event_interruptible - The preceeding tabs aren't noticed as being the same... + The preceding tabs aren't noticed as being the same... ----------------------------------- diff --git a/merge2.c b/merge2.c index 47bd978..9682a90 100644 --- a/merge2.c +++ b/merge2.c @@ -77,7 +77,7 @@ static int check_alreadyapplied(struct file af, struct file cf, * the change the mode of display - between displaying the merger * and displaying the separate streams. * A 'conflict' can only be displayed as separate stream so when - * one is found, we need to find a preceeding and trailing cut-point + * one is found, we need to find a preceding and trailing cut-point * and enlarge the conflict to that range. * A suitable location is one where all three streams are at a line-end. */ @@ -103,7 +103,7 @@ int isolate_conflicts(struct file af, struct file bf, struct file cf, * * A Changed text may also border a conflict, but it can * only border one conflict (where as an Unchanged can border - * a preceeding and a following conflict). + * a preceding and a following conflict). * The 'new' section of a Changed text appears in the * conflict as does any part of the original before * a newline. @@ -120,7 +120,7 @@ int isolate_conflicts(struct file af, struct file bf, struct file cf, * When in_conflict == 1, the 'lo' and 'hi' fields indicate * how much of the 'a' file is included in the conflict, the rest * being part of the clean result. - * Elements in af from m->a to m->a+m->lo are in the preceeding + * Elements in af from m->a to m->a+m->lo are in the preceding * conflict, from m->a+m->lo to m->a+m->hi are clean, and * m->a+m->hi to m->a+m->al are in the following conflict. * diff --git a/wiggle.1 b/wiggle.1 index 6601e07..efceb7e 100644 --- a/wiggle.1 +++ b/wiggle.1 @@ -157,7 +157,7 @@ only as a separator between other words and is not matched itself. The effect of this is that changes in the amount of white space are not treated as significant. .P -To be precise, any white space is combined with the preceeding word +To be precise, any white space is combined with the preceding word or, in the case of leading space on a line, with the following word. However it is not involved in any comparisons of that word. If a patch deletes a word, the attached white space is deleted as well. If a