Fix options documentation.

* build-aux/cross-options.pl: As in --help output, write optional
arguments as [=ARG] not =[ARG].
* doc/bison.texinfo (Bison Options): Add -W/--warnings argument.

diff --git a/ChangeLog b/ChangeLog
index 4b994e07848184dd027e4188bd5b4ec444af225f..68aa54f3edbbe0db96ff3615fffa17c5164bc477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-06  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Fix options documentation.
+       * build-aux/cross-options.pl: As in --help output, write optional
+       arguments as [=ARG] not =[ARG].
+       * doc/bison.texinfo (Bison Options): Add -W/--warnings argument.
+
 2008-11-07  Akim Demaille  <demaille@gostai.com>
 
        Fix --help.

diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 2cec3696162e487e0bb0cae9b3d7859fd18348fd..58772775372fd17dcb8e2c0b3d41aa4b2d9517e8 100755 (executable)
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -28,9 +28,12 @@ while (<>)
             # put each word in @var, to build @var{name}[=@var{value}], not
             # @var{name[=value]}].
            $arg =~ s/(\w+)/\@var{$1}/g;
-           $arg = '[' . $arg . ']'
-               if $opt eq '[';
-           $option{"$long=$arg"} = $short ? "$short $arg" : '';
+           my $long_arg = "=$arg";
+           if ($opt eq '[') {
+             $long_arg = "[$long_arg]";
+             $arg = "[$arg]";
+           }
+           $option{"$long$long_arg"} = $short ? "$short $arg" : '';
        }
        else
        {

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index d4a9cc311ce2ac116c5a98714b455b8312a2d450..daeb61f80c721beba04ceb93d957e1a04d9aafb8 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -34,8 +34,8 @@ This manual (@value{UPDATED}) is for @acronym{GNU} Bison (version
 @value{VERSION}), the @acronym{GNU} parser generator.
 
 Copyright @copyright{} 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
-1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-Foundation, Inc.
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -7783,8 +7783,8 @@ traditional Yacc grammars.  If your grammar uses a Bison extension
 like @samp{%glr-parser}, Bison might not be Yacc-compatible even if
 this option is specified.
 
-@item -W
-@itemx --warnings
+@item -W [@var{category}]
+@itemx --warnings[=@var{category}]
 Output warnings falling in @var{category}.  @var{category} can be one
 of:
 @table @code