Spelling and minor grammar fixes.

38 files changed, 107 insertions, 90 deletions

diff --git a/ChangeLog b/ChangeLog
index 648ef1414..fc93f880b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2003-09-05  Paul Eggert  <eggert@twinsun.com>
+
+	* NEWS, aclocal.in, automake.in, automake.texi, lib/ansi2knr.c,
+	lib/depcomp, lib/missing, lib/py-compile,
+	lib/Automake/Channels.pm, lib/Automake/Rule.pm,
+	lib/Automake/Variable.pm, lib/Automake/tests/Condition.pl,
+	lib/am/dejagnu.am, lib/am/depend.am, lib/am/lisp.am,
+	lib/am/remake-hdr.am, lib/am/texi-vers.am, m4/obsolete.m4,
+	m4/python.m4, tests/backsl4.test, tests/defs.in,
+	tests/dejagnu7.test, tests/depacl2.test, tests/dirlist.test,
+	tests/error.test, tests/getopt.test, tests/gnuwarn.test,
+	tests/include2.test, tests/libobj10.test, tests/libtool5.test,
+	tests/libtool6.test, tests/lisp3.test, tests/phony.test,
+	tests/pr220.test, tests/subcond2.test, tests/subcond3.test,
+	tests/vtexi.test:
+	Spelling and minor grammar fixes.
+
 2003-09-01  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* lib/config.sub, lib/config.guess, lib/texinfo.tex,
diff --git a/NEWS b/NEWS
index 986a8945c..f339ef6ba 100644
--- a/NEWS
+++ b/NEWS
@@ -293,7 +293,7 @@ New in 1.3:
 
 New in 1.2:
 * Bug fixes
-* Better DejaGNU support
+* Better DejaGnu support
 * Added no-installinfo option
 * Added Emacs Lisp support
 * Added --no-force option
@@ -329,7 +329,7 @@ New in 1.2:
 New in 1.0:
 * Bug fixes
 * distcheck target runs install and installcheck targets
-* Added preliminary support for DejaGNU.
+* Added preliminary support for DejaGnu.
 
 New in 0.33:
 * More bug fixes
diff --git a/aclocal.in b/aclocal.in
index 3454e0178..e4465a8bd 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -262,7 +262,7 @@ sub scan_configure ()
 
       # Search for things we know about.  The "search" sub is
       # constructed dynamically by scan_m4_files.  The last
-      # parenthethical match makes sure we don't match things that
+      # parenthetical match makes sure we don't match things that
       # look like macro assignments or AC_SUBSTs.
       if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/)
 	{
@@ -333,7 +333,7 @@ sub scan_m4_files (@)
     }
 
     # Construct a new function that does the searching.  We use a
-    # function (instead of just evalling $search in the loop) so that
+    # function (instead of just evaluating $search in the loop) so that
     # "die" is correctly and easily propagated if run.
     my $search = "sub search {\nmy \$found = 0;\n";
     foreach my $key (reverse sort keys %map)
@@ -408,7 +408,7 @@ sub add_file ($)
 	}
 
       # The search function is constructed dynamically by
-      # scan_m4_files.  The last parenthethical match makes sure we
+      # scan_m4_files.  The last parenthetical match makes sure we
       # don't match things that look like macro assignments or
       # AC_SUBSTs.
       if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)($|[^\]\)=A-Z0-9_])/)
diff --git a/automake.in b/automake.in
index e990051d7..4faad1194 100755
--- a/automake.in
+++ b/automake.in
@@ -1128,7 +1128,7 @@ sub handle_languages
 
 	    my $obj_compile = $lang->compile;
 
-	    # Rewrite each occurence of `AM_$flag' in the compile
+	    # Rewrite each occurrence of `AM_$flag' in the compile
 	    # rule into `${derived}_$flag' if it exists.
 	    for my $flag (@{$lang->flags})
 	      {
@@ -1208,7 +1208,7 @@ sub handle_languages
 		  if $source !~ /\$U/;
 
 		(my $source_ = $source) =~ s/\$U/_/g;
-		# Explicitely clean the _.c files if they are in
+		# Explicitly clean the _.c files if they are in
 		# a subdirectory. (In the current directory they get
 		# erased by a `rm -f *_.c' rule.)
 		$clean_files{$source_} = MOSTLY_CLEAN
@@ -1296,7 +1296,7 @@ sub handle_languages
 	$lang->finish;
 
 	# Flags listed in `->flags' are user variables (per GNU Standards),
-	# they should not be overriden in the Makefile...
+	# they should not be overridden in the Makefile...
 	my @dont_override = @{$lang->flags};
 	# ... and so is LDFLAGS.
 	push @dont_override, 'LDFLAGS' if $lang->link;
@@ -1778,7 +1778,7 @@ sub handle_source_transform
 	push @sources, "\$($varname)";
 	if ($prefix !~ /^nodist_/)
 	  {
-	    # If the VAR wasn't definined conditionally, we add
+	    # If the VAR wasn't defined conditionally, we add
 	    # it to DIST_SOURCES as is.  Otherwise we create a
 	    # am__VAR_DIST variable which contains all possible values,
 	    # and add this variable to DIST_SOURCES.
@@ -2541,7 +2541,7 @@ sub scan_texinfo_file ($)
       if (/^\@setfilename +(\S+)/)
 	{
 	  # Honor only the first @setfilename.  (It's possible to have
-	  # more occurences later if the manual shows examples of how
+	  # more occurrences later if the manual shows examples of how
 	  # to use @setfilename...)
 	  next if $outfile;
 
@@ -2609,8 +2609,8 @@ sub output_texinfo_build_rules ($$@)
   $dsfx ||= "";
 
   # We can output two kinds of rules: the "generic" rules use Make
-  # suffix rules and are appropritate when $source and $dest lie in
-  # the current directory; the "specifix" rules is needed in the other
+  # suffix rules and are appropriate when $source and $dest lie in
+  # the current directory; the "specific" rules are needed in the other
   # case.
   #
   # The former are output only once (this is not really apparent here,
@@ -2915,7 +2915,7 @@ sub handle_man_pages
 
   return unless %sections;
 
-  # Now for each section, generate an install and unintall rule.
+  # Now for each section, generate an install and uninstall rule.
   # Sort sections so output is deterministic.
   foreach my $section (sort keys %sections)
     {
@@ -5260,7 +5260,7 @@ sub read_am_file ($$)
 	elsif (/$COMMENT_PATTERN/o)
 	{
 	    # Stick comments before the incoming macro or rule.  Make
-	    # sure a blank line preceeds first block of comments.
+	    # sure a blank line precedes the first block of comments.
 	    $spacing = "\n" unless $blank;
 	    $blank = 1;
 	    $comment .= $spacing . $_;
@@ -5275,7 +5275,7 @@ sub read_am_file ($$)
     }
 
     # We save the conditional stack on entry, and then check to make
-    # sure it is the same on exit.  This lets us conditonally include
+    # sure it is the same on exit.  This lets us conditionally include
     # other files.
     my @saved_cond_stack = @cond_stack;
     my $cond = new Automake::Condition (@cond_stack);
@@ -5331,7 +5331,7 @@ sub read_am_file ($$)
 	    elsif ($prev_state == IN_COMMENT)
 	    {
 		# If the line doesn't start with a `#', add it.
-		# We do this because a continuated comment like
+		# We do this because a continued comment like
 		#   # A = foo \
 		#         bar \
 		#         baz
@@ -5425,7 +5425,7 @@ sub read_am_file ($$)
 		# Distribute any included file.
 
 		# Always use the $(top_srcdir) prefix in DIST_COMMON,
-		# otherwise OSF make will implicitely copy the included
+		# otherwise OSF make will implicitly copy the included
 		# file in the build tree during `make distdir' to satisfy
 		# the dependency.
 		# (subdircond2.test and subdircond3.test will fail.)
@@ -5436,7 +5436,7 @@ sub read_am_file ($$)
                 $path =~ s/\$\(srcdir\)\///;
                 push (@include_stack, "\$\(srcdir\)/$path");
 		# Always use the $(srcdir) prefix in DIST_COMMON,
-		# otherwise OSF make will implicitely copy the included
+		# otherwise OSF make will implicitly copy the included
 		# file in the build tree during `make distdir' to satisfy
 		# the dependency.
 		# (subdircond2.test and subdircond3.test will fail.)
@@ -5654,7 +5654,7 @@ sub file_contents_internal ($$$%)
     my $discard_rule = 0;	# 1 if the current rule should not be output.
 
     # We save the conditional stack on entry, and then check to make
-    # sure it is the same on exit.  This lets us conditonally include
+    # sure it is the same on exit.  This lets us conditionally include
     # other files.
     my @saved_cond_stack = @cond_stack;
     my $cond = new Automake::Condition (@cond_stack);
@@ -5945,14 +5945,14 @@ sub am_primary_prefixes ($$@)
 	      err_var ($var,
 		       "invalid variable `$varname': `dist' is forbidden");
 	    }
-	  # Standard directories must be explicitely allowed.
+	  # Standard directories must be explicitly allowed.
 	  elsif (! defined $valid{$X} && exists $standard_prefix{$X})
 	    {
 	      err_var ($var,
 		       "`${X}dir' is not a legitimate directory " .
 		       "for `$primary'");
 	    }
-	  # A not explicitely valid directory is allowed if Xdir is defined.
+	  # A not explicitly valid directory is allowed if Xdir is defined.
 	  elsif (! defined $valid{$X} &&
 		 $var->requires_variables ("`$varname' is used", "${X}dir"))
 	    {
@@ -6826,10 +6826,10 @@ sub parse_arguments ()
 
   # See if --version or --help is used.  We want to process these before
   # anything else because the GNU Coding Standards require us to
-  # `exit 0' after processing these options, and we can't garanty this
+  # `exit 0' after processing these options, and we can't guarantee this
   # if we treat other options first.  (Handling other options first
   # could produce error diagnostics, and in this condition it is
-  # confusing if Automake `exit 0'.)
+  # confusing if Automake does `exit 0'.)
   my %cli_options_1st_pass =
     (
      'version' => \&version,
diff --git a/automake.texi b/automake.texi
index ec06601bc..5d2d143c9 100644
--- a/automake.texi
+++ b/automake.texi
@@ -5228,7 +5228,7 @@ test.  To do this you would list its name in @code{TESTS} and also in
 @code{check_PROGRAMS}, and then specify it as you would any other
 program.
 
-@section DejaGNU Tests
+@section DejaGnu Tests
 
 If @uref{ftp://ftp.gnu.org/gnu/dejagnu/, @samp{dejagnu}} appears in
 @code{AUTOMAKE_OPTIONS}, then a @code{dejagnu}-based test suite is
@@ -5471,7 +5471,7 @@ There are a few rules and variables that didn't fit anywhere else.
 @menu
 * Tags::                        Interfacing to etags and mkid
 * Suffixes::                    Handling new file extensions
-* Multilibs::                   Support for multilibbing.
+* Multilibs::                   Support for multilibs.
 @end menu
 
 
@@ -6623,8 +6623,8 @@ Note that the renaming of objects is also affected by the
 @c  LocalWords:  uninstall installdirs uninstalls MOSTLYCLEANFILES mostlyclean
 @c  LocalWords:  DISTCLEANFILES MAINTAINERCLEANFILES gzip'd GZIP gzip shar exp
 @c  LocalWords:  distdir distcheck distcleancheck listfiles distuninstallcheck
-@c  LocalWords:  VPATH tarfile stdout XFAIL DejaGNU dejagnu DEJATOOL runtest ln
-@c  LocalWords:  RUNTESTDEFAULTFLAGS toolchain RUNTESTFLAGS DejaGnu asis readme
+@c  LocalWords:  VPATH tarfile stdout XFAIL DejaGnu dejagnu DEJATOOL runtest ln
+@c  LocalWords:  RUNTESTDEFAULTFLAGS toolchain RUNTESTFLAGS asis readme
 @c  LocalWords:  installcheck gzipped tarZ std utils etags mkid multilibbing cd
 @c  LocalWords:  ARGS taggable ETAGSFLAGS lang ctags CTAGSFLAGS GTAGS gtags idl
 @c  LocalWords:  foocc doit idlC multilibs ABIs cmindex defmac ARG enableval
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index eaeed1cdd..ddd7f1ece 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -158,7 +158,7 @@ C<$warnings_are_errors> is set.
 =item C<exit_code =E<gt> 1>
 
 The value to update C<$exit_code> with when a fatal or error message
-is emited.  C<$exit_code> is also updated for warnings output
+is emitted.  C<$exit_code> is also updated for warnings output
 when @<$warnings_are_errors> is set.
 
 =item C<file =E<gt> \*STDERR>
@@ -255,7 +255,7 @@ use vars qw (%_default_options %_global_duplicate_messages
    );
 
 # Filled with output messages as keys, to detect duplicates.
-# The value associated to each keys is the number of occurences
+# The value associated with each key is the number of occurrences
 # filtered out.
 %_local_duplicate_messages = ();
 %_global_duplicate_messages = ();
@@ -495,7 +495,7 @@ the following would be output:
 C<$location> can also be an instance of C<Automake::Location>.  In this
 case the stack of contexts will be displayed in addition.
 
-If C<$message> contains new line caracters, C<$location> is prepended
+If C<$message> contains newline characters, C<$location> is prepended
 to each line.  For instance
 
   msg 'error', 'somewhere', "1st line\n2nd line";
@@ -635,7 +635,7 @@ By default, when C<msg> is called, messages are processed immediately.
 
 Sometimes it is necessary to delay the output of messages.
 For instance you might want to make diagnostics before
-channels have been completly configured.
+channels have been completely configured.
 
 After C<buffer_messages(@types)> has been called, messages sent with
 C<msg> to a channel whose type is listed in C<@types> will be stored in a
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index fd6471d45..64e4c264d 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -369,7 +369,7 @@ sub register_suffix_rule ($$$)
   verb "Sources ending in $src become $dest";
   push @_suffixes, $src, $dest;
 
-  # When tranforming sources to objects, Automake uses the
+  # When transforming sources to objects, Automake uses the
   # %suffix_rules to move from each source extension to
   # `.$(OBJEXT)', not to `.o' or `.obj'.  However some people
   # define suffix rules for `.o' or `.obj', so internally we will
@@ -412,7 +412,7 @@ sub register_suffix_rule ($$$)
     }
 
   # Similarly, any extension that can be derived into $src
-  # can be derived into the same extenstions as $src can.
+  # can be derived into the same extensions as $src can.
   my @dest2 = keys %{$suffix_rules->{$src}};
   for my $src2 (keys %$suffix_rules)
     {
@@ -624,7 +624,7 @@ sub define ($$$$$)
 	      # already diagnosed as unportable by -Wportability.
 	      if ($target !~ /^[^%]*%[^%]*$/)
 		{
-		  ## FIXME: Presently we can't diagnose duplcate user rules
+		  ## FIXME: Presently we can't diagnose duplicate user rules
 		  ## because we doesn't distinguish rules with commands
 		  ## from rules that only add dependencies.  E.g.,
 		  ##   .PHONY: foo
@@ -709,7 +709,7 @@ sub define ($$$$$)
   # Check ambiguous conditional definitions.
   my $rule = _crule $target;
   my ($message, $ambig_cond) = $rule->conditions->ambiguous_p ($target, $cond);
-  if ($message)			# We have an ambiguty.
+  if ($message)			# We have an ambiguity.
     {
       if ($owner == RULE_USER)
 	{
@@ -788,8 +788,8 @@ sub define ($$$$$)
 	}
     }
 
-  # POSIX allow multiple targets befor the colon, but disallow
-  # definitions of multiple Inference rules.  It's also
+  # POSIX allows multiple targets before the colon, but disallows
+  # definitions of multiple inference rules.  It's also
   # disallowed to mix plain targets with inference rules.
   msg ('portability', $where,
        "Inference rules can have only one target before the colon (POSIX).")
@@ -802,14 +802,14 @@ sub define ($$$$$)
 
 Adds C<@deps> to the dependencies of target C<$target>.  This should
 be used only with factored targets (those appearing in
-C<%dependendees>).
+C<%dependees>).
 
 =cut
 
 sub depend ($@)
 {
-  my ($category, @dependendees) = @_;
-  push (@{$dependencies{$category}}, @dependendees);
+  my ($category, @dependees) = @_;
+  push (@{$dependencies{$category}}, @dependees);
 }
 
 =back
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index e5d6a54f4..6c63337af 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -719,11 +719,11 @@ sub scan_variable_expansions ($)
   # Strip comments.
   $text =~ s/#.*$//;
 
-  # Record each use of ${stuff} or $(stuff) that do not follow a $.
+  # Record each use of ${stuff} or $(stuff) that does not follow a $.
   while ($text =~ /(?<!\$)\$(?:\{([^\}]*)\}|\(([^\)]*)\))/g)
     {
       my $var = $1 || $2;
-      # The occurent may look like $(string1[:subst1=[subst2]]) but
+      # The occurence may look like $(string1[:subst1=[subst2]]) but
       # we want only `string1'.
       $var =~ s/:[^:=]*=[^=]*$//;
       push @result, $var;
diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl
index 5998a64e7..c2617038e 100644
--- a/lib/Automake/tests/Condition.pl
+++ b/lib/Automake/tests/Condition.pl
@@ -135,7 +135,7 @@ sub test_reduce_and ()
 	       [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
 		["FOO BAZ BAR"]],
 
-	       # Duplicated condionals should be removed
+	       # Duplicated conditionals should be removed.
 	       [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
 
 	       # Equivalent conditions in different forms should be
@@ -211,7 +211,7 @@ sub test_reduce_or ()
 	       [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"],
 		["BAZ,FOO"]],
 
-	       # Duplicated condionals should be removed
+	       # Duplicated conditionals should be removed.
 	       [["FOO", "BAR", "BAR"], ["BAR,FOO"]],
 
 	       # Equivalent conditions in different forms should be
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index e4154c8a6..e220b9359 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-## Flags for DejaGNU.
+## Flags for DejaGnu.
 RUNTESTFLAGS =
 
 ## Name of tool to use.  Default is the same as the package.
@@ -51,7 +51,7 @@ check-DEJAGNU: site.exp
 ## Life is easiest with an absolute srcdir, so do that.
 	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
 	EXPECT=$(EXPECT); export EXPECT; \
-## Allow this to work when expect and DejaGNU are in tree.
+## Allow this to work when expect and DejaGnu are in tree.
 ## Only required when --cygnus in force.
 ?CYGNUS?	if [ -f $(top_builddir)/../expect/expect ]; then \
 ?CYGNUS?	  TCL_LIBRARY=`$(am__cd) $(top_srcdir)/../tcl/library && pwd`; \
diff --git a/lib/am/depend.am b/lib/am/depend.am
index be4eccc66..f2923490e 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-## Depdirs's files are dependency of this Makefile, so we should never
+## This Makefile depends on Depdirs' files, so we should never
 ## erase them in -am or -recursive rules; that would prevent any other
 ## rules from being recursive (for instance multilib clean rules are
 ## recursive).
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 5b0ea0239..daea72ef6 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -25,9 +25,9 @@
 elc-stamp: $(am__ELFILES)
 	@echo 'WARNING: Warnings can be ignored. :-)'
 	if test $(EMACS) != no; then \
-## Make sure "$@" isn't empty initialy.
+## Make sure "$@" isn't empty initially.
 	  set x; \
-## Populate "$@" whith elisp files (found in the current directory
+## Populate "$@" with elisp files (found in the current directory
 ## or in $srcdir).
 	  list='$(am__ELFILES)'; for p in $$list; do \
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 04c859313..063ddb796 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -37,7 +37,7 @@ $(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL
 	cd $(top_srcdir) && $(AUTOHEADER)
 ## Autoheader has the bad habit of not changing the time stamp if
 ## config.hin is unchanged, which breaks Make targets.  Since what
-## must not changed gratuitiously is config.h, which is already handled
+## must not changed gratuitously is config.h, which is already handled
 ## by config.status, there is no reason to make things complex for
 ## config.hin.
 	touch $(srcdir)/%CONFIG_HIN%
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index c164fef53..9a1004b4a 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -23,7 +23,7 @@ DIST_COMMON += %VTEXI% %STAMPVTI%
 ## %STAMPVTI% is always newer than %VTEXI%, so this rule is always
 ## triggered.  If you equip this rule with a command, GNU make will
 ## assume %VTEXI% has been rebuild in the current directory and
-## discard any %VTEXI% file found in a VPATH seatch.
+## discard any %VTEXI% file found in a VPATH search.
 %VTEXI%: %MAINTAINER-MODE% %STAMPVTI%
 
 ## Depend on configure so that version number updates cause a rebuild.
diff --git a/lib/ansi2knr.c b/lib/ansi2knr.c
index 00b96b9da..e84c210b6 100644
--- a/lib/ansi2knr.c
+++ b/lib/ansi2knr.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */
 
-/*$Id: ansi2knr.c,v 1.13 2001/05/20 05:59:43 tromey Exp $*/
+/*$Id: ansi2knr.c,v 1.14 2003/09/06 05:36:56 eggert Exp $*/
 /* Convert ANSI C function definitions to K&R ("traditional C") syntax */
 
 /*
@@ -64,7 +64,7 @@ program under the GPL.
 
 	lpd 2000-04-12 backs out Eggert's changes because of bugs:
 	- concatlits didn't declare the type of its bufend argument;
-	- concatlits didn't't recognize when it was inside a comment;
+	- concatlits didn't recognize when it was inside a comment;
 	- scanstring could scan backward past the beginning of the string; when
 	- the check for \ + newline in scanstring was unnecessary.
 
diff --git a/lib/depcomp b/lib/depcomp
index 86f7f1539..dcb2b19d5 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -299,7 +299,7 @@ tru64)
 
 dashmstdout)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
+  # always write the preprocessed file to stdout, regardless of -o.
   "$@" || exit $?
 
   # Remove the call to Libtool.
@@ -395,7 +395,7 @@ makedepend)
 
 cpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
 
   # Remove the call to Libtool.
@@ -437,7 +437,7 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o,
   # because we must use -o when running libtool.
   "$@" || exit $?
   IFS=" "
diff --git a/lib/missing b/lib/missing
index 8d85d40f6..fc54c64ec 100755
--- a/lib/missing
+++ b/lib/missing
@@ -326,7 +326,7 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
 WARNING: \`$1' is needed, and you do not seem to have it handy on your
          system.  You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
          some other package would contain this missing \`$1' program."
     exit 1
diff --git a/lib/py-compile b/lib/py-compile
index a055fae4f..4c84b678a 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -80,7 +80,7 @@ $PYTHON -O -c "
 import sys, os, string, py_compile
 
 files = '''$*'''
-print 'Byte-compiling python modules (optimised versions) ...'
+print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
     $trans
     if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
index 4801f663d..872ab6b22 100644
--- a/m4/obsolete.m4
+++ b/m4/obsolete.m4
@@ -23,7 +23,7 @@
 
 # We put here only the macros whose substitution is not an Automake
 # macro; otherwise including this file would trigger dependencies for
-# all the subsitutions.  Generally, obsolete Automake macros are
+# all the substitutions.  Generally, obsolete Automake macros are
 # better AU_DEFUNed in the same file as their replacement, or alone in
 # a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
 
diff --git a/m4/python.m4 b/m4/python.m4
index cd4e0535d..722da1da2 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -39,7 +39,7 @@
 # environment variable, or create a .pth file (see the python
 # documentation for details).
 
-# If the MINIUMUM-VERSION argument is passed, AM_PATH_PYTHON will
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
 # cause an error if the version of python installed on the system
 # doesn't meet the requirement.  MINIMUM-VERSION should consist of
 # numbers and dots only.
@@ -121,7 +121,7 @@ AC_DEFUN([AM_PATH_PYTHON],
 
   dnl pythondir -- where to install python scripts.  This is the
   dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behaviour
+  dnl   directory like in previous automake betas.  This behavior
   dnl   is more consistent with lispdir.m4 for example.
   dnl Query distutils for this directory.  distutils does not exist in
   dnl Python 1.5, so we fall back to the hardcoded directory if it
@@ -164,7 +164,7 @@ AC_DEFUN([AM_PATH_PYTHON],
 # ---------------------------------------------------------------------------
 # Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
 # Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalant (first
+# This test uses sys.hexversion instead of the string equivalent (first
 # word of sys.version), in order to cope with versions such as 2.2c1.
 # hexversion has been introduced in Python 1.5.2; it's probably not
 # worth to support older versions (1.5.1 was released on October 31, 1998).
diff --git a/tests/backsl4.test b/tests/backsl4.test
index bb20b4e35..be6f2ef98 100755
--- a/tests/backsl4.test
+++ b/tests/backsl4.test
@@ -27,8 +27,8 @@ set -e
 
 echo AC_OUTPUT >>configure.in
 
-# Note: trailing whitespaces used during the test should not appear as
-# trailing whitespaces in this file, or they will get stripped by any
+# Note: trailing whitespace used during the test should not appear as
+# trailing whitespace in this file, or it will get stripped by any
 # reasonable editor.
 
 echo 'bin_SCRIPTS = foo \ ' >Makefile.am
diff --git a/tests/defs.in b/tests/defs.in
index 2154accf0..59a47df23 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -304,7 +304,7 @@ FGREP='@FGREP@'
 # and can be up to 3 seconds in the future w.r.t. the system clock.
 sleep='sleep @MODIFICATION_DELAY@'
 
-# The tests call `make -e' but we do not want $srcdir from the evironment
+# The tests call `make -e' but we do not want $srcdir from the environment
 # to override the definition from the Makefile.
 testsrcdir=$srcdir
 unset srcdir
diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test
index d293c12b8..bb920186b 100755
--- a/tests/dejagnu7.test
+++ b/tests/dejagnu7.test
@@ -24,7 +24,7 @@
 required=runtest
 . ./defs || exit 1
 
-# Check whether DejaGNU supports --status
+# Check whether DejaGnu supports --status
 runtest --help | $FGREP -e --status || exit 77
 
 cat > failtcl << 'END'
diff --git a/tests/depacl2.test b/tests/depacl2.test
index cd87664a9..e87e5755c 100755
--- a/tests/depacl2.test
+++ b/tests/depacl2.test
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Test to make sure dependencies work when require'd macro is part of
+# Test to make sure dependencies work when required macro is part of
 # autoconf.
 
 . ./defs || exit 1
diff --git a/tests/dirlist.test b/tests/dirlist.test
index 8a7c985a9..dfdf4b64a 100755
--- a/tests/dirlist.test
+++ b/tests/dirlist.test
@@ -50,8 +50,8 @@ $AUTOCONF
 grep 'GUILE-VERSION' configure
 
 # This bug can occur only when we do a VPATH build of Automake
-# (beause of the `-I' passed to aclocal in tests/defs) but it's
-# ok because this is what `make distcheck' does.
+# (because of the `-I' passed to aclocal in tests/defs) but it's
+# OK because this is what `make distcheck' does.
 grep 'I should not be included' configure && exit 1
 
 :
diff --git a/tests/error.test b/tests/error.test
index 17fd3e9c3..b50a395a7 100755
--- a/tests/error.test
+++ b/tests/error.test
@@ -30,7 +30,7 @@ END
 # dependency does not.
 cat > AM_ONE_MACRO.m4 << 'END'
 AC_DEFUN([AM_ONE_MACRO],
-[AC_REQUIRE([AM_UNEXISING_MACRO])])
+[AC_REQUIRE([AM_NONEXISTENT_MACRO])])
 END
 
 $ACLOCAL && exit 1
diff --git a/tests/getopt.test b/tests/getopt.test
index cceb43ee4..4fe59a034 100755
--- a/tests/getopt.test
+++ b/tests/getopt.test
@@ -26,20 +26,20 @@
 set -e
 
 # This is expected to fail ...
-AUTOMAKE_fails -Wnonexistant
-grep ':.*nonexistant' stderr
+AUTOMAKE_fails -Wnonexistent
+grep ':.*nonexistent' stderr
 
 # ... but this should not.
-AUTOMAKE_run 0 -Wnonexistant --help
-grep ':.*nonexistant' stderr && exit 1
+AUTOMAKE_run 0 -Wnonexistent --help
+grep ':.*nonexistent' stderr && exit 1
 
 
 # Similarly, this should fail ...
-AUTOMAKE_fails --nonexistant 2>stderr
-grep ':.*nonexistant' stderr
+AUTOMAKE_fails --nonexistent 2>stderr
+grep ':.*nonexistent' stderr
 
 # ... but this should not.
-AUTOMAKE_run 0 --nonexistant --help
-grep ':.*nonexistant' stderr && exit 1
+AUTOMAKE_run 0 --nonexistent --help
+grep ':.*nonexistent' stderr && exit 1
 
 :
diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test
index 4c7bfdf8a..492999ef5 100755
--- a/tests/gnuwarn.test
+++ b/tests/gnuwarn.test
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Check that Automake warns about user variables being overriden.
+# Check that Automake warns about user variables being overridden.
 
 . ./defs || exit 1
 
diff --git a/tests/include2.test b/tests/include2.test
index 2f3ccc0a5..c6d33a3e3 100755
--- a/tests/include2.test
+++ b/tests/include2.test
@@ -49,7 +49,7 @@ END
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
-# Use --srcdir with an obsolute path because it's harder
+# Use --srcdir with an absolute path because it's harder
 # to support in `distdir'.
 ./configure --srcdir `pwd`
 $MAKE test
diff --git a/tests/libobj10.test b/tests/libobj10.test
index 034351433..dbf55c6ad 100755
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -18,8 +18,8 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Do not complain about the inexistence of a source for LIBOBJS if
-# it's in BUILT_SOURCES.  Reported by Erez Zadok
+# Do not complain about the nonexistence of a source for LIBOBJS if
+# it's in BUILT_SOURCES.  Reported by Erez Zadok.
 
 . ./defs || exit 1
 
diff --git a/tests/libtool5.test b/tests/libtool5.test
index 19f856820..0c735c4cd 100755
--- a/tests/libtool5.test
+++ b/tests/libtool5.test
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Make sure it's ok to install a library under differents conditions
+# Make sure it's ok to install a library under different conditions
 # in the same directory.
 # Report from Harlan Stenn.
 
diff --git a/tests/libtool6.test b/tests/libtool6.test
index b7412ae62..fc18d7c1f 100755
--- a/tests/libtool6.test
+++ b/tests/libtool6.test
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Make sure it's not ok to install a library under differents conditions
+# Make sure it's not ok to install a library under different conditions
 # in different directories.
 
 required='libtoolize'
diff --git a/tests/lisp3.test b/tests/lisp3.test
index 20c52810d..0197e593d 100755
--- a/tests/lisp3.test
+++ b/tests/lisp3.test
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Test that compilings interdependent elisp files works.
+# Test that compiling interdependent elisp files works.
 
 required=emacs
 . ./defs || exit 1
diff --git a/tests/phony.test b/tests/phony.test
index 31a6c53aa..91168cd7d 100755
--- a/tests/phony.test
+++ b/tests/phony.test
@@ -18,7 +18,7 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Make sure .PHONY can be given depenencies several times.
+# Make sure .PHONY can be given dependencies several times.
 # From Ralf Corsepius.
 
 . ./defs
diff --git a/tests/pr220.test b/tests/pr220.test
index 5873c1b4d..14b6327ac 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -41,7 +41,7 @@ AC_INIT(main.c)
 AM_INIT_AUTOMAKE(test_am, 1.0)
 AC_PROG_CC
 AC_ARG_ENABLE(foo,
-[  --enanble-foo          Enable foo],
+[  --enable-foo          Enable foo],
 [ if test "foo" = "bar" ; then
     AM_CONDITIONAL(NEVER_TRUE, true)
   else
diff --git a/tests/subcond2.test b/tests/subcond2.test
index c59deaadb..18c1657a9 100755
--- a/tests/subcond2.test
+++ b/tests/subcond2.test
@@ -80,7 +80,7 @@ result: source
 	cp $(srcdir)/source result
 END
 
-# We want in opt/ the same Makefile as in src/.  Let's exercize `include'.
+# We want in opt/ the same Makefile as in src/.  Let's exercise `include'.
 cat >opt/Makefile.am << 'END'
 include ../src/Makefile.am
 END
diff --git a/tests/subcond3.test b/tests/subcond3.test
index 68691c9f1..f030b4fd1 100755
--- a/tests/subcond3.test
+++ b/tests/subcond3.test
@@ -81,7 +81,7 @@ result: source
 	cp $(srcdir)/source result
 END
 
-# We want in opt/ the same Makefile as in src/.  Let's exercize `include'.
+# We want in opt/ the same Makefile as in src/.  Let's exercise `include'.
 cat >opt/Makefile.am << 'END'
 include ../src/Makefile.am
 END
diff --git a/tests/vtexi.test b/tests/vtexi.test
index c6328e6a6..619ed8766 100755
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -51,7 +51,7 @@ grep '^textutils\.info:.*version\.texi$' Makefile.in
 
 # Test for bug reported by Lars Hecking:
 # When running the first version of configure.ac aware automake,
-# @CONFIGURE_AC@ was not properly substitued.
+# @CONFIGURE_AC@ was not properly substituted.
 
 $EGREP '^stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
 $EGREP '^stamp-vti:.*\$\(top_srcdir\)/configure( .*)?$' Makefile.in