Fix conflicts which arose during import, also add $FreeBSD$.

1 files changed, 17 insertions, 3 deletions

diff --git a/contrib/groff/troff/troff.man b/contrib/groff/troff/troff.man
index 30c7027..4b4fdea 100644
--- a/contrib/groff/troff/troff.man
+++ b/contrib/groff/troff/troff.man
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -15,6 +15,9 @@ manual into another language, under the above conditions for modified
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	$FreeBSD$
+
 ..
 .\" define a string tx for the TeX logo
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
@@ -47,7 +50,7 @@ the original English.
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-abivzCER
+.OP \-abivzCERU
 .OP \-w name
 .OP \-W name
 .OP \-d cs
@@ -80,7 +83,9 @@ approximation of the typeset output.
 .B \-b
 Print a backtrace with each warning or error message.  This backtrace
 should help track down the cause of the error.  The line numbers given
-in the backtrace may not always correct: troff's idea of line numbers
+in the backtrace may not always be correct:
+.B troff 's
+idea of line numbers
 gets confused by
 .B as
 or 
@@ -140,6 +145,14 @@ as the default font family.
 Read in the file
 .BI tmac. name\fR.
 Normally this will be searched for in @MACRODIR@.
+By default is used the 
+.I safer
+macro (reverted using -U ).
+.TP
+.B \-U
+Unsafe option, avoids default use of 
+.I safer
+macro.
 .TP
 .B \-R
 Don't load
@@ -2046,6 +2059,7 @@ of device
 .BR grops (@MAN1EXT@),
 .BR grodvi (@MAN1EXT@),
 .BR grotty (@MAN1EXT@),
+.BR grohtml (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@),
 .BR groff_out (@MAN5EXT@),
 .BR groff_char (@MAN7EXT@)