Commentary sync from coreutils.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index cf85e331af9ca0ade8f85323ecac5d1a51fc5a56..733e7324436223ef8219b6369a2da7936dbf5aaf 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-08  Jim Meyering  <jim@meyering.net>
+
+       * getndelim2.h (getndelim2): Remove doubled "after" in comment.
+
 2006-07-06  Jim Hyslop  <jhyslop@dreampossible.ca>  (tiny change)
 
        * lib/getaddrinfo.c: Changes to compile under MSVC6: changed

diff --git a/lib/getndelim2.h b/lib/getndelim2.h
index fb0a8c3e890275c437f98238ea2316a4f87454bb..37a597f7c2d08c3d834a50f7a371f89eee45b0ee 100644 (file)
--- a/lib/getndelim2.h
+++ b/lib/getndelim2.h
@@ -1,7 +1,7 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
    the buffer as necessary, but if NMAX is not GETNLINE_NO_LIMIT
    then do not allocate more than NMAX bytes; if the line is longer
    than that, read and discard the extra bytes.  Stop reading after
-   after the first occurrence of DELIM1 or DELIM2, whichever comes
-   first; a delimiter equal to EOF stands for no delimiter.  Read the
+   the first occurrence of DELIM1 or DELIM2, whichever comes first;
+   a delimiter equal to EOF stands for no delimiter.  Read the
    input bytes from STREAM.
    Return the number of bytes read and stored at *LINEPTR + OFFSET (not
    including the NUL terminator), or -1 on error or EOF.  */

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 6d43370dd4a874e18e61aa50d85d285a13d8a440..46273106cd9b2cd5937ae80d0e61e84c7111f890 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-08  Jim Meyering  <jim@meyering.net>
+
+       * link-follow.m4: Remove one of two adjacent "whether"s in a comment.
+       * getopt.m4: Remove one of two adjacent "your"s in a comment.
+       * regex.m4 (gl_REGEX): Remove one of two adjacent "the"s in a comment.
+
 2006-07-06  Derek R. Price  <derek@ximbiot.com>
        and Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/m4/getopt.m4 b/m4/getopt.m4
index e60b7469b18c27c7e37046db2820e8f3cd15017a..c0a73b2cb803aeb637f7f2db1b503e5e55b4da14 100644 (file)
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,11 +1,11 @@
-# getopt.m4 serial 12
+# getopt.m4 serial 13
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 # The getopt module assume you want GNU getopt, with getopt_long etc,
-# rather than vanilla POSIX getopt.  This means your your code should
+# rather than vanilla POSIX getopt.  This means your code should
 # always include <getopt.h> for the getopt prototypes.
 
 AC_DEFUN([gl_GETOPT_SUBSTITUTE],

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 735dad09f26d358ad639062adac70fe2e83d9c6f..f75062ce41ad7d056257da074f5e314b9f54d1c6 100644 (file)
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,8 +1,8 @@
-#serial 7
-dnl Run a program to determine whether whether link(2) follows symlinks.
+#serial 8
+dnl Run a program to determine whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-# Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/m4/regex.m4 b/m4/regex.m4
index 22d489d5be666be25600d0e196c7c69578071382..cd713660ef11859f6786f5b9ec9a5b0cff5823ea 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 36
+#serial 37
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006 Free Software Foundation, Inc.
@@ -28,7 +28,7 @@ AC_DEFUN([gl_REGEX],
   yes|no) ac_use_included_regex=$with_included_regex
        ;;
   '')
-    # If the system regex support is good enough that it passes the the
+    # If the system regex support is good enough that it passes the
     # following run test, then default to *not* using the included regex.c.
     # If cross compiling, assume the test would fail and use the included
     # regex.c.  The first failing regular expression is from `Spencer ere