maint: update all copyright year number ranges

Run "make update-copyright" and then...
* gnulib: Update to latest with copyright year adjusted.
* tests/init.sh: Sync with gnulib to pick up copyright year.
* bootstrap: Likewise.

46 files changed, 64 insertions, 50 deletions

diff --git a/AUTHORS b/AUTHORS
index e5c8b97..c1d2ea0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,7 +33,7 @@ Patrick D'Cruze
 Eli Zaretskii
 
 
-Copyright (C) 2001, 2006, 2009-2013, 2015-2020 Free Software Foundation, Inc.
+Copyright (C) 2001, 2006, 2009-2013, 2015-2021 Free Software Foundation, Inc.
 
 This file is part of GNU diffutils.
 
diff --git a/ChangeLog-2008 b/ChangeLog-2008
index bc227e2..bde0ffe 100644
--- a/ChangeLog-2008
+++ b/ChangeLog-2008
@@ -4265,7 +4265,7 @@ Thu Nov  3 16:30:24 1988  Randall Smith  (randy at gluteus.ai.mit.edu)
 
 	-----
 
-	Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013, 2015-2020
+	Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013, 2015-2021
 	Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
diff --git a/HACKING b/HACKING
index 0c60016..85a13ad 100644
--- a/HACKING
+++ b/HACKING
@@ -581,7 +581,7 @@ Then just open the index.html file (in the generated lcov-html directory)
 in your favorite web browser.
 
 ========================================================================
-Copyright (C) 2009-2013, 2015-2020 Free Software Foundation, Inc.
+Copyright (C) 2009-2013, 2015-2021 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/Makefile.am b/Makefile.am
index 062649e..8e96ebe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Main Automakefile for GNU diffutils.
 
-# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2020 Free Software
+# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2021 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/NEWS b/NEWS
index 7295d78..1d7811b 100644
--- a/NEWS
+++ b/NEWS
@@ -442,7 +442,7 @@ User-visible changes in version 2.0:
 
 
 
-Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2020 Free
+Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2021 Free
 Software Foundation, Inc.
 
 This file is part of GNU Diffutils.
diff --git a/README b/README
index e3b0936..57d080e 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ Please report bugs to <bug-diffutils@gnu.org>.
 
 -----
 
-Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015-2020 Free Software
+Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015-2021 Free Software
 Foundation, Inc.
 
 This file is part of GNU Diffutils.
diff --git a/README-hacking b/README-hacking
index 814bccd..5ee8cbe 100644
--- a/README-hacking
+++ b/README-hacking
@@ -94,7 +94,7 @@ each program.  One way to do this is to use vc-dwim
 
 -----
 
-Copyright (C) 2002-2007, 2009-2013, 2015-2020 Free Software Foundation, Inc.
+Copyright (C) 2002-2007, 2009-2013, 2015-2021 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
diff --git a/bootstrap b/bootstrap
index 70fd73c..7523f65 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2019-01-04.17; # UTC
+scriptversion=2020-11-18.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 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
@@ -71,7 +71,9 @@ Options:
  --no-git                 do not use git to update gnulib.  Requires that
                           --gnulib-srcdir point to a correct gnulib snapshot
  --skip-po                do not download po files
-
+EOF
+  bootstrap_print_option_usage_hook
+  cat <<EOF
 If the file $me.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
@@ -154,6 +156,18 @@ gnulib_files=
 : ${AUTOPOINT=autopoint}
 : ${AUTORECONF=autoreconf}
 
+# A function to be called for each unrecognized option.  Returns 0 if
+# the option in $1 has been processed by the function.  Returns 1 if
+# the option has not been processed by the function.  Override it via
+# your own definition in bootstrap.conf
+
+bootstrap_option_hook() { return 1; }
+
+# A function to be called in order to print the --help information
+# corresponding to user-defined command-line options.
+
+bootstrap_print_option_usage_hook() { :; }
+
 # A function to be called right after gnulib-tool is run.
 # Override it via your own definition in bootstrap.conf.
 bootstrap_post_import_hook() { :; }
@@ -335,7 +349,7 @@ do
   --no-git)
     use_git=false;;
   *)
-    die "$option: unknown option";;
+    bootstrap_option_hook $option || die "$option: unknown option";;
   esac
 done
 
@@ -970,7 +984,7 @@ bootstrap_post_import_hook \
 # Uninitialized submodules are listed with an initial dash.
 if $use_git && git submodule | grep '^-' >/dev/null; then
   die "some git submodules are not initialized. "     \
-      "Run 'git submodule init' and bootstrap again."
+      "Run 'git submodule update --init' and bootstrap again."
 fi
 
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
diff --git a/bootstrap.conf b/bootstrap.conf
index c5d2061..d45abdb 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2013, 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013, 2015-2021 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
diff --git a/cfg.mk b/cfg.mk
index 7a272c8..970af0a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2013, 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013, 2015-2021 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
diff --git a/configure.ac b/configure.ac
index e99ec83..ef01345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Configure template for GNU Diffutils.
 
-# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2020
+# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2021
 # Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 96a62ad..7138d76 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for GNU diffutils documentation.
 
-# Copyright (C) 2001-2002, 2009-2013, 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2009-2013, 2015-2021 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
diff --git a/doc/diffutils.texi b/doc/diffutils.texi
index 5da8e11..eed9bdb 100644
--- a/doc/diffutils.texi
+++ b/doc/diffutils.texi
@@ -14,7 +14,7 @@ and documents the GNU @command{diff}, @command{diff3},
 differences between files and the GNU @command{patch} command for
 using their output to update files.
 
-Copyright @copyright{} 1992--1994, 1998, 2001--2002, 2004, 2006, 2009--2020
+Copyright @copyright{} 1992--1994, 1998, 2001--2002, 2004, 2006, 2009--2021
 Free Software Foundation, Inc.
 
 @quotation
diff --git a/exgettext b/exgettext
index 1f6a468..e077ca7 100755
--- a/exgettext
+++ b/exgettext
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper around gettext for programs using the msgid convention.
 
-# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015-2020 Free Software
+# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015-2021 Free Software
 # Foundation, Inc.
 
 # Written by Paul Eggert <eggert@twinsun.com>.
diff --git a/gnulib b/gnulib
-Subproject 66a08a8636e7f89ccc8ea904b6c5100853e63a4
+Subproject bb6ecf3278cce40cfa6be693697e7995dca1a03
diff --git a/init.cfg b/init.cfg
index 66f8ee9..44e42bb 100644
--- a/init.cfg
+++ b/init.cfg
@@ -1,6 +1,6 @@
 # This file is sourced by init.sh, *before* its initialization.
 
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fbd0909..2edb30a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 # Automakefile for GNU Diffutils library.
 
-# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2020 Free Software
+# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2021 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c
index ea984c6..7cee45a 100644
--- a/lib/cmpbuf.c
+++ b/lib/cmpbuf.c
@@ -1,6 +1,6 @@
 /* Buffer primitives for comparison operations.
 
-   Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015-2020 Free
+   Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015-2021 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/cmpbuf.h b/lib/cmpbuf.h
index 554dd07..79b9f06 100644
--- a/lib/cmpbuf.h
+++ b/lib/cmpbuf.h
@@ -1,6 +1,6 @@
 /* Buffer primitives for comparison operations.
 
-   Copyright (C) 2002, 2009-2013, 2015-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2013, 2015-2021 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
diff --git a/lib/prepargs.c b/lib/prepargs.c
index bc33e44..3751ae0 100644
--- a/lib/prepargs.c
+++ b/lib/prepargs.c
@@ -1,6 +1,6 @@
 /* Parse arguments from a string and prepend them to an argv.
 
-   Copyright (C) 1999-2002, 2006, 2009-2013, 2015-2020 Free Software
+   Copyright (C) 1999-2002, 2006, 2009-2013, 2015-2021 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/man/Makefile.am b/man/Makefile.am
index d4cb02a..73073d8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 # Automakefile for GNU diffutils man pages
 
-# Copyright (C) 2002, 2009-2013, 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2009-2013, 2015-2021 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
diff --git a/man/help2man b/man/help2man
index a5709b3..49a76e5 100755
--- a/man/help2man
+++ b/man/help2man
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # Generate a short man page from --help and --version output.
-# Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2020 Free Software Foundation,
+# Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2021 Free Software Foundation,
 # Inc.
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3934673..b4f8ef8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of files that contain translatable strings.
 
-# Copyright (C) 2001-2002, 2009-2013, 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2009-2013, 2015-2021 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
diff --git a/po/en.po b/po/en.po
index 926edf3..580dd61 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,5 +1,5 @@
 # English messages for GNU diffutils
-# Copyright 1998, 2001-2003, 2009-2013, 2015-2020 Free Software Foundation,
+# Copyright 1998, 2001-2003, 2009-2013, 2015-2021 Free Software Foundation,
 # Inc.
 # Paul Eggert <eggert@twinsun.com>, 1998
 #
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ce2433..d27a54d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # Automakefile for GNU diffutils programs.
 
-# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2020 Free Software Foundation,
+# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2021 Free Software Foundation,
 # Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/src/analyze.c b/src/analyze.c
index 5693ba3..a5e4bdc 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1,7 +1,7 @@
 /* Analyze file differences for GNU DIFF.
 
    Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006-2007,
-   2009-2013, 2015-2020 Free Software Foundation, Inc.
+   2009-2013, 2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/cmp.c b/src/cmp.c
index 26b23d9..e2d6f25 100644
--- a/src/cmp.c
+++ b/src/cmp.c
@@ -1,7 +1,7 @@
 /* GNU cmp - compare two files byte by byte
 
    Copyright (C) 1990-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 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
diff --git a/src/context.c b/src/context.c
index c0bfb4a..c65f427 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,7 +1,7 @@
 /* Context-format output routines for GNU DIFF.
 
    Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2006, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/die.h b/src/die.h
index 95f6f0c..5ab0512 100644
--- a/src/die.h
+++ b/src/die.h
@@ -1,5 +1,5 @@
 /* Report an error and exit.
-   Copyright 2016-2020 Free Software Foundation, Inc.
+   Copyright 2016-2021 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
diff --git a/src/diff.c b/src/diff.c
index 00e3013..3871715 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1,7 +1,7 @@
 /* GNU diff - compare files line by line
 
    Copyright (C) 1988-1989, 1992-1994, 1996, 1998, 2001-2002, 2004, 2006-2007,
-   2009-2013, 2015-2020 Free Software Foundation, Inc.
+   2009-2013, 2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/diff.h b/src/diff.h
index 767b3be..27362c0 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -1,7 +1,7 @@
 /* Shared definitions for GNU DIFF
 
    Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/diff3.c b/src/diff3.c
index bb039a8..18a7341 100644
--- a/src/diff3.c
+++ b/src/diff3.c
@@ -1,7 +1,7 @@
 /* GNU diff3 - compare three files line by line
 
    Copyright (C) 1988-1989, 1992-1996, 1998, 2001-2002, 2004, 2006, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 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
diff --git a/src/dir.c b/src/dir.c
index 8aaad17..01a32ab 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -1,7 +1,7 @@
 /* Read, sort and compare two directories.  Used for GNU DIFF.
 
    Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006-2007,
-   2009-2013, 2015-2020 Free Software Foundation, Inc.
+   2009-2013, 2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/ed.c b/src/ed.c
index 3b64208..053e1fc 100644
--- a/src/ed.c
+++ b/src/ed.c
@@ -1,7 +1,7 @@
 /* Output routines for ed-script format.
 
    Copyright (C) 1988-1989, 1991-1993, 1995, 1998, 2001, 2004, 2006, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/ifdef.c b/src/ifdef.c
index 601be17..8e64b4c 100644
--- a/src/ifdef.c
+++ b/src/ifdef.c
@@ -1,6 +1,6 @@
 /* #ifdef-format output routines for GNU DIFF.
 
-   Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013, 2015-2020
+   Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013, 2015-2021
    Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
diff --git a/src/io.c b/src/io.c
index b226081..1f0e040 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,7 +1,7 @@
 /* File I/O for GNU DIFF.
 
    Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/normal.c b/src/normal.c
index 96abd0a..f76c1ac 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1,6 +1,6 @@
 /* Normal-format output routines for GNU DIFF.
 
-   Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015-2020
+   Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015-2021
    Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
diff --git a/src/sdiff.c b/src/sdiff.c
index 1aece14..232ebcd 100644
--- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -1,7 +1,7 @@
 /* GNU sdiff - side-by-side merge of file differences
 
    Copyright (C) 1992-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/side.c b/src/side.c
index 416dcb4..11d5f5c 100644
--- a/src/side.c
+++ b/src/side.c
@@ -1,6 +1,6 @@
 /* sdiff-format output routines for GNU DIFF.
 
-   Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015-2020 Free
+   Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015-2021 Free
    Software Foundation, Inc.
 
    This file is part of GNU DIFF.
diff --git a/src/system.h b/src/system.h
index e3c8b1d..f921a50 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,7 +1,7 @@
 /* System dependent declarations.
 
    Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/src/util.c b/src/util.c
index 83897b5..4348757 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,7 +1,7 @@
 /* Support routines for GNU DIFF.
 
    Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013,
-   2015-2020 Free Software Foundation, Inc.
+   2015-2021 Free Software Foundation, Inc.
 
    This file is part of GNU DIFF.
 
diff --git a/tests/cmp b/tests/cmp
index 34e195a..79568a2 100755
--- a/tests/cmp
+++ b/tests/cmp
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test 'cmp'.
 
-# Copyright 2017-2020 Free Software Foundation, Inc.
+# Copyright 2017-2021 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
diff --git a/tests/envvar-check b/tests/envvar-check
index 7e51193..dff7527 100644
--- a/tests/envvar-check
+++ b/tests/envvar-check
@@ -1,7 +1,7 @@
 # -*- sh -*-
 # Check environment variables for sane values while testing.
 
-# Copyright (C) 2000-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2021 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
diff --git a/tests/help-version b/tests/help-version
index 2e369a2..d5a8d71 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -2,7 +2,7 @@
 # Make sure all these programs work properly
 # when invoked with --help or --version.
 
-# Copyright (C) 2000-2013, 2015-2020 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013, 2015-2021 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
diff --git a/tests/init.cfg b/tests/init.cfg
index c03b363..656a54e 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -1,6 +1,6 @@
 # This file is sourced by init.sh, *before* its initialization.
 
-# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 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
diff --git a/tests/init.sh b/tests/init.sh
index b4a5944..9ef8348 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
@@ -389,7 +389,7 @@ setup_ ()
   if test "$VERBOSE" = yes; then
     # Test whether set -x may cause the selected shell to corrupt an
     # application's stderr.  Many do, including zsh-4.3.10 and the /bin/sh
-    # from SunOS 5.11, OpenBSD 4.7 and Irix 5.x and 6.5.
+    # from SunOS 5.11, OpenBSD 4.7 and Irix 6.5.
     # If enabling verbose output this way would cause trouble, simply
     # issue a warning and refrain.
     if $gl_set_x_corrupts_stderr_; then