Merge remote-tracking branch 'origin/maint'

[bison.git] / doc / refcard.tex

diff --git a/doc/refcard.tex b/doc/refcard.tex
index ead2a56382eef54e080e9f3df0039878e5a1ada8..caabf7e793d7142e95acf4e591c0871d406e7a86 100644 (file)
--- a/doc/refcard.tex
+++ b/doc/refcard.tex
@@ -19,24 +19,22 @@
 \def\finalout{\overfullrule=0pt}
 %\finalout
 
-% Copyright (c) 1998, 2001  Free Software Foundation, Inc.
+% Copyright (c) 1998, 2001, 2009-2012 Free Software Foundation, Inc.
 %
 % This file is part of Bison.
 %
-% Bison is free software; you can redistribute them and/or modify them
-% under the terms of the GNU General Public License as published by the
-% Free Software Foundation; either version 2, or (at your option) any
-% later version.
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 %
-% Bison is distributed in the hope that it will be useful, but WITHOUT
-% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-% for more details.
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with either Flex or Bison; see the file COPYING.  If not, write
-% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -96,9 +94,9 @@ For information, write to the:
 \vskip .2\baselineskip
 \centerline{Free Software Foundation, Inc.}
 \vskip .2\baselineskip
-\centerline{59 Temple Place - Suite 330}
+\centerline{51 Franklin Street, Fifth Floor}
 \vskip .2\baselineskip
-\centerline{Boston, MA 02111-1307 USA}
+\centerline{Boston, MA 02110-1301 USA}
 \endgroup}
 
 %%%% smallcopyrightnotice for two column printing on one page.
@@ -121,9 +119,9 @@ For information, write to the:
 \vskip .2\baselineskip
 \centerline{Free Software Foundation, Inc.}
 \vskip .2\baselineskip
-\centerline{59 Temple Place - Suite 330}
+\centerline{51 Franklin Street, Fifth Floor}
 \vskip .2\baselineskip
-\centerline{Boston, MA 02111-1307 USA}
+\centerline{Boston, MA 02110-1301 USA}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -458,7 +456,7 @@ as either {\tt first_column} or {\tt last_column}.
 \section {Variables and Types}
 %*****************************
 
-\key{Current look ahead token.}                {yychar}
+\key{Current lookahead token.}                 {yychar}
 \key{Debug mode flag.}                         {yydebug}
 \key{Data associated with the current token.}  {yylval}
 \key{Source position of current token.}        {yylloc}
@@ -489,8 +487,8 @@ as either {\tt first_column} or {\tt last_column}.
 \key{Quit parsing immediately. Return 1.}           {YYABORT}
 \key{Quit parsing immediately. Return 0.}           {YYACCEPT}
 \key{Pretend a syntax error occurred.}              {YYERROR}
-\key{Value in {\tt yychar} if no look-ahead token.} {YYEMPTY}
-\key{Clear previous look ahead token.}              {yyclearin}
+\key{Value in {\tt yychar} if no lookahead token.}  {YYEMPTY}
+\key{Clear previous lookahead token.}               {yyclearin}
 \key{Recover normally from an error.}               {yyerrok}
 
 % **************