2 files changed, 8 insertions, 12 deletions
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man
index a8cfaf611e06..9af7a50599f2 100644
--- a/contrib/groff/src/roff/nroff/nroff.man
+++ b/contrib/groff/src/roff/nroff/nroff.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -33,18 +33,12 @@ the original English.
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-h
-.OP \-i
+.OP \-CchipStUv
 .OP \-m name
 .OP \-n num
 .OP \-o list
-.OP \-p
 .OP \-r cn
-.OP \-S
-.OP \-t
 .OP \-T name
-.OP \-U
-.OP \-v
 .RI "[\ " "file" "\ .\|.\|.\ ]"
 .br
 .ad \na
@@ -63,7 +57,9 @@ and
 .B cp1047
 are valid arguments for the
 .B -T
-option.
+option, selecting the output encoding emitted by
+.BR grotty ,
+groff's TTY output device.
 If an invalid or no
 .BR \-T
 option is given,
@@ -95,8 +91,8 @@ options
 The
 .BR \-C ,
 .BR \-i ,
-.BR \-n ,
 .BR \-m ,
+.BR \-n ,
 .BR \-o ,
 and
 .B \-r
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index 176313443115..45c178c02f4c 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -68,7 +68,7 @@ for i
       echo "GNU nroff (groff) version @VERSION@"
       exit 0 ;;
     --help)
-      echo "usage: nroff [-cChipt] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
+      echo "usage: nroff [-CchipStUv] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
       exit 0 ;;
     --)
       shift
@@ -89,6 +89,6 @@ done
 
 : ${GROFF_BIN_PATH=@BINDIR@}
 export GROFF_BIN_PATH
-PATH=$GROFF_BIN_PATH:$PATH groff -mtty-char $T $opts ${1+"$@"}
+PATH=$GROFF_BIN_PATH@SEP@$PATH groff -mtty-char $T $opts ${1+"$@"}
 
 # eof