Merge remote-tracking branch 'origin/maint'

* origin/maint:
  version 2.5.1
  NEWS: prepare for 2.5.1.
  maint: update release procedure
  maint: fix comment typos
  maint: post-release administrivia

Conflicts:
	NEWS

.gitignore

@@ -31,3 +31,4 @@
 /patches
 /releases
 /stamp-h*
+/README-release

.prev-version

@@ -1 +1 @@
-2.3b
+2.5.1

ChangeLog-2012

@@ -10643,7 +10643,7 @@
 	(PERCENT_LEX_PARAM, PERCENT_PARSE_PARAM): Remove the {...} part,
 	which is now, again, a separate token.
 	Adjust all dependencies.
-	Whereever actions with $ and @ are used, use translate_code.
+	Wherever actions with $ and @ are used, use translate_code.
 	(action): Remove this nonterminal which is now useless.
 	* src/reader.c: Include assert.h, scan-gram.h and scan-code.h.
 	(grammar_current_rule_action_append): Use translate_code.
@@ -11829,10 +11829,10 @@
 
 	* Makefile.am: DJGPP specific files added to EXTRA_DIST.
 	* djgpp/Makefile.maint: Fix PACKAGE variable computation.
-	* djgpp/config.bat: Replace every occurence of the file name
+	* djgpp/config.bat: Replace every occurrence of the file name
 	scan-gram-c.c with c-scan-gram.c. The same for scan-skel-c.c with
 	c-scan-skel.c to conform with the 8.3 file name restriction on MSDOS.
-	* djgpp/config.sed: Replace every occurence of the file name
+	* djgpp/config.sed: Replace every occurrence of the file name
 	scan-gram-c.c with c-scan-gram.c. The same for scan-skel-c.c with
 	c-scan-skel.c to conform with the 8.3 file name restriction on MSDOS.
 	* djgpp/djunpack.bat: DJGPP specific file.
@@ -15105,7 +15105,7 @@
 	(YYERROR): Goto to yyerrorlab, not yyerrlab1.
 	(yyerrlab1): Remove, but where it used to be (now the bottom part of
 	yyerrlab), when hitting EOF, pop the whole stack here instead of
-	merely falling thru the default error handling mechanism.
+	merely falling through the default error handling mechanism.
 	(yyerrorlab): New label, with the old contents of YYERROR,
 	plus the following change: pop the stack of rhs corresponding
 	to the production that invoked YYERROR.  That is how Yacc
@@ -18827,7 +18827,7 @@
 
 2002-07-30  Akim Demaille  <akim@epita.fr>
 
-	`stage' was accidently included in a previous patch.
+	`stage' was accidentally included in a previous patch.
 	Initiate its autoconfiscation.
 
 	* configure.in: Look for malloc.h and sys/times.h.
@@ -21830,7 +21830,7 @@
 	(insert_accepting_state, augment_automaton): Remove, since now
 	these states are automatically computed from the initial state.
 	(generate_states): Adjust.
-	* src/print.c: When reporting a rule number to the user, substract
+	* src/print.c: When reporting a rule number to the user, subtract
 	1, so that the axiom rule is rule 0, and the first user rule is 1.
 	* src/reduce.c: Likewise.
 	* src/print_graph.c (print_core): For the time being, just as for

NEWS

@@ -1,7 +1,6 @@
-Bison News
+GNU Bison NEWS
-----------
 
-* Changes in version ?.? (????-??-??):
+* Noteworthy changes in release ?.? (????-??-??) [?]
 
 ** Additional yylex/yyparse arguments
 
@@ -69,7 +68,7 @@ Bison News
   allow the programmer to prune possible parses based on the values of
   runtime expressions.
 
-* Changes in version 2.5.1 (????-??-??):
+* Noteworthy changes in release 2.5.1 (2012-06-05) [stable]
 
 ** Future changes:
 

README-hacking

@@ -77,8 +77,9 @@ out-of-date version of the C code, but the process is not foolproof.
 Also, you may run into similar problems yourself if you modify Bison.
 
 Only building the initial full source tree will be a bit painful.
-Later, after synchronizing from the repository a plain `make' should
+Later, after synchronizing from the repository a plain 'make' should
-be sufficient.
+be sufficient.  Note, however, that when gnulib is updated, running
+'./bootstrap' again might be needed.
 
 ** First checkout
 
@@ -125,14 +126,14 @@ explicitly by the user.
 
 *** Updating Bison
 
-If you pull a newer version of a branch, say via `git pull', you might
+If you pull a newer version of a branch, say via "git pull", you might
-import requests for updated submodules.  A simple `git diff' will
+import requests for updated submodules.  A simple "git diff" will
 reveal if the current version of the submodule (i.e., the actual
 contents of the gnulib directory) and the current request from the
 subscriber (i.e., the reference of the version of gnulib that the
 Bison reporitory requests) differ.  To upgrade the submodules (i.e.,
 to check out the version that is actually requested by the subscriber,
-run `git submodule update'.
+run "git submodule update".
 
         $ git pull
         $ git submodule update
@@ -184,42 +185,46 @@ release:
   that 1. Bison compiles cleanly, 2. the parsers it produces compile
   cleanly too.
 
-- Build with -DGNULIB_POSIXCHECK.  It suggests gnulib modules that can
+- Maybe build with -DGNULIB_POSIXCHECK, which suggests gnulib modules
-  fix portability issues.
+  that can fix portability issues.  See if you really want to pay
+  attention to its warnings; there's no need to obey blindly to it
+  (<http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00057.html>).
 
-- Check with `make syntax-check' if there are issues diagnosed by
+- Check with "make syntax-check" if there are issues diagnosed by
   gnulib.
 
-- run `make maintainer-check' which:
+- run "make maintainer-check" which:
-  - runs `valgrind -q bison' to run Bison under Valgrind.
+  - runs "valgrind -q bison" to run Bison under Valgrind.
   - runs the parsers under Valgrind.
   - runs the test suite with G++ as C compiler...
 
-- run `make maintainer-push-check', which runs `make maintainer-check'
+- run "make maintainer-push-check", which runs "make maintainer-check"
   while activating the push implementation and its pull interface wrappers
   in many test cases that were originally written to exercise only the
   pull implementation.  This makes certain the push implementation can
   perform every task the pull implementation can.
 
-- run `make maintainer-xml-check', which runs `make maintainer-check'
+- run "make maintainer-xml-check", which runs "make maintainer-check"
   while checking Bison's XML automaton report for every working grammar
   passed to Bison in the test suite.  The check just diffs the output of
   Bison's included XSLT style sheets with the output of --report=all and
   --graph.
 
-- running `make maintainer-release-check' takes care of running
+- running "make maintainer-release-check" takes care of running
   maintainer-check, maintainer-push-check and maintainer-xml-check.
 
 - Change tests/atlocal/CFLAGS to add your preferred options.  For
-  instance, `-traditional' to check that the parsers are K&R.  Note
+  instance, "-traditional" to check that the parsers are K&R.  Note
-  that it does not make sense for glr.c, which should be ANSI,
+  that it does not make sense for glr.c, which should be ANSI, but
-  but currently is actually GNU C, nor for lalr1.cc.
+  currently is actually GNU C, nor for lalr1.cc.
 
 - Test with a very recent version of GCC for both C and C++.  Testing
   with older versions that are still in use is nice too.
 
 
 * Release Procedure
+This section needs to be updated to take into account features from
+gnulib.  In particular, be sure to read README-release.
 
 ** Update the submodules.  See above.
 
@@ -235,7 +240,7 @@ This helps: grep -l '\<_(' *
 See above.
 
 ** Update the foreign files
-Running `./bootstrap' in the top level should update them all for you.
+Running "./bootstrap" in the top level should update them all for you.
 This covers PO files too.  Sometimes a PO file contains problems that
 causes it to be rejected by recent Gettext releases; please report
 these to the Translation Project.
@@ -247,7 +252,7 @@ Bison sources.
 
 ** Check copyright years.
 We update years in copyright statements throughout Bison once at the
-start of every year by running `make update-copyright'.  However, before
+start of every year by running "make update-copyright".  However, before
 a release, it's good to verify that it's actually been run.  Besides the
 copyright statement for each Bison file, check the copyright statements
 that the skeletons insert into generated parsers, and check all
@@ -258,55 +263,57 @@ The version number, *and* the date of the release (including for
 betas).
 
 ** Mention the release name in a commit message
-Should have an entry similar to `Version 2.3b.'.
+Should have an entry similar to "Version 2.3b.".
 
 ** Tag the release
 Before Bison will build with the right version number, you must tag
 the release in git.  Do this after all other changes.  The command is
 similar to:
 
-  git tag -a v2.3b
+  git tag -a v2.3b -m "Bison 2.3b."
-
-The commit message can be simply:
-
-  Bison 2.3b
 
 ** Push
-Once `make distcheck' passes, push your changes and the tag.
+Once "make distcheck" passes, push your changes and the tag.
-`git push' without arguments will not push the tag.
+"git push" without arguments will not push the tag.
 
-** make alpha
+** make alpha, beta, or release
-FIXME: `make alpha' is not maintained and is broken.  These
+See README-release.
-instructions need to be replaced or removed.
-
-Running `make alpha' is absolutely perfect for beta releases: it makes
-the tarballs, the xdeltas, and prepares (in /tmp/) a proto
-announcement.  It is so neat, that that's what I use anyway for
-genuine releases, but adjusting things by hand (e.g., the urls in the
-announcement file, the ChangeLog which is not needed etc.).
-
-If it fails, you're on your own...
-
-It requires GNU Make.
 
 ** Upload
-The generic GNU upload procedure is at:
+There are two ways to upload the tarballs to the GNU servers: using
+gnupload (from gnulib), or by hand.  Obviously prefer the former.  But
+in either case, be sure to read the following paragraph.
 
-  http://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads
+*** Setup
+You need "gnupg".
 
-Follow the instructions there to register your information so you're permitted
+Make sure your public key has been uploaded at least to
-to upload.  Make sure your public key has been uploaded at least to
 keys.gnupg.net.  You can upload it with:
 
   gpg --keyserver keys.gnupg.net --send-keys F125BDF3
 
 where F125BDF3 should be replaced with your key ID.
 
+*** Using gnupload
+You need "ncftp".
+
+At the end "make release" (or alpha/beta) will display the prodecure
+to run.  Just copy and paste it in your shell.
+
+*** By hand
+
+The generic GNU upload procedure is at:
+
+  http://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads
+
+Follow the instructions there to register your information so you're permitted
+to upload.
+
 Here's a brief reminder of how to roll the tarballs and upload them:
 
 *** make distcheck
 *** gpg -b bison-2.3b.tar.gz
-*** In a file named `bison-2.3b.tar.gz.directive', type:
+*** In a file named "bison-2.3b.tar.gz.directive", type:
 
       version: 1.1
       directory: bison
@@ -372,10 +379,10 @@ replaced with your key ID.
 Complete/fix the announcement file.  The generated list of recipients
 (info-gnu@gnu.org, bug-bison@gnu.org, help-bison@gnu.org,
 bison-patches@gnu.org, and coordinator@translationproject.org) is
-appropriate for a stable release or a ``serious beta''.  For any other
+appropriate for a stable release or a "serious beta".  For any other
-release, drop at least info-gnu@gnu.org.  For an example of how to fill
+release, drop at least info-gnu@gnu.org.  For an example of how to
-out the rest of the template, search the mailing list archives for the
+fill out the rest of the template, search the mailing list archives
-most recent release announcement.
+for the most recent release announcement.
 
 For a stable release, send the same announcement on the comp.compilers
 newsgroup by sending email to compilers@iecc.com.  Do not make any Cc as
@@ -383,7 +390,7 @@ the moderator will throw away anything cross-posted or Cc'ed.  It really
 needs to be a separate message.
 
 ** Bump the version number
-In configure.ac.  Run `make'.  So that developers don't accidentally add new
+In configure.ac.  Run "make".  So that developers don't accidentally add new
 items to the old NEWS entry, create a new empty NEWS entry something like:
 
   Changes in version ?.? (????-??-??):

bootstrap.conf

@@ -18,12 +18,17 @@
 # gnulib modules used by this package.
 gnulib_modules='
   announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
-  configmake dirname error extensions fdl fopen-safer gendocs getopt-gnu
+  configmake
+  dirname
+  do-release-commit-and-tag
+  error extensions fdl fopen-safer gendocs getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
   mbswidth obstack perror progname
-  quote quotearg realloc-posix
+  quote quotearg
+  readme-release
+  realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
   unistd unistd-safer unlocked-io update-copyright unsetenv verify
   warnings
@@ -79,6 +84,8 @@ bootstrap_epilogue()
   # Make sure we don't need src/bison, which usually doesn't exist at
   # the time of a bootstrap.
   touch src/parse-gram.[ch]
+
+  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
 }
 
 # Keep our bootstrap script in sync with gnulib's.  If we ever need to

build-aux/.gitignore

@@ -22,3 +22,4 @@
 /vc-list-files
 /warn-on-use.h
 /ylwrap
+/do-release-commit-and-tag

data/yacc.c

@@ -199,7 +199,7 @@ m4_define([b4_declare_parser_state_variables], [b4_pure_if([[
        `yyvs': related to semantic values.]b4_locations_if([[
        `yyls': related to locations.]])[
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */

djgpp/README.in

@@ -179,7 +179,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 	This will install the products into your DJGPP installation tree given
 	by the default prefix "/dev/env/DJDIR".  If you prefer to install them
-	into some other directory you will have to set prefix to the appropiate
+	into some other directory you will have to set prefix to the appropriate
 	value:
 	  make install prefix=z:/some/other/place
 

djgpp/config.bat

@@ -471,7 +471,7 @@ redir -e /dev/null rm %XSRC%/po/stamp-cat-id
 
 Rem Update the arguments file for the configure script.
 Rem We prefer without-included-gettext because libintl.a from gettext package
-Rem is the only one that is garanteed to have been ported to DJGPP.
+Rem is the only one that is guaranteed to have been ported to DJGPP.
 echo --enable-nls --without-included-gettext >> args
 goto ConfigurePackage
 

src/parse-gram.c

@@ -1937,7 +1937,7 @@ YYLTYPE yylloc;
        `yyvs': related to semantic values.
        `yyls': related to locations.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */

tests/existing.at

@@ -1478,7 +1478,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 %token RAND
 %token SRAND
 %token COPY
-%token THRU
+%token THROUGH
 %token TOP
 %token BOTTOM
 %token UPPER
@@ -1604,12 +1604,12 @@ placeless_element:
                 {}
           DELIMITED
         | COPY TEXT
-        | COPY TEXT THRU
+        | COPY TEXT THROUGH
                 {}
           DELIMITED
                 {}
           until
-        | COPY THRU
+        | COPY THROUGH
                 {}
           DELIMITED
                 {}

tests/local.at

@@ -624,7 +624,7 @@ main (void)
 # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before
 # expanding macros, so it corrupts some special characters in the
 # macros.  To avoid this, expand now and pass it the result with proper
-# string quotation.  Assume args 7 thru 12 expand to properly quoted
+# string quotation.  Assume args 7 through 12 expand to properly quoted
 # strings.
 
 m4_if(m4_index(m4_quote($3), [no-xml]), -1,