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)

diff --git a/ChangeLog b/ChangeLog
index 86a480c..f103411 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-19  Jim Meyering  <meyering@redhat.com>
+
+       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  <eggert@cs.ucla.edu>
 
        intprops: work around IRIX 6.5 cc bug with 0u - 0u + -1

diff --git a/doc/regex.texi b/doc/regex.texi
index 093f4cc..bfc3471 100644 (file)
--- 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 48c37a9..ad8647d 100644 (file)
--- 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 c884b89..5cab8ce 100644 (file)
--- 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 fe57e22..6de6c62 100644 (file)
--- 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 ad762dd..d3ad1cd 100644 (file)
--- 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 03d27c1..d514748 100644 (file)
--- 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 96d01aa..742987f 100644 (file)
--- 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 6dda1ea..906fc1d 100644 (file)
--- 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