From 056b00fc460b2c7d1a2407c818adc76512bcc350 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 19 May 2011 22:18:05 +0200 Subject: [PATCH] maint: correct misuse of "a" and "an" * doc/regex.texi (Collating Symbol Operators): s/an close.../a close/ * lib/argp-help.c: "an docum...": s/an/a/ * lib/argp-parse.c: "An vector": s/An/A/ * lib/execute.c: "an native": s/an/a/ * lib/spawn-pipe.c: Likewise. * lib/gc.h: "an Gc_rc": s/an/a/ * lib/unigbrk.in.h: "an grapheme": s/an/a/ * lib/fts.c: "an stat.st_dev": s/an/a/ (cherry picked from commit c9ff025783e5374226ffbf7940f40ce7db6852ed) --- ChangeLog | 12 ++++++++++++ doc/regex.texi | 2 +- lib/argp-help.c | 2 +- lib/argp-parse.c | 2 +- lib/execute.c | 2 +- lib/fts.c | 2 +- lib/gc.h | 2 +- lib/spawn-pipe.c | 2 +- lib/unigbrk.in.h | 2 +- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86a480cc5..f10341168 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-05-19 Jim Meyering + + maint: correct misuse of "a" and "an" + * doc/regex.texi (Collating Symbol Operators): s/an close.../a close/ + * lib/argp-help.c: "an docum...": s/an/a/ + * lib/argp-parse.c: "An vector": s/An/A/ + * lib/execute.c: "an native": s/an/a/ + * lib/spawn-pipe.c: Likewise. + * lib/gc.h: "an Gc_rc": s/an/a/ + * lib/unigbrk.in.h: "an grapheme": s/an/a/ + * lib/fts.c: "an stat.st_dev": s/an/a/ + 2011-05-19 Paul Eggert intprops: work around IRIX 6.5 cc bug with 0u - 0u + -1 diff --git a/doc/regex.texi b/doc/regex.texi index 093f4cc38..bfc34715c 100644 --- a/doc/regex.texi +++ b/doc/regex.texi @@ -885,7 +885,7 @@ All other characters are ordinary. For example, @samp{[.*]} matches Collating symbols can be represented inside lists. You form a @dfn{collating symbol} by putting a collating element between an @dfn{open-collating-symbol -operator} and an @dfn{close-collating-symbol operator}. @samp{[.} +operator} and a @dfn{close-collating-symbol operator}. @samp{[.} represents the open-collating-symbol operator and @samp{.]} represents the close-collating-symbol operator. For example, if @samp{ll} is a collating element, then @samp{[[.ll.]]} would match @samp{ll}. diff --git a/lib/argp-help.c b/lib/argp-help.c index 48c37a99f..ad8647d54 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -259,7 +259,7 @@ fill_in_uparams (const struct argp_state *state) /* Returns true if OPT is an alias for an earlier option. */ #define oalias(opt) ((opt)->flags & OPTION_ALIAS) -/* Returns true if OPT is an documentation-only entry. */ +/* Returns true if OPT is a documentation-only entry. */ #define odoc(opt) ((opt)->flags & OPTION_DOC) /* Returns true if OPT should not be translated */ diff --git a/lib/argp-parse.c b/lib/argp-parse.c index c884b8976..5cab8cec3 100644 --- a/lib/argp-parse.c +++ b/lib/argp-parse.c @@ -254,7 +254,7 @@ struct parser struct group *groups; /* The end of the GROUPS array. */ struct group *egroup; - /* An vector containing storage for the CHILD_INPUTS field in all groups. */ + /* A vector containing storage for the CHILD_INPUTS field in all groups. */ void **child_inputs; /* True if we think using getopt is still useful; if false, then diff --git a/lib/execute.c b/lib/execute.c index fe57e2207..6de6c62f8 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -158,7 +158,7 @@ execute (const char *progname, (const char **) environ); if (exitcode < 0 && errno == ENOEXEC) { - /* prog is not an native executable. Try to execute it as a + /* prog is not a native executable. Try to execute it as a shell script. Note that prepare_spawn() has already prepended a hidden element "sh.exe" to prog_argv. */ --prog_argv; diff --git a/lib/fts.c b/lib/fts.c index ad762dd77..d3ad1cd57 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -710,7 +710,7 @@ leaf_optimization_applies (int dir_fd _GL_UNUSED) { return false; } #endif /* link-count-optimization entry: - map an stat.st_dev number to a boolean: leaf_optimization_works */ + map a stat.st_dev number to a boolean: leaf_optimization_works */ struct LCO_ent { dev_t st_dev; diff --git a/lib/gc.h b/lib/gc.h index 03d27c17e..d5147486e 100644 --- a/lib/gc.h +++ b/lib/gc.h @@ -168,7 +168,7 @@ extern Gc_rc gc_hmac_sha1 (const void *key, size_t keylen, larger value means this function take more time (typical iteration counts are 1000-20000). This function "stretches" the key to be exactly dkLen bytes long. GC_OK is returned on success, otherwise - an Gc_rc error code is returned. */ + a Gc_rc error code is returned. */ extern Gc_rc gc_pbkdf2_sha1 (const char *P, size_t Plen, const char *S, size_t Slen, diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c index 96d01aa84..742987f21 100644 --- a/lib/spawn-pipe.c +++ b/lib/spawn-pipe.c @@ -196,7 +196,7 @@ create_pipe (const char *progname, (const char **) environ); if (child < 0 && errno == ENOEXEC) { - /* prog is not an native executable. Try to execute it as a + /* prog is not a native executable. Try to execute it as a shell script. Note that prepare_spawn() has already prepended a hidden element "sh.exe" to prog_argv. */ --prog_argv; diff --git a/lib/unigbrk.in.h b/lib/unigbrk.in.h index 6dda1ea11..906fc1dce 100644 --- a/lib/unigbrk.in.h +++ b/lib/unigbrk.in.h @@ -62,7 +62,7 @@ extern int /* Grapheme cluster breaks. */ -/* Returns true if there is an grapheme cluster boundary between Unicode code +/* Returns true if there is a grapheme cluster boundary between Unicode code points A and B. A "grapheme cluster" is an approximation to a user-perceived character, which sometimes corresponds to multiple code points. For example, an English letter followed by an acute accent can be -- 2.11.0