Merge branch 'maint'

1 files changed, 6 insertions, 5 deletions

diff --git a/automake.in b/automake.in
index 7737ff007..bdbb4f086 100644
--- a/automake.in
+++ b/automake.in
@@ -1379,7 +1379,7 @@ sub handle_languages
 
     my %done;
 
-    # Is the c linker needed?
+    # Is the C linker needed?
     my $needs_c = 0;
     foreach my $ext (sort keys %extension_seen)
     {
@@ -2345,7 +2345,7 @@ sub handle_lib_objects
 	   if ($val !~ /^-[lL]/ &&
 	       # Skip -dlopen and -dlpreopen; these are explicitly allowed
 	       # for Libtool libraries or programs.  (Actually we are a bit
-	       # laxe here since this code also applies to non-libtool
+	       # lax here since this code also applies to non-libtool
 	       # libraries or programs, for which -dlopen and -dlopreopen
 	       # are pure nonsense.  Diagnosing this doesn't seem very
 	       # important: the developer will quickly get complaints from
@@ -2586,7 +2586,8 @@ sub handle_compile ()
 	    require_file ($ansi2knr_where, FOREIGN,
 			  'ansi2knr.c', 'ansi2knr.1');
 
-	    # ansi2knr needs to be built before subdirs, so unshift it.
+	    # ansi2knr needs to be built before subdirs, so unshift it
+	    # rather then pushing it.
 	    unshift (@all, '$(ANSI2KNR)');
 	  }
 	else
@@ -3201,7 +3202,7 @@ sub scan_texinfo_file ($)
 # ------------------------------------------------------------------
 # SOURCE - the source Texinfo file
 # DEST - the destination Info file
-# INSRC - wether DEST should be built in the source tree
+# INSRC - whether DEST should be built in the source tree
 # DEPENDENCIES - known dependencies
 sub output_texinfo_build_rules ($$$@)
 {
@@ -4205,7 +4206,7 @@ sub prepend_srcdir (@)
 # Compute a list of dependencies appropriate for the rebuild
 # rule of
 #   AC_CONFIG_FILES($OUTPUT:$INPUT[0]:$INPUTS[1]:...)
-# Also distribute $INPUTs which are not built by another AC_CONFIG_FOOS.
+# Also distribute $INPUTs which are not built by another AC_CONFIG_FOOs.
 sub rewrite_inputs_into_dependencies ($@)
 {
   my ($file, @inputs) = @_;