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
This commit is contained in:
Akim Demaille
2012-06-05 14:06:08 +02:00
13 changed files with 85 additions and 70 deletions

View File

@@ -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
{}

View File

@@ -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,