From acbd5a8bd7b1416d41a9812ec2d066724a0e7c2a Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 14 Aug 1999 21:56:35 +0000
Subject: [PATCH] Fix conflicts, ensure rev 1.2 changes are made to v1.28.

---
 contrib/bison/bison.1 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/bison/bison.1 b/contrib/bison/bison.1
index 6c031ce35c6a..9738696e57c2 100644
--- a/contrib/bison/bison.1
+++ b/contrib/bison/bison.1
@@ -320,14 +320,21 @@ bison \-y $*
 .ft R
 .sp
 .RE
-.PP
-The long-named options can be introduced with `+' as well as `\-\-',
-for compatibility with previous releases.  Eventually support for `+'
-will be removed, because it is incompatible with the POSIX.2 standard.
 .SH FILES
 /usr/share/misc/bison.simple	simple parser
 .br
 /usr/share/misc/bison.hairy	complicated parser
+.SH "ENVIRONMENT VARIABLES"
+.TP
+.SM BISON_SIMPLE
+If this is set, it specifies the location in which the
+.B bison.simple
+parser can be found.
+.TP
+.SM BISON_HAIRY
+If this is set, it specifies the location in which the
+.B bison.hairy
+parser can be found.
 .SH SEE ALSO
 .IR yacc (1)
 .br