doc: fix -W and %expect documentation some.

* NEWS (2.4.3): Mention that there are documentation fixes.
* doc/bison.texinfo (Expect Decl): Make it clear that %expect
turns conflicts into errors not warnings.
(Shift/Reduce): Likewise.
(Bison Options): Don't mention -Wsyntax.  It doesn't exist.
(cherry picked from commit 3ffdd5f1254fd9403a5a1d31dbdc5b2756c22775)

diff --git a/ChangeLog b/ChangeLog
index cd16bd099483d35729aaca74b7e5122e7b6aac8b..f10cf5f51614c6efe9141c348e7376c26c48b8b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-04  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       doc: fix -W and %expect documentation some.
+       * NEWS (2.4.3): Mention that there are documentation fixes.
+       * doc/bison.texinfo (Expect Decl): Make it clear that %expect
+       turns conflicts into errors not warnings.
+       (Shift/Reduce): Likewise.
+       (Bison Options): Don't mention -Wsyntax.  It doesn't exist.
+

 2010-08-01  Joel E. Denny  <joeldenny@joeldenny.org>
 
        -Werror: fix for rules useless in parser after conflicts.
 2010-08-01  Joel E. Denny  <joeldenny@joeldenny.org>
 
        -Werror: fix for rules useless in parser after conflicts.

diff --git a/NEWS b/NEWS
index 61b14b08f937930f7b09e0f06241055ffea7a759..0f38b7412177fef2b587b9f4f9e8cc2122b1aa9c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -240,6 +240,8 @@ Bison News
    errors in Bison 2.5.  They will remain warnings, which should be
    sufficient for POSIX while avoiding backward compatibility issues.
 
    errors in Bison 2.5.  They will remain warnings, which should be
    sufficient for POSIX while avoiding backward compatibility issues.
 

+** Minor documentation fixes.
+

 * Changes in version 2.4.2 (2010-03-20):
 
 ** Some portability problems that resulted in failures and livelocks
 * Changes in version 2.4.2 (2010-03-20):
 
 ** Some portability problems that resulted in failures and livelocks

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index d7f429b22a6c5f6a4cc7c065047444c1cf16a84d..75533c7dfdd9ea9d73ab4a4e3bc2e574fa7471af 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4615,8 +4615,8 @@ number which Bison printed.  With @acronym{GLR} parsers, add an
 @code{%expect-rr} declaration as well.
 @end itemize
 
 @code{%expect-rr} declaration as well.
 @end itemize
 

-Now Bison will warn you if you introduce an unexpected conflict, but
-will keep silent otherwise.
+Now Bison will report an error if you introduce an unexpected conflict,
+but will keep silent otherwise.

 
 @node Start Decl
 @subsection The Start-Symbol
 
 @node Start Decl
 @subsection The Start-Symbol


@@ -6451,8 +6451,10 @@ This particular ambiguity was first encountered in the specifications of
 Algol 60 and is called the ``dangling @code{else}'' ambiguity.
 
 To avoid warnings from Bison about predictable, legitimate shift/reduce
 Algol 60 and is called the ``dangling @code{else}'' ambiguity.
 
 To avoid warnings from Bison about predictable, legitimate shift/reduce

-conflicts, use the @code{%expect @var{n}} declaration.  There will be no
-warning as long as the number of shift/reduce conflicts is exactly @var{n}.
+conflicts, use the @code{%expect @var{n}} declaration.
+There will be no warning as long as the number of shift/reduce conflicts
+is exactly @var{n}, and Bison will report an error if there is a
+different number.

 @xref{Expect Decl, ,Suppressing Conflict Warnings}.
 
 The definition of @code{if_stmt} above is solely to blame for the
 @xref{Expect Decl, ,Suppressing Conflict Warnings}.
 
 The definition of @code{if_stmt} above is solely to blame for the


@@ -8101,8 +8103,8 @@ Treat warnings as errors.
 @end table
 
 A category can be turned off by prefixing its name with @samp{no-}.  For
 @end table
 
 A category can be turned off by prefixing its name with @samp{no-}.  For

-instance, @option{-Wno-syntax} will hide the warnings about unused
-variables.
+instance, @option{-Wno-yacc} will hide the warnings about
+@acronym{POSIX} Yacc incompatibilities.

 @end table
 
 @noindent
 @end table
 
 @noindent