Fix some comment typos.

* automake.in: Fix some comment typos.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/tests/DisjConditions.pl: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 20b76c699a706e699a0b3fc222c545dc716ddbb8..55614d05e40e5f99073c883b838a24ba1b30df13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Fix some comment typos.
+       * automake.in: Fix some comment typos.
+       * lib/Automake/Condition.pm: Likewise.
+       * lib/Automake/DisjConditions.pm: Likewise.
+       * lib/Automake/Variable.pm: Likewise.
+       * lib/Automake/tests/DisjConditions.pl: Likewise.
+
 2008-09-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/aclibobj.test: Fix race condition.

diff --git a/automake.in b/automake.in
index 796f17d83b777c8b54fdf70c32749e3b46448998..4e53484787200548ceb4d88e2dd8f18c5cf36186 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6004,7 +6004,7 @@ sub cond_stack_endif ($$$)
 # &define_pretty_variable ($VAR, $COND, $WHERE, @VALUE)
 # -----------------------------------------------------
 # Like define_variable, but the value is a list, and the variable may
-# be defined conditionally.  The second argument is the Condition
+# be defined conditionally.  The second argument is the condition
 # under which the value should be defined; this should be the empty
 # string to define the variable unconditionally.  The third argument
 # is a list holding the values to use for the variable.  The value is
@@ -7130,7 +7130,7 @@ sub am_install_var
       # Use the location of the currently processed variable as context.
       $where->push_context ("while processing `$one_name'");
 
-      # The variable containing all file to distribute.
+      # The variable containing all files to distribute.
       my $distvar = "\$($one_name)";
       $distvar = shadow_unconditionally ($one_name, $where)
        if ($dist_p && $one_var->has_conditional_contents);

diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index fc90df4397e83bc740069fd4e05c8f073cff78a0..129fc985425321ec84e8a6df72eb39ebbfca0b68 100644 (file)
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 1997, 2001, 2002, 2003, 2006  Free Software Foundation, Inc.
+# Copyright (C) 1997, 2001, 2002, 2003, 2006, 2008  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
@@ -272,7 +273,7 @@ sub conds ($ )
   return sort @conds;
 }
 
-# Undocumented, shouldn't be needed out of this class.
+# Undocumented, shouldn't be needed outside of this class.
 sub has ($$)
 {
   my ($self, $cond) = @_;

diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index 89759dcd11730e42bc7c13ed7b4ad0101f3d51ce..1f09c0fd4142fbcd6aa89e8033ff0a52619b5ef8 100644 (file)
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -110,7 +110,7 @@ follows.
 
   (COND1 and COND2) or ((not COND3) and COND4)
 
-That's indeed the condition into which C<VAR> has a value.
+That's indeed the condition in which C<VAR> has a value.
 
 Like C<Condition> objects, a C<DisjConditions> object is unique
 with respect to its conditions.  Two C<DisjConditions> objects created
@@ -176,7 +176,7 @@ sub new ($;@)
   # Else, create a new DisjConditions.
 
   # Store conditions as keys AND as values, because blessed
-  # objects are converted to string when used as keys (so
+  # objects are converted to strings when used as keys (so
   # at least we still have the value when we need to call
   # a method).
   my %h = map {$_ => $_} @filtered_conds;

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index eaf245b5cd7ab75fded50c38fe89843e08522820..e67d215c92d6daecb1b215e7af0daf1cb27995f8 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2008  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
@@ -1267,7 +1267,7 @@ following arguments:
                    during recursion
 
 If C<inner_expand> is set, variable references occurring in filename
-(as in C<$(BASE).ext>) are expansed before the filename is passed to
+(as in C<$(BASE).ext>) are expanded before the filename is passed to
 C<&fun_item>.
 
 If C<skip_ac_subst> is set, Autoconf @substitutions@ will be skipped,

diff --git a/lib/Automake/tests/DisjConditions.pl b/lib/Automake/tests/DisjConditions.pl
index 8ce6b7b2f3ae5c62ff0d54615d030fdaa95db9b4..6e186836bbb237568b4742e0efe749c3cd0b67fb 100644 (file)
--- a/lib/Automake/tests/DisjConditions.pl
+++ b/lib/Automake/tests/DisjConditions.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -235,7 +235,7 @@ sub test_simplify ()
          return 1;
        }
 
-      # Also exercize invert() while we are at it.
+      # Also exercise invert() while we are at it.
 
       my $inv1 = $set->invert->simplify;
       my $inv2 = $sim->invert->simplify;