Fix placing of ellipses in English text and synopses.

* Makefile.am: Be sure to add a space before `...' in natural
language text.
* automake.in (scan_autoconf_traces): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define): Likewise.
* lib/am/dejagnu.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/gnupload (dprint, upload): Likewise.
* tests/confdeps.test: Likewise.
* tests/location.test: Adjust expected output.
* automake.in (usage): In synopsis, use singular for OPTION,
* remove space before ellipsis.
* aclocal.in (usage): Likewise.  Also, fix indentation.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index ad0f0a782212b160562162f2457a5c344884aed3..7866ba980dc25dd6f90ee059f10c2543523a6313 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2010-04-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix placing of ellipses in English text and synopses.
+       * Makefile.am: Be sure to add a space before `...' in natural
+       language text.
+       * automake.in (scan_autoconf_traces): Likewise.
+       * lib/Automake/Rule.pm (define): Likewise.
+       * lib/Automake/Variable.pm (define): Likewise.
+       * lib/am/dejagnu.am: Likewise.
+       * lib/am/progs.am: Likewise.
+       * lib/gnupload (dprint, upload): Likewise.
+       * tests/confdeps.test: Likewise.
+       * tests/location.test: Adjust expected output.
+       * automake.in (usage): In synopsis, use singular for OPTION,
+       * remove space before ellipsis.
+       * aclocal.in (usage): Likewise.  Also, fix indentation.
+
        Fix more duplicate message prefixes.
        * lib/Automake/XFile.pm (seek): Do not prepend $me.
        ($me): Remove now-unused package-global.

diff --git a/Makefile.am b/Makefile.am
index f5ab44fb04c918f44c02ce2fbc203cb354382a69..829418b214d9caf65dd0160be1e7fab569b7b027 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -595,7 +595,7 @@ fetch:
                  >>Fetchdir/update.patch 2>/dev/null; then :; \
          else \
            stat=1; \
-           echo "Updating $(srcdir)/lib/$$file..."; \
+           echo "Updating $(srcdir)/lib/$$file ..."; \
            cp Fetchdir/$$file $(srcdir)/lib/$$file; \
          fi; \
        done; \

diff --git a/Makefile.in b/Makefile.in
index 15d81ba8dc5beac56300798350d66bfc3d54ee40..f1c07bafe0f6a11f29ae96d05b93475ac30c604e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1279,7 +1279,7 @@ fetch:
                  >>Fetchdir/update.patch 2>/dev/null; then :; \
          else \
            stat=1; \
-           echo "Updating $(srcdir)/lib/$$file..."; \
+           echo "Updating $(srcdir)/lib/$$file ..."; \
            cp Fetchdir/$$file $(srcdir)/lib/$$file; \
          fi; \
        done; \

diff --git a/aclocal.in b/aclocal.in
index c229367abf542f82af244512f7c4225b5055abb7..964a1b50b8a3e24a26b20ecafe17ad69333497e2 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -869,14 +869,14 @@ sub usage ($)
 {
   my ($status) = @_;
 
-  print "Usage: aclocal [OPTIONS] ...
+  print "Usage: aclocal [OPTION]...
 
 Generate `aclocal.m4' by scanning `configure.ac' or `configure.in'
 
 Options:
       --acdir=DIR           directory holding config files (for debugging)
       --diff[=COMMAND]      run COMMAND [diff -u] on M4 files that would be
-                              changed (implies --install and --dry-run)
+                            changed (implies --install and --dry-run)
       --dry-run             pretend to, but do not actually update any file
       --force               always update output file
       --help                print this help, then exit

diff --git a/automake.in b/automake.in
index e8a97270469b88acd15c361be2ea07e8a8731fa0..33e584655df73979ae8098cdedce4f101e98fc8f 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -5350,7 +5350,7 @@ sub scan_autoconf_traces ($)
          if ($seen_init_automake)
            {
              error ($where, "AC_CONFIG_AUX_DIR must be called before "
-                    . "AM_INIT_AUTOMAKE...", partial => 1);
+                    . "AM_INIT_AUTOMAKE ...", partial => 1);
              error ($seen_init_automake, "... AM_INIT_AUTOMAKE called here");
            }
          $config_aux_dir = $args[1];
@@ -8341,7 +8341,7 @@ sub generate_makefile ($$)
 # Print usage information.
 sub usage ()
 {
-    print "Usage: $0 [OPTION] ... [Makefile]...
+    print "Usage: $0 [OPTION]... [Makefile]...
 
 Generate Makefile.in for configure from Makefile.am.
 

diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index d7e71055cf55a067273dbf32cdebb30beb0995e8..ad63cc57e57d47c401d0cdb6b06ce83212136342 100644 (file)
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -659,7 +659,7 @@ sub define ($$$$$)
                  ## is legitimate. (This is phony.test.)
 
                  # msg ('syntax', $where,
-                 #      "redefinition of `$target'$condmsg...", partial => 1);
+                 #      "redefinition of `$target'$condmsg ...", partial => 1);
                  # msg_cond_rule ('syntax', $cond, $target,
                  #                "... `$target' previously defined here");
                }
@@ -695,7 +695,7 @@ sub define ($$$$$)
 
              msg_cond_rule ('override', $cond, $target,
                             "user target `$target' defined here"
-                            . "$condmsg...", partial => 1);
+                            . "$condmsg ...", partial => 1);
              msg ('override', $where,
                   "... overrides Automake target `$oldname' defined here",
                   partial => $hint);
@@ -719,7 +719,7 @@ sub define ($$$$$)
              my $oldsource = $tdef->source;
              return () if $source eq $oldsource && $target eq $oldname;
 
-             msg ('syntax', $where, "redefinition of `$target'$condmsg...",
+             msg ('syntax', $where, "redefinition of `$target'$condmsg ...",
                   partial => 1);
              msg_cond_rule ('syntax', $cond, $target,
                             "... `$oldname' previously defined here");

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 5d7c1d510d37ea78addea6e92f66f7ff6702c127..af0515ef433a098f63c1ee519294c2a65a021f7a 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -881,7 +881,7 @@ sub define ($$$$$$$$)
        {
          error ($def->location,
                 "Automake variable `$var' was set with `"
-                . $def->type . "=' here...", partial => 1);
+                . $def->type . "=' here ...", partial => 1);
          error ($where, "... and is now set with `$type=' here.");
          prog_error ("Automake variable assignments should be consistently\n"
                      . "defined with the same sign.");
@@ -896,7 +896,7 @@ sub define ($$$$$$$$)
              my $condmsg = ($cond == TRUE
                             ? '' : (" in condition `" . $cond->human . "'"));
              msg_cond_var ('override', $cond, $var,
-                           "user variable `$var' defined here$condmsg...",
+                           "user variable `$var' defined here$condmsg ...",
                            partial => 1);
              msg ('override', $where,
                   "... overrides Automake variable `$var' defined here");

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 08de45c61ae0ae3b811eaa727116e7c9621e1993..37f34ca4498ddd9a835f5cb6b900fefc6ed53a95 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006
+## Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2006, 2010
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -73,7 +73,7 @@ check-DEJAGNU: site.exp
 ## the possibility of a corrupted site.exp if make is interrupted.
 ## Jim Meyering has some useful text on this topic.
 site.exp: Makefile
-       @echo 'Making a new site.exp file...'
+       @echo 'Making a new site.exp file ...'
        @echo '## these variables are automatically generated by make ##' >site.tmp
        @echo '# Do not edit here.  If you wish to override these values' >>site.tmp
        @echo '# edit the last section' >>site.tmp

diff --git a/lib/am/progs.am b/lib/am/progs.am
index d39b23dbb6dd24c32384ada65f20a4aaf8c87bf8..d26968a67e5a5163f551287fcd33a1abf51bdb7a 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
 ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004,
-## 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+## 2006, 2007, 2008, 2009, 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
@@ -42,7 +42,7 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
            -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
        sed 'N;N;N;s,\n, ,g' | \
 ## The following awk script turns that into one line containing directories
-## and then lines of 'type target_name_or_directory sources...', with type
+## and then lines of 'type target_name_or_directory sources ...', with type
 ## 'd' designating directories, and 'f' files.
        $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
          { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

diff --git a/lib/gnupload b/lib/gnupload
index d4450753821d7864f19e9d525ed96fd71793e0de..08cb8421176e0d5372d961dd6a1cc3c39d7fcbdf 100755 (executable)
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2010-02-08.07; # UTC
+scriptversion=2010-04-25.17; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -185,7 +185,7 @@ done
 
 dprint()
 {
-  echo "Running $*..."
+  echo "Running $* ..."
 }
 
 if $dry_run; then
@@ -249,7 +249,7 @@ echo
 if test $# -ne 0; then
   for file
   do
-    echo "Signing $file..."
+    echo "Signing $file ..."
     rm -f $file.sig
     echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
   done
@@ -388,7 +388,7 @@ for dest in $to
 do
   for file
   do
-    echo "Uploading $file to $dest..."
+    echo "Uploading $file to $dest ..."
     stmt=
     files="$file $file.sig"
     destdir=`echo $dest | sed 's/[^:]*://'`

diff --git a/tests/confdeps.test b/tests/confdeps.test
index 47cdc16c485a4b2afe0a334bb96f75a0769fc3ed..f706e8c7570657b4fa8ef856cf35b27ab4c2f1b8 100755 (executable)
--- a/tests/confdeps.test
+++ b/tests/confdeps.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -21,12 +21,12 @@
 echo "FOO = foo"        > Makefile.am
 set -e
 
-echo "$me: Generated by aclocal..."
+echo "$me: Generated by aclocal ..."
 $ACLOCAL
 $AUTOMAKE
 grep '^\$(ACLOCAL_M4):' Makefile.in
 
-echo "$me: Not generated by aclocal..."
+echo "$me: Not generated by aclocal ..."
 # Pretend it is not from aclocal (remove the signature),
 # but keep it correct, i.e., with AM_INIT_AUTOMAKE etc.
 sed -n '3,$p' aclocal.m4 >aclocal.m4t

diff --git a/tests/location.test b/tests/location.test
index 21cfb4e92cc2b9fb2c6c0aec4c99dafad2cd00f9..bdd00c403b2feefab036bfd46d435fbc3325f0a8 100755 (executable)
--- a/tests/location.test
+++ b/tests/location.test
@@ -61,11 +61,11 @@ library.am: change your target to read `libfoo.a$(EXEEXT)'
 Makefile.am:3:   while processing library `libfoo.a'
 program.am: target `libfoo.a$(EXEEXT)' was defined here
 Makefile.am:1:   while processing program `libfoo.a'
-program.am: warning: redefinition of `libfoo.a$(EXEEXT)'...
+program.am: warning: redefinition of `libfoo.a$(EXEEXT)' ...
 Makefile.am:1:   while processing program `libfoo.a'
 library.am: ... `libfoo.a' previously defined here
 Makefile.am:3:   while processing library `libfoo.a'
-tags.am: warning: redefinition of `ctags'...
+tags.am: warning: redefinition of `ctags' ...
 program.am: ... `ctags$(EXEEXT)' previously defined here
 Makefile.am:6:   while processing program `ctags'
 EOF