Merge branch 'maint'

* origin/maint:
  maint: word changes
  lalr1.cc: fix test suite portability
  maint: fix an erroneous include
  tests: check that headers are self contained
  doc: add missing documentation for --report

Conflicts:
	NEWS
	data/location.cc

diff --cc NEWS
index a5c7a99dff06984aef67a8a624702428a6547729,c1ab7aa345348a3462e5c5d6b384ebfca33cc998..fd1cadd4c4dc7dcf16cedc28137e1b4748485af5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2130,8 -1896,7 +2132,8 @@@ along with this program.  If not, see <
   LocalWords:  namespaces strerror const autoconfiguration Dconst Autoconf's FDL
   LocalWords:  Automake TMPDIR LESSEQ ylwrap endif yydebug YYTOKEN YYLSP ival hh
   LocalWords:  extern YYTOKENTYPE TOKENTYPE yytokentype tokentype STYPE lval pdf
 - LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp calc yyo fval
 + LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp Wother nterm arg init
-  LocalWords:  TOK
++ LocalWords:  TOK calc yyo fval
  
  Local Variables:
  mode: outline

diff --cc README-hacking
Simple merge

diff --cc THANKS
Simple merge

diff --cc data/location.cc
index 218910b133344b88a8759864f31b5b9e21359881,92b6d0967fad7dfbaa8e1ebb3630b6c28ca00526..14688ca4e32f57034507ae8a7fe82084b23c97a7
--- 1/data/location.cc
--- 2/data/location.cc
+++ b/data/location.cc
@@@ -262,52 -288,9 +262,50 @@@ m4_define([b4_location_define]
        ostr << '-' << last.column;
      return ostr;
    }
 +]])
 +
  
- # include <iosfwd>
 +# We do want M4 expansion after # for CPP macros.
 +m4_changecom()
 +b4_defines_if([
 +m4_divert_push(0)dnl
 +@output(b4_dir_prefix[]position.hh@)@
 +b4_copyright([Positions for Bison parsers in C++])[
 +
 +/**
 + ** \file ]b4_dir_prefix[position.hh
 + ** Define the ]b4_namespace_ref[::position class.
 + */
 +
 +]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[
 +
 +# include <algorithm> // std::max
++# include <iostream>
 +# include <string>
 +
 +]b4_null_define[
 +
 +]b4_namespace_open[
 +]b4_position_define[
  ]b4_namespace_close[
 +]b4_cpp_guard_close([b4_dir_prefix[]position.hh])
 +@output(b4_dir_prefix[]location.hh@)@
 +b4_copyright([Locations for Bison parsers in C++])[
 +
 +/**
 + ** \file ]b4_dir_prefix[location.hh
 + ** Define the ]b4_namespace_ref[::location class.
 + */
 +
 +]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[
  
- # include <iostream>
- # include <string>
 +# include "position.hh"
 +
 +]b4_namespace_open[
 +]b4_location_define[
 +]b4_namespace_close[
  ]b4_cpp_guard_close([b4_dir_prefix[]location.hh])
  m4_divert_pop(0)
 +])# b4_defines_if
 +m4_popdef([b4_copyright_years])dnl
  m4_changecom([#])

diff --cc doc/bison.texi
Simple merge

diff --cc tests/headers.at
Simple merge