From 0ca5857b0b32381249833011e027ccb4f49443e4 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 13 May 2006 09:28:36 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ lib/Automake/Channels.pm | 26 +++++++++++++------------- lib/Automake/Condition.pm | 6 +++--- lib/Automake/DisjConditions.pm | 4 ++-- lib/Automake/Options.pm | 4 ++-- lib/Automake/VarDef.pm | 4 ++-- lib/Automake/Wrap.pm | 8 ++++---- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 637ebf56..8ee5c155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-13 Ralf Wildenhues + + * 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 * lib/install-sh: Sync from Autoconf, as follows: diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm index 7da83b35..db4b02c9 100644 --- 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, C, C -Possible values for the C options. This select the part +Possible values for the C options. This selects the part of the message that should be considered when filtering out duplicates. If C is used, the location and the explanation message are used for filtering. If C is used, only the explanation @@ -126,10 +126,10 @@ use constant UP_LOC_TEXT => 2; Possible values for the C options. Use C for error messages that should be printed only -once in the run of the program, C for message that +once during the execution of the program, C for message that should be printed only once per file. (Actually, C does not -now when files are changed, it relies on you calling C -when this happens.) +do this now when files are changed, it relies on you calling +C 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, C, and C -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 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 -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. @@ -496,10 +496,10 @@ the following would be output: foo.c:10: unused variable `mumble' C<$location> can also be an instance of C. 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 is called, with the current channel options (not the options in effect, -at the time of C). So for instance if some channel was silenced -in the meantime, messages to this channels will not be print. +at the time of C). So for instance, if some channel was silenced +in the meantime, messages to this channel will not be printed. C cancels the effect of C. Following calls to C are processed immediately as usual. diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm index 19f4a959..f294c37c 100644 --- 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 C are true. There is no way to express disjunctions Another point worth to mention is that each C object is unique with respect to its conditionals. Two C objects -created for the same set of conditionals will have the same adress. -This makes it easy to compare Cs, just compare the +created for the same set of conditionals will have the same address. +This makes it easy to compare Cs: 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 f6c400af..8378d278 100644 --- 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 has a value. Like C objects, a C object is unique with respect to its conditions. Two C 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 Cs: just compare the references. =head2 Methods diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index 9276c95f..f19fae96 100644 --- 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 or C. -Not that C should be used only when it is +Note that C should be used only when it is important to make sure an option hasn't been set locally. Otherwise C