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>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d0154bbc0a2f868b3f5f1c63dcffd1fc9355ebc3..5d22b7b58c5950fe70d09e0bb7384179ae30220f 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -175,19 +175,19 @@ endif::git-format-patch[]
        Shorthand for "--text".
 
 --ignore-space-at-eol::
        Shorthand for "--text".
 
 --ignore-space-at-eol::

-       Ignore changes in white spaces at EOL.
+       Ignore changes in whitespace at EOL.

 
 --ignore-space-change::
 
 --ignore-space-change::

-       Ignore changes in amount of white space.  This ignores white
-       space at line end, and consider all other sequences of one or
-       more white space characters to be equivalent.
+       Ignore changes in amount of whitespace.  This ignores whitespace
+       at line end, and considers all other sequences of one or
+       more whitespace characters to be equivalent.

 
 -b::
        Shorthand for "--ignore-space-change".
 
 --ignore-all-space::
 
 -b::
        Shorthand for "--ignore-space-change".
 
 --ignore-all-space::

-       Ignore white space when comparing lines.  This ignores
-       difference even if one line has white space where the other
+       Ignore whitespace when comparing lines.  This ignores
+       differences even if one line has whitespace where the other

        line has none.
 
 -w::
        line has none.
 
 -w::

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index fc1874424e26a2f95574d72bf3fc1c71a3b1a1b6..65f55e4ced20b7a957b83be3d47764dcfe3238c5 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -244,8 +244,7 @@ This commit is referred to as a "merge commit", or sometimes just a
        The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
        of the object's contents using the Secure Hash Algorithm
        1 and usually represented by the 40 character hexadecimal encoding of
        The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
        of the object's contents using the Secure Hash Algorithm
        1 and usually represented by the 40 character hexadecimal encoding of

-       the <<def_hash,hash>> of the object (possibly followed by
-       a white space).
+       the <<def_hash,hash>> of the object.

 
 [[def_object_type]]object type::
        One of the identifiers
 
 [[def_object_type]]object type::
        One of the identifiers

diff --git a/diff.c b/diff.c
index f780e3e8e67f4b1e07ef1d70ab3b9f101ff6b868..e74a30399eed872b3fb09015f84787103463b454 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1015,7 +1015,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
                if (line[i - 1] == '\t' && spaces)
                        space_before_tab = 1;
 
                if (line[i - 1] == '\t' && spaces)
                        space_before_tab = 1;
 

-               /* check white space at line end */
+               /* check whitespace at line end */

                if (line[len - 1] == '\n')
                        len--;
                if (isspace(line[len - 1]))
                if (line[len - 1] == '\n')
                        len--;
                if (isspace(line[len - 1]))


@@ -1029,7 +1029,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
                                        putchar(',');
                        }
                        if (white_space_at_end)
                                        putchar(',');
                        }
                        if (white_space_at_end)

-                               printf("white space at end");
+                               printf("whitespace at end");

                        printf(":%s ", reset);
                        emit_line_with_ws(1, set, reset, ws, line, len,
                                          data->ws_rule);
                        printf(":%s ", reset);
                        emit_line_with_ws(1, set, reset, ws, line, len,
                                          data->ws_rule);