bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/2] maint: correct misuse of "a" and "an"


From: Jim Meyering
Subject: [PATCH 1/2] maint: correct misuse of "a" and "an"
Date: Fri, 20 May 2011 11:56:38 +0200

FYI, these fix quite a few typos:

>From c9ff025783e5374226ffbf7940f40ce7db6852ed Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 19 May 2011 22:18:05 +0200
Subject: [PATCH 1/2] 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/
---
 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 95af3d4..07af46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-19  Jim Meyering  <address@hidden>
+
+       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  <address@hidden>

        intprops-tests: work around HP-UX 11.23 cc bug with constants
diff --git a/doc/regex.texi b/doc/regex.texi
index 093f4cc..bfc3471 100644
--- a/doc/regex.texi
+++ b/doc/regex.texi
@@ -885,7 +885,7 @@ Collating Symbol Operators
 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--
1.7.5.1.341.g177b8


>From 93d7550462f21202b69712f3d489399963965ddd Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 20 May 2011 11:53:34 +0200
Subject: [PATCH 2/2] 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.
---
 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 07af46c..f42002c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-20  Jim Meyering  <address@hidden>
+
+       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  <address@hidden>

        maint: correct misuse of "a" and "an"
diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index fef0d76..1e1ad40 100644
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -550,7 +550,7 @@ Unit test modules

 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 6419201..b6cd14a 100644
--- a/doc/intprops.texi
+++ b/doc/intprops.texi
@@ -58,7 +58,7 @@ Integer Type Determination

 @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 bfc3471..52ecf9b 100644
--- a/doc/regex.texi
+++ b/doc/regex.texi
@@ -1624,7 +1624,7 @@ GNU Matching
 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.
address@hidden Registers}, for a explanation of @var{regs}; you can safely
address@hidden 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 24f4bc9..9b8e00d 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 9ebe2d1..f87729d 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 ad8647d..7993794 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 c518f3b..5aedeee 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 bf3b792..a96b63a 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.  */
--
1.7.5.1.341.g177b8



reply via email to

[Prev in Thread] Current Thread [Next in Thread]