@matheusbsbs / matheus-bagliano / commits / 0ac7903ee3
Fork 0

Use "whitespace" consistently

For consistency, change "white space" and "whitespaces" to "whitespace", fixing a couple of adjacent grammar problems in the docs. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Wincent Colaiuta committed Dec 12, 2007 at 09:12 UTC 0ac7903ee3c7c93d2426a4aa4f3732bee73e0365
3 files changed +9 -10
Documentation/diff-options.txt
+6 -6
@@ -175,19 +175,19 @@ endif::git-format-patch[]
175 Shorthand for "--text".
176
177 --ignore-space-at-eol::
178 - Ignore changes in white spaces at EOL.
178 + Ignore changes in whitespace at EOL.
179
180 --ignore-space-change::
181 - Ignore changes in amount of white space. This ignores white
182 - space at line end, and consider all other sequences of one or
183 - more white space characters to be equivalent.
181 + Ignore changes in amount of whitespace. This ignores whitespace
182 + at line end, and considers all other sequences of one or
183 + more whitespace characters to be equivalent.
184
185 -b::
186 Shorthand for "--ignore-space-change".
187
188 --ignore-all-space::
189 - Ignore white space when comparing lines. This ignores
190 - difference even if one line has white space where the other
189 + Ignore whitespace when comparing lines. This ignores
190 + differences even if one line has whitespace where the other
191 line has none.
192
193 -w::
Documentation/glossary.txt
+1 -2
@@ -244,8 +244,7 @@ This commit is referred to as a "merge commit", or sometimes just a
244 The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
245 of the object's contents using the Secure Hash Algorithm
246 1 and usually represented by the 40 character hexadecimal encoding of
247 - the <<def_hash,hash>> of the object (possibly followed by
248 - a white space).
247 + the <<def_hash,hash>> of the object.
248
249 [[def_object_type]]object type::
250 One of the identifiers
diff.c
+2 -2
@@ -1015,7 +1015,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
1015 if (line[i - 1] == '\t' && spaces)
1016 space_before_tab = 1;
1017
1018 - /* check white space at line end */
1018 + /* check whitespace at line end */
1019 if (line[len - 1] == '\n')
1020 len--;
1021 if (isspace(line[len - 1]))
@@ -1029,7 +1029,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
1029 putchar(',');
1030 }
1031 if (white_space_at_end)
1032 - printf("white space at end");
1032 + printf("whitespace at end");
1033 printf(":%s ", reset);
1034 emit_line_with_ws(1, set, reset, ws, line, len,
1035 data->ws_rule);