From 4392fa65c8d8dce126bf6b404758a4727821c595 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Jul 2006 01:31:04 +0000 Subject: [PATCH] Commentary sync from coreutils. --- lib/ChangeLog | 4 ++++ lib/getndelim2.h | 6 +++--- m4/ChangeLog | 6 ++++++ m4/getopt.m4 | 4 ++-- m4/link-follow.m4 | 6 +++--- m4/regex.m4 | 4 ++-- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index cf85e331a..733e73244 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-07-08 Jim Meyering + + * getndelim2.h (getndelim2): Remove doubled "after" in comment. + 2006-07-06 Jim Hyslop (tiny change) * lib/getaddrinfo.c: Changes to compile under MSVC6: changed diff --git a/lib/getndelim2.h b/lib/getndelim2.h index fb0a8c3e8..37a597f7c 100644 --- 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 6d43370dd..46273106c 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2006-07-08 Jim Meyering + + * 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 and Paul Eggert diff --git a/m4/getopt.m4 b/m4/getopt.m4 index e60b7469b..c0a73b2cb 100644 --- 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 for the getopt prototypes. AC_DEFUN([gl_GETOPT_SUBSTITUTE], diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index 735dad09f..f75062ce4 100644 --- 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 22d489d5b..cd713660e 100644 --- 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 -- 2.11.0