* lib/Automake/Channels.pm, lib/Automake/Condition.pm,

lib/Automake/DisjConditions.pm, lib/Automake/Options.pm,
lib/Automake/VarDef.pm, lib/Automake/Wrap.pm: Fix some typos.

diff --git a/ChangeLog b/ChangeLog
index 637ebf566434d9a85893a8562a6d8101efb3cea9..8ee5c155163318febd2a65604aca80aedab48c2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/Automake/Channels.pm, lib/Automake/Condition.pm,
+       lib/Automake/DisjConditions.pm, lib/Automake/Options.pm,
+       lib/Automake/VarDef.pm, lib/Automake/Wrap.pm: Fix some typos.
+
 2006-05-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/install-sh: Sync from Autoconf, as follows:

diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 7da83b35eeba3bab26c4f19b5f7dc76abe900f8e..db4b02c9bf7258a8ab86b717718ad755860febb5 100644 (file)
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 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
@@ -43,7 +43,7 @@ Automake::Channels - support functions for error and warning management
   # Treat all warnings as errors.
   $warnings_are_errors = 1;
 
-  # Exit with the greater exist code encountered so far.
+  # Exit with the greatest exit code encountered so far.
   exit $exit_code;
 
 =head1 DESCRIPTION
@@ -108,7 +108,7 @@ $warnings_are_errors = 0;
 
 =item C<UP_NONE>, C<UP_TEXT>, C<UP_LOC_TEXT>
 
-Possible values for the C<uniq_part> options.  This select the part
+Possible values for the C<uniq_part> options.  This selects the part
 of the message that should be considered when filtering out duplicates.
 If C<UP_LOC_TEXT> is used, the location and the explanation message
 are used for filtering.  If C<UP_TEXT> is used, only the explanation
@@ -126,10 +126,10 @@ use constant UP_LOC_TEXT => 2;
 
 Possible values for the C<uniq_scope> options.
 Use C<US_GLOBAL> for error messages that should be printed only
-once in the run of the program, C<US_LOCAL> for message that
+once during the execution of the program, C<US_LOCAL> for message that
 should be printed only once per file.  (Actually, C<Channels> does not
-now when files are changed, it relies on you calling C<reset_local_duplicates>
-when this happens.)
+do this now when files are changed, it relies on you calling
+C<reset_local_duplicates> when this happens.)
 
 =cut
 
@@ -143,7 +143,7 @@ use constant US_GLOBAL => 1;
 
 Channels accept the options described below.  These options can be
 passed as a hash to the C<register_channel>, C<setup_channel>, and C<msg>
-functions.  The possible keys, with there default value are:
+functions.  The possible keys, with their default value are:
 
 =over
 
@@ -352,7 +352,7 @@ sub exists_channel ($)
 =item C<channel_type ($name)>
 
 Returns the type of channel C<$name> if it has been registered.
-Returns The empty string otherwise.
+Returns the empty string otherwise.
 
 =cut
 
@@ -478,7 +478,7 @@ sub _print_message ($$%)
 
 =item C<msg ($channel, $location, $message, [%options])>
 
-Emit a message on C<$channel>, overriding some options of the channel  with
+Emit a message on C<$channel>, overriding some options of the channel with
 those specified in C<%options>.  Obviously C<$channel> must have been
 registered with C<register_channel>.
 
@@ -496,10 +496,10 @@ the following would be output:
   foo.c:10: unused variable `mumble'
 
 C<$location> can also be an instance of C<Automake::Location>.  In this
-case the stack of contexts will be displayed in addition.
+case, the stack of contexts will be displayed in addition.
 
 If C<$message> contains newline characters, C<$location> is prepended
-to each line.  For instance
+to each line.  For instance,
 
   msg 'error', 'somewhere', "1st line\n2nd line";
 
@@ -646,8 +646,8 @@ list for later processing.
 
 This backlog of messages is processed when C<flush_messages> is
 called, with the current channel options (not the options in effect,
-at the time of C<msg>).  So for instance if some channel was silenced
-in the meantime, messages to this channels will not be print.
+at the time of C<msg>).  So for instance, if some channel was silenced
+in the meantime, messages to this channel will not be printed.
 
 C<flush_messages> cancels the effect of C<buffer_messages>.  Following
 calls to C<msg> are processed immediately as usual.

diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 19f4a959accaf2db32fab54e854c6162f2b0d653..f294c37cf328f2df85f19ecaee331547ba392247 100644 (file)
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1997, 2001, 2002, 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
@@ -123,8 +123,8 @@ B<and> C<COND2> are true. There is no way to express disjunctions
 
 Another point worth to mention is that each C<Condition> object is
 unique with respect to its conditionals.  Two C<Condition> objects
-created for the same set of conditionals will have the same adress.
-This makes it easy to compare C<Condition>s, just compare the
+created for the same set of conditionals will have the same address.
+This makes it easy to compare C<Condition>s: just compare the
 references.
 
   my $c1 = new Automake::Condition "COND1_TRUE", "COND2_TRUE";

diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index f6c400af4cd0ff5e7895b3f286cd2e72a393a44d..8378d2780412d94a0269b8701492438c4219c6e7 100644 (file)
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1997, 2001, 2002, 2003, 2004, 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
@@ -116,7 +116,7 @@ That's indeed the condition into 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
-for the same set of conditions will have the same adress.  This makes
+for the same set of conditions will have the same address.  This makes
 it easy to compare C<DisjConditions>s: just compare the references.
 
 =head2 Methods

diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 9276c95f2b0dfaabb5c43e5fe3f800cdf9b118c0..f19fae96c00ab23bc8dc1c55c0f37e1cc4f3b8ed 100644 (file)
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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
@@ -159,7 +159,7 @@ Query the state of an option.  If the option is unset, this
 returns the empty list.  Otherwise it returns the option's value,
 as set by C<set_option> or C<set_global_option>.
 
-Not that C<global_option> should be used only when it is
+Note that C<global_option> should be used only when it is
 important to make sure an option hasn't been set locally.
 Otherwise C<option> should be the standard function to
 check for options (be they global or local).

diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index f69103dbfa22296c4208f371ccc7b93d1302cf97..0ee00782cf3e6222ae2abd3eed98327bf228ced0 100644 (file)
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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
@@ -71,7 +71,7 @@ Automake::VarDef - a class for variable definitions
 
 =head1 DESCRIPTION
 
-This class gather data related to one Makefile-variable definition.
+This class gathers data related to one Makefile-variable definition.
 
 =head2 Constants
 

diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 344df873e826afc2177cd69ef53759b21f99adb1..e607243717a0af8925a114400cfca71ef479b12a 100644 (file)
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.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
@@ -26,7 +26,7 @@ use vars '@ISA', '@EXPORT_OK';
 
 =head1 NAME
 
-Automake::Wrap - a paragraph formater
+Automake::Wrap - a paragraph formatter
 
 =head1 SYNOPSIS
 
@@ -41,7 +41,7 @@ Automake::Wrap - a paragraph formater
 
 This modules provide facility to format list of strings.  It is
 comparable to Perl's L<Text::Wrap>, however we can't use L<Text::Wrap>
-because some versions will abort when some word to print exceed the
+because some versions will abort when some word to print exceeds the
 maximum length allowed.  (Ticket #17141, fixed in Perl 5.8.0.)
 
 =head2 Functions
@@ -65,7 +65,7 @@ sub tab_length($)
 
 Format C<@values> as a block of text that starts with C<$head>,
 followed by the strings in C<@values> separated by spaces or by
-C<"$eol\n$fill"> so that the lenght of each line never exceed
+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