* automake.in (handle_single_transform): Avoid 3 spaces at sentence end. * ChangeLog.03: Likewise. * lib/Automake/ChannelDefs.pm: Likewise. * lib/Automake/Channels.pm (_print_message): Likewise. * lib/Automake/Rule.pm (rule): Likewise. * lib/Automake/Variable.pm (var): Likewise. * lib/am/distdir.am: Likewise. * tests/insthook.test: Likewise.
Signed-off-by: Eric Blake <ebl...@redhat.com> --- I noticed this when syncing files to autoconf. Okay to commit to maint and merge to master, so as to avoid a spurious whitespace diff when autoconf pulls Channels.pm (where Ralf fixed this typo in autoconf commit 55072aea4)? ChangeLog | 13 +++++++++++++ ChangeLog.03 | 2 +- automake.in | 2 +- lib/Automake/ChannelDefs.pm | 2 +- lib/Automake/Channels.pm | 2 +- lib/Automake/Rule.pm | 4 ++-- lib/Automake/Variable.pm | 2 +- lib/am/distdir.am | 2 +- tests/insthook.test | 4 ++-- 9 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 688f4be..0526e0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2010-09-17 Eric Blake <ebl...@redhat.com> + + Avoid triple-space after period. + * automake.in (handle_single_transform): Avoid 3 spaces at + sentence end. + * ChangeLog.03: Likewise. + * lib/Automake/ChannelDefs.pm: Likewise. + * lib/Automake/Channels.pm (_print_message): Likewise. + * lib/Automake/Rule.pm (rule): Likewise. + * lib/Automake/Variable.pm (var): Likewise. + * lib/am/distdir.am: Likewise. + * tests/insthook.test: Likewise. + 2010-08-27 Stefano Lattarini <stefano.lattar...@gmail.com> Fix bug in test missing6.test. diff --git a/ChangeLog.03 b/ChangeLog.03 index aa31380..eb5b251 100644 --- a/ChangeLog.03 +++ b/ChangeLog.03 @@ -1325,7 +1325,7 @@ Makefile.am into DIST_COMMON here. * lib/am/configure.am (DIST_COMMON): Do it here, and use %MAKEFILE-AM% and %MAKEFILE-IN% so that items in DIST_COMMON - actually match the targets. Prefix `configure' with `$(srcdir)/' + actually match the targets. Prefix `configure' with `$(srcdir)/' to match the target. * tests/remake4.test: New file. * tests/Makefile.am (TESTS): Add remake4.test. diff --git a/automake.in b/automake.in index 381202b..6b36ae2 100755 --- a/automake.in +++ b/automake.in @@ -1991,7 +1991,7 @@ sub handle_single_transform ($$$$$%) # Each item on this list is a reference to a list consisting # of four values followed by additional transform flags for - # file_contents. The four values are the derived flag prefix + # file_contents. The four values are the derived flag prefix # (e.g. for `foo_CFLAGS', it is `foo'), the name of the # source file, the base name of the output file, and # the extension for the object file. diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm index eb208c3..aaca979 100644 --- a/lib/Automake/ChannelDefs.pm +++ b/lib/Automake/ChannelDefs.pm @@ -80,7 +80,7 @@ Fatal errors. Use C<&fatal> to send messages over this channel. =item C<error> -Common errors. Use C<&error> to send messages over this channel. +Common errors. Use C<&error> to send messages over this channel. =item C<error-gnu> diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm index b4908c0..8438fb4 100644 --- a/lib/Automake/Channels.pm +++ b/lib/Automake/Channels.pm @@ -500,7 +500,7 @@ sub _print_message ($$%) my $msg = _format_message ($location, $message, %opts); if ($opts{'partial'}) { - # Incomplete message. Store, don't print. + # Incomplete message. Store, don't print. $partial .= $msg; return; } diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index 68b3ea5..8fc5250 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2006, 2007, 2010 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 @@ -488,7 +488,7 @@ sub suffixes () =item C<rule ($rulename)> Return the C<Automake::Rule> object for the rule -named C<$rulename> if defined. Return 0 otherwise. +named C<$rulename> if defined. Return 0 otherwise. =cut diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 3261360..cb9d182 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -354,7 +354,7 @@ sub reset () =item C<var ($varname)> Return the C<Automake::Variable> object for the variable -named C<$varname> if defined. Return 0 otherwise. +named C<$varname> if defined. Return 0 otherwise. =cut diff --git a/lib/am/distdir.am b/lib/am/distdir.am index d88656c..e0f3bce 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -140,7 +140,7 @@ endif %?TOPDIR_P% ## we are not stripping a legitimate filename that starts with the ## same pattern as $(srcdir)? ## Well, it can't happen without the Makefile author distributing -## something out of the distribution (which is bad). As an example, +## something out of the distribution (which is bad). As an example, ## consider `EXTRA_DIST = ../bar'. This is an issue if $srcdir is `..', ## however getting this value for srcdir is impossible: `EXTRA_DIST = ../bar' ## implies we are in a subdirectory (so `../bar' is within the package), diff --git a/tests/insthook.test b/tests/insthook.test index 5a82bd6..a315447 100755 --- a/tests/insthook.test +++ b/tests/insthook.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005, 2007, 2010 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 @@ -52,7 +52,7 @@ test -f ok # Make sure that installing a second version doesn't erase the first # one. (This is error prone since `foo' symlinks to `foo-1.0' and the -# second version will overwrite `foo'. Hopefully `install' and `install-sh' +# second version will overwrite `foo'. Hopefully `install' and `install-sh' # are smart enough to erase the `foo' symlink before installing the new # version.) ./configure "--bindir=`pwd`/bin" -- 1.7.2.3