* doc/automake.texi (Dist, Dependency Tracking Evolution):

Fix some typos.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/ItemDef.pm: Likewise.
* lib/Automake/Options.pm: Likewise.
* lib/Automake/Rule.pm: Likewise.
* lib/Automake/VarDef.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/Wrap.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.
* m4/substnot.m4: Likewise.

diff --git a/ChangeLog b/ChangeLog
index c197cc9b7783c551ed1c2b5dd84e1efcbfec4bd8..976353faec621e102283df61938e689b47ebd3d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-10-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * doc/automake.texi (Dist, Dependency Tracking Evolution):
+       Fix some typos.
+       * lib/Automake/Condition.pm: Likewise.
+       * lib/Automake/DisjConditions.pm: Likewise.
+       * lib/Automake/ItemDef.pm: Likewise.
+       * lib/Automake/Options.pm: Likewise.
+       * lib/Automake/Rule.pm: Likewise.
+       * lib/Automake/VarDef.pm: Likewise.
+       * lib/Automake/Variable.pm: Likewise.
+       * lib/Automake/Wrap.pm: Likewise.
+       * lib/Automake/XFile.pm: Likewise.
+       * m4/substnot.m4: Likewise.
+
 2006-10-16  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/gnupload: Update to version 1.1 of directive file.

diff --git a/doc/automake.texi b/doc/automake.texi
index 8233733c70c225873cf4f227f33558d3e42f0b02..657621478749bef098c98ff3848797026fb2435b 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7944,7 +7944,7 @@ dist-hook:
         cp -p $(srcdir)/random/a1 $(srcdir)/random/a2 $(distdir)/random
 @end example
 
-Another way to to use this is for removing unnecessary files that get
+Another way to use this is for removing unnecessary files that get
 recursively included by specifying a directory in EXTRA_DIST:
 
 @example
@@ -11799,9 +11799,8 @@ This was also a problem in the previous dependency tracking implementation.
 
 The current fix is to use @code{BUILT_SOURCES} to list built headers
 (@pxref{Sources}).  This causes them to be built before any other
-other build rules are run.  This is unsatisfactory as a general
-solution, however in practice it seems sufficient for most actual
-programs.
+build rules are run.  This is unsatisfactory as a general solution,
+however in practice it seems sufficient for most actual programs.
 @end itemize
 
 This code is used since Automake 1.5.

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 54b69b33bb3a2146b0aa02e78ffa8aa407ad13df..2995436ea07a562acf3da225e8e25dafe017a388 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 16 October 2006
+@set UPDATED 20 October 2006
 @set UPDATED-MONTH October 2006
 @set EDITION 1.10a
 @set VERSION 1.10a

diff --git a/doc/version.texi b/doc/version.texi
index 54b69b33bb3a2146b0aa02e78ffa8aa407ad13df..2995436ea07a562acf3da225e8e25dafe017a388 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 16 October 2006
+@set UPDATED 20 October 2006
 @set UPDATED-MONTH October 2006
 @set EDITION 1.10a
 @set VERSION 1.10a

diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index f294c37cf328f2df85f19ecaee331547ba392247..1cf3647ae3a69877bfbe23ec68127009d1b459b5 100644 (file)
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -144,13 +144,13 @@ An item in C<@conds> should be either C<"FALSE">, C<"TRUE">, or have
 the form C<"NAME_FALSE"> or C<"NAME_TRUE"> where C<NAME> can be
 anything (in practice C<NAME> should be the name of a conditional
 declared in F<configure.ac> with C<AM_CONDITIONAL>, but it's not
-C<Automake::Condition>'s responsability to ensure this).
+C<Automake::Condition>'s responsibility to ensure this).
 
 An empty C<@conds> means C<"TRUE">.
 
 As explained previously, the reference (object) returned is unique
 with respect to C<@conds>.  For this purpose, duplicate elements are
-ignored, and C<@conds> is rewriten as C<("FALSE")> if it contains
+ignored, and C<@conds> is rewritten as C<("FALSE")> if it contains
 C<"FALSE"> or two contradictory conditionals (such as C<"NAME_FALSE">
 and C<"NAME_TRUE">.)
 

diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index 8378d2780412d94a0269b8701492438c4219c6e7..f23f1b43a97a27191c219da39f9aeff7c427d78a 100644 (file)
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -46,7 +46,7 @@ Automake::DisjConditions - record a disjunction of Conditions
   my $cond = $set->one_cond;
 
   # Return true iff $set is always true (i.e. its subconditions
-  # conver all cases).
+  # cover all cases).
   if ($set->true) { ... }
 
   # Return false iff $set is always false (i.e. is empty, or contains
@@ -331,7 +331,7 @@ The argument can also be a C<Condition>.
 
 =cut
 
-# Same as multiply() but take a list of Conditonals as second argument.
+# Same as multiply() but take a list of Conditionals as second argument.
 # We use this in invert().
 sub _multiply ($@)
 {

diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index a7f8110dabd2be3b8b1ae495fc6fa3cba0d7b138..2a5497f2b3c0675e7bdda95d61266e28e523b7d0 100644 (file)
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006  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
@@ -37,7 +37,7 @@ C<$comment> is any comment preceding the definition.  (Because
 Automake reorders items in the output, it also tries to carry comments
 around.)
 
-C<$location> is the place where the definition occured, it should be
+C<$location> is the place where the definition occurred, it should be
 an instance of L<Automake::Location>.
 
 C<$owner> specifies who owns the rule.

diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index f19fae96c00ab23bc8dc1c55c0f37e1cc4f3b8ed..83f6ec920c89ed10dbe69a016fcc0fca82d11f74 100644 (file)
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -104,11 +104,11 @@ use constant GNITS   => 2;
 
 =item C<$strictness>
 
-The current stricness.  One of C<FOREIGN>, C<GNU>, or C<GNITS>.
+The current strictness.  One of C<FOREIGN>, C<GNU>, or C<GNITS>.
 
 =item C<$strictness_name>
 
-The current stricness name.  One of C<'foreign'>, C<'gnu'>, or C<'gnits'>.
+The current strictness name.  One of C<'foreign'>, C<'gnu'>, or C<'gnits'>.
 
 =back
 
@@ -239,7 +239,7 @@ Return 1 on error, 0 otherwise.
 # -------------------------------------------------
 # Process a list of options.  Return 1 on error, 0 otherwise.
 # \%OPTIONS is the hash to fill with options data, $WHERE is
-# the location where @OPTIONS occured.
+# the location where @OPTIONS occurred.
 sub _process_option_list (\%$@)
 {
   my ($options, $where, @list) = @_;

diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 59f9dda8c99506e0fcab3473c0e8d5844cd90dc1..74e90ff59e450f8ddad0aebc3b514f02484903e7 100644 (file)
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -143,7 +143,7 @@ C<$suffix_rules{'.foo'}{'.$(OBJEXT)'}> exists.  This will work even if
 transforming C<.foo> to C<.$(OBJEXT)> involves a chain of several
 suffix rules.
 
-The value of C<$suffix_rules{$ext1}{$ext2}> is the a pair
+The value of C<$suffix_rules{$ext1}{$ext2}> is a pair
 C<[ $next_sfx, $dist ]> where C<$next_sfx> is target suffix
 for the next rule to use to reach C<$ext2>, and C<$dist> the
 distance to C<$ext2'>.
@@ -555,7 +555,7 @@ sub _new ($$)
 }
 
 
-=itcem C<@conds = define ($rulename, $source, $owner, $cond, $where)>
+=item C<@conds = define ($rulename, $source, $owner, $cond, $where)>
 
 Define a new rule.  C<$rulename> is the list of targets.  C<$source>
 is the filename the rule comes from.  C<$owner> is the owner of the
@@ -644,7 +644,7 @@ sub define ($$$$$)
                }
              # Return so we don't redefine the rule in our tables,
              # don't check for ambiguous condition, etc.  The rule
-             # will be output anyway beauce &read_am_file ignore the
+             # will be output anyway because &read_am_file ignore the
              # return code.
              return ();
            }
@@ -689,7 +689,7 @@ sub define ($$$$$)
              # Automake should ignore redefinitions of its own
              # rules if they came from the same file.  This makes
              # it easier to process a Makefile fragment several times.
-             # Hower it's an error if the target is defined in many
+             # However it's an error if the target is defined in many
              # files.  E.g., the user might be using bin_PROGRAMS = ctags
              # which clashes with our `ctags' rule.
              # (It would be more accurate if we had a way to compare
@@ -780,7 +780,7 @@ sub define ($$$$$)
       # 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
+         # ...or it's a rule with unknown extensions (i.e., the rule
          # looks like `.foo.bar:' but `.foo' or `.bar' are not
          # declared in SUFFIXES and are not known language
          # extensions).  Automake will complete SUFFIXES from

diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 0ee00782cf3e6222ae2abd3eed98327bf228ced0..1595464b417a23db0c29b8e7c5c4f69826872f66 100644 (file)
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -100,7 +100,7 @@ C<VAR_SORTED> variables should be sorted and then handled as
 C<VAR_PRETTY> variables.
 
 C<VAR_SILENT> variables can also be overridden silently (unlike the
-other kinds of variables whose overridding may sometimes produce
+other kinds of variables whose overriding may sometimes produce
 warnings).
 
 =cut
@@ -130,7 +130,7 @@ C<$comment> is any comment preceding the definition.  (Because
 Automake reorders variable definitions in the output, it also tries to
 carry comments around.)
 
-C<$location> is the place where the definition occured, it should be
+C<$location> is the place where the definition occurred, it should be
 an instance of L<Automake::Location>.
 
 C<$type> should be C<''> for definitions made with C<=>, and C<':'>
@@ -167,7 +167,7 @@ sub new ($$$$$$$$)
 
 =item C<$def-E<gt>append ($value, $comment)>
 
-Append C<$value> and <$comment> to the exisiting value and comment of
+Append C<$value> and <$comment> to the existing value and comment of
 C<$def>.  This is normally called on C<+=> definitions.
 
 =cut

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 3d23bec4098146a2c8d001e19117f7749e8c1c68..3334927ef48fbc3975db12c74496b95ef731b39f 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -193,7 +193,7 @@ my %_ac_macro_for_var =
 # The name of the configure.ac file.
 my $configure_ac = find_configure_ac;
 
-# Variables that can be overriden without complaint from -Woverride
+# Variables that can be overridden without complaint from -Woverride
 my %_silent_variable_override =
   (AM_MAKEINFOHTMLFLAGS => 1,
    AR => 1,
@@ -743,7 +743,7 @@ sub scan_variable_expansions ($)
   while ($text =~ /(?<!\$)\$(?:\{([^\}]*)\}|\(([^\)]*)\))/g)
     {
       my $var = $1 || $2;
-      # The occurence may look like $(string1[:subst1=[subst2]]) but
+      # The occurrence may look like $(string1[:subst1=[subst2]]) but
       # we want only `string1'.
       $var =~ s/:[^:=]*=[^=]*$//;
       push @result, $var;
@@ -789,7 +789,7 @@ C<$varname>: the name of the variable being defined.
 
 C<$owner>: owner of the variable (one of C<VAR_MAKEFILE>,
 C<VAR_CONFIGURE>, or C<VAR_AUTOMAKE>, defined by L<Automake::VarDef>).
-Variables can be overriden, provided the new owner is not weaker
+Variables can be overridden, provided the new owner is not weaker
 (C<VAR_AUTOMAKE> < C<VAR_CONFIGURE> < C<VAR_MAKEFILE>).
 
 C<$type>: the type of the assignment (C<''> for C<FOO = bar>,
@@ -1263,12 +1263,12 @@ following arguments:
                    traversing
    $val,        -- the item (i.e., filename) to process
    $cond,       -- the Condition for the $var definition we are
-                   examinating (ignoring the recursion context)
+                   examining (ignoring the recursion context)
    $full_cond)  -- the full Condition, taking into account
                    conditions inherited from parent variables
                    during recursion
 
-If C<inner_expand> is set, variable references occuring in filename
+If C<inner_expand> is set, variable references occurring in filename
 (as in C<$(BASE).ext>) are expansed before the filename is passed to
 C<&fun_item>.
 
@@ -1489,7 +1489,7 @@ sub _hash_varname ($)
 
 # _hash_values (@VALUES)
 # ----------------------
-# Hash @VALUES for %_gen_varname.  @VALUES shoud be a list
+# Hash @VALUES for %_gen_varname.  @VALUES should be a list
 # of pairs: ([$cond, @values], [$cond, @values], ...).
 # See _gen_varname() below.
 sub _hash_values (@)

diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index e607243717a0af8925a114400cfca71ef479b12a..a6bf51849b01de0746b9ea38702fce9a167e13b2 100644 (file)
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -68,7 +68,7 @@ followed by the strings in C<@values> separated by spaces or by
 C<"$eol\n$fill"> so that the length of each line never exceeds
 C<$max_len>.
 
-The C<$max_len> contraint is ignored for C<@values> items which
+The C<$max_len> constraint is ignored for C<@values> items which
 are too big to fit alone one a line.
 
 The constructed paragraph is C<"\n">-terminated.

diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 799ad8d0418594564f7d26e02870fa3f3c8665e8..d33bf059e5c1da4c935eb40afb956f061e24e54e 100644 (file)
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -66,7 +66,7 @@ Automake::XFile - supply object methods for filehandles with error handling
 C<Automake::XFile> inherits from C<IO::File>.  It provides the method
 C<name> returning the file name.  It provides dying version of the
 methods C<close>, C<lock> (corresponding to C<flock>), C<new>,
-C<open>, C<seek>, and C<trunctate>.  It also overrides the C<getline>
+C<open>, C<seek>, and C<truncate>.  It also overrides the C<getline>
 and C<getlines> methods to translate C<\r\n> to C<\n>.
 
 =head1 SEE ALSO

diff --git a/m4/substnot.m4 b/m4/substnot.m4
index 27d3f1fbef998682e34cafdcb8d766e58557dcce..5958962bb1ddd6a8ae94f4d9488df9d3ad8615e9 100644 (file)
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -7,6 +7,6 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])