Small cleanups before making a tarball.

5 files changed, 47 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index b89a9f6d..e0110a0e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* main.c (UPDATE_YEAR): Bump to 2019.
+	(usage): Revise help message a little bit.
+	* configure.ac: Bump version to start a release spiral.
+	* NEWS: Updated.
+
 2019-01-24         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awkgram.y (Grammar): Add new production `qualified_name' which
diff --git a/NEWS b/NEWS
index e5f34f88..47ff8362 100644
--- a/NEWS
+++ b/NEWS
@@ -5,50 +5,47 @@
    are permitted in any medium without royalty provided the copyright
    notice and this notice are preserved.
 
-Changes from 4.2.x to 5.0.0
+Changes from 4.2.1 to 5.0.0
 ---------------------------
 
-1. The undocumented configure option and code that enabled the use of
+1. Support for the POSIX standard %a and %A printf formats has been added.
+
+2. The test infrastructure has been greatly improved, simplifying the
+   contents of test/Makefile.am and making it possible to generate
+   pc/Makefile.tst from test/Makefile.in.
+
+3. The regex routines have been replaced with those from GNULIB, allowing
+   me to stop carrying forward decades of changes against the original
+   ones from GLIBC.
+
+4. Infrastructure upgrades: Bison 3.2.1, Automake 1.16.1, Gettext 0.19.8.1.
+
+5. The undocumented configure option and code that enabled the use of
    non-English "letters" in identifiers is now gone.
 
-2. The `--with-whiny-user-strftime' configuration option is now gone.
+6. The `--with-whiny-user-strftime' configuration option is now gone.
 
-3. The code now makes some stronger assumptions about a C99 environment.
+7. The code now makes some stronger assumptions about a C99 environment.
 
-4. PROCINFO["platform"] yields a string indicating the platform for
+8. PROCINFO["platform"] yields a string indicating the platform for
    which gawk was compiled.
 
-5. Writing to elements of SYMTAB that are not variable names now
+9. Writing to elements of SYMTAB that are not variable names now
    causes a fatal error.
 
-6. Comment handling in the pretty-printer has been reworked almost completely
-   from scratch. As a result, comments in many corner cases that were
+10. Comment handling in the pretty-printer has been reworked almost completely
+    from scratch. As a result, comments in many corner cases that were
    previously lost are now included in the formatted output.
 
-7. Namespaces have been implemented! See the manual.  One consequence of this
-   is that file included with -i, read with -f, and command line program
-   segments must all be self-contained syntactic units. E.g., you can no
-   longer do something like this:
+11. Namespaces have been implemented! See the manual.  One consequence of this
+    is that files included with -i, read with -f, and command line program
+    segments must all be self-contained syntactic units. E.g., you can no
+    longer do something like this:
 
    	gawk -e 'BEGIN {' -e 'print "hello" }'
 
-Changes from 4.2.1 to 4.2.2
----------------------------
-
-1. Support for the POSIX standard %a and %A printf formats has been added.
-
-2. The test infrastructure has been greatly improved, simplifying the
-   contents of test/Makefile.am and making it possible to generate
-   pc/Makefile.tst from test/Makefile.in.
-
-3. The regex routines have been replaced with those from GNULIB, allowing
-   me to stop carrying forward decades of changes against the original
-   ones from GLIBC.
-
-4. Infrastructure upgrades: Bison 3.2.1, Automake 1.16.1, Gettext 0.19.8.1.
-
 XX. A number of bugs, some of them quite significant, have been fixed.
-   See the ChangeLog for details.
+    See the ChangeLog for details.
 
 Changes from 4.2.0 to 4.2.1
 ---------------------------
diff --git a/configure b/configure
index c25029cb..abca1104 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU Awk 4.2.60.
+# Generated by GNU Autoconf 2.69 for GNU Awk 4.2.61.
 #
 # Report bugs to <bug-gawk@gnu.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Awk'
 PACKAGE_TARNAME='gawk'
-PACKAGE_VERSION='4.2.60'
-PACKAGE_STRING='GNU Awk 4.2.60'
+PACKAGE_VERSION='4.2.61'
+PACKAGE_STRING='GNU Awk 4.2.61'
 PACKAGE_BUGREPORT='bug-gawk@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/gawk/'
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Awk 4.2.60 to adapt to many kinds of systems.
+\`configure' configures GNU Awk 4.2.61 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1400,7 +1400,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Awk 4.2.60:";;
+     short | recursive ) echo "Configuration of GNU Awk 4.2.61:";;
    esac
   cat <<\_ACEOF
 
@@ -1522,7 +1522,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Awk configure 4.2.60
+GNU Awk configure 4.2.61
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2231,7 +2231,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Awk $as_me 4.2.60, which was
+It was created by GNU Awk $as_me 4.2.61, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3114,7 +3114,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gawk'
- VERSION='4.2.60'
+ VERSION='4.2.61'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11600,7 +11600,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Awk $as_me 4.2.60, which was
+This file was extended by GNU Awk $as_me 4.2.61, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11668,7 +11668,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU Awk config.status 4.2.60
+GNU Awk config.status 4.2.61
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 9e11f8ca..ab008610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl
 dnl configure.ac --- autoconf input file for gawk
 dnl
-dnl Copyright (C) 1995-2018 the Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2019 the Free Software Foundation, Inc.
 dnl
 dnl This file is part of GAWK, the GNU implementation of the
 dnl AWK Programming Language.
@@ -23,7 +23,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNU Awk],[4.2.60],[bug-gawk@gnu.org],[gawk])
+AC_INIT([GNU Awk],[4.2.61],[bug-gawk@gnu.org],[gawk])
 
 # This is a hack. Different versions of install on different systems
 # are just too different. Chuck it and use install-sh.
diff --git a/main.c b/main.c
index d75e9871..d42d1f43 100644
--- a/main.c
+++ b/main.c
@@ -24,7 +24,7 @@
  */
 
 /* FIX THIS BEFORE EVERY RELEASE: */
-#define UPDATE_YEAR	2018
+#define UPDATE_YEAR	2019
 
 #include "awk.h"
 #include "getopt.h"
@@ -633,7 +633,8 @@ usage(int exitval, FILE *fp)
 which is section `Reporting Problems and Bugs' in the\n\
 printed version.  This same information may be found at\n\
 https://www.gnu.org/software/gawk/manual/html_node/Bugs.html.\n\
-PLEASE do NOT try to report bugs by posting in comp.lang.awk.\n\n"), fp);
+PLEASE do NOT try to report bugs by posting in comp.lang.awk,\n\n\
+or by using a web forum such as Stack Overflow.\n\n"), fp);
 
 	/* ditto */
 	fputs(_("gawk is a pattern scanning and processing language.\n\