From c5548fdc28d66ad8894a5c3e13f8a74cd2f6234a Mon Sep 17 00:00:00 2001
From: Raja R Harinath <harinath@acm.org>
Date: Tue, 12 Aug 2003 22:33:44 +0000
Subject: [PATCH] typos in comments

---
 ChangeLog                      |  9 +++++++++
 lib/Automake/DisjConditions.pm |  2 +-
 lib/Automake/Rule.pm           | 10 +++++-----
 lib/Automake/Variable.pm       |  4 ++--
 tests/cond20.test              |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 216c2ce..c80fe4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-12  Raja R Harinath  <harinath@acm.org>
+
+	* lib/Automake/DisjConditions.pm (ambiguous_p): Typo in comment.
+	* lib/Automake/Rule.pm (accept_extensions, msg_cond_rule): Likewise.
+	(define): Reword comment slightly.
+	* Variable.pm (_var_order, msg_cond_var): Typo in comment.
+	* tests/cond20.test (var2): Use foo.c instead of foo.cc to avoid
+	spurious automake error exit.
+	
 2003-08-12  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* lib/Automake/Item.pm, lib/Automake/ItemDef.pm: New files.
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index ae18331..e5743f5 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -458,7 +458,7 @@ sub ambiguous_p ($$$)
 {
   my ($self, $var, $cond) = @_;
 
-  # Note that these rules doesn't consider the following
+  # Note that these rules don't consider the following
   # example as ambiguous.
   #
   #   if COND1
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 35fc11d..4bef2b4 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -128,7 +128,7 @@ use vars '%actions';
 =item <$suffix_rules>
 
 This maps the source extension for all suffix rule seen to
-a C<\hash> whose keys are the possible output extensions.
+a C<hash> whose keys are the possible output extensions.
 
 Note that this is transitively closed by construction:
 if we have
@@ -162,7 +162,7 @@ by the languages supported by Automake).  Using this pattern (instead
 of `\..*$') to match extensions allows Automake to support dot-less
 extensions.
 
-New extension should be registered with C<accept_extensions>.
+New extensions should be registered with C<accept_extensions>.
 
 =cut
 
@@ -218,7 +218,7 @@ sub msg_cond_rule ($$$$;%)
 
 Messages about rules.
 
-=cute
+=cut
 
 sub msg_rule ($$$;%)
 {
@@ -774,8 +774,8 @@ sub define ($$$$$)
   for my $t (split (' ', $target))
     {
       ++$target_count;
-      # Check the rule for being a suffix rule. If so, store in a hash.
-      # Either it's a rule for two known extensions...
+      # Check if the rule is a suffix rule: either it's a rule for
+      # two known extensions...
       if ($t =~ /^($KNOWN_EXTENSIONS_PATTERN)($KNOWN_EXTENSIONS_PATTERN)$/
 	  # ...or it's a rule with unknown extensions (.i.e, the rule
 	  # looks like `.foo.bar:' but `.foo' or `.bar' are not
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index cd716c7..f993ca5 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -133,7 +133,7 @@ non-object).
 my $_VARIABLE_PATTERN = '^[.A-Za-z0-9_@]+' . "\$";
 
 # The order in which variables should be output.  (May contain
-# duplicates -- only the first occurence matters.)
+# duplicates -- only the first occurrence matters.)
 my @_var_order;
 
 # This keeps track of all variables defined by &_gen_varname.
@@ -229,7 +229,7 @@ sub msg_cond_var ($$$$;%)
 
 =item C<msg_var ($channel, $var, $message, [%options])>
 
-messages about variables.
+Messages about variables.
 
 =cut
 
diff --git a/tests/cond20.test b/tests/cond20.test
index e56fbea..7d3ec06 100755
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -36,7 +36,7 @@ cat > Makefile.am << 'END'
 var1 = $(var2)
 
 if COND1
-var2 = $(var1:=.c) foo.cc
+var2 = $(var1:=.c) foo.c
 else
 var2 = $(var1:=.c)
 endif
-- 
2.7.4