Merge branch 'minor'

* minor:
  sync: update third-part files from upstream
  maint: fix typo in error message of a maintainer-only rule
  maint: bump version number 1.15 -> 1.15a ('minor' Git branch)
  release: stable minor release 1.15
  NEWS: minor improvements and fixed some typos and grammaros

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

9 files changed, 32 insertions, 32 deletions

diff --git a/INSTALL b/INSTALL
index 209984075..4cbd15f99 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2014 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
diff --git a/NEWS b/NEWS
index 661112a7b..ad3c45183 100644
--- a/NEWS
+++ b/NEWS
@@ -113,8 +113,8 @@ New in 2.0:
     with the SGI C/C++ compilers on IRIX.  The SGI depmode has been
     reported broken "in the wild" already, and we don't think investing
     time in debugging and fixing is worthwhile, especially considering
-    that SGI has last updated those compilers in 2006, and is expected
-    to retire support for them in December 2013:
+    that SGI has last updated those compilers in 2006, and retired
+    support for them in December 2013:
     <http://www.sgi.com/services/support/irix_mips_support.html>
 
   - Automake 2.0 will remove support for MS-DOS and Windows 95/98/ME
@@ -151,24 +151,24 @@ New in 1.15:
     (3) the "set -f" and "set +f" shell commands work, and, respectively,
         disable and enable shell globbing.
 
-  - The script implements stricter error checking, an it will now complain
-    and bail out if:
-    (1) the options -d and -t are used together;
-    (2) the argument passed to option -t must be a directory;
+  - The script implements stricter error checking, and now it complains
+    and bails out if any of the following expectations is not met:
+    (1) the options -d and -t are never used together;
+    (2) the argument passed to option -t is a directory;
     (3) if there are two or more SOURCEFILE arguments, the
         DESTINATION argument must be a directory.
 
 * Automake-generated testsuites:
 
   - The default test-driver used by the Automake-generates testsuites
-    now append the result and exit status of each "plain" test to the
+    now appends the result and exit status of each "plain" test to the
     associated log file (automake bug#11814).
 
   - The perl implementation of the TAP testsuite driver is no longer
     installed in the Automake's scripts directory, and is instead just
     distributed as a "contrib" addition.  There should be no reason to
     use this implementation anyway in real packages, since the awk+shell
-    implementation of the TAP driver (that is documented in the manual)
+    implementation of the TAP driver (which is documented in the manual)
     is more portable and has feature parity with the perl implementation.
 
   - The rule generating 'test-suite.log' no longer risk incurring in an
@@ -178,7 +178,7 @@ New in 1.15:
 * Distribution:
 
   - Automake bug#18286: "make distcheck" could sometimes fail to detect
-    missing files in the distribution tarball, especially in those cases
+    files missing from the distribution tarball, especially in those cases
     where both the generated files and their dependencies are explicitly
     in $(srcdir).  An important example of this are *generated* makefile
     fragments included at Automake time in Makefile.am; e.g.:
@@ -195,11 +195,11 @@ New in 1.15:
 
   - As a consequence of the previous change, "make distcheck" will run
     using '$(distdir)/_build/sub' as the build directory, rather than
-    simply '$(distdir)/_build' (as it was with Automake 1.14 and earlier).
-    Consequently, the './configure' and 'make' invocations issued by the
-    distcheck recipe will have $(srcdir) equal to '../..', rather than to
-    just '..' (as it was with Automake 1.14 and earlier).  Dependent and
-    similar variables (e.g., top_srcdir) are also changed accordingly.
+    simply '$(distdir)/_build' (as it was the case for Automake 1.14 and
+    earlier).  Consequently, the './configure' and 'make' invocations
+    issued by the distcheck recipe now have $(srcdir) equal to '../..',
+    rather than to just '..'.  Dependent and similar variables (e.g.,
+    '$(top_srcdir)') are also changed accordingly.
 
     Thus, Makefiles that made assumptions about the exact values of the
     build and source directories used by "make distcheck" will have to
@@ -226,17 +226,17 @@ New in 1.15:
     hash keys order in Perl 5.18.
 
   - In older Automake versions, if a user defined one single Makefile
-    fragment (say 'foo.am') to be included (via Automake includes) in
+    fragment (say 'foo.am') to be included via Automake includes in
     his main Makefile.am, and defined a custom make rule to generate that
-    file from other data, Automake used to spuriously complain about with
-    something like "... overrides Automake target '$(srcdir)/foo.am".
+    file from other data, Automake used to spuriously complain with some
+    message like "... overrides Automake target '$(srcdir)/foo.am".
     This bug is now fixed.
 
   - The user can now extend the special .PRECIOUS target, the same way
     he could already do with the .MAKE .and .PHONY targets.
 
-  - Fixed confusing typos in the manual and in some warning messages
-    (automake bug#16827 and bug#16997).
+  - Some confusing typos have been fixed in the manual and in few warning
+    messages (automake bug#16827 and bug#16997).
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/lib/INSTALL b/lib/INSTALL
index 209984075..4cbd15f99 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2014 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
diff --git a/lib/config.guess b/lib/config.guess
index 6c32c8645..dbfb9786c 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-11-04'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/lib/config.sub b/lib/config.sub
index 7ffe37378..6d2e94c8b 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-12-03'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@ case $basic_machine in
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 190f7b5db..de934c2da 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -9,7 +9,7 @@ my $VERSION = '2014-11-20 17:25'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2008-2014 Free Software Foundation, Inc.
+# Copyright (C) 2008-2015 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
diff --git a/lib/gnupload b/lib/gnupload
index 0832e16c9..406a3f7e6 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -3,7 +3,7 @@
 
 scriptversion=2013-03-19.17; # UTC
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 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
diff --git a/lib/update-copyright b/lib/update-copyright
index 90624e900..308fbf17f 100755
--- a/lib/update-copyright
+++ b/lib/update-copyright
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
 
 my $VERSION = '2013-01-03.09:41'; # UTC
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 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
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index b9dd0e90c..078b7efb3 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -417,7 +417,7 @@ web-manual-update:
 	     exit 1;; \
 	esac
 	$(AM_V_at)test -f $(web_manual_dir)/$(PACKAGE).html || { \
-	  echo 'You have to run "$(MAKE) web-manuals" before' \
+	  echo 'You have to run "$(MAKE) web-manual" before' \
 	       'invoking "$(MAKE) $@"' >&2; \
 	  exit 1; \
 	}