From 0cc554138bb45612d5618f2928ba3a7f8b45b26b Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 20 May 2011 11:53:34 +0200 Subject: [PATCH] maint: replace misused "a" with "an" * doc/intprops.texi: "a integer" * doc/regex.texi: "a explanation" * lib/alignof.h: "a object" * lib/argmatch.h: "a explanation" * lib/argp-help.c: "a option" and "a OPTION_DOC" * lib/stdint.in.h: "a integer" * lib/userspec.c: "a owner" * doc/gnulib.texi: Fix "a idea", and reword. (cherry picked from commit 93d7550462f21202b69712f3d489399963965ddd) --- ChangeLog | 12 ++++++++++++ doc/gnulib.texi | 2 +- doc/intprops.texi | 2 +- doc/regex.texi | 2 +- lib/alignof.h | 2 +- lib/argmatch.h | 4 ++-- lib/argp-help.c | 6 +++--- lib/stdint.in.h | 2 +- lib/userspec.c | 2 +- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f10341168..62b95058c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-05-20 Jim Meyering + + maint: replace misused "a" with "an" + * doc/intprops.texi: "a integer" + * doc/regex.texi: "a explanation" + * lib/alignof.h: "a object" + * lib/argmatch.h: "a explanation" + * lib/argp-help.c: "a option" and "a OPTION_DOC" + * lib/stdint.in.h: "a integer" + * lib/userspec.c: "a owner" + * doc/gnulib.texi: Fix "a idea", and reword. + 2011-05-19 Jim Meyering maint: correct misuse of "a" and "an" diff --git a/doc/gnulib.texi b/doc/gnulib.texi index fef0d7670..1e1ad40fa 100644 --- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -550,7 +550,7 @@ used here. It contains a convenient @code{ASSERT} macro. The body of the test, then, contains many @code{ASSERT} invocations. When a test fails, the @code{ASSERT} macro prints the line number of the failing -statement, thus giving you as a developer a idea which part of the test +statement, thus giving you, the developer, an idea of which part of the test failed, even when you don't have access to the machine where the test failed and the reporting user cannot run a debugger. diff --git a/doc/intprops.texi b/doc/intprops.texi index 641920179..b6cd14a3a 100644 --- a/doc/intprops.texi +++ b/doc/intprops.texi @@ -58,7 +58,7 @@ while the second, for integer types, is easier to use. @findex TYPE_IS_INTEGER @code{TYPE_IS_INTEGER (@var{t})} expands to a constant -expression that is 1 if the arithmetic type @var{t} is a integer type. +expression that is 1 if the arithmetic type @var{t} is an integer type. @code{_Bool} counts as an integer type. @findex TYPE_SIGNED diff --git a/doc/regex.texi b/doc/regex.texi index bfc34715c..52ecf9b70 100644 --- a/doc/regex.texi +++ b/doc/regex.texi @@ -1624,7 +1624,7 @@ compiled pattern. @var{string} is the string you want to match; it can contain newline and null characters. @var{size} is the length of that string. @var{start} is the string index at which you want to begin matching; the first character of @var{string} is at index zero. -@xref{Using Registers}, for a explanation of @var{regs}; you can safely +@xref{Using Registers}, for an explanation of @var{regs}; you can safely pass zero. @code{re_match} matches the regular expression in @var{pattern_buffer} diff --git a/lib/alignof.h b/lib/alignof.h index 24f4bc9b4..9b8e00dbc 100644 --- a/lib/alignof.h +++ b/lib/alignof.h @@ -31,7 +31,7 @@ # define alignof_slot(type) offsetof (struct { char __slot1; type __slot2; }, __slot2) #endif -/* Determine the good alignment of a object of the given type at compile time. +/* Determine the good alignment of an object of the given type at compile time. Note that this is not necessarily the same as alignof_slot(type). For example, with GNU C on x86 platforms: alignof_type(double) = 8, but - when -malign-double is not specified: alignof_slot(double) = 4, diff --git a/lib/argmatch.h b/lib/argmatch.h index 9ebe2d16d..f87729dd6 100644 --- a/lib/argmatch.h +++ b/lib/argmatch.h @@ -73,8 +73,8 @@ void argmatch_valid (char const *const *arglist, -/* Same as argmatch, but upon failure, reports a explanation on the - failure, and exits using the function EXIT_FN. */ +/* Same as argmatch, but upon failure, report an explanation of the + failure, and exit using the function EXIT_FN. */ ptrdiff_t __xargmatch_internal (char const *context, char const *arg, char const *const *arglist, diff --git a/lib/argp-help.c b/lib/argp-help.c index ad8647d54..799379471 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -359,7 +359,7 @@ struct hol_entry /* A pointers into the HOL's short_options field, to the first short option letter for this entry. The order of the characters following this point corresponds to the order of options pointed to by OPT, and there are at - most NUM. A short option recorded in a option following OPT is only + most NUM. A short option recorded in an option following OPT is only valid if it occurs in the right place in SHORT_OPTIONS (otherwise it's probably been shadowed by some other entry). */ char *short_options; @@ -713,7 +713,7 @@ hol_cluster_is_child (const struct hol_cluster *cl1, return cl1 == cl2; } -/* Given the name of a OPTION_DOC option, modifies NAME to start at the tail +/* Given the name of an OPTION_DOC option, modifies NAME to start at the tail that should be used for comparisons, and returns true iff it should be treated as a non-option. */ static int @@ -1551,7 +1551,7 @@ argp_doc (const struct argp *argp, const struct argp_state *state, free ((char *) inp_text); /* We copied INP_TEXT, so free it now. */ if (post && argp->help_filter) - /* Now see if we have to output a ARGP_KEY_HELP_EXTRA text. */ + /* Now see if we have to output an ARGP_KEY_HELP_EXTRA text. */ { text = (*argp->help_filter) (ARGP_KEY_HELP_EXTRA, 0, input); if (text) diff --git a/lib/stdint.in.h b/lib/stdint.in.h index c518f3bd4..5aedeee6f 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -93,7 +93,7 @@ #undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H -/* Minimum and maximum values for a integer type under the usual assumption. +/* Minimum and maximum values for an integer type under the usual assumption. Return an unspecified value if BITS == 0, adding a check to pacify picky compilers. */ diff --git a/lib/userspec.c b/lib/userspec.c index bf3b792a7..a96b63a00 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -254,7 +254,7 @@ parse_user_spec (char const *spec, uid_t *uid, gid_t *gid, if (!colon && error_msg) { /* If there's no colon but there is a dot, and if looking up the - whole spec failed (i.e., the spec is not a owner name that + whole spec failed (i.e., the spec is not an owner name that includes a dot), then try again, but interpret the dot as a separator. This is a compatible extension to POSIX, since the POSIX-required behavior is always tried first. */ -- 2.11.0