Merge remote-tracking branch 'origin/branch-2.6' into maint

* origin/branch-2.6:
  yacc.c: always initialize yylloc
  doc: one of the fixes for an ambiguous grammar was ambiguous too
  doc: fix the dangling else with precedence directives
  doc: prefer "token" to TOKEN
  doc: formatting changes

Conflicts:
	NEWS
	doc/bison.texi

diff --cc NEWS
index 46d614cfbff7718beabd45213f78d153a4759221,393b892414934f76aa4f95d8b7739542e3784dd8..3789e92d017ed67d695659500a7e1ecade131fe3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,60 -2,15 +2,71 @@@ GNU Bison NEW
  
  * Noteworthy changes in release ?.? (????-??-??) [?]
  
 +** Changes in the format of error messages
 +
 +  This used to be the format of many error reports:
 +
 +    foo.y:5.10-24: result type clash on merge function 'merge': <t3> != <t2>
 +    foo.y:4.13-27: previous declaration
 +
 +  It is now:
 +
 +    foo.y:5.10-25: result type clash on merge function 'merge': <t3> != <t2>
 +    foo.y:4.13-27:     previous declaration
 +
 +** Exception safety (lalr1.cc)
 +
 +  The parse function now catches exceptions, uses the %destructors to
 +  release memory (the lookahead symbol and the symbols pushed on the stack)
 +  before re-throwing the exception.
 +
 +  This feature is somewhat experimental.  User feedback would be
 +  appreciated.
 +
 +** New %define variable: api.location.type (glr.cc, lalr1.cc, lalr1.java)
 +
 +  The %define variable api.location.type defines the name of the type to use
 +  for locations.  When defined, Bison no longer generates the position.hh
 +  and location.hh files, nor does the parser will include them: the user is
 +  then responsible to define her type.
 +
 +  This can be used in programs with several parsers to factor their location
 +  and position files: let one of them generate them, and the others just use
 +  them.
 +
 +  This feature was actually introduced, but not documented, in Bison 2.5,
 +  under the name "location_type" (which is maintained for backward
 +  compatibility).
 +
 +  For consistency, lalr1.java's %define variables location_type and
 +  position_type are deprecated in favor of api.location.type and
 +  api.position.type.
 +
 +** Graph improvements in DOT and XSLT
 +
 +  The graphical presentation of the states is more readable: their shape is
 +  now rectangular, the state number is clearly displayed, and the items are
 +  numbered and left-justified.
 +
 +  The reductions are now explicitly represented as transitions to other
 +  diamond shaped nodes.
 +
 +  These changes are present in both --graph output and xml2dot.xsl XSLT
 +  processing, with minor (documented) differences.
 +
 +  Two nodes were added to the documentation: Xml and Graphviz.
 +
++* Noteworthy changes in release ?.? (????-??-??) [?]
++
+ ** Bug fixes
+ 
+   Warnings about uninitialized yylloc in yyparse have been fixed.
+ 
+ ** Documentation
+ 
+   The sections about shift/reduce and reduce/reduce conflicts resolution
+   have been fixed and extended.
+ 
  * Noteworthy changes in release 2.6.5 (2012-11-07) [stable]
  
    We consider compiler warnings about Bison generated parsers to be bugs.

diff --cc THANKS
Simple merge

diff --cc doc/bison.texi
index 7bb41460f8f44bcad7807a7fa287139cd2e13ebc,8e257a607af95960cb274bcafe39013c96bd2da7..f2d3dbc52dcffd3e2a275e7b3f5fad582ee89bfb
--- 1/doc/bison.texi
--- 2/doc/bison.texi
+++ b/doc/bison.texi
@@@ -12046,8 -11886,11 +12140,11 @@@ London, Department of Computer Science
  @c LocalWords: getLVal defvar deftypefn deftypefnx gotos msgfmt Corbett LALR's
  @c LocalWords: subdirectory Solaris nonassociativity perror schemas Malloy ints
  @c LocalWords: Scannerless ispell american ChangeLog smallexample CSTYPE CLTYPE
 -@c LocalWords: clval CDEBUG cdebug deftypeopx yyterminate
 +@c LocalWords: clval CDEBUG cdebug deftypeopx yyterminate LocationType
- @c LocalWords: errorVerbose
+ @c LocalWords: parsers parser's
+ @c LocalWords: associativity subclasses precedences unresolvable runnable
+ @c LocalWords: allocators subunit initializations unreferenced untyped
+ @c LocalWords: errorVerbose subtype subtypes
  
  @c Local Variables:
  @c ispell-dictionary: "american"