From owner-man-jp-reviewer@jp.freebsd.org  Wed Jun 28 13:35:35 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id NAA46798;
	Wed, 28 Jun 2000 13:35:35 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from smtp1.interramp.com (smtp1.interramp.com [38.8.45.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id NAA46723
	for <man-jp-reviewer@jp.freebsd.org>; Wed, 28 Jun 2000 13:35:32 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.14.49.83] (helo=localhost)
	by smtp1.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp-reviewer@jp.freebsd.org
	id 1379Z8-0003aF-00; Wed, 28 Jun 2000 00:35:10 -0400
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000628003251J.horikawa@psinet.com>
Date: Wed, 28 Jun 2000 00:32:51 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 4159
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: man-jp-reviewer 2663
Subject: [man-jp-reviewer 2663] 3.5-RELEASE (man1)
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: horikawa@psinet.com

 $B9b66$5$s$KD>$7$F$$$?$@$$$?(B man1 for 3.5-RELEASE (+ $B0JA0$N(B typo fix $B!)(B) 
$B$G$9!#(B

diff -ur man/man1/addftinfo.1 man/man1/addftinfo.1
--- man/man1/addftinfo.1	Sun Dec  5 10:39:42 1999
+++ man/man1/addftinfo.1	Thu Jun 15 21:26:41 2000
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: addftinfo.1,v 1.2 1997/05/13 16:07:12 horikawa Stab %
-.TH ADDFTINFO 1 "8 September 1996" "Groff Version 1.11"
+.TH ADDFTINFO 1 "8 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 addftinfo \- troff $BMQ$N%U%)%s%H%U%!%$%k$K(B groff $B$GMQ$$$k$?$a$N>pJs$rIU2C$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/apropos.1 man/man1/apropos.1
--- man/man1/apropos.1	Sun Dec  5 10:39:43 1999
+++ man/man1/apropos.1	Sat Jun 17 22:52:10 2000
@@ -12,27 +12,28 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.5.2.2 2000/05/10 13:45:29 phantom Exp %
 .\" jpman %Id: apropos.1,v 1.3 1997/06/14 16:18:57 kubo Stab %
 .Dd Jan 15, 1991
 .Dt APROPOS 1
 .Os
 .Sh $BL>>N(B
-.Nm apropos , whatis
+.Nm apropos ,
+.Nm whatis
 .Nd whatis $B%G!<%?%Y!<%9$rJ8;zNs$G8!:w$9$k(B
 .Sh $B=q<0(B
 .Nm apropos
 .Ar keyword ...
-.br
 .Nm whatis
 .Ar keyword ...
 .Sh $B2r@b(B
-.Nm apropos 
+.Nm
 $B$O!"%7%9%F%`%3%^%s%I$K4X$9$kC;$$4JC1$J@bL@$r4^$s$@%G!<%?%Y!<%9%U%!%$%k$r!"(B
 $B%-!<%o!<%I$K$h$C$F8!:w$7$F!"$=$N7k2L$rI8=`=PNO$KI=<($7$^$9!#(B
 .Nm whatis
 $B$G$O40A4$J8l$K$N$_%^%C%A$7$^$9!#(B
 .Sh $BLa$jCM(B
-.Nm apropos
+.Nm
 $B$O@.8y;~$K$O(B 0 $B$r!"%-!<%o!<%I$,%^%C%A$7$J$$>l9g$K$O(B 1 $B$rJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr makewhatis 1 ,
diff -ur man/man1/awk.1 man/man1/awk.1
--- man/man1/awk.1	Fri Dec 10 20:07:22 1999
+++ man/man1/awk.1	Sat Jun 17 22:44:46 2000
@@ -1904,7 +1904,7 @@
 .TP
 \fBsub(\fIr\fB, \fIs \fR[\fB, \fIt\fR]\fB)\fR
 .B gsub()
-$B$H;w$F$^$9$,!":G=i$K%^%C%A$7$?J8;zNs$N$_$,CV49$5$l$^$9!#(B
+$B$H;w$F$$$^$9$,!":G=i$K%^%C%A$7$?J8;zNs$N$_$,CV49$5$l$^$9!#(B
 .TP
 \fBsubstr(\fIs\fB, \fIi \fR[\fB, \fIn\fR]\fB)\fR
 $BJ8;zNs(B
diff -ur man/man1/biff.1 man/man1/biff.1
--- man/man1/biff.1	Wed Sep  1 11:13:31 1999
+++ man/man1/biff.1	Thu Jun 15 21:30:17 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)biff.1	6.5 (Berkeley) 3/14/91
-.\" %FreeBSD: src/usr.bin/biff/biff.1,v 1.5.2.1 1999/08/29 15:25:31 peter Exp %
+.\" %FreeBSD: src/usr.bin/biff/biff.1,v 1.5.2.2 2000/03/06 11:34:08 sheldonh Exp %
 .\"
 .\" jpman %Id: biff.1,v 1.2 1997/04/01 07:08:32 mutoh Stab %
 .\"
diff -ur man/man1/calendar.1 man/man1/calendar.1
--- man/man1/calendar.1	Sun Aug  8 12:10:11 1999
+++ man/man1/calendar.1	Thu Jun 15 21:31:43 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1	8.1 (Berkeley) 6/29/93
+.\" %FreeBSD: src/usr.bin/calendar/calendar.1,v 1.13.2.1 2000/03/06 11:34:10 sheldonh Exp %
 .\" jpman %Id: calendar.1,v 1.2 1997/04/20 09:45:28 jsakai Stab %
 .\"
 .Dd June 29, 1993
diff -ur man/man1/cdcontrol.1 man/man1/cdcontrol.1
--- man/man1/cdcontrol.1	Wed Sep  1 11:13:32 1999
+++ man/man1/cdcontrol.1	Thu Jun 15 21:32:58 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.16.2.3 1999/08/29 15:40:15 peter Exp %
+.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.16.2.4 2000/03/06 11:35:42 sheldonh Exp %
 .\" jpman %Id: cdcontrol.1,v 1.3 1997/07/22 09:20:03 mutoh Stab %
 .\"
 .Dd July 3, 1995
diff -ur man/man1/chflags.1 man/man1/chflags.1
--- man/man1/chflags.1	Wed Sep  1 11:13:32 1999
+++ man/man1/chflags.1	Thu Jun 15 21:43:54 2000
@@ -32,11 +32,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.6.2.1 1999/08/29 15:26:09 peter Exp %
+.\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
+.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.6.2.3 2000/04/03 22:13:40 jdp Exp %
 .\" jpman %Id: chflags.1,v 1.3 1997/06/18 14:15:48 jsakai Stab %
 .\"
-.Dd March 31, 1994
+.Dd May 2, 1995
 .Dt CHFLAGS 1
 .Os
 .Sh $BL>>N(B
@@ -49,15 +49,15 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Ar flags
-.Ar file ...
+.Ar
 .Sh $B2r@b(B
-.Nm chflags
+.Nm
 $B$O;XDj$7$?%U%!%$%k$N%U%i%0$r!"(B
 .Ar flags
 $B$G;XDj$7$?CM$KJQ99$7$^$9!#(B
 .Pp
 $B%*%W%7%g%s$O0J2<$N$H$*$j$G$9!#(B
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl H
 .Fl R
 $B%*%W%7%g%s$,;XDj$5$l$F$$$l$P!"0z?t$G;XDj$5$l$?%7%s%\%j%C%/%j%s%/$r(B
@@ -75,11 +75,12 @@
 $B%U%i%0$rJQ99$7$^$9!#(B
 .El
 .Pp
-$B%U%i%0$O%-!<%o!<%I$r%3%s%^$G6h@Z$C$?$b$N$G$9!#(B
+$B%U%i%0$O(B 8 $B?J?t!"$b$7$/$O%-!<%o!<%I$r%3%s%^$G6h@Z$C$?$b$N$G$9!#(B
 $B8=:_Dj5A$5$l$F$$$k%-!<%o!<%I$O0J2<$N$H$*$j$G$9(B:
 .Bd -literal -offset indent compact
 arch	archived $B%U%i%0$r%;%C%H$7$^$9(B ($B%9!<%Q%f!<%6$N$_(B)
-dump	dump $B%U%i%0$r%;%C%H$7$^$9(B
+opaque	opaque $B%U%i%0$r%;%C%H$7$^$9(B ($B=jM-<T$+%9!<%Q%f!<%6$N$_(B)
+nodump	nodump $B%U%i%0$r%;%C%H$7$^$9(B ($B=jM-<T$+%9!<%Q%f!<%6$N$_(B)
 sappnd	system append-only ($B%7%9%F%`%l%Y%k$G$NDI2C@lMQ(B) $B%U%i%0$r%;%C%H$7$^$9(B 
 	($B%9!<%Q%f!<%6$N$_(B)
 schg	system immutable ($B%7%9%F%`%l%Y%k$G$NJQ99IT2D(B) $B%U%i%0$r%;%C%H$7$^$9(B
@@ -102,7 +103,7 @@
 $B$r$D$1$k$H!"$=$N%U%i%0$rL58z$K$7$^$9!#(B
 $BNc$($P!"(B
 .Bd -literal -offset indent compact
-nodump	dump $B%U%i%0$r%/%j%"$7$^$9(B
+nouchg	immutable $B%S%C%H$r%/%j%"$7$^$9(B
 .Ed
 .Pp
 $B%7%s%\%j%C%/%j%s%/$K$O%U%i%0$O$"$j$^$;$s!#(B
@@ -112,7 +113,7 @@
 .Fl L
 $B%*%W%7%g%s$r;XDj$;$:$K%7%s%\%j%C%/%j%s%/$K(B
 $BBP$7$F(B
-.Nm chflags
+.Nm
 $B$r<B9T$7$?>l9g!">o$K@.8y$7$^$9$,!"2?$N8z2L$b$"$j$^$;$s!#(B
 .Fl H
 $B!"(B
@@ -126,8 +127,8 @@
 $B:G8e$K;XDj$5$l$?%*%W%7%g%s$K$h$C$F%3%^%s%I$NF0:n$,7h$^$j$^$9!#(B
 .Pp
 $B%U%!%$%k$N%U%i%0$r8+$k$K$O(B "ls -lo" $B$H$7$^$9!#(B
-.Pp
-.Nm chflags
+.Sh $B?GCG(B
+.Nm
 $B$O<B9T$K@.8y$9$k$H(B 0 $B$r!"%(%i!<$,H/@8$9$k$H(B 0 $B$h$jBg$-$$CM$r(B
 $BLa$jCM$H$7$FJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
@@ -137,7 +138,7 @@
 .Xr fts 3 ,
 .Xr symlink 7
 .Sh $BNr;K(B
-.Nm chflags
+.Nm
 $B$O(B
 .Bx 4.4
 $B$K=i$a$FEP>l$7$^$7$?!#(B
diff -ur man/man1/chgrp.1 man/man1/chgrp.1
--- man/man1/chgrp.1	Sun Aug  8 12:10:12 1999
+++ man/man1/chgrp.1	Thu Jun 15 21:46:52 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
+.\" %FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.4.2.1 1999/12/29 19:55:07 obrien Exp %
 .\" jpman %Id: chgrp.1,v 1.3 1997/05/19 16:29:32 horikawa Stab %
 .\"
 .Dd March 31, 1994
@@ -51,8 +52,9 @@
 .Oc
 .Op Fl f
 .Op Fl h
+.Op Fl v
 .Ar group
-.Ar files ...
+.Ar
 .Sh $B2r@b(B
 .Nm chgrp
 $B$O;XDj$5$l$?%U%!%$%k$N%0%k!<%W(B ID $B$r(B 
@@ -60,7 +62,7 @@
 $B$K%;%C%H$7$^$9!#(B
 .Pp
 $B%*%W%7%g%s$O0J2<$N$b$N$,$"$j$^$9(B:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl H
 .Fl R
 $B%*%W%7%g%s$H$H$b$K;XDj$5$l$F$$$k>l9g$K!"%3%^%s%I%i%$%s>e$N%7%s%\(B
@@ -84,6 +86,9 @@
 $B%U%!%$%k$,%7%s%\%j%C%/%j%s%/$N>l9g!"(B
 $B%]%$%s%H$5$l$k%U%!%$%k$G$O$J$/!"(B
 $B%j%s%/<+?H$N%0%k!<%W(B ID $B$rJQ$($^$9!#(B
+.It Fl v
+.Nm
+$B$r>iD9$K$7!"%0%k!<%W$,=$@5$5$l$k%U%!%$%k$rI=<($5$;$^$9!#(B
 .El
 .Pp
 .Fl H ,
@@ -105,13 +110,16 @@
 .Nm
 $B$r<B9T$9$k%f!<%6$O!";XDj$7$?%0%k!<%W$K<+J,$,4^$^$l$+$D%U%!(B
 $B%$%k$N=jM-<T$G$"$k$+!"%9!<%Q%f!<%6$G$J$1$l$P$J$j$^$;$s!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
 $B$O@.8y;~$K(B 0 $B$r!"%(%i!<$,5/$3$C$?;~$K(B 0 $B$h$jBg$-$JCM$rLa$jCM$H$7(B
 $B$FJV$7$^$9!#(B
 .Sh $B8_49@-(B
 $B0JA0$N%P!<%8%g%s$N%7%9%F%`$G$O!"(B
 $B%7%s%\%j%C%/%j%s%/$K$O%0%k!<%W$OM-$j$^$;$s$G$7$?!#(B
+.Pp
+.Fl v
+$B%*%W%7%g%s$OHsI8=`$G$"$j!"%9%/%j%W%HCf$G$N;HMQ$OHs?d>)$G$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /etc/group -compact
 .It Pa /etc/group
diff -ur man/man1/chmod.1 man/man1/chmod.1
--- man/man1/chmod.1	Wed Sep  1 11:13:32 1999
+++ man/man1/chmod.1	Sat Jun 17 22:52:15 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" %FreeBSD: src/bin/chmod/chmod.1,v 1.10.2.5 1999/08/29 14:11:30 peter Exp %
+.\" %FreeBSD: src/bin/chmod/chmod.1,v 1.10.2.7 2000/02/17 03:18:24 unfurl Exp %
 .\"
 .\" jpman %Id: chmod.1,v 1.2 1997/04/01 01:37:14 mutoh Stab %
 .Dd March 31, 1994
@@ -48,6 +48,7 @@
 .Fl f
 .Fl R
 .Op Fl H | Fl L | Fl P
+.Fl v
 .Oc
 .Ar mode
 .Ar file ...
@@ -63,7 +64,7 @@
 .Fl R
 $B%*%W%7%g%s$,;XDj$5$l$F$$$l$P!"0z?t$,%7%s%\%j%C%/%j%s%/$N$H$-!"$=$l$r(B
 $B$?$I$C$FJQ99$7$^$9!#(B
-($B%G%#%l%/%H%j%D%j!<C5:wCf$K8+$D$+$C$?%7%s%\%j%C%/%j%s%/$O(B
+($B%G%#%l%/%H%j%D%j!<C5:wCf$K8+$D$+$C$?%7%s%\%j%C%/%j%s%/$O!"%G%U%)%k%H$G$O(B
 $B$=$l0J>eDI@W$7$^$;$s(B)
 .It Fl L
 .Fl R
@@ -80,6 +81,9 @@
 $B$,(B
 .Va file
 $B$N%b!<%I$rJQ99$G$-$J$+$C$?>l9g$K!"?GCG%a%C%;!<%8$rI=<($7$^$;$s!#(B
+.It Fl v
+.Nm
+$B$r>iD9$K$7!"%b!<%I$,JQ99$5$l$k%U%!%$%k$rI=<($5$;$^$9!#(B
 .El
 .Pp
 $B%7%s%\%j%C%/%j%s%/$O%b!<%I$r;}$?$J$$$N$G!"(B
@@ -170,9 +174,8 @@
 $B%7%s%\%k$K$h$k;XDj$O0J2<$NJ8K!$K=>$$$^$9!#(B
 .Bd -literal -offset indent
 mode         ::= clause [, clause ...]
-clause       ::= [who ...] [action ...] last_action
+clause       ::= [who ...] [action ...] action
 action       ::= op [perm ...]
-last_action  ::= op [perm ...]
 who          ::= a | u | g | o
 op           ::= + | \- | =
 perm         ::= r | s | t | w | x | X | u | g | o
@@ -293,9 +296,12 @@
 $B$7$^$9!#(B
 .El
 .Sh $B%P%0(B
-naughty bit$B$N$?$a$N(B
+naughty bit $B$N$?$a$N(B
 .Ar perm
-$B%*%W%7%g%s$,L5$$!#(B
+$B%*%W%7%g%s$,$"$j$^$;$s!#(B
+.Sh $B8_49@-(B
+.Fl v
+$B%*%W%7%g%s$OHsI8=`$G$"$j!"%9%/%j%W%HCf$N;HMQ$OHs?d>)$G$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr chflags 1 ,
 .Xr install 1 ,
diff -ur man/man1/chpass.1 man/man1/chpass.1
--- man/man1/chpass.1	Tue Dec 21 17:01:23 1999
+++ man/man1/chpass.1	Sat Jun 17 22:52:21 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.5 1999/11/18 16:06:50 phantom Exp %
+.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.8 2000/03/27 10:07:31 sheldonh Exp %
 .\"
 .\" jpman %Id: chpass.1,v 1.2 1997/03/31 14:06:36 horikawa Stab %
 .Dd December 30, 1993
@@ -48,8 +48,19 @@
 .Nm chpass
 .Op Fl a Ar list
 .Op Fl p Ar encpass
+.Op Fl e Ar expiretime
 .Op Fl s Ar newshell
 .Op user
+.Pp
+.Nm chpass
+.Op Fl oly
+.Op Fl a Ar list
+.Op Fl p Ar encpass
+.Op Fl e Ar expiretime
+.Op Fl s Ar newshell
+.Op Fl d Ar domain
+.Op Fl h Ar host
+.Op user
 .Sh $B2r@b(B
 .Nm
 $B$O(B
@@ -74,6 +85,10 @@
 $B%9!<%Q%f!<%6$O!"0E9f2=$5$l$?%Q%9%o!<%I%U%#!<%k%I$r(B
 .Xr crypt 3 
 $B$GMQ$$$i$l$F$$$k%U%)!<%^%C%H$G0z?t$H$7$FD>@\;XDj$9$k$3$H$,$G$-$^$9!#(B
+.It Fl e Ar expiretime
+$B%"%+%&%s%H$,L58z$H$J$k;~$rJQ99$7$^$9!#(B
+$BBPOC%(%G%#%?$+$i$N$h$&$K%9%/%j%W%H$+$i!"(B
+$BL58z$H$J$k;~$rJQ99$9$k$?$a$K!"K\%*%W%7%g%s$r;HMQ$7$^$9!#(B
 .It Fl s Ar newshell
 $B%f!<%6$N%7%'%k$r(B
 .Ar newshell
@@ -224,6 +239,11 @@
 $B%(%G%#%?$,;H$o$l$^$9!#%(%G%#%?$,=*N;$9$k$H!"$=$N>pJs$O:FEYFI$_9~$^$l!"(B
 $B%f!<%6%G!<%?%Y!<%9$rJQ99$9$k$?$a$N>pJs$H$7$^$9!#(B
 $B%f!<%6$N>pJs$rJQ99$G$-$k$N$O!"$=$N%f!<%6$+%9!<%Q%f!<%6$N$_$G$9!#(B
+.Pp
+.Ev PW_SCAN_BIG_IDS
+$B4D6-JQ?t$N@_Dj$N%$%s%Q%/%H$K$D$$$F$O!"(B
+.Xr pwd_mkdb 8
+$B$N@bL@$r;2>H$7$F$/$@$5$$!#(B
 .Sh NIS $B$H$NAj8_:nMQ(B
 $B$$$/$D$+$N@)8B$,E,MQ$5$l$^$9$,!"(B
 .Nm
diff -ur man/man1/colldef.1 man/man1/colldef.1
--- man/man1/colldef.1	Wed Sep  1 11:13:33 1999
+++ man/man1/colldef.1	Thu Jun 15 21:53:34 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/colldef/colldef.1,v 1.5.2.1 1999/08/29 15:26:21 peter Exp %
+.\" %FreeBSD: src/usr.bin/colldef/colldef.1,v 1.5.2.2 2000/03/06 11:34:16 sheldonh Exp %
 .\"
 .\" jpman %Id: colldef.1,v 1.3 1997/09/04 16:33:17 horikawa Stab %
 .\"
diff -ur man/man1/crunchgen.1 man/man1/crunchgen.1
--- man/man1/crunchgen.1	Sun Jul 26 08:08:18 1998
+++ man/man1/crunchgen.1	Sat Jun 17 22:52:34 2000
@@ -22,6 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
+.\" %FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.7.2.2 2000/03/06 11:35:46 sheldonh Exp %
 .\"
 .Dd September 29, 1997
 .\" jpman %Id: crunchgen.1,v 1.3 1997/07/29 13:43:59 konuma Stab %
@@ -33,6 +34,7 @@
 .Sh $B=q<0(B
 .Nm \&crunchgen
 .Op Fl fql
+.Op Fl h Ar makefile-header-name
 .Op Fl m Ar makefile-name
 .Op Fl c Ar c-file-name
 .Op Fl e Ar exec-file-name
@@ -96,6 +98,13 @@
 $B%-%c%C%7%e$r>C5n$7!"%-%c%C%7%e$5$l$F$$$?%Q%i%a!<%?$r6/@)E*$K:F7W;;$7$^$9!#(B
 .It Fl l
 $BL>A0$NI=<(!#$3$N%P%$%J%j$,BP1~$9$kL>A0$r0lMwI=<($7$^$9!#(B
+.It Fl h Ar makefile-header-name
+.Nm crunchgen
+$B$,@8@.$9$k(B Makefile $B$N@hF,$K4^$a$k%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
+make $B$NJQ?t$rDj5A$9$k$N$KJXMx$G$9!#(B
+$B$3$l$K$O!"(Bmake $B$NF0:n$K1F6A$rM?$(!"4D6-JQ?t$r2p$7$F$G$OLLE]$G$"$k!"(B
+.Ar RELEASE_CRUNCH
+$B$,4^$^$l$^$9!#(B
 .It Fl m Ar makefile-name
 $B=PNO$9$k(B Makefile $B$NL>A0$r(B
 .Ar makefile-name
@@ -156,6 +165,15 @@
 .Nm
 $B%Q%i%a!<%?$r;XDj$G$-$^$9!#(B
 .Bl -tag -width indent
+.It Nm special Ar progname Nm objvar Ar variable_name
+$B%W%m%0%i%`MQ(B
+.Ar progname
+$B$N%*%V%8%'%/%H%U%!%$%k0lMw$rJ];}$9$k(B make $BJQ?t$NL>A0$r@_Dj$7$^$9!#(B
+$B$3$l$ODL>o(B
+.Nm OBJS
+$B$G$9$,!"(BMakefile $B$K$h$C$F$O!"B>$NLsB+$,9%$^$7$$>l9g$d!"(B
+.Nm SSHD_OBJS
+$B$N$h$&$K%W%m%0%i%`L>$,A0$KIU$/$b$N$,$"$j$^$9!#(B
 .It Nm special Ar progname Nm srcdir Ar pathname
 $B%W%m%0%i%`(B
 .Ar progname
diff -ur man/man1/csh.1 man/man1/csh.1
--- man/man1/csh.1	Sun Oct 17 20:35:37 1999
+++ man/man1/csh.1	Sat Jun 17 22:52:41 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\" %FreeBSD: src/bin/csh/csh.1,v 1.11.2.3 1999/09/18 16:03:48 phantom Exp %
+.\" %FreeBSD: src/bin/csh/csh.1,v 1.11.2.6 2000/02/17 03:41:52 unfurl Exp %
 .\"
 .\" jpman %Id: csh.1,v 1.2 1997/04/08 00:35:51 h-nokubi Stab %
 .\"	Japanese translation for jpman-0.2 checked by jpman project 96.12.23
@@ -59,9 +59,9 @@
 $BBPOCE*$J%m%0%$%s!&%7%'%k!"$^$?(B
 $B%7%'%k!&%9%/%j%W%H$N%3%^%s%I!&%W%m%;%C%5$NN>J}$NMQES$G;H$o$l$^$9!#(B
 .Ss $B0z?t%j%9%H=hM}(B
-$B%7%'%k$X$N:G=i$N0z?t(B($BBh(B 0 $B0z?t(B)$B$,(B
 .Ql Fl \&
-$B$G;O$^$k>l9g!"%7%'%k$O%m%0%$%s!&%7%'%k$H$J$j$^$9!#(B
+$B$G;O$^$k%W%m%0%i%`L>$G%7%'%k$,<B9T$5$l$?>l9g!"(B
+$B%7%'%k$O%m%0%$%s!&%7%'%k$H$J$j$^$9!#(B
 $B%7%'%k$r(B
 .Ql Fl l
 $B%U%i%0$r;XDj$7$F5/F0$9$k$3$H$G$b%m%0%$%s!&%7%'%k$K$G$-$^$9!#(B
diff -ur man/man1/ctm.1 man/man1/ctm.1
--- man/man1/ctm.1	Wed Sep  1 11:13:33 1999
+++ man/man1/ctm.1	Sat Jun 17 22:52:46 2000
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.14.2.1 1999/08/29 15:40:55 peter Exp %
+.\" %FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.14.2.2 2000/06/08 06:30:30 kris Exp %
 .\" jpman %Id: ctm.1,v 1.3 1997/09/27 16:26:57 ryo2 Stab %
 .\"
 .Dd Mar 25, 1995
@@ -231,7 +231,34 @@
 $B%*%W%7%g%s$r;H$$$^$9!#(B
 
 .El
-
+.Pp
+.Sh $B%;%-%e%j%F%#(B
+.Pp
+CTM $B<+?H!"(B
+$B0BA4$G$O$J$$%W%m%H%3%k$G$9(B
+- $B%=!<%9%3!<%I$X2C$($i$l$?=$@5$,?.Mj$G$-$k$H$3$m$+$iAw$i$l$?$3$H$r(B
+$BG'>Z$7$^$;$s$N$G!"(B
+$BDL>o$NEE;R%a!<%kEy$N?.Mj$G$-$J$$G^BN$+$i(B
+CTM $B%G%k%?$rF@$?>l9g$K$OCm0U$,I,MW$G$9!#(B
+CTM $B%G%k%?$r56B$$7$F!"@5Ev$J$b$N$r8r49$^$?$O>e=q$-$7!"(B
+$B0-0U$"$k%3!<%I$r$"$J$?$N%=!<%9%D%j!<$KA^F~$9$k$3$H$O!"(B
+$B967b<T$K$H$C$FHf3SE*4JC1$G$9!#(B
+$B@5Ev$J%G%k%?$NE~Ce$,$J$s$i$+$NJ}K!$GK8$2$i$l$?>l9g!"(B
+$B$3$l$r46CN$G$-$k$N$O!"8e$N%G%k%?$,F1$8%U%!%$%k$r?($m$&$H$9$k;~E@$G$9!#(B
+$B$3$N;~E@$G!"(BMD $B%A%'%C%/%5%`$,<:GT$7$^$9!#(B
+.Pp
+$B$3$l$r2sHr$7$F0BA4$J$b$N$K$9$k$?$a$K!"(B
+freebsd.org $B$,:n$C$?(B CTM $BItIJ$K$O!"(B
+GNU Privacy Guard $B%f!<%F%#%j%F%#8_49$J%U%)!<%^%C%H$G0E9fE*$K=pL>$7$F$$$^$9!#(B
+$B$3$N%f!<%F%#%j%F%#$O(B /usr/ports/security/gpg $B$*$h$S(B
+Pretty Good Privacy v5 $B%f!<%F%#%j%F%#(B
+/usr/ports/security/pgp5 $B$+$iF~<j$G$-$^$9!#(B
+$BE,@Z$J8x3+80$O(B ctm@freebsd.org $B$r(B finger $B$9$k$3$H$GF@$i$l$^$9!#(B
+.Pp
+$B$3$N$h$&$K=pL>$5$l$?(B CTM $B%G%k%?$O!"(B
+$B8!CN$5$l$k$3$H$J$/967b<T$,2~JQ$9$k$3$H$O$G$-$^$;$s!#(B
+$B$=$l$f$(!"(BCTM $B%G%k%?$rEE;R%a!<%k$G<u?.$9$k>l9g$K$O!"(B
+GPG $B$^$?$O(B PGP5 $B$r;HMQ$7$F=pL>$r3NG'$9$k$3$H$r4+$a$^$9!#(B
 .Sh $B4D6-JQ?t(B
 .Ev TMPDIR
 $B$K%Q%9L>$,%;%C%H$5$l$F$$$k$H!"(Bctm $B$O0l;~%U%!%$%k$NCV$->l=j$H$7$F(B
diff -ur man/man1/ctm_rmail.1 man/man1/ctm_rmail.1
--- man/man1/ctm_rmail.1	Sat Nov 20 19:54:18 1999
+++ man/man1/ctm_rmail.1	Sat Jun 17 22:52:53 2000
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.3 1999/10/30 15:59:34 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.4 2000/06/08 06:29:04 kris Exp %
 .\" jpman %Id: ctm_rmail.1,v 1.3 1997/09/27 16:25:48 ryo2 Stab %
 .\"
 .Dd January 24, 1995
@@ -379,32 +379,32 @@
 .Xr ctm
 $B$N<B9T$r2DG=$K$9$k$?$a$N$b$N$G$9!#(B
 .Sh $B%;%-%e%j%F%#(B
-$B<+F0E*$K%a!<%k$r<h$C$F%U%!%$%k%D%j!<$X$N%Q%C%A%W%m%0%i%`$K(B
-$BEO$7$F$$$k>l9g!"$"$J$?$N%7%9%F%`$X$N80$r%/%i%C%+!<$K<jEO$7$F$$$k$H(B
-$B9M$($k$+$bCN$l$^$;$s!#9,$$!"B;32$r5/$3$9Ak$O$H$F$b>.$5$$$N$G$9!#(B
-.Nm ctm_rmail
-$B$O!"(B
-($B%G%k%?L>Cf$N(B $B$$$+$J$k(B
-.Dq /
-$BJ8;z$b?.MQ$7$J$$$3$H$K$h$C$F(B)
-$BM?$($i$l$?%G%#%l%/%H%j$N$_$K$7$+=q$-9~$^$J$$$h$&$KCm0U$7$F$$$^$9!#(B
-$B$=$7$F:G?7$N(B
-.Xr ctm
-$B$G$OA`:n$9$k%U%!%$%k$K@dBP%Q%9L>$H(B
-.Dq \&\.\.
-$B$r5v2D$7$F$$$J$$$N$G!":G0-$G$b<:$o$l$k2DG=@-$N$"$k$N$O(B
-($B%G%k%?$+$iI|85$G$-$k(B) $BFs!";0$N%=!<%9%D%j!<$N%U%!%$%k$@$1$J$N$G$9!#(B
-.Xr ctm
-$B$O%U%!%$%k$K$5$o$kA0$K(B
-.Xr md5
-$B$K$h$k%A%'%C%/%5%`$,9gCW$9$k;v$rMW5a$9$k$N$G!"%=!<%9$N<u?.<T$@$1$,(B
-$B56B$$7$?%G%k%?$r@8@.$G$-$k2DG=@-$r;}$A!"$=$7$F(B $B$=$&$$$&?MC#$,(B
-$B$=$s$J$3$H$r9M$($k$O$:$b$"$j$^$;$s(B! :-)
-.Pp
-$B$3$N2DG=@-$5$($b0E9f2=$5$l$?=pL>$G<h$j=|$/;v$,2DG=$G$9!#(B
-$B>-Mh$N6/2=$N2DG=@-$O!"(B
-.Nm PGP
-$B$r;H$C$?0BA4$J%i%C%Q$NDs6!$,$"$j$^$9!#(B
+.Pp
+CTM $B<+?H!"(B
+$B0BA4$G$O$J$$%W%m%H%3%k$G$9(B
+- $B%=!<%9%3!<%I$X2C$($i$l$?=$@5$,?.Mj$G$-$k$H$3$m$+$iAw$i$l$?$3$H$r(B
+$BG'>Z$7$^$;$s$N$G!"(B
+$BDL>o$NEE;R%a!<%kEy$N?.Mj$G$-$J$$G^BN$+$i(B
+CTM $B%G%k%?$rF@$?>l9g$K$OCm0U$,I,MW$G$9!#(B
+CTM $B%G%k%?$r56B$$7$F!"@5Ev$J$b$N$r8r49$^$?$O>e=q$-$7!"(B
+$B0-0U$"$k%3!<%I$r$"$J$?$N%=!<%9%D%j!<$KA^F~$9$k$3$H$O!"(B
+$B967b<T$K$H$C$FHf3SE*4JC1$G$9!#(B
+$B@5Ev$J%G%k%?$NE~Ce$,$J$s$i$+$NJ}K!$GK8$2$i$l$?>l9g!"(B
+$B$3$l$r46CN$G$-$k$N$O!"8e$N%G%k%?$,F1$8%U%!%$%k$r?($m$&$H$9$k;~E@$G$9!#(B
+$B$3$N;~E@$G!"(BMD $B%A%'%C%/%5%`$,<:GT$7$^$9!#(B
+.Pp
+$B$3$l$r2sHr$7$F0BA4$J$b$N$K$9$k$?$a$K!"(B
+freebsd.org $B$,:n$C$?(B CTM $BItIJ$K$O!"(B
+GNU Privacy Guard $B%f!<%F%#%j%F%#8_49$J%U%)!<%^%C%H$G0E9fE*$K=pL>$7$F$$$^$9!#(B
+$B$3$N%f!<%F%#%j%F%#$O(B /usr/ports/security/gpg $B$*$h$S(B
+Pretty Good Privacy v5 $B%f!<%F%#%j%F%#(B
+/usr/ports/security/pgp5 $B$+$iF~<j$G$-$^$9!#(B
+$BE,@Z$J8x3+80$O(B ctm@freebsd.org $B$r(B finger $B$9$k$3$H$GF@$i$l$^$9!#(B
+.Pp
+$B$3$N$h$&$K=pL>$5$l$?(B CTM $B%G%k%?$O!"(B
+$B8!CN$5$l$k$3$H$J$/967b<T$,2~JQ$9$k$3$H$O$G$-$^$;$s!#(B
+$B$=$l$f$(!"(BCTM $B%G%k%?$rEE;R%a!<%k$G<u?.$9$k>l9g$K$O!"(B
+GPG $B$^$?$O(B PGP5 $B$r;HMQ$7$F=pL>$r3NG'$9$k$3$H$r4+$a$^$9!#(B
 .\" This next request is for sections 1, 6, 7 & 8 only
 .Sh $B4D6-JQ?t(B
 $B%G%k%?$rE,MQ$9$k$N$J$i$P(B
diff -ur man/man1/cursor.1 man/man1/cursor.1
--- man/man1/cursor.1	Fri Dec 10 20:07:23 1999
+++ man/man1/cursor.1	Sat Jun 17 22:53:00 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)cursor.1, 3.20, Last Edit-Date: [Mon Dec 19 20:30:40 1994]
+.\" %FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.3.2.1 2000/03/06 11:36:41 sheldonh Exp %
 .\" jpman %Id: cursor.1,v 1.3 1997/07/22 17:10:13 horikawa Stab %
 .\"
 .Dd December 19, 1994
diff -ur man/man1/cut.1 man/man1/cut.1
--- man/man1/cut.1	Fri May  7 21:44:40 1999
+++ man/man1/cut.1	Thu Jun 15 22:08:53 2000
@@ -35,6 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/cut/cut.1,v 1.2.2.2 2000/03/06 11:34:17 sheldonh Exp %
 .\" jpman %Id: cut.1,v 1.2 1997/03/29 02:27:38 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/date.1 man/man1/date.1
--- man/man1/date.1	Tue Dec 21 17:01:24 1999
+++ man/man1/date.1	Mon Jun 26 22:02:31 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\" %FreeBSD: src/bin/date/date.1,v 1.26.2.4 1999/12/15 13:57:03 sheldonh Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.26.2.6 2000/06/15 16:08:04 brian Exp %
 .\"
 .\" jpman %Id: date.1,v 1.2 1997/03/31 23:25:55 mutoh Stab %
 .Dd November 17, 1993
@@ -89,7 +89,13 @@
 .Fl n
 $B%*%W%7%g%s$r;XDj$7$?>l9g$K$O!"B>$N%^%7%s$N;~9o$OJQ99$7$^$;$s!#(B
 .It Fl r
-$B4p=`;~E@(B (1970 $BG/(B 1 $B7n(B 1 $BF|(B) $B$+$i(B
+$B4p=`;~E@(B
+.Po
+1970 $BG/(B 1 $B7n(B 1 $BF|(B 00:00:00; 
+.Xr time 3
+$B;2>H(B
+.Pc
+$B$+$i(B
 .Ar seconds
 $BIC7P2a$7$?F|;~$rI=<($7$^$9!#(B
 .It Fl t
@@ -115,6 +121,8 @@
 $BI,MW$J$iG$0U8D$3$N%U%i%0$r;XDj$7$F;~9o$r=$@5$9$k$3$H$,=PMh$^$9!#(B
 $B%U%i%0$O;XDj$7$?=g=x$K=hM}$5$l$^$9!#(B
 .Pp
+.Pq $BCM$r=$@5$9$k$N$G$O$J$/(B
+$BCM$r;XDj$9$k>l9g!"(B
 $BIC$NHO0O$O(B 0-59$B!"(B
 $BJ,$NHO0O$O(B 0-59$B!";~$NHO0O$O(B 1-12$B!"F|$NHO0O$O(B 1-31$B!"MKF|$NHO0O$O(B 0-6 
 (Sun-Sat)$B!"7n$NHO0O$O(B 1-12 (Jan-Dec)$B!"(B
@@ -136,6 +144,27 @@
 $BF|IU$OE,9g$9$k<!$N(B ($BA0$N(B) $BMKF|$b$7$/$O7n$K?J$_$^$9(B ($BLa$j$^$9(B)$B!#(B
 $BMKF|$b$7$/$O7n$,8=:_$N$b$N$HJQ$i$J$$>l9g!"F|$O=$@5$7$^$;$s!#(B
 .Pp
+$BFCDj$NCM$K;~9o$r=$@5$9$k>l9g$d!"C10L$,(B 1 $B;~4V$h$j$bBg$-$$>l9g$K$O!"(B
+$B2F;~4V$N35G0$OL5;k$5$l$^$9!#(B
+1 $B;~4V0J2<$NC10L$G$N=$@5$O!"2F;~4V$N35G0$r;}$A$^$9!#(B
+$B8=:_$N;~9o$r(B 3 $B7n(B 26 $BF|(B 0:30 $B$G$"$j!"(B
+$B2F;~4V$N=$@5$K$h$j(B 01:00 $B$+$i(B 02:00 $B$X?J$`$H2>Dj$7$?>l9g!"(B
+.Fl v No +1H
+$B$O;~9o$r(B 3 $B7n(B 26 $BF|(B 2:30 $B$X=$@5$7$^$9!#(B
+$BF1MM$K!"8=:_$N;~9o$,(B 10 $B7n(B 29 $BF|(B 0:30 $B$G$"$j!"(B
+$B2F;~4V$N=$@5$K$h$j(B 02:00 $B$+$i(B 01:00 $B$XLa$k$H2>Dj$7$?>l9g!"(B
+.Fl v No +3H
+$B$H$9$k$H;~9o$O(B 10 $B7n(B 20 $BF|(B ($BLuCm(B: 10 $B7n(B 30 $BF|(B) 2:30 $B$K$J$j$^$9!#(B
+.Pp
+$BB8:_$7$J$$FCDj$NCM(B
+.Pq $BNc$($P(B 2000 $BG/(B 3 $B7n(B 26 $BF|(B 1:30 BST
+$B$X;~9o$r=$@5$9$k>l9g!"(B
+$B@5Ev$J;~9o$K$J$k$^$G!";~9o$OL[$C$F(B 1 $B;~4V$NC10L$G?J$a$i$l$^$9!#(B
+2 $B2sB8:_$9$kFCDj$NCM(B
+.Pq $BNc$($P(B 2000 $BG/(B 10 $B7n(B 29 $BF|(B 1:30
+$B$X;~9o$r=$@5$9$k>l9g!":G=*E*$J%?%$%`%>!<%s$O!"(B
+2 $B2s$N;~9o$N$&$AAa$$$b$N$KE,9g$9$k$b$N$H$J$j$^$9!#(B
+.Pp
 $B>\:Y$K4X$7$F$O!"2<5-$NNc$r;2>H$7$F2<$5$$!#(B
 .El
 .Pp
@@ -232,7 +261,8 @@
 .Ed
 .Pp
 $B$O!"(B
-.Dq Li "1985 $BG/(B 6 $B7n(B 13 $BF|8a8e(B 4 $B;~(B 27 $BJ,(B"
+.\" '\ ' $BL5$7$G$O0z?t$N?t$,8B3&$r1[$($k$?$a(B
+.Dq Li "1985\ $BG/(B\ 6\ $B7n(B\ 13\ $BF|8a8e(B\ 4\ $B;~(B\ 27\ $BJ,(B"
 $B$KF|;~$r@_Dj$7$^$9!#(B
 .Pp
 $B0J2<$N%3%^%s%I(B:
diff -ur man/man1/dd.1 man/man1/dd.1
--- man/man1/dd.1	Sun Dec 12 09:42:22 1999
+++ man/man1/dd.1	Thu Jun 15 22:22:24 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" %FreeBSD: src/bin/dd/dd.1,v 1.8.2.3 1999/12/12 01:54:04 green Exp %
+.\" %FreeBSD: src/bin/dd/dd.1,v 1.8.2.4 2000/02/23 01:06:40 gsutter Exp %
 .\"
 .\" jpman %Id: dd.1,v 1.3 1997/05/16 00:16:21 h-nokubi Stab %
 .Dd January 13, 1994
@@ -92,6 +92,12 @@
 $BI8=`F~NO$N$+$o$j$K(B
 .Ar file
 $B$+$iF~NO$r9T$$$^$9!#(B
+.It Cm iseek= Ns Ar n
+$BF~NO%U%!%$%k$N(B
+.Va n
+$B%V%m%C%/L\$K%7!<%/$7$^$9!#(B
+.Cm skip= Ns Ar n
+$B$HF1$8$G$9!#(B
 .It Cm obs= Ns Ar n
 $B=PNO%V%m%C%/$N%5%$%:$r%G%U%)%k%H$N(B 512 $B%P%$%H$KBe$($F(B
 .Va n
@@ -103,10 +109,16 @@
 .Cm notrunc
 $B$,;XDj$5$l$J$$$+$.$j!"IaDL$N=PNO%U%!%$%k$G$O:G8e$N(B 1 $B%V%m%C%/%5%$%:$K(B
 $BK~$?$J$$%G!<%?$O@Z$j5M$a$i$l$^$9!#(B
-$B=PNO%U%!%$%k$N:G=i$NItJ,$,%9%-%C%W$5$l$k>l9g$O(B (
-.Cm seek
+$B=PNO%U%!%$%k$N:G=i$NItJ,$,%7!<%/$5$l$FDL$j2a$.$k>l9g$O(B (
+.Cm oseek
 $B%*%Z%i%s%I;2>H(B)
 $B=PNO%U%!%$%k$O(B $B$=$3$^$G@Z$j5M$a$i$l$^$9!#(B
+.It Cm oseek= Ns Ar n
+$B=PNO%U%!%$%k$N(B
+.Va n
+$B%V%m%C%/L\$K%7!<%/$7$^$9!#(B
+.Cm seek= Ns Ar n
+$B$HF1$8$G$9!#(B
 .It Cm seek= Ns Ar n
 $B%3%T!<$9$kA0$K!"=PNOB&%U%!%$%k$N3+;O0LCV$r@hF,$+$i(B
 .Va n
@@ -267,7 +279,7 @@
 .El
 .El
 .Pp
-$B%5%$%:$N;XDj$O(B 10 $B?J$N%P%$%H?t$,4|BT$5$l$^$9!#(B
+$B%5%$%:$N;XDj$O(B 10 $B?J!&(B 8 $B?J!&(B 16 $B?J$N%P%$%H?t$,4|BT$5$l$^$9!#(B
 $B?t;z$N:G8e$K(B ``b'', ``k'', ``m'', ``g'', ``w'' $B$r$D$1$?>l9g!"(B
 $B$=$N?t;z$K!"(B
 512, 1024 (1K), 1048576 (1M), 1073741824 (1G),
diff -ur man/man1/df.1 man/man1/df.1
--- man/man1/df.1	Wed Sep  1 11:13:34 1999
+++ man/man1/df.1	Sat Jun 17 22:53:29 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" %FreeBSD: src/bin/df/df.1,v 1.13.2.3 1999/08/29 14:12:14 peter Exp %
+.\" %FreeBSD: src/bin/df/df.1,v 1.13.2.5 2000/05/09 14:27:05 sheldonh Exp %
 .\"
 .\" jpman %Id: df.1,v 1.2 1997/04/07 05:31:08 mutoh Stab %
 .Dd May 8, 1995
@@ -41,7 +41,11 @@
 .Nd $B%G%#%9%/$N6u$-NN0hEy$NI=<((B
 .Sh $B=q<0(B
 .Nm df
-.Op Fl ikn
+.Oo
+.Fl b | h | H | k |
+.Fl m | P
+.Oc
+.Op Fl in
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
 .Sh $B2r@b(B
@@ -68,6 +72,21 @@
 .Pp
 $B%*%W%7%g%s$H$7$F$O0J2<$N$b$N$,$"$j$^$9(B:
 .Bl -tag -width Ds
+.It Fl b
+$B%G%U%)%k%HCM$G$J$/(B 512 $B%P%$%H%V%m%C%/$r;HMQ$7$^$9!#(B
+$B$3$l$O!"4D6-$N(B
+.Ev BLOCKSIZE
+$B;XDj$KM%@h$9$k$3$H$KCm0U$7$F$/$@$5$$!#(B
+.It Fl H
+$B!V?M4V$,FI$a$k!W=PNO$G$9!#(B
+$BC10L%5%U%#%C%/%9$K!"%P%$%H!"%-%m%P%$%H!"%a%,%P%$%H!"(B
+$B%.%,%P%$%H!"%F%i%P%$%H!"%Z%?%P%$%H$r;HMQ$7$F?t;z$r(B 3 $B7e0J2<$K8:$i$7$^$9!#(B
+$BBg$-$5$N4p?t$O(B 10 $B$G$9!#(B
+.It Fl h
+$B!V?M4V$,FI$a$k!W=PNO$G$9!#(B
+$BC10L%5%U%#%C%/%9$K!"%P%$%H!"%-%m%P%$%H!"%a%,%P%$%H!"(B
+$B%.%,%P%$%H!"%F%i%P%$%H!"%Z%?%P%$%H$r;HMQ$7$F?t;z$r(B 3 $B7e0J2<$K8:$i$7$^$9!#(B
+$BBg$-$5$N4p?t$O(B 2 $B$G$9!#(B
 .It Fl i
 $B%U%j!<$J(B i $B%N!<%I$N>pJs$bI=<($7$^$9!#(B
 .It Fl k
@@ -76,6 +95,11 @@
 $B$3$N%*%W%7%g%s$O!"4D6-JQ?t(B
 .Ev BLOCKSIZE
 $B$N;X<($rL58z$K$7$^$9!#(B
+.It Fl m
+$B%G%U%)%k%H$NBe$j$K(B 1048576 $B%P%$%H(B (1 M $B%P%$%H(B) $B%V%m%C%/$r;HMQ$7$^$9!#(B
+$B$3$l$O!"4D6-$N(B
+.Ev BLOCKSIZE
+$B;XDj$KM%@h$9$k$3$H$KCm0U$7$F$/$@$5$$!#(B
 .It Fl n
 .Fl n
 $B%*%W%7%g%s$,;XDj$5$l$k$H!"(B
@@ -87,6 +111,11 @@
 .Nm
 $B$O%U%!%$%k%7%9%F%`$K?7$7$$>pJs$rLd$$9g$o$;$:!"(B
 $B0JA0$K<hF@$7$F$*$$$?:G?7$G$O$J$$2DG=@-$N$"$k>pJs$rI=<($7$^$9!#(B
+.It Fl P
+$B%G%U%)%k%H$NBe$j$K(B POSIX $B=`5r$N(B 512 $B%P%$%H%V%m%C%/$N=PNO$r9T$$$^$9!#(B
+$B$3$l$O!"4D6-$N(B
+.Ev BLOCKSIZE
+$B;XDj$KM%@h$9$k$3$H$KCm0U$7$F$/$@$5$$!#(B
 .It Fl t
 $B;X<($5$l$?%?%$%W$N%U%!%$%k%7%9%F%`$K4X$9$k>pJs$N$_(B
 $B$rI=<($7$^$9!#(B
diff -ur man/man1/dnskeygen.1 man/man1/dnskeygen.1
--- man/man1/dnskeygen.1	Sat Jan  8 19:36:48 2000
+++ man/man1/dnskeygen.1	Sat Jun 17 22:44:50 2000
@@ -14,7 +14,7 @@
 .\" SOFTWARE.
 .\"
 .\" %Id: dnskeygen.1,v 8.5 1999/02/23 05:20:18 vixie Exp %
-.\" jpman %Id: dnskeygen.1,v 1.2 1999/12/29 10:29:04 horikawa Stab %
+.\" jpman %Id: dnskeygen.1,v 1.3 2000/02/03 00:03:40 mitchy Stab %
 .\"
 .Dd December 2, 1998
 .Dt DNSKEYGEN 1
@@ -45,20 +45,20 @@
 $B%j%/%(%9%H$H%H%i%s%6%/%7%g%s$N=pL>$K;H$o$l$k6&M-HkL)80$r@8@.2DG=$G$9!#(B
 .Bl -tag -width Fl
 .It Fl D
-dnskeygen $B$O!"C10l$N(B
+dnskeygen $B$O!"(B
 .Ic DSA/DSS
 $B80$r@8@.$7$^$9!#(B
 .Dq size
 $B$O!"(B[512, 576, 640, 704, 768, 832, 896, 960, 1024] $B$N$$$:$l$+(B
-$B$R$H$D$G$"$kI,MW$,$"$j$^$9!#(B
+$B$G$"$kI,MW$,$"$j$^$9!#(B
 .It Fl H
-dnskeygen $B$O!"C10l$N(B
+dnskeygen $B$O!"(B
 .Ic HMAC-MD5
 $B80$r@8@.$7$^$9!#(B
 .Dq size
 $B$O(B 128 $B$H(B 504 $B$N4V$G$"$kI,MW$,$"$j$^$9!#(B
 .It Fl R
-dnskeygen $B$O!"C10l$N(B
+dnskeygen $B$O!"(B
 .Ic RSA
 $B80$r@8@.$7$^$9!#(B
 .Dq size
@@ -91,7 +91,7 @@
 (DNSSEC) $B$G$"$j!"$=$NB>$N>l9g$O(B
 .Ic 2
 (EMAIL) $B$G$9!#(B
-$BB>$K<uM}$5$l$kCM$O(B
+$BB>$K;XDj2DG=$JCM$O(B
 .Ic 1
 (TLS),
 .Ic 4
diff -ur man/man1/du.1 man/man1/du.1
--- man/man1/du.1	Wed Sep  1 11:13:34 1999
+++ man/man1/du.1	Thu Jun 15 22:35:01 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" %FreeBSD: src/usr.bin/du/du.1,v 1.11.2.1 1999/08/29 15:27:18 peter Exp %
+.\" %FreeBSD: src/usr.bin/du/du.1,v 1.11.2.2 2000/03/06 11:34:19 sheldonh Exp %
 .\" jpman %Id: du.1,v 1.3 1997/06/18 16:43:08 horikawa Stab %
 .\"
 .Dd April 1, 1994
diff -ur man/man1/echo.1 man/man1/echo.1
--- man/man1/echo.1	Wed Sep  1 11:13:34 1999
+++ man/man1/echo.1	Thu Jun 15 22:36:25 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" %FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 peter Exp %
+.\" %FreeBSD: src/bin/echo/echo.1,v 1.6.2.3 2000/01/14 11:15:21 sheldonh Exp %
 .\" jpman %Id: echo.1,v 1.2 1997/04/02 00:07:04 mutoh Stab %
 .\"
 .Dd July 22, 1993
@@ -56,12 +56,21 @@
 .It Fl n
 $B2~9T$rIU2C$7$^$;$s!#(B
 $B$3$l$O!"(BiBCS2 $B8_49%7%9%F%`$G9T$o$l$F$$$?$h$&$K!"(B
-$BJ8;zNs$N:G8e$K(B `\ec' $B$rIU$12C$($k;v$G<B8=$7$F$$$^$9!#(B
+$BJ8;zNs$N:G8e$K(B `\ec' $B$rIU$12C$($k;v$G$b<B8=$G$-$^$9!#(B
 .El
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B?GCG(B
 $B@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
-.Xr printf 1
+.Xr builtin 1 ,
+.Xr csh 1 ,
+.Xr printf 1 ,
+.Xr sh 1
 .Sh $B5,3J(B
 .Nm
 $B%f!<%F%#%j%F%#$O(B
diff -ur man/man1/ed.1 man/man1/ed.1
--- man/man1/ed.1	Wed Sep  1 11:13:34 1999
+++ man/man1/ed.1	Sat Jun 17 22:53:41 2000
@@ -1,11 +1,12 @@
-.\" %FreeBSD: src/bin/ed/ed.1,v 1.14.2.1 1999/08/29 14:12:24 peter Exp %
+.\" %FreeBSD: src/bin/ed/ed.1,v 1.14.2.4 2000/05/10 10:01:27 sheldonh Exp %
 .\" jpman %Id: ed.1,v 1.2 1997/06/09 15:03:56 jsakai Stab %
 .Dd May 21, 1993
 .Dt ED 1
 .Os
 .Sh $BL>>N(B
 .\" ed, red \- text editor
-.Nm ed
+.Nm ed ,
+.Nm red
 .Nd $B9T;X8~$N%F%-%9%H%(%G%#%?(B
 .Sh $B=q<0(B
 .Nm ed
@@ -817,7 +818,8 @@
 USD:12-13
 
 .Rs
-.%A B. W. Kernighan and P. J. Plauger
+.%A B. W. Kernighan
+.%A P. J. Plauger
 .%B Software Tools in Pascal
 .%O Addison-Wesley
 .%D 1981
diff -ur man/man1/eqn.1 man/man1/eqn.1
--- man/man1/eqn.1	Mon Apr 26 10:34:46 1999
+++ man/man1/eqn.1	Thu Jun 15 22:39:20 2000
@@ -11,7 +11,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH EQN 1 "7 September 1996" "Groff Version 1.11"
+.TH EQN 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 eqn \- troff $BMQ$N?t<0%U%)!<%^%C%?(B
 .SH $B=q<0(B
diff -ur man/man1/fdformat.1 man/man1/fdformat.1
--- man/man1/fdformat.1	Tue Oct 27 09:33:12 1998
+++ man/man1/fdformat.1	Thu Jun 15 22:40:03 2000
@@ -21,8 +21,9 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" jpman %Id: fdformat.1,v 1.3 1997/04/06 15:39:38 horikawa Stab %
+.\" %FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.12.2.1 2000/03/06 11:35:49 sheldonh Exp %
 .\"
+.\" jpman %Id: fdformat.1,v 1.3 1997/04/06 15:39:38 horikawa Stab %
 .Dd September 16, 1993
 .Os
 .Dt FDFORMAT 1
diff -ur man/man1/fdwrite.1 man/man1/fdwrite.1
--- man/man1/fdwrite.1	Wed Sep  1 11:13:35 1999
+++ man/man1/fdwrite.1	Thu Jun 15 22:41:00 2000
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.9.2.1 1999/08/29 15:41:31 peter Exp %
+.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.9.2.2 2000/03/06 11:35:51 sheldonh Exp %
 .\" jpman %Id: fdwrite.1,v 1.4 1997/07/26 21:35:54 horikawa Stab %
 .\"
 .\"
diff -ur man/man1/fetch.1 man/man1/fetch.1
--- man/man1/fetch.1	Wed Sep  1 11:13:35 1999
+++ man/man1/fetch.1	Thu Jun 15 22:41:39 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/fetch/fetch.1,v 1.27.2.3 1999/08/29 15:27:35 peter Exp %
+.\" %FreeBSD: src/usr.bin/fetch/fetch.1,v 1.27.2.4 2000/03/06 11:34:21 sheldonh Exp %
 .\"
 .\" jpman %Id: fetch.1,v 1.4 1997/08/15 06:31:28 horikawa Stab %
 .Dd February 22, 1999
diff -ur man/man1/file.1 man/man1/file.1
--- man/man1/file.1	Sat Jan  8 19:36:48 2000
+++ man/man1/file.1	Thu Jun 15 22:42:21 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/file/file.1,v 1.12.2.2 1999/09/20 09:49:56 phantom Exp %
+.\" %FreeBSD: src/usr.bin/file/file.1,v 1.12.2.3 2000/03/06 11:34:23 sheldonh Exp %
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
diff -ur man/man1/finger.1 man/man1/finger.1
--- man/man1/finger.1	Wed Sep  1 11:13:36 1999
+++ man/man1/finger.1	Thu Jun 15 22:42:53 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" %FreeBSD: src/usr.bin/finger/finger.1,v 1.7.2.1 1999/08/29 15:27:54 peter Exp %
+.\" %FreeBSD: src/usr.bin/finger/finger.1,v 1.7.2.2 2000/03/06 11:34:25 sheldonh Exp %
 .\" jpman %Id: finger.1,v 1.2 1997/04/07 05:53:49 mutoh Stab %
 .\"
 .Dd August 1, 1997
diff -ur man/man1/fmt.1 man/man1/fmt.1
--- man/man1/fmt.1	Tue Feb 24 23:53:58 1998
+++ man/man1/fmt.1	Thu Jun 15 22:43:40 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/fmt/fmt.1,v 1.4.2.1 2000/03/09 09:31:52 sheldonh Exp %
 .\" jpman %Id: fmt.1,v 1.2 1997/03/29 03:55:54 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -40,7 +41,7 @@
 .Nd $B4JC1$J%F%-%9%H%U%)!<%^%C%?(B
 .Sh $B=q<0(B
 .Nm
-.Fl c
+.Op Fl c
 .Oo
 .Ar goal
 .Op Ar maximum
diff -ur man/man1/fpr.1 man/man1/fpr.1
--- man/man1/fpr.1	Tue Feb 24 23:53:59 1998
+++ man/man1/fpr.1	Thu Jun 15 22:44:27 2000
@@ -32,6 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fpr.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/fpr/fpr.1,v 1.1.1.1.10.1 2000/03/03 11:43:17 sheldonh Exp %
 .\" jpman %Id: fpr.1,v 1.2 1997/03/29 03:57:18 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/ftp.1 man/man1/ftp.1
--- man/man1/ftp.1	Sun Oct 31 10:42:51 1999
+++ man/man1/ftp.1	Thu Jun 15 22:48:57 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.8.2.4 1999/08/29 15:28:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.8.2.6 2000/03/10 14:47:32 sheldonh Exp %
 .\" 	%NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp %
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -646,7 +646,7 @@
 .Ev PAGER 
 $B$G;XDj$5$l$?%W%m%0%i%`(B
 ($B%G%U%)%k%H$O(B
-.Xr less 1
+.Xr more 1
 ) $B$r;H$C$FI=<($7$^$9!#(B
 .It Ic passive
 $B%Q%C%7%V%b!<%I$r@Z$jBX$($^$9!#%Q%C%7%V%b!<%I$,%*%s(B
@@ -1124,7 +1124,7 @@
 .Dq globbing
 $B$,5v2D$5$l$F$$$k>l9g!"(B
 $B%m!<%+%k%U%!%$%kL>$O(B
-.Xr csh  1
+.Xr csh 1
 $B$N%U%!%$%kL>E83+5,B'$K$7$?$,$C$FE83+$5$l$^$9!#(B
 ($B>\:Y$O(B
 .Ic glob 
diff -ur man/man1/gcore.1 man/man1/gcore.1
--- man/man1/gcore.1	Tue Oct 27 09:33:12 1998
+++ man/man1/gcore.1	Thu Jun 15 22:49:37 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
+.\" %FreeBSD: src/usr.bin/gcore/gcore.1,v 1.5.2.1 2000/03/06 11:34:28 sheldonh Exp %
 .\" jpman %Id: gcore.1,v 1.3 1997/08/20 12:27:20 horikawa Stab %
 .\"
 .Dd April 18, 1994
diff -ur man/man1/gencat.1 man/man1/gencat.1
--- man/man1/gencat.1	Wed Sep  1 11:13:36 1999
+++ man/man1/gencat.1	Mon Jun 26 20:53:48 2000
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gencat.1,v 1.3 1997/06/11 15:39:54 kstailey Exp $
+.\"	%OpenBSD: gencat.1,v 1.3 1997/06/11 15:39:54 kstailey Exp %
 .\"
 .\" Copyright (c) 1997 Ken Stailey
 .\"
diff -ur man/man1/getopt.1 man/man1/getopt.1
--- man/man1/getopt.1	Sun Oct 17 20:35:38 1999
+++ man/man1/getopt.1	Thu Jun 15 22:50:13 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/getopt/getopt.1,v 1.4.4.2 1999/09/18 15:53:26 phantom Exp %
+.\" %FreeBSD: src/usr.bin/getopt/getopt.1,v 1.4.4.3 2000/03/06 11:34:30 sheldonh Exp %
 .\"
 .\" jpman %Id: getopt.1,v 1.3 1997/06/19 14:12:53 take Stab %
 .Dd April 3, 1999
diff -ur man/man1/grep.1 man/man1/grep.1
--- man/man1/grep.1	Sat May  1 19:58:56 1999
+++ man/man1/grep.1	Sat Jun 17 22:54:35 2000
@@ -1,50 +1,67 @@
-.TH GREP 1 "1992 September 10" "GNU Project"
+.\" grep man page
+.\" %FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.6.2.1 1999/12/31 09:55:53 ru Exp %
+.de Id
+.ds Dt \\$4
+..
+.Id %Id: grep.1,v 1.1 1998/11/22 06:45:20 alainm Exp %
+.TH GREP 1 \*(Dt "GNU Project"
 .\" jpman %Id: grep.1,v 1.3 1997/07/21 07:22:12 konuma Stab %
+.\"
+.\" WORD: word-constituent characters	$BC18l9=@.J8;z(B
 .SH $BL>>N(B
 grep, egrep, fgrep, zgrep \- $B%Q%?!<%s$K%^%C%A$9$k9T$rI=<($9$k(B
 .SH $B=q<0(B
 .B grep
-[\-[AB] num]
-[\-HRPS]
-[\-CEFGLVabchilnqsvwx]
-[\-e expr]
-[\-f file]
-files...
+[-[AB] NUM] [-CEFGVZabchiLlnqrsvwxyUu] [-e PATTERN | -f FILE]
+[-d ACTION] [--directories=ACTION]
+[--extended-regexp] [--fixed-strings] [--basic-regexp]
+[--regexp=PATTERN] [--file=FILE] [--ignore-case] [--word-regexp]
+[--line-regexp] [--line-regexp] [--no-messages] [--revert-match]
+[--version] [--help] [--byte-offset] [--line-number]
+[--with-filename] [--no-filename] [--quiet] [--silent] [--text]
+[--files-without-match] [--files-with-matcces] [--count]
+[--before-context=NUM] [--after-context=NUM] [--context]
+[--binary] [--unix-byte-offsets] [--recursive]
+[--decompress]
+.I files...
 .SH $B2r@b(B
+.PP
 .B grep
 $B$O!"(B
 .I files
-$B$GL>A0$r;XDj$5$l$?%U%!%$%k(B ($B%U%!%$%k$,;XDj$5$l$F$J$$$+(B
-.I files
+$B$GL>A0$r;XDj$5$l$?F~NO%U%!%$%k(B ($B%U%!%$%k$,;XDj$5$l$F$J$$$+!"(B
+.I file
 $B$NItJ,$K(B
 .B \-
-$B$,;XDj$5$l$?>l9g$OI8=`F~NO(B) $B$rFI$_9~$_!"(B
-.I pattern
-$B$G;XDj$7$?%Q%?!<%s$K%^%C%A$9$kItJ,$r4^$s$G$$$k$+$I$&$+$r!"9TKh$KD4$Y$^$9!#(B
-$B%G%U%)%k%HF0:n$G$O!"%^%C%A$7$?9T$rI=<($7$^$9!#(B
+$B$,;XDj$5$l$?>l9g$OI8=`F~NO(B) $B$rFI$_9~$_!"M?$($i$l$?(B
+.IR pattern
+$B$K%^%C%A$9$kItJ,$r4^$`9T$rC5$7$^$9!#(B
+$B%G%U%)%k%HF0:n$G$O!"(B
+.B grep
+$B$O%^%C%A$7$?9T$rI=<($7$^$9!#(B
 .PP
 .B grep
 $B$O!"0J2<$N%*%W%7%g%s$K$h$jBg$-$/(B 3 $B$D$NF0:n$KJ,$+$l$^$9!#(B
 .PD 0
 .TP
-.B \-G
+.B \-G, --basic-regexp
 .I pattern
 $B$H$7$F!"4pK\E*$J@55,I=8=$r07$&%b!<%I$G$9(B ($B2<5-;2>H(B)$B!#%G%U%)%k%H$G$9!#(B
 .TP
-.B \-E
+.B \-E, --extended-regexp
 .I pattern
 $B$H$7$F!"3HD%$5$l$?@55,I=8=$r07$&%b!<%I$G$9(B ($B2<5-;2>H(B)$B!#(B
 .TP
-.B \-F
+.B \-F, --fixed-strings
 .I pattern
 $B$H$7$F!"2~9T$G6h@Z$i$l$?8GDj$NJ8;zNs%Q%?!<%s$N%j%9%H$r07$&%b!<%I$G$9!#(B
 $B$=$NJ8;zNs$N$I$l$+$K%^%C%A$9$k$+$I$&$+D4$Y$^$9!#(B
 .LP
-$B$5$i$K!"(B2 $B$D$NF1<o$N%W%m%0%i%`(B
+$B$5$i$K!"(B2 $B$D$N%W%m%0%i%`(B
 .B egrep
 $B$H(B
 .B fgrep
-$B$,MxMQ2DG=$G$9!#(B
+$B$rMxMQ2DG=$G$9!#(B
 .B egrep
 $B$O!"(B
 .B "grep\ \-E" 
@@ -52,13 +69,13 @@
 .B egrep 
 $B$H8_49@-$,$"$j$^$9!#(B
 .B fgrep
-$B$O!"(B
-.B "grep\ \-F"
+$B$O(B
+.BR "grep\ \-F"
+$B$HF1$8$G$9!#(B
+.B zgrep
+$B$O(B
+.BR "grep\ \-Z"
 $B$HF1$8$G$9!#(B
-.BR zgrep
-$B$H$7$F8F$P$l$?>l9g$K$O!"(B
-.BR \-Z
-$B%*%W%7%g%s$,2>Dj$5$l$^$9!#(B
 .PD
 .LP
 $BA4$F$N(B
@@ -66,144 +83,228 @@
 $B$NJQ<o$O!"0J2<$N$h$&$J%*%W%7%g%s$rM}2r$7$^$9(B:
 .PD 0
 .TP
-.BI \- num
-.I num
-$B$G;XDj$7$?9T?t$@$1!"%Q%?!<%s$K%^%C%A$7$?9T$NA08e$N9T$bI=<($7$^$9!#(B
-$B$?$@$7!"F1$89T$r(B 2 $BEY0J>eI=<($9$k;v$O$"$j$^$;$s!#(B
-.TP
-.BI \-A " num"
-.I num
+.BI \-A " NUM" ", --after-context=" NUM
+.I NUM
 $B$G;XDj$7$?9T?t$@$1!"%Q%?!<%s$K%^%C%A$7$?9T$N8e$N9T$bI=<($7$^$9!#(B
 .TP
-.BI \-B " num"
-.I num
+.BI \-B " NUM" ", --before-context=" NUM
+.I NUM
 $B$G;XDj$7$?9T?t$@$1!"%Q%?!<%s$K%^%C%A$7$?9T$NA0$N9T$bI=<($7$^$9!#(B
 .TP
-.B \-C
-.B \-2
-$B$r;XDj$7$?;v$HF1$8$G$9!#(B
+.BI \-C ,\  --context"[=NUM]"
+.I NUM
+$B$G;XDj$7$?9T?t(B ($B%G%U%)%k%H$O(B 2) $B$@$1!"%Q%?!<%s$K%^%C%A$7$?9T$NA08e$N9T$b(B
+$BI=<($7$^$9!#(B
+.TP
+.BI \- NUM \ 
+--context=NUM $B$HF1$8$h$&$K;XDj$7$?9T?t$@$1!"(B
+$B%Q%?!<%s$K%^%C%A$7$?9T$NA08e$N9T$bI=<($7$^$9!#(B
+$B$?$@$7!"F1$89T$r(B 2 $BEY0J>eI=<($9$k;v$O$"$j$^$;$s!#(B
 .TP
-.B \-V
+.B \-V, --version
 .B grep
 $B$N%P!<%8%g%sHV9f$rI8=`%(%i!<=PNO$KI=<($7$^$9!#%P%0%l%]!<%H(B
 $B$K$O!"$3$NHV9f$rIU5-$7$F$/$@$5$$(B ($B2<5-;2>H(B)$B!#(B
 .TP
-.B \-a
-$B%P%$%J%j%U%!%$%k$N8!:w$r9T$$$^$;$s!#(B
-.TP
-.B \-b
-$B3F9T$NA0$K!"%U%!%$%k$N@hF,$+$i$N%P%$%HC10L$N%*%U%;%C%H$rI=<($7$^$9!#(B
+.B \-b ", " \-\^\-byte-offset
+$B3F=PNO9T$NA0$K!"F~NO%U%!%$%k$N@hF,$+$i$N%P%$%HC10L$N%*%U%;%C%H$rI=<($7$^$9!#(B
 .TP
-.B \-c
-$B3F9T$NI=<($O$;$:!"%^%C%A$7$?9T?t$@$1$rI=<($7$^$9!#(B
-.B \-v
+.B \-c, --count
+$BDL>o$N=PNO$O$;$:!"3FF~NO%U%!%$%k$K$D$$$F%^%C%A$7$?9T?t$rI=<($7$^$9!#(B
+.B \-v, --revert-match
 $B%*%W%7%g%s$H6&$K;XDj$7$?>l9g$O!"(B
-$B%^%C%A$7$J$+$C$?9T?t$NI=<($H$J$j$^$9(B ($B2<5-;2>H(B)$B!#(B
+$B%^%C%A$7$J$+$C$?9T?t$rI=<($7$^$9(B ($B2<5-;2>H(B)$B!#(B
 .TP
-.BI \-e " pattern"
-$B%Q%?!<%s$r;XDj$7$^$9!#(B
-.B \-
-$B$G;O$^$C$F$$$k%Q%?!<%s$rJ]8n$9$k$?$a$KM-8z$G$9!#(B
+.BI \-d " ACTION" ", --directories=" ACTION
+$BF~NO%U%!%$%k$,%G%#%l%/%H%j$N>l9g$K!"(B
+.I ACTION
+$B$r;H$C$F$=$N=hM}$r9T$$$^$9!#%G%U%)%k%H$G$O(B
+.I ACTION
+$B$O(B
+.BR read
+$B$G$"$j!"%G%#%l%/%H%j$rIaDL$N%U%!%$%k$G$"$k$+$NMM$KFI$_<h$k;v$r0UL#$7$^$9!#(B
+.I ACTION
+$B$,(B
+.BR skip
+$B$J$i!"%G%#%l%/%H%j$rL[$C$FFI$_Ht$P$7$^$9!#(B
+.I ACTION
+$B$,(B
+.BR recurse
+$B$J$i!"(B
+.B
+grep $B$O3F%G%#%l%/%H%j2<$N$9$Y$F$N%U%!%$%k$r:F5"E*$KFI$_<h$j$^$9!#(B
+$B$3$l$O(B
+.B \-r
+$B%*%W%7%g%s$HEy2A$G$9!#(B
+.TP
+.BI \-e " PATTERN" ", --regexp=" PATTERN
+.I PATTERN
+$B$r%Q%?!<%s$H$7$F;XDj$7$^$9!#(B
+.BR \-
+$B$G;O$^$k%Q%?!<%s$rJ]8n$9$k$?$a$KM-8z$G$9!#(B
 .TP
-.BI \-f " file"
+.BI \-f " FILE" ", --file=" FILE
 $B%Q%?!<%s$r(B
-.I file
-$B$+$iFI$_9~$_$^$9!#(B
+.IR FILE
+$B$+$i(B 1 $B9T$4$H$KFI$_9~$_$^$9!#(B
+$B6u$N%U%!%$%k$O%Q%?!<%s$r4^$^$J$$$N$G!"2?$K$b%^%C%A$7$^$;$s!#(B
 .TP
-.B \-h
+.B \-h, --no-filename
 $BJ#?t%U%!%$%k$r8!:w$7$?;~$K!"=PNO$NA0$K%U%!%$%kL>$rIU$1$k$3$H$rM^@)$7$^$9!#(B
 .TP
-.B \-i
-$B%Q%?!<%s%^%C%A$K$*$$$F!"1QBgJ8;z$H>.J8;z$N6hJL$r$7$J$$$h$&$K$7$^$9!#(B
+.B \-i, --ignore-case
+.I pattern
+$B$HF~NO%U%!%$%k$NAPJ}$G!"1QBgJ8;z$H>.J8;z$N6hJL$r$7$J$$$h$&$K$7$^$9!#(B
 .TP
-.B \-L
-$BDL>o$NI=<($rM^;_$7$^$9(B;
+.B \-L, --files-without-match
+$BDL>o$N=PNO$O$;$:!"(B
 $B$3$N%*%W%7%g%s$r;XDj$7$J$+$C$?$H$-$K(B
 $BA4$/=PNO$5$l$J$$F~NO%U%!%$%k$NL>A0$rI=<($7$^$9!#(B
+$B%9%-%c%sF0:n$O:G=i$N%^%C%A$G=*N;$7$^$9!#(B
 .TP
-.B \-l
-$BDL>o$NI=<($rM^;_$7$^$9(B;
+.B \-l, --files-with-matches
+$BDL>o$N=PNO$O$;$:!"(B
 $B$3$N%*%W%7%g%s$r;XDj$7$J$+$C$?$H$-$K(B
 $B=PNO$5$l$kF~NO%U%!%$%k$NL>A0$rI=<($7$^$9!#(B
+$B%9%-%c%sF0:n$O:G=i$N%^%C%A$G=*N;$7$^$9!#(B
 .TP
-.B \-n
-$B3F9T$N=PNO$NA0$K!"F~NO%U%!%$%k$K$*$1$k9THV9f$rI=<($7$^$9!#(B
-.TP
-.B \-q
-$B@E=M(B; $BDL>o$NI=<($rM^;_$7$^$9!#(B
+.B \-n, --line-number
+$B3F=PNO9T$NA0$K!"F~NO%U%!%$%k$K$*$1$k9THV9f$rI=<($7$^$9!#(B
 .TP
+.B \-q, --quiet, --silent
+$BD@L[!#DL>o$N=PNO$rM^;_$7$^$9!#(B
+$B%9%-%c%sF0:n$O:G=i$N%^%C%A$G=*N;$7$^$9!#(B
+$B2<5-$N(B
 .B \-s
+$B$d(B
+.B --no-messages
+$B%*%W%7%g%s$b;2>H!#(B
+.TP
+.B \-r, --recursive
+$B3F%G%#%l%/%H%j2<$N$9$Y$F$N%U%!%$%k$r:F5"E*$KFI$_<h$j$^$9!#(B
+$B$3$l$O(B
+.B "\-d recurse"
+$B%*%W%7%g%s$HEy2A$G$9!#(B
+.TP
+.B \-s, --no-messages
 $B;XDj$5$l$?%U%!%$%k$,B8:_$7$J$$$3$H$dFI$_9~$_$G$-$J$$$3$H$r<($9(B
 $B%(%i!<%a%C%;!<%8$rM^;_$7$^$9!#(B
+$B0\?"@-$K4X$9$kCm(B: GNU
+.BR grep
+$B$H$O0[$J$j!"(BBSD
+.B grep
+$B$O(B \s-1POSIX.2\s0 $B$KE,9g$7$F$$$^$;$s$G$7$?!#$J$<$J$i!"(BBSD
+.B grep
+$B$K$O(B
+.B \-q
+$B%*%W%7%g%s$,L5$/!"(B
+.B \-s
+$B%*%W%7%g%s$O(B GNU
+.BR grep
+$B$N(B
+.B \-q
+$B%*%W%7%g%s$NMM$KF0:n$7$?$+$i$G$9!#(BBSD
+.B grep
+$B$X0\?"2DG=$G$"$k$3$H$r0U?^$7$?%7%'%k%9%/%j%W%H$O!"(B
+.B \-q
+$B$H(B
+.B \-s
+$B$rN>J}$H$b;H$o$:$K!"=PNO$r(B /dev/null $B$X%j%@%$%l%/%H$9$Y$-$G$9!#(B
 .TP
-.B \-v
+.B \-a, --text
+$B%P%$%J%j%G!<%?$r4^$`9T$NI=<($rM^;_$7$^$;$s!#(B
+$BDL>o!"%U%!%$%k$N:G=i$N?t%P%$%H$,%U%!%$%k$K%P%$%J%j%U%!%$%k$,(B
+$B4^$^$l$F$$$k$3$H$r<($7$F$$$k>l9g!"(B
+.B grep
+$B$O%U%!%$%k$,%Q%?!<%s$K%^%C%A$7$?$3$H$@$1$r=PNO$7$^$9!#(B
+$B$3$N%*%W%7%g%s$K$h$j!"$?$H$(JL$NE@$G$O%U%!%$%k$r(B
+$B%P%$%J%j%U%!%$%k$H$7$F07$&$H$7$F$b!"(B
+.B grep
+$B%U%!%$%k$r%F%-%9%H%U%!%$%k$H$_$J$7$FF0:n$7$^$9!#(B
+.TP
+.B \-v, --revert-match
 $B%^%C%A$N0UL#$r5UE>$7$^$9!#$9$J$o$A!"%^%C%A$7$J$$9T$rBP>]$K$7$^$9!#(B
 .TP
-.B \-w
+.B \-w, --word-regexp
 $B40A4$J8l$K%^%C%A$9$k9T$N$_$rA*Br$7$^$9!#(B
 $BItJ,J8;zNs$,9TF,$+$i;O$^$C$F$$$k$+!"(B
 $B8l$G$J$$J8;zNs$,A0$K$"$k$3$H$,%F%9%H$5$l$^$9!#(B
 $BF1MM$K!"9TKv$+8l$G$J$$J8;zNs$,8e$KIU$$$$$kI,MW$,$"$j$^$9!#(B
 $BC18l$H$O!"%l%?!<!&?t;z!&%"%s%@%9%3%"$+$i$J$kJ8;zNs$G$9!#(B
 .TP
-.B \-x
+.B \-x, --line-regexp
 $B9TA4BN$,%^%C%A$9$k9T$N$_$rA*Br$7$^$9!#(B
-
-.PP
-FTS $B%i%$%V%i%j$H$H$b$K%3%s%Q%$%k$7$?>l9g!"0J2<$N%*%W%7%g%s$,(B
-$BMxMQ2DG=$G$9(B:
-.PD 0
 .TP
-.BI \-H
-.I \-R
-$B%*%W%7%g%s;XDj;~$K!"(B
-$B%3%^%s%I%i%$%s$N%7%s%\%j%C%/%j%s%/$rC)$j$^$9(B
-($BLZ$rC5:w$7$F$$$k;~$KAx6x$7$?%7%s%\%j%C%/%j%s%/$OC)$j$^$;$s(B) $B!#(B
-.TP
-.BI \-L
-.I \-R
-$B%*%W%7%g%s;XDj;~$K!"A4$F$N%7%s%\%j%C%/%j%s%/$rC)$j$^$9!#(B
-.TP
-.BI \-P
-.I \-R
-$B%*%W%7%g%s;XDj;~$K!"%7%s%\%j%C%/%j%s%/$rC)$j$^$;$s!#(B
-.TP
-.BI \-R
-files $B$N$_$r8!:w$9$kBe$o$j$K!"(Bfiles $B$r:,$H$9$k%U%!%$%k3,AX$r8!:w$7$^$9!#(B
+.B \-y
+$BF1$8$h$&$J0UL#$r;}$D(B
+.BR \-i
+$B$K$h$jCV$-49$($i$l$^$7$?!#(B
+.TP
+.B \-U, --binary
+$B%U%!%$%k$r%P%$%J%j$H$7$F07$$$^$9!#%G%U%)%k%H$G$O!"(BMS-DOS $B$H(B MS-Windows $B4D6-2<$G(B
+.BR grep
+$B$O!"%U%!%$%k$+$iFI$_<h$C$?:G=i$N(B 32KB
+$B$NFbMF$r8+$F!"%U%!%$%k%?%$%W$r?dB,$7$^$9!#(B
+.BR grep
+$B$O%U%!%$%k$r%F%-%9%H%U%!%$%k$HH=CG$7$?>l9g!"%*%j%8%J%k$N%U%!%$%kFbMF$+$i(B
+( 
+.B ^
+$B$H(B
+.B $
+$B$,;H$o$l$F$$$k@55,I=8=$r@5$7$/F0:n$5$;$k$?$a$K(B )
+CR $BJ8;z$r<h$j=|$-$^$9!#(B
+.B \-U
+$B$r;XDj$9$k$H!"$3$NEv$F?dNL$rM^@)$7!"$9$Y$F$N%U%!%$%k$rFI$_<h$C$F(B
+$B%^%C%A5!9=$X$=$N$^$^EO$7$^$9!#$b$7%U%!%$%k$,(B
+$B3F9T$NKvHx$K(B CR/LF $B$NAH$_$r;}$D%F%-%9%H%U%!%$%k$J$i!"(B
+$B$3$N%*%W%7%g%s$O@55,I=8=$rLr$KN)$?$J$/$5$;$k$3$H$,$"$k$G$7$g$&!#(B
+$B$3$N%*%W%7%g%s$O(B MS-DOS $B$H(B MS-Windows $B$G$N$_%5%]!<%H$5$l$F$$$^$9!#(B
 .TP
+.B \-u, --unix-byte-offsets
+unix $B7A<0$N%P%$%HC10L%*%U%;%C%H$rJs9p$7$^$9!#$3$N%9%$%C%A$r;XDj$9$k$H(B
+.B grep
+$B$O!"%U%!%$%k$,(B unix $B7A<0$N%F%-%9%H%U%!%$%k!"(B
+$B$9$J$o$A!"(B CR $BJ8;z$,<h$j=|$+$l$?%U%!%$%k$G$"$k$+$N$4$H$/$K(B
+$B%P%$%HC10L%*%U%;%C%H$rJs9p$7$^$9!#(B
+$B$3$N$3$H$O(B
+.B grep
+$B$r(B Unix $B%^%7%s$GF0:n$5$;$?$N$HF1$87k2L$r@8@.$7$^$9!#(B
+$B$3$N%*%W%7%g%s$O(B
+.B \-b
+$B%*%W%7%g%s$b;HMQ$7$J$$8B$j8z2L$,$"$j$^$;$s!#(B
+MS-DOS $B$H(B MS-Windows $B$N$_%5%]!<%H$5$l$F$$$^$9!#(B
+.PD
 .LP
-$B<!$N%*%W%7%g%s$O(B zlib $B%i%$%V%i%j$H6&$K%3%s%Q%$%k$7$?>l9g$N$_;HMQ2DG=$G$9(B:
+$B<!$N%*%W%7%g%s$O(B zlib(3) $B%i%$%V%i%j$H6&$K%3%s%Q%$%k$7$?>l9g$N$_;HMQ2DG=$G$9(B:
 .PD 0
 .TP
-.BI \-Z
-.I \-Z
-$B%*%W%7%g%s$,;XDj$5$l$k$H!"8!:wA0$KF~NO%U%!%$%k$r?-D9$7$^$9!#(B
-.TP
+.B \-Z, --decompress
+$B8!:w$r3+;O$9$kA0$KF~NO%G!<%?$r?-D9$7$^$9!#(B
 .PD
 .SH "$B@55,I=8=(B"
 .PP
-$B@55,I=8=$O!"J8;zNs$N=89g$rI=8=$9$k%Q%?!<%s$N;v$G$9!#@55,I=8=$O!"$h$j>.$5$J(B
-$BI=8=$rAH$_9g$o$;$k$5$^$6$^$J1i;;;R$rMQ$$$k;v$K$h$j!"?t<0I=8=$HF1$8$h$&$J(B
-$BI=8=$r:n@.$9$k;v$,$G$-$^$9!#(B
+$B@55,I=8=$O!"J8;zNs$N=89g$rI=8=$9$k%Q%?!<%s$N;v$G$9!#?t<0I=8=$HF1MM$K!"(B
+$B$h$j>.$5$JI=8=$rAH$_9g$o$;$k$5$^$6$^$J1i;;;R$rMQ$$$k;v$G!"(B
+$B@55,I=8=$rAH$_N)$F$^$9!#(B
 .PP
 .B grep
 $B$O!"!V4pK\!W@55,I=8=$H(B
-$B!V3HD%!W@55,I=8=$N(B 2 $B<oN`$N@55,I=8=$r07$&;v$,$G$-$^$9!#(B
+$B!V3HD%!W@55,I=8=$N(B 2 $B<oN`$N@55,I=8=J8K!$r07$&;v$,$G$-$^$9!#(B
 .RB "GNU\ " grep
-$B$G$O!"$I$A$i$NI=8=$b5!G=E*$K0c$$$"$j$^$;$s!#(B
+$B$G$O!"$I$A$i$N@55,I=8=J8K!$b5!G=E*$J0c$$$O$"$j$^$;$s!#(B
 $BB>$N<BAu$G$O!"4pK\@55,I=8=$O3HD%@55,I=8=$h$jG=NO$,Dc$/$J$C$F$$$^$9!#(B
 $B$3$3$G$O!"3HD%@55,I=8=$K$D$$$F@bL@$7$^$9!#(B
 $B4pK\@55,I=8=$H$N0c$$$O!"$=$N8e$K@bL@$7$^$9!#(B
 .PP
-$B@55,I=8=$N4pK\C10L$O!"(B1 $BJ8;z$K%^%C%A$7$^$9!#(B
-$B%l%?!<$d?t;z$J$I$NB?$/$NJ8;z$O!"$=$l<+?H$K%^%C%A$7$^$9!#(B
-$B$^$?!"FC<l$J0UL#$,$"$k%a%?J8;z$b!"$=$NJ8;z$NA0$K%P%C%/%9%i%C%7%e(B
-$B$rIU$1$k;v$G!"$=$NK\Mh$NJ8;z$K%^%C%A$9$k$h$&$K$J$j$^$9!#(B
+$B@55,I=8=$N4pK\C10L$O!"(B1 $BJ8;z$K%^%C%A$9$k@55,I=8=$G$9!#(B
+$B%l%?!<$H?t;z$r4^$`B?$/$NJ8;z$O!"$=$l<+?H$K%^%C%A$9$k@55,I=8=$G$9!#(B
+$B$^$?!"FC<l$J0UL#$r;}$D%a%?J8;z$b!"$=$NJ8;z$NA0$K%P%C%/%9%i%C%7%e(B
+$B$rIU$1$k$H!"$=$NK\Mh$NJ8;z$K%^%C%A$9$k$h$&$K$J$j$^$9!#(B
 .PP
 .B [
 $B$H(B
 .B ]
-$B$G0O$^$l$?J8;z$N%j%9%H$O!"$=$N%j%9%H$NCf$K4^$^$l$k$I$l$+(B 1 $BJ8;z$K%^%C%A$7$^$9!#(B
+$B$G0O$^$l$?J8;z$N%j%9%H$O!"$=$N%j%9%HCf$K4^$^$l$k$I$l$+(B 1 $BJ8;z$K%^%C%A$7$^$9!#(B
 $B$?$@$7!"%j%9%H$N@hF,$,%-%c%l%C%H(B
 .B ^
 $B$N>l9g$O!"$=$N%j%9%H$K4^$^$l(B
@@ -212,8 +313,8 @@
 $BNc$($P!"@55,I=8=(B
 .B [0123456789]
 $B$O?t;z(B 1 $BJ8;z$K%^%C%A$7$^$9!#(B
-ASCII $BJ8;z$NHO0O$O:G=i$H:G8e$NJ8;z$r%O%$%U%s(B (`-') $B$G$D$J$0$3$H$G(B
-$B;XDj$G$-$^$9!#:G8e$K!"FCDj$NL>A0$r;}$DJ8;z%/%i%9$,4{Dj5A$5$l$F$$$^$9!#(B
+$B%"%9%-!<J8;z$NHO0O$O:G=i$H:G8e$NJ8;z$r%O%$%U%s(B (`-') $B$G$D$J$0$3$H$G(B
+$B;XDj$G$-$^$9!#:G8e$K!"FCDj$NL>A0$r;}$DJ8;z%/%i%9$,$"$i$+$8$aDj5A$5$l$F$$$^$9!#(B
 $BL>A0$,FbMF$r<($7$F$*$j!"$=$l$i$O!"(B
 .BR [:alnum:] ,
 .BR [:alpha:] ,
@@ -225,37 +326,37 @@
 .BR [:punct:] ,
 .BR [:space:] ,
 .BR [:upper:] ,
-.B [:xdigit:]
+.BR [:xdigit:]
 $B$G$9!#(B
 $BNc$($P!"(B
 .B [[:alnum:]]
 $B$O(B
-.B [0-9A-Za-z]
+.BR [0-9A-Za-z]
 $B$HF1$8$G$9$,!"8e<T$O(B ASCII $B%3!<%I=g$K0MB8$7$^$9$N$G!"A0<T$NJ}$,2DHBE*$G$9!#(B
-($BCm(B: $B%/%i%9L>$N3C3g8L$O%7%s%\%kL>$N0lIt$G$"$j!"(B
-$B%j%9%H$r6h@Z$k3C3g8L$H$OJL$K;XDj$9$kI,MW$,$"$j$^$9!#(B)
-$B%j%9%H$NCf$G$O!"$[$H$s$I$NFC<lJ8;z$O!"DL>o$NJ8;z$H$7$F07$o$l$^$9!#(B
+($B%/%i%9L>$NCf$N3Q3g8L$O%7%s%\%kL>$N0lIt$G$"$j!"(B
+$B%j%9%H$r6h@Z$k3Q3g8L$H$OJL$K;XDj$9$kI,MW$,$"$k$3$H$KCm0U(B)
+$B%j%9%H$NCf$G$O!"$[$H$s$I$N%a%?J8;z$ODL>o$NJ8;z$H$7$F07$o$l$^$9!#(B
 $B%j%F%i%k(B
 .B ]
-$B$r4^$`$?$a$K$O%j%9%H$N@hF,$KCV$$$F$/$@$5$$!#F1MM$K!"%j%F%i%k(B
+$B$r4^$a$k$K$O!"$3$NJ8;z$r%j%9%H$N@hF,$KCV$$$F$/$@$5$$!#F1MM$K!"%j%F%i%k(B
 .B ^
-$B$r4^$`$?$a$K$O@hF,0J30$KCV$$$F$/$@$5$$!#%j%F%i%k(B
+$B$r4^$a$k$K$O!"$3$NJ8;z$r%j%9%H$N@hF,0J30$KCV$$$F$/$@$5$$!#%j%F%i%k(B
 .B \-
-$B$r4^$`$?$a$K$O!":G8e$KCV$$$F$/$@$5$$!#(B
+$B$r4^$a$k$K$O!"$3$NJ8;z$r%j%9%H$N:G8e$KCV$$$F$/$@$5$$!#(B
 .PP
 $B%T%j%*%I(B
 .B .
 $B$O!"G$0U$N(B 1 $BJ8;z$K%^%C%A$7$^$9!#(B
 $B%7%s%\%k(B
 .B \ew
-$B$O!"(B
+$B$O(B
 .B [[:alnum:]]
-$B$HF1$8$G!"(B
+$B$HF1$80UL#$G!"(B
 $B%7%s%\%k(B
 .B \eW
-$B$O!"(B
-.B [^[:alnum:]]
-$B$HF1$8$G$9!#(B
+$B$O(B
+.BR [^[:alnum:]]
+$B$HF1$80UL#$G$9!#(B
 .PP
 $B%-%c%l%C%H(B
 .B ^
@@ -267,7 +368,7 @@
 .B \e<
 $B$H%7%s%\%k(B
 .B \e>
-$B$O!"$=$l$>$lC18l$N@hF,$HC18l$NKvHx$N6uJ8;zNs$K%^%C%A$9$k%a%?J8;z$G$9!#(B
+$B$O!"$=$l$>$lC18l$N@hF,$HKvHx$N6uJ8;zNs$K%^%C%A$9$k%a%?J8;z$G$9!#(B
 $B%7%s%\%k(B
 .B \eb
 $B$OC18l$NC<$N6uJ8;zNs$K%^%C%A$7$^$9!#(B
@@ -277,7 +378,7 @@
 .I $B0J30(B
 $B$N6uJ8;zNs$K%^%C%A$7$^$9!#(B
 .PP
-1 $BJ8;z$K%^%C%A$9$k@55,I=8=$N8e$K$O!"7+$jJV$71i;;;R$,IU$/$3$H$,$"$j$^$9(B:
+$B@55,I=8=$N8e$K$O!"7+$jJV$71i;;;R$N$I$l$+$,B3$/$3$H$,$"$j$^$9!#(B
 .PD 0
 .TP
 .B ?
@@ -312,26 +413,28 @@
 $B2s%^%C%A$7$^$9!#(B
 .PD
 .PP
-2 $B$D$N@55,I=8=$O7k9g2DG=$G$9(B;
+2 $B$D$N@55,I=8=$O7k9g2DG=$G$9!#(B
 $B7k2L$H$7$F$G$-$"$,$k@55,I=8=$O!"(B
 $B7k9g$5$l$?(B 2 $B$D$NItJ,I=8=$K$=$l$>$l%^%C%A$9$k(B
 2 $B$D$NItJ,J8;zNs$r7k9g$7$?G$0U$NJ8;zNs$K%^%C%A$7$^$9!#(B
-2 $B$D$N@55,I=8=$O(B
-.B |
-$B%$%s%U%#%/%91i;;;R$G7R$0$3$H$,$G$-$^$9(B;
+.PP
+2 $B$D$N@55,I=8=$OCfCV$-7?1i;;;R(B
+.BR |
+$B$G7R$0$3$H$,2DG=$G$9!#(B
 $B7k2L$H$7$F$G$-$"$,$k@55,I=8=$O!"(B
 $B$I$A$i$+$NItJ,I=8=$K%^%C%A$9$kG$0U$NJ8;zNs$K%^%C%A$7$^$9!#(B
 .PP
-$B7+$jJV$7$O7k9g$KM%@h$7$^$9!#$^$?7k9g$OA*8@$KM%@h$7$^$9!#(B
-$BItJ,I=8=A4BN$O3g8L$G3g$C$F!"$3$N=g=x$KM%@h$5$;$k$3$H$,$G$-$^$9!#(B
+$B7+$jJV$7$O7k9g$KM%@h$7$^$9!#$^$?7k9g$OA*Br$KM%@h$7$^$9!#(B
+$B$3$l$i$NM%@h5,B'$rL58z$H$9$k$?$a$K!"(B
+$BItJ,I=8=A4BN$r3g8L$G0O$`$3$H$,2DG=$G$9!#(B
 .PP
 .I n
-$B$,(B 1 $B$D$N?t;z$G$"$k$h$&$J!"(B
+$B$,(B 1 $B$D$N?t;z$G$"$k$h$&$J(B
 $B8eJ};2>H(B
-.BI \e n\c
-\& $B$O!"@55,I=8=Cf$G3g8L$G0O$^$l$?(B
-.I n 
-$BHVL\$NItJ,I=8=$K%^%C%A$7$^$9!#(B
+.BI \e n
+$B$O!"@55,I=8=Cf$N3g8L$G0O$^$l$?(B
+.IR n
+$BHVL\$NItJ,I=8=$,%^%C%A$7$?J8;zNs$H%^%C%A$7$^$9!#(B
 .PP
 $B4pK\@55,I=8=$G$O!"%a%?J8;z(B
 .BR ? ,
@@ -339,14 +442,14 @@
 .BR { ,
 .BR | ,
 .BR ( ,
-.B )
-$B$O!"FC<l$J0UL#$r<:$$$^$9(B; $BBe$o$j$K!"%P%C%/%9%i%C%7%e$rIU$1$?(B
+.BR )
+$B$O!"$=$NFC<l$J0UL#$r<:$$$^$9!#Be$o$j$K!"%P%C%/%9%i%C%7%e$rIU$1$?(B
 .BR \e? ,
 .BR \e+ ,
 .BR \e{ ,
 .BR \e| ,
 .BR \e( ,
-.B \e) 
+.BR \e) 
 $B$r;HMQ$7$F$/$@$5$$!#(B
 .PP
 .B egrep
@@ -355,23 +458,37 @@
 $B$O!"FC<l$J0UL#$r<:$$$^$9(B; $BBe$o$j$K!"(B
 .B \e{
 $B$r;H$&I,MW$,$"$j$^$9!#(B
+.SH "$B4D6-(B"
+$B4D6-JQ?t(B
+.B GREP_OPTIONS
+$B$O!"(B
+.I grep
+$B$KBP$9$k%G%U%)%k%H$N%*%W%7%g%s$rJ];}$9$k;v$,2DG=$G$9!#(B
+$B$3$l$i$N%*%W%7%g%s$O:G=i$K2r<a$5$l!"%3%^%s%I%i%$%s$+$i(B
+$BL@<(E*$K;XDj$5$l$?%Q%i%a!<%?$r>e=q$-$9$k$3$H$,$G$-$^$9!#(B
 .SH $B?GCG(B
+.PP
 $BDL>o!"%Q%?!<%s$K%^%C%A$7$?9T$,8+$D$+$C$?>l9g$O(B 0 $B$r!"(B
 $B8+$D$+$i$J$+$C$?>l9g$O(B 1 $B$rJV$7$^$9!#(B($B$?$@$7!"(B
 .B \-v
 $B%*%W%7%g%s$r;XDj$7$?>l9g$O!"5U$K$J$j$^$9!#(B)
-$B%Q%?!<%s$N;XDj$N;EJ}$,4V0c$C$F$$$?$j!"%U%!%$%k$,%"%/%;%9$G$-$J$$$J$I$N(B
-$B%(%i!<$,H/@8$7$?>l9g$O!"(B2 $B$rJV$7$^$9!#(B
+$B%Q%?!<%s$KJ8K!%(%i!<$,B8:_$7$?$j!"(B
+$BF~NO%U%!%$%k$K%"%/%;%9$G$-$J$$$J$I$N(B
+$B%7%9%F%`%(%i!<$,H/@8$7$?>l9g$O!"(B2 $B$rJV$7$^$9!#(B
 .SH $B%P%0(B
+.PP
 $B%P%0%l%]!<%H$O!"(B
-.B bug-gnu-utils@prep.ai.mit.edu
-$B$^$G(B Email $B$7$F$/$@$5$$!#$3$N;~!"(B``Subject:'' $B$N$I$3$K$G$b$$$$$G$9$+$i(B
-``grep'' $B$H$$$&C18l$r(B
+.BR bug-gnu-utils@gnu.org
+$B$^$G(B Email $B$7$F$/$@$5$$!#(B
+$B$3$N;~!"(BSubject: $B$N$I$3$+$K(B
+grep $B$H$$$&C18l$r(B
 $BK:$l$:$KF~$l$F$/$@$5$$!#(B
 .PP
 .BI { m , n }
 $B$NI=8=$GHs>o$KBg$-$J7+$jJV$7$r;XDj$9$k$H!"Hs>o$KB?$/$N%a%b%j$r>CHq$7$^$9!#(B
 $B$5$i$K!"$"$k<o$N$"$$$^$$$J@55,I=8=$r;XDj$9$k$H!"I,MW$H$J$k;~4V$H%a%b%jNN0h$O(B
-$B;X?tE*$KA}Bg$7!"%a%b%jITB-$r5/$3$92DG=@-$,$"$j$^$9!#(B
+$B;X?tE*$KA}Bg$7!"(B
+.B grep
+$B$,%a%b%jITB-$r5/$3$92DG=@-$,$"$j$^$9!#(B
 .PP
 $B8eJ};2>H$OHs>o$KF0:n$,CY$/!"I,MW$H$J$k;~4V$O;X?tE*$KA}Bg$7$^$9!#(B
diff -ur man/man1/grodvi.1 man/man1/grodvi.1
--- man/man1/grodvi.1	Mon Apr 26 10:34:46 1999
+++ man/man1/grodvi.1	Thu Jun 15 22:57:18 2000
@@ -25,7 +25,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GRODVI 1 "7 September 1996" "Groff Version 1.11"
+.TH GRODVI 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 grodvi \- groff $B$N=PNO$r(B TeX $B$N(B dvi $B7A<0$KJQ49$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/groff.1 man/man1/groff.1
--- man/man1/groff.1	Sat Nov 20 19:54:18 1999
+++ man/man1/groff.1	Mon Jun 26 21:43:48 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 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 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/groff/groff.man,v 1.2.4.2 2000/03/09 20:08:51 asmodai Exp %
+
 ..
 .\" jpman %Id: groff.1,v 1.2 1997/05/13 16:13:14 horikawa Stab %
 .de TQ
@@ -28,13 +31,13 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROFF 1 "18 March 1999" "Groff Version 1.11"
+.TH GROFF 1 "9 March 2000" "Groff Version 1.15"
 .SH $BL>>N(B
 groff \- groff $B%I%-%e%a%s%H%U%)!<%^%C%H%7%9%F%`$N%U%m%s%H%(%s%I(B
 .SH $B=q<0(B
 .B groff
 [
-.B \-tpeszaivhblCENRSVXZ
+.B \-abehilpstvzCENRSUVXZ
 ]
 [
 .BI \-w name
@@ -49,6 +52,9 @@
 .BI \-F dir
 ]
 [
+.BI \-I dir
+]
+[
 .BI \-T dev
 ]
 [
@@ -73,6 +79,9 @@
 .BI \-P arg
 ]
 [
+.BI \-L arg
+]
+[
 .IR files \|.\|.\|.\|
 ]
 .SH $B2r@b(B
@@ -85,28 +94,31 @@
 $B8e=hM}%W%m%0%i%`$r<B9T$7$^$9!#MxMQ2DG=$J%G%P%$%9$O0J2<$N$H$*$j$G$9(B:
 .TP
 .B ps
-PostScript $B%W%j%s%?$d%W%l%S%e%"(B
+PostScript $B%W%j%s%?$d%W%l%S%e%"!#(B
 .TP
 .B dvi
-TeX $B$N(B dvi $B%U%)!<%^%C%H(B
+TeX $B$N(B dvi $B%U%)!<%^%C%H!#(B
 .TP
 .B X75
-75 dpi $B$N(B X11 $B%W%l%S%e%"(B
+75 dpi $B$N(B X11 $B%W%l%S%e%"!#(B
 .TP
 .B X100
-100 dpi $B$N(B X11 $B%W%l%S%e%"(B
+100 dpi $B$N(B X11 $B%W%l%S%e%"!#(B
 .TP
 .B ascii
-$B%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9(B
+$B%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9!#(B
 .TP
 .B latin1
-ISO Latin-1 $BJ8;z=89g$rMxMQ$9$k%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9(B
+ISO Latin-1 $BJ8;z=89g$rMxMQ$9$k%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9!#(B
 .TP 
 .B lj4
-HP LaserJet4 $B8_49(B ($B$^$?$OB>$N(B PCL5 $B8_49(B) $B%W%j%s%?(B
+HP LaserJet4 $B8_49(B ($B$^$?$OB>$N(B PCL5 $B8_49(B) $B%W%j%s%?!#(B
 .TP
 .B koi8-r
-$B%m%7%"8l(B KOI8-R $BJ8;z=89g$rMxMQ$9$k%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9(B
+$B%m%7%"8l(B KOI8-R $BJ8;z=89g$rMxMQ$9$k%?%$%W%i%$%?$K;w$?FC@-$r;}$D%G%P%$%9!#(B
+.TP
+.B html
+HTML $B=PNO$r9T$$$^$9!#(B
 .LP
 $B;XDj$5$l$?%G%P%$%9MQ$N8e=hM}$r9T$&%W%m%0%i%`$O!"%G%P%$%95-=R%U%!%$%k$N(B 
 .B postpro
@@ -156,6 +168,14 @@
 .B soelim
 $B$r;H$C$FA0=hM}$r9T$$$^$9!#(B
 .TP
+.BI \-I dir
+$B$3$N%*%W%7%g%s$O(B
+.BR soelim (1)
+$B$K5-=R$5$l$F$$$^$9!#(B
+$B$3$N%*%W%7%g%s$O(B
+.B \-s
+$B%*%W%7%g%s$r0EL[E*$K;XDj$7$^$9!#(B
+.TP
 .B \-R
 .B refer
 $B$r;H$C$FA0=hM}$r9T$$$^$9!#(B
@@ -261,6 +281,10 @@
 $B$K$F(B
 .B \%\-msafer
 $B%^%/%m$r;HMQ$7$^$9!#(B
+($B%G%U%)%k%H$GM-8z$K$J$j$^$9(B)
+.TP
+.B \-U
+$B0BA4$G$J$$%b!<%I!#8E$$0BA4$G$J$$F0:n$KLa$7$^$9!#(B
 .TP
 .B \-a
 .TQ
@@ -316,6 +340,8 @@
 .BR gropos ,
 .BR grodvi ,
 .BR grotty ,
+.BR grolj4 ,
+.BR grohtml ,
 .B gxditview
 $B$K$O1F6A$7$^$;$s!#(B
 .TP
@@ -371,11 +397,11 @@
 .SH $B:n<T(B
 James Clark <jjc@jclark.com>
 .SH $B%P%0(B
-$B%P%0%l%]!<%H$O!"(Bbug-groff@prep.ai.mit.edu $B$^$G$*4j$$$7$^$9!#(B
+$B%P%0%l%]!<%H$O!"(Bbug-groff@gnu.org $B$^$G$*4j$$$7$^$9!#(B
 $B%l%]!<%H$N:]$K$O%P%0$r:F8=$G$-$k40A4$JNcBj$rE:IU$7!"$"$J$?$NMx(B
 $BMQ$7$F$$$k(B groff $B$N%P!<%8%g%s$rE:$($F2<$5$$!#(B 
 .SH COPYRIGHT
-Copyright  (C) 1989, 1990, 1991, 1992  Free Software Foundation, Inc.
+Copyright \(co 1989, 1990, 1991, 1992, 1999 Free Software Foundation, Inc.
 .LP
 groff $B$O%U%j!<%=%U%H%&%'%"$G$9!#(BFree Software Foundation $B$+$i(B
 $B=PHG$5$l$F$$$k(B the GNU General Public License $B$N(B ver 2.0 $B$+$=(B
@@ -393,10 +419,10 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 $B$^$G8fO"Mm2<$5$$!#(B
 .SH $BF~<j@-(B
-$B:G?7$N(B groff $B$O$?$$$F$$(B prep.ai.mit.edu $B$N(B pub/gnu $B%G%#%l%/%H(B
-$B%j$KCV$+$l$F$*$j!"(Banonymous ftp $B$GF~<j$G$-$^$9!#(B
+$B:G?7$N(B groff $B$O$?$$$F$$(B ftp.gnu.org $B$N(B gnu/groff $B%G%#%l%/%H%j$KCV$+$l$F$*$j!"(B
+anonymous ftp $B$GF~<j$G$-$^$9!#(B
 .SH $B4XO"9`L\(B
-.\" .BR grog (1),
+.BR grog (1),
 .BR troff (1),
 .BR tbl (1),
 .BR pic (1),
@@ -406,10 +432,11 @@
 .BR grops (1),
 .BR grodvi (1),
 .BR grotty (1),
-.\" .BR gxditview (1),
+.BR grohtml (1),
 .BR groff_font (5),
 .BR groff_out (5),
+.BR groff_man (7),
 .BR groff_ms (7),
-.BR me (7),
+.BR groff_me (7),
 .BR groff_char (7),
-.BR msafer (7)
+.BR groff_msafer (7)
Only in man/man1: grog.1
Only in man/man1: grohtml.1
diff -ur man/man1/grolj4.1 man/man1/grolj4.1
--- man/man1/grolj4.1	Mon Apr 26 10:34:46 1999
+++ man/man1/grolj4.1	Mon Jun 26 21:43:58 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 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
@@ -23,7 +23,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROLJ4 1 "7 September 1996" "Groff Version 1.11"
+.TH GROLJ4 1 "9 March 2000" "Groff Version 1.15"
 .SH $BL>>N(B
 grolj4 \- HP Laserjet 4 $B%U%!%_%jMQ(B groff $B%I%i%$%P(B
 .SH $B=q<0(B
@@ -31,6 +31,10 @@
 [
 .B \-lv
 ] [
+.B \-d
+[\c
+.IR n ]
+] [
 .BI \-c n
 ] [
 .BI \-p paper_size
@@ -68,6 +72,13 @@
 .TP
 .B \-l
 $B%i%s%I%9%1!<%W$K$FJ8=q$r0u:~$7$^$9!#(B
+.TP
+.BI "\-d [" n ]
+$BFs=E%b!<%I(B
+.IR n
+$B$r;HMQ$7$^$9(B:
+1\ $B$OD9$$%5%$%I%P%$%s%G%#%s%0$G!"(B2 $B$OC;$$%5%$%I%P%$%s%G%#%s%0$G$9!#(B
+$B%G%U%)%k%H$O(B\ 1 $B$G$9!#(B
 .TP
 .BI \-p size
 $BMQ;f%5%$%:$r(B
diff -ur man/man1/grops.1 man/man1/grops.1
--- man/man1/grops.1	Mon Apr 26 10:34:46 1999
+++ man/man1/grops.1	Thu Jun 15 23:03:11 2000
@@ -23,7 +23,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROPS 1 "8 September 1996" "Groff Version 1.11"
+.TH GROPS 1 "8 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 grops \- groff $BMQ(B PostScript $B%I%i%$%P(B
 .SH $B=q<0(B
diff -ur man/man1/grotty.1 man/man1/grotty.1
--- man/man1/grotty.1	Mon Apr 26 10:34:46 1999
+++ man/man1/grotty.1	Thu Jun 15 23:03:34 2000
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: grotty.1,v 1.2 1997/05/13 16:15:38 horikawa Stab %
-.TH GROTTY 1 "8 September 1996" "Groff Version 1.11"
+.TH GROTTY 1 "8 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 grotty \- $B%?%$%W%i%$%?7?%G%P%$%9$N$?$a$N(B groff $B%I%i%$%P(B
 .SH $B=q<0(B
diff -ur man/man1/hostname.1 man/man1/hostname.1
--- man/man1/hostname.1	Wed Sep  1 11:13:36 1999
+++ man/man1/hostname.1	Sat Jun 17 22:54:08 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/hostname/hostname.1,v 1.8.2.1 1999/08/29 14:12:37 peter Exp %
+.\" %FreeBSD: src/bin/hostname/hostname.1,v 1.8.2.2 1999/12/22 01:35:49 jhb Exp %
 .\" jpman %Id: hostname.1,v 1.2 1997/04/10 07:27:59 mutoh Stab %
 .\"
 .Dd April 28, 1995
@@ -50,6 +50,11 @@
 $B$3$l$ODL>o!"%V!<%H;~$K%M%C%H%o!<%/$N=i4|2=%9%/%j%W%H$G$"$k(B
 .Pa /etc/rc.network
 $B$NCf$G9T$J$o$l$^$9!#(B
+$B$3$N%9%/%j%W%H$O!"(B
+.Pa /etc/rc.conf
+$BCf$N(B
+.Va hostname
+$BJQ?t$r;HMQ$7$^$9!#(B
 .Pp
 $B%*%W%7%g%s$H$7$F$O!"0J2<$N$b$N$,$"$j$^$9!#(B
 .Bl -tag -width flag
@@ -57,7 +62,8 @@
 $BL>A0$+$i%I%a%$%s>pJs$r<h$j=|$$$FI=<($7$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
-.Xr gethostname 3
+.Xr gethostname 3 ,
+.Xr rc.conf 5
 .Sh $BNr;K(B
 .Nm
 $B%f!<%F%#%j%F%#$O(B
diff -ur man/man1/indxbib.1 man/man1/indxbib.1
--- man/man1/indxbib.1	Mon Apr 26 10:34:46 1999
+++ man/man1/indxbib.1	Thu Jun 15 23:06:12 2000
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: indxbib.1,v 1.2 1997/03/29 04:27:19 horikawa Stab %
-.TH INDXBIB 1 "7 September 1996" "Groff Version 1.11"
+.TH INDXBIB 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 indxbib \- $BJ88%L\O?%G!<%?%Y!<%9MQ$N5U0z$-%$%s%G%C%/%9$N:n@.(B
 .SH $B=q<0(B
Only in man/man1: info.1
diff -ur man/man1/install-info.1 man/man1/install-info.1
--- man/man1/install-info.1	Sun Oct 17 20:35:38 1999
+++ man/man1/install-info.1	Thu Jun 15 23:06:39 2000
@@ -1,60 +1,84 @@
-.\"
-.\" Copyright (c) 1997 David E. O'Brien (obrien@FreeBSD.org)
-.\"
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" %FreeBSD: src/gnu/usr.bin/texinfo/install-info/install-info.1,v 1.2.2.2 1999/09/23 13:43:31 phantom Exp %
-.\"
-.\" .TH install-info 1
-.Dd August 29, 1997
-.Dt INSTALL-INFO 1
-.Os BSD
-.Sh $BL>>N(B
-.Nm install-info
-.Nd GNU info $B%O%$%Q!<%F%-%9%H%7%9%F%`MQ$N(B info/dir $B%U%!%$%k$rJT=8$9$k(B
-.Sh $B=q<0(B
-.Nm install-info
-.Ar program.info info/dir
-.Sh $B2r@b(B
-.Nm
-$B$O(B FreeBSD ports $B%3%l%/%7%g%s$G$h$/MxMQ$5$l$^$9!#(B
-.Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width "/usr/share/info/dir" -compact
-.It Pa "/usr/share/info/dir"
-.It Pa "/usr/local/info/dir"
-.El
-.I F
-.Sh $B4XO"9`L\(B
-.Xr info 1
-.\" .Sh $B?GCG(B
-.\" $B$J$7!#(B
-.\" .Sh $B%P%0(B
-.\" $BCN$i$l$F$$$k$b$N$O$"$j$^$;$s!#(B
-.Sh $B:n<T(B
-$B$3$N%^%K%e%"%k%Z!<%8$O(B
-.An David O'Brien Aq obrien@NUXI.com
-$B$K$h$C$F(B
-$B=q$+$l$^$7$?!#(B
-.\" .Sh HISTORY
-.\" .Nm 
-.\" appeared in FreeBSD 2.1.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
+.TH INSTALL-INFO "1" "September 1999" "GNU texinfo 4.0" FSF
+.SH $BL>>N(B
+install-info \- info/dir $B%(%s%H%j$N99?7(B
+.SH $B=q<0(B
+.B install-info
+[\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
+.SH $B2r@b(B
+.PP
+Info $B%G%#%l%/%H%j%U%!%$%k(B DIR-FILE $B$KBP$7!"(B
+INFO-FILE $BMQ$N%G%#%l%/%H%j%(%s%H%j$N%$%s%9%H!<%k$^$?$O:o=|$r9T$$$^$9!#(B
+.SH $B%*%W%7%g%s(B
+.TP
+\fB\-\-delete\fR
+INFO-FILE $BMQ$K4{$KB8:_$9$k%(%s%H%j$r(B DIR-FILE $B$+$i:o=|$7$^$9!#(B
+.IP
+$B?75,%(%s%H%j$r$J$K$bA^F~$7$^$;$s!#(B
+.TP
+\fB\-\-dir\-file\fR=\fINAME\fR
+Info $B%G%#%l%/%H%j%U%!%$%k$N%U%!%$%kL>$r;XDj$7$^$9!#(B
+.IP
+$B$3$l$O!"(BDIR-FILE $B0z?t$r;HMQ$9$k$N$HEy2A$G$9!#(B
+.TP
+\fB\-\-entry\fR=\fITEXT\fR
+Info $B%G%#%l%/%H%j%(%s%H%j$H$7$F!"(BTEXT $B$rA^F~$7$^$9!#(B
+.IP
+TEXT $B$N7A<0$O!"(B
+Info $B%a%K%e!<9`L\9T(B 1 $B9T$K2C$(!"(B
+$B6uGr$+$i3+;O$9$kDI2C9T$r(B 0 $B9T0J>e$G$9!#(B
+$BJ#?t%(%s%H%j$r;XDj$7$?>l9g!"$9$Y$F$,DI2C$5$l$^$9!#(B
+$B%(%s%H%j$r$J$K$b;XDj$7$J$$>l9g!"(BInfo $B%U%!%$%k<+?H$NCf$N>pJs$+$i!"(B
+$B%(%s%H%j$,7hDj$5$l$^$9!#(B
+.TP
+\fB\-\-help\fR
+$B$3$N%X%k%W$rI=<($7=*N;$7$^$9!#(B
+.TP
+\fB\-\-info\-file\fR=\fIFILE\fR
+$B%G%#%l%/%H%j$K%$%s%9%H!<%k$9$k(B Info $B%U%!%$%k$r;XDj$7$^$9!#(B
+.IP
+$B$3$l$O!"(BINFO-FILE $B0z?t$r;XDj$9$k$N$HEy2A$G$9!#(B
+.TP
+\fB\-\-info\-dir\fR=\fIDIR\fR
+\fB\-\-dir\-file\fR=\fIDIR\fR/dir $B$HF1$8$G$9!#(B
+.TP
+\fB\-\-item\fR=\fITEXT\fR
+\fB\-\-entry\fR TEXT $B$HF1$8$G$9!#(B
+.IP
+Info $B%G%#%l%/%H%j%(%s%H%j$O!"<B:]$K%a%K%e!<9`L\$G$9!#(B
+.TP
+\fB\-\-quiet\fR
+$B7Y9p$rM^@)$7$^$9!#(B
+.TP
+\fB\-\-remove\fR
+\fB\-\-delete\fR $B$HF1$8$G$9!#(B
+.TP
+\fB\-\-section\fR=\fISEC\fR
+$B$3$N%U%!%$%k$N%(%s%H%j$r!"%G%#%l%/%H%j$N%;%/%7%g%s(B SEC $B$KCV$-$^$9!#(B
+.IP
+$BJ#?t$N%;%/%7%g%s$r;XDj$7$?>l9g!"A4%;%/%7%g%s$,3F%;%/%7%g%s$KDI2C$5$l$^$9!#(B
+$B%;%/%7%g%s$r;XDj$7$J$$>l9g!"(BInfo $B%U%!%$%k<+?H$NCf$N>pJs$+$i!"(B
+$B%;%/%7%g%s$,7hDj$5$l$^$9!#(B
+.TP
+\fB\-\-version\fR
+$B%P!<%8%g%s>pJs$rI=<($7=*N;$7$^$9!#(B
+.SH $B%P%0Js9p(B
+$B%P%0Js9p$O(B bug-texinfo@gnu.org $B$X!"(B
+$B0lHLE*$J<ALd$d5DO@$O(B help-texinfo@gnu.org $B$X%a!<%k$7$F$/$@$5$$(B
+.SH $B4XO"9`L\(B
+.B install-info
+$B$N40A4$JJ8=q$O!"(BTexinfo $B%^%K%e%"%k$K$F0];}$5$l$F$$$^$9!#(B
+$B$"$J$?$N%5%$%H$G(B
+.B info
+$B$H(B
+.B install-info
+$B$,E,@Z$K%$%s%9%H!<%k$5$l$F$$$k$J$i$P!"(B
+.IP
+.B info install-info
+.PP
+$B$H$$$&%3%^%s%I$G!"40A4$J%^%K%e%"%k$rFI$a$k$G$7$g$&!#(B
+.SH COPYRIGHT
+Copyright \(co 1999 Free Software Foundation, Inc.
+There is NO warranty.  You may redistribute this software
+under the terms of the GNU General Public License.
+For more information about these matters, see the files named COPYING.
diff -ur man/man1/install.1 man/man1/install.1
--- man/man1/install.1	Sun Oct  3 12:26:10 1999
+++ man/man1/install.1	Thu Jun 15 23:08:09 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/xinstall/install.1,v 1.13.2.1 1999/08/29 15:34:56 peter Exp %
+.\" %FreeBSD: src/usr.bin/xinstall/install.1,v 1.13.2.2 2000/03/06 11:35:31 sheldonh Exp %
 .\"
 .\" jpman %Id: install.1,v 1.3 1997/11/12 13:03:24 horikawa Stab %
 .Dd September 22, 1996
@@ -105,7 +105,8 @@
 .Xr chflags 1
 $B$r;2>H$7$F2<$5$$!#(B
 .It Fl g
-$B%0%k!<%W$r;XDj$7$^$9!#?tCM;XDj$N(B GID $B$,MxMQ$G$-$^$9!#(B
+$B%0%k!<%W$r;XDj$7$^$9!#(B
+$B?tCM;XDj$N(B GID $B$,MxMQ$G$-$^$9!#(B
 .It Fl M
 .Xr mmap 2
 $B$N;HMQ$rA4LLE*$K6X;_$7$^$9!#(B
@@ -116,7 +117,8 @@
 .Xr chmod 1
 $B$r;2>H$7$F2<$5$$!#(B
 .It Fl o
-$B=jM-<T$r;XDj$7$^$9!#?tCM;XDj$N(B UID $B$,MxMQ$G$-$^$9!#(B
+$B=jM-<T$r;XDj$7$^$9!#(B
+$B?tCM;XDj$N(B UID $B$,MxMQ$G$-$^$9!#(B
 .It Fl p
 $B=$@5;~9o$rJ]B8$7$^$9!#(B
 .Fl C
diff -ur man/man1/ipcrm.1 man/man1/ipcrm.1
--- man/man1/ipcrm.1	Wed Sep  1 11:13:37 1999
+++ man/man1/ipcrm.1	Thu Jun 15 23:09:34 2000
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" %FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.5.2.2 1999/08/29 15:28:53 peter Exp %
+.\" %FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.5.2.3 2000/05/09 14:27:11 sheldonh Exp %
 .\"
 .\" jpman %Id: ipcrm.1,v 1.2 1997/05/04 07:58:04 horikawa Stab %
 .\""
@@ -30,7 +30,7 @@
 .Os
 .Sh $BL>>N(B
 .Nm ipcrm
-.Nd $B;XDj$7$?%a%C%;!<%8%-%e!<!"%;%^%U%)%;%C%H!"6&M-%a%b%j%;%0%a%s%H$r:o=|$9$k(B
+.Nd "$B;XDj$7$?%a%C%;!<%8%-%e!<!"%;%^%U%)%;%C%H!"6&M-%;%0%a%s%H$r:o=|$9$k(B"
 .Sh $B=q<0(B
 .Nm
 .Op Fl q Ar msqid
diff -ur man/man1/kbdcontrol.1 man/man1/kbdcontrol.1
--- man/man1/kbdcontrol.1	Sat Nov 20 19:54:18 1999
+++ man/man1/kbdcontrol.1	Thu Jun 15 23:10:21 2000
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
-.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.4 1999/11/18 16:10:46 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.5 2000/05/09 14:27:12 sheldonh Exp %
 .\"
 .\" jpman %Id: kbdcontrol.1,v 1.3 1997/07/26 21:37:54 horikawa Stab %
 .\"
diff -ur man/man1/kbdmap.1 man/man1/kbdmap.1
--- man/man1/kbdmap.1	Wed Sep  1 11:13:38 1999
+++ man/man1/kbdmap.1	Fri Jun 16 00:10:17 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.14.2.1 1999/08/29 15:42:41 peter Exp %
+.\" %FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.14.2.2 2000/03/06 11:36:11 sheldonh Exp %
 .\" jpman %Id: kbdmap.1,v 1.3 1997/08/10 18:29:41 horikawa Stab %
 
 .Dd Mar 25, 1995
@@ -73,7 +73,8 @@
 .Xr vidfont 1
 $B$H$7$F%3%^%s%I$r<B9T$7$^$9!#(B
 .It Fl d , Fl default
-$B%G%U%)%k%H8@8l$r;HMQ$7$^$9!#(B$LANG $B$OL5;k$5$l$^$9!#(B
+$B%G%U%)%k%H8@8l$r;HMQ$7$^$9!#(B
+$LANG $B$OL5;k$5$l$^$9!#(B
 .It Fl h , Fl help
 $B%*%W%7%g%s0lMw$rI=<($7$F=*N;$7$^$9!#(B
 .It Fl l , Fl lang Ar language
diff -ur man/man1/kcon.1 man/man1/kcon.1
--- man/man1/kcon.1	Tue Feb 24 23:54:02 1998
+++ man/man1/kcon.1	Fri Jun 16 00:11:48 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)kcon.1, 3.20, Last Edit-Date: [Wed Jan 25 16:34:56 1995]
+.\" %FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.4.2.1 2000/03/06 11:36:44 sheldonh Exp %
 .\" jpman %Id: kcon.1,v 1.3 1997/07/22 17:43:18 horikawa Stab %
 .\"
 .Dd January 25, 1995
diff -ur man/man1/keyinit.1 man/man1/keyinit.1
--- man/man1/keyinit.1	Thu Oct 15 12:06:13 1998
+++ man/man1/keyinit.1	Fri Jun 16 00:16:05 2000
@@ -1,4 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
+.\" %FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.5.2.1 2000/03/06 11:34:32 sheldonh Exp %
 .\"
 .\" jpman %Id: keyinit.1,v 1.4 1997/07/26 21:39:55 horikawa Stab %
 .Dd July 20, 1993
diff -ur man/man1/keylogin.1 man/man1/keylogin.1
--- man/man1/keylogin.1	Sat Oct 10 09:09:07 1998
+++ man/man1/keylogin.1	Fri Jun 16 00:16:57 2000
@@ -1,6 +1,8 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"
+.\" %FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.2.2.1 2000/03/06 11:34:34 sheldonh Exp %
+.\"
 .\" jpman %Id: keylogin.1,v 1.3 1998/10/04 20:50:45 vanitas Stab %
 .\"
 .\" WORD: decrypt    $BI|9f$9$k(B[keyserv.8]
diff -ur man/man1/kill.1 man/man1/kill.1
--- man/man1/kill.1	Wed Sep  1 11:13:38 1999
+++ man/man1/kill.1	Sat Jun 17 22:54:20 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/kill/kill.1,v 1.8.2.1 1999/08/29 14:12:40 peter Exp %
+.\" %FreeBSD: src/bin/kill/kill.1,v 1.8.2.2 2000/01/14 11:15:23 sheldonh Exp %
 .\" jpman %Id: kill.1,v 1.2 1997/04/18 07:37:46 mutoh Stab %
 .\"
 .Dd April 28, 1995
@@ -118,16 +118,13 @@
 TERM (software termination signal)
 .El
 .Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
 .Nm
-$B$O(B
-.Xr csh 1
-$B$G$OAH$_9~$_%3%^%s%I$G$9(B;
-$BAH$_9~$_%3%^%s%I$G$O%W%m%;%9HV9f$N$+$o$j$K(B ``%...'' $B$N7A$G%8%g%VHV9f$r(B
-$B;XDj$9$k$3$H$,$G$-$k$N$G!"%W%m%;%9HV9f$O$"$^$j;H$$$^$;$s!#(B
-$B>\$7$/$O(B
-.Xr csh 1
-$B$r;2>H$7$F2<$5$$!#(B
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B4XO"9`L\(B
+.Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr killall 1 ,
 .Xr ps 1 ,
diff -ur man/man1/last.1 man/man1/last.1
--- man/man1/last.1	Sun Jun  7 19:14:59 1998
+++ man/man1/last.1	Fri Jun 16 09:38:39 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/last/last.1,v 1.3.2.1 2000/03/06 11:34:35 sheldonh Exp %
 .\" jpman %Id: last.1,v 1.2 1997/05/12 06:02:31 yugawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/ldd.1 man/man1/ldd.1
--- man/man1/ldd.1	Tue Feb 24 23:54:10 1998
+++ man/man1/ldd.1	Fri Jun 16 09:42:29 2000
@@ -11,11 +11,12 @@
 .Op Fl f Ar $B%U%)!<%^%C%H(B
 .Ar $B%W%m%0%i%`(B ...
 .Sh $B2r@b(B
-.Nm ldd
+.Nm
 $B$O!"(B
 $B;XDj$5$l$?%W%m%0%i%`$r<B9T$9$k$?$a$KI,MW$J(B
 $B$9$Y$F$N6&M-%*%V%8%'%/%H$rI=<($7$^$9!#(B
-nm(1) $B$H$O0[$J$j!"(B
+.Xr nm 1
+$B$H$O0[$J$j!"(B
 $B6&M-%*%V%8%'%/%H$,99$KJL$N6&M-%*%V%8%'%/%H$rI,MW$H$7$F$$$k$h$&$J(B
 .Dq $B4V@\(B
 $B0MB8$K$bBP1~$7$F$$$^$9!#(B
@@ -28,7 +29,7 @@
 $B$=$N0z?t$O!"(B
 .Xr rtld 1
 $B$KEO$5$l$k%U%)!<%^%C%HJ8;zNs$G$"$j!"(B
-.Nm ldd
+.Nm
 $B$N=PNO$r%+%9%?%^%$%:$7$^$9!#(B
 $B;HMQ$G$-$kJQ49J8;z$N%j%9%H$O(B
 .Xr rtld 1
@@ -42,13 +43,14 @@
 $B%=!<%9%3!<%I$H%$%s%/%k!<%I%U%!%$%k$r8+$F$/$@$5$$!#(B
 .Sh $B4XO"9`L\(B
 .Xr ld 1 ,
-.Xr ld.so 1 ,
 .Xr nm 1
 .Sh $BNr;K(B
 .Nm ldd
 $B$O(B SunOS 4.0 $B$G:G=i$KEP>l$7!"(B
-FreeBSD 1.1 $B$G8=:_$N7A$K$J$j$^$7$?!#(B
+.Fx 1.1
+$B$G8=:_$N7A$K$J$j$^$7$?!#(B
 .Pp
 .Fl v
 $B$N%5%]!<%H$O!"(B
-John Polstra <jdp@polstra.com> $B$K$h$C$F=q$+$l$?%3!<%I$K4p$E$$$F$$$^$9!#(B
+.An John Polstra Aq jdp@polstra.com
+$B$K$h$C$F=q$+$l$?%3!<%I$K4p$E$$$F$$$^$9!#(B
diff -ur man/man1/lint.1 man/man1/lint.1
--- man/man1/lint.1	Sun Jul 26 08:08:21 1998
+++ man/man1/lint.1	Fri Jun 16 09:43:24 2000
@@ -1,4 +1,5 @@
 .\"	%NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp %
+.\" %FreeBSD: src/usr.bin/xlint/xlint/lint.1,v 1.5.2.1 2000/03/06 11:35:33 sheldonh Exp %
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
 .\" All Rights Reserved.
diff -ur man/man1/lkbib.1 man/man1/lkbib.1
--- man/man1/lkbib.1	Mon Apr 26 10:34:46 1999
+++ man/man1/lkbib.1	Fri Jun 16 11:21:58 2000
@@ -25,7 +25,7 @@
 .el .TP "\\$1"
 ..
 .\" jpman %Id: lkbib.1,v 1.2 1997/05/13 16:17:15 horikawa Stab %
-.TH LKBIB 1 "7 September 1996" "Groff Version 1.11"
+.TH LKBIB 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 lkbib \- $BJ88%L\O?%G!<%?%Y!<%9$r8!:w$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/ln.1 man/man1/ln.1
--- man/man1/ln.1	Wed Sep  1 11:13:39 1999
+++ man/man1/ln.1	Tue Jun 27 23:07:07 2000
@@ -33,24 +33,27 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/bin/ln/ln.1,v 1.6.2.2 1999/08/29 14:12:42 peter Exp %
+.\" %FreeBSD: src/bin/ln/ln.1,v 1.6.2.3 1999/12/29 19:37:50 obrien Exp %
 .\" jpman %Id: ln.1,v 1.2 1997/04/15 00:24:41 mutoh Stab %
 .\"
 .Dd December 30, 1993
 .Dt LN 1
 .Os BSD 4
 .Sh $BL>>N(B
-.Nm ln
+.Nm ln ,
+.Nm link
 .Nd $B%j%s%/%U%!%$%k$N:n@.(B
 .Sh $B=q<0(B
 .Nm ln
-.Op Fl fs
+.Op Fl fsv
 .Ar source_file
 .Op target_file
 .Nm ln
-.Op Fl fs
+.Op Fl fsv
 .Ar source_file ...
 .Op target_dir
+.Nm link
+.Ar source_file Ar target_file
 .Sh $B2r@b(B
 .Nm
 $B$O?7$7$$%G%#%l%/%H%j%(%s%H%j(B($B%j%s%/%U%!%$%k(B)$B$r:n@.$9$k%f!<%F%#%j%F%#$G$9!#(B
@@ -73,6 +76,9 @@
 $B%7%s%\%j%C%/%j%s%/$r:n@.$7$^$9!#(B
 .El
 .Pp
+.It Fl v
+.Nm
+$B$r>iD9$K$7!"=hM}$9$k%U%!%$%k$rI=<($7$^$9!#(B
 $B%G%U%)%k%H$G$O!"(B
 .Nm
 $B$O(B
@@ -120,15 +126,31 @@
 $BFb$K;XDj$5$l$?A4$F$N%U%!%$%k$N%j%s%/$r:n@.$7$^$9!#:n$i$l$k%j%s%/$N(B
 $BL>A0$O!"%j%s%/$5$l$k%U%!%$%k$NL>A0$HF1$8$K$J$j$^$9!#(B
 .Pp
+$BK\%f!<%F%#%j%F%#$r(B
+.Nm link
+$B$H$7$F8F$S=P$9>l9g$K$O@53N$K(B 2 $B8D$N0z?t$r;XDj$9$k$3$H$,I,MW$G$"$j!"(B
+$B$I$A$i$b%G%#%l%/%H%j$G$"$C$F$O$J$j$^$;$s!#(B
+$B$3$NC1=c%b!<%I$K$*$$$F$O!"%*%W%7%g%s$O;XDjIT2D$G$"$j!"(B
+$BEO$5$l$?(B 2 $B8D$N0z?t$r;HMQ$7$F(B
+.Xr link 2
+$B$r<B9T$7$^$9!#(B
+.Pp
 .Sh $B4XO"9`L\(B
 .Xr link 2 ,
 .Xr lstat 2 ,
 .Xr readlink 2 ,
 .Xr stat 2 ,
 .Xr symlink 2 ,
+.Sh $B8_49@-(B
+.Fl v
+$B$OI8=`$G$O$"$j$^$;$s$7!"%9%/%j%W%HCf$G$N;HMQ$O$*4+$a$7$^$;$s!#(B
 .Xr symlink 7
 .Sh $BNr;K(B
 .Nm ln
 $B%3%^%s%I$O(B
 .At v1
-$B$+$iEP>l$7$^$7$?!#(B
+$BC1=c2=$5$l$?(B
+.Nm link
+$B%3%^%s%I$O(B
+.St -susv2
+$B=`5r$G$9!#(B
diff -ur man/man1/loadfont.1 man/man1/loadfont.1
--- man/man1/loadfont.1	Tue Feb 24 23:54:10 1998
+++ man/man1/loadfont.1	Fri Jun 16 11:23:57 2000
@@ -27,6 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" %FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.6.2.1 2000/03/06 11:36:48 sheldonh Exp %
 .\" @(#)loadfont.1, 3.20, Last Edit-Date: [Tue Apr  4 13:06:00 1995]
 .\" jpman %Id: loadfont.1,v 1.2 1997/03/29 06:19:33 horikawa Stab %
 .\"
diff -ur man/man1/locate.1 man/man1/locate.1
--- man/man1/locate.1	Wed Sep  1 11:13:39 1999
+++ man/man1/locate.1	Fri Jun 16 11:24:35 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.11.2.1 1999/08/29 15:29:50 peter Exp %
+.\" %FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.11.2.3 2000/03/06 11:34:39 sheldonh Exp %
 .\"	jpman %Id: locate.1,v 1.3 1997/05/19 16:39:18 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/login.1 man/man1/login.1
--- man/man1/login.1	Wed Sep  1 11:13:39 1999
+++ man/man1/login.1	Fri Jun 16 11:27:49 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\" %FreeBSD: src/usr.bin/login/login.1,v 1.13.2.2 1999/08/29 15:30:01 peter Exp %
+.\" %FreeBSD: src/usr.bin/login/login.1,v 1.13.2.3 2000/01/14 11:15:25 sheldonh Exp %
 .\"
 .\" jpman %Id: login.1,v 1.3 1997/05/19 16:39:53 horikawa Stab %
 .Dd May 5, 1994
@@ -134,13 +134,11 @@
 $B%m%0%$%s%/%i%9$O!"Ev3:%m%0%$%s$K5v$5$l$?:GBg$*$h$S8=:_$N;q8;@)Ls!"(B
 $B%W%m%;%9M%@hEY$dB>$NB?$/$N%f!<%6%m%0%$%s4D6-$r@)8f$7$^$9!#(B
 .Pp
-$BI8=`%7%'%k$G$"$k(B
-.Xr csh 1 
-$B$H(B
-.Xr sh 1
-$B$O!"(B
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
 .Nm
-$B$,<B9T$5$l$F$+$i5/F0$7$^$9!#(B
+$B%3%^%s%I$rDs6!$9$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /var/mail/userXXX -compact
 .It Pa /etc/fbtab
@@ -172,7 +170,9 @@
 $BG'>Z%5!<%S%9$N@_Dj(B
 .El
 .Sh $B4XO"9`L\(B
+.Xr builtin 1 ,
 .Xr chpass 1 ,
+.Xr csh 1 ,
 .Xr passwd 1 ,
 .Xr rlogin 1 ,
 .Xr skey 1 ,
diff -ur man/man1/lookbib.1 man/man1/lookbib.1
--- man/man1/lookbib.1	Mon Apr 26 10:34:46 1999
+++ man/man1/lookbib.1	Fri Jun 16 11:31:27 2000
@@ -17,7 +17,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH LOOKBIB 1 "7 September 1996" "Groff Version 1.11"
+.TH LOOKBIB 1 "7 September 1996" "Groff Version 1.15"
 .\" jpman %Id: lookbib.1,v 1.2 1997/04/24 00:31:25 mutoh Stab %
 .SH $BL>>N(B
 lookbib \- $BJ88%L\O?%G!<%?%Y!<%9$r8!:w$9$k(B
diff -ur man/man1/lp.1 man/man1/lp.1
--- man/man1/lp.1	Wed Sep  1 11:13:39 1999
+++ man/man1/lp.1	Fri Jun 16 11:31:56 2000
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.7.2.1 1999/08/29 15:43:16 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.7.2.3 2000/03/08 10:18:10 sheldonh Exp %
 .\" jpman %Id: lp.1,v 1.3 1997/07/01 19:59:08 ken Stab %
 .\"
 .Dd January 22, 1995
@@ -42,7 +42,8 @@
 .Nd $B%W%j%s%H%9%W!<%i$N%U%m%s%H%(%s%I(B
 .Sh $B=q<0(B
 .Nm lp
-.Op Fl c
+.Op Fl cs
+.Op Fl o Ar option
 .Op Fl d Ar printer
 .Op Fl n Ar num
 .Op Ar name ...
@@ -55,7 +56,7 @@
 $B$O!"E,@Z$J0z?t$r$D$1$F(B
 .Xr lpr 1
 $B$r5/F0$7$^$9!#(B
-
+.Pp
 $BDL>o!"(B
 .Nm
 $B$O;XDj$5$l$?%U%!%$%k$r%?!<%2%C%H$H$9$k%W%j%s%?$G%W%j%s%H$7$^$9!#(B
@@ -84,6 +85,15 @@
 $B;XDj$5$l$?3F%U%!%$%k$r(B
 .Ar num
 $BIt$:$D%W%j%s%H=PNO$7$^$9!#(B
+.It Fl o Ar option
+$B%W%j%s%?8GM-$N%*%W%7%g%s$G$9!#(B
+SVR $B$H$N8_49@-$N$?$a$@$1$KDs6!$5$l$F$$$k%*%W%7%g%s$G$"$j!"(B
+$B%5%]!<%H$5$l$F$$$^$;$s!#(B
+.It Fl s
+$BL[$C$FF0:n$7$^$9!#(B
+.St -susv2
+$B$H$N8_49@-$N$?$a$@$1$KDs6!$5$l$F$$$k%*%W%7%g%s$G$"$j!"(B
+$B%5%]!<%H$5$l$F$$$^$;$s!#(B
 .El
 .Sh $B4D6-JQ?t(B
 $B>e$G=R$Y$?$h$&$K!"4D6-JQ?t(B
@@ -91,7 +101,6 @@
 $B$*$h$S(B
 .Ev PRINTER
 $B$,%?!<%2%C%H$H$9$k%W%j%s%?$rA*Br$9$k$N$KMQ$$$i$l$^$9!#(B
-
 .Sh $B4XO"9`L\(B
 .Xr lpr 1
 .Sh $B5,3J(B
diff -ur man/man1/lpr.1 man/man1/lpr.1
--- man/man1/lpr.1	Sun Oct 31 10:42:51 1999
+++ man/man1/lpr.1	Fri Jun 16 11:32:49 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.8.2.1 1999/08/29 15:43:28 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.8.2.2 2000/03/06 11:36:19 sheldonh Exp %
 .\" jpman %Id: lpr.1,v 1.3 1997/08/11 14:28:54 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/ls.1 man/man1/ls.1
--- man/man1/ls.1	Wed Sep  1 11:13:39 1999
+++ man/man1/ls.1	Fri Jun 16 11:33:40 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" %FreeBSD: src/bin/ls/ls.1,v 1.26.2.3 1999/08/29 14:12:47 peter Exp %
+.\" %FreeBSD: src/bin/ls/ls.1,v 1.26.2.4 2000/03/03 14:58:53 sheldonh Exp %
 .\"
 .\" jpman %Id: ls.1,v 1.3 1997/05/19 17:21:06 horikawa Stab %
 .Dd July 29, 1994
diff -ur man/man1/m4.1 man/man1/m4.1
--- man/man1/m4.1	Wed Sep  1 11:13:39 1999
+++ man/man1/m4.1	Fri Jun 16 11:34:28 2000
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) %FreeBSD: src/usr.bin/m4/m4.1,v 1.7.2.2 1999/08/29 15:30:09 peter Exp %
+.\"	@(#) %FreeBSD: src/usr.bin/m4/m4.1,v 1.7.2.3 2000/06/08 06:11:23 kris Exp %
 .\"
 .\" jpman %Id: m4.1,v 1.3 1997/10/05 12:55:54 horikawa Stab %
 .\"
diff -ur man/man1/mail.1 man/man1/mail.1
--- man/man1/mail.1	Sun Nov 28 10:05:36 1999
+++ man/man1/mail.1	Fri Jun 16 11:35:08 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.2 1999/11/22 10:33:49 jkoshy Exp %
+.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.3 2000/03/06 11:34:42 sheldonh Exp %
 .\" jpman %Id: mail.1,v 1.3 1997/10/30 01:42:49 h-nokubi Stab %
 .\"
 .Dd December 30, 1993
diff -ur man/man1/make.1 man/man1/make.1
--- man/man1/make.1	Wed Dec  8 08:40:39 1999
+++ man/man1/make.1	Fri Jun 16 11:52:04 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\" %FreeBSD: src/usr.bin/make/make.1,v 1.16.2.5 1999/12/05 12:36:19 cracauer Exp %
+.\" %FreeBSD: src/usr.bin/make/make.1,v 1.16.2.8 2000/05/20 20:18:49 will Exp %
 .\"
 .\" this file based on that translated to japanese on NetBSD Japanese Reference
 .\" Manual Project, and modefied to fit FreeBSD Reference Manual
@@ -113,6 +113,10 @@
 $BI=<($7$^$9!#(B
 .It Ar j
 $BJ#?t$N%7%'%k$r5/F0$9$k>l9g$N>pJs$rI=<($7$^$9!#(B
+.It Ar l
+@ $B$dB>$N(B "$B@E$+$K$9$k(B" $B%U%i%0$,$D$1$i$l$F$$$k$+$I$&$+$K$+$+$o$i$:!"(B
+Makefile $BCf$N%3%^%s%I$rI=<($7$^$9!#(B
+$B$3$l$O(B "$BA{!9$7$$(B" $B?6Iq$$$H$7$FCN$i$l$F$$$^$9!#(B
 .It Ar m
 $B%?!<%2%C%H$N:n@.$HJQ99F|IU$K4X$9$k>pJs$rI=<($7$^$9!#(B
 .It Ar s
@@ -390,7 +394,7 @@
 $B!#$9$J$o$A!"(B
 .Ql \&$$
 $B$OC10l$N%I%k5-9f$KCV49$5$l$^$9!#(B
-.It Va .MAKE
+.It Va MAKE
 .Nm make
 $B$N5/F0$K;HMQ$5$l$?L>A0(B
 .Pq Va argv Op 0
Only in man/man1: makeinfo.1
diff -ur man/man1/man.1 man/man1/man.1
--- man/man1/man.1	Mon Aug 23 12:04:25 1999
+++ man/man1/man.1	Fri Jun 16 12:00:49 2000
@@ -12,6 +12,8 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.6.2.3 2000/04/05 14:02:35 sheldonh Exp %
+.\"
 .\" jpman %Id: man.1,v 1.2 1997/04/01 14:17:54 horikawa Stab %
 .Dd Jan 5, 1991
 .Dt MAN 1
@@ -112,8 +114,8 @@
 $B$,%;%C%H$5$l$F$$$l$P!"$=$NCM$O(B nroff $B$d(B troff $B$r9T$&A0$K<B9T$5$l$k(B
 $B%W%j%W%m%;%C%5$N=g=x$r<($9$N$K;H$o$l$^$9!#(B
 $B%G%U%)%k%H$G$O!"(Bnroff $B$NA0$K(B tbl $B%W%j%W%m%;%C%5$,<B9T$5$l$^$9!#(B
-.It Ev MANSEC
-.Ev MANSEC
+.It Ev MANSECT
+.Ev MANSECT
 $B$,%;%C%H$5$l$F$$$l$P!"$=$NCM$O$I$N%^%K%e%"%k%;%/%7%g%s$r8!:w$9$k$N$+$r(B
 $B7hDj$9$k$N$K;H$o$l$^$9!#(B
 .It Ev PAGER
@@ -123,6 +125,17 @@
 .Nm more -s
 $B$,;H$o$l$^$9!#(B
 .El
+.Sh $B;HMQNc(B
+.Pp
+$BDL>o!"(Bgetop $B$NE,@Z$J%^%K%e%"%k%Z!<%8$r8+$k$?$a$K$O!"(B
+$B0J2<$N$h$&$K;HMQ$7$^$9(B:
+.Dl man getopt
+.Pp
+$B$7$+$7!"(B
+.Xr getopt 3
+$B$N$h$&$K%^%K%e%"%k$NFCDj$N%;%/%7%g%s$r;2>H$9$k$?$a$K$O(B
+$B0J2<$N$h$&$K;HMQ$7$^$9(B:
+.Dl man 3 getopt
 .Sh $B4XO"9`L\(B
 .Xr apropos 1 ,
 .Xr groff 1 ,
diff -ur man/man1/mcon.1 man/man1/mcon.1
--- man/man1/mcon.1	Sun May 17 21:05:38 1998
+++ man/man1/mcon.1	Fri Jun 16 12:02:33 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)mcon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:28:22 1994]
+.\" %FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.5.2.1 2000/03/06 11:36:49 sheldonh Exp %
 .\" jpman %Id: mcon.1,v 1.3 1997/08/20 12:33:46 horikawa Stab %
 .\"
 .Dd January 3, 1994
diff -ur man/man1/mk_cmds.1 man/man1/mk_cmds.1
--- man/man1/mk_cmds.1	Sat Jan  8 19:36:48 2000
+++ man/man1/mk_cmds.1	Fri Jun 16 12:09:57 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/mk_cmds/mk_cmds.1,v 1.1.2.1 1999/12/12 03:04:11 chris Exp %
+.\" %FreeBSD: src/usr.bin/mk_cmds/mk_cmds.1,v 1.1.2.2 1999/12/20 09:41:41 asmodai Exp %
 .\" jpman %Id: mk_cmds.1,v 1.3 1999/12/24 07:39:55 mitchy Stab %
 .Dd November 14, 1999
 .Dt MK_CMDS 1
diff -ur man/man1/mklocale.1 man/man1/mklocale.1
--- man/man1/mklocale.1	Sun Oct 17 20:35:39 1999
+++ man/man1/mklocale.1	Fri Jun 16 12:12:22 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	%FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.3.2.1 1999/09/20 09:49:57 phantom Exp %
+.\"	%FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.3.2.2 1999/12/17 14:38:53 phantom Exp %
 .\"
 .\" jpman %Id: mklocale.1,v 1.3 1997/05/20 08:56:54 mihara Stab %
 .\"
@@ -45,8 +45,14 @@
 .Nd LC_CTYPE locale $B%U%!%$%k$N:n@.(B
 .Sh $B=q<0(B
 .Nm mklocale
+.Op Fl d
 .Ar "< src-file"
 .Ar "> language/LC_CTYPE"
+.Nm mklocale
+.Op Fl d
+.Fl o
+.Ar language/LC_CTYPE
+.Ar src-file
 .Sh $B2r@b(B
 .Nm mklocale
 $B%f!<%F%#%j%F%#$OI8=`F~NO$+$i(B
@@ -63,6 +69,14 @@
 $B%U%!%$%kCf$K%3%a%s%H$r=q$/>l9g$O!"(B
 C $B$N%9%?%$%k$N%3%a%s%H$r;HMQ$9$k$3$H$,$G$-$^$9!#(B
 .Pp
+$B<!$N%*%W%7%g%s$r;HMQ2DG=$G$9(B:
+.Bl -tag -width indent
+.It Fl d
+$B%G%P%C%0MQ%a%C%;!<%8$rM-8z$K$7$^$9!#(B
+.It Fl o
+$B=PNO%U%!%$%k$r;XDj$7$^$9!#(B
+.El
+.Pp
 $B8e=R$9$k%-!<%o!<%I$NB>$K!"(B
 .Ar src-file
 $B$NCf$GM-8z$J%H!<%/%s$H$7$F0J2<$N$b$N$,$"$j$^$9!#(B
@@ -243,7 +257,7 @@
 $BI=2;J8;z$GI=<(2DG=$JJ8;z$G$"$k(B rune $B$rDj5A$7$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
-.Xr mklocale 1 ,
+.Xr colldef 1 ,
 .Xr mbrune 3 ,
 .Xr rune 3 ,
 .Xr setlocale 3 ,
diff -ur man/man1/mkstr.1 man/man1/mkstr.1
--- man/man1/mkstr.1	Sun May 17 21:05:42 1998
+++ man/man1/mkstr.1	Fri Jun 16 12:13:05 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.4.2.1 2000/03/06 11:34:46 sheldonh Exp %
 .\" jpman %Id: mkstr.1,v 1.2 1997/03/29 06:22:47 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/mktemp.1 man/man1/mktemp.1
--- man/man1/mktemp.1	Sat Nov 20 19:54:18 1999
+++ man/man1/mktemp.1	Fri Jun 16 12:14:19 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.1 1999/10/30 14:05:49 phantom Exp %
+.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.2 2000/03/06 11:34:48 sheldonh Exp %
 .\" From: %OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp %
 .\"
 .\" Copyright (c) 1989, 1991, 1993
diff -ur man/man1/more.1 man/man1/more.1
--- man/man1/more.1	Wed Sep  1 11:13:40 1999
+++ man/man1/more.1	Fri Jun 16 12:14:53 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)more.1	5.15 (Berkeley) 7/29/91
-.\" %FreeBSD: src/usr.bin/more/more.1,v 1.7.2.6 1999/08/29 15:31:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/more/more.1,v 1.7.2.7 2000/03/06 11:34:50 sheldonh Exp %
 .\"
 .\" jpman %Id: more.1,v 1.4 1997/08/11 14:30:57 horikawa Stab %
 .\"
diff -ur man/man1/msgs.1 man/man1/msgs.1
--- man/man1/msgs.1	Sat Jul 31 07:15:55 1999
+++ man/man1/msgs.1	Fri Jun 16 12:15:24 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
+.\" %FreeBSD: src/usr.bin/msgs/msgs.1,v 1.5.2.2 2000/03/06 11:34:52 sheldonh Exp %
 .\" jpman %Id: msgs.1,v 1.2 1997/03/29 06:23:20 horikawa Stab %
 .\"
 .Dd April 28, 1995
diff -ur man/man1/mt.1 man/man1/mt.1
--- man/man1/mt.1	Sun Oct 31 10:42:52 1999
+++ man/man1/mt.1	Fri Jun 16 12:16:33 2000
@@ -31,8 +31,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.12.2.4 2000/03/06 11:34:54 sheldonh Exp %
 .\" jpman %Id: mt.1,v 1.3 1997/06/16 09:29:17 taku Stab %
-.\" jpman original revision: 1.12.2.3
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff -ur man/man1/neqn.1 man/man1/neqn.1
--- man/man1/neqn.1	Mon Apr 26 10:34:46 1999
+++ man/man1/neqn.1	Fri Jun 16 12:19:23 2000
@@ -1,4 +1,4 @@
-.TH NEQN 1 "14 September 1997" "Groff Version 1.11"
+.TH NEQN 1 "14 September 1997" "Groff Version 1.15"
 .SH $BL>>N(B
 neqn \- $B?t<0$r(B ASCII $B7A<0$G=PNO$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/netstat.1 man/man1/netstat.1
--- man/man1/netstat.1	Sat Nov 20 19:54:18 1999
+++ man/man1/netstat.1	Fri Jun 16 12:31:38 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.3 1999/10/30 14:42:19 phantom Exp %
+.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.5 2000/03/06 11:34:56 sheldonh Exp %
 .\"
 .\" jpman %Id: netstat.1,v 1.4 1997/10/11 07:45:56 horikawa Stab %
 .\"
@@ -42,7 +42,7 @@
 .Nd $B%M%C%H%o!<%/$N>uBV$rI=<($9$k(B
 .Sh $B=q<0(B
 .Nm netstat
-.Op Fl Aan
+.Op Fl AaLn
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -149,6 +149,11 @@
 $B$5$l$^$9!#%^%k%A%-%c%9%H%"%I%l%9$O!"(B
 $B3F!9BP1~$9$k%$%s%?%U%'!<%9%"%I%l%9$KB3$$$FI=<((B
 $B$5$l$^$9!#(B
+.It Fl L
+$B$5$^$6$^$J@\B3%-%e!<$NBg$-$5$rI=<($7$^$9!#(B
+1 $BHVL\$N?tCM$O<u$1IU$1$i$l$F$$$J$$@\B3$N?t$r<($7$^$9!#(B
+2 $BHVL\$N?tCM$O<u$1IU$1$i$l$F$$$J$$IT40A4$J@\B3$NNL$r<($7$^$9!#(B
+3 $BHVL\$N?tCM$OBT$A>uBV$K$"$k@\B3$N:GBg?t$r<($7$^$9!#(B
 .It Fl M
 $B%G%U%)%k%H$G;HMQ$5$l$k(B
 .Pa /dev/kmem
diff -ur man/man1/nice.1 man/man1/nice.1
--- man/man1/nice.1	Sat Jan  8 19:36:49 2000
+++ man/man1/nice.1	Fri Jun 16 12:33:00 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/nice/nice.1,v 1.7.2.2 1999/08/29 15:31:40 peter Exp %
+.\" %FreeBSD: src/usr.bin/nice/nice.1,v 1.7.2.3 2000/01/14 11:15:26 sheldonh Exp %
 .\"
 .\" jpman %Id: nice.1,v 1.2 1997/05/04 08:01:38 horikawa Stab %
 .\"
@@ -73,6 +73,12 @@
 $B=*N;%9%F!<%?%9$O(B
 .Nm
 $B$,<B9T$7$?%3%^%s%I$N=*N;%9%F!<%?%9$G$9!#(B
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B;HMQNc(B
 .Pp
 $ nice -5 date
@@ -87,6 +93,7 @@
 .Sq date 
 $B$rM%@hEY(B -19 $B$K$F<B9T$7$^$9!#(B
 .Sh $B4XO"9`L\(B
+.Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr idprio 1 ,
 .Xr rtprio 1 ,
@@ -98,22 +105,3 @@
 $B$O(B
 .At v6
 $B$GDI2C$5$l$^$7$?!#(B
-.Sh $B%P%0(B
-.Nm
-$B$O(B
-.Xr sh  1
-$B8~$1$N%3%^%s%I$G$9!#(B
-$B$b$7(B
-.Xr csh  1
-$B$r;H$C$F$$$k$N$J$i!"(B``&'' $B$r$D$1$F<B9T$5$l$?%3%^%s%I$O!"(B
-$B%P%C%/%0%i%&%s%I$G<B9T$5$l$F$$$k4V$O(B
-$B<+F0E*$K(B hangup $B$rL5;k$7$^$9!#(B
-.Pp
-.Xr csh  1
-$B$G$O!"(B
-.Nm
-$B$OAH$_9~$_%3%^%s%I$G$"$j!"$3$3$G@bL@$7$?$b$N$H$O>/$70[$J$k=q<0$K$J$j$^$9!#(B
-.Ql nice +10
-$B$OM%@hEY$rDc$/$7!"(B
-.Ql nice \-10
-$B$O%9!<%Q%f!<%6$,MQ$$$?;~$KM%@hEY$r9b$/$7$^$9!#(B
diff -ur man/man1/nohup.1 man/man1/nohup.1
--- man/man1/nohup.1	Sat Oct 10 09:09:07 1998
+++ man/man1/nohup.1	Fri Jun 16 12:33:55 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)nohup.1	6.8 (Berkeley) 7/27/91
+.\"	%FreeBSD: src/usr.bin/nohup/nohup.1,v 1.2.2.1 2000/01/14 11:15:27 sheldonh Exp %
 .\" jpman %Id: nohup.1,v 1.2 1997/05/04 13:33:09 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -62,6 +63,12 @@
 $B$O%(%i!<$,$"$l$P(B 1 $B$rJV$7$^$9!#$=$NB>$N>l9g$O(B
 .Ar command
 $B$N=*N;%9%F!<%?%9$rJV$7$^$9!#(B
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B4D6-JQ?t(B
 .Nm
 $B$O0J2<$N4D6-JQ?t$r;2>H$7$^$9!#(B
@@ -74,6 +81,8 @@
 $B$G<($5$l$?%G%#%l%/%H%j$K:n@.$7$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
+.Xr builtin 1 ,
+.Xr csh 1 ,
 .Xr signal 3
 .Sh $B5,3J(B
 .Nm
diff -ur man/man1/nroff.1 man/man1/nroff.1
--- man/man1/nroff.1	Sat Nov 20 19:54:18 1999
+++ man/man1/nroff.1	Mon Jun 26 21:44:09 2000
@@ -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
@@ -16,11 +16,11 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 
-	%FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.1 1999/11/02 12:33:21 phantom Exp %
+	%FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.2 2000/03/09 20:11:06 asmodai Exp %
 
 ..
 .\" jpman %Id: nroff.1,v 1.2 1997/05/13 16:18:02 horikawa Stab %
-.TH NROFF 1 "2 November 1999" "Groff Version 1.11"
+.TH NROFF 1 "9 March 2000" "Groff Version 1.15"
 .SH $BL>>N(B
 nroff \- groff $B$K$h$k(B nroff $B%3%^%s%I$N%(%_%e%l!<%H(B
 .SH $B=q<0(B
@@ -89,6 +89,13 @@
 .BR \-q ,
 .B \-s
 $B%*%W%7%g%s$OL5;k$5$l!"%(%i!<%a%C%;!<%8$bI=<($5$l$^$;$s!#(B
+$B%*%W%7%g%s(B
+.B \-S
+($B$h$j0BA4(B) $B$H(B
+.B \-U
+($B0BA4$G$J$$(B) $B$O(B groff $B$KEO$5$l$^$9!#(B
+.B \-S
+$B$,%G%U%)%k%H$GEO$5$l$^$9!#(B
 .SH $B4XO"9`L\(B
 .BR groff (1),
 .BR troff (1),
diff -ur man/man1/passwd.1 man/man1/passwd.1
--- man/man1/passwd.1	Tue Dec 21 17:01:24 1999
+++ man/man1/passwd.1	Fri Jun 16 12:49:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/passwd/passwd.1,v 1.11.2.2 1999/08/29 15:31:54 peter Exp %
+.\" %FreeBSD: src/usr.bin/passwd/passwd.1,v 1.11.2.3 2000/03/06 11:34:58 sheldonh Exp %
 .\"
 .\" jpman %Id: passwd.1,v 1.4 1997/07/21 09:41:51 konuma Stab %
 .Dd June 6, 1993
diff -ur man/man1/pax.1 man/man1/pax.1
--- man/man1/pax.1	Wed Sep  1 11:13:41 1999
+++ man/man1/pax.1	Fri Jun 16 12:50:42 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/pax/pax.1,v 1.8.2.2 1999/08/29 14:13:08 peter Exp %
+.\" %FreeBSD: src/bin/pax/pax.1,v 1.8.2.3 2000/03/03 14:58:54 sheldonh Exp %
 .\" jpman %Id: pax.1,v 1.4 1997/08/25 03:45:37 horikawa Stab %
 .\"
 .Dd April 18, 1994
diff -ur man/man1/pfbtops.1 man/man1/pfbtops.1
--- man/man1/pfbtops.1	Mon Apr 26 10:34:46 1999
+++ man/man1/pfbtops.1	Fri Jun 16 12:51:16 2000
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: pfbtops.1,v 1.2 1997/05/13 16:18:42 horikawa Stab %
-.TH PFBTOPS 1 "7 September 1996" "Groff Version 1.11"
+.TH PFBTOPS 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 pfbtops \- .pfb $B%U%)!<%^%C%H$N(B PostScript $B%U%)%s%H$r(B
 ASCII $B%U%)!<%^%C%H$KJQ49$9$k(B
diff -ur man/man1/pic.1 man/man1/pic.1
--- man/man1/pic.1	Mon Apr 26 10:34:46 1999
+++ man/man1/pic.1	Mon Jun 26 21:44:18 2000
@@ -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
@@ -30,13 +30,13 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH PIC 1 "7 September 1996" "Groff Version 1.11"
+.TH PIC 1 "9 March 2000" "Groff Version 1.15"
 .SH $BL>>N(B
 pic \- troff $B$H(B TeX $B$GMQ$$$k%T%/%A%c%3%s%Q%$%i(B
 .SH $B=q<0(B
 .B pic
 [
-.B \-nvC
+.B \-nvCSU
 ]
 [
 .I filename
@@ -46,7 +46,7 @@
 .B pic
 .B \-t
 [
-.B \-cvzC
+.B \-cvzCSU
 ]
 [
 .I filename
@@ -78,7 +78,7 @@
 $B$H(B
 .B .PE
 $B%^%/%m$NE,@Z$JDj5A$O%f!<%6$KG$$5$l$F$$$^$9!#;HMQ$7$F$$$k(B
-$B%^%/%m%Q%C%1!<%8$,E,Ev$JDj5A$rDs6!$7$J$$>l9g(B($B$?$H$($P!"8E$$%P!<%8%g%s$N(B
+$B%^%/%m%Q%C%1!<%8$,E,Ev$JDj5A$rDs6!$7$J$$>l9g(B ($B$?$H$($P!"8E$$%P!<%8%g%s$N(B
 \-ms $B%^%/%m$N>l9g(B)$B!"(B
 .B \-mpic
 $B%^%/%m$+$i<h$j=P$9$3$H$,$G$-$^$9!#(B
@@ -111,6 +111,13 @@
 .B sh
 $B%3%^%s%I$r<B9T$7$^$;$s!#(B
 $B?.MQ$G$-$J$$F~NO$r=hM}$9$k>l9g$KJXMx$G$9!#(B
+($B%G%U%)%k%H$GM-8z$G$9(B)
+.TP
+.B \-U
+$B0BA4$G$J$$%b!<%I(B;
+$B%G%U%)%k%H%*%W%7%g%s(B
+.BR \-S
+$B$rBG$A>C$7$^$9!#(B
 .TP
 .B \-n
 groff $B$N(B troff $B$KBP$9$kFH<+3HD%$rMQ$$$^$;$s!#8e=hM}$KFH<+3HD%$r2r<a(B
@@ -141,7 +148,7 @@
 .B .ps
 $B$G;O$^$k9T$O!"FC(B
 $BJL$J07$$$r<u$1$^$9!#$9$J$o$A!"@0?t$N%*%W%7%g%s$rB3$1$k$3$H$,$G$-!"$=$l(B
-$B$OD>@~$NB@$5(B($B%Z%s$N%5%$%:(B)$B$r(B 1000 $BJ,$N(B 1 $B%$%s%A$G<($7$^$9!#%*%W%7%g%s$,(B
+$B$OD>@~$NB@$5(B ($B%Z%s$N%5%$%:(B) $B$r(B 1000 $BJ,$N(B 1 $B%$%s%A$G<($7$^$9!#%*%W%7%g%s$,(B
 $B>JN,$5$l$?>l9g$O!"D>(B
 $BA0$ND>@~$NB@$5$KLa$7$^$9!#D>@~$NB@$5$N=i4|CM$O(B 1000 $BJ,$N(B 8 $B%$%s%A$G$9!#(B
 $B$3$N$h$&$K;XDj$5$l$?D>@~$NB@$5$O!"(B
@@ -645,7 +652,7 @@
 .B .PS
 $B9T$K$*$1$k9b$5$N1F6A$b<u$1$^$;$s!#(B
 .LP
-$B%\%C%/%9(B($B3Q$N4]$$%\%C%/%9$r4^$_$^$9(B)$B!"(B
+$B%\%C%/%9(B ($B3Q$N4]$$%\%C%/%9$r4^$_$^$9(B)$B!"(B
 $B1_!"BJ1_$OEI$j$D$V$9$3$H$,2DG=$G$"$j!"(B
 $BB0@-(B
 .BR fill [ ed ]
@@ -728,17 +735,18 @@
 .br
 Tpic: Pic for \*(tx
 .br
-AT&T Bell Laboratories, Computing Science Technical Report No.\ 116,
-PIC \(em A Graphics Language for Typesetting.
-(This can be obtained by sending a mail message to netlib@research.att.com
-with a body of `send\ 116\ from\ research/cstr'.)
+Brian W. Kernighan,
+PIC \(em A Graphics Language for Typesetting (User Manual).
+AT&T Bell Laboratories, Computing Science Technical Report No.\ 116
+<URL:http://cm.bell-labs.com/cm/cs/cstr/116.ps.gz>
+(revised May, 1991).
 .SH $B%P%0(B
 .LP
 .B groff
-$B$K$H$C$FIT@5$JJ8;z(B($BNc$($P(B
+$B$K$H$C$FIT@5$JJ8;z(B ($BNc$($P(B
 .SM ASCII
 code 0 $B$d(B 8 $B?J$G(B 013$B!A(B037$B!"(B
-0200$B!A(B0237)$B$O(B \*(tx $B%b!<%I$G$"$C$F$b5qH]$5$l$^$9!#(B
+0200$B!A(B0237) $B$O(B \*(tx $B%b!<%I$G$"$C$F$b5qH]$5$l$^$9!#(B
 .LP
 .B fillval
 $B$N2r<a$O(B 10th edition Unix $B$H8_49@-$,$"$j$^$;$s!#(B
diff -ur man/man1/pkg_add.1 man/man1/pkg_add.1
--- man/man1/pkg_add.1	Sun Oct 31 10:42:52 1999
+++ man/man1/pkg_add.1	Fri Jun 16 12:53:10 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.29.2.5 1999/09/01 14:05:07 billf Exp %
+.\" %FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.29.2.6 2000/03/06 11:36:58 sheldonh Exp %
 .\"
 .\" jpman %Id: pkg_add.1,v 1.3 1997/06/09 04:19:05 jsakai Stab %
 .Dd November 25, 1994
diff -ur man/man1/pkg_create.1 man/man1/pkg_create.1
--- man/man1/pkg_create.1	Fri Dec 10 20:07:23 1999
+++ man/man1/pkg_create.1	Fri Jun 16 12:53:49 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.27.2.3 1999/08/29 15:45:15 peter Exp $	
+.\" %FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.27.2.4 2000/03/06 11:36:59 sheldonh Exp %	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
diff -ur man/man1/pkg_version.1 man/man1/pkg_version.1
--- man/man1/pkg_version.1	Sun Dec  5 10:39:43 1999
+++ man/man1/pkg_version.1	Fri Jun 16 12:54:21 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.2.2.2 1999/12/03 06:18:04 billf Exp %
+.\"	%FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.2.2.3 2000/03/06 11:37:01 sheldonh Exp %
 .\" jpman %Id: pkg_version.1,v 1.3 1999/12/05 08:25:39 horikawa Stab %
 .Dd July 17, 1998
 .Dt PKG_VERSION 1
diff -ur man/man1/pr.1 man/man1/pr.1
--- man/man1/pr.1	Wed Dec  8 08:40:40 1999
+++ man/man1/pr.1	Fri Jun 16 12:55:55 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/pr/pr.1,v 1.5.2.2 1999/12/06 04:43:22 kris Exp %
+.\" %FreeBSD: src/usr.bin/pr/pr.1,v 1.5.2.3 2000/03/06 11:35:00 sheldonh Exp %
 .\"
 .\" jpman %Id: pr.1,v 1.3 1997/06/30 16:45:20 horikawa Stab %
 .\"
diff -ur man/man1/printf.1 man/man1/printf.1
--- man/man1/printf.1	Sat Oct 10 09:09:07 1998
+++ man/man1/printf.1	Fri Jun 16 12:57:29 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/printf/printf.1,v 1.3.2.2 2000/01/19 04:20:16 chris Exp %
 .\" jpman %Id: printf.1,v 1.2 1997/05/20 01:08:19 mutoh Stab %
 .\"
 .Dd June 6, 1993
@@ -238,11 +239,20 @@
 $BB8:_$7$J$$%U%#!<%k%I!"$b$7$/$O>.$5$J%U%#!<%k%II};XDj$G%U%#!<%k%I$,@Z$j(B
 $B5M$a$i$l$k$3$H$O$"$j$^$;$s!#;XDj$5$l$?%U%#!<%k%I$,<B:]$NI}$r1[$($?;~$O!"(B
 $B%Q%G%#%s%0$,5/$3$j$^$9!#(B
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $BLa$jCM(B
 .Nm
 $B$O@.8y;~$K$O(B 0 $B$rJV$7!"<:GT;~$K$O(B 1 $B$rJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
-.Xr printf 3
+.Xr builtin 1 ,
+.Xr csh 1 ,
+.Xr printf 3 ,
+.Xr sh 1
 .Sh $BNr;K(B
 .Nm
 $B$O!"(B
@@ -257,3 +267,9 @@
 .Pp
 .Tn ANSI
 16 $B?JJ8;zDj?t$O$o$6$HMQ0U$5$l$F$$$^$;$s!#(B
+.Pp
+$B%(%9%1!<%W%7!<%1%s%9(B \e000 $B$,J8;zNs=*C<;R$G$9!#(B
+.Ar format
+$BCf$KB8:_$9$k$H!"(B
+.Ar format
+$B$O(B \e000 $BJ8;z$N$H$3$m$G@Z$j<N$F$i$l$^$9!#(B
diff -ur man/man1/psbb.1 man/man1/psbb.1
--- man/man1/psbb.1	Mon Apr 26 10:34:46 1999
+++ man/man1/psbb.1	Fri Jun 16 12:59:06 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH PSBB 1 "7 September 1996" "Groff Version 1.11"
+.TH PSBB 1 "7 September 1996" "Groff Version 1.15"
 .\" jpman %Id: psbb.1,v 1.2 1997/05/20 01:24:45 mutoh Stab %
 .SH $BL>>N(B
 psbb \- PostScript $BJ8=q$N%P%&%s%G%#%s%0%\%C%/%9$rI=<($9$k(B
diff -ur man/man1/psroff.1 man/man1/psroff.1
--- man/man1/psroff.1	Mon Apr 26 10:34:46 1999
+++ man/man1/psroff.1	Fri Jun 16 12:59:30 2000
@@ -1,4 +1,4 @@
-.TH PSROFF 1 "15 September 1997" "Groff Version 1.11"
+.TH PSROFF 1 "15 September 1997" "Groff Version 1.15"
 .SH $BL>>N(B
 psroff \- troff $B=PNO$r(B PostScript $B%W%j%s%?$KAw$k(B
 .SH $B=q<0(B
diff -ur man/man1/pwd.1 man/man1/pwd.1
--- man/man1/pwd.1	Wed Sep  1 11:13:42 1999
+++ man/man1/pwd.1	Fri Jun 16 13:00:19 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/pwd/pwd.1,v 1.6.2.2 1999/08/29 14:13:23 peter Exp %
+.\" %FreeBSD: src/bin/pwd/pwd.1,v 1.6.2.3 2000/01/14 11:15:30 sheldonh Exp %
 .\"
 .\" jpman %Id: pwd.1,v 1.2 1997/04/21 08:09:42 mitchy Stab %
 .Dd April 28, 1995
@@ -47,6 +47,12 @@
 .Sh $B2r@b(B
 .Nm 
 $B$O!"8=:_$N%o!<%-%s%0%G%#%l%/%H%j$r@dBP%Q%9$GI8=`=PNO$K=PNO$7$^$9!#(B
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B?GCG(B
 .Nm
 $B%f!<%F%#%j%F%#$O!"(B
@@ -57,14 +63,17 @@
 .St -p1003.2
 $B8_49$G$9!#(B
 .Sh $B4XO"9`L\(B
+.Xr builtin 1 ,
 .Xr cd 1 ,
 .Xr csh 1 ,
-.Xr getcwd 3
+.Xr getcwd 3 ,
+.Xr sh
 .Sh $B%P%0(B
 .Xr csh 1
 $B$NFbIt%3%^%s%I(B
 .Ic dirs
-$B$NJ}$,9bB.$G$9(B ($B$7$+$7!"$^$l$K0c$&Ez$($rJV$7$^$9!#(B
+$B$NJ}$,9bB.$G$9!#$J$<$J$i!"%7%'%kAH$_9~$_$@$+$i$G$9!#(B
+$B$7$+$7!"$^$l$K0c$&Ez$($rJV$7$^$9!#(B
 $B$=$l$O!"%7%'%k$G%+%l%s%H%G%#%l%/%H%j$K0\F0$7$?8e$K!"(B
 $B%+%l%s%H%G%#%l%/%H%j$+$=$NAD@h%G%#%l%/%H%j$,0\F0(B ($BLuCm(B: mv)
-$B$5$l$?>l9g$G$9(B)$B!#(B
+$B$5$l$?>l9g$G$9!#(B
diff -ur man/man1/rcp.1 man/man1/rcp.1
--- man/man1/rcp.1	Wed Sep  1 11:13:43 1999
+++ man/man1/rcp.1	Fri Jun 16 13:01:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" %FreeBSD: src/bin/rcp/rcp.1,v 1.7.2.1 1999/08/29 14:13:27 peter Exp %
+.\" %FreeBSD: src/bin/rcp/rcp.1,v 1.7.2.2 2000/01/07 13:16:51 phantom Exp %
 .\" jpman %Id: rcp.1,v 1.2 1997/05/20 01:30:55 mutoh Stab %
 .\"
 .Dd May 31, 1993
@@ -55,9 +55,11 @@
 .Ar file
 $B$*$h$S(B
 .Ar directory
-$B$H$7$F(B ``rname@rhost:path'' $B$N7A<0$G;XDj$9$k(B
+$B$H$7$F(B
+.Dq rname@rhost:path
+$B$N7A<0$G;XDj$9$k(B
 $B$3$H$K$h$j!"$=$l$,%j%b!<%H%^%7%s>e$N%U%!%$%k$G$"$k$H$_$J$5$l$^$9!#(B
-$B%U%!%$%k;XDj$K(B ``:'' $B$,4^$^$l$F$$$J$$$+!"4^$^$l$F$$$F$b(B``/''$B$N$"$H$K$"$k(B
+$B%U%!%$%k;XDj$K(B `:' $B$,4^$^$l$F$$$J$$$+!"4^$^$l$F$$$F$b(B `/' $B$N8e$K$"$k(B
 $B>l9g$O!"%m!<%+%k%^%7%s$N%U%!%$%k$H$_$J$5$l$^$9!#(B
 .Pp
 $B<!$N%*%W%7%g%s$rMxMQ2DG=$G$9(B:
@@ -100,7 +102,7 @@
 $B%m%0%$%s%G%#%l%/%H%j(B) $B$+$i$NAjBP%Q%9$H2r<a$7$^$9!#(B
 $B%j%b!<%H%^%7%s>e$N%U%!%$%k;XDj$K%o%$%k%I%+!<%I$J$I$N%a%?%-%c%i%/%?$r(B
 $B4^$a$k>l9g$O!"%m!<%+%k%^%7%s$N%7%'%k$K$h$j%o%$%k%I%+!<%I$,(B
-$BE83+$5$l$J$$$h$&(B \e$B!"(B" $B$^$?$O(B \(aa $B$G%/%)!<%H$9$kI,MW$,$"$j$^$9!#(B
+$BE83+$5$l$J$$$h$&(B \e, ", \(aa $B$N$$$:$l$+$G%/%)!<%H$9$kI,MW$,$"$j$^$9!#(B
 .Pp
 .Nm
 $B$G$O(B
@@ -121,7 +123,9 @@
 .Xr cp 1 ,
 .Xr ftp 1 ,
 .Xr rlogin 1 ,
-.Xr rsh 1 
+.Xr rsh 1 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
@@ -138,14 +142,15 @@
 .Pp
 $B%j%b!<%H%[%9%H$N(B
 .Pa \&.login ,
-.Pa \&.profile 
-$B$^$?$O(B
+.Pa \&.profile ,
 .Pa \&.cshrc
-$BFb$N%3%^%s%I$N=PNO$K$h$C$F:.Mp$9$k$3$H$,$"$j$^$9!#(B
+$B$N$$$:$l$+$K4^$^$l$k%3%^%s%I$N=PNO$K$h$C$F:.Mp$9$k$3$H$,$"$j$^$9!#(B
 .Pp
 $BE>Aw@h$N%^%7%s$K%P!<%8%g%s(B
 .Bx 4.2
 $B$N(B
 .Nm
-$B$,F0:n$7$F$$$k>l9g!"(B``rhost.rname''$B$N$h$&$KE>Aw@h$N%f!<%6L>$H%[%9%H(B
+$B$,F0:n$7$F$$$k>l9g!"(B
+.Dq rhost.rname
+$B$N$h$&$KE>Aw@h$N%f!<%6L>$H%[%9%H(B
 $BL>$r;XDj$7$J$1$l$P$J$j$^$;$s!#(B
diff -ur man/man1/rdist.1 man/man1/rdist.1
--- man/man1/rdist.1	Sun Jun 20 08:44:35 1999
+++ man/man1/rdist.1	Fri Jun 16 13:02:54 2000
@@ -30,8 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
+.\" %FreeBSD: src/usr.bin/rdist/rdist.1,v 1.10.2.1 2000/03/06 11:35:02 sheldonh Exp %
 .\"
-.\" Original Revision: 1.10
 .\" jpman %Id: rdist.1,v 1.2 1997/06/05 02:50:01 yugawa Stab %
 .\"
 .Dd March 17, 1994
diff -ur man/man1/refer.1 man/man1/refer.1
--- man/man1/refer.1	Sat Nov 20 19:54:18 1999
+++ man/man1/refer.1	Fri Jun 16 13:04:39 2000
@@ -31,7 +31,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH REFER 1 "7 September 1996" "Groff Version 1.11"
+.TH REFER 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 refer \- groff $B$N$?$a$N;29MJ88%L\O?%W%j%W%m%;%C%5(B
 .SH $B=q<0(B
diff -ur man/man1/rlogin.1 man/man1/rlogin.1
--- man/man1/rlogin.1	Tue Oct 27 09:33:12 1998
+++ man/man1/rlogin.1	Fri Jun 16 13:06:33 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/rlogin/rlogin.1,v 1.6.2.1 2000/01/07 13:17:00 phantom Exp %
 .\" jpman %Id: rlogin.1,v 1.3 1997/08/20 12:42:10 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -77,16 +78,20 @@
 .Fl K
 $BA4$F$N(B Kerberos $BG'>Z$rL58z$K$7$^$9!#(B
 .It Fl L
-rlogin $B%;%C%7%g%s$r(B ``litout'' $B%b!<%I$GF0:n$5$;$^$9(B(
+rlogin $B%;%C%7%g%s$r(B
+.Dq litout
+$B%b!<%I$GF0:n$5$;$^$9(B (
 .Xr tty 4
 $B;2>H(B)$B!#(B
 .It Fl d
 $B%j%b!<%H%[%9%H$H$NDL?.$KMQ$$$k(B TCP $B%=%1%C%H$N(B
-$B%=%1%C%H%G%P%C%05!G=(B(
+$B%=%1%C%H%G%P%C%05!G=(B (
 .Xr setsockopt 2
 $B;2>H(B)$B$rM-8z$K$7$^$9!#(B
 .It Fl e
-$B%(%9%1!<%W%-%c%i%/%?$r;XDj$7$^$9!#%G%U%)%k%H$O(B ``~'' $B$G$9!#(B
+$B%(%9%1!<%W%-%c%i%/%?$r;XDj$7$^$9!#%G%U%)%k%H$O(B
+.Dq ~
+$B$G$9!#(B
 $B;XDj$O%j%F%i%k%-%c%i%/%?$"$k$$$O(B \ennn $B7A<0$N(B 8 $B?J?t$G9T$$$^$9!#(B
 .It Fl k
 .Xr krb_realmofhost  3
@@ -112,15 +117,23 @@
 $B$h$j9b$$%;%-%e%j%F%#$,F@$i$l$^$9!#(B
 .El
 .Pp
-``<escape char>.'' $B$H$$$&7A<0$N9T$rF~NO$9$k$H!"(B
+.Dq Ao escape char Ac Ns \&.
+$B$H$$$&7A<0$N9T$rF~NO$9$k$H!"(B
 $B%j%b!<%H%[%9%H$+$i@ZCG$7$^$9!#(B
-$BF1MM$K(B ``<escape char>^Z'' $B$H$$$&9T$rF~NO$9$k$H(B
+$BF1MM$K(B
+.Dq Ao escape char Ac Ns ^Z
+$B$H$$$&9T$rF~NO$9$k$H(B
 .Nm
 $B%;%C%7%g%s$rCfCG$7!"(B
-``<escape char><delayed-suspend char>'' $B$rF~NO$9$k$H(B
+.Dq Ao escape char Ac Ao delayed-suspend char Ac
+$B$rF~NO$9$k$H(B
 rlogin $B$NAw?.ItJ,$N$_CfCG$7!"%j%b!<%H%7%9%F%`$+$i$N=PNO$OM-8z$KJ]$A$^$9!#(B
-$B%G%U%)%k%H$G$O(B <escape char> $B$O%A%k%@(B (``~'') $B$G$"$j!"(B
-<delayed-suspend char> $B$OIaDL(B control-Y (``^Y'') $B$G$9!#(B
+$B%G%U%)%k%H$G$O(B <escape char> $B$O%A%k%@(B
+.Pq Dq ~
+$B$G$"$j!"(B
+<delayed-suspend char> $B$OIaDL(B control-Y
+.Pq Dq ^Y
+$B$G$9!#(B
 .Pp
 $B%(%3!<$OA4$F%j%b!<%H%5%$%HB&$G9T$o$l!"(B($BCY1d$r=|$-(B)
 .Nm
@@ -163,7 +176,7 @@
 $B%f!<%6$NC<Kv%?%$%W$r7hDj$7$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
-.Xr login ,
+.Xr login 1 ,
 .Xr rsh 1 ,
 .Xr telnet 1 ,
 .Xr setsockopt 2 ,
@@ -172,19 +185,21 @@
 .Xr krb_sendauth 3 ,
 .Xr ruserok 3 ,
 .Xr tty 4 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr rlogind 8 ,
 .Xr rshd 8
-
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /etc/hosts -compact
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/auth.conf
-.It Pa $HOME/.rhosts
-.It Pa $HOME/.klogin
+.Sm off
+.It Pa Ev $HOME /.rhosts
+.It Pa Ev $HOME /.klogin
+.Sm on
 .El
-
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
diff -ur man/man1/rm.1 man/man1/rm.1
--- man/man1/rm.1	Fri Dec 10 20:07:24 1999
+++ man/man1/rm.1	Fri Jun 16 13:07:44 2000
@@ -35,19 +35,22 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" %FreeBSD: src/bin/rm/rm.1,v 1.12.2.3 1999/12/06 05:00:50 kris Exp %
+.\" %FreeBSD: src/bin/rm/rm.1,v 1.12.2.4 1999/12/29 19:39:46 obrien Exp %
 .\"
 .\" jpman %Id: rm.1,v 1.3 1997/05/19 16:49:44 horikawa Stab %
 .Dd January 28, 1999
 .Dt RM 1
 .Os
 .Sh $BL>>N(B
-.Nm rm
+.Nm rm ,
+.Nm unlink
 .Nd $B%G%#%l%/%H%j%(%s%H%j$N:o=|(B
 .Sh $B=q<0(B
 .Nm rm
 .Op Fl dfiPRrvW
 .Ar file ...
+.Nm unlink
+.Ar file
 .Sh $B2r@b(B
 .Nm
 $B$O!"(B
@@ -114,6 +117,13 @@
 .Dq ..
 $B$r:o=|$7$h$&$H$9$k$H%(%i!<$K$J$j$^$9!#(B
 .Pp
+$BK\%f!<%F%#%j%F%#$,(B
+.Nm unlink
+$B$H$7$F8F$P$l$?>l9g!"Hs%G%#%l%/%H%j$NC10l0z?t$N$_$,;XDj2DG=$G$9!#(B
+$B$3$NC1=c%b!<%IF0:n$G$O!"%*%W%7%g%s$O;XDjIT2D$G$"$j!"EO$5$l$?0z?t$KBP$7(B
+.Xr unlink 2
+$BF0:n$r<B9T$7$^$9!#(B
+.Pp
 $B;XDj$7$?%U%!%$%k$r$9$Y$F:o=|$7$?>l9g$+!"(B
 .Fl f
 $B%*%W%7%g%s$,;XDj$5$l!"B8:_$9$k%U%!%$%k$,$9$Y$F:o=|$5$l$?>l9g$K(B 0 $B$rJV$7$^$9!#(B
@@ -179,6 +189,12 @@
 $B$3$l$O!"%G%#%l%/%H%j$K4X$9$k(B
 .Nm
 $B$NNr;KE*$JF0:n$K=>$C$F$$$^$9!#(B
+.Pp
+$BC1=c2=$5$l$?(B
+.Nm unlink
+$B$O(B
+.St -susv2
+$B=`5r$G$9!#(B
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
diff -ur man/man1/rpcgen.1 man/man1/rpcgen.1
--- man/man1/rpcgen.1	Sat Nov 20 19:54:19 1999
+++ man/man1/rpcgen.1	Fri Jun 16 13:08:58 2000
@@ -1,6 +1,6 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
-.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.1 1999/10/30 15:27:57 phantom Exp %
+.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.2 2000/03/06 11:35:04 sheldonh Exp %
 .\"
 .\" jpman %Id: rpcgen.1,v 1.2 1997/06/08 13:49:19 jsakai Stab %
 .Dd March 28, 1993
diff -ur man/man1/rsh.1 man/man1/rsh.1
--- man/man1/rsh.1	Sat Nov 20 19:54:19 1999
+++ man/man1/rsh.1	Fri Jun 16 13:11:28 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.1 1999/10/30 15:27:58 phantom Exp %
+.\" %FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.2 2000/01/07 13:17:02 phantom Exp %
 .\"
 .\" jpman %Id: rsh.1,v 1.2 1997/05/13 00:56:14 mutoh Stab %
 .\"
@@ -153,6 +153,8 @@
 .Xr krb_sendauth 3 ,
 .Xr rcmd 3 ,
 .Xr ruserok 3 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr rlogind 8 ,
 .Xr rshd 8
diff -ur man/man1/rtprio.1 man/man1/rtprio.1
--- man/man1/rtprio.1	Wed Sep  1 11:13:44 1999
+++ man/man1/rtprio.1	Fri Jun 16 13:12:46 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.15.2.2 1999/08/29 15:48:06 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.15.2.3 2000/03/06 11:37:13 sheldonh Exp %
 .\"
 .\" jpman %Id: rtprio.1,v 1.3 1997/09/23 16:41:42 horikawa Stab %
 .\"
diff -ur man/man1/rusers.1 man/man1/rusers.1
--- man/man1/rusers.1	Wed Sep  1 11:13:44 1999
+++ man/man1/rusers.1	Fri Jun 16 13:13:45 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.6.2.1 1999/08/29 15:32:29 peter Exp %
+.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.6.2.2 2000/03/06 11:35:06 sheldonh Exp %
 .\" jpman %Id: rusers.1,v 1.3 1997/08/20 12:45:29 horikawa Stab %
 .\"
 .Dd April 23, 1991
diff -ur man/man1/rwall.1 man/man1/rwall.1
--- man/man1/rwall.1	Wed Sep  1 11:13:44 1999
+++ man/man1/rwall.1	Fri Jun 16 13:14:42 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.5.2.1 1999/08/29 15:32:32 peter Exp %
+.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.5.2.2 2000/03/06 11:35:08 sheldonh Exp %
 .\" jpman %Id: rwall.1,v 1.2 1997/05/21 00:38:04 mutoh Stab %
 .\"
 .Dd April 23, 1991
diff -ur man/man1/sasc.1 man/man1/sasc.1
--- man/man1/sasc.1	Wed Sep  1 11:13:44 1999
+++ man/man1/sasc.1	Fri Jun 16 13:15:30 2000
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.7.2.1 1999/08/29 15:32:36 peter Exp %
+.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.7.2.2 2000/03/06 11:35:09 sheldonh Exp %
 .\" jpman %Id: sasc.1,v 1.3 1997/07/22 17:55:16 horikawa Stab %
 .\"
 .Dd January 6, 1995
diff -ur man/man1/scon.1 man/man1/scon.1
--- man/man1/scon.1	Tue Feb 24 23:54:14 1998
+++ man/man1/scon.1	Fri Jun 16 13:16:37 2000
@@ -29,6 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)scon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:30:48 1994]
+.\" %FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.5.2.1 2000/03/06 11:36:51 sheldonh Exp %
 .\" jpman %Id: scon.1,v 1.3 1997/07/26 21:45:58 horikawa Stab %
 .\"
 .Dd December 31, 1993
diff -ur man/man1/script.1 man/man1/script.1
--- man/man1/script.1	Tue Dec 21 17:01:24 1999
+++ man/man1/script.1	Fri Jun 16 13:18:44 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/script/script.1,v 1.6.2.2 1999/12/13 23:47:12 billf Exp %
+.\" %FreeBSD: src/usr.bin/script/script.1,v 1.6.2.3 2000/03/06 11:35:11 sheldonh Exp %
 .\" jpman %Id: script.1,v 1.2 1997/03/29 08:26:02 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/sed.1 man/man1/sed.1
--- man/man1/sed.1	Sun Oct  3 12:26:10 1999
+++ man/man1/sed.1	Fri Jun 16 13:19:39 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
+.\" %FreeBSD: src/usr.bin/sed/sed.1,v 1.5.2.2 2000/02/15 03:17:11 unfurl Exp %
 .\" jpman %Id: sed.1,v 1.2 1997/03/29 08:28:32 horikawa Stab %
 .\"
 .Dd December 30, 1993
@@ -84,7 +85,7 @@
 $B%U%!%$%k(B
 .Ar command_file
 $B$K5-=R$5$l$?%3%^%s%I$r%3%^%s%I%j%9%H$KDI2C$7$^$9!#(B
-$BJT=8%3%^%s%I$O(B1$B9T$4$H$K5-=R$7$^$9!#(B
+$BJT=8%3%^%s%I$O(B 1 $B9T$4$H$K5-=R$7$^$9!#(B
 .It Fl n
 $B%G%U%)%k%H$G$O!"F~NO9T$O!"$9$Y$F$N%3%^%s%I$rE,MQ$7$?8e$KI8=`=PNO$K=q(B
 $B$-=P$5$l$^$9!#(B
@@ -118,24 +119,27 @@
 $B$rMxMQ$7$^$9!#%[!<%k%I%9%Z!<%9$NFbMF$O!"0J9_$N=hM}$KMQ$$$k$3$H$,$G$-(B
 $B$^$9!#(B
 .Sh "sed $B$N(B address $BI=5-(B"
-address $B$N;XDj$OI,?\$G$O$"$j$^$;$s!#(Badderss $B$O9THV9f(B($BJ#?t$NF~NO%U%!%$(B
+address $B$N;XDj$OI,?\$G$O$"$j$^$;$s!#(Baddress $B$O9THV9f(B ($BJ#?t$NF~NO%U%!%$(B
 $B%k$KBP$7$F$ODL$7HV9f$rMQ$$$^$9(B)$B!"F~NO$N:G8e$N9T$r<($9%I%k5-9f(B
 .Pq Dq $
-$B!"%3%s%F%-%9%H%"%I%l%9(B($B6h@Z$j5-9f$K$O$5$^$l$?@55,I=8=(B)$B$N$$$:$l$+$G$9!#(B
+$B!"%3%s%F%-%9%H%"%I%l%9(B ($B6h@Z$j5-9f$K$O$5$^$l$?@55,I=8=(B) $B$N$$$:$l$+$G$9!#(B
 .Pp
 address $B;XDj$r;}$?$J$$%3%^%s%I$O!"$9$Y$F$N%Q%?%s%9%Z!<%9$rA*Br$7$^$9!#(B
 .Pp
 1$B$D$N(B address $B;XDj$r;}$D%3%^%s%I$O!"$=$N(B address $B;XDj$K%^%C%A$9$k(B
 $B$9$Y$F$N%Q%?%s%9%Z!<%9$rA*Br$7$^$9!#(B
 .Pp
-2$B$D$N(B address $B;XDj$r;}$D%3%^%s%I$O!"(B1$B$D$a$N(B address $B$K%^%C%A$7$?(B
-$B%Q%?%s%9%Z!<%9$+$i(B
-2$B$D$a$N(B address $B$K%^%C%A$7$?(B
-$B%Q%?%s%9%Z!<%9$^$G$NHO0O$rA*Br$7$^$9(B($B$b$7!"(B
-2$B$D$a$N(B address $B$,!"(B1$B$D$a$N(B address $B0J2<$N9THV9f$N>l9g!"(B
-1$B$D$a$N(B address $B$,;XDj$9$k9T$N$_A*Br$5$l$^$9(B)$B!#(B
-$BA*Br$5$l$?HO0O$N<!$N9T$+$i!"(B1 $B$D$a$N(B address $B$K%^%C%A$9$k9T$N8!:w(B
-$B$,:F3+$5$l$^$9!#(B
+2 $B$D$N(B address $B;XDj$r;}$D%3%^%s%I$O!"(Baddress $B$NN>C<$r4^$s$@HO0O$r(B
+$BA*Br$7$^$9!#(B
+$B$3$NHO0O$O!"(B1 $B$D$a$N(B address $B$K%^%C%A$7$?%Q%?%s%9%Z!<%9$G;O$^$j!"(B
+$B$=$N8e$KB3$/(B 2 $B$D$a$N(B address $B$K%^%C%A$7$?%Q%?%s%9%Z!<%9$G=*$o$j$^$9!#(B
+2 $B$D$a$N(B address $B$,!"(B1 $B$D$a$N(B address $B$GA*Br$5$l$?9THV9f0J2<$N(B
+$BHV9f$G$"$k>l9g!"(B1 $B$D$a$N(B address $B$,;XDj$9$k9T$N$_A*Br$5$l$^$9!#(B
+2 $B$D$a$N(B address $B$,%3%s%F%-%9%H%"%I%l%9$G$"$k>l9g!"(Bsed $B$O!"(B
+1 $B$D$a$N(B address $B$K%^%C%A$7$?%Q%?%s%9%Z!<%9$r(B 2 $B$D$a$N(B
+address $B$K:F$S%^%C%A$5$;$h$&$H$O$7$^$;$s!#(Bsed $B$O!"A*Br$5$l$?HO0O$N(B
+$B<!$N9T$+$i!"(B1 $B$D$a$N(B address $B$K%^%C%A$9$k9T$N8!:w$r(B
+$B:F3+$7$^$9!#(B
 .Pp
 $B%(%/%9%/%i%a!<%7%g%s4X?t(B
 .Pq Dq !
@@ -315,7 +319,7 @@
 $B0u;zIT2DG=$JJ8;z$O!"3F%P%$%H$4$H$K(B
 .Dq \e
 $B$KB3$$$F(B 3 $B7e$N(B 8 $B?J?t$G=PNO$5$l$^(B
-$B$9(B(Most Significant Byte $B$,@hF,$G$9(B)$B!#(B
+$B$9(B (Most Significant Byte $B$,@hF,$G$9(B)$B!#(B
 $BD9$$9T$O@^$jJV$7$FI=<($5$l$^$9!#@^$jJV$7$?ItJ,$O(B
 .Dq \e
 $B$KB3$/2~9T$G(B
diff -ur man/man1/send-pr.1 man/man1/send-pr.1
--- man/man1/send-pr.1	Sun Oct 31 10:42:53 1999
+++ man/man1/send-pr.1	Fri Jun 16 13:21:59 2000
@@ -21,7 +21,10 @@
 .\"    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 .\"
 .\" ---------------------------------------------------------------------------
+.\"
+.\" %FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.7.2.1 1999/12/29 23:16:08 steve Exp %
 .\" jpman %Id: send-pr.1,v 1.2 1997/03/29 08:29:34 horikawa Stab %
+.\"
 .nh
 .TH SEND-PR 1 3.2 "February 1993"
 .SH $BL>>N(B
@@ -144,6 +147,40 @@
 .B send-pr
 $B$NN>J}$r;H$&$3$H$K$h$C$F!"I,MW$J>pJs$N$9$Y$F$,%5%]!<%H%5%$%H$K3N<B$K(B
 $BFO$-$d$9$/$J$j$^$9!#(B
+.SH FREEBSD $B$N%+%F%4%j(B
+.TP
+.B advocacy
+$B;Y;}(B WWW $B%Z!<%8MQ!#2?$K;H$&$N$+:#$OIT3N$+$G$9!#(B
+.TP
+.B alpha
+Alpha $B%W%m%;%C%58GM-$NLdBj!#(B
+.TP
+.B bin
+$B%7%9%F%`$N<B9T7A<0$N=$@5$^$?$O3HD%!#(B
+.TP
+.B conf
+$B%7%9%F%`$N@_Dj%U%!%$%k$N=$@5$^$?$O3HD%!#(B
+.TP
+.B docs
+$B%^%K%e%"%k%Z!<%8$^$?$OB>$NJ8=q$N=$@5$^$?$O3HD%!#(B
+.TP
+.B gnu
+GNU $BDiMW%=%U%H%&%'%"$N=$@5$^$?$O3HD%!#(B
+.TP
+.B i386
+Intel x86 $B%W%m%;%C%58GM-$NLdBj!#(B
+.TP
+.B kern
+$B%"!<%-%F%/%A%cFHN)%+!<%M%k%=!<%9$N=$@5$^$?$O3HD%!#(B
+.TP
+.B misc
+$BB>$N%+%F%4%j$K$"$F$O$^$i$J$$LdBj!#(B
+.TP
+.B ports
+ports collection $B$N=$@5$^$?$O3HD%(B ($B?75,(B ports $B$r4^$_$^$9(B)$B!#(B
+.TP
+.B sparc
+SPARC $B%W%m%;%C%58GM-$NLdBj!#(B
 .SH $B4D6-JQ?t(B
 $B4D6-JQ?t(B
 .B EDITOR
diff -ur man/man1/sgsc.1 man/man1/sgsc.1
--- man/man1/sgsc.1	Sat Oct 10 09:09:07 1998
+++ man/man1/sgsc.1	Fri Jun 16 13:23:39 2000
@@ -27,7 +27,10 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" %FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.4.2.1 2000/03/06 11:37:14 sheldonh Exp %
 .\" jpman %Id: sgsc.1,v 1.3 1997/06/12 22:00:17 horikawa Stab %
+.\"
 .Dd January 6, 1995
 .Dt SGSC 1
 .Os
diff -ur man/man1/sh.1 man/man1/sh.1
--- man/man1/sh.1	Fri Dec 10 20:07:24 1999
+++ man/man1/sh.1	Fri Jun 16 13:24:31 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" %FreeBSD: src/bin/sh/sh.1,v 1.23.2.7 1999/12/04 17:19:07 cracauer Exp %
+.\" %FreeBSD: src/bin/sh/sh.1,v 1.23.2.9 2000/03/20 10:51:04 cracauer Exp %
 .\"
 .\" jpman %Id: sh.1,v 1.2 1997/05/31 16:40:31 jsakai Stab %
 .\"	Japanese Translation amended by Norihiro Kumagai, 3/29/96,
@@ -1635,7 +1635,7 @@
 $B40A4$J%Q%9L>$,0u:~$5$l$^$9!#(B
 .It Xo
 .Ic ulimit
-.Op Fl HSacdflmnust
+.Op Fl HSabcdflmnust
 .Op Ar limit
 .Xc
 $B%j%=!<%9$N%j%_%C%HCM(B ($B%j%_%C%HCM$K$D$$$F$O(B
@@ -1671,6 +1671,8 @@
 $B$3$NB>$N%*%W%7%g%s$O!"I=<($"$k$$$O@_Dj$9$k%j%=!<%9$N<oN`$r;XDj$9$k$b$N$G$9!#(B
 $B$3$l$i$O8_$$$KGSB>E*$G$9!#(B
 .Bl -tag -width Ds
+.It Fl b Ar sbsize
+$B%=%1%C%H%P%C%U%!%5%$%:$N:GBgCM!#%P%$%HC10L!#(B
 .It Fl c Ar coredumpsize
 $B%3%"%@%s%W%U%!%$%k$N:GBg%5%$%:!#(B512 $B%P%$%H$N%V%m%C%/C10L!#(B
 .It Fl d Ar datasize
diff -ur man/man1/skey.1 man/man1/skey.1
--- man/man1/skey.1	Tue Feb 24 23:54:15 1998
+++ man/man1/skey.1	Fri Jun 16 13:25:07 2000
@@ -1,6 +1,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)skey.1	1.1 	10/28/93
+.\" %FreeBSD: src/lib/libskey/skey.1,v 1.1.10.1 2000/03/03 14:59:41 sheldonh Exp %
 .\" jpman %Id: skey.1,v 1.2 1997/05/04 13:37:08 horikawa Stab %
 .\"
 .lt 6.0i
diff -ur man/man1/sleep.1 man/man1/sleep.1
--- man/man1/sleep.1	Sat Nov 20 19:54:19 1999
+++ man/man1/sleep.1	Fri Jun 16 13:25:41 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.3 1999/10/28 18:02:43 ru Exp %
+.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.4 2000/03/03 14:58:55 sheldonh Exp %
 .\"
 .\" jpman %Id: sleep.1,v 1.2 1997/05/04 13:38:26 horikawa Stab %
 .\"
diff -ur man/man1/sockstat.1 man/man1/sockstat.1
--- man/man1/sockstat.1	Sat Sep 11 08:07:46 1999
+++ man/man1/sockstat.1	Fri Jun 16 13:28:14 2000
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.1.2.3 1999/09/06 13:20:42 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.1.2.4 2000/03/06 11:35:15 sheldonh Exp %
 .\"
 .\" jpman %Id: sockstat.1,v 1.3 1999/05/07 16:58:23 kuma Stab %
 .\"
diff -ur man/man1/startslip.1 man/man1/startslip.1
--- man/man1/startslip.1	Wed Sep  1 11:13:45 1999
+++ man/man1/startslip.1	Fri Jun 16 13:29:20 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/startslip/startslip.1,v 1.14.2.1 1999/08/29 15:15:49 peter Exp %
+.\" %FreeBSD: src/sbin/startslip/startslip.1,v 1.14.2.2 2000/03/03 15:13:15 sheldonh Exp %
 .\"
 .\" jpman %Id: startslip.1,v 1.3 1997/08/19 03:06:09 h-nokubi Stab %
 .\"
diff -ur man/man1/stty.1 man/man1/stty.1
--- man/man1/stty.1	Wed Sep  1 11:13:45 1999
+++ man/man1/stty.1	Fri Jun 16 13:30:13 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/stty/stty.1,v 1.10.2.2 1999/08/29 14:14:21 peter Exp %
+.\" %FreeBSD: src/bin/stty/stty.1,v 1.10.2.3 2000/03/03 14:58:57 sheldonh Exp %
 .\"
 .\" jpman %Id: stty.1,v 1.2 1997/06/05 04:05:59 yugawa Stab %
 .Dd April 18, 1994
diff -ur man/man1/su.1 man/man1/su.1
--- man/man1/su.1	Sun Oct 31 10:42:53 1999
+++ man/man1/su.1	Fri Jun 16 13:30:41 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/su/su.1,v 1.15.2.1 1999/08/29 15:32:57 peter Exp %
+.\" %FreeBSD: src/usr.bin/su/su.1,v 1.15.2.2 2000/03/06 11:35:17 sheldonh Exp %
 .\" jpman %Id: su.1,v 1.3 1997/05/19 16:52:17 horikawa Stab %
 .\"
 .\" this is for hilit19's braindeadness: "
diff -ur man/man1/systat.1 man/man1/systat.1
--- man/man1/systat.1	Sat Sep 11 08:07:46 1999
+++ man/man1/systat.1	Fri Jun 16 13:31:09 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/systat/systat.1,v 1.16.2.4 1999/09/07 08:39:34 des Exp %
+.\" %FreeBSD: src/usr.bin/systat/systat.1,v 1.16.2.5 2000/03/06 11:35:19 sheldonh Exp %
 .\"
 .\" jpman %Id: systat.1,v 1.3 1997/10/05 12:58:19 horikawa Stab %
 .\"
diff -ur man/man1/talk.1 man/man1/talk.1
--- man/man1/talk.1	Tue Feb 24 23:54:15 1998
+++ man/man1/talk.1	Fri Jun 16 13:31:31 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/talk/talk.1,v 1.3.2.1 2000/03/06 11:35:21 sheldonh Exp %
 .\" jpman %Id: talk.1,v 1.2 1997/05/04 13:39:47 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/tbl.1 man/man1/tbl.1
--- man/man1/tbl.1	Mon Apr 26 10:34:46 1999
+++ man/man1/tbl.1	Fri Jun 16 13:31:59 2000
@@ -17,7 +17,7 @@
 the original English.
 ..
 .\" jpman %Id: tbl.1,v 1.2 1997/05/15 15:23:39 horikawa Stab %
-.TH TBL 1 "7 September 1996" "Groff Version 1.11"
+.TH TBL 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 tbl \- troff $B$N$?$a$NI=%U%)!<%^%C%?(B
 .SH $B=q<0(B
diff -ur man/man1/tcpslice.1 man/man1/tcpslice.1
--- man/man1/tcpslice.1	Wed Sep  1 11:13:46 1999
+++ man/man1/tcpslice.1	Fri Jun 16 13:32:28 2000
@@ -17,7 +17,7 @@
 .\" or promote products derived from this software without specific prior
 .\" written permission.
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.6.2.1 1999/08/29 15:48:40 peter Exp %
+.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.6.2.2 2000/05/09 14:27:13 sheldonh Exp %
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .Dd October 14, 1991
diff -ur man/man1/test.1 man/man1/test.1
--- man/man1/test.1	Tue Dec 21 17:01:24 1999
+++ man/man1/test.1	Fri Jun 16 13:32:59 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" %FreeBSD: src/bin/test/test.1,v 1.8.2.2 1999/12/15 13:37:11 sheldonh Exp %
+.\" %FreeBSD: src/bin/test/test.1,v 1.8.2.3 2000/03/03 14:58:57 sheldonh Exp %
 .\"
 .\" jpman %Id: test.1,v 1.2 1997/03/31 03:43:49 ryo2 Stab %
 .\"
Only in man/man1: texindex.1
diff -ur man/man1/tfmtodit.1 man/man1/tfmtodit.1
--- man/man1/tfmtodit.1	Mon Apr 26 10:34:46 1999
+++ man/man1/tfmtodit.1	Fri Jun 16 13:33:27 2000
@@ -25,7 +25,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH TFMTODIT 1 "7 September 1996" "Groff Version 1.11"
+.TH TFMTODIT 1 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 tfmtodit \- groff \-Tdvi $B$GMQ$$$k%U%)%s%H%U%!%$%k$r:n@.$9$k(B
 .SH $B=q<0(B
diff -ur man/man1/time.1 man/man1/time.1
--- man/man1/time.1	Mon Apr 26 10:34:47 1999
+++ man/man1/time.1	Fri Jun 16 13:34:39 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
+.\"	%FreeBSD: src/usr.bin/time/time.1,v 1.8.2.2 2000/01/14 11:15:32 sheldonh Exp %
 .\" jpman %Id: time.1,v 1.3 1997/07/27 12:00:02 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -81,17 +82,11 @@
 $B$K$5$;$^$9(B ($B3F;~4V$,3F9T$KI=<($5$l$^$9(B)$B!#(B
 .El
 .Pp
-$B$[$H$s$I$N%7%'%k(B (
-.Xr csh 1
-$B$r4^$_$^$9(B) $B$OFH<+$N(B
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
 .Nm
-$B$rAH$_9~$_%3%^%s%I$H$7$F<BAu$7$F$$$^$9!#(B
-$B$3$l$i$N%7%'%k$r;HMQ$7$F$$$k>l9g!"(B
-$B$3$3$G@bL@$5$l$F$$$k(B
-.Nm
-$B$r<B9T$9$k$H$-$O(B
-.Pa /usr/bin/time
-$B$H%?%$%W$7$F2<$5$$!#(B
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B?GCG(B
 .Ar command
 $B$r@.8yN"$K;~4V7WB,$G$-$?>l9g!"%3%^%s%I$N=*N;>uBV$,JV$5$l$^$9!#(B
@@ -104,6 +99,7 @@
 .Nm
 $B$,B>$N%(%i!<$H$J$C$?>l9g!"=*N;>uBV$O(B 1 $B0J>e(B 125 $B0J2<$H$J$j$^$9!#(B
 .Sh $B4XO"9`L\(B
+.Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr getrusage 2 ,
 .Xr wait 2
diff -ur man/man1/tip.1 man/man1/tip.1
--- man/man1/tip.1	Thu Oct 15 12:06:14 1998
+++ man/man1/tip.1	Fri Jun 16 13:35:29 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
+.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.4.2.1 2000/03/06 11:35:22 sheldonh Exp %
 .\" jpman %Id: tip.1,v 1.3 1997/07/26 21:48:01 horikawa Stab %
 .\"
 .Dd April 18, 1994
diff -ur man/man1/troff.1 man/man1/troff.1
--- man/man1/troff.1	Mon Apr 26 10:34:47 1999
+++ man/man1/troff.1	Mon Jun 26 21:44:29 2000
@@ -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 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/troff/troff.man,v 1.2.4.1 2000/03/09 20:13:17 asmodai Exp %
+
 ..
 .\" jpman %Id: troff.1,v 1.4 1997/07/26 21:50:12 horikawa Stab %
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
@@ -28,7 +31,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH TFMTODIT 1 "8 September 1996" "Groff Version 1.11"
+.TH TROFF 1 "9 March 2000" "Groff Version 1.15"
 .SH $BL>>N(B
 troff \- $BJ8=q$r%U%)!<%^%C%H$9$k(B
 .SH $B=q<0(B
@@ -42,7 +45,7 @@
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-abivzCER
+.OP \-abivzCERU
 .OP \-w name
 .OP \-W name
 .OP \-d cs
@@ -78,8 +81,9 @@
 .B as
 $B$d(B
 .B am
-$B%j%/%(%9%H$K$h$j9THV9f$r8mG'$9$k2DG=@-$,$"$k(B
-$B$+$i$G$9!#(B
+$B%j%/%(%9%H$K$h$j!"(B
+.B troff
+$B$,9THV9f$r8mG'$9$k2DG=@-$,$"$k$+$i$G$9!#(B
 .TP
 .B \-i
 $B;XDj$5$l$?%U%!%$%k$r$9$Y$F=hM}$7$?$"$H$K!"I8=`F~NO$bFI$_9~$_!"=hM}$7$^$9!#(B
@@ -133,6 +137,14 @@
 $B$rFI$_9~$_$^$9!#DL>o!"%G%#%l%/%H%j(B 
 .B /usr/share/tmac
 $B$,8!:w$5$l$^$9!#(B
+$B%G%U%)%k%H$G(B
+.I safer
+$B%^%/%m$,;HMQ$5$l$^$9(B (-U $B$r;H$&$3$H$G;H$o$J$$$h$&$K$G$-$^$9(B)$B!#(B
+.TP
+.B \-U
+$B0BA4$G$J$$%*%W%7%g%s$G$"$j!"%G%U%)%k%H$G;H$o$l$k(B
+.I safer
+$B%^%/%m$r;H$o$J$$$h$&$K$7$^$9!#(B
 .TP
 .B \-R
 .B troffrc
@@ -2013,6 +2025,7 @@
 .BR grops (1),
 .BR grodvi (1),
 .BR grotty (1),
+.BR grohtml (1),
 .BR groff_font (5),
 .BR groff_out (5),
 .BR groff_char (7)
diff -ur man/man1/uuencode.1 man/man1/uuencode.1
--- man/man1/uuencode.1	Wed Sep  1 11:13:47 1999
+++ man/man1/uuencode.1	Fri Jun 16 13:37:50 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.7.2.1 1999/08/29 15:34:24 peter Exp %
+.\" %FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.7.2.2 2000/03/06 11:35:24 sheldonh Exp %
 .\" jpman %Id: uuencode.1,v 1.2 1997/03/29 11:57:08 horikawa Stab %
 .\"
 .Dd June 6, 1993
diff -ur man/man1/vacation.1 man/man1/vacation.1
--- man/man1/vacation.1	Wed Sep  1 11:13:48 1999
+++ man/man1/vacation.1	Fri Jun 16 13:38:17 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\" %FreeBSD: src/usr.bin/vacation/vacation.1,v 1.6.2.2 1999/08/29 15:34:27 peter Exp %
+.\" %FreeBSD: src/usr.bin/vacation/vacation.1,v 1.6.2.3 2000/03/06 11:35:27 sheldonh Exp %
 .\"
 .\" jpman %Id: vacation.1,v 1.3 1997/08/19 03:07:07 h-nokubi Stab %
 .\"
diff -ur man/man1/vidcontrol.1 man/man1/vidcontrol.1
--- man/man1/vidcontrol.1	Sat Nov 20 19:54:19 1999
+++ man/man1/vidcontrol.1	Fri Jun 16 13:40:57 2000
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.6 1999/10/30 14:31:56 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.8 2000/03/06 11:37:24 sheldonh Exp %
 .\"
 .\" jpman %Id: vidcontrol.1,v 1.3 1997/08/04 01:31:25 mitchy Stab %
 .Dd June 30, 1999
@@ -30,6 +30,7 @@
 .Op Fl i Cm adapter | mode
 .Op Fl l Ar screen_map
 .Op Fl L
+.Op Fl M Ar char
 .Op Fl m Cm on | off
 .Op Fl r Ar foreground Ar background
 .Op Fl s Ar number
@@ -127,6 +128,10 @@
 $B8=:_$N%S%G%*%"%@%W%?$K4X$9$k>pJs$rI=<($7$^$9!#(B
 .It Fl i Cm mode
 $B8=:_$N%S%G%*%O!<%I%&%'%"$K$F;HMQ2DG=$J%S%G%*%b!<%I$rI=<($7$^$9!#(B
+.It Fl M Ar char
+$B%^%&%9%]%$%s%?$rIA$/4pK\$H$J$kJ8;z$r(B
+.Ar char
+$B$K$7$^$9!#(B
 .It Fl m Cm on | off
 $B%^%&%9%]%$%s%?$r(B
 .Cm on
diff -ur man/man1/vt220keys.1 man/man1/vt220keys.1
--- man/man1/vt220keys.1	Tue Feb 24 23:54:18 1998
+++ man/man1/vt220keys.1	Fri Jun 16 13:42:02 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.5.2.1 2000/03/06 11:36:53 sheldonh Exp %
 .TH VT220KEYS 1 
 .\" jpman %Id: vt220keys.1,v 1.3 1997/07/22 18:00:12 horikawa Stab %
 .UC 4
diff -ur man/man1/which.1 man/man1/which.1
--- man/man1/which.1	Wed Sep  1 11:13:48 1999
+++ man/man1/which.1	Fri Jun 16 13:42:48 2000
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/which/which.1,v 1.12.2.1 1999/08/29 15:34:46 peter Exp %
+.\" %FreeBSD: src/usr.bin/which/which.1,v 1.12.2.3 2000/01/14 11:20:04 sheldonh Exp %
 .\" jpman %Id: which.1,v 1.3 1997/06/14 16:24:02 kubo Stab %
 .Dd January 26, 1995
 .Dt WHICH 1
@@ -52,12 +52,21 @@
 .It Fl s
 $B<B9T7A<0$,8+$D$+$l$P(B 0 $B$rJV$7!"8+$D$+$i$J$1$l$P(B 1 $B$rJV$7$^$9!#(B
 $BI=<($O$7$^$;$s!#(B
+.El
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$H;w$?$^$?$OF1$8!"AH$_9~$_$N(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$k$b$N$,$"$j$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
 .Fx 2.1
 $B$+$iEP>l$7$^$7$?!#(B
 .Sh $B4XO"%U%!%$%k(B
+.Xr builtin 1 ,
+.Xr csh 1 ,
 .Xr find 1 ,
 .Xr locate 1 ,
 .Xr perl 1 ,
diff -ur man/man1/whois.1 man/man1/whois.1
--- man/man1/whois.1	Wed Dec  8 08:40:40 1999
+++ man/man1/whois.1	Fri Jun 16 13:43:25 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.4.2.3 1999/12/06 22:05:38 joe Exp %
+.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.4.2.5 2000/03/06 11:35:29 sheldonh Exp %
 .\"
 .\" jpman %Id: whois.1,v 1.3 1997/06/14 04:30:33 kubo Stab %
 .Dd November 17, 1999
