summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS6
-rw-r--r--TODO4
-rw-r--r--bin/autom4te.in4
-rw-r--r--bin/autoreconf.in4
-rw-r--r--bin/autoupdate.in6
-rw-r--r--doc/autoconf.texi22
-rw-r--r--lib/Autom4te/Struct.pm6
-rw-r--r--lib/autoconf/autoheader.m47
-rw-r--r--lib/autoconf/c.m47
-rw-r--r--lib/autoconf/functions.m49
-rw-r--r--lib/autoconf/general.m46
-rw-r--r--lib/autoconf/lang.m47
-rw-r--r--lib/autoconf/libs.m48
-rw-r--r--lib/autoscan/identifiers5
-rw-r--r--lib/autotest/general.m42
-rw-r--r--lib/freeze.mk4
-rw-r--r--lib/m4sugar/m4sh.m42
-rw-r--r--tests/atgeneral.m46
-rw-r--r--tests/atspecific.m44
-rw-r--r--tests/semantics.at4
-rw-r--r--tests/torture.at4
22 files changed, 72 insertions, 64 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fd32e00..4fe641bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2002-04-19 Paul Eggert <eggert@twinsun.com>
+ * NEWS, TODO, bin/autom4te.in, bin/autoreconf.in, bin/autoupdate.in,
+ doc/autoconf.texi, lib/freeze.mk, lib/Autom4te/Struct.pm,
+ lib/autoconf/autoheader.m4, lib/autoconf/c.m4,
+ lib/autoconf/functions.m4, lib/autoconf/general.m4,
+ lib/autoconf/lang.m4, lib/autoconf/libs.m4, lib/autoscan/identifiers,
+ lib/autotest/general.m4, lib/m4sugar/m4sh.m4, tests/atgeneral.m4,
+ tests/atspecific.m4, tests/semantics.at, tests/torture.at:
+ Minor spelling and grammar fixes.
+
* doc/autoconf.texi: Follow the outline suggested in the GNU
Sample Texts sections of the Texinfo 4.2 manual. Most
importantly, this makes sure that the copyright notices appear in
diff --git a/NEWS b/NEWS
index 6f692add..28f55f5d 100644
--- a/NEWS
+++ b/NEWS
@@ -459,7 +459,7 @@ Major changes in Autoconf 2.13:
* Fixed an important bug in AC_CHECK_TYPE that would cause a configure
script to report that `sometype_t' was present when only `type_t'
was defined.
-* Merge of the FSF version of config.guess and config.sub to modernise
+* Merge of the FSF version of config.guess and config.sub to modernize
these scripts. Add support for a few new hosts in config.guess.
Incorporate latest versions of install-sh, mkinstalldirs and
texinfo.tex from the FSF.
@@ -808,8 +808,8 @@ Various bug fixes.
-----
-Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free
-Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
This file is part of GNU Autoconf.
diff --git a/TODO b/TODO
index 29e410fc..97e8ea2b 100644
--- a/TODO
+++ b/TODO
@@ -236,7 +236,7 @@ So that --recheck does not pass --no-recursive to configure.
* autoconf.texi
Move the specific macro documentation blocks into the source files,
-and use a doc-block extraction/merge technique to get docuemntation
+and use a doc-block extraction/merge technique to get documentation
into texi-file. This should help avoid bit-rot in the doc, and make
the doc easier to update when people add/change macros. The name
"autodoc" is probably already taken so we probably need another one.
@@ -693,7 +693,7 @@ with autoconf scripts.
------------------------------------------------------------------------------
-Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
This file is part of GNU Autoconf.
diff --git a/bin/autom4te.in b/bin/autom4te.in
index db0027d2..e00457ac 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -135,7 +135,7 @@ sub request ($%)
}
# It would be great to have $REQ check that it up to date wrt its
- # dependencies, but that requires gettting traces (to fetch the
+ # dependencies, but that requires getting traces (to fetch the
# included files), which is out of the scope of Request
# (currently?).
@@ -1138,7 +1138,7 @@ if (%trace)
# Always produce traces, since even if the output is young enough,
# there is no guarantee that the traces use the same *format*
# (e.g., `-t FOO:foo' and `-t FOO:bar' are both using the same M4
- # traces, hence the M4 traces cache is usable, but its formating
+ # traces, hence the M4 traces cache is usable, but its formatting
# will yield different results).
handle_traces ($req, $output, %trace);
}
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 7d0e6e7c..2b75bfb0 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -349,7 +349,7 @@ sub autoreconf ($)
# -------------------- #
- # Running gettexitze. #
+ # Running gettextize. #
# -------------------- #
if (!$uses_gettext)
@@ -471,7 +471,7 @@ sub autoreconf ($)
# ------------------ #
# Don't try to be smarter than `autoconf', which does its own
- # up to date checkings.
+ # up to date checks.
xsystem ($autoconf);
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index ee41958d..c032396b 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -289,10 +289,10 @@ foreach my $file (@ARGV)
# They work by pair: each time an AU macro is activated, it runs
# _au_enable, and at its end its runs _au_disable (see _au_defun
- # above). But since AU macros might use AU macros, which should
- # enable/disable only for the outter AU macros.
+ # above). AU macros might use AU macros, which should
+ # enable/disable only for the outer AU macros.
#
- # `_au_enabled' is used to this end, condionning whether we really
+ # `_au_enabled' is used to this end, determining whether we really
# enable/disable.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3912ad28..31e6d475 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -360,7 +360,7 @@ Site Configuration
* External Software:: Working with other optional software
* Package Options:: Selecting optional features
-* Pretty Help Strings:: Formating help string
+* Pretty Help Strings:: Formatting help string
* Site Details:: Configuring site details
* Transforming Names:: Changing program names when installing
* Site Defaults:: Giving @command{configure} local defaults
@@ -3399,7 +3399,7 @@ strnlen ("foobar", 9) = 6
@prindex @code{unlink}
The @sc{posix} spec says that @code{unlink} causes the given file to be
removed only after there are no more open file handles for it. Not all
-OS's support this behaviour though. So even on systems that provide
+OS's support this behavior though. So even on systems that provide
@code{unlink}, you cannot portably assume it is OK to call it on files
that are open. For example, on Windows 9x and ME, such a call would fail;
on DOS it could even lead to file system corruption, as the file might end
@@ -3429,7 +3429,7 @@ value back in the caller (eg. @code{vsnprintf} in the GNU C Library
@item Signed @code{>>}
Normally the C @code{>>} right shift of a signed type replicates the
high bit, giving a so-called ``arithmetic'' shift. But care should be
-taken since the ISO C standard doesn't require that behaviour. On those
+taken since the ISO C standard doesn't require that behavior. On those
few processors without a native arithmetic shift (for instance Cray
vector systems) zero bits may be shifted in, the same as a shift of an
unsigned type.
@@ -6403,7 +6403,7 @@ and their interface might change in the future. As a matter of fact,
@c prevented `expansion' of $1. Unless it refers to the expansion
@c of the value of $1? Anyway, we need a rewrite here@dots{}
-The most common brokenness of existing macros is an improper quotation.
+The most common problem with existing macros is an improper quotation.
This section, which users of Autoconf can skip, but which macro writers
@emph{must} read, first justifies the quotation scheme that was chosen
for Autoconf and then ends with a rule of thumb. Understanding the
@@ -7345,7 +7345,7 @@ Return the arguments as a single entity, i.e., wrap them into a pair of
quotes.
@end defmac
-The following example aims at emphasing the difference between (i), not
+The following example aims at emphasizing the difference between (i), not
using these macros, (ii), using @code{m4_quote}, and (iii), using
@code{m4_dquote}.
@@ -8131,8 +8131,8 @@ Russ Allbery:
@quotation
The @sc{gnu} assumption that @command{/bin/sh} is the one and only shell
-leads to a permanent deadlock. Vendors don't want to break user's
-existant shell scripts, and there are some corner cases in the Bourne
+leads to a permanent deadlock. Vendors don't want to break users'
+existing shell scripts, and there are some corner cases in the Bourne
shell that are not completely compatible with a @sc{posix} shell. Thus,
vendors who have taken this route will @emph{never} (OK@dots{}``never say
never'') replace the Bourne shell (as @command{/bin/sh}) with a
@@ -8147,7 +8147,7 @@ This is exactly the problem. While most (at least most System V's) do
have a Bourne shell that accepts shell functions most vendor
@command{/bin/sh} programs are not the @sc{posix} shell.
-So while most modern systems do have a shell _somewhere_ that meets the
+So while most modern systems do have a shell @emph{somewhere} that meets the
@sc{posix} standard, the challenge is to find it.
@end quotation
@@ -8398,7 +8398,7 @@ That means that @file{foobar-part1.c}, @file{foobar-part2.c} and
Note: This is not usually a problem under Windows, as it uses numeric
tails in the short version of filenames to make them unique. However, a
-registry setting can turn this behaviour off. While this makes it
+registry setting can turn this behavior off. While this makes it
possible to share file trees containing long file names between @sc{sfn}
and @sc{lfn} environments, it also means the above problem applies there
as well.
@@ -9881,7 +9881,7 @@ sed @var{instruction-1};@var{instruction-2}
Contrary to yet another urban legend, you may portably use @samp{&} in
the replacement part of the @code{s} command to mean ``what was
-matched''. All descendents of Bell Lab's V7 @command{sed} (at least; we
+matched''. All descendants of Bell Lab's V7 @command{sed} (at least; we
don't have first hand experience with older @command{sed}s) have
supported it.
@@ -10596,7 +10596,7 @@ options.
@menu
* External Software:: Working with other optional software
* Package Options:: Selecting optional features
-* Pretty Help Strings:: Formating help string
+* Pretty Help Strings:: Formatting help string
* Site Details:: Configuring site details
* Transforming Names:: Changing program names when installing
* Site Defaults:: Giving @command{configure} local defaults
diff --git a/lib/Autom4te/Struct.pm b/lib/Autom4te/Struct.pm
index 3753d7d4..16fd02cd 100644
--- a/lib/Autom4te/Struct.pm
+++ b/lib/Autom4te/Struct.pm
@@ -1,5 +1,5 @@
# autoconf -- create `configure' using m4 macros
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -564,8 +564,8 @@ Modified by Damian Conway, 1999-03-05, v0.58.
Added classname prefixes to keys in hash-based classes
(refer to "Perl Cookbook", Recipe 13.12 for rationale).
- Corrected behaviour of accessors for '*@' and '*%' struct
- elements. Package now implements documented behaviour when
+ Corrected behavior of accessors for '*@' and '*%' struct
+ elements. Package now implements documented behavior when
returning a reference to an entire hash or array element.
Previously these were returned as a reference to a reference
to the element.
diff --git a/lib/autoconf/autoheader.m4 b/lib/autoconf/autoheader.m4
index c82aa3ea..d60b0bda 100644
--- a/lib/autoconf/autoheader.m4
+++ b/lib/autoconf/autoheader.m4
@@ -1,7 +1,8 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Interface with autoheader.
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -62,7 +63,7 @@ m4_define([AH_OUTPUT], [])
# If KEY is direct (i.e., no indirection such as in KEY=$my_func which
# may occur if there is AC_CHECK_FUNCS($my_func)), issue an autoheader
# TEMPLATE associated to the KEY. Otherwise, do nothing. TEMPLATE is
-# output as is, with no formating.
+# output as is, with no formatting.
m4_define([AH_VERBATIM],
[AS_LITERAL_IF([$1],
[AH_OUTPUT([$1], AS_ESCAPE([[$2]]))])
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 4100bd21..32c5663a 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1,7 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Programming languages support.
-# Copyright 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -878,7 +877,7 @@ main ()
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes],
-[# try to guess the endianess by grep'ing values into an object file
+[# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -909,7 +908,7 @@ case $ac_cv_c_bigendian in
$2 ;;
*)
m4_default([$3],
- [AC_MSG_ERROR([unknown endianess
+ [AC_MSG_ERROR([unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help])]) ;;
esac
])# AC_C_BIGENDIAN
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index a2643597..1d723594 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1,7 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for functions.
-# Copyright 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -402,7 +401,7 @@ fi
# AC_FUNC_GETGROUPS
# -----------------
# Try to find `getgroups', and check that it works.
-# When crosscompiling, assume getgroups is broken.
+# When cross-compiling, assume getgroups is broken.
AC_DEFUN([AC_FUNC_GETGROUPS],
[AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
@@ -614,8 +613,8 @@ fi
# AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
# -------------------------------------
-# When crosscompiling, be pessimistic so we will end up using the
-# replacement version of lstat that checkes for trailing slashes and
+# When cross-compiling, be pessimistic so we will end up using the
+# replacement version of lstat that checks for trailing slashes and
# calls lstat a second time when necessary.
AC_DEFUN([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
[AC_CACHE_CHECK(
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index ec184f67..4fbb23cf 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1354,15 +1354,15 @@ ac_cv_env_$1_value=$$1])dnl
# _AC_ARG_VAR_VALIDATE
# --------------------
# The precious variables are saved twice at the beginning of
-# configure. E.g., PRECIOUS, is saved as `ac_env_PRECIOUS_SET' and
+# configure. E.g., PRECIOUS is saved as `ac_env_PRECIOUS_SET' and
# `ac_env_PRECIOUS_VALUE' on the one hand and `ac_cv_env_PRECIOUS_SET'
# and `ac_cv_env_PRECIOUS_VALUE' on the other hand.
#
-# Now the cache has just been load, so `ac_cv_env_' represents the
+# Now the cache has just been loaded, so `ac_cv_env_' represents the
# content of the cached values, while `ac_env_' represents that of the
# current values.
#
-# So we check that `ac_env_' and `ac_cv_env_' are consistant. If
+# So we check that `ac_env_' and `ac_cv_env_' are consistent. If
# they aren't, die.
m4_define([_AC_ARG_VAR_VALIDATE],
[# Check that the precious variables saved in the cache have kept the same
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index 9b0af7b4..7f3c763d 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -1,7 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Programming languages support.
-# Copyright 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -351,7 +350,7 @@ AC_DEFUN([AC_REQUIRE_CPP],
# compiler often expects to be able to link with some of such
# libraries.
#
-# In several of these libraries, work-arounds have been introduced to
+# In several of these libraries, workarounds have been introduced to
# avoid the AC_PROG_CC_WORKS test, that would just abort their
# configuration. The introduction of AC_EXEEXT, enabled either by
# libtool or by CVS autoconf, have just made matters worse.
@@ -562,7 +561,7 @@ ac_exeext=$EXEEXT
# _AC_COMPILER_OBJEXT
# -------------------
# Check the object extension used by the compiler: typically `.o' or
-# `.obj'. If this is called, some other behaviour will change,
+# `.obj'. If this is called, some other behavior will change,
# determined by ac_objext.
#
# This macro is called by AC_LANG_COMPILER, the latter being required
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index aaeb5c14..3eb2562f 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for libraries.
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -52,11 +52,11 @@
# Table of contents
#
# 1. Generic tests for libraries
-# 2. Tests for specific libraires
+# 2. Tests for specific libraries
## --------------------------------- ##
-## 1. Generic tests for libraires.## ##
+## 1. Generic tests for libraries.## ##
## --------------------------------- ##
diff --git a/lib/autoscan/identifiers b/lib/autoscan/identifiers
index 8c6059ba..783818f3 100644
--- a/lib/autoscan/identifiers
+++ b/lib/autoscan/identifiers
@@ -1,6 +1,7 @@
-# acindentifiers -- autoscan's mapping from identifiers which are not
+# identifiers -- autoscan's mapping from identifiers which are not
# involved in function calls to Autoconf macros.
-# Copyright 1992, 1993, 1994, 1996, 1999, 2000, 2001
+
+# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 1c1a17f4..3dd784f0 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -76,7 +76,7 @@ m4_define([_m4_divert(TAIL)], 60)
# m4_bpatsubst(__file__, [^.*/\(.*\)], [[\1]])
#
# since then, since `dnl' doesn't match the pattern, it is returned
-# with once quotation level less, so you lose, dammit! And since GNU M4
+# with once quotation level less, so you lose! And since GNU M4
# is one of the biggest junk in the whole universe wrt regexp, don't
# even think about using `?' or `\?'. Bah, `*' will do.
# Pleeeeeeeease, Gary, provide us with dirname and ERE!
diff --git a/lib/freeze.mk b/lib/freeze.mk
index 251b4afa..b93bb1b7 100644
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -1,6 +1,6 @@
## Freeze M4 files.
-## Copyright 2002 Free Software Foundation, Inc.
+## Copyright (C) 2002 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
SUFFIXES = .m4 .m4f
# Do not use AUTOM4TE here, since Makefile.maint (my-distcheck)
-# checks if we are independant of Autoconf by defining AUTOM4TE (and
+# checks if we are independent of Autoconf by defining AUTOM4TE (and
# others) to `false'. But we _ship_ tests/autom4te, so it doesn't
# apply to us.
MY_AUTOM4TE = $(top_builddir)/tests/autom4te
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index d4dec1aa..18f8eee8 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -176,7 +176,7 @@ as_me=`AS_BASENAME("$[0]")`
# _AS_PREPARE
# -----------
# This macro has a very special status. Normal use of M4sh relies
-# heavily on AS_REQUIRE, so that needed initiatizations (such as
+# heavily on AS_REQUIRE, so that needed initializations (such as
# _AS_TEST_PREPARE) are performed on need, not on demand. But
# Autoconf is the first client of M4sh, and for two reasons: configure
# and config.status. Relying on AS_REQUIRE is of course fine for
diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 39944db9..e5747827 100644
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -403,9 +403,9 @@ m4_divert_push([TESTS])dnl
# We try to build a regular expression matching `[', `]', `*', and
# `.', i.e., the regexp active characters.
#
-# Novices would write, `[[]*.]', which sure fails since the character
-# class ends with the first closing braquet.
-# M4 gurus will sure write `[\[\]*.]', but it will fail too because
+# Novices would write `[[]*.]', which fails since the character
+# class ends with the first closing bracket.
+# M4 gurus would write `[\[\]*.]', but it will fail too because
# regexp does not support this and understands `\' per se.
# Regexp gurus will write `[][*.]' which is indeed what Regexp expects,
# but it will fail for M4 reasons: it's the same as `[*.]'.
diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index 2e308bd6..d9e5f0c3 100644
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -1,6 +1,6 @@
# M4 macros used in building Autoconf test suites. -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -278,7 +278,7 @@ AT_CLEANUP()dnl
#
# Updated configure.ac shall not depend upon obsolete macros, which votes
# in favor of `-W obsolete', but since many of these macros leave a message
-# to be removed by the user once her code ajusted, let's not check.
+# to be removed by the user once her code is adjusted, let's not check.
#
# Remove config.hin to avoid `autoheader: config.hin is unchanged'.
m4_define([AT_CHECK_AU_MACRO],
diff --git a/tests/semantics.at b/tests/semantics.at
index afed9425..d1a856c4 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -2,7 +2,7 @@
AT_BANNER([Semantics.])
-# Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -174,7 +174,7 @@ AC_CHECK_SIZEOF(charcharchar)
# AC_CHECK_SIZEOF
# ---------------
AT_CHECK_MACRO([AC_CHECK_SIZEOF],
-[[# Exercize the code used when cross-compiling
+[[# Exercise the code used when cross-compiling
cross_compiling=yes
AC_CHECK_SIZEOF(char)
AC_CHECK_SIZEOF(charchar,,
diff --git a/tests/torture.at b/tests/torture.at
index 27288285..ecc5ffda 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,6 +1,6 @@
# -*- Autotest -*-
-# Copyright 2000, 2001, 2002 (C) Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ AT_CLEANUP
# AT_CHECK_AC_ARG_VAR(FIRST-VALUE, SECOND-VALUE)
# ----------------------------------------------
# Check that AC_ARG_VAR caches the latest values, diagnoses
-# inconsistances, and arms config.status.
+# inconsistencies, and arms config.status.
m4_define([AT_CHECK_AC_ARG_VAR],
[rm -f config.cache