* lib/argp-pv.c: Remove a doubled word in a comment.

* lib/check-version.c (check_version): Likewise.
* lib/javacomp.c (compile_java_class): Likewise.
* m4/glob.m4: Likewise.

6 files changed, 21 insertions, 12 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 733e732443..031f345c17 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-09  Jim Meyering  <jim@meyering.net>
+
+	* argp-pv.c: Remove a doubled word in a comment.
+	* check-version.c (check_version): Likewise.
+	* javacomp.c (compile_java_class): Likewise.
+
 2006-07-08  Jim Meyering  <jim@meyering.net>
 
 	* getndelim2.h (getndelim2): Remove doubled "after" in comment.
diff --git a/lib/argp-pv.c b/lib/argp-pv.c
index a0d68e10b6..a11298bfab 100644
--- a/lib/argp-pv.c
+++ b/lib/argp-pv.c
@@ -1,5 +1,5 @@
 /* Default definition for ARGP_PROGRAM_VERSION.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -19,6 +19,6 @@
 
 /* If set by the user program to a non-zero value, then a default option
    --version is added (unless the ARGP_NO_HELP flag is used), which will
-   print this this string followed by a newline and exit (unless the
+   print this string followed by a newline and exit (unless the
    ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
 const char *argp_program_version;
diff --git a/lib/check-version.c b/lib/check-version.c
index 4df90a4843..74cee20c8d 100644
--- a/lib/check-version.c
+++ b/lib/check-version.c
@@ -1,5 +1,5 @@
 /* check-version.h --- Check version string compatibility.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -30,12 +30,11 @@
 /* Get specification. */
 #include "check-version.h"
 
-/* Check that the the version of the library (i.e., the CPP symbol
- * VERSION) is at minimum the requested one in REQ_VERSION (typically
- * found in a header file) and return the version string.  Return NULL
- * if the condition is not satisfied.  If a NULL is passed to this
- * function, no check is done, but the version string is simply
- * returned.
+/* Check that the version of the library (i.e., the CPP symbol VERSION)
+ * is at minimum the requested one in REQ_VERSION (typically found in
+ * a header file) and return the version string.  Return NULL if the
+ * condition is not satisfied.  If a NULL is passed to this function,
+ * no check is done, but the version string is simply returned.
  */
 const char *
 check_version (const char *req_version)
diff --git a/lib/javacomp.c b/lib/javacomp.c
index 04013e96e8..ba47b6e7ca 100644
--- a/lib/javacomp.c
+++ b/lib/javacomp.c
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -97,7 +97,7 @@ compile_java_class (const char * const *java_sources,
       {
 	/* Because $JAVAC may consist of a command and options, we use the
 	   shell.  Because $JAVAC has been set by the user, we leave all
-	   all environment variables in place, including JAVA_HOME, and
+	   environment variables in place, including JAVA_HOME, and
 	   we don't erase the user's CLASSPATH.  */
 	char *old_classpath;
 	unsigned int command_length;
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 46273106cd..f27da9a0b3 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-09  Jim Meyering  <jim@meyering.net>
+
+	* glob.m4: Remove a doubled word in a comment.
+
 2006-07-08  Jim Meyering  <jim@meyering.net>
 
 	* link-follow.m4: Remove one of two adjacent "whether"s in a comment.
diff --git a/m4/glob.m4 b/m4/glob.m4
index d57e323eb7..5d80e05878 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -5,7 +5,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 # The glob module assumes you want GNU glob, with glob_pattern_p etc,
-# rather than vanilla POSIX glob.  This means your your code should
+# rather than vanilla POSIX glob.  This means your code should
 # always include <glob.h> for the glob prototypes.
 
 AC_DEFUN([gl_GLOB_SUBSTITUTE],