[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[automake-commit] 02/02: maint: spelling and whitespace fixes
|
From: |
Paul Eggert |
|
Subject: |
[automake-commit] 02/02: maint: spelling and whitespace fixes |
|
Date: |
Fri, 07 Jun 2024 11:43:45 -0400 |
eggert pushed a commit to branch master
in repository automake.
View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=1d35638b23e95fe6f41c828a3442f6d7f242f4c4
commit 1d35638b23e95fe6f41c828a3442f6d7f242f4c4
Author: Paul Eggert <eggert@cs.ucla.edu>
AuthorDate: Fri Jun 7 08:41:45 2024 -0700
maint: spelling and whitespace fixes
Most of these spelling fixes are just to comments and documentation.
However, some affect tests as follows:
* t/cond36.sh (tparse.h): Fix misspelling of dependency.
* t/disthook.sh: Fix misspelling of file.
* t/help3.sh: Fix misspelling of long option.
* t/instdir-ltlib.sh: Fix misspellings of macro names.
This causes the test to fail, so someone with libtool
expertise needs to look into this.
* t/tap-no-spurious-numbers.sh (highno): Fix misspelling of shell var.
---
HACKING | 24 ++++-----
NEWS | 22 ++++----
NEWS-2.0 | 10 ++--
PLANS/subdir-objects.txt | 10 ++--
THANKS | 2 +-
bin/automake.in | 14 ++---
configure.ac | 2 +-
contrib/checklinkx | 2 +-
doc/automake-history.texi | 4 +-
doc/automake.texi | 48 ++++++++---------
doc/local.mk | 4 +-
lib/Automake/ChannelDefs.pm | 6 +--
lib/Automake/Channels.pm | 2 +-
lib/Automake/Condition.pm | 8 +--
lib/Automake/Configure_ac.pm | 2 +-
lib/Automake/FileUtils.pm | 2 +-
lib/Automake/Getopt.pm | 2 +-
lib/Automake/Variable.pm | 2 +-
lib/Automake/XFile.pm | 2 +-
lib/am/check.am | 2 +-
lib/am/header-vars.am | 2 +-
lib/am/ltlib.am | 4 +-
lib/am/progs.am | 4 +-
lib/depcomp | 4 +-
lib/gendocs.sh | 4 +-
lib/install-sh | 6 +--
lib/missing | 4 +-
lib/tap-driver.sh | 6 +--
m4/depend.m4 | 2 +-
m4/dmalloc.m4 | 2 +-
m4/sanity.m4 | 4 +-
maintainer/maint.mk | 2 +-
old/ChangeLog.00 | 6 +--
old/ChangeLog.03 | 4 +-
old/ChangeLog.09 | 16 +++---
old/ChangeLog.11 | 102 +++++++++++++++++------------------
old/ChangeLog.96 | 4 +-
old/TODO | 4 +-
t/README | 2 +-
t/ac-output-old.tap | 2 +-
t/ar-lib5b.sh | 2 +-
t/autodist-aclocal-m4.sh | 4 +-
t/autodist-config-headers.sh | 2 +-
t/ax/am-test-lib.sh | 6 +--
t/ax/depcomp.sh | 2 +-
t/ax/tap-functions.sh | 2 +-
t/ax/test-defs.in | 2 +-
t/ax/test-lib.sh | 10 ++--
t/ax/testsuite-summary-checks.sh | 2 +-
t/backcompat6.sh | 2 +-
t/backslash-issues.sh | 2 +-
t/canon8.sh | 2 +-
t/cond36.sh | 2 +-
t/confh8.sh | 2 +-
t/dist-no-built-sources.sh | 2 +-
t/distcheck-configure-flags-am.sh | 2 +-
t/disthook.sh | 2 +-
t/extra-dist-wildcards-vpath.sh | 2 +-
t/extra-dist-wildcards.sh | 2 +-
t/help.sh | 2 +-
t/help2.sh | 2 +-
t/help3.sh | 4 +-
t/help4.sh | 2 +-
t/instdir-ltlib.sh | 4 +-
t/instspc.tap | 4 +-
t/java-compile-run-flat.sh | 2 +-
t/lexvpath.sh | 2 +-
t/lisp-flags.sh | 2 +-
t/local.mk | 2 +-
t/longlin2.sh | 2 +-
t/parallel-tests-fork-bomb.sh | 2 +-
t/parallel-tests-interrupt.tap | 2 +-
t/perf/testsuite-summary.sh | 2 +-
t/primary-prefix-invalid-couples.tap | 2 +-
t/py-compile-basedir.sh | 2 +-
t/py-compile-env.sh | 2 +-
t/relativize.tap | 2 +-
t/remake-deeply-nested.sh | 2 +-
t/remake-macrodir.sh | 2 +-
t/remake-timing-bug-pr8365.sh | 2 +-
t/self-check-exit.tap | 2 +-
t/serial-tests.sh | 6 +--
t/spy-rm.tap | 2 +-
t/subobjname.sh | 2 +-
t/suffix3.tap | 2 +-
t/tap-deps.sh | 2 +-
t/tap-diagnostic-custom.sh | 2 +-
t/tap-log.sh | 2 +-
t/tap-no-spurious-numbers.sh | 2 +-
t/tap-plan-leading-zero.sh | 2 +-
t/tap-plan-malformed.sh | 2 +-
t/tap-test-number-0.sh | 2 +-
t/tar-ustar-id-too-high.sh | 2 +-
t/test-driver-custom-multitest.sh | 2 +-
t/test-driver-custom-xfail-tests.sh | 2 +-
t/test-log.sh | 2 +-
t/test-logs-repeated.sh | 2 +-
t/test-metadata-global-result.sh | 2 +-
t/tests-environment-backcompat.sh | 2 +-
t/tests-environment-fd-redirect.sh | 6 +--
t/txinfo-no-texi-but-texi-in.sh | 4 +-
t/uninstall-fail.sh | 2 +-
t/vala-configure.sh | 2 +-
t/vala-mix.sh | 2 +-
t/vala-mix2.sh | 2 +-
t/yacc-grepping2.sh | 2 +-
106 files changed, 258 insertions(+), 258 deletions(-)
diff --git a/HACKING b/HACKING
index f70fcea8a..8f88c8031 100644
--- a/HACKING
+++ b/HACKING
@@ -178,15 +178,15 @@
nor contain any potentially destabilizing refactoring or sweeping change,
nor introduce new features whose implementation might be liable to cause
bugs or regressions in existing code. However, it might be acceptable to
- introduce very limited and localized backward-incompatibilities, *only*
+ introduce very limited and localized backward-incompatibility, *only*
if that is necessary to fix non-trivial bugs, address serious performance
issues, or greatly enhance usability. But please, do this sparsely and
rarely!
-* Major releases can introduce backward-incompatibilities (albeit such
- incompatibilities should be announced well in advance, and a smooth
+* Major releases can introduce backward incompatibility (albeit such
+ incompatibility should be announced well in advance, and a smooth
transition plan prepared for them), and try more risky and daring
- refactorings and code cleanups. Still, backward incompatibilities are
+ refactorings and code cleanups. Still, backward incompatibility is
extremely undesirable and should be avoided at all costs.
* For more information, refer to the extensive discussion associated
@@ -199,7 +199,7 @@
use the 'bootstrap' script. It uses the code from the source
tree, so the resulting files (aclocal.m4 and Makefile.in) should
be the same as you would get if you install this version of
- automake and use it to generate those files.
+ automake and use it to generate those files.
* To get a faithful and correct rebuild, run:
./bootstrap && ./config.status --recheck && make clean all
@@ -209,7 +209,7 @@
do. However, sometimes it may be necessary to use the development
versions due to bugs fixed, etc. Whatever is first in PATH wins.
(Some background: https://bugs.gnu.org/11347)
-
+
* The Automake git tree currently carries three basic branches:
'master', 'next' and 'maint'. In practice, for quite a few years now,
as of this writing in 2023, we have been using only the master branch,
@@ -428,18 +428,18 @@
* Some hints for debugging test failures or trying to understand the
(complex) test infrastructure.
-
+
- You may want a simple test just to exercise the setup; t/amassign.sh
is such a test. For a simple test that runs automake twice (sometimes
useful in finding concurrency failures), try t/nodef.sh.
-
+
- The t/ax/ dir contains most of the test infrastructure files.
- To trace the (complex) test initialization code, change the set -e
to set -ex (or whatever you wish) in t/ax/test-init.sh.
Automake itself enables -x for the *.log and test-suite.log files,
in am_test_setup in t/ax/test-lib.sh. You may want to change to -vx.
-
+
- If you want to run the individual commands of a test one by one in a
shell, you have to reproduce the test environment. Start a subshell and:
PATH=$am/bin:$am/t/ax:$PATH # where $am is your automake source checkout
@@ -447,11 +447,11 @@
. test-init.sh # beginning of test
Then each command you type will be executed in the test environment,
including -x being enabled. Each test prints the PATH value at the beginning.
-
+
- If you need to debug a test which fails under installcheck, you need
to invoke make with am_running_installcheck=yes, as is done by the
installcheck-testsuite target in t/local.mk.
-
+
- If you want to see the (complex shell) commands that make is
running, despite all of Automake's attempt at silence, run (GNU)
make --debug=p ... other make args ...
@@ -544,7 +544,7 @@
* Run "make git-upload-release".
For pretest releases: "DEVEL_SNAPSHOT=1 make git-upload-release".
-
+
This will first verify that you are releasing from a tagged version
and that the local git repository and working tree are clean and
up-to-date, and will then run "make dist" to create the tarballs,
diff --git a/NEWS b/NEWS
index 2da4cc769..fa6b8f842 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-For planned incompatibilities in a future Automake 2.0 release,
+For planned incompatibility in a future Automake 2.0 release,
please see NEWS-2.0 and start following the advice there now.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -500,7 +500,7 @@ New in 1.14:
- The 'compile' script is now unconditionally required for all packages
that perform C compilation (if you are using the '--add-missing'
option, automake will fetch that script for you, so you shouldn't
- need any explicit adjustment). This new behaviour is needed to avoid
+ need any explicit adjustment). This new behavior is needed to avoid
obscure errors when the 'subdir-objects' option is used, and the
compiler is an inferior one that doesn't grasp the combined use of
both the "-c -o" options; see discussion about automake bug#13378 for
@@ -528,7 +528,7 @@ New in 1.14:
- The AM_PROG_CC_C_O macro can still be called, albeit that should no
longer be necessary. This macro is now just a thin wrapper around the
Automake-enhanced AC_PROG_CC. This means, among the other things,
- that its behaviour is changed in three ways:
+ that its behavior is changed in three ways:
1. It no longer invokes the Autoconf-provided AC_PROG_CC_C_O
macro behind the scenes.
@@ -853,7 +853,7 @@ New in 1.13:
- Elisp files placed in a subdirectory are now byte-compiled to '.elc'
files in the same subdirectory; for example, byte-compiling of file
'sub/foo.el' file will result in 'sub/foo.elc' rather than in
- 'foo.elc'. This behaviour is backward-incompatible with older
+ 'foo.elc'. This behavior is backward-incompatible with older
Automake versions, but it is more natural and more sane. See also
automake bug#7441.
@@ -946,7 +946,7 @@ New in 1.13:
- Various internal refactorings. They should cause no visible change,
but the chance for regression is there anyway, so please report any
- unexpected or suspicious behaviour.
+ unexpected or suspicious behavior.
- Support for pre-8.0 versions of the Intel C Compiler has been dropped.
This should cause no problem, since icc 8.0 has been released in
@@ -1028,7 +1028,7 @@ New in 1.12.5:
* Miscellaneous changes:
- - automake and aclocal no longer honours the 'perllibdir' environment
+ - automake and aclocal no longer honors the 'perllibdir' environment
variable. That had always been intended only as an hack required in
the testsuite, not meant for any use beyond that.
@@ -1064,7 +1064,7 @@ New in 1.12.3:
* Miscellaneous changes:
- The '.m4' files provided by Automake no longer define serial numbers.
- This should cause no difference in the behaviour of aclocal though.
+ This should cause no difference in the behavior of aclocal though.
- Some testsuite weaknesses and spurious failures have been fixed.
@@ -1337,7 +1337,7 @@ New in 1.12:
- Slightly backward-incompatible change, relevant only for use of Yacc
with C++: the extensions of the header files produced by the Yacc
- rules are now modelled after the extension of the corresponding
+ rules are now modeled after the extension of the corresponding
sources. For example, yacc files named "foo.y++" and "bar.yy" will
produce header files named "foo.h++" and "bar.hh" respectively, where
they would have previously produced header files named simply "foo.h"
@@ -1688,12 +1688,12 @@ Bugs fixed in 1.11.2:
and error out if `javadir' is undefined, instead of silently producing
a broken Makefile.in.
- - aclocal and automake now honour the configure-time definitions of
+ - aclocal and automake now honor the configure-time definitions of
AUTOCONF and AUTOM4TE when they spawn autoconf or autom4te processes.
- The `install-info' recipe no longer tries to guess whether the
`install-info' program is from Debian or from GNU, and adaptively
- change its behaviour; this has proven to be frail and easy to
+ change its behavior; this has proven to be frail and easy to
regress.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2833,7 +2833,7 @@ Bugs fixed in 1.7.3:
- use `_dirstamp' when the file-system doesn't support `.dirstamp'
- install/uninstall `*.i[0-9][0-9]'-style info files
- more changes that affect only the Automake package (not its output)
-* Fix some incompatibilities with upcoming perl-5.10.
+* Fix some incompatibility with upcoming perl-5.10.
* Properly quote AC_PACKAGE_TARNAME and AC_PACKAGE_VERSION when defining
PACKAGE and VERSION.
* depcomp fixes:
diff --git a/NEWS-2.0 b/NEWS-2.0
index 41fbdcbfd..e31ba291e 100644
--- a/NEWS-2.0
+++ b/NEWS-2.0
@@ -1,4 +1,4 @@
-This file (NEWS-2.0) lists several incompatibilities that may happen in a
+This file (NEWS-2.0) lists incompatibility issues that may happen in a
future Automake 2.0 release.
However, the (few) current Automake maintainers have insufficient interest
@@ -12,7 +12,7 @@ any time soon. So moving these future issues to a separate
file seemed
warranted. For more info, see the ./PLANS/ directory.
-* WARNING: Future backward-incompatibilities!
+* WARNING: Future backward-incompatibility!
- Makefile recipes generated by Automake 2.0 will expect to use an
'rm' program that doesn't complain when called without any non-option
@@ -31,7 +31,7 @@ warranted. For more info, see the ./PLANS/ directory.
for Automake 2.0.
- Automake 2.0 will require Autoconf 2.71 or later. Exact
- dependencies are unknowable at ths time.
+ dependencies are unknowable at this time.
- Automake 2.0 will drop support for the long-deprecated 'configure.in'
name for the Autoconf input file. You are advised to start using the
@@ -39,8 +39,8 @@ warranted. For more info, see the ./PLANS/ directory.
- The ACLOCAL_AMFLAGS special make variable will be fully deprecated in
Automake 2.0: it will raise warnings in the "obsolete" category (but
- still no hard error of course, for compatibilities with the many, many
- packages that still relies on that variable). You are advised to
+ still no hard error of course, for compatibility with the many, many
+ packages that still rely on that variable). You are advised to
start relying on the new Automake support for AC_CONFIG_MACRO_DIRS
instead (which was introduced in Automake 1.13).
diff --git a/PLANS/subdir-objects.txt b/PLANS/subdir-objects.txt
index c6a046f52..fe79e80c4 100644
--- a/PLANS/subdir-objects.txt
+++ b/PLANS/subdir-objects.txt
@@ -1,7 +1,7 @@
Summary
-------
-We want to make the behaviour currently enabled by the 'subdir-objects'
+We want to make the behavior currently enabled by the 'subdir-objects'
the default one, and in fact the *only* one, in Automake 2.0.
See automake bug#13378: <https://debbugs.gnu.org/13378>.
@@ -15,12 +15,12 @@ that the 'subdir-objects' option had only been introduced
in April 1999,
starting with commit 'user-dep-gen-branchpoint-56-g88b5959', and never
made the default (likely to avoid backwards-compatibility issues).
-Since I believe the behaviour enabled by the 'subdir-objects' is the most
+Since I believe the behavior enabled by the 'subdir-objects' is the most
useful one, and in fact the *only* natural one, I'd like to make it the
only one available, simplifying the Automake implementation and APIs a
little in the process.
-Alas, since this also means changing the default behaviour of Automake
+Alas, since this also means changing the default behavior of Automake
('subdir-objects' is not enabled by default, sadly), this means the
transition path will be less smooth than I'd like.
@@ -58,8 +58,8 @@ Submit the pending patch series that fixes
https://debbugs.gnu.org/13928
For automake 2.0
----------------
-Make the behaviour once activated by the 'subdir-object' option mandatory.
-With that change, we'll drop support for the "old" behaviour of having
+Make the behavior once activated by the 'subdir-object' option mandatory.
+With that change, we'll drop support for the "old" behavior of having
object files derived from sources in a subdirectory being placed in the
current directory rather than in that same subdirectory.
diff --git a/THANKS b/THANKS
index 8f37ecd5e..c48cb0ea0 100644
--- a/THANKS
+++ b/THANKS
@@ -40,7 +40,7 @@ Arto C. Nirkko anirkko@insel.ch
Assar Westerlund assar@sics.se
Axel Belinfante Axel.Belinfante@cs.utwente.nl
Bas Wijnen shevek@fmf.nl
-Ben Pfaff blp@cs.standford.edu
+Ben Pfaff blp@cs.stanford.edu
Benoit Sigoure tsuna@lrde.epita.fr
Bernard Giroud bernard.giroud@creditlyonnais.ch
Bernard Urban Bernard.Urban@meteo.fr
diff --git a/bin/automake.in b/bin/automake.in
index 24b1bb51f..74a18cd69 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1843,7 +1843,7 @@ sub handle_single_transform
else
{
# Since the next major version of automake (2.0) will
- # make the behaviour so far only activated with the
+ # make the behavior so far only activated with the
# 'subdir-objects' option mandatory, it's better if we
# start warning users not using that option.
# As suggested by Peter Johansson, we strive to avoid
@@ -1866,7 +1866,7 @@ object file(s) will be placed in the top-level directory.
However, this
behavior may change in a future Automake major version, with object
files being placed in the same subdirectory as the corresponding sources.
You are advised to start using 'subdir-objects' option throughout your
-project, to avoid future incompatibilities.
+project, to avoid future incompatibility.
EOF
}
}
@@ -2064,7 +2064,7 @@ EOF
# dependency code).
# Properly flatten multiple adjacent slashes, as Solaris 10 make
# might fail over them in an include statement.
- # Leading double slashes may be special, as per Posix, so deal
+ # Leading double slashes may be special, as per POSIX, so deal
# with them carefully.
if ($lang && $lang->autodep ne 'no')
{
@@ -2291,7 +2291,7 @@ sub handle_lib_objects
# Skip -dlopen and -dlpreopen; these are explicitly allowed
# for Libtool libraries or programs. (Actually we are a bit
# lax here since this code also applies to non-libtool
- # libraries or programs, for which -dlopen and -dlopreopen
+ # libraries or programs, for which -dlopen and -dlpreopen
# are pure nonsense. Diagnosing this doesn't seem very
# important: the developer will quickly get complaints from
# the linker.)
@@ -2563,7 +2563,7 @@ sub handle_targets ()
@ltliblist = am_install_var ('ltlib', 'LTLIBRARIES',
'noinst', 'lib', 'pkglib', 'check');
- # Record duplications that may arise after canonicalization of the
+ # Record duplicates that may arise after canonicalization of the
# base names, in order to prevent object file clashes in the presence
# of target-specific *FLAGS
my @targetlist = (@proglist, @liblist, @ltliblist);
@@ -3103,7 +3103,7 @@ sub scan_texinfo_file
# Since @setfilename is optional nowadays, doesn't seem worth
# the trouble to handle (which looks to be nontrivial).
# https://bugs.gnu.org/54063
-
+
$outfile = $1;
if (index ($outfile, '.') < 0)
{
@@ -4910,7 +4910,7 @@ sub handle_per_suffix_test
}
# The "test driver" program, deputed to handle tests protocol used by
# test scripts. By default, it's assumed that no protocol is used, so
- # we fall back to the old behaviour, implemented by the 'test-driver'
+ # we fall back to the old behavior, implemented by the 'test-driver'
# auxiliary script.
if (! var "${pfx}LOG_DRIVER")
{
diff --git a/configure.ac b/configure.ac
index 13b341b77..3ff08e9f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ dnl We don't want to abort our configuration script if no C
compiler is
dnl available, as such a compiler is only required to run part of the
dnl testsuite, not to build or install Automake. Ditto for C++, Fortran
dnl and Fortran 77 compilers. Unfortunately, autoconf does not offer an
-dnl easy way to obtain this behaviour, so we'll need a few hacks.
+dnl easy way to obtain this behavior, so we'll need a few hacks.
dnl We want the body of this macro to expand as a single shell statement,
dnl thus we wrap it into { ... } brackets.
diff --git a/contrib/checklinkx b/contrib/checklinkx
index 6be807f87..357bf4101 100755
--- a/contrib/checklinkx
+++ b/contrib/checklinkx
@@ -2879,7 +2879,7 @@ sub code_shown ($$)
sub links_summary (\%\%\%\%)
{
- # Advices to fix the problems
+ # Advice to fix the problems
my %todo = (
200 =>
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
index cf5e7b482..6e8db83d7 100644
--- a/doc/automake-history.texi
+++ b/doc/automake-history.texi
@@ -688,7 +688,7 @@ facing similar troubles, for similar reasons.
This release introduced versioned installation (@pxref{API Versioning, ,
API Versioning, automake, GNU Automake}). This was mainly pushed by
Havoc Pennington, taking the GNOME source tree as motive: due to
-incompatibilities between the autotools it's impossible for the GNOME
+incompatibility between the autotools it's impossible for the GNOME
packages to switch to Autoconf 2.53 and Automake 1.5 all at once, so
they are currently stuck with Autoconf 2.13 and Automake 1.4.
@@ -699,7 +699,7 @@ scheme implies maintaining a bug-fix branch in addition to
the
development trunk, which means more work from the maintainer, but
providing regular bug-fix releases proved to be really worthwhile.
-Like 1.5, 1.6 also introduced a bunch of incompatibilities, intentional or
+Like 1.5, 1.6 also introduced a bunch of incompatibility, intentional or
not. Perhaps the more annoying was the dependence on the newly
released Autoconf 2.53. Autoconf seemed to have stabilized enough
since its explosive 2.50 release and included changes required to fix
diff --git a/doc/automake.texi b/doc/automake.texi
index 4f7029fff..71304293c 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -364,7 +364,7 @@ Using the TAP test protocol
* Introduction to TAP::
* Use TAP with the Automake test harness::
-* Incompatibilities with other TAP parsers and drivers::
+* Incompatibility with other TAP parsers and drivers::
* Links and external resources on TAP::
Changing Automake's Behavior
@@ -997,7 +997,7 @@ by two hosts, but compilation and installation were done
separately on
each host.
The GNU Build System also supports networked setups where part of the
-installed files should be shared amongst multiple hosts. It does so
+installed files should be shared among multiple hosts. It does so
by distinguishing architecture-dependent files from
architecture-independent files, and providing two @file{Makefile}
targets to install each of these classes of files.
@@ -1213,7 +1213,7 @@ snapshot of all the files to be installed.
@end example
After this example, @code{amhello-1.0-i686.tar.gz} is ready to be
-uncompressed in @file{/} on many hosts. (Using @code{`cat ../files.lst`}
+decompressed in @file{/} on many hosts. (Using @code{`cat ../files.lst`}
instead of @samp{.} as argument for @command{tar} avoids entries for
each subdirectory in the archive: we would not like @command{tar} to
restore the modification time of @file{/}, @file{/usr/}, etc.)
@@ -3639,7 +3639,7 @@ Conversely to @file{dirlist}, @env{ACLOCAL_PATH} is
useful if you are
using a global copy of Automake and want @command{aclocal} to look for
macros somewhere under your home directory.
-@subsubheading Planned future incompatibilities
+@subsubheading Planned future incompatibility
The order in which the directories in the macro search path are currently
looked up is confusing and/or suboptimal in various aspects, and is
@@ -9200,7 +9200,7 @@ foo.1: foo.c $(top_srcdir)/configure.ac
This way, @file{foo.1} will not get rebuilt every time
@file{foo$(EXEEXT)} changes. The @command{make} call makes sure
-@file{foo$(EXEEXT)} is up-to-date before @command{help2man}.
+@file{foo$(EXEEXT)} is up-to-date before @command{help2man}.
Another step towards ensuring this would be to use separate
directories for binaries and man pages, and set @code{SUBDIRS} so that
@@ -9430,8 +9430,8 @@ wildly, and we'll attempt no precise definition.
@cindex test pass
@cindex test failure
A test is said to @emph{pass} when it can determine that the condition or
-behaviour it means to verify holds, and is said to @emph{fail} when it can
-determine that such condition of behaviour does @emph{not} hold.
+behavior it means to verify holds, and is said to @emph{fail} when it can
+determine that such condition of behavior does @emph{not} hold.
@cindex test skip
Sometimes, tests can rely on non-portable tools or prerequisites, or
@@ -9463,7 +9463,7 @@ special kind of failure called @emph{unexpected pass} (or
@emph{xpass}).
@cindex Distinction between errors and failures in testsuites
Many testing environments and frameworks distinguish between test failures
and hard errors. As we've seen, a test failure happens when some invariant
-or expected behaviour of the software under test is not met. A @emph{hard
+or expected behavior of the software under test is not met. A @emph{hard
error} happens when e.g., the set-up of a test case scenario fails, or when
some other unexpected or highly undesirable condition is encountered (for
example, the program under test experiences a segmentation fault).
@@ -9702,7 +9702,7 @@ serial harness (@pxref{Serial Test Harness}).
@cindex @option{serial-tests}, Using
First, note that today the use of this harness is strongly discouraged in
-favour of the parallel test harness (@pxref{Parallel Test Harness}).
+favor of the parallel test harness (@pxref{Parallel Test Harness}).
Still, there are a @emph{few} situations when the advantages offered by
the parallel harness are irrelevant, and when test concurrency can
even cause tricky problems. In those cases, it might make sense to
@@ -10180,7 +10180,7 @@ for this program.
Note that the exact semantics attached to the @option{--color-tests},
@option{--expect-failure} and @option{--enable-hard-errors} options are
-left up to the individual test drivers. Still, having a behaviour
+left up to the individual test drivers. Still, having a behavior
compatible or at least similar to that provided by the default driver
is advised, as that would offer a better consistency and a more pleasant
user experience.
@@ -10235,7 +10235,7 @@ test; the harness will ignore such extra text when
generating
If this field is present and defined to @code{no}, then the corresponding
test script will @emph{not} be run upon a @command{make recheck}. What
happens when two or more @code{:recheck:} fields are present in the same
-@file{.trs} file is undefined behaviour.
+@file{.trs} file is undefined behavior.
@c Keep in sync with 'test-metadata-global-log.sh'.
@item @code{:copy-in-global-log:}
@@ -10247,7 +10247,7 @@ of the @file{.log} file will @emph{not} be copied into
the global
it can be useful in debugging and analysis of bug report, it can also be
just a waste of space in normal situations, e.g., when a test script is
successful. What happens when two or more @code{:copy-in-global-log:}
-fields are present in the same @file{.trs} file is undefined behaviour.
+fields are present in the same @file{.trs} file is undefined behavior.
@c Keep in sync with 'test-metadata-global-result.sh'.
@item @code{:test-global-result:}
@@ -10261,7 +10261,7 @@ cases, 6 of which pass and 4 of which are skipped,
could reasonably have
a @code{PASS/SKIP} value for this field, while a test script which runs
19 successful tests and one failed test could have an @code{ALMOST
PASSED} value. What happens when two or more @code{:test-global-result:}
-fields are present in the same @file{.trs} file is undefined behaviour.
+fields are present in the same @file{.trs} file is undefined behavior.
@end table
@noindent
@@ -10314,7 +10314,7 @@ implementations' output might be a good idea too.
@menu
* Introduction to TAP::
* Use TAP with the Automake test harness::
-* Incompatibilities with other TAP parsers and drivers::
+* Incompatibility with other TAP parsers and drivers::
* Links and external resources on TAP::
@end menu
@@ -10479,11 +10479,11 @@ PASS: baz.test 1
exit status: 0
@end example
-@node Incompatibilities with other TAP parsers and drivers
-@subsection Incompatibilities with other TAP parsers and drivers
+@node Incompatibility with other TAP parsers and drivers
+@subsection Incompatibility with other TAP parsers and drivers
For implementation or historical reasons, the TAP driver and harness as
-implemented by Automake have some minor incompatibilities with the
+implemented by Automake have some minor compatibility issues with the
mainstream versions, which you should be aware of.
@itemize @bullet
@@ -10502,7 +10502,7 @@ allow this, so if you use it your diagnostic will be
lost to more
compliant tools like @command{prove} and @code{Test::Harness}
@item
And there are probably some other small and yet undiscovered
-incompatibilities, especially in corner cases or with rare usages.
+compatibility issues, especially in corner cases or with rare usages.
@end itemize
@node Links and external resources on TAP
@@ -12266,7 +12266,7 @@ package, regardless of the licensing you choose.
@chapter Automake API Versioning
New Automake releases usually include bug fixes and new features.
-Unfortunately they may also introduce new bugs and incompatibilities.
+Unfortunately they may also introduce new bugs and incompatibility.
This makes four reasons why a package may require a particular Automake
version.
@@ -12382,7 +12382,7 @@ missing @option{--force-missing}.
Before upgrading to a new major release, it is a good idea to read the
file @file{NEWS}. This file lists all changes between releases: new
-features, obsolete constructs, known incompatibilities, and
+features, obsolete constructs, known incompatibility, and
workarounds.
@node FAQ
@@ -12456,7 +12456,7 @@ of @file{configure}.
@cindex CVS and generated files
@cindex generated files and CVS
-There are basically two clans amongst maintainers: those who keep all
+There are basically two clans among maintainers: those who keep all
distributed files under CVS, including generated files, and those who
keep generated files @emph{out} of CVS.
@@ -12521,7 +12521,7 @@ touch doc/*.info
@item
In distributed development, developers are likely to have different
versions of the maintainer tools installed. In this case rebuilds
-triggered by timestamp lossage will lead to spurious changes
+triggered by clock skew will lead to spurious changes
to generated files. There are several solutions to this:
@itemize
@@ -12650,7 +12650,7 @@ The user can override the default setting by passing
either
to @command{configure}.
People use @code{AM_MAINTAINER_MODE} either because they do not want their
-users (or themselves) annoyed by timestamp lossage (@pxref{CVS}), or
+users (or themselves) annoyed by clock skew (@pxref{CVS}), or
because they simply can't stand the rebuild rules and prefer running
maintainer tools explicitly.
@@ -13785,7 +13785,7 @@ attach the @file{test-suite.log} file.
@c LocalWords: yylhs yylen yydefred yydgoto yysindex yyrindex yygindex yyname
@c LocalWords: yytable yycheck yyrule byacc CXXCOMPILE CXXLINK FLINK cfortran
@c LocalWords: Catalogue preprocessable FLIBS libfoo baz JAVACFLAGS java exe
-@c LocalWords: SunOS fying basenames exeext uninstalled oldinclude kr FSF's
+@c LocalWords: SunOS basenames exeext uninstalled oldinclude kr FSF's
@c LocalWords: pkginclude oldincludedir sysconf sharedstate localstate gcc rm
@c LocalWords: sysconfdir sharedstatedir localstatedir preexist CLEANFILES gz
@c LocalWords: depfile tmpdepfile depmode const interoperate
diff --git a/doc/local.mk b/doc/local.mk
index f3c208aed..cc4f21984 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -34,11 +34,11 @@ CLEANFILES += $(man1_MANS)
# In automake, users generate man pages as part of a normal build from
# release tarballs. This is ok because we also distribute the help2man
# script, as given below.
-#
+#
# Autoconf handles this in an alternative way, of including the man
# pages in the tarballs and thus not requiring help2man to be run by
# users (q.v.). Neither is better or worse than the other.
-#
+#
# See the "Errors with distclean" node in the manual for more info.
# XXX: The help2man script we include in the Automake distribution
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index bb0ae0bb0..e94bb8c6a 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -15,7 +15,7 @@
##################################################################
# The master copy of this file is in Automake's source repository.
-# Please send updates to automake-patches@gnu.org.
+# Please send updates to automake-patches@gnu.org.
##################################################################
package Automake::ChannelDefs;
@@ -451,8 +451,8 @@ sub merge_WARNINGS (@)
{
# The character class in the second match group is ASCII \S minus
# comma. We are generous with this because category values may come
- # from WARNINGS and we don't want to assume what other programs'
- # syntaxes for warnings categories are.
+ # from WARNINGS and we don't want to assume other programs'
+ # syntax for warnings categories.
/^(no-|)([\w\[\]\/\\!"#$%&'()*+-.:;<=>?@^`{|}~]+)$/
or die "Invalid warnings category: $_";
$warnings{$2} = $1;
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index de6020a6e..adb6b2224 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -15,7 +15,7 @@
##################################################################
# The master copy of this file is in Automake's source repository.
-# Please send updates to automake-patches@gnu.org.
+# Please send updates to automake-patches@gnu.org.
##################################################################
package Automake::Channels;
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 9c6893570..03460b427 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -313,7 +313,7 @@ sub true ($ )
Build a string which denotes the condition.
-For instance using the C<$cond> definition from L<SYNOPSYS>,
+For instance using the C<$cond> definition from L<SYNOPSIS>,
C<$cond-E<gt>string> will return C<"COND1_TRUE COND2_FALSE">.
=cut
@@ -341,7 +341,7 @@ sub string ($ )
Build a human readable string which denotes the condition.
-For instance using the C<$cond> definition from L<SYNOPSYS>,
+For instance using the C<$cond> definition from L<SYNOPSIS>,
C<$cond-E<gt>string> will return C<"COND1 and !COND2">.
=cut
@@ -382,7 +382,7 @@ sub human ($ )
Build a C<AC_SUBST>-style string for output in F<Makefile.in>.
-For instance using the C<$cond> definition from L<SYNOPSYS>,
+For instance using the C<$cond> definition from L<SYNOPSIS>,
C<$cond-E<gt>subst_string> will return C<"@COND1_TRUE@@COND2_FALSE@">.
=cut
@@ -411,7 +411,7 @@ sub subst_string ($ )
Return 1 iff C<$cond> is true when C<$when> is true.
Return 0 otherwise.
-Using the definitions from L<SYNOPSYS>, C<$cond> is true
+Using the definitions from L<SYNOPSIS>, C<$cond> is true
when C<$both> is true, but the converse is wrong.
=cut
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index 825848f4a..cedb33797 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -15,7 +15,7 @@
##################################################################
# The master copy of this file is in Automake's source repository.
-# Please send updates to automake-patches@gnu.org.
+# Please send updates to automake-patches@gnu.org.
##################################################################
package Automake::Configure_ac;
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 31c61048e..bc5b24a38 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -15,7 +15,7 @@
##################################################################
# The master copy of this file is in Automake's source repository.
-# Please send updates to automake-patches@gnu.org.
+# Please send updates to automake-patches@gnu.org.
##################################################################
package Automake::FileUtils;
diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index 8f6458ede..a20059940 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -15,7 +15,7 @@
##################################################################
# The master copy of this file is in Automake's source repository.
-# Please send updates to automake-patches@gnu.org.
+# Please send updates to automake-patches@gnu.org.
##################################################################
package Automake::Getopt;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 62dfa9b94..db1f6378d 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -333,7 +333,7 @@ sub variables (;$)
{
@vars = values %_variable_dict;
}
- # The behaviour of the 'sort' built-in is undefined in scalar
+ # The behavior of the 'sort' built-in is undefined in scalar
# context, hence we need an ad-hoc handling for such context.
return wantarray ? sort { $a->name cmp $b->name } @vars : scalar @vars;
}
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 81af13e38..fb191550b 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -17,7 +17,7 @@
##################################################################
# The master copy of this file is in Automake's source repository.
-# Please send updates to automake-patches@gnu.org.
+# Please send updates to automake-patches@gnu.org.
##################################################################
package Automake::XFile;
diff --git a/lib/am/check.am b/lib/am/check.am
index b6fa3aaad..a506d1c79 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -361,7 +361,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
##
-## Function to write some basic system info in the log.
+## Function to write some basic system info in the log.
output_system_information () \
{ \
## Omit the hostname for privacy. In practice it's a single word?
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index a9280d56a..98734d83e 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -75,7 +75,7 @@ am__make_running_with_option = \
## variable $(MFLAGS) behaves much better in that regard. So use it.
sane_makeflags=$$MFLAGS; \
else \
-## Non-GNU make: we must rely on $(MAKEFLAGS). This is tricker and more
+## Non-GNU make: we must rely on $(MAKEFLAGS). This is trickier and more
## brittle, but is the best we can do.
case $$MAKEFLAGS in \
## If we run "make TESTS='snooze nap'", FreeBSD make will export MAKEFLAGS
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index fc2165bcf..5ed189e20 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -43,7 +43,7 @@ if %?BASE%
test -z "$$list2" || { \
echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)'"; \
$(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
-## Note that we explicitly set the libtool mode. This avoids any lossage
+## Note that we explicitly set the libtool mode. This avoids problems
## if the program doesn't have a name that libtool expects.
## Use INSTALL and not INSTALL_DATA because libtool knows the right
## permissions to use.
@@ -69,7 +69,7 @@ else !%?BASE%
test "x$$dir" = x. || { \
echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
$(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
-## Note that we explicitly set the libtool mode. This avoids any lossage
+## Note that we explicitly set the libtool mode. This avoids problems
## if the program doesn't have a name that libtool expects.
## Use INSTALL and not INSTALL_DATA because libtool knows the right
## permissions to use.
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 8ce315202..d53ecd884 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -64,8 +64,8 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
test -z "$$files" || { \
?!LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(%NDIR%dir)$$dir'"; \
?!LIBTOOL? $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
-## Note that we explicitly set the libtool mode. This avoids any
-## lossage if the install program doesn't have a name that libtool
+## Note that we explicitly set the libtool mode. This avoids
+## problems if the install program doesn't have a name that libtool
## expects.
?LIBTOOL? echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(%NDIR%dir)$$dir'"; \
?LIBTOOL? $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
diff --git a/lib/depcomp b/lib/depcomp
index 2f1d24a2a..4ade06624 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-07.03; # UTC
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
@@ -129,7 +129,7 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed
's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
-# Avoid interferences from the environment.
+# Avoid interference from the environment.
gccflag= dashmflag=
# Some modes work just like other modes, but use different flags. We
diff --git a/lib/gendocs.sh b/lib/gendocs.sh
index 60447d4f5..b888de4f8 100755
--- a/lib/gendocs.sh
+++ b/lib/gendocs.sh
@@ -2,7 +2,7 @@
# gendocs.sh -- generate a GNU manual in many formats. This script is
# mentioned in maintain.texi. See the help message below for usage details.
-scriptversion=2024-01-27.16
+scriptversion=2024-06-07.07
# Copyright 2003-2024 Free Software Foundation, Inc.
#
@@ -437,7 +437,7 @@ d=`dirname $srcfile`
done
# if $MAKEINFO is recent enough, use --trace-includes on the
- # $srcfile to get the included files of the targetted manual only
+ # $srcfile to get the included files of the targeted manual only
base=`basename "$srcfile"`
cmd="$SETLANG $MAKEINFO $commonarg --trace-includes \"$base\""
diff --git a/lib/install-sh b/lib/install-sh
index 7c56c9c01..e0af0fe2f 100755
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-07.14; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -345,7 +345,7 @@ do
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directly in world-writable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
@@ -353,7 +353,7 @@ do
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
+ # Check for POSIX incompatibility with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
diff --git a/lib/missing b/lib/missing
index cd3da8249..303e65563 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU and other programs.
-scriptversion=2024-05-29.18; # UTC
+scriptversion=2024-06-07.14; # UTC
# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
@@ -56,7 +56,7 @@ Options:
-v, --version output version information and exit
Supported PROGRAM values:
-aclocal autoconf autogen autoheader autom4te automake autoreconf
+aclocal autoconf autogen autoheader autom4te automake autoreconf
bison flex help2man lex makeinfo perl yacc
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 69121683a..01d362fa5 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -124,7 +124,7 @@ fi
# problems with Korn shells. Some Korn shells are known to propagate
# to themselves signals that have killed a child process they were
# waiting for; this is done at least for SIGINT (and usually only for
- # it, in truth). Without the `trap' below, such a behaviour could
+ # it, in truth). Without the `trap' below, such a behavior could
# cause a premature exit in the current subshell, e.g., in case the
# test command it runs gets terminated by a SIGINT. Thus, the awk
# script we are piping into would never seen the exit status it
@@ -462,7 +462,7 @@ function get_test_exit_message(status)
# We used to report an "abnormal termination" here, but some Korn
# shells, when a child process die due to signal number n, can leave
# in $? an exit status of 256+n instead of the more standard 128+n.
- # Apparently, both behaviours are allowed by POSIX (2008), so be
+ # Apparently, both behaviors are allowed by POSIX (2008), so be
# prepared to handle them both. See also Austin Group report ID
# 0000051 <http://www.austingroupbugs.net/view.php?id=51>
exit_details = sprintf(" (terminated by signal %d?)", status - 256)
@@ -578,7 +578,7 @@ while (1)
# Older versions of prove and TAP::Harness (e.g., 3.17) did not
# recognize a "Bail out!" directive when preceded by leading
# whitespace, but more modern versions (e.g., 3.23) do. So we
- # emulate the latter, "more modern" behaviour.
+ # emulate the latter, "more modern" behavior.
else if ($0 ~ /^[ \t]*Bail out!/)
{
bailed_out = 1
diff --git a/m4/depend.m4 b/m4/depend.m4
index 9ab9b2965..49f6d493b 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -131,7 +131,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index 4dd09cb36..640f7c0fa 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -1,6 +1,6 @@
## ----------------------------------- ## -*- Autoconf -*-
## Check if --with-dmalloc was given. ##
-## From Franc,ois Pinard ##
+## From François Pinard ##
## ----------------------------------- ##
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index 4504ef878..09489ffaa 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -94,7 +94,7 @@ for am_try_res in $am_try_resolutions; do
# It can happen that everything else supports the subsecond mtimes,
# but make doesn't, notably on macOS, which ships make 3.81 from
# 2006 (the last one released under GPLv2). https://bugs.gnu.org/68808
- #
+ #
# So, first let's create a Makefile:
rm -f conftest.mk
echo 'conftest.ts1: conftest.ts2' >conftest.mk
@@ -105,7 +105,7 @@ for am_try_res in $am_try_resolutions; do
# should touch ts1 because ts2 is newer. This could happen by luck,
# but most often, it will fail if make's support is insufficient. So
# test for several consecutive successes.
- #
+ #
# (We reuse conftest.ts[12] because we still want to modify existing
# files, not create new ones, per above.)
n=0
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index e10f9fd2a..4b8d44aa6 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -503,7 +503,7 @@ files_without_copyright += lib/mkinstalldirs
# This script has an MIT-style license
files_without_copyright += lib/install-sh
-# The UPDATE_COPYRIGHT_YEAR environment variable is honoured by the
+# The UPDATE_COPYRIGHT_YEAR environment variable is honored by the
# 'lib/update-copyright' script.
.PHONY: update-copyright
update-copyright:
diff --git a/old/ChangeLog.00 b/old/ChangeLog.00
index 4ef641002..f25536ea5 100644
--- a/old/ChangeLog.00
+++ b/old/ChangeLog.00
@@ -1158,13 +1158,13 @@
* m4/multi.m4: Added missing `]'. From Akim Demaille.
- * Makefile.am (path-check): Make sure distdir is writeable before
+ * Makefile.am (path-check): Make sure distdir is writable before
removing it.
* automake.in (handle_texinfo): Added `cm' and `ov' extensions.
- (handle_dist_worker): Make sure distdir is writeable before
+ (handle_dist_worker): Make sure distdir is writable before
removing it.
(initialize_global_constants [$dist_trailer]): Make sure distdir
- is writeable before removing it.
+ is writable before removing it.
* dist.am (distcheck): Make the new source tree read-only before
compiling. Idea from Karl Berry.
diff --git a/old/ChangeLog.03 b/old/ChangeLog.03
index a72e799fa..6f4179852 100644
--- a/old/ChangeLog.03
+++ b/old/ChangeLog.03
@@ -558,7 +558,7 @@
* lib/Makefile.am (dist_script_DATA): Move config-ml.in ...
(dist_pkgvdata_DATA): ... here.
- * tests/spy.test: Document overlapping ::-rules incompatibilities,
+ * tests/spy.test: Document overlapping ::-rules incompatibility,
and check only non-overlapping ::-rules.
* doc/automake.texi (Texinfo): Define MAKEINFO, MAKEINFOHTML,
@@ -2338,7 +2338,7 @@
2003-04-03 Alexandre Duret-Lutz <adl@gnu.org>
* automake.in (check_trailing_slash): New function (variation on
- a patch by Peter Muir). Diagnose whitespaces following trailing
+ a patch by Peter Muir). Diagnose whitespace following trailing
backslash.
(read_am_file): Use it.
* tests/backsl4.test: New file.
diff --git a/old/ChangeLog.09 b/old/ChangeLog.09
index 4c318b63e..b9c55fe01 100644
--- a/old/ChangeLog.09
+++ b/old/ChangeLog.09
@@ -458,7 +458,7 @@
2009-09-06 Stefano Lattarini <stefano.lattarini@gmail.com> (tiny change)
- tests/README: warn about zsh incompatibilities.
+ tests/README: warn about zsh incompatibility.
* tests/README (User interface, Getting details from failures):
Explicitly state that every test is a "shell script", not just
a "script", and that it's run by `/bin/sh' by default.
@@ -2085,7 +2085,7 @@
Fix portability issues in distcleancheck_listfiles doc example.
* doc/automake.texi (Dist): In the `distcleancheck_listfiles'
code example, add `.' path, for Solaris `find', also rewrite so
- `{}' appears only once and as separate argument, for Posix.
+ `{}' appears only once and as separate argument, for POSIX.
* tests/distcleancheck.test: New test.
* tests/Makefile.am: Update.
* THANKS: Update.
@@ -4088,7 +4088,7 @@
* automake.in (%_macro_for_cond): New variable.
(cond_stack_if): Use it for better error message about
missing dependency tracking conditionals.
- * tests/asm2.test: New test, modelled after asm.test.
+ * tests/asm2.test: New test, modeled after asm.test.
* tests/Makefile.am: Adjust.
Report by Ralf Corsepius.
@@ -4522,9 +4522,9 @@
Don't use 'path' to talk about file names,
as per GNU coding standards. Close a race condition reported by Ralf
Wildenhues and Stepan Kasal. There is still a race condition
- on hosts that predate Posix 1003.1-1992, but we can't help this.
- Don't mishandle weird characters like space on pre-Posix hosts.
- Invoke mkdir at most once per dir arg on pre-Posix hosts.
+ on hosts that predate POSIX 1003.1-1992, but we can't help this.
+ Don't mishandle weird characters like space on pre-POSIX hosts.
+ Invoke mkdir at most once per dir arg on pre-POSIX hosts.
2006-05-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -4856,7 +4856,7 @@
2006-01-12 Paul Eggert <eggert@cs.ucla.edu>
* lib/install-sh (dstdir): Don't use semicolons inside { } in
- sed scripts, as Posix says it's not portable.
+ sed scripts, as POSIX says it's not portable.
* lib/missing (file): Likewise.
* lib/am/distdir.am (distcheck): Likewise.
* tests/comment7.test, tests/comment9.test, tests/confh.test: Likewise
@@ -5387,7 +5387,7 @@
* tests/pr401.test, tests/pr401b.test, tests/pr401c.test: New tests.
* tests/Makefile.am (TESTS): Add them.
* doc/automake.texi (Optional) <AC_CONFIG_LIBOBJ_DIR>: Document.
- (LIBOBJS): Document changes in behaviour of
+ (LIBOBJS): Document changes in behavior of
LIBOBJS, ALLOCA, LTLIBOBJS & LTALLOCA in the presence of
subdir-objects and an invocation of AC_CONFIG_LIBOBJ_DIR.
diff --git a/old/ChangeLog.11 b/old/ChangeLog.11
index 7aa45e115..78c04e026 100644
--- a/old/ChangeLog.11
+++ b/old/ChangeLog.11
@@ -114,14 +114,14 @@
was better to do so only for directories specified with a
relative path.
- The rationale for this latter behaviour was that, before the
+ The rationale for this latter behavior was that, before the
existence of the `ACLOCAL_PATH' variable, the only way (a poor
way, I might add) for a common user to extend the search path
of a system-wide installation of aclocal was to export something
like ACLOCAL="aclocal -I /my/extra/macros" in the environment.
Today, the correct way to proceed is undoubtedly through the
use of ACLOCAL_PATH, so we can settle the question once and for
- all, and start verifying the correct behaviour of `-I' with a
+ all, and start verifying the correct behavior of `-I' with a
new test.
* tests/aclocal-install-absdir.test: New test.
@@ -386,7 +386,7 @@
$ echo status = $?
status = 1
- We need to work around this misbehaviour in a couple of our
+ We need to work around this misbehavior in a couple of our
tests (whose failures where causing cascading failures in a
lot of other tests).
@@ -543,7 +543,7 @@
tests was usually skipped on testsuite runs "in the wild", thus
needlessly reducing coverage.
- Second, the older testsuite behaviour made more difficult for
+ Second, the older testsuite behavior made more difficult for
the developers to run the testsuite with non-default libtool or
gettext. For example, assume the developer is working on a system
that has a default libtool version 1.5 installed in the /usr/local
@@ -905,7 +905,7 @@
memory requirement on any client that wants to decompress your
tar.xz file.
People have complained that a tarball compressed with -9 cannot
- be uncompressed in a low-memory environment (wrt-based embedded).
+ be decompressed in a low-memory environment (wrt-based embedded).
Hence, instead of defaulting to -9, which is useful only for very
large tarballs, it defaults to -e (equivalent to -6e). This
limits the default memory requirements imposed on decompressors,
@@ -945,7 +945,7 @@
proceeds with the configuration process -- only for the build to
possibly fail later, at make time.
- This behaviour is intended; the Autoconf manual reads:
+ This behavior is intended; the Autoconf manual reads:
``You are encouraged to use Flex in your sources, since it is
both more pleasant to use than plain Lex and the C source it
produces is portable. In order to ensure portability, however,
@@ -953,7 +953,7 @@
it (e.g., your scanner has no `#include'-like feature), simply
include a `%noyywrap' statement in the scanner's source.''
- This AC_PROG_LEX behaviour is causing some spurious failures of
+ This AC_PROG_LEX behavior is causing some spurious failures of
the Automake testsuite in environments which lack a proper library
providing `yywrap' (this happens for example on Fedora-based
systems). The proper workaround is to simply provide a fall-back
@@ -1485,12 +1485,12 @@
This change fixes automake bug#9773. See also Debian Bug#543992.
* lib/am/texinfos.am: Don't look anymore at the output of
`install-info --version' to decide whether to use it to update
- the `${infodir}/dir' or not; instead, honour the environment
+ the `${infodir}/dir' or not; instead, honor the environment
variable `AM_UPDATE_INFO_DIR'.
* tests/install-info-dir.test: New test.
* tests/Makefile.am (TESTS): Add it.
* tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted
- interferences from the environment.
+ interference from the environment.
* doc/automake.texi (Texinfo): Update.
* NEWS: Likewise.
* THANKS: Likewise.
@@ -1644,7 +1644,7 @@
proceeds with the configuration process -- only for the build to
possibly fail later, at make time.
- This behaviour is intended; the Autoconf manual reads:
+ This behavior is intended; the Autoconf manual reads:
``You are encouraged to use Flex in your sources, since it is
both more pleasant to use than plain Lex and the C source it
produces is portable. In order to ensure portability, however,
@@ -1652,7 +1652,7 @@
it (e.g., your scanner has no `#include'-like feature), simply
include a `%noyywrap' statement in the scanner's source.''
- This AC_PROG_LEX behaviour is causing some spurious failures of
+ This AC_PROG_LEX behavior is causing some spurious failures of
the Automake testsuite in environments which lack a proper library
providing `yywrap' (this happens for example on Fedora-based
systems). The proper workaround is to simply provide a fall-back
@@ -2116,7 +2116,7 @@
2011-09-28 Stefano Lattarini <stefano.lattarini@gmail.com>
- tap/awk: account for unusual korn shell signal handling behaviour
+ tap/awk: account for unusual korn shell signal handling behavior
This change has been motivated by a testsuite failure on Debian
with the AT&T Korn Shell version 93u-1.
* lib/tap-driver.sh: Temporarily ignore some common signals when
@@ -2130,12 +2130,12 @@
tap/awk: handle exit statuses > 256 (seen on few korn shells)
Some Korn shells, when a child process die due to signal number
n, can leave in $? an exit status of 256+n instead of the more
- standard 128+n. Apparently, both behaviours are allowed by
+ standard 128+n. Apparently, both behaviors are allowed by
POSIX, so be prepared to handle them both.
This change has been motivated by a testsuite failure on Debian
with the AT&T Korn Shell version 93u-1.
* lib/tap-driver.sh (get_test_exit_message): Handle the described
- Korn Shell behaviour too.
+ Korn Shell behavior too.
($scriptversion): Update.
2011-09-28 Stefano Lattarini <stefano.lattarini@gmail.com>
@@ -2390,7 +2390,7 @@
2011-09-13 Stefano Lattarini <stefano.lattarini@gmail.com>
- test defs: work around weird ksh behaviour w.r.t. signal handling
+ test defs: work around weird ksh behavior w.r.t. signal handling
* tests/defs (is_blocked_signal): Use perl to determine whether a
signal is trapped, since trying to do it portably within the shell
means opening a nasty can of worms.
@@ -3196,7 +3196,7 @@
testsuite: different test scripts cannot share the same basename
If two test scripts have the same basename, they will end up
sharing the same log file, leading to all sort of undefined and
- undesired behaviours. Add a Makefile check verifying that this
+ undesired behaviors. Add a Makefile check verifying that this
is not the case.
* tests/test-logs-repeated.test: New test, verifying previously
unspecified semantics (in the definition of $(TEST_LOGS) from
@@ -3294,7 +3294,7 @@
e.g. syntax or I/O errors) to the log files instead that to the
console.
* tests/tap-driver-stderr.test: New test, verifying the improved
- driver behaviour. Notice that this test still fails when using
+ driver behavior. Notice that this test still fails when using
the perl implementation of the TAP driver.
* tests/Makefile.am (tap_other_tests): Update.
@@ -3451,7 +3451,7 @@
coverage: a TAP result numbered "0" is always out-of-order
* tests/tap-test-number-0.test: New, checks that a test result
numbered as 0 is to be considered out-of-order; this is
- consistent with the behaviour of the `prove' utility.
+ consistent with the behavior of the `prove' utility.
* tests/Makefile.am (tap_with_common_setup_tests): Update.
2011-08-20 Stefano Lattarini <stefano.lattarini@gmail.com>
@@ -3494,7 +3494,7 @@
`configure.in'.
* tests/vpath.test: Make grepping of generated `Makefile.in'
slightly stricter. Prefer trailing `:' over trailing `Exit 0'.
- * tests/suffix6c.test: Unset OBJEXT to avoid interferences from
+ * tests/suffix6c.test: Unset OBJEXT to avoid interference from
the environment.
* tests/suffix12.test: Do not whitespace-indent `##' comments
when they are embedded in a makefile rule: having them indented
@@ -3727,14 +3727,14 @@
2011-08-12 Stefano Lattarini <stefano.lattarini@gmail.com>
coverage: TAP diagnostics after "Bail out!" aren't reported
- This is compatible with the behaviour of the `prove' utility.
+ This is compatible with the behavior of the `prove' utility.
* tests/tap-bailout-suppress-later-diagnostic.test: New test.
* tests/Makefile.am (tap_with_common_setup_tests): Update.
2011-08-12 Stefano Lattarini <stefano.lattarini@gmail.com>
coverage: TAP errors after a "Bail out!" directive aren't reported
- This is compatible with the behaviour of the `prove' utility.
+ This is compatible with the behavior of the `prove' utility.
* tests/tap-bailout-suppress-later-errors.test: New test.
* tests/tap-bailout-badexit.test: Renamed ...
* tests/tap-bailout-suppress-badexit.test: ... to this, for
@@ -3786,7 +3786,7 @@
2011-08-12 Stefano Lattarini <stefano.lattarini@gmail.com>
tap: non-zero exit status after "Bail out!" should not be reported
- This new behaviour is more consistent with that of the `prove'
+ This new behavior is more consistent with that of the `prove'
utility. Also, experience with the use of TAP in the Automake's
own test suite has shown that reporting non-zero exit status from
a script after it has issued a "Bail out!" directive is mostly
@@ -3801,7 +3801,7 @@
2011-08-11 Stefano Lattarini <stefano.lattarini@gmail.com>
tap: a "plan with SKIP" after test results is an error
- This new behaviour is both more natural and more consistent with
+ This new behavior is both more natural and more consistent with
that of the `prove' utility.
* lib/tap-driver (handle_tap_plan): Do not stop TAP parsing when
a "plan with SKIP" line (e.g., "1..0 # SKIP") is encountered, and
@@ -4282,7 +4282,7 @@
ok 1
was considered to be an error, diagnosed with a message "test
plan in middle of output"; as effect of the current change, such
- input is now valid. This is more consistent with the behaviour
+ input is now valid. This is more consistent with the behavior
of the `prove' utility.
* lib/tap-driver ($lineno): Removed, no more needed.
($tap_stopped): New global variable.
@@ -4470,7 +4470,7 @@
tap: fix whitespace munging of diagnostic messages
* lib/tap-driver (extract_tap_comment): Pass the `g' flag to the
- substitution operator, to strip also trailing whitespaces. Fixes
+ substitution operator, to strip also trailing whitespace. Fixes
a failure in test `tap-whitespace-normalization.test'.
2011-08-06 Stefano Lattarini <stefano.lattarini@gmail.com>
@@ -5149,7 +5149,7 @@
format of the `.log' files. Note that this change makes the
`:end-metadata:' field obsolete.
* doc/automake.texi (Parallel Test Harness, Log files generation
- and test results recording): Document the new APIs and behaviour;
+ and test results recording): Document the new APIs and behavior;
some related minor rewordings and fixlets.
* NEWS: Update.
* automake.in (handle_tests): When bringing in the content of
@@ -5304,7 +5304,7 @@
* tests/parallel-tests-fd-redirect.test: Likewise.
* tests/parallel-tests-am_tests_environment.test: Remove checks
about the use of redirections in AM_TESTS_ENVIRONMENT: they would
- check deprecated (if not undefined) behaviour now. Strengthen a
+ check deprecated (if not undefined) behavior now. Strengthen a
couple of still valid checks, to keep the test more in sync with
the documentation. Improve debugging information.
* tests/Makefile.am (TESTS): Update.
@@ -5569,7 +5569,7 @@
moved into the manual.
(recheck, recheck-html): Minor adjustments to better conform to the
documentation (this should cause no semantic changes w.r.t. the
- former behaviour); minor improvements and extensions to existing
+ former behavior); minor improvements and extensions to existing
comments.
* tests/test-driver-create-log-dir.test: New test.
* tests/test-driver-strip-vpath.test: Likewise.
@@ -6119,7 +6119,7 @@
define (in the top-level Makefile.am) extra flags to be passed
to configure at "make distcheck" time; DISTCHECK_CONFIGURE_FLAGS
should be reserved for the user. Add proper `@vindex' directive.
- Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honoured in a
+ Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honored in a
subpackage Makefile.am, but the flags in it are passed down to
the configure script of the subpackage.
* lib/am/distdir.am (distcheck): Also pass the flags in
@@ -6761,13 +6761,13 @@
2011-05-29 Stefano Lattarini <stefano.lattarini@gmail.com>
- automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
+ automake, aclocal: honor configure-time AUTOCONF and AUTOM4TE
Currently, the Automake's own configure script allow definition
of AUTOCONF and AUTOM4TE, expected to point respectively to an
autoconf and autom4te programs. But while these definitions are
- honoured in the Automake's build systems and test suite, they
- were *not* honoured in the generated `automake' and `aclocal'
- scripts. This behaviour, apart from being wrong in that it does
+ honored in the Automake's build systems and test suite, they
+ were *not* honored in the generated `automake' and `aclocal'
+ scripts. This behavior, apart from being wrong in that it does
not allow the user enough freedom in choosing his tools, also
caused inconsistencies in the test suite, brining to spurious
failures.
@@ -6784,7 +6784,7 @@
build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
Our build system allows the user to override AUTOCONF and AUTOHEADER
- at configure time, and honours these overrides in our testsuite.
+ at configure time, and honors these overrides in our testsuite.
But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE.
This change fixes that inconsistency.
* configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New
@@ -6956,7 +6956,7 @@
fail, configure declares that no lex library is needed, and simply
proceeds with the configuration process -- only for the build to
possibly fail later, at make time.
- This behaviour might be (partly) intended; the Autoconf manual
+ This behavior might be (partly) intended; the Autoconf manual
reads:
``You are encouraged to use Flex in your sources, since it is
both more pleasant to use than plain Lex and the C source
@@ -6965,7 +6965,7 @@
you don't use it (e.g., your scanner has no `#include'-like
feature), simply include a `%noyywrap' statement in the
scanner's source.''
- This AC_PROG_LEX behaviour is causing some spurious failures of the
+ This AC_PROG_LEX behavior is causing some spurious failures of the
Automake testsuite in environments which lack a proper library
providing `yywrap' (this happens for example in Linux->MinGW cross
compilations). But at this point is clear that a proper workaround
@@ -7208,7 +7208,7 @@
is passed to the exit trap. Indeed, this happens in practice, as
an autoconf-generated configure script can exit with status `77'
if it fails to find, e.g., a required compiler.
- While this behaviour is quite useful for avoiding spurious test
+ While this behavior is quite useful for avoiding spurious test
failures in the wild, it can also sometimes prevent the Automake
developers to easily see and declare the requirements of their
tests.
@@ -7342,7 +7342,7 @@
* tests/gen-parallel-tests: Do not generate "siblings" for tests
that explicitly define the `parallel_tests', whether to "yes" or
to any other value. Extend heading comments to give a rationale
- for this behaviour.
+ for this behavior.
* tests/README: Update.
2011-05-20 Stefano Lattarini <stefano.lattarini@gmail.com>
@@ -7484,7 +7484,7 @@
depmod tests: fix bug in depmodes list extraction
* tests/depmod-tests.sh (get_depmodes): Use `echo $all_depmodes'
- instead of `... | tr "$nl" "$sp"' to strip extra whitespaces and
+ instead of `... | tr "$nl" "$sp"' to strip extra whitespace and
newlines from `$all_depmodes'. The latter idiom with `tr' is
wrong since it gets run before `./defs' is sourced, and thus `$nl'
and `$sp' are undefined.
@@ -8116,7 +8116,7 @@
testsuite: more environment sanitization
* tests/defs.in: Sanity check: abort if any of `parallel_tests'
or `required' is in the environment.
- ($sed_unindent_prog): Initialize to empty, to avoid interferences
+ ($sed_unindent_prog): Initialize to empty, to avoid interference
from the environment.
* tests/self-check-me-in-env.test: Renamed to ...
* tests/self-check-env-sanitize.test: ... this, and extended.
@@ -8411,13 +8411,13 @@
yacc: update NEWS and docs about yacc-generated headers extensions
* doc/automake.texi (Yacc and Lex): Document explicitly that
- extensions of yacc-generated headers are modelled after the
+ extensions of yacc-generated headers are modeled after the
extension of the corresponding sources.
* NEWS: Update.
2011-01-28 Stefano Lattarini <stefano.lattarini@gmail.com>
- yacc: extension of headers modelled after extension of sources
+ yacc: extension of headers modeled after extension of sources
With this change, if '-d' is in *YFLAGS, a yacc input file named
foo.y++ will cause a foo.h++ header to be generated, instead of a
foo.h header. Similarly for foo.ypp, foo.yxx and foo.yy.
@@ -8428,7 +8428,7 @@
* lib/am/yacc.am (am__yacc_c2h): New internal variable.
(?GENERIC?%EXT%%DERIVED-EXT%, ?!GENERIC?%OBJ%): Get the name of
the header dynamically at make runtime, so that its extension is
- modelled after the extension of the source.
+ modeled after the extension of the source.
* automake.in (lang_yacc_target_hook): Adjust the calculation of
`$header' accordingly.
* tests/yacc-cxx.test: New test.
@@ -9701,7 +9701,7 @@
* tests/txinfo4.test: Escape literal dots in grep regexps. Add
trailing `:' command.
* tests/txinfo29.test: Likewise. Relax grepping of generated
- Makefile.in w.r.t. whitespaces. Prefer `cat' over `echo' to
+ Makefile.in w.r.t. whitespace. Prefer `cat' over `echo' to
append to configure.in.
* tests/txinfo3.test: Likewise.
* tests/vtexi.test: Improve grepping of Makefile.in (sometimes
@@ -9832,8 +9832,8 @@
2011-01-09 Stefano Lattarini <stefano.lattarini@gmail.com>
- cosmetics: remove trailing whitespaces
- * doc/automake.texi: Remove trailing whitespaces.
+ cosmetics: remove trailing whitespace
+ * doc/automake.texi: Remove trailing whitespace.
* tests/cond13.test: Likewise.
* tests/cond14.test: Likewise.
* tests/fort4.test: Likewise.
@@ -10538,7 +10538,7 @@
* tests/specflg3.test: Enable `errexit' shell flag, with related
changes. Avoid unportable use of `-e' option of fgrep. Prefer
trailing `:' over trailing `Exit 0'. Remove extra empty lines,
- and cosmetic changes to whitespaces.
+ and cosmetic changes to whitespace.
* tests/obsolete.test: Enable `errexit' shell flag, with related
changes. Improve verbosity. Other miscellaneous changes.
@@ -11112,7 +11112,7 @@
Improve tests `help*.test' (also fixes maintcheck failures).
* tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
flags stripped away rather than hard-coded `automake-$APIVERSION',
- to better honour user-overrides. Similarly for aclocal.
+ to better honor user-overrides. Similarly for aclocal.
* tests/help2.test: Likewise.
* tests/help3.test: Likewise.
* tests/help4.test: Likewise.
@@ -11410,7 +11410,7 @@
* NEWS: Update.
Report by Bob Friesenhahn.
- Posix 2008 requires make to set errexit.
+ POSIX 2008 requires make to set errexit.
* lib/am/check.am: Update comment.
2010-09-06 Stefano Lattarini <stefano.lattarini@gmail.com>
@@ -12136,7 +12136,7 @@
* tests/obsolete.test: Add a comment explaining why we need
an indirection in adding $AUTOUPDATE to $required.
- Normalize whitespaces in 'tests/Makefile.am'.
+ Normalize whitespace in 'tests/Makefile.am'.
* tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
definition of this variable.
@@ -12935,7 +12935,7 @@
* tests/parallel-tests10.test: Likewise.
* tests/README (Section "Writing Test Cases" subsection "Do"):
Adjusted the parts referring to tests checking `parallel-tests'
- behaviour. Some other minor related improvements.
+ behavior. Some other minor related improvements.
* tests/.gitignore (defs-p): Removed.
2010-03-04 Stefano Lattarini <stefano.lattarini@gmail.com>
diff --git a/old/ChangeLog.96 b/old/ChangeLog.96
index e35af62a9..20a917794 100644
--- a/old/ChangeLog.96
+++ b/old/ChangeLog.96
@@ -1207,7 +1207,7 @@ Mon Aug 5 00:12:45 1996 Tom Tromey
<tromey@creche.cygnus.com>
(handle_texinfo): Don't generate `.info-[0-9]' as a filename.
* texinfos.am (.texi.info): Force .info file to be built in
- srcdir. From Franc,ois Pinard.
+ srcdir. From François Pinard.
From Jim Meyering:
* m4/AM_PROG_CC_STDC.m4: (fp_PROG_CC_STDC): Include sys/stat.h in
@@ -2621,7 +2621,7 @@ Sun Dec 10 11:59:33 1995 Tom Tromey
<tromey@cambric.colorado.edu>
* Makefile.am (cvs-dist): Don't release unless NEWS updated.
Ensure 'checks' pass before release.
(maintainer-check): Renamed. Look in $(srcdir) for sources. From
- Franc,ois Pinard.
+ François Pinard.
(cvs-dist): Depend on maintainer-check instead of explicitly
running check.
diff --git a/old/TODO b/old/TODO
index 0d00320d6..f45875fbf 100644
--- a/old/TODO
+++ b/old/TODO
@@ -217,7 +217,7 @@ corresponding `.y' file.]
Jim's idea: should look for @setfilename and warn if filenames too long
* guess split size
-from joerg-martin schwarz:
+from Joerg-Martin Schwarz:
-- If Makefile.am contains $(CC), $(COMPILE), $(YLWRAP), ....
in an explicitly written rule, you should emit the corresponding
Makefile variables automatically.
@@ -254,7 +254,7 @@ djm wants ``LINKS'' variable; list of things to link
together after
install. In BSD environment, use:
LINKS = from1 to1 from2 to2 ...
-Need way to say there are no suffixes in a Makefile (Franc,ois'
+Need way to say there are no suffixes in a Makefile (François'
"override" idea suffices here)
Check to make sure various scripts are executable (IE when looking for
diff --git a/t/README b/t/README
index 4772c0be2..d9eb9f136 100644
--- a/t/README
+++ b/t/README
@@ -97,7 +97,7 @@ Supported shells
The test scripts are written with portability in mind, and should run
with any decent POSIX shell. However, it is worth nothing that older
- versions of Zsh (pre-4.3) exhibited several bugs and incompatibilities
+ versions of Zsh (pre-4.3) exhibited several bugs and compatibility issues
with our uses, and are thus not supported for running Automake's test
scripts.
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index 16f8dfef5..b7a91fa3c 100644
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test for various older bugs related to quoting, escaping and
-# line breaking in the use of AC_OUTPUT. Synthesised by a bunch
+# line breaking in the use of AC_OUTPUT. Synthesized by a bunch
# of older tests (referenced below).
. test-init.sh
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
index 313c79258..6d21aabd3 100644
--- a/t/ar-lib5b.sh
+++ b/t/ar-lib5b.sh
@@ -66,7 +66,7 @@ case " $* " in
# configure tests.
*' -OUT:'*) exit 0;;
# This means that $* looks like a command-line for 'ar'. We have to
- # exit with failure here, to accommodate the two following ortoghonal
+ # exit with failure here, to accommodate the two following orthogonal
# scenarios:
# 1. when 'lib' is tested by configure, this will tell that it does
# not use the ar(1) interface, so that the 'ar-lib' script will
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index ea538a82e..fef9f83b3 100644
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
@@ -16,8 +16,8 @@
# Check that 'aclocal.m4' is not automatically distributed if not
# required to build 'configure'. This is *really* a corner-case
-# check, and the behaviour it checks is not documented either, so
-# if that behaviour is deliberately changed in the future, just
+# check, and the behavior it checks is not documented either, so
+# if that behavior is deliberately changed in the future, just
# remove this test.
# Related to automake bug#7819.
diff --git a/t/autodist-config-headers.sh b/t/autodist-config-headers.sh
index 84d4675c5..fb2427228 100644
--- a/t/autodist-config-headers.sh
+++ b/t/autodist-config-headers.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Check that config.h.bot and config.h.top are automatically
-# distributed if the AC_CONFIG_HADERS macro is used and they
+# distributed if the AC_CONFIG_HEADERS macro is used and they
# exist at automake runtime.
# Related to automake bug#7819.
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index d61fd6662..4c83ebe3f 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -188,7 +188,7 @@ run_make ()
am__make_redirect_stdall=no
am__make_flags=
am__make_rc_exp=0
- # Follow-up code might want to analyse this, so mark is as
+ # Follow-up code might want to analyze this, so mark it as
# publicly accessible (no double undesrscore).
am_make_rc=0
# Parse options for this function.
@@ -425,7 +425,7 @@ using_gmake ()
fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";;
esac
}
-am__using_gmake="" # Avoid interferences from the environment.
+am__using_gmake="" # Avoid interference from the environment.
# make_can_chain_suffix_rules
# ---------------------------
@@ -461,7 +461,7 @@ END
*) fatal_ "make_can_chain_suffix_rules: internal error";;
esac
}
-am__can_chain_suffix_rules="" # Avoid interferences from the environment.
+am__can_chain_suffix_rules="" # Avoid interference from the environment.
# useless_vpath_rebuild
# ---------------------
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index 43ed0c0f2..da34f7083 100644
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Check dependency tracking in various flavours.
+# Check dependency tracking in various flavors.
# Contains both libtool and non-libtool case.
# Sourced by the various (autogenerated) 'depcomp*.tap' tests.
# Examples of reported failures that motivated those test are
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
index 25b542def..50e116972 100644
--- a/t/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
@@ -148,7 +148,7 @@ result_ ()
set -x # Restore shell xtraces.
}
-# Shorthands for common usages of 'result_'.
+# Shorthand for common usages of 'result_'.
ok_ () { result_ 'ok' ${1+"$@"}; }
not_ok_ () { result_ 'not ok' ${1+"$@"}; }
skip_ () { result_ 'ok' -D SKIP ${1+"$@"}; }
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 275cfb2dc..61a88110e 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -222,7 +222,7 @@ esac
# for this whole subsecond-mtime problem. With this set to "sleep 1",
# there were still random parallelization failures; setting
# am_cv_sleep_fractional_seconds=false as above was still needed.
-#
+#
sleep="sleep $MTIME_RESOLUTION"
# An old timestamp that can be given to a file, in "touch -t" format.
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 7378bc789..c616bf116 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -35,7 +35,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null
2>&1; then
NULLCMD=:
setopt NO_GLOB_SUBST
# If Zsh is not started directly in POSIX-compatibility mode, it has some
- # incompatibilities in the handling of $0 that conflict with our usage;
+ # incompatibility in the handling of $0 that conflict with our usage;
# i.e., $0 inside a file sourced with the '.' builtin is temporarily set
# to the name of the sourced file. Work around that.
# Note that a bug in some versions of Zsh prevents us from resetting $0
@@ -95,7 +95,7 @@ _am_exit ()
# Extra escaping to ensure we do not call our 'exit' alias.
(\exit $1); \exit $1
}
-# Avoid interferences from the environment
+# Avoid interference from the environment
am__test_skipped=no
# This alias must actually be placed before any use if 'exit' -- even
# just inside a function definition. Weird, but real.
@@ -249,7 +249,7 @@ unindent ()
fi
sed "$sed_unindent_prog" ${1+"$@"}
}
-sed_unindent_prog="" # Avoid interferences from the environment.
+sed_unindent_prog="" # Avoid interference from the environment.
## ---------------------------------------------------------------- ##
## Create and set up of the temporary directory used by the test. ##
@@ -271,7 +271,7 @@ am_exit_trap ()
else
# This is to ensure that a test script does give a SKIP outcome just
# because a command in it happens to exit with status 77. This
- # behaviour, while from time to time useful to developers, is not
+ # behavior, while from time to time useful to developers, is not
# meant to be enabled by default, as it could cause spurious failures
# in the wild. Thus it will be enabled only when the variable
# 'am_explicit_skips' is set to a "true" value.
@@ -305,7 +305,7 @@ am_set_exit_traps ()
# - /bin/ksh and /usr/xpg4/bin/sh on Solaris 10
# - Bash 3.2.51 on Solaris 10 and bash 4.1.5 on Debian GNU/Linux
# - AT&T ksh on Debian Gnu/Linux (deb package ksh, version 93u-1)
- # OTOH, at least these shells that do *not* exhibit that behaviour:
+ # OTOH, at least these shells that do *not* exhibit that behavior:
# - modern version of the Almquist Shell (at least 0.5.5.1), on
# both Solaris and GNU/Linux
# - public domain Korn Shell, version 5.2.14, on Debian GNU/Linux
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 41df96e74..9c8870776 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -62,7 +62,7 @@ case "$1" in
esac
END
-# Quite complexish, but allow the tests in client scripts to be written
+# Quite complex, but allow the tests in client scripts to be written
# in a "data-driven fashion".
do_check ()
{
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index 1fbeb859a..6535b7ecd 100644
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -16,7 +16,7 @@
# Backward-compatibility test: try to build and distribute a package
# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT,
-# and 'configure.in' as autconf input file.
+# and 'configure.in' as autoconf input file.
# This script can also serve as mild stress-testing for Automake.
# See also the similar test 'backcompat5.test'.
diff --git a/t/backslash-issues.sh b/t/backslash-issues.sh
index 49f919af2..85fc4732e 100644
--- a/t/backslash-issues.sh
+++ b/t/backslash-issues.sh
@@ -39,7 +39,7 @@ END
$AUTOMAKE
# Make sure we diagnose trailing backslash at the end of a file.
-# Report from Akim Demaile <akim@epita.fr>.
+# Report from Akim Demaille <akim@epita.fr>.
echo 'foo = \' > Makefile.am
AUTOMAKE_fails
grep 'trailing backslash' stderr
diff --git a/t/canon8.sh b/t/canon8.sh
index 5dced579d..87a9e2d36 100644
--- a/t/canon8.sh
+++ b/t/canon8.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Check that canonicalization does not transliterate the '@' charactrer.
+# Check that canonicalization does not transliterate the '@' character.
. test-init.sh
diff --git a/t/cond36.sh b/t/cond36.sh
index c51311912..9b4507669 100644
--- a/t/cond36.sh
+++ b/t/cond36.sh
@@ -39,7 +39,7 @@ else
bin_PROGRAMS = tb
tb_SOURCES = tb.c tparse.h tscan.l tparse.y
tb_LDADD = $(LEXLIB)
-tparse.h: tparce.c
+tparse.h: tparse.c
echo whatever
endif
EOF
diff --git a/t/confh8.sh b/t/confh8.sh
index 22ac5e0e0..a3bbc4863 100644
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Test to make sure several config headers are allowed.
-# See also sister "minimalistic" test 'confh7.sh'.
+# See also sister "minimalist" test 'confh7.sh'.
. test-init.sh
diff --git a/t/dist-no-built-sources.sh b/t/dist-no-built-sources.sh
index e74c99568..d891f3a13 100644
--- a/t/dist-no-built-sources.sh
+++ b/t/dist-no-built-sources.sh
@@ -70,7 +70,7 @@ EOF
# built-sources build should have it
test -e x.c
fi
-
+
# If the test runs fast enough, the make dist second time through
# won't do anything since the tarball will be considered up to date.
rm -f "${pkg_ver}".tar.gz "${pkg_ver}".tar
diff --git a/t/distcheck-configure-flags-am.sh
b/t/distcheck-configure-flags-am.sh
index 7ad30c55c..38968c14e 100644
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -45,7 +45,7 @@ grep
'DISTCHECK_CONFIGURE_FLAGS.*AM_DISTCHECK_CONFIGURE_FLAGS' Makefile.in \
$AUTOCONF
./configure --enable-success sentence='it works :-)'
-# The configure call in "make distcheck" should honour
+# The configure call in "make distcheck" should honor
# $(AM_DISTCHECK_CONFIGURE_FLAGS).
$MAKE distcheck
diff --git a/t/disthook.sh b/t/disthook.sh
index b2c12d17c..45c342a2e 100644
--- a/t/disthook.sh
+++ b/t/disthook.sh
@@ -75,7 +75,7 @@ test "$(cat write)" = "all is ok"
test ! -e removed
test -f doc/README
test -f doc/RELEASE-DATE
-test ! -e doc/HACING
+test ! -e doc/HACKING
./execute
./execute | grep 'I run successfully'
cd ..
diff --git a/t/extra-dist-wildcards-vpath.sh b/t/extra-dist-wildcards-vpath.sh
index e2ea5de78..cab7a2258 100644
--- a/t/extra-dist-wildcards-vpath.sh
+++ b/t/extra-dist-wildcards-vpath.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Check that wildcards in elements of EXTRA_DIST are honoured when
+# Check that wildcards in elements of EXTRA_DIST are honored when
# $srcdir != $builddir, if properly declared.
# Suggested by observations from Braden McDaniel.
diff --git a/t/extra-dist-wildcards.sh b/t/extra-dist-wildcards.sh
index 5ff290205..412ca7cd4 100644
--- a/t/extra-dist-wildcards.sh
+++ b/t/extra-dist-wildcards.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Check that wildcards in EXTRA_DIST are honoured.
+# Check that wildcards in EXTRA_DIST are honored.
# Suggested by observations from Braden McDaniel.
# See also sister test 'extra-dist-wildcards-gnu.sh', that checks a
# similar usage with the involvement of the $(wildcard) GNU make builtin.
diff --git a/t/help.sh b/t/help.sh
index faa033727..93f6ad983 100644
--- a/t/help.sh
+++ b/t/help.sh
@@ -23,7 +23,7 @@
mkdir emptydir
cd emptydir
-# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# Honor user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
ACLOCAL=$am_original_ACLOCAL
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/help2.sh b/t/help2.sh
index cf6ad9c6b..b26905586 100644
--- a/t/help2.sh
+++ b/t/help2.sh
@@ -22,7 +22,7 @@
mkdir cleandir
cd cleandir
-# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# Honor user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
ACLOCAL=$am_original_ACLOCAL
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/help3.sh b/t/help3.sh
index 4ca44276e..033574496 100644
--- a/t/help3.sh
+++ b/t/help3.sh
@@ -22,7 +22,7 @@
mkdir cleandir
cd cleandir
-# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# Honor user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
ACLOCAL=$am_original_ACLOCAL
AUTOMAKE=$am_original_AUTOMAKE
@@ -51,7 +51,7 @@ mv -f foo.m4 aclocal.m4 # autoconf will need aclocal.m4
$AUTOMAKE --add-missing --help --copy
test ! -e install-sh
-$AUTOMAKE --copy --version --add-mising
+$AUTOMAKE --copy --version --add-missing
test ! -e install-sh
# Sanity check.
$AUTOMAKE --add-missing --copy
diff --git a/t/help4.sh b/t/help4.sh
index 74c1d9e1f..1fd5c715e 100644
--- a/t/help4.sh
+++ b/t/help4.sh
@@ -23,7 +23,7 @@
mkdir emptydir
cd emptydir
-# Honour user overrides for $ACLOCAL and $AUTOMAKE, but without
+# Honor user overrides for $ACLOCAL and $AUTOMAKE, but without
# adding extra options.
ACLOCAL=$am_original_ACLOCAL
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index b56dfd6e0..7744fd6e6 100644
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -35,9 +35,9 @@ cat >Makefile.am <<'END'
AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = p
nobase_bin_PROGRAMS = np sub/np
-lib_LTIBRARIES = libfoo.la
+lib_LTLIBRARIES = libfoo.la
nobase_lib_LTLIBRARIES = libnfoo.la sub/libnfoo.la
-pyexec_LTIBRARIES = libpy.la
+pyexec_LTLIBRARIES = libpy.la
nobase_pyexec_LTLIBRARIES = libnpy.la sub/libnpy.la
END
diff --git a/t/instspc.tap b/t/instspc.tap
index ed2f4c71a..97f7b1856 100644
--- a/t/instspc.tap
+++ b/t/instspc.tap
@@ -52,7 +52,7 @@ define_problematic_string ()
fi
}
-# Be sure to avoid interferences from the environment.
+# Be sure to avoid interference from the environment.
all_test_names_list=''
builddir_xfails=''
destdir_xfails=''
@@ -286,7 +286,7 @@ for test_name in $test_names_list; do
dest)
build=build-$test_name
# Also use $test_name in the definition of $dest, to avoid
- # interferences among different tests in case $test_string
+ # interference among different tests in case $test_string
# is strangely munged (which is not unexpected, considering
# how tricky its characters are). With some shells, this
# has already happened (at least on OpenIndiana 11 and on
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
index bac7678bf..ead75980a 100644
--- a/t/java-compile-run-flat.sh
+++ b/t/java-compile-run-flat.sh
@@ -150,7 +150,7 @@ END
cat >> Makefile.am <<'END'
## We must use 'TESTS_ENVIRONMENT', not 'AM_TESTS_ENVIRONMENT',
-## because the latter is not hnoured by the old serial test
+## because the latter is not honored by the old serial test
## harness.
TESTS_ENVIRONMENT = \
if test x"$$jprog_doing_installcheck" != x"yes"; then \
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
index 4958d279d..7a58d060a 100644
--- a/t/lexvpath.sh
+++ b/t/lexvpath.sh
@@ -20,7 +20,7 @@
# 'make' and 'make distdir' and check whether the version of 'lexer.c'
# to be distributed is up to date.
-# Please keep this in sync with sister test 'yaccvapth.sh'.
+# Please keep this in sync with sister test 'yaccvpath.sh'.
required='cc lex'
. test-init.sh
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
index cf188254c..e84399d75 100644
--- a/t/lisp-flags.sh
+++ b/t/lisp-flags.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Elisp byte-compilation honours AM_ELCFLAFS and ELCFLAGS.
+# Elisp byte-compilation honors AM_ELCFLAFS and ELCFLAGS.
. test-init.sh
diff --git a/t/local.mk b/t/local.mk
index bce6f1851..b1a8eb7ea 100644
--- a/t/local.mk
+++ b/t/local.mk
@@ -171,7 +171,7 @@ nodist_noinst_SCRIPTS += runtest
# If two test scripts have the same basename, they will end up sharing
# the same log file, leading to all sort of undefined and undesired
-# behaviours.
+# behaviors.
check-no-repeated-test-name:
@LC_ALL=C; export LC_ALL; \
lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \
diff --git a/t/longlin2.sh b/t/longlin2.sh
index d7d77e77c..60c63a98e 100644
--- a/t/longlin2.sh
+++ b/t/longlin2.sh
@@ -34,7 +34,7 @@ FOO = $files $files2 \
EOF
# The 'FOO = ...' line is 2293-byte long. More than what a POSIX
-# conformant system is expected to support. So do not use grep
+# conforming system is expected to support. So do not use grep
# on the non-text file.
# grep $match Makefile.am
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 0b1107a4d..29d7c1034 100644
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -39,7 +39,7 @@ if IS_GNU_MAKE
is_too_deep := $(shell test $(MAKELEVEL) -lt 10 && echo no)
-## Indenteation here required to avoid confusing Automake.
+## Indentation here required to avoid confusing Automake.
ifeq ($(is_too_deep),no)
else
$(error $(errmsg), $(MAKELEVEL) levels)
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index a67040ceb..302fe9dee 100644
--- a/t/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
@@ -49,7 +49,7 @@ cat > foo.test << 'END'
# We expect the test driver to be terminated by a signal, and so
# to exit with non-zero status, thus causing "make check" to fail.
# Exiting with status 0 from this test script is thus a good way to
-# make unexpected behaviours more evident, since this will likely
+# make unexpected behaviors more evident, since this will likely
# cause and unexpected success in "make check".
trap 'exit 0' 0;
stop_test () { exit 0; }
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index 7f7bc71a1..cb59c8c10 100644
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Check performanceof recipe generating test-suite.log file and testsuite
+# Check performance of recipe generating test-suite.log file and testsuite
# summary. That has suffered of huge inefficiencies in the past.
# FIXME: this test is not currently able to detect whether the measured
# FIXME: performance is too low, and FAIL accordingly; it just offers
diff --git a/t/primary-prefix-invalid-couples.tap
b/t/primary-prefix-invalid-couples.tap
index 393d17c55..b10fe2b6e 100644
--- a/t/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
@@ -105,7 +105,7 @@ for primary in $primaries; do
# primary to be coupled to any prefix.
# See also Automake bug#7656.
# We should dig out how automake had come to behave this way, and
- # if such a behaviour can be safely changed.
+ # if such a behavior can be safely changed.
prefixes_ok=$prefixes
;;
TEXINFOS)
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
index b9bbb3913..0bdfd91ac 100644
--- a/t/py-compile-basedir.sh
+++ b/t/py-compile-basedir.sh
@@ -44,7 +44,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
files=$(find "$d2" | grep '\.py[co]$')
#
# 1) With new-enough Python3, there are six files.
- #
+ #
# 2) We have to elide the leading spaces from the wc output
# for the sake of the macOS shell.
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68119#4
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
index 8d563ba4c..b4ba6dcbe 100644
--- a/t/py-compile-env.sh
+++ b/t/py-compile-env.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Make sure 'py-compile' honours the PYTHON environment variable.
+# Make sure 'py-compile' honors the PYTHON environment variable.
. test-init.sh
diff --git a/t/relativize.tap b/t/relativize.tap
index 16492de14..199dd4def 100644
--- a/t/relativize.tap
+++ b/t/relativize.tap
@@ -35,7 +35,7 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-# The 'am__relitivize' definition is only brought in when
+# The 'am__relativize' definition is only brought in when
# SUBDIRS are defined.
SUBDIRS = .
diff --git a/t/remake-deeply-nested.sh b/t/remake-deeply-nested.sh
index f31028d52..c74334693 100644
--- a/t/remake-deeply-nested.sh
+++ b/t/remake-deeply-nested.sh
@@ -30,7 +30,7 @@ echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
echo "@FOO@" > bar.in
echo "AC_CONFIG_FILES([bar])" >> configure.ac
-unset d # Avoid unduly interferences from the environment.
+unset d # Avoid undue interference from the environment.
for i in 0 1 2 3 4 5 6 7 8 9; do
d=${d+"$d/"}sub$i
echo "SUBDIRS = sub$i" > Makefile.am
diff --git a/t/remake-macrodir.sh b/t/remake-macrodir.sh
index 20aeb8997..aa8435141 100644
--- a/t/remake-macrodir.sh
+++ b/t/remake-macrodir.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Check that the aclocal honouring of AC_CONFIG_MACRO_DIR interacts
+# Check that the aclocal honoring of AC_CONFIG_MACRO_DIR interacts
# nicely with automatic rebuild rules.
. test-init.sh
diff --git a/t/remake-timing-bug-pr8365.sh b/t/remake-timing-bug-pr8365.sh
index 2e33d277b..4c992d82e 100644
--- a/t/remake-timing-bug-pr8365.sh
+++ b/t/remake-timing-bug-pr8365.sh
@@ -16,7 +16,7 @@
# Test for automake bug#8365, related to Makefile remake rules.
# The bug is due to subtle timestamp issues and limitations in
-# make's behaviour, and is very unlikely to be triggered (we have
+# make's behavior, and is very unlikely to be triggered (we have
# to resort to timestamp edit hacks to consistently expose it); in
# any account, it is nigh to impossible to trigger it by running
# make by hand. Thus, fixing it would not be worth the hassle, but
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index 4d69f9971..7375963df 100644
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
@@ -75,7 +75,7 @@ command_ok_ "command not found" -- test $? -gt 0
: Non-executable command.
test -f Makefile && test ! -x Makefile || \
- framowork_failure_ "no proper Makefile in the current directory"
+ framework_failure_ "no proper Makefile in the current directory"
$AM_TEST_RUNNER_SHELL -c "$init ./Makefile; :" "$dummy_test_script"
command_ok_ "permission denied" test $? -gt 0
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index b5b9e4c3a..8ad2a5ae1 100644
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -19,7 +19,7 @@
am_create_testdir=empty
. test-init.sh
-hasnt_parallel_tests ()
+lacks_parallel_tests ()
{
$EGREP 'TEST_SUITE_LOG|TEST_LOGS|\.log.*:' $1 && exit 1
grep 'recheck.*:' $1 && exit 1
@@ -61,7 +61,7 @@ touch missing install-sh
$ACLOCAL
$AUTOMAKE
grep TEST Makefile.in # For debugging.
-hasnt_parallel_tests Makefile.in
+lacks_parallel_tests Makefile.in
test ! -e test-driver
cd ..
@@ -71,7 +71,7 @@ $ACLOCAL
$AUTOMAKE --add-missing
grep TEST [ab]Makefile.in # For debugging.
has_parallel_tests aMakefile.in
-hasnt_parallel_tests bMakefile.in
+lacks_parallel_tests bMakefile.in
mv aMakefile.in aMakefile.sav
mv bMakefile.in bMakefile.sav
test ! -e test-driver
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
index f120a5fdd..2cf5d9551 100644
--- a/t/spy-rm.tap
+++ b/t/spy-rm.tap
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Check whether "rm -f" do not complain if called without file
-# operands. We'd like to depend on this behaviour (which seems
+# operands. We'd like to depend on this behavior (which seems
# to hold on all non-museum systems, and will soon be mandated
# by POSIX as well) in future version of automake, to simplify
# automake-provided cleanup rules.
diff --git a/t/subobjname.sh b/t/subobjname.sh
index dc4490170..476a03ab1 100644
--- a/t/subobjname.sh
+++ b/t/subobjname.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Make sure we reuse variables whenever possible, to limit
-# combinational explosion. (This test is named after the &subobjname
+# combinatorial explosion. (This test is named after the &subobjname
# sub in Automake).
. test-init.sh
diff --git a/t/suffix3.tap b/t/suffix3.tap
index eb41df053..3c010ee2b 100644
--- a/t/suffix3.tap
+++ b/t/suffix3.tap
@@ -33,7 +33,7 @@ SUFFIXES = .zoo
bin_PROGRAMS = foo
foo_SOURCES = foo.zoo
# This is required by "make distcheck". The useless indirection is
-# reequired to avoid false positives by the grepping checks below.
+# required to avoid false positives by the grepping checks below.
FOO = foo
CLEANFILES = $(FOO).cc
END
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 605a2bd03..b7a6706b0 100644
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -20,7 +20,7 @@
. test-init.sh
cat > Makefile.am << 'END'
-# The tests are *deliberately* listed in inversed order here.
+# The tests are *deliberately* listed in inverse order here.
TESTS = c.test b.test a.test
b.log: a.log
c.log: b.log
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
index 81907dffc..3d56e23e5 100644
--- a/t/tap-diagnostic-custom.sh
+++ b/t/tap-diagnostic-custom.sh
@@ -54,7 +54,7 @@ for string in \
'## A string with more whitespace' \
" ${tab}a b${tab} c" \
'## Note the we do not have the empty string here. We prefer to' \
-'## leave its behaviour in this context undefined for the moment.'
+'## leave its behavior in this context undefined for the moment.'
do
case $string in '##'*) continue;; esac
i=$(($i + 1))
diff --git a/t/tap-log.sh b/t/tap-log.sh
index b59e2a998..6c39a0090 100644
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
@@ -108,7 +108,7 @@ test $($FGREP -c "$cmarker" my.log) -eq 5
# Passed test scripts shouldn't be mentioned in the global log.
$EGREP '(^pass|[^x]pass)\.test' my.log && exit 1
-# But failing (expectedly or not) and skipped ones should.
+# But failing (unexpectedly or not) and skipped ones should.
$FGREP 'xfail.test' my.log
$FGREP 'skip.test' my.log
$FGREP 'fail.test' my.log
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
index 2fd317c55..46847a7c6 100644
--- a/t/tap-no-spurious-numbers.sh
+++ b/t/tap-no-spurious-numbers.sh
@@ -74,7 +74,7 @@ highno=1000
for result in 'ok' 'not ok'; do
for spacing in "" " " "$tab"; do
- subst="$result &$spacing$higno"
+ subst="$result &$spacing$highno"
sed -e "s|.*|$subst|" prefixes
for directive in TODO SKIP; do
test "$result $directive" != "not ok SKIP" || continue
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
index c3f30eb72..bde2fc7cd 100644
--- a/t/tap-plan-leading-zero.sh
+++ b/t/tap-plan-leading-zero.sh
@@ -17,7 +17,7 @@
# TAP support:
# - TAP plans with numbers having leading zeroes, as in "1..01"
# - TAP "SKIP" plans with multiple zeroes, as in "1..00 # SKIP"
-# This is consistent with the behaviour of the 'prove' utility.
+# This is consistent with the behavior of the 'prove' utility.
. test-init.sh
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
index 0d7eed674..7b2b47c5a 100644
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# TAP support: a malformed TAP plan is not recognized. The checks in
-# here should be consistent with the behaviour of the 'prove' utility.
+# here should be consistent with the behavior of the 'prove' utility.
. test-init.sh
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
index 7bed7e21f..afa9f7211 100644
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.sh
@@ -16,7 +16,7 @@
# TAP support:
# - a test result numbered as 0 is to be considered out-of-order
-# This is consistent with the behaviour of the 'prove' utility.
+# This is consistent with the behavior of the 'prove' utility.
. test-init.sh
. tap-setup.sh
diff --git a/t/tar-ustar-id-too-high.sh b/t/tar-ustar-id-too-high.sh
index db813e7b6..05005f066 100644
--- a/t/tar-ustar-id-too-high.sh
+++ b/t/tar-ustar-id-too-high.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# Check that UID or GID too high for the ustar format are correctly
-# rwcognized and diagnosed by configure. See bug#8343 and bug#13588.
+# recognized and diagnosed by configure. See bug#8343 and bug#13588.
. test-init.sh
diff --git a/t/test-driver-custom-multitest.sh
b/t/test-driver-custom-multitest.sh
index 09fdae72c..81ac9cde2 100644
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@ -148,7 +148,7 @@ for vpath in : false; do
# Check that the content of, and only of, the test logs with at least
# one failing test case has been copied into 'test-suite.log'. Note
# that test logs containing skipped or xfailed test cases are *not*
- # copied into 'test-suite.log' -- a behaviour that deliberately differs
+ # copied into 'test-suite.log' -- a behavior that deliberately differs
# from the one of the built-in Automake test drivers.
grep '%%' test-suite.log # For debugging.
grep '%% fail %%' test-suite.log
diff --git a/t/test-driver-custom-xfail-tests.sh
b/t/test-driver-custom-xfail-tests.sh
index 70c3c6c99..3b498cd47 100644
--- a/t/test-driver-custom-xfail-tests.sh
+++ b/t/test-driver-custom-xfail-tests.sh
@@ -40,7 +40,7 @@ empty =
TEST_LOG_DRIVER = \$(top_srcdir)/td
# XFAIL_TESTS should gracefully handle TAB characters, and multiple
-# whitespaces.
+# whitespace characters.
XFAIL_TESTS =\$(empty)${tab}x1.test x2.test${tab}x3.test${tab}\
x4.test ${tab} x5.test x6.test${tab}\$(empty)
diff --git a/t/test-log.sh b/t/test-log.sh
index 4bad6f206..b81435877 100644
--- a/t/test-log.sh
+++ b/t/test-log.sh
@@ -122,7 +122,7 @@ have_rst_section ()
# Passed test scripts shouldn't be mentioned in the global log.
$EGREP ':.*[^x]pass' my.log && exit 1
-# But failing (expectedly or not) and skipped ones should.
+# But failing (unexpectedly or not) and skipped ones should.
have_rst_section 'SKIP: skip' my.log
have_rst_section 'FAIL: fail' my.log
have_rst_section 'XFAIL: xfail' my.log
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
index a57f39337..1f244b348 100644
--- a/t/test-logs-repeated.sh
+++ b/t/test-logs-repeated.sh
@@ -16,7 +16,7 @@
# Check parallel-tests features:
# - $(TESTS_LOGS) can end up holding duplicated entries
-# Such behaviour can be useful for projects that want to verify that
+# Such behavior can be useful for projects that want to verify that
# different test scripts don't end up sharing the same log file.
# (Automake itself is such a project, BTW ;-)
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
index de2e7cb18..a780413a4 100644
--- a/t/test-metadata-global-result.sh
+++ b/t/test-metadata-global-result.sh
@@ -174,7 +174,7 @@ XFAIL: zar-doz
==============
END
-# Whitespaces before and after ':global-test-result:' are handled OK.
+# Whitespace characters before and after ':global-test-result:' are handled OK.
echo " $tab:global-test-result:PASS" > foo.test
echo "${tab}${tab}:global-test-result:${tab} ${tab}SKIP" > zar-doz.x
diff --git a/t/tests-environment-backcompat.sh
b/t/tests-environment-backcompat.sh
index db43309ee..f134cd63e 100644
--- a/t/tests-environment-backcompat.sh
+++ b/t/tests-environment-backcompat.sh
@@ -17,7 +17,7 @@
# With old serial testsuite driver, TESTS_ENVIRONMENT can be used to
# define the "test runner", i.e. the program that the test scripts must
# be run by (with the parallel test harness one should use LOG_COMPILER
-# for this). The behaviour tested here is also documented in the manual.
+# for this). The behavior tested here is also documented in the manual.
am_serial_tests=yes
. test-init.sh
diff --git a/t/tests-environment-fd-redirect.sh
b/t/tests-environment-fd-redirect.sh
index 6937dfd07..0c1178a2b 100644
--- a/t/tests-environment-fd-redirect.sh
+++ b/t/tests-environment-fd-redirect.sh
@@ -14,14 +14,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Test for a behaviour of 'TESTS_ENVIRONMENT' and 'AM_TESTS_ENVIRONMENT'
+# Test for a behavior of 'TESTS_ENVIRONMENT' and 'AM_TESTS_ENVIRONMENT'
# w.r.t. file descriptor redirections which, although undocumented,
# is nonetheless required by Gnulib's 'tests/init.sh' and by coreutils'
# testsuite.
-# The checked behaviour is that we can portably do file descriptor
+# The checked behavior is that we can portably do file descriptor
# redirections by placing them at the end of a {AM_,}TESTS_ENVIRONMENT
# definition without a following semicolon. The need to support this
-# is detailedly motivated by coreutils bug#8846:
+# is motivated in detail by coreutils bug#8846:
# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=8846>
# and the following CC:ed thread on bug-autoconf list:
# <https://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
diff --git a/t/txinfo-no-texi-but-texi-in.sh b/t/txinfo-no-texi-but-texi-in.sh
index c3db16d1e..694ffb9cf 100644
--- a/t/txinfo-no-texi-but-texi-in.sh
+++ b/t/txinfo-no-texi-but-texi-in.sh
@@ -16,9 +16,9 @@
# Check if Automake doesn't exit with an error for Texinfo output files
# without a direct input file, but with a matching input file processed
-# by 'configure' (file.texi.in).
+# by 'configure' (file.texi.in).
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54063#41
-#
+#
# This also tests an @setfilename that is different from the file name,
# and the lack of any @setfilename, in the case of using .texi.in.
# (See scan_texinfo_file in automake.)
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
index 3209af5be..8cabc648d 100644
--- a/t/uninstall-fail.sh
+++ b/t/uninstall-fail.sh
@@ -33,7 +33,7 @@ chmod a-w d || skip_ "cannot make directories unwritable"
# "eat" the error message from 'rm' in some situation, although the 'rm'
# utility itself correctly prints it when invoked from (say) 'env' or
# 'bash'. Yikes.
-# We'll cater to these incompatibilities by relaxing a test below if
+# We'll cater to this incompatibility by relaxing a test below if
# a faulty shell or 'rm' program is detected.
st=0; $SHELL -c 'rm -f d/f' 2>stderr || st=$?
cat stderr >&2
diff --git a/t/vala-configure.sh b/t/vala-configure.sh
index 61f26a933..825098890 100644
--- a/t/vala-configure.sh
+++ b/t/vala-configure.sh
@@ -58,7 +58,7 @@ chmod +x bin/valac.old
PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH
-# Avoid interferences from the environment.
+# Avoid interference from the environment.
unset VALAC vala_version
$ACLOCAL
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index a57101dc2..f3c34f96b 100644
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -117,7 +117,7 @@ $MAKE clean
have_generated_files
# But stamp files should be removed by "maintainer-clean" (the
-# behaviour w.r.t. intermediate C files is still unclear, and
+# behavior w.r.t. intermediate C files is still unclear, and
# better left undefined for the moment).
$MAKE maintainer-clean
ls *vala*.stamp | grep . && exit 1
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index 957007621..725c4f195 100644
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -114,7 +114,7 @@ ls -l # For debugging.
have_generated_files
# But stamp files should be removed by "maintainer-clean" (the
-# behaviour w.r.t. intermediate C files is still unclear, and
+# behavior w.r.t. intermediate C files is still unclear, and
# better left undefined for the moment).
$MAKE maintainer-clean
ls *vala*.stamp | grep . && exit 1
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index 899d8fcb4..cb5a226dd 100644
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -63,7 +63,7 @@ grep '^sub/maude\.c:.*maude\.y' Makefile.in && exit 1
cat > Makefile.am << 'END'
bin_PROGRAMS = maude
maude_SOURCES = sub/maude.y
-## A particularly trickey case.
+## A particularly tricky case.
maude_YFLAGS = -d
END