From owner-man-jp-reviewer@jp.freebsd.org  Wed Jul  5 12:23:23 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA49323;
	Wed, 5 Jul 2000 12:23:23 +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 MAA49264
	for <man-jp-reviewer@jp.freebsd.org>; Wed, 5 Jul 2000 12:23:17 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.26.194.210] (helo=localhost)
	by smtp1.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp-reviewer@jp.freebsd.org
	id 139flc-0007Vg-00; Tue, 4 Jul 2000 23:22:28 -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: Multipart/Mixed;
	boundary="--Next_Part(Tue_Jul__4_21:42:03_2000_179)--"
Content-Transfer-Encoding: 7bit
Message-Id: <20000704231953B.horikawa@psinet.com>
Date: Tue, 04 Jul 2000 23:19:53 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 8419
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 2672
Subject: [man-jp-reviewer 2672] 4.0-20000703-STABLE (man1)
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: horikawa@psinet.com

----Next_Part(Tue_Jul__4_21:42:03_2000_179)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 man1 $B$N(B 4.0-20000703-STABLE $B$X$N(B 4.0-RELEASE $B$+$i$N:9J,$G$9!#(B
 $BLu$7$?$H$3$m$O$[$H$s$I$J$$(B ($B$O$:(B) $B$G$9!#(B
 

----Next_Part(Tue_Jul__4_21:42:03_2000_179)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: jdiff_4.0-20000703-STABLE_1
Content-Disposition: attachment; filename=jdiff_4.0-20000703-STABLE_1

diff -ur man/man1/Makefile man/man1/Makefile
--- man/man1/Makefile	Wed Jun 14 22:42:06 2000
+++ man/man1/Makefile	Wed Jul  5 09:47:17 2000
@@ -84,7 +84,6 @@
 	file2c.1\
 	find.1\
 	finger.1\
-	flex.1\
 	fmt.1\
 	fold.1\
 	fontedit.1\
@@ -370,7 +369,7 @@
 MLINKS=	builtin.1 alias.1 builtin.1 alloc.1 builtin.1 bg.1 \
 	builtin.1 break.1 builtin.1 breaksw.1 builtin.1 case.1 \
 	builtin.1 cd.1 builtin.1 chdir.1 builtin.1 command.1 \
-	builtin.1 continue.1 builtin.1 cwd.1 builtin.1 default.1 \
+	builtin.1 continue.1 builtin.1 default.1 \
 	builtin.1 dirs.1 builtin.1 do.1 builtin.1 done.1 \
 	builtin.1 elif.1 builtin.1 else.1 \
 	builtin.1 end.1 builtin.1 endif.1 builtin.1 endsw.1 \
@@ -393,49 +392,66 @@
 	builtin.1 unsetenv.1 builtin.1 until.1 builtin.1 wait.1 \
 	builtin.1 while.1
 
-MLINKS+= ed.1 red.1
-MLINKS+=	test.1 '[.1'
-MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
-MLINKS+=	cccp.1 cpp.1
-MLINKS+= grep.1 egrep.1 grep.1 fgrep.1
-MLINKS+= grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
-MLINKS+= gzip.1 gunzip.1  gzip.1 zcat.1  gzip.1 gzcat.1
-MLINKS+= zdiff.1 zcmp.1
-MLINKS+=	apropos.1 whatis.1
-MLINKS+=	send-pr.1 sendbug.1
-MLINKS+=	at.1 batch.1 \
-        at.1 atq.1 \
-        at.1 atrm.1
-MLINKS+=	basename.1 dirname.1
-MLINKS+=	chpass.1 chfn.1 chpass.1 chsh.1
-MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
-MLINKS+=	compress.1 uncompress.1
-MLINKS+=        ee.1 ree.1
-MLINKS+=	expand.1 unexpand.1
-MLINKS+= ftp.1 pftp.1 ftp.1 gate-ftp.1
-MLINKS+=	hexdump.1 hd.1
-MLINKS+=	intro.1 introduction.1
-MLINKS+=	lex.1 flex.1
-MLINKS+=	lex.1 flex++.1
-MLINKS+=	lex.1 lex++.1
-MLINKS+=	mail.1 Mail.1
+MLINKS+=ed.1 red.1
+MLINKS+=test.1 '[.1'
+MLINKS+=gcc.1 cc.1 
+MLINKS+=gcc.1 c++.1
+MLINKS+=gcc.1 g++.1
+MLINKS+=gcc.1 CC.1
+MLINKS+=cccp.1 cpp.1
+MLINKS+=grep.1 egrep.1
+MLINKS+=grep.1 fgrep.1
+MLINKS+=grep.1 zgrep.1
+MLINKS+=grep.1 zegrep.1
+MLINKS+=grep.1 zfgrep.1
+MLINKS+=gzip.1 gunzip.1
+MLINKS+=gzip.1 zcat.1
+MLINKS+=gzip.1 gzcat.1
+MLINKS+=zdiff.1 zcmp.1
+MLINKS+=apropos.1 whatis.1
+MLINKS+=send-pr.1 sendbug.1
+MLINKS+=at.1 batch.1
+MLINKS+=at.1 atq.1
+MLINKS+=at.1 atrm.1
+MLINKS+=basename.1 dirname.1
+MLINKS+=chpass.1 chfn.1
+MLINKS+=chpass.1 chsh.1
+MLINKS+=chpass.1 ypchpass.1
+MLINKS+=chpass.1 ypchfn.1
+MLINKS+=chpass.1 ypchsh.1
+MLINKS+=compress.1 uncompress.1
+MLINKS+=ee.1 ree.1
+MLINKS+=expand.1 unexpand.1
+MLINKS+=ftp.1 pftp.1
+MLINKS+=ftp.1 gate-ftp.1
+MLINKS+=hexdump.1 hd.1
+MLINKS+=intro.1 introduction.1
+MLINKS+=lex.1 flex.1
+MLINKS+=lex.1 flex++.1
+MLINKS+=lex.1 lex++.1
+MLINKS+=mail.1 Mail.1
 MLINKS+=passwd.1 yppasswd.1
-MLINKS+=	printenv.1 env.1
-MLINKS+=	tput.1 clear.1
-MLINKS+=	tset.1 reset.1
-MLINKS+=vi.1 ex.1 vi.1 view.1
-MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1
+MLINKS+=printenv.1 env.1
+MLINKS+=tput.1 clear.1
+MLINKS+=tset.1 reset.1
+MLINKS+=vi.1 ex.1
+MLINKS+=vi.1 view.1
+MLINKS+=vi.1 nex.1
+MLINKS+=vi.1 nview.1
+MLINKS+=vi.1 nvi.1
 MLINKS+=yacc.1 byacc.1
-MLINKS+=	ctm_rmail.1 ctm_smail.1
-MLINKS+=	ctm_rmail.1 ctm_dequeue.1
-MLINKS+= kbdmap.1 vidfont.1
-MLINKS+= rtprio.1 idprio.1
-MLINKS+= cksum.1 sum.1
-MLINKS+= ktrace.1 trace.1
-MLINKS+= uuencode.1 uudecode.1
-MLINKS+= ncal.1 cal.1
+MLINKS+=ctm_rmail.1 ctm_smail.1
+MLINKS+=ctm_rmail.1 ctm_dequeue.1
+MLINKS+=kbdmap.1 vidfont.1
+MLINKS+=rtprio.1 idprio.1
+MLINKS+=cksum.1 sum.1
+MLINKS+=ktrace.1 trace.1
+MLINKS+=uuencode.1 uudecode.1
+MLINKS+=ncal.1 cal.1
 MLINKS+=enigma.1 crypt.1
 MLINKS+=ln.1 link.1
 MLINKS+=rm.1 unlink.1
+MLINKS+=opiekey.1 otp-md4.1
+MLINKS+=opiekey.1 otp-md5.1
 
 .include "bsd.prog.mk"
diff -ur man/man1/apropos.1 man/man1/apropos.1
--- man/man1/apropos.1	Tue Feb 15 23:34:49 2000
+++ man/man1/apropos.1	Wed Jul  5 09:34:38 2000
@@ -12,27 +12,29 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.6.2.1 2000/05/10 13:44:45 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/at.1 man/man1/at.1
--- man/man1/at.1	Tue Feb 15 23:34:49 2000
+++ man/man1/at.1	Wed Jul  5 09:34:40 2000
@@ -1,10 +1,13 @@
-.\" %FreeBSD: src/usr.bin/at/at.man,v 1.13 1999/12/05 19:57:14 charnier Exp %
+.\" %FreeBSD: src/usr.bin/at/at.man,v 1.13.2.1 2000/04/23 16:51:28 mpp Exp %
 .\" jpman %Id: at.1,v 1.3 1997/08/05 18:36:01 george Stab %
 .Dd April 12, 1995
 .Dt "AT" 1
 .Os FreeBSD 2.1
 .Sh $BL>>N(B
-.Nm at , batch , atq , atrm
+.Nm at ,
+.Nm batch , 
+.Nm atq , 
+.Nm atrm
 .Nd $B$"$H$G%8%g%V$r<B9T$5$;$k$?$a$N%-%e!<$N@_Dj!"3NG'!"%8%g%V$N:o=|$r9T$J$&(B
 .Sh $B=q<0(B
 .Nm at
diff -ur man/man1/basename.1 man/man1/basename.1
--- man/man1/basename.1	Tue Feb 15 23:34:49 2000
+++ man/man1/basename.1	Wed Jul  5 09:34:41 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/basename/basename.1,v 1.6 1999/08/28 00:59:11 peter Exp %
+.\" %FreeBSD: src/usr.bin/basename/basename.1,v 1.6.2.1 2000/06/30 09:51:44 ps Exp %
 .\"
 .\" jpman %Id: basename.1,v 1.2 1997/03/26 15:20:48 jsakai Stab %
 .\"
@@ -82,17 +82,17 @@
 $B<!$N9T$O!"%7%'%kJQ?t(B FOO $B$K(B /usr/bin $B$r@_Dj$9$k$b$N$G$9!#(B
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Pp
-.Nm  basename
+.Sh $B?GCG(B
+.Nm
 $B$*$h$S(B
-.Nm  dirname
+.Nm dirname
 $B$O6&$K!"@.8y$7$?>l9g$O(B 0 $B$r!"(B
 $B%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr csh 1 ,
 .Xr sh 1
 .Sh $B5,3J(B
-.Nm basename
+.Nm
 $B$*$h$S(B
 .Nm dirname
 $B$N5!G=$O!"(BPOSIX 1003.2 $B=`5r$G$"$k$H;W$o$l$^$9!#(B
diff -ur man/man1/builtin.1 man/man1/builtin.1
--- man/man1/builtin.1	Wed Jun 14 22:42:07 2000
+++ man/man1/builtin.1	Wed Jul  5 09:34:43 2000
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5 2000/03/03 09:28:05 sheldonh Exp %
+.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5.2.3 2000/05/10 10:20:53 sheldonh Exp %
 .\"
 .\" jpman %Id: builtin.1,v 0.0 1999/12/11 15:12:46 horikawa Stab %
 .Dd September 1, 1999
@@ -42,7 +42,6 @@
 .Nm chdir ,
 .Nm command ,
 .Nm continue ,
-.Nm cwd ,
 .Nm default ,
 .Nm dirs ,
 .Nm do ,
@@ -151,14 +150,9 @@
 $BB>$N%7%'%k$N%f!<%6$O!"(B
 $B$=$N%7%'%k$H6&$KDs6!$5$l$kJ8=q$r;2>H$9$kI,MW$,$"$k$G$7$g$&!#(B
 .Bl -column "continueXX" "ExternalXX" "csh(1)" "sh(1)" -offset indent
-.\"
-.\" XXX:
-.\" The correct table header here can not be rendered with mdoc's current
-.\" argument maximum.  When mdoc can handle sufficient arguments, the
-.\" correct table header will be as follows:
-.\" .It Em Command Ta Em External Ta Xr csh 1 Ta Xr sh 1
-.\"
-.It Em $B%3%^%s%I(B	$B30It(B	csh	sh
+.It Xo
+.Em $B%3%^%s%I(B	$B30It(B Ta Xo
+.Xc Xc Xr csh 1 Ta Xr sh 1
 .It Ic alias Ta \&No Ta Yes Ta Yes
 .It Ic alloc Ta \&No Ta Yes Ta \&No
 .It Ic bg Ta \&No Ta Yes Ta Yes
@@ -169,7 +163,6 @@
 .It Ic chdir Ta \&No Ta Yes Ta \&No
 .It Ic command Ta \&No Ta \&No Ta Yes
 .It Ic continue Ta \&No Ta Yes Ta \&No
-.It Ic cwd Ta \&No Ta Yes Ta \&No
 .It Ic default Ta \&No Ta Yes Ta \&No
 .It Ic dirs Ta \&No Ta Yes Ta \&No
 .It Ic do Ta \&No Ta \&No Ta Yes
diff -ur man/man1/cat.1 man/man1/cat.1
--- man/man1/cat.1	Tue Feb 15 23:34:49 2000
+++ man/man1/cat.1	Wed Jul  5 09:34:44 2000
@@ -33,25 +33,30 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" %FreeBSD: src/bin/cat/cat.1,v 1.10 1999/08/27 23:13:32 peter Exp %
+.\" %FreeBSD: src/bin/cat/cat.1,v 1.10.2.3 2000/06/30 23:02:12 ps Exp %
 .\"
 .\" jpman %Id: cat.1,v 1.3 1997/08/31 14:09:30 horikawa Stab %
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
-.Os BSD 3
+.Os
 .Sh $BL>>N(B
 .Nm cat
 .Nd $B%U%!%$%k$NO"7k!"I=<($r9T$&(B
 .Sh $B=q<0(B
 .Nm cat
 .Op Fl benstuv
-.Op Fl
 .Op Ar
 .Sh $B2r@b(B
 .Nm
 $B$O%U%!%$%k$rO"B3E*$KFI$_9~$_!"I8=`=PNO$K=q$-=P$7$^$9!#(B
 .Ar file
+$B$,C10l$N%@%C%7%e(B
+.Pq Sq \&-
+$B$^$?$OB8:_$7$J$$>l9g!"(B
+.Nm
+$B$OI8=`F~NO$+$iFI$_9~$_$^$9!#(B
+.Ar file
 $B$O%3%^%s%I%i%$%s$K5-=R$5$l$?=gHV$G=hM}$5$l$^$9!#(B
 ``-'' $B$OI8=`F~NO$rI=$7$^$9!#(B
 .Pp
@@ -96,24 +101,88 @@
 .Nm
 $B$O<B9T$K@.8y$9$k$H(B 0 $B$rJV$7!"%(%i!<$,5/$3$k$H(B 0 $B$h$j(B
 $BBg$-$JCM$rJV$7$^$9!#(B
-.Sh $B%P%0(B
-$B%7%'%k$N=PNO%j%@%$%l%/%H$N%a%+%K%:%`$,860x$G!"(B
-.Dq Li cat file1 file2 > file1
-$B$O(B file1 $B$K:G=i$KF~$C$F$$$k%G!<%?$r>C5n$7$F$7$^$$$^$9(B!
+.Sh $B;HMQNc(B
+$B%3%^%s%I(B
+.Bd -literal -offset indent
+.Ic cat file1
+.Ed
+.Pp
+$B$O!"(B
+.Ar file1
+$B$NFbMF$rI8=`=PNO$XI=<($7$^$9!#(B
+.Pp
+$B%3%^%s%I(B
+.Bd -literal -offset indent
+.Ic cat file1 file2 > file3
+.Ed
+.Pp
+$B$O!"(B
+.Ar file1
+$B$H(B
+.Ar file2
+$B$NFbMF$r(B
+.Ar file3
+$B$X=gHV$KI=<($7$^$9!#(B
+.Ar file3
+$B$,4{$KB8:_$9$k>l9g$K$O$3$l$r@Z$j5M$a$^$9!#(B
+$B%j%@%$%l%/%H$K$D$$$F$N99$J$k>pJs$O!"%7%'%k(B ($B$9$J$o$A(B
+.Xr sh 1 )
+$B$N%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+$B%3%^%s%I(B
+.Bd -literal -offset indent
+.Ic cat file1 - file2 - file3
+.Ed
+.Pp
+$B$O!"(B
+.Ar file1
+$B$NFbMF$rI=<($7!"I8=`F~NO$+$i(B
+.Dv EOF
+.Pq Sq ^D
+$BJ8;z$r<u$1<h$k$^$G$K<u$1<h$C$?%G!<%?$rI=<($7!"(B
+.Ar file2
+$B$NFbMF$rI=<($7!":FEYI8=`F~NO$+$iFI<h$C$?FbMF$r=PNO$7!"(B
+$B:G8e$K(B
+.Ar file3
+$B$NFbMF$r=PNO$7$^$9!#(B
+$BI8=`F~NO$,%U%!%$%k$r;2>H$7$F$$$k>l9g!"(B
+$B%3%^%s%I%i%$%s>e$N(B 2 $BHVL\$N%@%C%7%e$O8z2L$,$J$/$J$k$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B:G=i$N(B
+.Ql \&-
+$B$K$*$$$F!"%U%!%$%k$NFbMFA4BN$,!"(B
+.Nm
+$B$K$h$C$F4{$KFI$_<h$i$l$FI=<($5$l$F$7$^$C$?$+$i$G$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr head 1 ,
 .Xr more 1 ,
 .Xr pr 1 ,
+.Xr sh 1 ,
 .Xr tail 1 ,
-.Xr vis 1
+.Xr vis 1 ,
+.Xr setbuf 3
 .Rs
 .%A Rob Pike
 .%T "UNIX Style, or cat -v Considered Harmful"
 .%J "USENIX Summer Conference Proceedings"
 .%D 1983
 .Re
+.Sh $BI8=`(B
+.Nm
+$B%f!<%F%#%j%F%#$O(B
+.St -p1003.2-92
+$B;EMM$K=`5r$7$F$$$^$9!#(B
+.Pp
+$B%U%i%0(B
+.Op Fl benstv
+$B$O$3$N;EMM$KBP$9$k3HD%$G$9!#(B
 .Sh $BNr;K(B
 .Nm
-$B$O(B Version 1 AT&T UNIX $B$+$iEP>l$7$^$7$?!#(B
+$B%f!<%F%#%j%F%#$O(B
+.At v1
+$B$+$iEP>l$7$^$7$?!#(B
 .An Dennis Ritchie
 $B$,%^%K%e%"%k$N=iHG$r%G%6%$%s$7!"<9I.$7$^$7$?!#(B
+.Sh $B%P%0(B
+$B%7%'%k$N=PNO%j%@%$%l%/%H$N%a%+%K%:%`$,860x$G!"(B
+.Dq Li cat file1 file2 > file1
+$B$O(B file1 $B$K:G=i$KF~$C$F$$$k%G!<%?$r>C5n$7$F$7$^$$$^$9(B!
diff -ur man/man1/cdcontrol.1 man/man1/cdcontrol.1
--- man/man1/cdcontrol.1	Wed Jun 14 22:42:07 2000
+++ man/man1/cdcontrol.1	Wed Jul  5 09:34:46 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.21 2000/03/02 14:53:34 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.21.2.1 2000/06/29 23:49:28 ps Exp %
 .\" jpman %Id: cdcontrol.1,v 1.3 1997/07/22 09:20:03 mutoh Stab %
 .\"
 .Dd July 3, 1995
@@ -164,10 +164,10 @@
 $B%W%m%0%i%`$r=*N;$7$^$9!#(B
 
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /dev/rmcd0c -compact
-.It Pa /dev/rcd0c
-.It Pa /dev/rmcd0c
-.It Pa /dev/rwcd0c
+.Bl -tag -width /dev/mcd0c -compact
+.It Pa /dev/cd0c
+.It Pa /dev/mcd0c
+.It Pa /dev/acd0c
 .El
 .Sh $B:n<T(B
 .An Jean-Marc Zucconi ,
diff -ur man/man1/chflags.1 man/man1/chflags.1
--- man/man1/chflags.1	Tue Feb 15 23:34:49 2000
+++ man/man1/chflags.1	Wed Jul  5 09:34:48 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.9 1999/11/21 16:11:56 charnier Exp %
+.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.9.2.1 2000/04/03 22:12:15 jdp Exp %
 .\" jpman %Id: chflags.1,v 1.3 1997/06/18 14:15:48 jsakai Stab %
 .\"
 .Dd May 2, 1995
@@ -75,7 +75,7 @@
 $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!"(B8 $B?J?t$+!"%-!<%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)
diff -ur man/man1/cmp.1 man/man1/cmp.1
--- man/man1/cmp.1	Tue Feb 15 23:34:49 2000
+++ man/man1/cmp.1	Wed Jul  5 09:34:49 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/cmp/cmp.1,v 1.7 1999/08/28 00:59:40 peter Exp %
+.\" %FreeBSD: src/usr.bin/cmp/cmp.1,v 1.7.2.1 2000/07/02 09:28:36 ps Exp %
 .\" jpman %Id: cmp.1,v 1.2 1997/03/26 15:40:44 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -62,10 +62,14 @@
 .Bl -tag -width Ds
 .It Fl l
 $BA4$F$N0c$$$KBP$7!"(B
-$B0c$$$N$"$C$?>l=j$N%U%!%$%k@hF,$+$i$N%P%$%H0LCV(B (10$B?J?tI=8=(B) $B$H!"(B
-$B3F!9$N%U%!%$%kCf$NCM(B (8$B?J?tI=8=(B) $B$rI=<($7$^$9!#(B
+$B0c$$$N$"$C$?>l=j$N%U%!%$%k@hF,$+$i$N%P%$%H0LCV(B (10 $B?J?tI=8=(B) $B$H!"(B
+$B3F!9$N%U%!%$%kCf$NCM(B (8 $B?J?tI=8=(B) $B$rI=<($7$^$9!#(B
 .It Fl s
 $B2?$bI=<($7$J$$$h$&$K$7$^$9!#7k2L$O=*N;%3!<%I$K$N$_H?1G$5$l$^$9!#(B
+.It Fl x
+.Fl l
+$B$H;w$F$$$^$9$,!"(B16 $B?J?t$GI=<($7!"(B
+$B%U%!%$%k$N:G=i$N%P%$%H$KBP$7$F(B 0 $B$r%$%s%G%C%/%9$H$7$F;HMQ$7$^$9!#(B
 .El
 .Pp
 .Ar file1
diff -ur man/man1/col.1 man/man1/col.1
--- man/man1/col.1	Tue Feb 15 23:34:49 2000
+++ man/man1/col.1	Wed Jul  5 09:34:50 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
-.\" %FreeBSD: src/usr.bin/col/col.1,v 1.4 1999/08/28 00:59:41 peter Exp %
+.\" %FreeBSD: src/usr.bin/col/col.1,v 1.4.2.1 2000/07/02 09:34:27 ps Exp %
 .\" jpman %Id: col.1,v 1.3 1997/07/22 09:21:29 mutoh Stab %
 .\"
 .Dd June 29, 1993
@@ -60,7 +60,7 @@
 $B$OI8=`F~NO$rFI$_9~$_!"I8=`=PNO$K=PNO$7$^$9!#(B
 .Pp
 $B%*%W%7%g%s$K$O0J2<$N$b$N$,$"$j$^$9!#(B
-.Bl -tag -width "-l num  "
+.Bl -tag -width indent 
 .It Fl b
 $B%P%C%/%9%Z!<%9$r=PNO$;$:!"3F7e$N0LCV$K:G8e$K=q$+$l$?J8;z$@$1$r(B
 $BI=<($7$^$9!#(B
@@ -76,7 +76,7 @@
 $B%G%U%)%k%H$G(B 128 $B9T$^$G%P%C%U%!%j%s%0$5$l$^$9!#(B
 .El
 .Pp
-.Nm col
+.Nm
 $B$,M}2r$G$-$kI|5"F0:n$N@)8fJ8;z$H$=$N(B 10 $B?JCM$N0lMw$r0J2<$NI=$K<($7$^$9!#(B
 .Pp
 .Bl -tag -width "carriage return" -compact
@@ -106,19 +106,19 @@
 .Pp
 $BG'<1$G$-$J$$$9$Y$F$N@)8fJ8;z$H%(%9%1!<%W%7!<%1%s%9$O<N$F$i$l$^$9!#(B
 .Pp
-.Nm col
+.Nm
 $B$O!"FI$_9~$^$l$?DL$j$KJ8;z%;%C%H$N0\$jJQ$o$j$r5-21$7!"(B
 $B=PNO;~$KJ8;z%;%C%H$,@5$7$/$J$k$h$&$K$7$^$9!#(B
 .Pp
 $BF~NO$,:G8e$KI=<($5$l$?9T$KLa$m$&$H$9$k$H!"(B
-.Nm col
+.Nm
 $B$O7Y9p%a%C%;!<%8$rI=<($7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr expand 1 ,
 .Xr nroff 1 ,
 .Xr tbl 1
 .Sh $BNr;K(B
-.Nm col
+.Nm
 $B%3%^%s%I$O(B
 .At v6
 $B$+$iEP>l$7$^$7$?!#(B
diff -ur man/man1/column.1 man/man1/column.1
--- man/man1/column.1	Tue Feb 15 23:34:50 2000
+++ man/man1/column.1	Wed Jul  5 09:34:52 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/column/column.1,v 1.5 1999/08/28 00:59:52 peter Exp %
+.\" %FreeBSD: src/usr.bin/column/column.1,v 1.5.2.1 2000/06/30 09:51:44 ps Exp %
 .\" jpman %Id: column.1,v 1.2 1997/05/17 15:57:10 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -46,7 +46,7 @@
 .Op Fl s Ar sep
 .Op Ar
 .Sh $B2r@b(B
-.Nm column
+.Nm
 $B$O!"F~NO$rJ#?t%+%i%`$KJ,$1$F@07A$7$^$9!#(B
 $BNs$h$j@h$K9T$rKd$a$^$9!#(B
 .Ar file
@@ -55,7 +55,7 @@
 $B$r!";XDj$5$l$F$$$J$1$l$PI8=`F~NO$r=hM}$7$^$9!#6u9T$OL5;k$5$l$^$9!#(B
 .Pp
 $B%*%W%7%g%s(B:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c
 $BI=<($NI}$r(B
 .Ar columns
@@ -73,9 +73,9 @@
 .It Fl x
 $B9T$rKd$a$kA0$KNs$rKd$a$^$9!#(B
 .El
-.Pp
-.Nm column
-$B$O!"@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+.Sh $B?GCG(B
+.Nm
+$B$O!"@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B4D6-JQ?t(B
 .Bl -tag -width COLUMNS
 .It Ev COLUMNS
diff -ur man/man1/compress.1 man/man1/compress.1
--- man/man1/compress.1	Tue Feb 15 23:34:50 2000
+++ man/man1/compress.1	Wed Jul  5 09:34:54 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/compress/compress.1,v 1.4 1999/08/28 00:59:55 peter Exp %
+.\" %FreeBSD: src/usr.bin/compress/compress.1,v 1.4.2.1 2000/06/30 09:51:45 ps Exp %
 .\" jpman %Id: compress.1,v 1.2 1997/04/03 02:01:53 mutoh Stab %
 .\"
 .Dd April 18, 1994
@@ -56,7 +56,7 @@
 .Nm zcat
 .Op Ar
 .Sh $B2r@b(B
-.Nm compress
+.Nm
 $B$O(B adaptive Lempel-Ziv $BK!$rMQ$$$F!"%U%!%$%k$r05=L$7$^$9!#(B
 $B8D!9$N05=L$5$l$?(B
 .Ar file
@@ -93,7 +93,7 @@
 $BF~NO%U%!%$%k$O:o=|$5$l$:!"$^$?F~NO%U%!%$%k$NB0@-$O0z$-7Q$,$l$^$;$s!#(B
 .Pp
 $B%*%W%7%g%s$O0J2<$N$b$N$,$"$j$^$9(B:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl b
 .Ar bits
 $B%3!<%I$N>e8BCM$r;XDj$7$^$9(B($B0J2<$r;2>H(B)$B!#(B
@@ -108,7 +108,7 @@
 $B05=L8e!"%U%!%$%k%5%$%:$,$I$l$@$18:$C$?$+$r%Q!<%;%s%HI=<($7$^$9!#(B
 .El
 .Pp
-.Nm compress
+.Nm
 $B$O(B Lempel-Ziv$B=$@5%"%k%4%j%:%`$r;HMQ$7$^$9!#(B
 $B%U%!%$%kFb$N=EJ#$9$kItJ,J8;zNs$O!"$^$:!"(B257 $B0J>e$N(B 9$B%S%C%H%3!<%I$K(B
 $BCV$-49$($i$l$^$9!#%3!<%I$,(B 512 $B$KC#$9$k$H!"%"%k%4%j%:%`$O(B
@@ -121,13 +121,13 @@
 .Pp
 .Ar bits
 $B$N>e8B$KC#$9$k$H!"(B
-.Nm compress
+.Nm
 $B$O05=LN($rDj4|E*$K%A%'%C%/$7$^$9!#(B
 $B05=LN($,>e$,$C$F$$$k$H$-!"(B
-.Nm compress
+.Nm
 $B$O4{B8$N%3!<%I<-=q$r;H$$B3$1$^$9$,!"(B
 $B05=LN($,2<$,$C$?$H$-$O(B
-.Nm compress
+.Nm
 $B$O!"ItJ,J8;zNs$N%F!<%V%k$rGK4~$7!":G=i$+$i%F!<%V%k$r:n$jD>$7$^$9!#(B
 $B$3$&$7$F!"%"%k%4%j%:%`$r%U%!%$%k$N<!$N(B "block" $B$XE,MQ$7$F$$$/$3$H$,(B
 $B$G$-$^$9!#(B
@@ -149,8 +149,8 @@
 $B0lHLE*$K(B (pack$B%3%^%s%I$G;H$o$l$F$$$k(B) Huffman$BK!!"$^$?$O(B
 (compact$B%3%^%s%I$G;H$o$l$F$$$k(B)$B:GE,2=(BHuffman$BK!$h$C$FF@$i$l$k$h$j!"05=L(B
 $B$ONI$/!"7W;;;~4V$b$+$+$j$^$;$s!#(B
-.Pp
-.Nm compress
+.Sh $B?GCG(B
+.Nm
 $B%f!<%F%#%j%F%#$O@5>o=*N;;~$K$O(B 0 $B$r!"%(%i!<=*N;;~$K$O(B 0 $B$h$jBg$-$$CM$r(B
 $BJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
diff -ur man/man1/date.1 man/man1/date.1
--- man/man1/date.1	Wed Jun 14 22:42:07 2000
+++ man/man1/date.1	Wed Jul  5 09:34:56 2000
@@ -1,4 +1,3 @@
-
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -34,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\" %FreeBSD: src/bin/date/date.1,v 1.34 2000/03/07 20:54:17 sheldonh Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.34.2.2 2000/05/28 13:05:44 asmodai Exp %
 .\"
 .\" jpman %Id: date.1,v 1.2 1997/03/31 23:25:55 mutoh Stab %
 .Dd November 17, 1993
@@ -45,22 +44,13 @@
 .Nd $BF|IU$H;~9o$NI=<(!"@_Dj(B
 .Sh $B=q<0(B
 .Nm date
-.Op Fl jnu
+.Op Fl nu
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
 .Op Fl t Ar minutes_west
-.Oo
-.Fl v
-.Op +|- Ns
-.No val Ns Op ymwdHMS
-.Oc Ns ...
-.Oo Fl f No " "
-.Ar fmt date No |
-.Oo Oo Oo Oo Oo "\&cc" Ns
-.Oc "\&yy" Oc "\&mm" Oc "\&dd" Oc "\&HH" Ns
-.Oc
-.No "\&MM" Ns Op "\&.ss"
-.Oc
+.Op Fl v Ns Ar [+|-]val Ns Op ymwdHMS
+.Ar ...
+.Op Fl f Ar fmt Ar date | [[[[[cc]yy]mm]dd]HH]MM[\&.ss]
 .Op Cm + Ns Ar format
 .Sh $B2r@b(B
 $B0z?t$J$7$G<B9T$9$k$H!"(B
@@ -82,24 +72,12 @@
 $B$K(B 0 $B0J30$NCM$,JV$j$^$9!#(B
 .It Fl f
 $B%G%U%)%k%H$N(B
-.\" .Ar [[[[[cc]yy]mm]dd]HH]MM[.ss]
-.Xo
-.Oo Oo Oo Oo Oo "\&cc" Ns
-.Oc "\&yy" Oc "\&mm" Oc "\&dd" Oc "\&HH" Ns
-.Oc
-.No "\&MM" Ns Op "\&.ss" Xc
+.Ar [[[[yy]mm]dd]HH]MM[.ss]
 $B%U%)!<%^%C%H$NBe$j$K(B
 .Ar fmt
 $B$r!";~9o$r%Q!<%:$9$k%U%)!<%^%C%H$H$7$F;HMQ$7$^$9!#(B
 .Xr strptime 3
 $B$r;HMQ$7$F%Q!<%:$7$^$9!#(B
-.It Fl j
-$B;~9o$r@_Dj$7$h$&$H$7$^$;$s!#(B
-.Fl f
-$B%U%i%0$r(B
-.Cm +
-$B%*%W%7%g%s$K2C$($F;HMQ$9$k$3$H$K$h$j!"(B
-$B$"$k;~9o=q<0$rB>$N=q<0$KJQ992DG=$H$7$^$9!#(B
 .It Fl n
 .Xr timed 8
 $B$rMxMQ$7$F!"%0%k!<%WFb$N%^%7%s4V$G;~7W$rF14|$5$;$^$9!#(B
@@ -112,7 +90,7 @@
 .It Fl r
 $B4p=`;~E@(B
 .Po
-00:00:00 UTC, January 1, 1970;
+1970 $BG/(B 1 $B7n(B 1 $BF|(B 00:00:00; 
 .Xr time 3
 $B;2>H(B
 .Pc
@@ -129,8 +107,7 @@
 $B$KF~$j$^$9!#(B
 .It Fl u
 .Tn UTC
-.Pq $B6(Dj@$3&;~(B
-$B$NF|IU$rI=<(!"@_Dj$7$^$9!#(B
+($B6(Dj@$3&;~(B) $B$NF|IU$rI=<(!"@_Dj$7$^$9!#(B
 .\"	$BLuCm(B(Mar.1996):UTC (Universal Time Coordinate)
 .It Fl v
 $BIC!"J,!";~!"F|!"MKF|!"7n!"G/$N$$$:$l$+$r(B
@@ -143,12 +120,12 @@
 $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 
-.Pq Sun-Sat
-$B!"7n$NHO0O$O(B 1-12
-.Pq Jan-Dec
-$B!"G/$NHO0O$O(B 80-38 $B$b$7$/$O(B 1980-2038 $B$G$9!#(B
+(Sun-Sat)$B!"7n$NHO0O$O(B 1-12 (Jan-Dec)$B!"(B
+$BG/$NHO0O$O(B 80-38 $B$b$7$/$O(B 1980-2038 $B$G$9!#(B
 .Pp
 .Ar val
 $B$,?tCM$N>l9g!"(B
@@ -162,22 +139,35 @@
 $B$N$$$:$l$+$r;HMQ$7$F!";~9o$N$I$NItJ,$r=$@5$9$k$N$+$r;XDj$9$kI,MW$,$"$j$^$9!#(B
 .Pp
 $BMKF|$b$7$/$O7n$O?tCM$NBe$j$KL>A0$G;XDj2DG=$G$9!#(B
-$BL>A0$H6&$K%W%i%9(B
-.Pq $B$b$7$/$O%^%$%J%9(B
-$B5-9f$r;HMQ$7$?>l9g!"(B
-$BF|IU$OE,9g$9$k<!$N(B
-.Pq $BA0$N(B
-$BMKF|$b$7$/$O7n$K?J$_$^$9(B
-.Pq $BLa$j$^$9(B
-$B!#(B
+$BL>A0$H6&$K%W%i%9(B ($B$b$7$/$O%^%$%J%9(B) $B5-9f$r;HMQ$7$?>l9g!"(B
+$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
-$B%W%i%9(B
-.Pq Dq \&+
-$B$G;O$^$k%*%W%7%g%s$O!"F|IU$H;~9o$NI=<(J}K!$r;XDj$9$k(B
+$B%W%i%9(B (``+'') $B$G;O$^$k%*%W%7%g%s$O!"F|IU$H;~9o$NI=<(J}K!$r;XDj$9$k(B
 $B%U%)!<%^%C%HJ8;zNs$G$9!#%U%)!<%^%C%HJ8;zNs$K$O!"(B
 .Xr strftime 3
 $B$G5-=R$5$l$F$$$k$h$&$JJQ49J8;zNs$H!"G$0U$N%F%-%9%H$r4^$`$3$H$,$G$-$^$9!#(B
@@ -186,26 +176,21 @@
 .Nm
 $B$N%G%U%)%k%H$NI=<(7A<0$O!"(B
 .Bd -literal -offset indent
-.Dq +%+
+``+%+''
 .Ed
 .Pp
 $B$H$7$?$b$N$HF1$8$G$9!#(B
 .Pp
-$B$b$7!"0z?t$,(B
-.Dq \&+
-$B5-9f$G;O$^$kJ8;zNs$G$J$1$l$P!"$=$l$O%7%9%F%`$K(B
+$B$b$7!"0z?t$,(B ``+'' $B5-9f$G;O$^$kJ8;zNs$G$J$1$l$P!"$=$l$O%7%9%F%`$K(B
 $BF|;~$r@_Dj$9$k$?$a$NCM$H2r<a$5$l$^$9!#F|;~$r@_Dj$9$k$?$a$N@5<0$J(B
 $BI=8=$O0J2<$N$H$*$j$G$9(B:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
 .It Ar cc
-$B@$5*(B
-.Pq 19 $B$^$?$O(B 20 $B$N$$$:$l$+(B
-$B$G$"$j!"@>Nq$N>JN,I=8=$NA0$KIU$-$^$9!#(B
+$B@$5*(B (19 $B$^$?$O(B 20 $B$N$$$:$l$+(B) $B$G$"$j!"@>Nq$N>JN,I=8=$NA0$KIU$-$^$9!#(B
 .It Ar yy
 $B@>Nq$N>JN,I=8=$G$9!#@>Nq$N(B 10 $B$N0L$H(B 1 $B$N0L$G$9(B
-.Pq 1989 $BG/$J$i(B 89$B!"(B06 $B$J$i(B 2006
-$B!#(B
+(1989 $BG/$J$i(B 89$B!"(B06 $B$J$i(B 2006)$B!#(B
 .It Ar mm
 $B7n$N?t;zI=8=$G$9!#(B1 $B$+$i(B 12 $B$^$G$N?t;z$G$9!#(B
 .It Ar dd
@@ -215,9 +200,7 @@
 .It Ar MM
 $BJ,$G$9!#(B0 $B$+$i(B 59 $B$^$G$N?t;z$G$9!#(B
 .It Ar .ss
-$BIC$G$9!#(B0 $B$+$i(B 61 $B$^$G$N?t;z$G$9(B
-.Pq 59 $BIC(B + 2 $BIC$^$G$N$&$k$&IC(B
-$B!#(B
+$BIC$G$9!#(B0 $B$+$i(B 61 $B$^$G$N?t;z$G$9!#(B (59 $BIC(B + 2 $BIC$^$G$N$&$k$&IC(B)
 .El
 .Pp
 $BJ,$N;XDj0J30$O$9$Y$F>JN,2DG=$G$9!#(B
@@ -247,7 +230,7 @@
 Sun Jan  4 03:15:24 GMT 1998
 .Ed
 .Pp
-$B8=:_(B Mon Aug  4 04:15:24 BST 1997 $B$N>l9g!#(B
+($B8=:_(B Mon Aug  4 04:15:24 BST 1997 $B$N>l9g(B)$B!#(B
 .Pp
 $B0J2<$N%3%^%s%I(B:
 .Bd -literal -offset indent
@@ -269,7 +252,7 @@
 Fri Aug 29 04:31:11 BST 1997
 .Ed
 .Pp
-$B8=:_(B Mon Aug  4 04:31:11 BST 1997 $B$N>l9g!#(B
+($B8=:_(B Mon Aug  4 04:31:11 BST 1997 $B$N>l9g(B)$B!#(B
 .Pp
 $B0J2<$N%3%^%s%I(B:
 .Bd -literal -offset indent
@@ -277,7 +260,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:
@@ -341,6 +325,22 @@
 $B$H$N4V$GDL?.$K<:GT$7$?>l9g$O!"(B
 .Ql Communication error with timed
 $B$,I=<($5$l$^$9!#(B
+.Sh $B%P%0(B
+$B%7%9%F%`$O(B
+.Tn VMS
+$B$H9b$$8_49@-$r;}$D%U%)!<%^%C%H$GF|;~$rJ];}$7$h$&$H$7$F$$$^$9!#$7$+$7!"(B
+.Tn VMS
+$B$O(B
+.Tn GMT
+$B$G$O$J$/%m!<%+%k$J;~9o$r;H$C$F$*$j!"2F;~4V$rM}2r$7$^$;$s!#$=$N$?$a!"(B
+.Tn UNIX
+$B$H(B
+.Tn VMS
+$B$rF1;~$K;H$&>l9g$O!"(B
+.Tn VMS
+$B$r(B
+.Tn GMT
+$B$G;H$&$Y$-$G$7$g$&!#(B
 .Sh $B5,3J(B
 .Nm
 $B%3%^%s%I$O(B
diff -ur man/man1/df.1 man/man1/df.1
--- man/man1/df.1	Tue Feb 15 23:34:50 2000
+++ man/man1/df.1	Wed Jul  5 09:34:57 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" %FreeBSD: src/bin/df/df.1,v 1.18 1999/12/15 03:44:08 mharo Exp %
+.\" %FreeBSD: src/bin/df/df.1,v 1.18.2.2 2000/07/01 03:02:08 ps Exp %
 .\"
 .\" jpman %Id: df.1,v 1.2 1997/04/07 05:31:08 mutoh Stab %
 .Dd May 8, 1995
@@ -41,7 +41,10 @@
 .Nd $B%G%#%9%/$N6u$-NN0hEy$NI=<((B
 .Sh $B=q<0(B
 .Nm df
-.Op Fl b | h | H | k | m | P
+.Oo
+.Fl b | h | H | k |
+.Fl m | P
+.Oc
 .Op Fl ain
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
@@ -74,6 +77,11 @@
 $BA4%^%&%s%H%]%$%s%H$rI=<($7$^$9!#(B
 .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 g
+$B%G%U%)%k%HCM$G$J$/(B 1073741824 $B%P%$%H(B (1 G $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
diff -ur man/man1/doscmd.1 man/man1/doscmd.1
--- man/man1/doscmd.1	Tue Feb 15 23:34:57 2000
+++ man/man1/doscmd.1	Wed Jul  5 09:35:00 2000
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI doscmd.1,v 2.3 1996/04/08 19:32:29 bostic Exp
-.\" %FreeBSD: src/usr.bin/doscmd/doscmd.1,v 1.12 1999/10/13 23:48:34 imp Exp %
+.\" %FreeBSD: src/usr.bin/doscmd/doscmd.1,v 1.12.2.2 2000/06/30 11:06:16 tg Exp %
 .\"
 .\" jpman %Id: doscmd.1,v 1.3 1998/10/13 21:31:33 vanitas Stab %
 .\" WORD: raw file	$B%m%&%U%!%$%k(B (mknod.8 $B$K$h$k$H(B character special file)
@@ -513,7 +513,20 @@
 $B$N%G%U%)%k%H$G$7$?(B) $B$KJQ99$9$k$K$O!"CM(B
 .Cm 320
 $B$r;HMQ$7$F$/$@$5$$!#(B
-.El
+.It Cm X11_FONT
+$B$3$NJQ?t$NCM$O(B X window $B$G;HMQ$9$k%U%)%s%H$r7hDj$7$^$9!#(B
+$B%G%U%)%k%H$N%U%)%s%H$O(B
+.Cm vga
+$B$G$"$j(B
+.Pa /usr/libdata/doscmd/fonts
+$B$K%$%s%9%H!<%k$5$l$F$$$^$9!#(B
+X $B%5!<%P$,%U%)%s%H$r8+IU$1$i$l$k$h$&$K(B
+.Ql xset fp+ /usr/libdata/doscmd/fonts
+$B$r(B
+.Pa ${HOME}/.xsession
+$B$+(B
+.Pa ${HOME}/.xinitrc
+$B$KDI2C$7$F$/$@$5$$!#(B
 .Sh $B%U%!%$%kJQ49(B
 .Nm
 $B$O(B
@@ -601,8 +614,8 @@
 .Pa .doscmdrc
 $B$r:n@.$7$^$9(B:
 .Bd -literal -offset indent
-assign A: /dev/rfd0.1440 1440
-assign A: /dev/rfd0.720 720
+assign A: /dev/fd0.1440 1440
+assign A: /dev/fd0.720 720
 assign hard boot_drive 80 2 2
 .Ed
 .Pp
diff -ur man/man1/du.1 man/man1/du.1
--- man/man1/du.1	Wed Jun 14 22:42:07 2000
+++ man/man1/du.1	Wed Jul  5 09: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.15 2000/03/02 14:53:29 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/du/du.1,v 1.15.2.1 2000/07/02 10:45:29 ps Exp %
 .\" jpman %Id: du.1,v 1.3 1997/06/18 16:43:08 horikawa Stab %
 .\"
 .Dd April 1, 1994
@@ -46,9 +46,9 @@
 .Op Fl c
 .Op Fl h | k
 .Op Fl x
-.Op Ar file ...
+.Op Ar
 .Sh $B2r@b(B
-.Nm du
+.Nm
 $B%f!<%F%#%j%F%#$O!"0z?t$K;XDj$5$l$?3F%U%!%$%k!"$*$h$S(B
 $B0z?t$K;XDj$5$l$?3F%G%#%l%/%H%j$r:,$H$9$k%U%!%$%k3,AXFb$K$"$k(B
 $B3F%G%#%l%/%H%jFb$N%G%#%9%/;HMQE}7W$r%V%m%C%/C10L$GI=<($7$^$9!#(B
@@ -62,7 +62,7 @@
 $BC<?t$H$J$k%V%m%C%/?t$O@Z$j>e$2$i$l$^$9!#(B
 .Pp
 $B%*%W%7%g%s$O0J2<$NDL$j$G$9(B:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl P
 $B%7%s%\%j%C%/%j%s%/$rA4$/$?$I$j$^$;$s!#(B($B%G%U%)%k%H(B)
 .It Fl H
@@ -98,7 +98,7 @@
 $B%U%!%$%k%7%9%F%`%^%&%s%H%]%$%s%H$O$?$I$j$^$;$s!#(B
 .El
 .Pp
-.Nm du
+.Nm
 $B$O!"(B
 .Fl H
 $B$b$7$/$O(B
@@ -115,7 +115,7 @@
 $B%j%s%/$NBg$-$5$O?t$($i$l$:!"$^$?I=<($b$5$l$^$;$s!#(B
 .Pp
 $BJ#?t$N%O!<%I%j%s%/$r;}$D%U%!%$%k$O!"(B
-.Nm du
+.Nm
 $B$N<B9TCf!"(B1 $B2s$7$+?t$($i$l$:!"(B1 $B2s$7$+I=<($5$l$^$;$s!#(B
 .Sh $B4D6-JQ?t(B
 .Bl -tag -width BLOCKSIZE
@@ -137,7 +137,7 @@
 .Xr symlink 7 ,
 .Xr quot 8
 .Sh $BNr;K(B
-.Nm du
+.Nm
 $B%3%^%s%I$O!"(B
 .At v1
 $B$GEP>l$7$^$7$?!#(B
diff -ur man/man1/ed.1 man/man1/ed.1
--- man/man1/ed.1	Wed Jun 14 22:42:07 2000
+++ man/man1/ed.1	Wed Jul  5 09:35:05 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/bin/ed/ed.1,v 1.17 2000/03/01 10:43:03 sheldonh Exp %
+.\" %FreeBSD: src/bin/ed/ed.1,v 1.17.2.1 2000/05/10 09:53:26 sheldonh Exp %
 .\" jpman %Id: ed.1,v 1.2 1997/06/09 15:03:56 jsakai Stab %
 .Dd May 21, 1993
 .Dt ED 1
@@ -818,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/expand.1 man/man1/expand.1
--- man/man1/expand.1	Tue Feb 15 23:34:50 2000
+++ man/man1/expand.1	Wed Jul  5 09:35:06 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)error.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/expand/expand.1,v 1.3 1999/08/28 01:00:44 peter Exp %
+.\" %FreeBSD: src/usr.bin/expand/expand.1,v 1.3.2.1 2000/07/02 11:19:29 ps Exp %
 .\" jpman %Id: expand.1,v 1.2 1997/04/03 02:16:14 mutoh Stab %
 .\"
 .Dd June 6, 1993
@@ -43,18 +43,18 @@
 .Sh $B=q<0(B
 .Nm expand
 .Op Fl Ns Ar tabstop
-.Op Fl Ns Ar tab1,tab2,...,tabn
-.Ar
+.Op Fl t Ar tab1,tab2,...,tabn
+.Op Ar
 .Nm unexpand
 .Op Fl a
-.Ar
+.Op Ar
 .Sh $B2r@b(B
-.Nm expand
+.Nm
 $B$O!";XDj$5$l$?%U%!%$%k$^$?$OI8=`F~NO$rFI$_9~$_!"(B
 $B%?%V$r6uGrJ8;z$KJQ49$7$FI8=`=PNO$K=PNO$7$^$9!#(B
 $B%P%C%/%9%Z!<%9J8;z$O$=$N$^$^=PNO$7!"(B
 $BF1;~$K%?%V$N7W;;$KMQ$$$k%+%i%`0LCV%+%&%s%?$r0l$D8:$8$^$9!#(B
-.Nm expand
+.Nm
 $B$O!"(B
 ($B%=!<%H$NA0!"FCDj$N%+%i%`$KCmL\$7$?$$$H$-!"$J$I(B)
 $B%?%V$r4^$s$@%F%-%9%H%U%!%$%k$NA0=hM}MQ$KJXMx$G$9!#(B
@@ -63,7 +63,7 @@
 .\"       $B2r$j$d$9$$$H9M$($^$9$N$G!$;d$bA0$N%P!<%8%g%s$NNc$K$J$i$$$^$9!%(B
 .\" 2.2.1R $BBP>](B(1997/04/03) Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
 $B%*%W%7%g%s$H$7$F$O0J2<$N$b$N$,$"$j$^$9(B:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl t Ar tabstop
 $B%?%VI}$r;XDj$7$^$9!#%G%U%)%k%H$O(B 8 $BJ8;z$G$9!#(B
 .It Fl t Ar tab1,tab2,...,tabn
@@ -79,7 +79,7 @@
 .Pp
 .Nm unexpand
 $B$O!"(B
-.Nm expand
+.Nm
 $B$H$O5U$K!"6uGrJ8;z$r%?%V$KLa$7$^$9!#%G%U%)%k%H$G$O!"(B
 $B9TF,$N6uGrJ8;z$H%?%V$@$1$r!"$G$-$k$@$1D9$$%?%V$NJB$S$KLa$7$^$9!#(B
 .Pp
@@ -90,7 +90,7 @@
 $B%5%$%:$,05=L$5$l$k$h$&$J2U=j$O$9$Y$F%?%V$KCV$-49$($i$l$^$9!#(B
 .El
 .Sh $BNr;K(B
-.Nm expand
+.Nm
 $B%3%^%s%I$O(B
 .Bx 3.0
 $B$+$iEP>l$7$^$7$?!#(B
diff -ur man/man1/fdwrite.1 man/man1/fdwrite.1
--- man/man1/fdwrite.1	Wed Jun 14 22:42:07 2000
+++ man/man1/fdwrite.1	Wed Jul  5 09:35:08 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.12 2000/03/01 14:07:40 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.12.2.1 2000/06/29 23:49:29 ps Exp %
 .\" jpman %Id: fdwrite.1,v 1.4 1997/07/26 21:35:54 horikawa Stab %
 .\"
 .\"
@@ -59,7 +59,7 @@
 .It Fl d Ar device
 $B=q$-9~$`$?$a$N%U%m%C%T%G%P%$%9$NL>A0$G$9!#(B
 $B%G%U%)%k%H$O!"(B
-.Pa /dev/rfd0
+.Pa /dev/fd0
 $B$G$9!#(B
 .El
 
@@ -82,7 +82,7 @@
 $B$=$N$h$&$J;HMQNc$O!"0J2<$N(B tar $B%"!<%+%$%V$N=q$-9~$_$,$"$j$^$9!#(B
 
 .ce 1
-tar cf - . | gzip -9 | fdwrite -d /dev/rfd0.1720 -v
+tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
 
 .Xr tar 1
 $B$N%^%k%A%\%j%e!<%`5!G=$H$N<gMW$J0c$$$O!"(B
diff -ur man/man1/find.1 man/man1/find.1
--- man/man1/find.1	Wed Jun 14 22:42:07 2000
+++ man/man1/find.1	Wed Jul  5 09:35:11 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" %FreeBSD: src/usr.bin/find/find.1,v 1.23 2000/03/01 10:48:32 nik Exp %
+.\" %FreeBSD: src/usr.bin/find/find.1,v 1.23.2.2 2000/06/23 18:38:46 roberto Exp %
 .\"
 .\" jpman %Id: find.1,v 1.4 1997/09/23 14:13:10 horikawa Stab %
 .Dd May 9, 1995
@@ -159,7 +159,7 @@
 .Nm
 $B$O:F5"E*$K%G%#%l%/%H%j%D%j!<$r2<$j$^$9!#(B
 $B%;%-%e%j%F%#>e$NM}M3$+$i!"(B
-"." $B$+$i$NAjBP%Q%9L>$K(B ``/'' $BJ8;z$r4^$`%U%!%$%kL>$N%U%!%$%k$r(B
+\&"." $B$+$i$NAjBP%Q%9L>$K(B ``/'' $BJ8;z$r4^$`%U%!%$%kL>$N%U%!%$%k$r(B
 $B>C5n$7$h$&$H$O$7$^$;$s!#(B
 $B$3$N%*%W%7%g%s$K$h$j0E<(E*$K?<$5M%@h$N=hM}$,;XDj$5$l$^$9!#(B
 .It Ic -exec Ar utility Op argument ... ; 
@@ -227,6 +227,14 @@
 ``->'' $B$N8e$K%j%s%/@h$N%U%!%$%k$N%Q%9L>$rI=<($7$^$9!#(B
 $B%U%)!<%^%C%H$O(B
 ``ls -dgils'' $B$N=PNO7k2L$HF1$8$G$9!#(B
+.It Ic -maxdepth Ar n
+$B8=:_$N%U%!%$%k$N%D%j!<$K$*$1$k?<$5$,(B
+.Ar n
+$B0J2<$G$"$k>l9g!"??$K$J$j$^$9!#(B
+.It Ic -mindepth Ar n
+$B8=:_$N%U%!%$%k$N%D%j!<$K$*$1$k?<$5$,(B
+.Ar n
+$B0J>e$G$"$k>l9g!"??$K$J$j$^$9!#(B
 .It Ic -mmin Ar n 
 $B:G8e$K%U%!%$%k$,=$@5$5$l$?;~9o$H!"(B
 .Nm find
Only in man/man1: flex.1
diff -ur man/man1/fstat.1 man/man1/fstat.1
--- man/man1/fstat.1	Tue Feb 15 23:34:50 2000
+++ man/man1/fstat.1	Wed Jul  5 09:35:13 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
-.\" %FreeBSD: src/usr.bin/fstat/fstat.1,v 1.9 1999/09/06 13:14:24 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/fstat/fstat.1,v 1.9.2.1 2000/07/02 10:28:38 ps Exp %
 .\" jpman %Id: fstat.1,v 1.2 1997/05/20 00:44:48 mutoh Stab %
 .\"
 .Dd February 25, 1994
@@ -42,7 +42,7 @@
 .Pp
 .Sh $B=q<0(B
 .Nm fstat
-.Op Fl fnv
+.Op Fl fmnv
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl p Ar pid
@@ -88,6 +88,9 @@
 $B$N$+$o$j$K(B
 .Ar system
 $B$r;H$$$^$9!#(B
+.It Fl m
+$B%a%b%j%^%C%W$5$l$?%U%!%$%k$r%j%9%H$K4^$a$^$9!#(B
+$B99$J$k=hM}$,I,MW$G$"$k$?$a!"DL>o$O$3$l$i$O=|30$5$l$F$$$^$9!#(B
 .It Fl n
 $B?tCM%U%)!<%^%C%H$GI=<($r9T$$$^$9!#%^%&%s%H%]%$%s%H$NL>A0$rI=<($9$k(B
 $B$+$o$j$K!"$=$N%U%!%$%k%7%9%F%`$K$*$1$k%G%P%$%9HV9f(B ($B%a%8%c!<!"%^%$%J!<(B)
@@ -131,10 +134,11 @@
 $B0J2<$NFCJL$JL>A0$N$I$l$+$G$9!#(B
 .Pp
 .Bd -literal -ragged -offset indent -compact
-text - $B<B9T2DG=%F%-%9%H$N(B inode
-wd - $B8=:_$N%o!<%-%s%0%G%#%l%/%H%j(B
-root - $B%k!<%H$N(B inode
-tr - $B%+!<%M%k%H%l!<%9%U%!%$%k(B
+text	- $B<B9T2DG=%F%-%9%H$N(B inode
+wd	- $B8=:_$N%o!<%-%s%0%G%#%l%/%H%j(B
+root	- $B%k!<%H$N(B inode
+tr	- $B%+!<%M%k%H%l!<%9%U%!%$%k(B
+mmap	- $B%a%b%j%^%C%W$5$l$?%U%!%$%k(B
 .Ed
 .Pp
 $B%U%!%$%kHV9f$N$"$H$K%"%9%?%j%9%/5-9f(B ``*'' $B$,$"$k>l9g$O!"%U%!%$%k$O(B inode
diff -ur man/man1/ftp.1 man/man1/ftp.1
--- man/man1/ftp.1	Wed Jun 14 22:42:07 2000
+++ man/man1/ftp.1	Wed Jul  5 09:35:17 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.15 2000/03/10 14:46:30 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.15.2.1 2000/06/14 16:31:25 ume Exp %
 .\" 	%NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp %
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -45,7 +45,7 @@
 $B%U%!%$%kE>Aw%W%m%0%i%`(B
 .Sh $B=q<0(B
 .Nm
-.Op Fl adeginptUvV
+.Op Fl 46adeginptUvV
 .Op Fl P Ar port
 .Op Fl s Ar src_addr
 .Op Ar host Op Ar port
@@ -75,6 +75,12 @@
 .Pp
 $B%*%W%7%g%s$O!"%3%^%s%I%i%$%s>e$+!"%3%^%s%I%$%s%?%W%j%?$G;XDj$G$-$^$9!#(B
 .Bl -tag -width Fl
+.It Fl 4
+.Nm
+$B$K(B IPv4 $B%"%I%l%9$N$_$r;HMQ$9$k$h$&6/@)$7$^$9!#(B
+.It Fl 6
+.Nm
+$B$K(B IPv6 $B%"%I%l%9$N$_$r;HMQ$9$k$h$&6/@)$7$^$9!#(B
 .It Fl a
 .Nm
 $B$ODL>o$N%m%0%$%s<jB3$-$rHt$P$7$F!"$+$o$j$K(B anonymous $B%m%0%$%s$r(B
@@ -746,7 +752,7 @@
 .Ic open
 $B%3%^%s%I$G$"$kI,MW$,$"$j$^$9!#(B
 $B$3$l$O!"(B2 $B<!E*$J@)8f%3%M%/%7%g%s$r3NN)$9$k$?$a$KI,MW$JA`:n$G$9!#(B
-"proxy ?" $B$H%3%^%s%I$r<B9T$9$k$3$H$G!"(B
+\&"proxy ?" $B$H%3%^%s%I$r<B9T$9$k$3$H$G!"(B
 2 $B<!@\B32<$G;HMQ2DG=$J%3%^%s%I0lMw$,I=<($5$l$^$9!#(B
 $B0J2<$N%3%^%s%I$O(B
 .Ic proxy
@@ -857,11 +863,11 @@
 $B$d(B
 .Ic mget
 $B%3%^%s%I$GL\E*$N%m!<%+%k%U%!%$%k$HF1$8L>A0$N%U%!%$%k$,4{$KB8:_$9$k;~$K$O!"(B
-".1" $B$,L>A0$KIU2C$5$l$^$9!#(B
+\&".1" $B$,L>A0$KIU2C$5$l$^$9!#(B
 $B$=$NL>A0$b4{$KB8:_$9$k;~$K$O(B
-".2" $B$,IU2C$5$l$^$9!#(B
+\&".2" $B$,IU2C$5$l$^$9!#(B
 $B$3$N$h$&$K=gHV$K=hM}$r$7!"(B
-".99" $B$K$J$C$F$bB8:_$9$k;~$K$O(B
+\&".99" $B$K$J$C$F$bB8:_$9$k;~$K$O(B
 $B%(%i!<%a%C%;!<%8$,I=<($5$l!"E>Aw$O9T$o$l$^$;$s!#(B
 $B@8@.$5$l$?%f%K!<%/$J%U%!%$%kL>$OJs9p$5$l$^$9!#(B
 $BCm(B:
diff -ur man/man1/groups.1 man/man1/groups.1
--- man/man1/groups.1	Tue Feb 15 23:34:50 2000
+++ man/man1/groups.1	Wed Jul  5 09:35:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)groups.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/id/groups.1,v 1.4 1999/08/28 01:02:06 peter Exp %
+.\" %FreeBSD: src/usr.bin/id/groups.1,v 1.4.2.1 2000/06/30 09:51:45 ps Exp %
 .\" jpman %Id: groups.1,v 1.2 1997/05/06 00:59:29 mutoh Stab %
 .\"
 .Dd June 6, 1993
@@ -43,7 +43,7 @@
 .Nm groups
 .Op Ar user
 .Sh $B2r@b(B
-.Nm groups
+.Nm
 $B$O!"(B
 .Xr id 1
 $B$,EP>l$7$?$?$a$K8E$/$J$j$^$7$?!#(B
@@ -53,14 +53,14 @@
 .Dq Nm id Fl p
 $B$,IaDL$NBPOCE*$J;H$$J}$G$9!#(B
 .Pp
-.Nm groups
+.Nm
 $B$O!"%f!<%6$,B0$7$F$$$k%0%k!<%W(B ( $B%f!<%6$r;XDj$7$?>l9g$O$=$N(B
 $B%f!<%6$NB0$7$F$$$k%0%k!<%W(B ) $B$rI=<($7$^$9!#(B
-.Pp
 .\".Sh $BLa$jCM(B
 .\"($BLuCm(B)$B86J8I=5-Cf$K>e5-$N>OJ,$1$,$J$$$?$a:o=|$7$?!#(B
 .\" 2.2.1R $BBP>](B(1997/05/04) Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
-.Nm groups
+.Sh $B?GCG(B
+.Nm
 $B$O!"@.8y$7$?>l9g$O(B0$B$r!"%(%i!<$,5/$-$?>l9g$O(B0$B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr id 1
diff -ur man/man1/id.1 man/man1/id.1
--- man/man1/id.1	Tue Feb 15 23:34:50 2000
+++ man/man1/id.1	Wed Jul  5 09:35:20 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/id/id.1,v 1.7 1999/09/01 22:56:44 chris Exp %
+.\" %FreeBSD: src/usr.bin/id/id.1,v 1.7.2.1 2000/06/30 09:51:45 ps Exp %
 .\"
 .\" jpman %Id: id.1,v 1.2 1997/03/29 04:26:50 horikawa Stab %
 .\"
@@ -44,7 +44,7 @@
 .Nm id
 .Nd $B%f!<%6$N!"%f!<%6L>$H%0%k!<%WL>$*$h$S3FHV9f$rI=<($9$k(B
 .Sh $B=q<0(B
-.Nm
+.Nm id
 .Op Ar user
 .Nm id
 .Fl G Op Fl n
@@ -75,7 +75,7 @@
 $B$3$N>l9g!"<B(B ID $B$H<B8z(B ID $B$H$OF1$8$b$N$H$_$J$5$l$^$9!#(B
 .Pp
 $B%*%W%7%g%s$H$7$F$O0J2<$N$b$N$,$"$j$^$9(B:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl G
 $B%0%k!<%W(B ID
 ($B<B8z%0%k!<%W!"<B%0%k!<%W!"$=$NB>(B) $B$r!"6uGr$G6h@Z$C$FNs5s$7$^$9!#(B
@@ -122,7 +122,7 @@
 .It Fl u
 $B<B8z%f!<%6(B ID $B$r(B ID $BHV9f$GI=<($7$^$9!#(B
 .El
-.Pp
+.Sh $B?GCG(B
 .Nm
 $B%f!<%F%#%j%F%#$O(B
 $B@.8y$N>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
diff -ur man/man1/ipcrm.1 man/man1/ipcrm.1
--- man/man1/ipcrm.1	Tue Feb 15 23:34:51 2000
+++ man/man1/ipcrm.1	Wed Jul  5 09:35:21 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.7 1999/08/28 01:02:13 peter Exp %
+.\" %FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.7.2.1 2000/05/09 14:12:48 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/join.1 man/man1/join.1
--- man/man1/join.1	Tue Feb 15 23:34:51 2000
+++ man/man1/join.1	Wed Jul  5 09:35:23 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/join/join.1,v 1.3 1999/08/28 01:02:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/join/join.1,v 1.3.2.1 2000/06/30 09:51:48 ps Exp %
 .\" jpman %Id: join.1,v 1.2 1997/05/20 00:48:55 mutoh Stab %
 .\"
 .Dd April 28, 1995
@@ -58,21 +58,27 @@
 .Ar file1
 .Ar file2
 .Sh $B2r@b(B
-.Nm join
-$B$O!";XDj$5$l$?%U%!%$%k$KBP$7(B ``equality join'' $B$H8F$P$l$k!"(B
+.Nm
+$B%f!<%F%#%j%F%#$O!";XDj$5$l$?%U%!%$%k$KBP$7(B
+.Dq equality join
+$B$H8F$P$l$k!"(B
 $B3F%U%!%$%k$NF10l$NItJ,$r7k9g$9$kA`:n$r;\$7$F7k2L$rI8=`=PNO$K=PNO$7$^$9!#(B
 .Pp
-$BHf3S$O!"$=$l$>$l$N%U%!%$%k$N(B ``join field'' $B$H8F$P$l$k%U%#!<%k%I$G(B
+$BHf3S$O!"$=$l$>$l$N%U%!%$%k$N(B
+.Dq join field
+$B$H8F$P$l$k%U%#!<%k%I$G(B
 $B9T$J$$$^$9!#%G%U%)%k%H$G$O!"3F9T$N:G=i$N%U%#!<%k%I$,;HMQ$5$l$^$9!#(B
 .Ar file1
 $B$H(B
 .Ar file2
-$B$NCf$G!"(B``join field'' $B$,0lCW$7$?9T$,AH$_$H$J$j!"(B1 $B9T$G=PNO$5$l$^$9!#(B
-``join field'' $B!"(B
+$B$NCf$G!"(B
+.Dq join field
+$B$,0lCW$7$?9T$,AH$_$H$J$j!"(B1 $B9T$G=PNO$5$l$^$9!#(B
+join field $B$H!"(B
 .Ar file1
 $B$N$&$A$N;D$j$N%U%#!<%k%I!"$=$N8e!"(B
 .Ar file2
-$B$N$&$A$N;D$j$N%U%#!<%k%I$,(B 1$B9T$K$J$C$F=PNO$5$l$^$9!#(B
+$B$N$&$A$N;D$j$N%U%#!<%k%I$,(B 1 $B9T$K$J$C$F=PNO$5$l$^$9!#(B
 .Pp
 $B%U%#!<%k%I$N6h@Z$O!"%G%U%)%k%H$G$O%?%V$+6uGrJ8;z$G$9!#J#?t$N%?%V$d6uGr(B
 $B$,7R$C$F$$$F$b!"(B1 $B$D$N6h@Z$H$_$J$5$l!"FI$_9~$_;~$K$3$l$i$OL5;k$5$l$^$9!#(B
@@ -82,7 +88,7 @@
 $BHV9f$O>o$K!"(B1 $B$+$i;O$^$j$^$9!#$9$J$o$A!"%3%^%s%I%i%$%s$N:G=i$N%U%!%$%k(B
 $B$O%U%!%$%kHV9f(B 1 $BHV$G$"$j!"3F9T$N:G=i$N%U%#!<%k%I$O!"%U%#!<%k%IHV9f(B 1
 $BHV$H$J$j$^$9!#(B
-.Bl -tag -width Fl
+.Bl -tag -width indent
 .It Fl a Ar file_number
 $B%G%U%)%k%H$N=PNO$K2C$($F!"(B
 .Ar file_number
@@ -97,7 +103,7 @@
 .Ar string
 $B$G;XDj$7$?J8;zNs$KCV$-49$($^$9!#(B
 .It Fl o Ar list
-.Nm join
+.Nm
 $B$N=hM}$7$F=PNO$9$Y$-9T$K4X$7!"%G%U%)%k%H$N=g=x$G$J$/!"(B
 .Ar list
 $B$G;XDj$7$?=g=x$G3F%U%!%$%k$N3F%U%#!<%k%I$r=PNO(B
@@ -105,7 +111,9 @@
 .Ar list
 $B$N3FMWAG$O!"(B
 .Ql file_number.field
-$B$GI=$o$7!"MWAG4V$O!"%3%s%^(B (``,'') $B$+6uGr$G6h@Z$j$^$9(B
+$B$GI=$o$7!"MWAG4V$O!"%3%s%^(B
+.Pf ( Dq , Ns )
+$B$+6uGr$G6h@Z$j$^$9(B
 ($B6uGr$G6h@Z$k>l9g$O!"%7%'%k$,MWAG$rJL!9$N%Q%i%a!<%?$KJ,2r$7$J$$$h$&(B
 $B%/%)!<%F%#%s%0$9$k$+!"J#?t$N(B
 .Fl o
@@ -127,23 +135,27 @@
 .Fl v Ar 2
 $B$rF1;~$K;XDj$7$F$b$+$^$$$^$;$s!#(B
 .It Fl 1 Ar field
-$B%U%!%$%k(B1$B$N(B ``join field'' $B$r(B
+$B%U%!%$%k(B 1 $B$N(B
+.Dq join field
+$B$r(B
 .Ar field
 $B$G;XDj$7$?HV9f$N%U%#!<%k%I$H$7$^$9!#(B
 .It Fl 2 Ar field
-$B%U%!%$%k(B2 $B$N(B ``join field'' $B$r(B
+$B%U%!%$%k(B 2 $B$N(B
+.Dq join field
+$B$r(B
 .Ar field
 $B$G;XDj$7$?HV9f$N%U%#!<%k%I$H$7$^$9!#(B
 .El
 .Pp
 $B%G%U%)%k%H$N%U%#!<%k%I6h@Z$jJ8;z$,;H$o$l$?>l9g!"(B
 $B%U%!%$%k$,7k9g$5$l$k=g=x$O(B
-.Xr sort 1 ,
+.Xr sort 1
 $B$K(B
 .Fl b
 $B%*%W%7%g%s$rIU$1$?$b$N$HF1MM$K$J$k$O$:$G$9!#(B
 $B5U$K!"(B
-.Nm join
+.Nm
 .Fl t
 $B%*%W%7%g%s$K$h$C$F!"%U%#!<%k%I6h@Z$jJ8;z$,;XDj$5$l$F$$$k>l9g!"(B
 $B%U%#!<%k%I$N>H9g=g=x$O(B
@@ -155,21 +167,25 @@
 .Ar file1
 $B$^$?$O(B
 .Ar file2
-$B$N$&$A$NJRJ}$,(B ``-'' $B$G$"$C$?>l9g$K$O!"I8=`F~NO$,;H$o$l$^$9!#(B
-.Pp
-.Nm join
-$B$O!"<B9T$K@.8y$7$?>l9g$K(B0$B$rJV$7!"%(%i!<$,H/@8$7$?>l9g$K$O(B0$B$h$jBg$-$J(B
+$B$N$&$A$NJRJ}$,(B
+.Dq -
+$B$G$"$C$?>l9g$K$O!"I8=`F~NO$,;H$o$l$^$9!#(B
+.Sh $B?GCG(B
+.Nm
+$B$O!"<B9T$K@.8y$7$?>l9g$K(B 0 $B$rJV$7!"%(%i!<$,H/@8$7$?>l9g$K$O(B 0 $B$h$jBg$-$J(B
 $BCM$rJV$7$^$9!#(B
 .Sh $B8_49@-(B
-$B$5$i$K!"8E$$%P!<%8%g%s$N(Bjoin$B$H$N8_49$N$?$a!"<!$N%*%W%7%g%s$b;HMQ$G$-$^$9!#(B
-.Bl -tag -width Fl
+$B$5$i$K!"8E$$%P!<%8%g%s$N(B
+.Nm
+$B$H$N8_49$N$?$a!"<!$N%*%W%7%g%s$b;HMQ$G$-$^$9!#(B
+.Bl -tag -width indent
 .It Fl a
 $B%G%U%)%k%H$N=PNO$K2C$(!"(Bfile1 $B$H(B file2 $B$N3F!9$G!"F10l%U%#!<%k%I(B
 $B$,$J$$9T$rI=<($7$^$9!#(B
 ($B$3$l$H(B
 .Fl a Ar file_number
 $B$r6hJL$9$k$?$a$K!"(B
-.Nm join
+.Nm
 $B$O8=:_8e<T$O6uGr$r4^$^$J$$$3$H$rI,MW$H$7$F$$$^$9!#(B)
 .It Fl j1 Ar field
 $B%U%!%$%k(B1$B$N(B ``join field'' $B$r(B
@@ -185,23 +201,25 @@
 $B$G;XDj$7$?HV9f$N%U%#!<%k%I$H$7$^$9!#(B
 .It Fl o Ar list ...
 $BNr;KE*$J(B
-.Nm join
+.Nm
 $B$N<BAu$G$O(B
 .Fl o
 $B%*%W%7%g%s$KJ#?t$N0z?t$r5v2D$7$F$$$^$7$?!#(B
 $B$3$l$i$N0z?t$O!"8=:_$N(B
 .Fl o
-$B%*%W%7%g%s$G@bL@$7$?$b$N$HF1$8(B``file_number.field_number''$B$H$$(B
-$B$&7A<0$G$7$?!#(B
-$B$7$+$7!"$3$NJ}K!$G$O(B``1.2''$B$HL>IU$1$i$l$?%U%!%$%k$,B8:_$9$k$H!"L@(B
-$B$i$+$K:$Fq$r@8$8$^$9!#(B
+$B%*%W%7%g%s$G@bL@$7$?$b$N$HF1$8(B
+.Dq file_number.field_number
+$B$H$$$&7A<0$G$7$?!#(B
+$B$7$+$7!"$3$NJ}K!$G$O(B
+.Ql 1.2
+$B$HL>IU$1$i$l$?%U%!%$%k$,B8:_$9$k$H!"L@$i$+$K:$Fq$r@8$8$^$9!#(B
 .El
 .Pp
 $B$3$l$i$N%*%W%7%g%s$O!"=$@5$r$7$?$/$J$$$h$&$JHs>o$K8E$$%7%'%k%9%/%j%W%H(B
 $B$N$?$a$@$1$KMQ0U$5$l$F$$$^$9!#(B
 $B$3$l$i$N%*%W%7%g%s$O!";H$&$Y$-$G$O$"$j$^$;$s!#(B
 .Sh $B5,3J(B
-.Nm join
+.Nm
 $B%3%^%s%I$O(B
 .St -p1003.2
 $B8_49$G$9!#(B
diff -ur man/man1/jot.1 man/man1/jot.1
--- man/man1/jot.1	Thu Feb 24 06:37:29 2000
+++ man/man1/jot.1	Wed Jul  5 09:35:24 2000
@@ -185,7 +185,7 @@
 
 .Sh $B?GCG(B
 .Nm
-$B%f!<%F%#%j%F%#$O!"@.8y;~$K$O(B 0 $B$G!"=*N;;~$K$O(B >0 $B$G!"=*N;$7$^$9!#(B
+$B%f!<%F%#%j%F%#$O!"@.8y;~$K$O(B 0 $B$G!"=*N;;~$K$O(B 0 $B$h$jBg$-$JCM$G!"=*N;$7$^$9!#(B
 $B<!$N?GCG%a%C%;!<%8$O!"FCJL$J2r@b$rMW$7$^$9(B:
 .Bl -diag
 .It "illegal or unsupported format '%s'"
diff -ur man/man1/kbdcontrol.1 man/man1/kbdcontrol.1
--- man/man1/kbdcontrol.1	Tue Feb 15 23:34:51 2000
+++ man/man1/kbdcontrol.1	Wed Jul  5 09:35:26 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.18 1999/11/18 16:09:40 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.18.2.1 2000/05/09 14:12:49 sheldonh Exp %
 .\"
 .\" jpman %Id: kbdcontrol.1,v 1.3 1997/07/26 21:37:54 horikawa Stab %
 .\"
diff -ur man/man1/keyinfo.1 man/man1/keyinfo.1
--- man/man1/keyinfo.1	Tue Feb 15 23:34:51 2000
+++ man/man1/keyinfo.1	Wed Jul  5 09:35:28 2000
@@ -29,7 +29,6 @@
     > keyinfo
 .sp 0
     0098 ws91340
-.LP
 .Sh $B0z?t(B
 .Bl -tag -width indent
 .It Ar username
diff -ur man/man1/ldd.1 man/man1/ldd.1
--- man/man1/ldd.1	Wed Jun 14 22:42:07 2000
+++ man/man1/ldd.1	Wed Jul  5 09:35:29 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.12 2000/03/01 12:19:50 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.12.2.3 2000/05/10 15:46:58 phantom Exp %
 .\"
 .Dd October 22, 1993
 .\" jpman %Id: ldd.1,v 1.3 1997/07/15 14:15:08 konuma Stab %
@@ -13,11 +13,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
@@ -30,7 +31,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
@@ -44,13 +45,15 @@
 $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
+.Xr nm 1 ,
+.Xr rtld 1
 .Sh $BNr;K(B
-.Nm ldd
+.Nm
 $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/leave.1 man/man1/leave.1
--- man/man1/leave.1	Tue Feb 15 23:34:52 2000
+++ man/man1/leave.1	Wed Jul  5 09:35:30 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/leave/leave.1,v 1.4 1999/08/28 01:02:45 peter Exp %
+.\" %FreeBSD: src/usr.bin/leave/leave.1,v 1.4.2.1 2000/06/30 09:51:49 ps Exp %
 .\" jpman %Id: leave.1,v 1.4 1997/07/26 21:41:57 horikawa Stab %
 .\"
 .Dd April 28, 1995
@@ -56,9 +56,8 @@
 .Nm
 $B$O<!$N%a%C%;!<%8$r=P$9A0$K=*N;$7$^$9!#(B
 .Pp
-$B%*%W%7%g%s(B:
-.Pp
-.Bl -tag -width flag
+$B<!$N%*%W%7%g%s$rMxMQ2DG=$G$9(B:
+.Bl -tag -width indent
 .It Ar hhmm
 .Ar hhmm
 $B7A<0$G$N;~9o$N;XDj$G$9!#(B
diff -ur man/man1/limits.1 man/man1/limits.1
--- man/man1/limits.1	Tue Feb 15 23:34:52 2000
+++ man/man1/limits.1	Wed Jul  5 09:35:33 2000
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" %FreeBSD: src/usr.bin/limits/limits.1,v 1.14 1999/10/09 20:47:58 green Exp %
+.\" %FreeBSD: src/usr.bin/limits/limits.1,v 1.14.2.1 2000/07/02 09:50:17 ps Exp %
 .\"
 .\" jpman %Id: limits.1,v 1.3 1997/06/23 15:04:52 horikawa Stab %
 .Dd January 15, 1996
@@ -52,12 +52,12 @@
 .Op Ar name=value ...
 .Op Ar command
 .Sh $B2r@b(B
-.Nm limits
+.Nm
 $B$O%+!<%M%k$N%j%=!<%9@)8B$NI=<($*$h$S@_Dj$r9T$J$$$^$9!#$^$?!"(B
 .Xr env 1
 $B$N$h$&$K4D6-JQ?t$r@_Dj$7$F!"%W%m%0%i%`$rA*Br$7$?%j%=!<%9$GF0:n$5$;$k$3(B
 $B$H$b$G$-$^$9!#(B
-.Nm limits
+.Nm
 $B%3%^%s%I$O0J2<$N(B 3 $BDL$j$N;H$$J}$,$G$-$^$9(B:
 .Pp
 .Bl -hang -width indent
@@ -98,7 +98,7 @@
 $B%U%!%$%k%7%9%F%`Cf$N%(%s%H%j$rD4$Y$F7hDj$5$l$^$9!#(B
 $B$b$7!"%7%'%k$,H=L@$9$k$H(B ($B$9$J$o$A(B sh, csh, bash, tcsh, ksh, pdksh, rc
 $B$N$$$:$l$+(B)$B!"(B
-.Nm limits
+.Nm
 $B$O(B 'limit' $B$b$7$/$O(B 'ulimit' $B%3%^%s%I$r$=$N%7%'%k$,2r<a$G$-$k%U%)!<%^%C%H$G(B
 $B=PNO$7$^$9!#%7%'%kL>$,7hDj$G$-$J$+$C$?>l9g$O!"(B
 .Pa /bin/sh
@@ -110,7 +110,7 @@
 $B$^$?!"%m%0%$%s%/%i%9%G!<%?%Y!<%9$r@_Dj$7Cf1{%G!<%?%Y!<%9$rJ]<i$9$k$3$H$K$h$j!"(B
 $B:GBg;HMQ%j%=!<%9$r%0%m!<%P%k$K@_Dj$9$k$3$H$,$G$-$k$H$$$&MxE@$,$"$j$^$9!#(B
 .Pp
-.Nm limits
+.Nm
 $B$ODL>o(B
 $B%7%'%k%9%/%j%W%HCf$G$O<!$N$h$&$K%P%C%/%/%)!<%F!<%7%g%s$K0O$_I>2A$9$k$h(B
 $B$&$K$7$F;H$o$l$^$9!#(B
@@ -118,7 +118,7 @@
 .Dl eval `limits -e -C daemon`
 .Pp
 $B$3$l$G(B
-.Nm limits
+.Nm
 $B$N=PNO$,I>2A$5$l!"8=:_$N%7%'%k$G@_Dj$5$l$^$9!#(B
 .El
 .Pp
@@ -162,7 +162,7 @@
 $B=PNO$r(B "eval mode" ($BI>2A%b!<%I(B) $B$N=q<0$K$7$^$9!#(B
 $B$3$l$OI=<(%b!<%I$G$N$_M-8z$G$"$j!"%3%^%s%I$r<B9T$9$k$H$-$K$O;H$($^$;$s!#(B
 $B=PNO$K;HMQ$5$l$k@53N$J%7%s%?%C%/%9$O(B
-.Nm limits
+.Nm
 $B$,5/F0$5$l$?%7%'%k$N%?%$%W$K0MB8$7$^$9!#(B
 .It Fl b Op Ar limit
 .Em sbsize
@@ -204,10 +204,16 @@
 $B%7%9%F%`A4BN$GF1;~$KAv9T$G$-$k%W%m%;%9$NAm?t$O!"(B
 \&'sysctl kern.maxproc' $B%3%^%s%I$GI=<($G$-$kCM$K@)8B$5$l$^$9!#(B
 .Pp
-$B>e5-$N%U%i%0$N%;%C%H$K$*$1$kM-8z$J(B 'limit' $B$NCM$O!"L58BCM(B ($B$b$7$/$O(B
-$B%+!<%M%k$K$*$$$FDj5A$5$l$F$$$k:GBgCM(B) $B$r@_Dj$9$k>l9g$OJ8;zNs(B 'infinity' 
-$B$b$7$/$O(B 'inf' $B$r;XDj$7!"$=$l0J30$N>l9g$O@\Hx;R$D$-$N?t;z$r;XDj$7$^(B
-$B$9!#%5%$%:$K4X$9$kCM$O%G%U%)%k%H$G$O%P%$%H$G$NCM$H$J$j$^$9!#$^$?0J2<$N(B
+$B>e5-$N%U%i%0$N%;%C%H$K$*$1$kM-8z$J(B
+.Ar limit
+$B$NCM$O!"L58BCM(B ($B$b$7$/$O(B
+$B%+!<%M%k$K$*$$$FDj5A$5$l$F$$$k:GBgCM(B) $B$r@_Dj$9$k>l9g$OJ8;zNs(B
+.Em infinity
+.Em inf
+.Em unlimited
+.Em unlimit
+$B$N$$$:$l$+$r;XDj$7!"$=$l0J30$N>l9g$O@\Hx;R$D$-$N?t;z$r;XDj$7$^$9!#(B
+$B%5%$%:$K4X$9$kCM$O%G%U%)%k%H$G$O%P%$%H$G$NCM$H$J$j$^$9!#$^$?0J2<$N(B
 $B@\Hx;R$N(B 1 $B$D$rIU$1$k$3$H$K$h$C$F$=$NC10L$H$J$j$^$9!#(B
 .Pp
 .Bl -tag -offset indent -width "xxxx" -compact
@@ -245,7 +251,7 @@
 .It Fl E
 .Sq Fl E
 $B%*%W%7%g%s$r;HMQ$9$k$H(B
-.Nm limits
+.Nm
 $B$O7Q>5$7$F$$$k4D6-$r40A4$KL5;k$7$^$9!#(B
 .It Fl a
 $B$3$N%*%W%7%g%s$OFCDj$N%j%=!<%9$N@_Dj$,;XDj$5$l$F$$$F$b!"(B
@@ -262,19 +268,19 @@
 root $B0J30$N%f!<%6$O$=$l$r0z$-2<$2$k$+!"%j%=!<%9$N(B "soft" $B%j%_%C%H$r(B 
 hard $B%j%_%C%H$NHO0O$GJQ99$9$k$3$H$,$G$-$^$9!#(B
 $B%W%m%0%i%`$r<B9T$9$k>l9g!"(B
-.Nm limits
+.Nm
 $B$,(B hard $B%j%_%C%H$r0z$->e$2$h$&$H$9$k$H!"$=$l$OCWL?E*%(%i!<$H$7$F07$o$l(B
 $B$^$9!#(B
 .El
 .Sh $B?GCG(B
-.Nm limits
+.Nm
 $B$O%f!<%6$,2?$i$+$NJ}K!$G8m;HMQ$r$9$k$H(B EXIT_FAILURE $B$G=*N;$7$^$9!#8m(B
 $B;HMQ$K$OIT@5$J%*%W%7%g%s$r;HMQ$7$?>l9g$d!"F1;~$K@_Dj$HI=<($N%*%W%7%g%s(B
 $B$r;XDj$7$?>l9g!"$^$?$O(B
 .Fl e
 $B$,%W%m%0%i%`$r5/F0$9$k;~$K;H$o$l$?>l9g$J$I$,4^$^$l$^$9!#(B
 $BI=<(%b!<%I$b$7$/$OI>2A%b!<%I$K$F<B9T$5$l$?$H$-!"(B
-.Nm limits
+.Nm
 $B$O(B EXIT_SUCCESS $B$N=*N;%9%F!<%?%9$G=*N;$7$^$9!#(B
 $B%3%^%s%I%b!<%I$G<B9T$5$l%3%^%s%I$N<B9T$,@.8y$7$?$H$-$K$O!"=*N;%9%F!<%?%9$O(B
 $B<B9T$5$l$?%W%m%0%i%`$,JV$9$b$N$K$J$j$^$9!#(B
@@ -290,20 +296,23 @@
 .Xr sysctl 8
 .Sh $B%P%0(B
 $BL@$i$+$JM}M3$K$h$j!"(B
-.Nm limits
+.Nm
 $B$OEy9f(B (``='') $B$,$=$NL>>N$K4^$^$l$k%3%^%s%I$r07$&$3$H$,$G$-$^$;$s!#(B
 .Pp
 $BI>2AMQ$N=PNO$,A*Br$5$l$?>l9g!"%7%'%k$r@5$7$/G'<1$7!"$=$N%7%'%k$K$H$C$F(B
-$B=PNO$,@5$7$$%7%s%?%C%/%9$H$J$k$?$a$K$O!"(B/proc $B%U%!%$%k%7%9%F%`$,%$%s%9(B
-$B%H!<%k$5$l%^%&%s%H$5$l$F$$$J$1$l$P$J$j$^$;$s!#(B
-$B%G%U%)%k%H$N=PNO$O(B /bin/sh $B$K$H$C$FM-8z$J$b$N$H$J$j$^$9!#$=$N$?$a!"(B
-/proc $B%^%&%s%HA0$K(B
-.Nm limits
+$B=PNO$,@5$7$$%7%s%?%C%/%9$H$J$k$?$a$K$O!"(B
+.Pa /proc
+$B%U%!%$%k%7%9%F%`$,%$%s%9%H!<%k$5$l%^%&%s%H$5$l$F$$$J$1$l$P$J$j$^$;$s!#(B
+$B%G%U%)%k%H$N=PNO$O(B
+.Pa /bin/sh
+$B$K$H$C$FM-8z$J$b$N$H$J$j$^$9!#$=$N$?$a!"(B
+.Pa /proc $B%^%&%s%HA0$K(B
+.Nm
 $B$r;HMQ$G$-$k$N$O!"I8=`$N(B bourne $B%7%'%k%9%/%j%W%HCf$G$N$_$H$J$j$^$9!#(B
 .Pp
-.Nm limits
+.Nm
 $B$O=PNO$dI=<($9$k%j%=!<%9$N@_Dj$,8=:_$N%f!<%6$GM-8z$G$"$k$+$d!"@_Dj2DG=(B
 $B$G$"$k$+$K$D$$$F$O3NG'$r9T$J$$$^$;$s!#%9!<%Q%f!<%6%"%+%&%s%H$N$_$,(B 
 hard $B%j%_%C%H$r0z$->e$2$k$3$H$,$G$-$^$9!#M?$($i$l$?CM$,Bg$-$9$.$k>l9g$O(B 
-FreeBSD $B%+!<%M%k$O2?$b=PNO$;$:$K$=$N@)8BCM$r;XDj$5$l$?CM$h$jDc$/@_Dj(B
-$B$7$^$9!#(B
+.Fx
+$B%+!<%M%k$O2?$b=PNO$;$:$K$=$N@)8BCM$r;XDj$5$l$?CM$h$jDc$/@_Dj$7$^$9!#(B
diff -ur man/man1/logger.1 man/man1/logger.1
--- man/man1/logger.1	Tue Feb 15 23:34:52 2000
+++ man/man1/logger.1	Wed Jul  5 09:35:34 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/logger/logger.1,v 1.4 1999/08/28 01:03:08 peter Exp %
+.\" %FreeBSD: src/usr.bin/logger/logger.1,v 1.4.2.1 2000/06/30 09:51:49 ps Exp %
 .\" jpman %Id: logger.1,v 1.3 1997/09/05 09:02:40 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -52,8 +52,8 @@
 .Xr syslog 3
 $B%7%9%F%`%m%05-O?%b%8%e!<%k$H$N%7%'%k%3%^%s%I%$%s%?%U%'!<%9$rDs6!$7$^$9!#(B
 .Pp
-$B%*%W%7%g%s(B:
-.Bl -tag -width "message"
+$B<!$N%*%W%7%g%s$r;HMQ2DG=$G$9(B:
+.Bl -tag -width indent
 .It Fl i
 logger $B%W%m%;%9$N%W%m%;%9(B ID $B$r3F9T$K5-O?$7$^$9!#(B
 .It Fl s
@@ -79,7 +79,7 @@
 .Fl f
 $B$b;XDj$5$l$F$$$J$1$l$P!"I8=`F~NO$r%m%0$H$7$F5-O?$7$^$9!#(B
 .El
-.Pp
+.Sh $B?GCG(B
 .Nm
 $B$O@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B;HMQNc(B
diff -ur man/man1/logname.1 man/man1/logname.1
--- man/man1/logname.1	Tue Feb 15 23:34:52 2000
+++ man/man1/logname.1	Wed Jul  5 09:35:35 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/usr.bin/logname/logname.1,v 1.5 1999/08/28 01:03:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/logname/logname.1,v 1.5.2.1 2000/06/30 09:51:50 ps Exp %
 .\" jpman %Id: logname.1,v 1.2 1997/04/24 00:27:29 mutoh Stab %
 .\"
 .Dd June 9, 1993
@@ -54,9 +54,9 @@
 $B$d(B
 .Ev USER
 $B$,?.Mj$G$-$J$$$?$a!"$3$l$i$N4D6-JQ?t$rL5;k$7$^$9!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
-$B$O@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B$O@.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 who 1 ,
 .Xr whoami 1 ,
diff -ur man/man1/lpr.1 man/man1/lpr.1
--- man/man1/lpr.1	Wed Jun 14 22:42:08 2000
+++ man/man1/lpr.1	Wed Jul  5 09:35:37 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.11 2000/03/01 14:08:50 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.11.2.1 2000/06/27 19:55:40 wollman Exp %
 .\" jpman %Id: lpr.1,v 1.3 1997/08/11 14:28:54 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -48,13 +48,14 @@
 .Op Fl L Ar locale
 .Op Fl T Ar title
 .Op Fl U Ar user
+.Op Fl Z Ar daemon-options
 .Op Fl i Ar numcols
 .Op Fl 1234 Ar font
 .Op Fl w Ns Ar num
 .Op Fl cdfghlnmprstv
 .Op Ar name ...
 .Sh $B2r@b(B
-.Nm  lpr
+.Nm
 $B$O!"%W%j%s%?$,MxMQ2DG=$K$J$C$?$H$-$K%U%!%$%k$r%W%j%s%H(B
 $B%"%&%H$9$k$?$a$K%9%W!<%j%s%0%G!<%b%s$rMxMQ$7$^$9!#(B
 $B$b$7%U%!%$%kL>$,;XDj$5$l$J$$$h$&$J$i!"I8=`F~NO$+$iFI$_$^$9!#(B
@@ -165,8 +166,11 @@
 .It Fl L Ar locale
 $B4D6-JQ?t$NBe$j$K!"0z?t$G;XDj$5$l$k(B
 .Ar locale
-$B$r;HMQ$7$^$9!#(B
-$B%m%1!<%k$r%G%U%)%k%H$KLa$9$K$O(B "C" $B$r;HMQ$7$F$/$@$5$$!#(B
+$B$r;HMQ$7$^$9!#(B(
+.Fl p
+$B%*%W%7%g%s$r;HMQ$7$F(B
+.Xr pr 1
+$B$K$h$k%U%#%k%?%j%s%0$rMW5a$7$?>l9g$N$_M-8z$G$9!#(B)
 .It Fl T Ar title
 .Xr pr 1
 $B$N%?%$%H%kL>$K!"%U%!%$%kL>$N$+$o$j$K$3$N%?%$%H%k$r;H$$$^$9!#(B
@@ -174,6 +178,20 @@
 $B%P!<%9%H%Z!<%8$G;H$&%f!<%6L>$G$"$j!"2]6bL\E*$G$bMxMQ$5$l$^$9!#(B
 $B$3$N%*%W%7%g%s$O<B%f!<%6(B id $B$,(B daemon ($B$"$k$$$O(B daemon $B$NBe$o$j$K(B
 printcap $BCf$G;XDj$5$l$F$$$k%f!<%6(B) $B$N$_;HMQ$G$-$^$9!#(B
+.It Fl Z Ar daemon-options
+.Tn LPRng
+$BEy!"%9%W!<%i$K$h$C$F$O!"99$J$k%8%g%VKh$N%*%W%7%g%s$r!"(B
+.Ql Z
+$B@)8f9T$r<u$1IU$1$^$9!#(B
+.Fl Z
+$B$,;XDj$5$l!"(B
+.Fl p
+.Pq Xr pr 1
+$B$,;XDj$5$l$J$+$C$?$H$-!";XDj$5$l$?(B
+.Ar daemon-options
+$B$,%j%b!<%H$N(B
+.Tn LPRng
+$B%9%W!<%i$XEO$5$l$^$9!#(B
 .It Fl i numcols
 $B=PNO$,(B
 .Pq Ar numcols
@@ -186,7 +204,7 @@
 .El
 .Sh $B4D6-JQ?t(B
 $B0J2<$N4D6-JQ?t$,B8:_$9$k$H!"(B
-.Nm lpr
+.Nm
 $B$,;HMQ$7$^$9(B:
 .Bl -tag -width PRINTER
 .It Ev PRINTER
@@ -242,7 +260,27 @@
 .Sh $B%P%0(B
 .Xr troff 1
 $B$H(B
-.Xr tex
+.Tn TeX
 $B$N%U%)%s%H$O!$%W%j%s%?$,$D$J$,$C$F$$$k%[%9%H$K$J$$$H$$$1$^$;$s!#(B
 $B$3$l$O!$8=:_$O%m!<%+%k$N%U%)%s%H%i%$%V%i%j$r;H$&$3$H$,$G$-$J$$$3$H$r(B
 $B0UL#$7$^$9!#(B
+.Pp
+.Ql Z
+$B@)8f%U%!%$%k9T$O(B 2 $B<oN`$N0[$J$C$?L\E*$K;HMQ$5$l$^$9!#(B
+$BI8=`$N(B
+.Fx
+.Xr lpd 8
+$B$G$O!"(B
+.Xr pr 1
+$B$KEO$5$l$k%m%1!<%k$r;XDj$7$^$9!#(B
+.Tn LPRng
+.Xr lpd 8
+$B$G$O!"%9%W!<%i$NF~=PNO%U%#%k%?$,2r<a$9$kDI2C%*%W%7%g%s$r;XDj$7$^$9!#(B
+$B%8%g%V$r(B
+.Nm
+$B$GDs=P$9$k$H$-!"(B
+.Fl p
+.Fl L Ar locale
+$B$OA0<T$N0UL#$G;HMQ$5$l!"(B
+.Fl Z Ar daemon-options
+$B$O8e<T$N0UL#$G;HMQ$5$l$^$9!#(B
diff -ur man/man1/ls.1 man/man1/ls.1
--- man/man1/ls.1	Wed Jun 14 22:42:08 2000
+++ man/man1/ls.1	Wed Jul  5 09:35:40 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" %FreeBSD: src/bin/ls/ls.1,v 1.33 2000/03/02 14:53:20 sheldonh Exp %
+.\" %FreeBSD: src/bin/ls/ls.1,v 1.33.2.1 2000/06/28 00:18:22 joe Exp %
 .\"
 .\" jpman %Id: ls.1,v 1.3 1997/05/19 17:21:06 horikawa Stab %
 .Dd July 29, 1994
@@ -347,8 +347,10 @@
 (
 .Fl C
 $B;2>H(B)$B!#(B
-.It Ev TZ
-$BF|;~$rI=<($9$k$H$-$K;H$o$l$k%?%$%`%>!<%s$r;XDj$7$^$9!#(B
+.It Ev LANG
+$BD9$$(B
+.Fl l
+$B%U%)!<%^%C%H=PNO$K$*$1$k!"F|$H7n$N=g=x$r7hDj$9$k$?$a$K;HMQ$9$k%m%1!<%k$G$9!#(B
 $B>\:Y$O(B
 .Xr environ 7
 $B$r;2>H$7$F$/$@$5$$!#(B
@@ -361,6 +363,11 @@
 $B%U%#!<%k%I$N=g=x$O<!$NDL$j$G$9(B:
 i$B%N!<%I!&%V%m%C%/?t!&%j%s%/?t!&%f!<%6L>!&%0%k!<%WL>!&%U%i%0!&%U%!%$%k%5%$%:!&(B
 $B%U%!%$%kL>!#(B
+.It Ev TZ
+$BF|;~$rI=<($9$k$H$-$K;H$o$l$k%?%$%`%>!<%s$r;XDj$7$^$9!#(B
+$B>\:Y$O(B
+.Xr environ 7
+$B$r;2>H$7$F$/$@$5$$!#(B
 .El
 .Sh $B8_49@-(B
 .St -p1003.2
diff -ur man/man1/lsvfs.1 man/man1/lsvfs.1
--- man/man1/lsvfs.1	Tue Feb 15 23:34:53 2000
+++ man/man1/lsvfs.1	Wed Jul  5 09:35:40 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.7 1999/08/28 01:03:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.7.2.1 2000/06/30 09:51:50 ps Exp %
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
@@ -13,16 +13,16 @@
 .Nm lsvfs
 .Op Ar vfsname Ar ...
 .Sh $B2r@b(B
-.Nm lsvfs
+.Nm
 $B%3%^%s%I$O8=:_%m!<%I$5$l$F$$$k2>A[%U%!%$%k%7%9%F%`%b%8%e!<%k$K(B
 $B4X$9$k>pJs$rI=<($7$^$9!#(B
 $B0z?t(B
 .Ar vfsname
 $B$,M?$($i$l$k$H!"(B
-.Nm lsvfs
+.Nm
 $B$O;XDj$5$l$?(B VFS $B%b%8%e!<%k$K4X$9$k>pJs$rI=<($7$^$9!#(B
 $B$=$l0J30$N>l9g!"(B
-.Nm lsvfs
+.Nm
 $B$O8=:_%m!<%I$5$l$F$$$kA4$F$N%b%8%e!<%k$rI=<($7$^$9!#(B
 $BI=<($5$l$k>pJs$O0J2<$NDL$j(B:
 .Pp
@@ -49,5 +49,5 @@
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
-.Tn FreeBSD
-2.0 $B$GEP>l$7$^$7$?!#(B
+.Fx 2.0
+$B$GEP>l$7$^$7$?!#(B
diff -ur man/man1/make.1 man/man1/make.1
--- man/man1/make.1	Wed Jun 14 22:42:08 2000
+++ man/man1/make.1	Wed Jul  5 09:35:45 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.29 2000/03/01 12:19:52 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/make/make.1,v 1.29.2.1 2000/05/20 20:17:20 will Exp %
 .\"
 .\" this file based on that translated to japanese on NetBSD Japanese Reference
 .\" Manual Project, and modefied to fit FreeBSD Reference Manual
@@ -121,6 +121,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$,%3%^%s%I$KA0CV$5$l$F$$$h$&$H$$$^$$$H!"(B
+$B$^$?B>$N!V@E<d!W%U%i%0$NM-L5$K4X$o$i$:!"(BMakefile $B$N%3%^%s%I$rI=<($7$^$9!#(B
+$B$3$l$O!V$d$+$^$7$$!WF0:n$H$7$F$bCN$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
diff -ur man/man1/makewhatis.1 man/man1/makewhatis.1
--- man/man1/makewhatis.1	Tue Feb 15 23:34:51 2000
+++ man/man1/makewhatis.1	Wed Jul  5 09:35:46 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.14 1999/09/11 18:21:16 ache Exp %
+.\" %FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.14.2.1 2000/06/20 10:42:06 alex Exp %
 .\" jpman %Id: makewhatis.1,v 1.2 1997/04/01 14:15:46 horikawa Stab %
 .Dd January 12, 1995
 .Dt MAKEWHATIS 1
@@ -130,7 +130,7 @@
 .Bl -tag -width /etc/master.passwdxx -compact
 .It Pa */man/whatis
 whatis $B%G!<%?%Y!<%9!#(B
-.It Pa /etc/weekly
+.It Pa /etc/periodic/weekly/320.whatis
 $BKh=5(B
 .Nm makewhatis.local
 $B$r<B9T$7$^$9!#(B
diff -ur man/man1/man.1 man/man1/man.1
--- man/man1/man.1	Tue Feb 15 23:34:53 2000
+++ man/man1/man.1	Wed Jul  5 09:35:48 2000
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" %FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.10 1999/12/20 14:34:29 asmodai Exp %
+.\" %FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.10.2.2 2000/04/23 16:57:02 mpp Exp %
 .\"
 .\" jpman %Id: man.1,v 1.2 1997/04/01 14:17:54 horikawa Stab %
 .Dd Jan 5, 1991
@@ -141,8 +141,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
diff -ur man/man1/mkfifo.1 man/man1/mkfifo.1
--- man/man1/mkfifo.1	Tue Feb 15 23:34:53 2000
+++ man/man1/mkfifo.1	Wed Jul  5 09:35:49 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\" %FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.6 1999/08/28 01:04:05 peter Exp %
+.\" %FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.6.2.1 2000/06/30 09:51:51 ps Exp %
 .\" jpman %Id: mkfifo.1,v 1.3 1997/09/04 16:41:11 horikawa Stab %
 .\"
 .Dd January 5, 1994
@@ -78,9 +78,10 @@
 $B$G=$@5$7$?%b!<%I$G(B FIFO $B$r:n@.$7$^$9!#(B
 .Nm
 $B%3%^%s%I$K$O!"?F%G%#%l%/%H%j$K=q$-9~$_%Q!<%_%C%7%g%s$,I,MW$G$9!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
-$B%3%^%s%I$O!"@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B%3%^%s%I$O!"@.8y$7$?>l9g$O(B 0 $B$r!"(B
+$B%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B5,3J(B
 .Nm
 $B%3%^%s%I$O!"(B
diff -ur man/man1/mt.1 man/man1/mt.1
--- man/man1/mt.1	Wed Jun 14 22:42:08 2000
+++ man/man1/mt.1	Wed Jul  5 09:35:52 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.19 2000/03/02 14:53:31 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.19.2.1 2000/06/30 09:51:51 ps Exp %
 .\" jpman %Id: mt.1,v 1.3 1997/06/16 09:29:17 taku Stab %
 .\"
 .Dd June 6, 1993
@@ -223,7 +223,7 @@
 $B$,B8:_$7$J$$>l9g!"(B
 .Nm
 $B$O%G%P%$%9(B
-.Pa /dev/nrsa0
+.Pa /dev/nsa0
 $B$r;HMQ$7$^$9!#(B
 .Pp
 .Nm
diff -ur man/man1/ncplist.1 man/man1/ncplist.1
--- man/man1/ncplist.1	Wed Jun 14 10:57:29 2000
+++ man/man1/ncplist.1	Wed Jul  5 09:35:53 2000
@@ -1,8 +1,8 @@
-.\" %FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.3 2000/03/01 12:20:03 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.3.2.1 2000/03/23 12:07:32 sheldonh Exp %
 .Dd Jun 24, 1999
 .\" jpman %Id: ncplist.1,v 1.3 2000/04/19 02:38:07 horikawa Stab %
 .Dt NCPLIST 1
-.Os FreeBSD 3.2
+.Os
 .Sh $BL>>N(B
 .Nm ncplist
 .Nd ncplib $B$H(B NetWare $B%5!<%P$K$D$$$F$5$^$6$^$J>pJs$rI=<($9$k(B
@@ -44,7 +44,9 @@
 .It s Op Ar server
 $B;XDj$7$?(B
 .Ar server
-$B$KCN$i$l$F$$$k(B NetWare $B%5!<%P$N%j%9%H$rI=<($7$^$9!#(B
+$B$KCN$i$l$F$$$k(B
+.Tn NetWare
+$B%5!<%P$N%j%9%H$rI=<($7$^$9!#(B
 $B%5!<%P$,;XDj$5$l$J$1$l$P:G$b6a$$%5!<%P$,;XDj$5$l$?$3$H$K$J$j$^$9!#(B
 .It u Ar server
 .Ar server
@@ -59,20 +61,21 @@
 .Ar server
 $B$K%^%&%s%H$5$l$F$$$k%\%j%e!<%`$rI=<($7$^$9!#(B
 .El
+.Sh $B<BAu$K4X$9$kCm(B
+$B$3$N%f!<%F%#%j%F%#$O<g$K650iL\E*$N$?$a$KDs6!$5$l$F$$$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /var/log/wtmp -compact
 .It Pa ~/.nwfsrc
 $B$O$=$l$>$l$N%3%M%/%7%g%s$K4X$9$k@bL@$rJ];}$7$^$9!#>\:Y$O(B
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 $B$r;2>H$7$F$/$@$5$$!#(B
-
-.Sh $BCm(B
-$B$3$N%f!<%F%#%j%F%#$O<g$K650iL\E*$N$?$a$KDs6!$5$l$F$$$^$9!#(B
-
-.Sh $B%P%0(B
-$B<c43$"$k$+$b$7$l$^$;$s!#(B
-
+.Sh $BNr;K(B
+.Nm
+$B%f!<%F%#%j%F%#$,:G=i$KEP>l$7$?$N$O(B
+.Fx 4.0
+$B$G$9!#(B
 .Sh $B:n<T(B
-.An Boris Popov Aq bp@butya.kz
-,
+.An Boris Popov Aq bp@butya.kz ,
 .Aq rbp@chat.ru
+.Sh $B%P%0(B
+$B%P%0$O:n<T$KJs9p$7$F$/$@$5$$!#(B
diff -ur man/man1/ncplogin.1 man/man1/ncplogin.1
--- man/man1/ncplogin.1	Wed Jun 14 10:57:29 2000
+++ man/man1/ncplogin.1	Wed Jul  5 09:35:55 2000
@@ -1,31 +1,46 @@
-.\" %FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.4 2000/03/06 09:45:30 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.4.2.2 2000/03/27 10:52:05 sheldonh Exp %
 .Dd Sep 15, 1999
 .\" jpman %Id: ncplogin.1,v 1.3 2000/04/19 02:38:14 horikawa Stab %
 .Dt NCPLOGIN 1
-.Os FreeBSD 4.0
+.Os
 .Sh $BL>>N(B
 .Nm ncplogin
 .Nd NetWare $B%5!<%P$X$N;}B3E*$J%3%M%/%7%g%s$r@8@.$9$k(B
 .Sh $B=q<0(B
 .Nm ncplogin
-.Op Fl S Ar server Fl U Ar user
+.Op Fl BCDN
+.Op Fl S Ar server
+.Op Fl U Ar user
 .Op Fl A Ar host
-.Op Fl B
-.Op Fl C
-.Op Fl D
 .Op Fl I Ar level
 .Op Fl M Ar mode
-.Op Fl N
-.\" hm, which is right way to do this ?
-.Op Fl O Ar owner Op :group
-.Op Fl O Ar :group
-|
+.Oo
+.Fl O Xo
+.Op Ar owner Ns
+.Op : Ns Ar group
+.Xc
+.Oc
 .Op Fl R Ar retrycount
 .Op Fl T Ar tree
 .Op Fl W Ar timeout
-.Ar /server:user
+.Nm ncplogin
+.Op Fl BCDN
+.Op Fl A Ar host
+.Op Fl I Ar level
+.Op Fl M Ar mode
+.Oo
+.Fl O Xo
+.Op Ar owner Ns
+.Op : Ns Ar group
+.Xc
+.Oc
+.Op Fl R Ar retrycount
+.Op Fl T Ar tree
+.Op Fl W Ar timeout
+.No / Ns Ar server Ns : Ns Ar user
 .Sh $B2r@b(B
-NetWare $B%5!<%P$X$N%3%M%/%7%g%s$O!"(B
+.Tn NetWare
+$B%5!<%P$X$N%3%M%/%7%g%s$O!"(B
 .Xr mount_nwfs 8
 $B$H$OFHN)$K!":n@.$*$h$S;HMQ2DG=$G$9!#(B
 .\" revision 1.5 $B$+$i$O(B independently of mount_nwfs(8) $B$K$J$C$F$$$k(B
@@ -35,8 +50,10 @@
 $B$3$H$,$G$-$^$9$,!"(BNetWare $B%5!<%P(B : NetWare $B%f!<%6$NAH$O0l0U$G$"$kI,MW(B
 $B$,$"$j$^$9!#(B
 .Pp
-.Nm ncplogin
-$B%3%^%s%I$O(B NetWare $B%5!<%P$H$N;}B3E*$J%3%M%/%7%g%s$r:n@.$7$^$9!#;}B3E*$J(B
+.Nm
+$B%3%^%s%I$O(B
+.Tn NetWare
+$B%5!<%P$H$N;}B3E*$J%3%M%/%7%g%s$r:n@.$7$^$9!#;}B3E*$J(B
 $B%3%M%/%7%g%s$O!"$=$l$r;HMQ$9$k%"%W%j%1!<%7%g%s$,$J$/$J$C$F$b;D$j$^$9!#(B
 $B$3$l$K$h$C$F%f!<%6$O(B ncp* $B%W%m%0%i%`$r%U%!%$%k%5!<%P$d%f!<%6L>$r;XDj$;$:$K(B
 $B;HMQ$9$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#%3%M%/%7%g%s$O(B
@@ -44,27 +61,37 @@
 $B%3%^%s%I$K$h$C$F2r=|$5$l$^$9!#(B
 .Pp
 $B$3$N%^%K%e%"%k$G2r@b$7$F$$$kBgJ8;z$N%*%W%7%g%s$OB>$N(B ncp* $B%W%m%0%i%`$H6&DL$G!"(B
-.Ar connection options
+.Qq connection options
 $B$H$7$F;2>H$5$l$^$9!#(B
 .Fl U
 $B5Z$S(B
 .Fl S
 $B%*%W%7%g%s$O!"(B
-.Ar /server:user
+.No / Ns Ar server Ns : Ns Ar user
 $B$H$$$&=q<0$HGSB>E*$K:nMQ$7$^$9!#(B
 .Pp
 $B%*%W%7%g%s$O0J2<$NDL$j$G$9!#(B
 .Bl -tag -width indent
 .It Fl S Ar server
-$B@\B3$9$k(B NetWare $B%5!<%PL>$r;XDj$7$^$9!#$3$l$O(B IPX $B%5!<%P$K$N$_M-8z$G$9!#(B
-$B%M%$%F%#%V(B IP $B%5!<%P$K$D$$$F$O(B
+$B@\B3$9$k(B
+.Tn NetWare
+$B%5!<%PL>$r;XDj$7$^$9!#$3$l$O(B
+.Tn IPX
+$B%5!<%P$K$N$_M-8z$G$9!#(B
+$B%M%$%F%#%V(B
+.Tn IP
+$B%5!<%P$K$D$$$F$O(B
 .Fl A
 $B%*%W%7%g%s$r;2>H$7$F$/$@$5$$!#(B
 .It Fl U Ar user
 $B%m%0%$%s<jB3$-$G;HMQ$9$k%f!<%6L>$r;XDj$7$^$9!#(B
 .It Fl A Ar host
 .Ar host
-$B%Q%i%a!<%?$G;XDj$7$?(B NetWare 5.x $B%5!<%P$X$N@\B3$K(B UDP $B%W%m%H%3%k$rMQ$$$^$9!#(B
+$B0z?t$G;XDj$7$?(B
+.Tn NetWare
+5.x $B%5!<%P$X$N@\B3$K(B
+.Tn UDP
+$B%W%m%H%3%k$rMQ$$$^$9!#(B
 .It Fl C
 $B%Q%9%o!<%I$rBgJ8;z$KJQ49$7$^$;$s!#(B
 .It Fl D
@@ -75,16 +102,18 @@
 .It Fl I Ar signature_level
 .Ar signature_level 
 $B$r;HMQ$7$h$&$H$7$^$9!#(B
+$B;HMQ2DG=$JCM$O<!$NDL$j$G$9(B:
 .Bd -literal -offset indent
 $BCM(B      $B0UL#(B
-0	$B=pL>$r6X;_$7$^$9!#(B
-1	$B%5!<%P$,MW5a$9$l$P=pL>$r5v2D$7$^$9!#(B
-2	$B%5!<%P$K=pL>$rMW5a$7$^$9$,!"=pL>$J$7$G$bF0:n$9$k$3$H$r5v2D$7$^$9!#(B
-3	$B=pL>$rMW5a$7$^$9!#(B
+0	$B=pL>$r6X;_$7$^$9(B
+1	$BM-8z2=$7$^$9(B ($B%5!<%P$,MW5a$9$l$P=pL>$r5v2D$7$^$9(B)
+2	$B%5!<%P$K=pL>$rMW5a$7$^$9$,!"=pL>$J$7$G$bF0:n$9$k$3$H$r5v2D$7$^$9(B
+3	$B=pL>$rMW5a$7$^$9(B
 .Ed
+.Pp
 $B%Q%1%C%H%X%C%@$X$N=pL>$@$1$,<BAu$5$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#(B
 .It Fl M Ar mode
-$B%U%!%$%k$HF1$8$h$&$K%3%M%/%7%g%s$b%f!<%64V$G6&M-$5$l$^$9!#$=$N:]$K!"(B
+$B%3%M%/%7%g%s$b%f!<%64V$G6&M-$5$l$^$9!#$=$N:]$K!"(B
 .Ar mode
 $B0z?t$N%S%C%H$,%U%!%$%k$N%Q!<%_%C%7%g%s$N$h$&$K$U$k$^$$$^$9!#(B
 .Bd -literal -offset indent
@@ -93,38 +122,48 @@
 2	WRITE   - $B%3%M%/%7%g%s$rJD$8$?$j!"JQ99$9$k$3$H$,$G$-$^$9!#(B
 1	EXECUTE - $B%f!<%6$O%j%/%(%9%H$r<B9T$9$k$3$H$,$G$-$^$9!#(B
 .Ed
-$B%G%U%)%k%H$G$O%3%M%/%7%g%s$O%b!<%I(B 0700 $B$G:n@.$5$l!"(B
+$B%G%U%)%k%H$G$O%3%M%/%7%g%s$O(B
+.Ar mode
+0700 $B$G:n@.$5$l!"(B
 $B=jM-<T$N$_$,$=$l$rG$0U$K;HMQ$9$k$3$H$,$G$-$^$9!#(B
-$B%3%M%/%7%g%s$r6&M-$7$?$$>l9g$K!"$?$H$($P%0%k!<%W$H$N6&M-$G(B
-$B$"$l$P(B 0750 $B$N$h$&$KCM$r;XDj$9$k$3$H$,$G$-$^$9!#$3$l$OF10l%0%k!<%W$+$i(B NCP
-$B%j%/%(%9%H$r9T$J$&$3$H$O$G$-$k$,!"@\B3$r2r=|$9$k$3$H$O$G$-$J$$$H$$$&$3$H$G$9!#(B
+.Fl M
+$B%*%W%7%g%s$K(B 0750 $B$r;XDj$9$k$H!"(B
+$B%0%k!<%W$KBP$9$kFI$_9~$_@lMQ%"%/%;%9$r5v2D$7$^$9!#(B
+$B$3$l$O!"%0%k!<%W$KBP$7!"(BNCP $B%j%/%(%9%H$r5v2D$7$^$9$,!"(B
+$B@\B32r=|$O5v2D$7$^$;$s!#(B
 $B%f!<%6$,;HMQ$9$k%5!<%P$rL@3N$K;XDj$7$J$+$C$?>l9g!"(Bncp* $B%W%m%0%i%`$O<!$N<j=g(B
 $B$GE,@Z$J%3%M%/%7%g%s$rC5$7$^$9!#(B
 .Pp
-1. $B%f!<%6$,=jM-$7$F$$$k%3%M%/%7%g%s$rC5$7$^$9!#(B
+.It $B%f!<%6$,=jM-$7$F$$$k%3%M%/%7%g%s$rC5$7$^$9!#(B
 $B$=$l$,J#?t$"$l$P$I$l$,%W%i%$%^%j$G$"$k$+$rC5$7$^$9!#%W%i%$%^%j%U%i%0$O(B
 .Fl D
 $B%*%W%7%g%s$G@)8f$G$-$^$9!#(B
 .Pp
-2. $B8+$D$+$i$J$+$C$?>l9g$O!":G=i$N6&M-%3%M%/%7%g%s$,;HMQ$5$l$^$9!#(B
+.It $B8+$D$+$i$J$+$C$?>l9g$O!":G=i$N6&M-%3%M%/%7%g%s$,;HMQ$5$l$^$9!#(B
+.El
 .It Fl N
 $B%Q%9%o!<%I$rMW5a$7$^$;$s!#(B
+$B<B9T;~$K(B
 .Nm
-$B$rFI$_9~$`$H(B ~/.nwfsrc $B%U%!%$%k$+$i@_Dj$NDI2C$H%Q%9%o!<%I$,FI$_9~$^$l$^$9!#(B
-$B$b$7;XDj$5$l$?%5!<%P$H%f!<%6$NAH9g$;$N%Q%9%o!<%I$,B8:_$7$J$1$l$P!"(B
+$B$O(B
+.Pa ~/.nwfsrc
+$B%U%!%$%k$+$i@_Dj$NDI2C$H%Q%9%o!<%I$rFI$_9~$_$^$9!#(B
+$B$b$7;XDj$5$l$?(B
+.Ar server Ns : Ns Ar user
+$B$N%Q%9%o!<%I$,B8:_$7$J$1$l$P!"(B
 .Nm
 $B$O$=$l$rMW5a$9$k%W%m%s%W%H$rI=<($7$^$9!#(B
 .It Fl O
-$B%U%!%$%k$HF1$8$h$&$K!"%3%M%/%7%g%s$b(B
+$B%3%M%/%7%g%s$KBP$9$k(B
 .Ar owner
 $B$H(B
 .Ar group
-$B$NB0@-$r;}$C$F$$$^$9!#?7$7$/:n@.$5$l$?%3%M%/%7%g%s$G$O(B
+$B$NB0@-$r;XDj$7$^$9!#?7$7$/:n@.$5$l$?%3%M%/%7%g%s$G$O(B
 .Ar owner
-$B%Q%i%a!<%?$K:n@.<T$N%f!<%6(B ID $B$,!"(B
+$BB0@-$K:n@.<T$N%f!<%6(B ID $B$,!"(B
 .Ar group
-$B%Q%i%a!<%?$K:n@.<T$N%W%i%$%^%j%0%k!<%W$,;HMQ$5$l$^$9!#(B
-$B$3$l$O$3$N%*%W%7%g%s$K$h$C$FJQ99$9$k$3$H$,$G$-$^$9!#(B
+$BB0@-$K:n@.<T$N%W%i%$%^%j%0%k!<%W$,;HMQ$5$l$^$9!#(B
+$B$3$NF0:n$O$3$N%*%W%7%g%s$K$h$C$FJQ99$9$k$3$H$,$G$-$^$9!#(B
 .Ar owner
 $B$rJQ99$G$-$k$N$O%9!<%Q%f!<%6$@$1$G$9!#(B
 .It Fl P
@@ -134,19 +173,33 @@
 $B$G;HMQ2DG=$G$9!#(B
 .It Fl R Ar retry_count
 $B@\B3$r$"$-$i$a$kA0$N:F;n9T2s?t$r;XDj$7$^$9!#4{DjCM$O(B 10 $B$G$9!#(B
-
-$BCm0U(B: $B%3%M%/%7%g%s$,(B 'BAD' $B$H%^!<%/$5$l$?$"$H$O!"%j%/%(%9%HKh$K$=$l$r2sI|(B
-$B$7$h$&$H;n$_$^$9!#$3$N%W%m%;%9$O(B NCP $B%3%M%/%7%g%s$@$1$r2sI|$7$h$&$H$7$^$9$,!"(B
-$B%*!<%W%s$5$l$F$$$k%U%!%$%k$r:F%*!<%W%s$7$h$&$H$O$7$^$;$s!#(B
+.Pp
+$BCm(B: $B%3%M%/%7%g%s$,(B
+.Sq BAD
+$B$H%^!<%/$5$l$?$"$H$O!"%j%/%(%9%HKh$K$=$l$r2sI|(B
+$B$7$h$&$H;n$_$^$9!#$3$N%W%m%;%9$O(B
+.Tn NCP
+$B%3%M%/%7%g%s$@$1$r2sI|$7$h$&$H$7$^$9$,!"(B
+.Sq BAD
+$B$H%^!<%/$5$l$?$H$-$K(B
+$B%*!<%W%s$5$l$F$$$?%U%!%$%k$r:F%*!<%W%s$7$h$&$H$O$7$^$;$s!#(B
 .It Fl W Ar timeout
 $B%5!<%P$X$N%j%/%(%9%H;~$N%?%$%`%"%&%H;~4V$rICC10L$G;XDj$7$^$9!#(B
 $B4{DjCM$O(B 5 $BIC$G$9!#(B
-.It Ar /server:user
+.It / Ns Ar server Ns : Ns Ar user
 $B$3$NJ8K!$OC1=c$JA`:n$N$?$a$KDs6!$5$l$F$*$j!"(B
 .Fl S
 $B5Z$S(B
 .Fl U
 $B%*%W%7%g%s$HGSB>E*$K:nMQ$7$^$9!#(B
+.Sh $B<BAu$K4X$9$kCm(B
+$BDc%l%Y%k$N@\B34IM}$O(B
+.Pa ncp.ko
+$B%b%8%e!<%k$G<B8=$5$l$^$9!#(B
+.Tn IPX
+$B%5%]!<%H$N$?$a$K$O!"$5$i$K(B
+.Xr IPXrouted 8
+$B%W%m%0%i%`$rFI$_9~$`I,MW$,$"$j$^$9!#(B
 .El
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /var/log/wtmp -compact
@@ -154,14 +207,13 @@
 $B$O%3%M%/%7%g%s$d$=$NB>$N>pJs$K4X$7$F@EE*$J%Q%i%a!<%?$rJ];}$7$^$9!#>\:Y$O(B
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 $B$r;2>H$7$F$/$@$5$$!#(B
-
-.Sh $BCm(B
-$BDc%l%Y%k$N@\B34IM}$O(B ncp.ko $B%b%8%e!<%k$G<B8=$5$l$^$9!#(B
-IPX $B%W%m%H%3%k$K4X$7$F$O$5$i$K(B IPXrouted $B%W%m%0%i%`$rFI$_9~$`I,MW$,$"$j$^$9!#(B
-
-.Sh $B%P%0(B
-$B<c43$"$k$+$b$7$l$^$;$s!#(B
-
+.Sh $BNr;K(B
+.Nm
+$B$,:G=i$KEP>l$7$?$N$O(B
+.Fx 4.0
+$B$G$9!#(B
 .Sh $B:n<T(B
 .An Boris Popov Aq bp@butya.kz ,
 .Aq rbp@chat.ru
+.Sh $B%P%0(B
+$B%P%0$O:n<T$KJs9p$7$F$/$@$5$$!#(B
diff -ur man/man1/ncplogout.1 man/man1/ncplogout.1
--- man/man1/ncplogout.1	Wed Jun 14 10:57:29 2000
+++ man/man1/ncplogout.1	Wed Jul  5 09:35:56 2000
@@ -1,8 +1,8 @@
-.\" %FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.3 2000/03/01 12:20:05 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.3.2.1 2000/03/24 07:47:05 sheldonh Exp %
 .Dd Sep 15, 1999
 .\" jpman %Id: ncplogout.1,v 1.3 2000/04/19 02:38:18 horikawa Stab %
 .Dt NCPLOGOUT 1
-.Os FreeBSD 4.0
+.Os
 .Sh $BL>>N(B
 .Nm ncplogout
 .Nd $B;}B3E*$J%3%M%/%7%g%s$rJD$8$k$h$&%9%1%8%e!<%k$9$k(B
@@ -13,34 +13,43 @@
 .Op -c Ar handle
 .Nm ncplogout
 .Op -c Ar handle
-.Ar /server:user
+.No / Ns Ar server Ns : Ns Ar user
 .Sh $B2r@b(B
 .Nm
 $B$O(B
 .Xr ncplogin 1
 $B$K$h$C$F@8@.$5$l$?%3%M%/%7%g%s$rJD$8$k$h$&%9%1%8%e!<%k$7$^$9!#(B
 $B$b$7$=$N%3%M%/%7%g%s$,B>$N%W%m%;%9(B
-$B$G;HMQCf$G$"$k$J$I$NM}M3$K$h$j%S%8!<>uBV$G$"$l$P!":G8e$N%W%m%;%9$,=*N;$7$?;~(B
-$BE@$GJD$8$i$l$^$9$3$N%3%^%s%I$O(B DOS $B$N(B logout.exe $B%3%^%s%I$HF1Ey$G$9!#(B
+$B$G;HMQCf$G$"$k$J$I$NM}M3$K$h$j%S%8!<>uBV$G$"$l$P!"(B
+$B;HMQCf$N:G8e$N%W%m%;%9$,=*N;$7$?;~E@$GJD$8$i$l$^$9!#(B
+$B$3$N%3%^%s%I$O(B
+.Tn DOS
+$B$N(B logout.exe $B%3%^%s%I$HF1Ey$G$9!#(B
 .Pp
 $B%*%W%7%g%s$O0J2<$NDL$j$G$9!#(B
 .Bl -tag -width indent
 .It Fl S Ar server
-$B%3%M%/%7%g%s$r<1JL$9$k(B NetWare $B%5!<%P$NL>>N$G$9!#(B
+$B%3%M%/%7%g%s$r<1JL$9$k(B
+.Tn NetWare
+$B%5!<%P$NL>>N$r;XDj$7$^$9!#(B
 $B%"%/%F%#%V$J%3%M%/%7%g%s$,$R$H$D$7$+$J$$>l9g$O>JN,$G$-$^$9!#(B
 .It Fl U Ar user
 $B%3%M%/%7%g%s$r<1JL$9$k%f!<%6L>$G$9!#(B
 $B%"%/%F%#%V$J%3%M%/%7%g%s$,$R$H$D$7$+$J$$>l9g$O>JN,$G$-$^$9!#(B
 .It Fl c Ar handle
-$B%O%s%I%k$G%3%M%/%7%g%s$rJD$8$^$9!#;HMQ2DG=$J%O%s%I%k$N%j%9%H$O(B
+$B%O%s%I%k$G%3%M%/%7%g%s$rJD$8$^$9!#(B
+$B;HMQ2DG=$J%O%s%I%k$N%j%9%H$O<!$N%3%^%s%I$GF@$i$l$^$9(B:
 .Bd -literal -offset indent
 	ncplist c
 .Ed
-$B$GCN$k$3$H$,$G$-$^$9!#(B
 .El
-.Sh $B%P%0(B
-$B<c43B8:_$7$^$9!#(B
-
+.Sh $BNr;K(B
+.Nm
+$B%f!<%F%#%j%F%#$,:G=i$KEP>l$7$?$N$O(B
+.Fx 4.0
+$B$G$9!#(B
 .Sh $B:n<T(B
 .An Boris Popov Aq bp@butya.kz ,
 .Aq bp@freebsd.org
+.Sh $B%P%0(B
+$B%P%0$O:n<T$KJs9p$7$F$/$@$5$$!#(B
diff -ur man/man1/nohup.1 man/man1/nohup.1
--- man/man1/nohup.1	Tue Feb 15 23:34:54 2000
+++ man/man1/nohup.1	Wed Jul  5 09:35:57 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)nohup.1	6.8 (Berkeley) 7/27/91
-.\" %FreeBSD: src/usr.bin/nohup/nohup.1,v 1.6 1999/09/14 11:46:03 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/nohup/nohup.1,v 1.6.2.1 2000/07/02 09:52:14 ps Exp %
 .\" jpman %Id: nohup.1,v 1.2 1997/05/04 13:33:09 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -45,13 +45,14 @@
 .Sh $B=q<0(B
 .Nm
 .Ar command
-.Op Ar arg ...
+.Op Ar arguments
 .Sh $B2r@b(B
 .Nm
 $B$O(B
 .Dv SIGHUP
-$B%7%0%J%k$rL5;k$9$k$h$&$K@_Dj$7!";XDj$5$l$?%3%^%s%I$r;XDj$5$l$?0z?tIU$G(B
-$B<B9T$7$^$9!#(B
+$B%7%0%J%k$rL5;k$9$k$h$&$K@_Dj$7!";XDj$5$l$?%3%^%s%I$r;XDj$5$l$?(B
+.Ar arguments
+$BIU$G<B9T$7$^$9!#(B
 .Dv SIGQUIT
 $B$bL5;k$9$k$h$&$K@_Dj$7$^$9!#(B
 $BI8=`=PNO$,C<Kv$N;~!"%3%^%s%I$N=PNO$O%+%l%s%H%G%#%l%/%H%j$N%U%!%$%k(B
diff -ur man/man1/opieinfo.1 man/man1/opieinfo.1
--- man/man1/opieinfo.1	Tue Feb 15 23:34:54 2000
+++ man/man1/opieinfo.1	Wed Jul  5 09:35:59 2000
@@ -1,7 +1,7 @@
 .\" opieinfo.1: Manual page for the opieinfo(1) program.
 .\"
 .\" %%% portions-copyright-cmetz-96
-.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
+.\" Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
 .\" Reserved. The Inner Net License Version 2 applies to these portions of
 .\" the software.
 .\" You should have received a copy of the license with this software. If
@@ -19,6 +19,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinfo.1).
 .\"
+.\"	%FreeBSD: src/contrib/opie/opieinfo.1,v 1.3.6.1 2000/06/09 07:14:56 kris Exp %
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff -ur man/man1/opiekey.1 man/man1/opiekey.1
--- man/man1/opiekey.1	Tue Feb 15 23:34:54 2000
+++ man/man1/opiekey.1	Wed Jul  5 09:36:01 2000
@@ -1,7 +1,7 @@
 .\" opiekey.1: Manual page for the opiekey(1) program.
 .\"
 .\" %%% portions-copyright-cmetz-96
-.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
+.\" Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
 .\" Reserved. The Inner Net License Version 2 applies to these portions of
 .\" the software.
 .\" You should have received a copy of the license with this software. If
@@ -25,6 +25,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(key.1).
 .\"
+.\"	%FreeBSD: src/contrib/opie/opiekey.1,v 1.3.6.1 2000/06/09 07:14:56 kris Exp %
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff -ur man/man1/opiepasswd.1 man/man1/opiepasswd.1
--- man/man1/opiepasswd.1	Tue Feb 15 23:34:54 2000
+++ man/man1/opiepasswd.1	Wed Jul  5 09:36:02 2000
@@ -1,7 +1,7 @@
 .\" opiepasswd.1: Manual page for the opiepasswd(1) program.
 .\"
 .\" %%% portions-copyright-cmetz-96
-.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
+.\" Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
 .\" Reserved. The Inner Net License Version 2 applies to these portions of
 .\" the software.
 .\" You should have received a copy of the license with this software. If
@@ -21,6 +21,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinit.1).
 .\"
+.\"	%FreeBSD: src/contrib/opie/opiepasswd.1,v 1.3.6.1 2000/06/09 07:14:57 kris Exp %
 .ll 6i 
 .pl 10.5i 
 .lt 6.0i
diff -ur man/man1/paste.1 man/man1/paste.1
--- man/man1/paste.1	Tue Feb 15 23:34:54 2000
+++ man/man1/paste.1	Wed Jul  5 09:36:04 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/paste/paste.1,v 1.4 1999/08/28 01:04:53 peter Exp %
+.\" %FreeBSD: src/usr.bin/paste/paste.1,v 1.4.2.1 2000/06/30 09:51:52 ps Exp %
 .\" jpman %Id: paste.1,v 1.3 1997/07/22 17:53:46 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -65,8 +65,9 @@
 $BCf$NJ8;z$O=d2s$9$k$h$&$K;H$o$l$^$9!#$D$^$j!"(B
 .Ar list
 $B$NJ8;z$,=*$C$?;~$K$O:G=i$NJ8;z$,:F$S;H$o$l$^$9!#(B
-$B$3$l$O!"(B($B%G%U%)%k%H$NA`:n$G$O(B) $B:G8e$NF~NO%U%!%$%k$+$i$N9T$^$G!"$b$7$/$O(B
-(-s $B%*%W%7%g%s;HMQ;~$K$O(B) $B3F%U%!%$%k$N:G8e$N9T$,I=<($5$l$k$^$GB3$-$^$9!#(B
+$B$3$l$O!"(B($B%G%U%)%k%H$NA`:n$G$O(B) $B:G8e$NF~NO%U%!%$%k$+$i$N9T$^$G!"$b$7$/$O(B (
+.Fl s
+$B%*%W%7%g%s;HMQ;~$K$O(B) $B3F%U%!%$%k$N:G8e$N9T$,I=<($5$l$k$^$GB3$-$^$9!#(B
 $B:G8e$N9T$rI=<($7$?$H$3$m$G!"(B
 .Nm
 $B$O!"A*Br$5$l$?J8;z$N:G=i$+$iA`:n$r9T$$$^$9!#(B
@@ -87,7 +88,9 @@
 $B>e5-0J30$NJ8;z$O!"%P%C%/%9%i%C%7%eIU$-$N>l9g$=$NJ8;z<+?H$rI=8=$7$^$9!#(B
 .It Fl s
 $BJL8D$NF~NO%U%!%$%k$NA49T$N7k9g$r!"%3%^%s%I%i%$%s$KJB$s$@=g$K9T$$$^$9!#(B
-$BF~NO%U%!%$%kCf$N!":G8e$N9T0J30$NA4$F$N9T$N2~9TJ8;z$O!"(B -d $B%*%W%7%g%s$,(B
+$BF~NO%U%!%$%kCf$N!":G8e$N9T0J30$NA4$F$N9T$N2~9TJ8;z$O!"(B
+.Dl d
+$B%*%W%7%g%s$,(B
 $B;XDj$5$l$F$$$J$$>l9g$O!"%?%VJ8;z$GCV$-49$($i$l$^$9!#(B
 .El
 .Pp
@@ -96,10 +99,10 @@
 $BI8=`F~NO$O!"0lEY$K0l9TFI$_9~$^$l!"=d2sE*$K(B
 .Ql Fl 
 $B$N3F<BBN$H$7$F;H$o$l$^$9!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
-$B$O!"@.8y$7$?>l9g(B 0 $B$G=*N;$7$^$9!#$^$?!"%(%i!<$,5/$3$C$?>l9g$O(B 1 $B0J>e$G(B
-$B=*N;$7$^$9!#(B
+$B$O!"@.8y$7$?>l9g(B 0 $B$G=*N;$7$^$9!#(B
+$B$^$?!"%(%i!<$,5/$3$C$?>l9g$O(B 0 $B$h$jBg$-$JCM$G=*N;$7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr cut 1
 .Sh $B5,3J(B
diff -ur man/man1/printenv.1 man/man1/printenv.1
--- man/man1/printenv.1	Wed Jun 14 22:42:08 2000
+++ man/man1/printenv.1	Wed Jul  5 09:36:05 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6 2000/03/01 12:20:08 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6.2.3 2000/06/30 09:51:52 ps Exp %
 .\" jpman %Id: printenv.1,v 1.2 1997/04/17 13:59:49 j5306050 Stab %
 .\"
 .Dd June 6, 1993
@@ -64,6 +64,12 @@
 $B$G;XDj$5$l$?4D6-JQ?t$,Dj5A$5$l$F$$$J$+$C$?>l9g!"(B
 .Nm printenv
 $B$OLa$jCM$H$7$F(B 1 $B$rJV$7$^$9!#$=$l0J30$N>l9g$O(B 0 $B$rJV$7$^$9!#(B
+.Pp
+$B%7%'%k$K$h$C$F$O!"K\%f!<%F%#%j%F%#$K;w$F$$$k$^$?$OF1Ey$N!"AH$_9~$_(B
+.Nm
+$B%3%^%s%I$rDs6!$7$F$$$^$9!#(B
+.Xr builtin 1
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .Pp
 .Nm env
 $B$O!"%3%^%s%I%i%$%s$G;XDj$5$l$?4D6-JQ?t$NCM$rJQ99$7$F$+$i(B
diff -ur man/man1/quota.1 man/man1/quota.1
--- man/man1/quota.1	Tue Feb 15 23:34:55 2000
+++ man/man1/quota.1	Wed Jul  5 09:36:08 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quota.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/quota/quota.1,v 1.7 1999/08/28 01:04:59 peter Exp %
+.\" %FreeBSD: src/usr.bin/quota/quota.1,v 1.7.2.1 2000/07/02 09:57:51 ps Exp %
 .\" jpman %Id: quota.1,v 1.2 1997/05/17 16:06:48 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -60,9 +60,8 @@
 $B$O!"%f!<%6$N%G%#%9%/;HMQNL$H3d$jEv$F@)8B$rI=<($7$^$9!#%G%U%)%k%H$G(B
 $B$O%f!<%6$KBP$9$k3d$jEv$F@)8B$K4X$9$k>pJs$N$_$,I=<($5$l$^$9!#(B
 .Pp
-$B%*%W%7%g%s(B
-.Pp
-.Bl -tag -width Ds
+$B<!$N%*%W%7%g%s$r;HMQ2DG=$G$9(B:
+.Bl -tag -width indent
 .It Fl g
 $B%f!<%6$,=jB0$9$k%0%k!<%W$KBP$9$k%0%k!<%W3d$jEv$F@)8B$rI=<($7$^$9!#(B
 $B$3$l$KBP$7!"(B
@@ -101,12 +100,12 @@
 .Nm
 $B$O%^%&%s%H$5$l$F$$$kA4$F$N%U%!%$%k%7%9%F%`$K4X$7$FJs9p$7$h$&$H$7$^$9!#(B
 $B%U%!%$%k%7%9%F%`$,(B
-.Nm NFS
+.Tn NFS
 $B$r2p$7$F%^%&%s%H$5$l$F$$$k>l9g!"(B
 .Xr rpc.rquotad 8
-.Nm NFS
+.Tn NFS
 $B%5!<%P$N%G!<%b%s$HO"Mm$7$h$&$H$7$^$9!#(B
-.Nm UFS
+.Tn UFS
 $B%U%!%$%k%7%9%F%`$G$O!"(B
 .Nm
 $B$O(B
diff -ur man/man1/rm.1 man/man1/rm.1
--- man/man1/rm.1	Tue Feb 15 23:34:55 2000
+++ man/man1/rm.1	Wed Jul  5 09:36:10 2000
@@ -127,7 +127,7 @@
 $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
-$B%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $BCm(B
 .Nm
 $B$O0z?t$r%Q!<%9$9$k$?$a$K(B
diff -ur man/man1/rup.1 man/man1/rup.1
--- man/man1/rup.1	Tue Feb 15 23:34:55 2000
+++ man/man1/rup.1	Wed Jul  5 09:36:11 2000
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/rup/rup.1,v 1.7 1999/08/28 01:05:26 peter Exp %
+.\" %FreeBSD: src/usr.bin/rup/rup.1,v 1.7.2.1 2000/06/30 09:51:55 ps Exp %
 .\" jpman %Id: rup.1,v 1.2 1997/05/07 02:31:39 mutoh Stab %
 .\"
 .Dd June 7, 1993
@@ -46,7 +46,7 @@
 .Sh $B2r@b(B
 .Nm
 $B$O!"FCDj$N(B
-.Em host
+.Ar host
 $B!"$b$7$/$O%m!<%+%k%M%C%H%o!<%/>e$N$9$Y$F$N%^%7%s$K$D$$$F!"(B
 $B8=:_$N%7%9%F%`>uBV$rI=<($7$^$9!#%3%^%s%I=PNO$K$O!"8=:_;~9o!"%7%9%F%`$,N)$A>e(B
 $B$,$C$F$+$i$N7P2a;~4V!"$=$7$F%m!<%I%"%Y%l!<%8$,I=<($5$l$^$9!#%m!<%I%"%Y%l!<%8(B
@@ -57,7 +57,9 @@
 .Xr rpc.rstatd 8
 $B%G!<%b%s$,5/F0$7$F$$$kI,MW$,$"$j$^$9!#(B
 .Nm
-$B$O(B /usr/include/rpcsvc/rstat.x $B$KDj5A$5$l$F$$$k(B RPC $B%W%m%H%3%k$r(B
+$B$O(B
+.Pa /usr/include/rpcsvc/rstat.x
+$B$KDj5A$5$l$F$$$k(B RPC $B%W%m%H%3%k$r(B
 $B;HMQ$7$^$9!#(B
 .Sh $B;HMQNc(B
 .Bd -unfilled -offset indent -compact
diff -ur man/man1/ruptime.1 man/man1/ruptime.1
--- man/man1/ruptime.1	Tue Feb 15 23:34:55 2000
+++ man/man1/ruptime.1	Wed Jul  5 09:36:12 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\" %FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.8 1999/11/01 19:42:02 nik Exp %
+.\" %FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.8.2.1 2000/06/30 09:45:00 ps Exp %
 .\"
 .\" jpman %Id: ruptime.1,v 1.2 1997/05/20 01:35:36 mutoh Stab %
 .\"
@@ -46,7 +46,7 @@
 .Sh $B2r@b(B
 .Nm ruptime
 $B$O!"%m!<%+%k%M%C%H%o!<%/>e$K@\B3$5$l$?A4%^%7%s$K$D$$$F!"(B
-.Ar uptime
+.Xr uptime 1
 $B$HF1MM$NI=<($r9T$J$$$^$9!#$3$NI=<($O!"%M%C%H%o!<%/>e$N3F%[%9%H$+$i(B 3 $BJ,$4$H$K(B
 $B%V%m!<%I%-%c%9%H$5$l$k%Q%1%C%H$r$b$H$K:n@.$5$l$^$9!#(B
 .Pp
@@ -57,7 +57,9 @@
 $B0J2<$N%*%W%7%g%s$,;HMQ2DG=$G$9!#(B
 .Bl -tag -width Ds
 .It Fl a
-$B%"%$%I%k;~4V$,(B 1 $B;~4V0J>e$N%f!<%6$K$D$$$F$bI=<($7$^$9!#(B
+$B$9$Y$F$N%f!<%6$r4^$a$^$9!#(B
+$B%G%U%)%k%H$G$O!"%f!<%6$,(B 1 $B;~4V0J>e%7%9%F%`$XF~NO$7$J$+$C$?>l9g!"(B
+$B$=$N%f!<%6$O=PNO$+$i>JN,$5$l$^$9!#(B
 .It Fl l
 $B%m!<%I%"%Y%l!<%8=g$K%=!<%H$7$^$9!#(B
 .It Fl r
diff -ur man/man1/rusers.1 man/man1/rusers.1
--- man/man1/rusers.1	Wed Jun 14 22:42:08 2000
+++ man/man1/rusers.1	Wed Jul  5 09:36:14 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.8 2000/03/01 12:20:09 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.8.2.1 2000/06/30 09:51:55 ps Exp %
 .\" jpman %Id: rusers.1,v 1.3 1997/08/20 12:45:29 horikawa Stab %
 .\"
 .Dd April 23, 1991
@@ -46,13 +46,19 @@
 .Sh $B2r@b(B
 .Nm
 $B%3%^%s%I$O(B
-.Xr who
+.Xr who 1
 $B$HF1MM$N7k2L$r=PNO$7$^$9$,!"(B
-$B;XDj$7$?%[%9%H$N%j%9%H!"$"$k$$$O%m!<%+%k%M%C%H%o!<%/>e$NA4%^%7%s$KBP$9$k(B
+$B;XDj$7$?(B
+.Ar host
+$B$N%j%9%H!"$"$k$$$O%m!<%+%k%M%C%H%o!<%/>e$NA4%^%7%s$KBP$9$k(B
 $B7k2L$r=PNO$7$^$9!#(B
-rusers $B$NLd$$9g$o$;$KJVEz$7$?3F%[%9%H$KBP$7$F!"(B
+rusers $B$NLd$$9g$o$;$KJVEz$7$?3F(B
+.Ar host
+$B$KBP$7$F!"(B
 $B8=:_%m%0%$%s$7$F$$$k%f!<%6L>$,%[%9%HL>$H6&$K3F9T$K=PNO$5$l$^$9!#(B
-$BJVEz$NCY$$%[%9%H$N$?$a$K(B rusers $B%3%^%s%I$O(B 1 $BJ,4VBT$A$^$9!#(B
+$BJVEz$NCY$$%[%9%H$N$?$a$K(B
+.Nm
+$B%3%^%s%I$O(B 1 $BJ,4VBT$A$^$9!#(B
 .Pp
 $B0J2<$N%*%W%7%g%s$,MxMQ2DG=$G$9(B:
 .Bl -tag -width indent
@@ -69,16 +75,16 @@
 .El
 .Sh $B?GCG(B
 .Bl -tag -width indent
-.It rusers: RPC: Program not registered
+.It Nm Ns : RPC: Program not registered
 $B%j%b!<%H%[%9%H>e$G(B
 .Xr rpc.rusersd 8
 $B%G!<%b%s$,5/F0$5$l$F$$$^$;$s!#(B
-.It rusers: RPC: Timed out
+.It Nm Ns : RPC: Timed out
 $BDL?.%(%i!<$,@8$8$^$7$?!#(B
 $B%M%C%H%o!<%/$,Hs>o$K:.$s$G$$$k$+!"%j%b!<%H%[%9%H>e$N(B
 .Xr rpc.rusersd 8
 $B%G!<%b%s$,=*N;$7$^$7$?!#(B
-.It rusers: RPC: Port mapper failure - RPC: Timed out
+.It Nm Ns : "RPC: Port mapper failure - RPC: Timed out"
 $B%j%b!<%H%[%9%H$G(B portmapper (
 .Xr portmap 8
 $B;2>H(B)$B$,F0$$$F$*$i$:!"A4$F$N(B RPC $B%Y!<%9$N%5!<%S%9$,MxMQ$G$-$^$;$s!#(B
diff -ur man/man1/rwall.1 man/man1/rwall.1
--- man/man1/rwall.1	Wed Jun 14 22:42:08 2000
+++ man/man1/rwall.1	Wed Jul  5 09:36:15 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.7 2000/03/01 12:20:09 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.7.2.1 2000/06/30 09:51:56 ps Exp %
 .\" jpman %Id: rwall.1,v 1.2 1997/05/21 00:38:04 mutoh Stab %
 .\"
 .Dd April 23, 1991
@@ -45,7 +45,9 @@
 .Op Ar file
 .Sh $B2r@b(B
 .Nm
-$B$O!";XDj$7$?%[%9%H$K%m%0%$%s$7$F$$$k%f!<%6$K%a%C%;!<%8$rAw?.$7$^$9!#(B
+$B$O!";XDj$7$?(B
+.Ar host
+$B$K%m%0%$%s$7$F$$$k%f!<%6$K%a%C%;!<%8$rAw?.$7$^$9!#(B
 $BAw?.$9$k%a%C%;!<%8$H$7$F$O!"C<Kv$+$iF~NO$5$l(B EOF $B$G=*N;$9$k$b$N$+!"(B
 .Ar file
 $B$K5-=R$5$l$F$$$k$b$N$rMQ$$$k$3$H$,=PMh$^$9!#(B
diff -ur man/man1/rwho.1 man/man1/rwho.1
--- man/man1/rwho.1	Tue Feb 15 23:34:55 2000
+++ man/man1/rwho.1	Wed Jul  5 09:36:16 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwho.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/rwho/rwho.1,v 1.6 1999/08/28 01:05:33 peter Exp %
+.\" %FreeBSD: src/usr.bin/rwho/rwho.1,v 1.6.2.1 2000/06/30 09:51:56 ps Exp %
 .\" jpman %Id: rwho.1,v 1.2 1997/05/21 00:39:50 mutoh Stab %
 .\"
 .Dd June 6, 1993
@@ -45,18 +45,17 @@
 .Sh $B2r@b(B
 .Nm
 $B%3%^%s%I$O!"%m!<%+%k%M%C%H%o!<%/>e$NA4$F$N%^%7%s$K$D$$$F(B
-.Xr who
+.Xr who 1
 $B$H;w$?=PNO$r9T$J$$$^$9!#(B5 $BJ,0J>e%l%9%]%s%9$,$J$$%^%7%s$O(B
 down $B$7$F$$$k$b$N$H$_$J$7!"$=$N%^%7%s$K4X$9$k%f!<%6$N%m%0%$%s>pJs$r(B
 $BI=<($7$^$;$s!#(B
 .Pp
-$B$b$7!"%^%7%s$K%m%0%$%s$7$F$$$k%f!<%6$,(B 1 $BJ,0J>eC<Kv$+$i$NF~NO$r(B
-$B9T$J$C$F$$$J$$>l9g!"(B
-.Nm
-$B$O$=$N;~4V$r(B idle $B;~4V$H$7$FJs9p$7$^$9!#(Bidle $B;~4V$,(B 1 $B;~4V0J>e$N(B
-$B%f!<%6>pJs$O(B
-.Fl a
-$B%*%W%7%g%s$,;XDj$5$l$J$$8B$jI=<($7$^$;$s!#(B
+$B<!$N%*%W%7%g%s$r;HMQ2DG=$G$9(B:
+.It Fl a
+$B$9$Y$F$N%f!<%6$r4^$a$^$9!#(B
+$B%G%U%)%k%H$G$O!"%f!<%6$,(B 1 $B;~4V0J>e%7%9%F%`$XF~NO$7$J$+$C$?>l9g!"(B
+$B$=$N%f!<%6$O=PNO$+$i>JN,$5$l$^$9!#(B
+.El
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /var/rwho/whod.* -compact
 .It Pa /var/rwho/whod.*
diff -ur man/man1/sasc.1 man/man1/sasc.1
--- man/man1/sasc.1	Wed Jun 14 22:42:08 2000
+++ man/man1/sasc.1	Wed Jul  5 09:36:18 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.9 2000/03/01 12:20:10 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.9.2.1 2000/06/30 09:47:52 ps Exp %
 .\" jpman %Id: sasc.1,v 1.3 1997/07/22 17:55:16 horikawa Stab %
 .\"
 .Dd January 6, 1995
@@ -57,7 +57,8 @@
 .Nm
 $B$,%*%W%7%g%sL5$7$G8F$S=P$5$l$?>l9g!"8=:_$N@_Dj$,(B
 $BJs9p$5$l$^$9!#(B
-.Sh $B%*%W%7%g%s(B
+.Pp
+$B<!$N%*%W%7%g%s$r;HMQ2DG=$G$9(B:
 .Bl -tag -width indent
 $B0J2<$N%*%W%7%g%s$r;HMQ2DG=$G$9!#(B
 .It Fl s Bq ASC_SRESSW
diff -ur man/man1/sockstat.1 man/man1/sockstat.1
--- man/man1/sockstat.1	Wed Jun 14 22:42:08 2000
+++ man/man1/sockstat.1	Wed Jul  5 09:36:19 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.6 2000/03/01 12:20:10 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.6.2.1 2000/06/30 09:51:57 ps Exp %
 .\"
 .\" jpman %Id: sockstat.1,v 1.3 1999/05/07 16:58:23 kuma Stab %
 .\"
diff -ur man/man1/tail.1 man/man1/tail.1
--- man/man1/tail.1	Tue Feb 15 23:34:56 2000
+++ man/man1/tail.1	Wed Jul  5 09:36:20 2000
@@ -119,7 +119,7 @@
 $B$O%U%!%$%kL>$G$9!#(B
 .Pp
 .Nm
-$B$O!"@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B$O!"@.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 cat 1 ,
 .Xr head 1 ,
diff -ur man/man1/tar.1 man/man1/tar.1
--- man/man1/tar.1	Wed Jun 14 22:42:08 2000
+++ man/man1/tar.1	Wed Jul  5 09:36:24 2000
@@ -4,7 +4,7 @@
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"	Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
 .\"
-.\" %FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.22 2000/03/01 10:40:18 nik Exp %
+.\" %FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.22.2.1 2000/07/01 11:33:38 ps Exp %
 .\"
 .\" jpman %Id: tar.1,v 1.2 1997/06/24 07:09:44 bobson Stab %
 .Dd 25 August 1997
@@ -346,7 +346,7 @@
 $B%U%!%$%k$r:n@.$9$kA0$K!"$$$C$?$s:o=|$7$^$9!#(B
 .El
 .Sh $B;HMQNc(B
-"bert" $B$H(B "ernie" $B$H$$$&%U%!%$%k$r4^$`!"(B
+\&"bert" $B$H(B "ernie" $B$H$$$&%U%!%$%k$r4^$`!"(B
 $B%V%m%C%/%5%$%:$,(B 20 $B%V%m%C%/$N%"!<%+%$%V$r!"(B
 $B%F!<%W%I%i%$%V(B /dev/rsa0 $B$K:n$k$K$O!"(B
 .Pp
@@ -369,7 +369,7 @@
 .Pp
 .Dl tar c bert ernie
 .Pp
-"backup.tar" $B$H$$$&%"!<%+%$%V$+$i!"$9$Y$F$N(B C $B%=!<%95Z$S%X%C%@$r(B
+\&"backup.tar" $B$H$$$&%"!<%+%$%V$+$i!"$9$Y$F$N(B C $B%=!<%95Z$S%X%C%@$r(B
 $BCj=P$9$k$K$O!"<!$N$h$&$K%?%$%W$7$^$9!#(B
 .Pp
 .Dl tar xf backup.tar '*.[ch]'
@@ -386,18 +386,18 @@
 $B%G%#%9%1%C%H$K!"(Bgzip $B$r;H$C$?05=L%"!<%+%$%V$r:n@.$9$k$K$O!"<!$N(B
 $B$h$&$J%3%^%s%I%i%$%s$r;H$&$H$$$$$G$7$g$&!#(B
 .Pp
-.Dl tar --block-compress -z -c -v -f /dev/rfd1a -b 36 tar/
+.Dl tar --block-compress -z -c -v -f /dev/fd1a -b 36 tar/
 .Pp
 $B$^$H$a;XDj%U%i%0$H(B -- $B%9%?%$%k$N%U%i%0$r:.:_$5$;$k$3$H$,$G$-$J$$(B
 $B$3$H$KCm0U$7$F$/$@$5$$!#<!$N$h$&$K%?%$%W$7$J$1$l$P$J$i$J$$$o$1$G(B
 $B$O$J$/!">e5-$N$h$&$J=q$-J}$G(B 1 $BJ8;z%U%i%0$r;H$&$3$H$,$G$-$^$9!#(B
 .Pp
-.Dl tar --block-compress --gzip --verbose --file /dev/rfd1a --block-size 20 tar/
+.Dl tar --block-compress --gzip --verbose --file /dev/fd1a --block-size 20 tar/
 .Pp
 $B>e$N$h$&$K$7$F:n@.$7$?%G%#%9%/$NFbMF$O!"<!$N$h$&$K$9$l$P%j%9%H(B
 $BI=<($G$-$^$9!#(B
 .Pp
-.Dl tar tvfbz /dev/rfd1a 36
+.Dl tar tvfbz /dev/fd1a 36
 .Pp
 2 $B$D$N(B tar $B%"!<%+%$%V$r(B 1 $B$D$N%"!<%+%$%V$K$^$H$a$k$K$O!"(B
 .Pp
@@ -438,7 +438,7 @@
 .It SHELL
 $B%$%s%?%i%/%F%#%V%b!<%I$K$*$$$F!"%5%V%7%'%k$N5/F0$,MW5a$5$l$?$H$-!"(B
 SHELL $BJQ?t$,@_Dj$5$l$F$$$l$P$=$l$,!"@_Dj$5$l$F$$$J$1$l$P(B
-"/bin/sh" $B$,;HMQ$5$l$^$9!#(B
+\&"/bin/sh" $B$,;HMQ$5$l$^$9!#(B
 .It TAPE
 tar $B$N%G%U%)%k%H$N%F!<%W%I%i%$%V$rJQ99$7$^$9!#(B($B$3$l$O!"$5$i$K(B
 .Fl f
diff -ur man/man1/tcpslice.1 man/man1/tcpslice.1
--- man/man1/tcpslice.1	Tue Feb 15 23:34:56 2000
+++ man/man1/tcpslice.1	Wed Jul  5 09:36:26 2000
@@ -17,9 +17,9 @@
 .\" 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.7 1999/08/28 01:20:14 peter Exp %
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
+.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.7.2.1 2000/05/09 14:12:49 sheldonh Exp %
 .Dd October 14, 1991
 .Dt TCPSLICE 1
 .Os
diff -ur man/man1/tee.1 man/man1/tee.1
--- man/man1/tee.1	Tue Feb 15 23:34:56 2000
+++ man/man1/tee.1	Wed Jul  5 09:36:26 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/tee/tee.1,v 1.4 1999/08/28 01:06:21 peter Exp %
+.\" %FreeBSD: src/usr.bin/tee/tee.1,v 1.4.2.1 2000/06/30 09:51:57 ps Exp %
 .\" jpman %Id: tee.1,v 1.2 1997/03/29 11:45:44 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -75,10 +75,10 @@
 .Fl i
 $B%*%W%7%g%s$r;XDj$7$?>l9g$r=|$$$F$O!"A4$F$N%7%0%J%k$KBP$7$F%G%U%)%k%H$NF0:n$r(B
 $B$7$^$9!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
 $B%f!<%F%#%j%F%#$O!"@.8y$7$?>l9g$O(B 0 $B$r!"(B
-$B%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B%(%i!<$,5/$-$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B5,3J(B
 .Nm
 $B$O(B
diff -ur man/man1/telnet.1 man/man1/telnet.1
--- man/man1/telnet.1	Wed Jun 14 22:42:08 2000
+++ man/man1/telnet.1	Wed Jul  5 09:36:30 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\" %FreeBSD: src/usr.bin/telnet/telnet.1,v 1.15 2000/01/27 09:28:33 shin Exp %
+.\" %FreeBSD: src/usr.bin/telnet/telnet.1,v 1.15.2.1 2000/06/14 16:31:26 ume Exp %
 .\"
 .\" jpman %Id: telnet.1,v 1.2 1997/05/23 00:55:09 mutoh Stab %
 .\"
@@ -44,7 +44,7 @@
 $B%W%m%H%3%k$rMQ$$$FB>$N%[%9%H$HDL?.$9$k(B
 .Sh $B=q<0(B
 .Nm
-.Op Fl 8EFKLNacdfrx
+.Op Fl 468EFKLNacdfrx
 .Op Fl S Ar tos
 .Op Fl X Ar authtype
 .Op Fl e Ar escapechar
@@ -79,8 +79,14 @@
 .Nm
 $B%3%^%s%I$G$O!"0J2<$N%*%W%7%g%s$,;HMQ2DG=$G$9!#(B
 .Bl -tag -width indent
+.It Fl 4
+.Nm
+$B$K(B IPv4 $B%"%I%l%9$N$_$r;HMQ$9$k$h$&6/@)$7$^$9!#(B
+.It Fl 6
+.Nm
+$B$K(B IPv6 $B%"%I%l%9$N$_$r;HMQ$9$k$h$&6/@)$7$^$9!#(B
 .It Fl 8
-8$B%S%C%H%G!<%?$r$=$N$^$^DL$9$h$&;X<($7$^$9!#K\%*%W%7%g%s$O!"%G!<%?F~=PNO;~$K(B
+8 $B%S%C%H%G!<%?$r$=$N$^$^DL$9$h$&;X<($7$^$9!#K\%*%W%7%g%s$O!"%G!<%?F~=PNO;~$K(B
 .Dv TELNET BINARY
 $B%*%W%7%g%s$r;HMQ$9$k$3$H$r0UL#$7$^$9!#(B
 .It Fl E
diff -ur man/man1/tip.1 man/man1/tip.1
--- man/man1/tip.1	Wed Jun 14 22:42:08 2000
+++ man/man1/tip.1	Wed Jul  5 09:36:33 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.7 2000/03/01 12:20:21 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.7.2.1 2000/04/23 16:52:35 bsd Exp %
 .\" jpman %Id: tip.1,v 1.3 1997/07/26 21:48:01 horikawa Stab %
 .\"
 .Dd April 18, 1994
@@ -75,7 +75,7 @@
 $B$G;XDj$7$?$b$N$KJQ99$7$^$9(B
 ($B0z?t$,;XDj$5$l$J$$>l9g$K$O!"%[!<%`%G%#%l%/%H%j$K0\F0$7$^$9(B)$B!#(B
 .It Ic \&~!
-$B%7%'%k$r5/F0$7$^$9(B($B%7%'%k$r=*N;$9$k$H!"(Btip $B$KLa$j$^$9(B)$B!#(B
+$B%7%'%k$r5/F0$7$^$9(B ($B%7%'%k$r=*N;$9$k$H!"(Btip $B$KLa$j$^$9(B)$B!#(B
 .It Ic \&~>
 $B%m!<%+%k%^%7%s$N%U%!%$%k$r%j%b!<%H%^%7%s$K%3%T!<$7$^$9!#(B
 .Nm tip
@@ -179,13 +179,12 @@
 $B$,%3%M%/%7%g%s$r3NN)$9$k$H!"%j%b!<%H%[%9%H$K%3%M%/%7%g%s%a%C%;!<%8$r(B
 $BAw?.$7$^$9(B; $B%G%U%)%k%H$N%a%C%;!<%8$,B8:_$9$k$J$i$P(B
 .Pa /etc/remote
-$B$KDj5A$5$l$F$$$^$9(B
-(
+$B$KDj5A$5$l$F$$$^$9(B (
 .Xr remote 5 
-$B$r;2>H$7$F$/$@$5$$(B) $B!#(B
+$B$r;2>H$7$F$/$@$5$$(B)$B!#(B
 .Pp
 .Nm tip
-$B$K0z?t$NF~NO$rB%$5$l$F$$$k>l9g(B($BNc$($P!"%U%!%$%kE>Aw$N@_Dj$N4V(B)
+$B$K0z?t$NF~NO$rB%$5$l$F$$$k>l9g(B ($BNc$($P!"%U%!%$%kE>Aw$N@_Dj$N4V(B)
 $B$K$O!"F~NO$5$l$?9T$OI8=`$N(B erase $B$d(B kill $BJ8;z$GJT=8$9$k$3$H$,5v$5$l$F$$$^$9!#(B
 $BF~NO$rB%$5$l$F$$$k;~$K6u9T$rF~NO$7$?$jA`:n$rCfCG(B
 $B$7$?>l9g$K$O!"F~NO$rB%$92hLL$+$iH4$1=P$7!"%j%b!<%H%^%7%s$H$NBPOC$KLa$j$^$9!#(B
@@ -201,7 +200,7 @@
 $B$OE>Aw$7$?9T?t$rI=<($7$^$9!#(B
 ~> $B$d(B ~< $B%3%^%s%I$r;HMQ$7$?>l9g$K$O!"(B``eofread'' $BJQ?t$d(B ``eofwrite''
 $BJQ?t$O!"%U%!%$%kFI$_9~;~$N(B end-of-file $BJ8;z$NG'<1$d!"%U%!%$%k=q$-9~$_;~(B
-$B$N(B end-of-file $BJ8;z$N;XDj$KMQ$$$i$l$^$9(B($B8e=R(B)$B!#%U%!%$%kE>Aw;~$N%U%m!<@)8f$O!"(B
+$B$N(B end-of-file $BJ8;z$N;XDj$KMQ$$$i$l$^$9(B ($B8e=R(B)$B!#%U%!%$%kE>Aw;~$N%U%m!<@)8f$O!"(B
 $BDL>o$O(B tandem $B%b!<%I$G9T$J$o$l$^$9!#%j%b!<%H%7%9%F%`$,(B tandem
 $B%b!<%I$r%5%]!<%H$7$J$$>l9g$K$O!"(B``echocheck'' $B$,@_Dj$5$l!"(B
 .Nm tip
@@ -243,7 +242,7 @@
 $B$G$-$^$9!#$9$Y$F$N@_Dj$K$D$$$F!"$=$N;XDjCf$K6uGr$rF~$l$F$O$$$1$^$;$s!#(B
 $BC1FH$N(B set $B%3%^%s%I$O!"JQ?t$NCM$r@_Dj$9$k$@$1$G$J$/!"JQ?t$NCM$rCN$k$?$a(B
 $B$K$bMQ$$$i$l$^$9!#(B
-$BJQ?t$O<B9T;~$K(B set $B%3%^%s%I$r<B9T$9$k$3$H$G=i4|2=$5$l$^$9(B(
+$BJQ?t$O<B9T;~$K(B set $B%3%^%s%I$r<B9T$9$k$3$H$G=i4|2=$5$l$^$9(B (
 $B%[!<%`%G%#%l%/%H%j$N(B
 .Pa .tiprc
 $B%U%!%$%kCf$G!"(B``~s'' $B%W%l%U%#%C%/%9$,$J$$>l9g$G$9(B)$B!#(B
@@ -262,8 +261,12 @@
 ($B?tCM(B) $B%3%M%/%7%g%s3NN);~$NDL?.B.EY$r;XDj$7$^$9(B;
 .Ar ba
 $B$HN,9fI=5-$5$l$^$9!#(B
+.It Ar chardelay
+($B?tCM(B) $B3FJ8;z$NAw?.8e$KBT$D%_%jIC?t$r;XDj$7$^$9(B;
+.Ar cdelay
+$B$HN,9fI=5-$5$l$^$9!#(B
 .It Ar dialtimeout
-($B?tCM(B) $BAj<j@h$KEEOC$r$+$1$k:]$K!"%3%M%/%7%g%s3NN)$^$G$NBT$A;~4V(B($BICC10L(B)$B$r(B
+($B?tCM(B) $BAj<j@h$KEEOC$r$+$1$k:]$K!"%3%M%/%7%g%s3NN)$^$G$NBT$A;~4V(B ($BICC10L(B) $B$r(B
 $B;XDj$7$^$9(B;
 .Ar dial
 $B$HN,9fI=5-$5$l$^$9!#(B
@@ -288,7 +291,7 @@
 .Nm tip
 $B$O9TKvJ8;z$ND>8e$K8=$l$?%(%9%1!<%WJ8;z$N$_!"%(%9%1!<%WJ8;z$H$7$FG'<1$7$^$9!#(B
 .It Ar escape
-($BJ8;z(B) $B%3%^%s%I%W%l%U%#%C%/%9(B($B%(%9%1!<%W(B)$BJ8;z$G$9(B;
+($BJ8;z(B) $B%3%^%s%I%W%l%U%#%C%/%9(B ($B%(%9%1!<%W(B) $BJ8;z$G$9(B;
 .Ar es
 $B$HN,9fI=5-$5$l$^$9(B;
 $BK\JQ?t$N%G%U%)%k%HCM$O(B `~' $B$G$9!#(B
@@ -304,13 +307,17 @@
 $BK\JQ?t$N%G%U%)%k%HCM$O(B`^P'$B$G$9!#(B
 .It Ar framesize
 ($B?tCM(B) $B%U%!%$%k$r<u?.$7$?>l9g$K!"%U%!%$%k%7%9%F%`$H$N4V$K$"$k%P%C%U%!$K(B
-$B%P%C%U%!%j%s%0$9$k%G!<%?NL(B($B%P%$%HC10L(B)$B$G$9(B;
+$B%P%C%U%!%j%s%0$9$k%G!<%?NL(B ($B%P%$%HC10L(B) $B$G$9(B;
 .Ar fr
 $B$HN,9fI=5-$5$l$^$9!#(B
 .It Ar host
 ($BJ8;zNs(B) $B@\B3$7$F$$$k%[%9%HL>$G$9(B;
 .Ar ho
 $B$HN,9fI=5-$5$l$^$9!#(B
+.It Ar linedelay
+($B?tCM(B) $B3F9T$NAw?.8e$KBT$D%_%jIC?t$r;XDj$7$^$9(B;
+.Ar ldelay
+$B$HN,9fI=5-$5$l$^$9!#(B
 .It Ar login
 ($BJ8;zNs(B) $B@\B3D>8e$K<B9T$5$l$k%m%0%$%s%7%'%k%9%/%j%W%H$N%Q%9L>$G$9(B;
 $BI8=`F~=PNO$O%j%b!<%H%[%9%H$X%j%@%$%l%/%H$5$l$^$9!#(B
@@ -368,7 +375,7 @@
 .Ar beautify
 $B%9%$%C%A$,M-8z$K$J$C$F$$$k>l9g$K$O!"I=<(2DG=$J(B
 .Tn ASCII
-$BJ8;z(B($BJ8;z%3!<%I$K49;;$7$F(B040$B$+$i(B0177$B$^$G$N4V(B)$B$K$D$$$F$N$_5-O?$5$l$^$9!#(B
+$BJ8;z(B ($BJ8;z%3!<%I$K49;;$7$F(B 040 $B$+$i(B 0177 $B$^$G$N4V(B) $B$K$D$$$F$N$_5-O?$5$l$^$9!#(B
 beautification $B5,B'$NNc30$r;XDj$9$k(B
 .Ar exceptions
 $BJQ?t$K$h$k@_Dj$bM-8z$H$J$j$^$9!#(B
diff -ur man/man1/touch.1 man/man1/touch.1
--- man/man1/touch.1	Tue Feb 15 23:34:56 2000
+++ man/man1/touch.1	Wed Jul  5 09:36:34 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/touch/touch.1,v 1.6 1999/08/28 01:06:46 peter Exp %
+.\" %FreeBSD: src/usr.bin/touch/touch.1,v 1.6.2.1 2000/06/30 09:51:58 ps Exp %
 .\" jpman %Id: touch.1,v 1.2 1997/04/01 05:52:35 mutoh Stab %
 .\"
 .Dd April 28, 1995
@@ -117,9 +117,9 @@
 $B$,;XDj$5$l$F$$$J$$$H!"8=:_$NG/$K$J$j$^$9!#(B
 .Dq SS
 $B$,;XDj$5$l$F$$$J$$$H!"CM$O(B0$B$H$J$j$^$9!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
-$B$O@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B$O@.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 utimes 2
 .Sh $B8_49@-(B
diff -ur man/man1/uname.1 man/man1/uname.1
--- man/man1/uname.1	Tue Feb 15 23:34:57 2000
+++ man/man1/uname.1	Wed Jul  5 09:36:35 2000
@@ -80,7 +80,7 @@
 $B=PNO$O$9$Y$F0l9T$K%9%Z!<%9$G6h@Z$i$l$FI=<($7$^$9!#(B
 .Pp
 .Nm
-$B$O!"@.8y;~$K(B 0 $B$r!"%(%i!<;~$O(B >0 $B$rJV$7$^$9!#(B
+$B$O!"@.8y;~$K(B 0 $B$r!"%(%i!<;~$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
 .Sh $B4XO"9`L\(B
 .Xr sysctl 3 ,
 .Xr uname 3 ,
diff -ur man/man1/uniq.1 man/man1/uniq.1
--- man/man1/uniq.1	Tue Feb 15 23:34:57 2000
+++ man/man1/uniq.1	Wed Jul  5 09:36:37 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/uniq/uniq.1,v 1.5 1999/08/28 01:07:07 peter Exp %
+.\" %FreeBSD: src/usr.bin/uniq/uniq.1,v 1.5.2.1 2000/06/30 09:51:58 ps Exp %
 .\"
 .\" jpman %Id: uniq.1,v 1.2 1997/03/29 11:56:16 horikawa Stab %
 .Dd June 6, 1993
@@ -113,7 +113,7 @@
 .Pp
 $B%3%^%s%I%i%$%s$K$5$i$K0z?t$,;XDj$5$l$k$H!"$=$N:G=i$N0z?t$rF~NO%U%!%$%k$N(B
 $BL>A0$H$7$F;HMQ$7!"$=$N<!$N0z?t$r=PNO%U%!%$%k$NL>A0$H$7$F;HMQ$7$^$9!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
 $B%f!<%F%#%j%F%#$O!"@.8y$7$?>l9g$O(B 0 $B$r!"(B
 $B%(%i!<$,H/@8$7$?>l9g$O(B 0 $B$h$jBg$-$JCM$rJV$7$^$9!#(B
diff -ur man/man1/wc.1 man/man1/wc.1
--- man/man1/wc.1	Tue Feb 15 23:34:57 2000
+++ man/man1/wc.1	Wed Jul  5 09:36:38 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/usr.bin/wc/wc.1,v 1.6 1999/08/28 01:07:33 peter Exp %
+.\" %FreeBSD: src/usr.bin/wc/wc.1,v 1.6.2.1 2000/06/30 09:51:59 ps Exp %
 .\" jpman %Id: wc.1,v 1.2 1997/03/29 20:55:21 iwasaki Stab %
 .\"
 .Dd April 19, 1994
@@ -78,9 +78,9 @@
 .Ar file
 $B$,;XDj$5$l$J$+$C$?>l9g$O!"I8=`F~NO$+$iFI$_9~$^$l!"(B
 $B%U%!%$%kL>$O=PNO$5$l$^$;$s!#(B
-.Pp
+.Sh $B?GCG(B
 .Nm
-$B$O!"@.8y$7$?>l9g$O(B 0 $B$r!"%(%i!<$,5/$-$?>l9g$O(B 1 $B0J>e$NCM$rJV$7$^$9!#(B
+$B$O!"@.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 isspace 3
 .Sh $B8_49@-(B
diff -ur man/man1/whoami.1 man/man1/whoami.1
--- man/man1/whoami.1	Tue Feb 15 23:34:57 2000
+++ man/man1/whoami.1	Wed Jul  5 09:36:40 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)whoami.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/id/whoami.1,v 1.4 1999/08/28 01:02:08 peter Exp %
+.\" %FreeBSD: src/usr.bin/id/whoami.1,v 1.4.2.1 2000/06/30 09:51:48 ps Exp %
 .\" jpman %Id: whoami.1,v 1.3 1997/06/14 04:31:06 kubo Stab %
 .\"
 .Dd June 6, 1993
@@ -42,7 +42,7 @@
 .Sh $B=q<0(B
 .Nm whoami
 .Sh $B2r@b(B
-.Nm whoami
+.Nm
 $B$O!"(B
 .Xr id 1
 $B$,EP>l$7$?$?$a$K;~BeCY$l$H$J$j$^$7$?!#(B
@@ -53,10 +53,10 @@
 .Dq Nm id Fl p
 $B$r?d>)$7$^$9!#(B
 .Pp
-.Nm whoami
+.Nm
 $B$O!"<+J,$N<B8z%f!<%6(B ID $B$rL>A0$GI=<($7$^$9!#(B
-.Pp
-.Nm whoami
+.Sh $B?GCG(B
+.Nm
 $B$O!"@.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 id 1

----Next_Part(Tue_Jul__4_21:42:03_2000_179)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_4.0-20000703-STABLE_1
Content-Disposition: attachment; filename=diff_4.0-20000703-STABLE_1

diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/apropos.1 man1/apropos.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/apropos.1	Tue Mar 21 06:29:14 2000
+++ man1/apropos.1	Mon Jul  3 19:49:45 2000
@@ -12,20 +12,21 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.6.2.1 2000/05/10 13:44:45 phantom Exp %
 .Dd Jan 15, 1991
 .Dt APROPOS 1
 .Os
 .Sh NAME
-.Nm apropos , whatis
+.Nm apropos ,
+.Nm whatis
 .Nd search the whatis database
 .Sh SYNOPSIS
 .Nm apropos
 .Ar keyword ...
-.br
 .Nm whatis
 .Ar keyword ...
 .Sh DESCRIPTION
-.Nm apropos 
+.Nm
 searches a set of database files containing short descriptions
 of system commands for keywords and displays the result on the
 standard output.
@@ -33,7 +34,7 @@
 displays only complete word matches. 
 .Sh RETURN VALUES
 The 
-.Nm apropos
+.Nm
 utility exits 0 on success, and 1 if no keyword matched.
 .Sh SEE ALSO
 .Xr makewhatis 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/at.1 man1/at.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/at.1	Tue Mar 21 06:31:10 2000
+++ man1/at.1	Mon Jul  3 19:52:08 2000
@@ -1,9 +1,12 @@
-.\" %FreeBSD: src/usr.bin/at/at.man,v 1.13 1999/12/05 19:57:14 charnier Exp %
+.\" %FreeBSD: src/usr.bin/at/at.man,v 1.13.2.1 2000/04/23 16:51:28 mpp Exp %
 .Dd April 12, 1995
 .Dt "AT" 1
 .Os FreeBSD 2.1
 .Sh NAME
-.Nm at , batch , atq , atrm
+.Nm at ,
+.Nm batch ,
+.Nm atq ,
+.Nm atrm
 .Nd queue, examine or delete jobs for later execution
 .Sh SYNOPSIS
 .Nm at
@@ -180,7 +183,7 @@
 range from
 .Ar a
 to 
-.Ar z .
+.Ar z
 and
 .Ar A
 to
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/basename.1 man1/basename.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/basename.1	Tue Mar 21 06:31:10 2000
+++ man1/basename.1	Mon Jul  3 19:52:09 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/basename/basename.1,v 1.6 1999/08/28 00:59:11 peter Exp %
+.\" %FreeBSD: src/usr.bin/basename/basename.1,v 1.6.2.1 2000/06/30 09:51:44 ps Exp %
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
@@ -79,18 +79,18 @@
 .Pa /usr/bin .
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Pp
+.Sh  DIAGNOSTICS
 Both the
-.Nm basename
+.Nm
 and
 .Nm dirname
-exit 0 on success, and >0 if an error occurs.
+utilities exit 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm basename
+.Nm
 and
 .Nm dirname
 functions are expected to be POSIX 1003.2 compatible.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/builtin.1 man1/builtin.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/builtin.1	Tue Mar 21 06:30:39 2000
+++ man1/builtin.1	Mon Jul  3 19:51:34 2000
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5 2000/03/03 09:28:05 sheldonh Exp %
+.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5.2.3 2000/05/10 10:20:53 sheldonh Exp %
 .\"
 .Dd September 1, 1999
 .Dt BUILTIN 1
@@ -41,7 +41,6 @@
 .Nm chdir ,
 .Nm command ,
 .Nm continue ,
-.Nm cwd ,
 .Nm default ,
 .Nm dirs ,
 .Nm do ,
@@ -152,14 +151,9 @@
 Users of other shells will need to consult the documentation supplied
 with the other shells.
 .Bl -column "continueXX" "ExternalXX" "csh(1)" "sh(1)" -offset indent
-.\"
-.\" XXX:
-.\" The correct table header here can not be rendered with mdoc's current
-.\" argument maximum.  When mdoc can handle sufficient arguments, the
-.\" correct table header will be as follows:
-.\" .It Em Command Ta Em External Ta Xr csh 1 Ta Xr sh 1
-.\"
-.It Em Command	External	csh	sh
+.It Xo
+.Em Command Ta Em External Ta Xo
+.Xc Xc Xr csh 1 Ta Xr sh 1
 .It Ic alias Ta \&No Ta Yes Ta Yes
 .It Ic alloc Ta \&No Ta Yes Ta \&No
 .It Ic bg Ta \&No Ta Yes Ta Yes
@@ -170,7 +164,6 @@
 .It Ic chdir Ta \&No Ta Yes Ta \&No
 .It Ic command Ta \&No Ta \&No Ta Yes
 .It Ic continue Ta \&No Ta Yes Ta \&No
-.It Ic cwd Ta \&No Ta Yes Ta \&No
 .It Ic default Ta \&No Ta Yes Ta \&No
 .It Ic dirs Ta \&No Ta Yes Ta \&No
 .It Ic do Ta \&No Ta \&No Ta Yes
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/cat.1 man1/cat.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/cat.1	Tue Mar 21 06:28:17 2000
+++ man1/cat.1	Mon Jul  3 19:48:33 2000
@@ -33,18 +33,17 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" %FreeBSD: src/bin/cat/cat.1,v 1.10 1999/08/27 23:13:32 peter Exp %
+.\" %FreeBSD: src/bin/cat/cat.1,v 1.10.2.3 2000/06/30 23:02:12 ps Exp %
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
-.Os BSD 3
+.Os
 .Sh NAME
 .Nm cat
 .Nd concatenate and print files
 .Sh SYNOPSIS
 .Nm cat
 .Op Fl benstuv
-.Op Fl
 .Op Ar
 .Sh DESCRIPTION
 The
@@ -52,8 +51,14 @@
 utility reads files sequentially, writing them to the standard output.
 The
 .Ar file
-operands are processed in command line order.
-A single dash represents the standard input.
+operands are processed in command-line order.
+If
+.Ar file
+is a single dash
+.Pq Sq \&-
+or absent,
+.Nm
+reads from the standard input.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
@@ -94,30 +99,92 @@
 .Sh DIAGNOSTICS
 The
 .Nm
-utility exits 0 on success, and >0 if an error occurs.
-.Sh BUGS
-Because of the shell language mechanism used to perform output
-redirection, the command
-.Dq Li cat file1 file2 > file1
-will cause the original data in file1 to be destroyed!
+utility exits 0 on success or >0 if an error occurred.
+.Sh EXAMPLES
+The command:
+.Bd -literal -offset indent
+.Ic cat file1
+.Ed
+.Pp
+will print the contents of
+.Ar file1
+to the standard output.
+.Pp
+The command:
+.Bd -literal -offset indent
+.Ic cat file1 file2 > file3
+.Ed
+.Pp
+will sequentially print the contents of
+.Ar file1
+and
+.Ar file2
+to the file
+.Ar file3 ,
+truncating
+.Ar file3
+if it already exists.
+See the manual page for your shell (i.e.,
+.Xr sh 1 )
+for more information on redirection.
+.Pp
+The command:
+.Bd -literal -offset indent
+.Ic cat file1 - file2 - file3
+.Ed
+.Pp
+will print the contents of
+.Ar file1 ,
+print data it receives from the standard input until it receives an
+.Dv EOF
+.Pq Sq ^D
+character, print the contents of
+.Ar file2 ,
+read and output contents of the standard input again, then finally output
+the contents of
+.Ar file3 .
+Note that if the standard input referred to a file, the second dash
+on the command-line would have no effect, since the entire contents of the file
+would have already been read and printed by
+.Nm
+when it encountered the first
+.Ql \&-
+operand.
 .Sh SEE ALSO
 .Xr head 1 ,
 .Xr more 1 ,
 .Xr pr 1 ,
+.Xr sh 1 ,
 .Xr tail 1 ,
-.Xr vis 1
+.Xr vis 1 ,
+.Xr setbuf 3
 .Rs
 .%A Rob Pike
 .%T "UNIX Style, or cat -v Considered Harmful"
 .%J "USENIX Summer Conference Proceedings"
 .%D 1983
 .Re
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.2-92
+specification.
+.Pp
+The flags
+.Op Fl benstv
+are extensions to the specification.
 .Sh HISTORY
 A
 .Nm
-command appeared in Version 1 AT&T UNIX. 
+utility appeared in
+.At v1 .
 .An Dennis Ritchie
-designed and wrote the first man page. 
+designed and wrote the first man page.
 It appears to have been
 .Xr cat 1 .
-
+.Sh BUGS
+Because of the shell language mechanism used to perform output
+redirection, the command
+.Dq Li cat file1 file2 > file1
+will cause the original data in file1 to be destroyed!
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/cdcontrol.1 man1/cdcontrol.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/cdcontrol.1	Tue Mar 21 06:31:55 2000
+++ man1/cdcontrol.1	Mon Jul  3 19:53:00 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.21 2000/03/02 14:53:34 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.21.2.1 2000/06/29 23:49:28 ps Exp %
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
@@ -170,10 +170,10 @@
 Quit the program.
 
 .Sh FILES
-.Bl -tag -width /dev/rmcd0c -compact
-.It Pa /dev/rcd0c
-.It Pa /dev/rmcd0c
-.It Pa /dev/rwcd0c
+.Bl -tag -width /dev/mcd0c -compact
+.It Pa /dev/cd0c
+.It Pa /dev/mcd0c
+.It Pa /dev/acd0c
 .El
 .Sh AUTHORS
 .An Jean-Marc Zucconi ,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/chflags.1 man1/chflags.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/chflags.1	Tue Mar 21 06:31:11 2000
+++ man1/chflags.1	Mon Jul  3 19:52:10 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.9 1999/11/21 16:11:56 charnier Exp %
+.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.9.2.1 2000/04/03 22:12:15 jdp Exp %
 .\"
 .Dd May 2, 1995
 .Dt CHFLAGS 1
@@ -77,7 +77,8 @@
 in the files instead of just the files themselves.
 .El
 .Pp
-Flags are a comma separated list of keywords.
+The flags are specified as an octal number or a comma separated list
+of keywords.
 The following keywords are currently defined:
 .Bd -literal -offset indent compact
 arch	set the archived flag (super-user only)
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/cmp.1 man1/cmp.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/cmp.1	Tue Mar 21 06:31:12 2000
+++ man1/cmp.1	Mon Jul  3 19:52:11 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/cmp/cmp.1,v 1.7 1999/08/28 00:59:40 peter Exp %
+.\" %FreeBSD: src/usr.bin/cmp/cmp.1,v 1.7.2.1 2000/07/02 09:28:36 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
@@ -66,6 +66,11 @@
 .It Fl s
 Print nothing for differing files; return exit
 status only.
+.It Fl x
+Like 
+.Fl l
+but prints in hexadecimal and using zero as index
+for the first byte in the files.
 .El
 .Pp
 The optional arguments
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/col.1 man1/col.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/col.1	Tue Mar 21 06:31:12 2000
+++ man1/col.1	Mon Jul  3 19:52:11 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
-.\" %FreeBSD: src/usr.bin/col/col.1,v 1.4 1999/08/28 00:59:41 peter Exp %
+.\" %FreeBSD: src/usr.bin/col/col.1,v 1.4.2.1 2000/07/02 09:34:27 ps Exp %
 .\"
 .Dd June 29, 1993
 .Dt COL 1
@@ -59,7 +59,7 @@
 reads from the standard input and writes to the standard output.
 .Pp
 The options are as follows:
-.Bl -tag -width "-l num  "
+.Bl -tag -width indent 
 .It Fl b
 Do not output any backspaces, printing only the last character
 written to each column position.
@@ -77,7 +77,7 @@
 .El
 .Pp
 The control sequences for carriage motion that
-.Nm col
+.Nm
 understands and their decimal values are listed in the following
 table:
 .Pp
@@ -114,7 +114,7 @@
 sure the character set is correct when they are output.
 .Pp
 If the input attempts to back up to the last flushed line,
-.Nm col
+.Nm
 will display a warning message.
 .Sh SEE ALSO
 .Xr expand 1 ,
@@ -122,7 +122,7 @@
 .Xr tbl 1
 .Sh HISTORY
 A
-.Nm col
+.Nm
 command
 appeared in
 .At v6 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/column.1 man1/column.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/column.1	Tue Mar 21 06:31:13 2000
+++ man1/column.1	Mon Jul  3 19:52:12 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/column/column.1,v 1.5 1999/08/28 00:59:52 peter Exp %
+.\" %FreeBSD: src/usr.bin/column/column.1,v 1.5.2.1 2000/06/30 09:51:44 ps Exp %
 .\"
 .Dd June 6, 1993
 .Os
@@ -46,7 +46,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The
-.Nm column
+.Nm
 utility formats its input into multiple columns.
 Rows are filled before columns.
 Input is taken from
@@ -55,7 +55,7 @@
 Empty lines are ignored.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c
 Output is formatted for a display
 .Ar columns
@@ -74,9 +74,10 @@
 .It Fl x
 Fill columns before filling rows.
 .El
-.Pp
-.Nm Column
-exits 0 on success, >0 if an error occurred.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 .Bl -tag -width COLUMNS
 .It Ev COLUMNS
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/compress.1 man1/compress.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/compress.1	Tue Mar 21 06:31:13 2000
+++ man1/compress.1	Mon Jul  3 19:52:12 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/compress/compress.1,v 1.4 1999/08/28 00:59:55 peter Exp %
+.\" %FreeBSD: src/usr.bin/compress/compress.1,v 1.4.2.1 2000/06/30 09:51:45 ps Exp %
 .\"
 .Dd April 18, 1994
 .Dt COMPRESS 1
@@ -91,7 +91,7 @@
 not removed, and the attributes of the input file are not retained.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl b
 Specify the
 .Ar bits
@@ -122,13 +122,13 @@
 After the
 .Ar bits
 limit is reached,
-.Nm compress
+.Nm
 periodically checks the compression ratio.
 If it is increasing,
-.Nm compress
+.Nm
 continues to use the existing code dictionary.
 However, if the compression ratio decreases,
-.Nm compress
+.Nm
 discards the table of substrings and rebuilds it from scratch.  This allows
 the algorithm to adapt to the next "block" of the file.
 .Pp
@@ -153,9 +153,9 @@
 coding (as used in the historical command pack), or adaptive Huffman
 coding (as used in the historical command compact), and takes less
 time to compute.
-.Pp
+.Sh DIAGNOSTICS
 The
-.Nm compress
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Rs
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/date.1 man1/date.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/date.1	Tue Mar 21 06:28:19 2000
+++ man1/date.1	Mon Jul  3 19:48:34 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/date/date.1,v 1.34 2000/03/07 20:54:17 sheldonh Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.34.2.2 2000/05/28 13:05:44 asmodai Exp %
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -130,7 +130,7 @@
 .Xr gettimeofday 2 .
 .It Fl u
 Display or set the date in
-.Tn UCT
+.Tn UTC
 .Pq universal
 time.
 .It Fl v
@@ -143,7 +143,9 @@
 part of the date is set.  The date can be adjusted as many times as
 required using these flags.  Flags are processed in the order given.
 .Pp
-Seconds are in the range 0-59, minutes are in the range 0-59, hours are
+When setting values
+.Pq rather than adjusting them ,
+seconds are in the range 0-59, minutes are in the range 0-59, hours are
 in the range 1-12, month days are in the range 1-31, week days are in the
 range 0-6
 .Pq Sun-Sat ,
@@ -173,6 +175,27 @@
 .Pq previous
 date that matches the given week day or month.  This will not adjust the date
 if the given week day or month is the same as the current one.
+.Pp
+When a date is adjusted to a specific value or in units greater than hours,
+daylight savings time considerations are ignored.
+Adjustments in units of hours or less honour daylight savings time.
+So, assuming the current date is March 26, 0:30 and that the DST adjustment
+means that the clock goes forward at 01:00 to 02:00, using
+.Fl v No +1H
+will adjust the date to March 26, 2:30.
+Likewise, if the date is October 29, 0:30 and the DST adjustment means that
+the clock goes back at 02:00 to 01:00, using
+.Fl v No +3H
+will be necessary to reach October 20, 2:30.
+.Pp
+When the date is adjusted to a specific value that doesn't actually exist
+.Pq for example March 26, 1:30 BST 2000 ,
+the date will be silently adjusted forwards in units of one hour until it
+reaches a valid time.
+When the date is adjusted to a specific value that occurs twice
+.Pq for example October 29, 1:30 2000 ,
+the resulting timezone will be set so that the date matches the earlier of
+the two times.
 .Pp
 Refer to the examples below for further details.
 .El
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/df.1 man1/df.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/df.1	Tue Mar 21 06:28:19 2000
+++ man1/df.1	Mon Jul  3 19:48:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" %FreeBSD: src/bin/df/df.1,v 1.18 1999/12/15 03:44:08 mharo Exp %
+.\" %FreeBSD: src/bin/df/df.1,v 1.18.2.2 2000/07/01 03:02:08 ps Exp %
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -40,7 +40,10 @@
 .Nd display free disk space
 .Sh SYNOPSIS
 .Nm df
-.Op Fl b | h | H | k | m | P
+.Oo
+.Fl b | h | H | k |
+.Fl m | P
+.Oc
 .Op Fl ain
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
@@ -65,6 +68,11 @@
 flag.
 .It Fl b
 Use 512-byte blocks rather than the default.  Note that
+this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
+.It Fl g
+Use 1073741824-byte (1-Gbyte) blocks rather than the default.  Note that
 this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/doscmd.1 man1/doscmd.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/doscmd.1	Tue Mar 21 06:31:46 2000
+++ man1/doscmd.1	Mon Jul  3 19:52:48 2000
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI doscmd.1,v 2.3 1996/04/08 19:32:29 bostic Exp
-.\" %FreeBSD: src/usr.bin/doscmd/doscmd.1,v 1.12 1999/10/13 23:48:34 imp Exp %
+.\" %FreeBSD: src/usr.bin/doscmd/doscmd.1,v 1.12.2.2 2000/06/30 11:06:16 tg Exp %
 .\"
 .Dd January 30, 1995
 .Dt DOSCMD 1
@@ -525,7 +525,19 @@
 .Nm doscmd )
 use the value of
 .Cm 320 .
-.El
+.It Cm X11_FONT
+The value of this variable determines the font used in an X window.
+The default font is
+.Cm vga ,
+which is installed in
+.Pa /usr/libdata/doscmd/fonts .
+Add the line
+.Ql xset fp+ /usr/libdata/doscmd/fonts
+to your
+.Pa ${HOME}/.xsession
+or
+.Pa ${HOME}/.xinitrc
+to let the X server find it.
 .Sh FILE TRANSLATION
 .Nm Doscmd
 translates
@@ -612,8 +624,8 @@
 .Pa .doscmdrc
 with at least the following:
 .Bd -literal -offset indent
-assign A: /dev/rfd0.1440 1440
-assign A: /dev/rfd0.720 720
+assign A: /dev/fd0.1440 1440
+assign A: /dev/fd0.720 720
 assign hard boot_drive 80 2 2
 .Ed
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/du.1 man1/du.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/du.1	Tue Mar 21 06:31:14 2000
+++ man1/du.1	Mon Jul  3 19:52:13 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" %FreeBSD: src/usr.bin/du/du.1,v 1.15 2000/03/02 14:53:29 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/du/du.1,v 1.15.2.1 2000/07/02 10:45:29 ps Exp %
 .\"
 .Dd April 1, 1994
 .Dt DU 1
@@ -45,10 +45,10 @@
 .Op Fl c
 .Op Fl h | k
 .Op Fl x
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 The
-.Nm du
+.Nm
 utility displays the file system block usage for each file argument
 and for each directory in the file hierarchy rooted in each directory
 argument.
@@ -63,7 +63,7 @@
 Partial numbers of blocks are rounded up.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl P
 No symbolic links are followed.
 (default)
@@ -115,7 +115,7 @@
 .Pp
 Files having multiple hard links are counted (and displayed) a single
 time per
-.Nm du
+.Nm
 execution.
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
@@ -138,6 +138,6 @@
 .Xr quot 8
 .Sh HISTORY
 A
-.Nm du
+.Nm
 command appeared in
 .At v1 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ed.1 man1/ed.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ed.1	Tue Mar 21 07:54:08 2000
+++ man1/ed.1	Mon Jul  3 20:22:49 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/bin/ed/ed.1,v 1.17 2000/03/01 10:43:03 sheldonh Exp %
+.\" %FreeBSD: src/bin/ed/ed.1,v 1.17.2.1 2000/05/10 09:53:26 sheldonh Exp %
 .Dd May 21, 1993
 .Dt ED 1
 .Os
@@ -835,7 +835,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 /home/horikawa/man-jp/work/fbsd-400r/man/man1/expand.1 man1/expand.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/expand.1	Tue Mar 21 06:31:14 2000
+++ man1/expand.1	Mon Jul  3 19:52:13 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)expand.1	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/usr.bin/expand/expand.1,v 1.3 1999/08/28 01:00:44 peter Exp %
+.\" %FreeBSD: src/usr.bin/expand/expand.1,v 1.3.2.1 2000/07/02 11:19:29 ps Exp %
 .\"
 .Dd June 9, 1993
 .Dt EXPAND 1
@@ -42,11 +42,11 @@
 .Sh SYNOPSIS
 .Nm expand
 .Op Fl Ns Ar tabstop
-.Op Fl Ns Ar tab1,tab2,...,tabn
-.Ar
+.Op Fl t Ar tab1,tab2,...,tabn
+.Op Ar
 .Nm unexpand
 .Op Fl a
-.Ar
+.Op Ar
 .Sh DESCRIPTION
 .Nm Expand
 processes the named files or the standard input writing
@@ -73,7 +73,7 @@
 Option (with
 .Nm unexpand
 only):
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl a
 By default, only leading blanks and tabs
 are reconverted to maximal strings of tabs.  If the
@@ -83,6 +83,6 @@
 .El
 .Sh HISTORY
 The
-.Nm expand
+.Nm
 command appeared in
 .Bx 3.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/fdwrite.1 man1/fdwrite.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/fdwrite.1	Tue Mar 21 06:32:02 2000
+++ man1/fdwrite.1	Mon Jul  3 19:53:04 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.12 2000/03/01 14:07:40 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.12.2.1 2000/06/29 23:49:29 ps Exp %
 .\"
 .\"
 .Dd September 16, 1993
@@ -58,7 +58,7 @@
 Input file to read.  If none is given, stdin is assumed.
 .It Fl d Ar device
 The name of the floppy device to write to.  Default is
-.Pa /dev/rfd0 .
+.Pa /dev/fd0 .
 .El
 
 .Nm Fdwrite
@@ -81,7 +81,7 @@
 one such use could be to write a tar-archive:
 
 .ce 1
-tar cf - . | gzip -9 | fdwrite -d /dev/rfd0.1720 -v
+tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
 
 The main difference from using
 .Xr tar 1 's
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/find.1 man1/find.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/find.1	Tue Mar 21 06:31:15 2000
+++ man1/find.1	Mon Jul  3 19:52:14 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" %FreeBSD: src/usr.bin/find/find.1,v 1.23 2000/03/01 10:48:32 nik Exp %
+.\" %FreeBSD: src/usr.bin/find/find.1,v 1.23.2.2 2000/06/23 18:38:46 roberto Exp %
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
@@ -245,6 +245,12 @@
 If the file is a symbolic link, the pathname of the linked\-to file will be
 displayed preceded by ``\->''.
 The format is identical to that produced by ``ls \-dgils''.
+.It Ic -maxdepth Ar n
+True if the depth of the current file into the tree is less than or equal to
+.Ar n .
+.It Ic -mindepth Ar n
+True if the depth of the current file into the tree is greater than or equal to
+.Ar n .
 .It Ic -mmin Ar n 
 True if the difference between the file last modification time and the time
 .Nm find
@@ -324,7 +330,9 @@
 in the comparison.
 If the mode is preceded by a dash (``\-''), this primary evaluates to true
 if at least all of the bits in the mode are set in the file's mode bits.
-If the mode is not preceded by a dash, this primary evaluates to true if
+If the mode is preceded by a plus (``\+''), this primary evaluates to true
+if any of the bits in the mode are set in the file's mode bits.
+Otherwise, this primary evaluates to true if
 the bits in the mode exactly match the file's mode bits.
 Note, the first character of a symbolic mode may not be a dash (``\-'').
 .It Ic -flags Op Fl Ns Ar flags
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/fstat.1 man1/fstat.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/fstat.1	Tue Mar 21 06:31:16 2000
+++ man1/fstat.1	Mon Jul  3 19:52:15 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
-.\" %FreeBSD: src/usr.bin/fstat/fstat.1,v 1.9 1999/09/06 13:14:24 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/fstat/fstat.1,v 1.9.2.1 2000/07/02 10:28:38 ps Exp %
 .\"
 .Dd February 25, 1994
 .Dt FSTAT 1
@@ -40,7 +40,7 @@
 .Nd file status
 .Sh SYNOPSIS
 .Nm fstat
-.Op Fl fnv
+.Op Fl fmnv
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl p Ar pid
@@ -74,6 +74,9 @@
 .It Fl N
 Extract the name list from the specified system instead of the default
 .Pa /kernel .
+.It Fl m
+Include memory-mapped files in the listing; normally these are excluded
+due to the extra processing required.
 .It Fl n
 Numerical format.  Print the device number (maj,min) of the filesystem
 the file resides in rather than the mount point name; for special
@@ -117,6 +120,7 @@
 wd 	- current working directory
 root	- root inode
 tr	- kernel trace file
+mmap	- memory-mapped file
 .Ed
 .Pp
 If the file number is followed by an asterisk (``*''), the file is
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ftp.1 man1/ftp.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ftp.1	Tue Mar 21 06:31:16 2000
+++ man1/ftp.1	Mon Jul  3 19:52:15 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.15 2000/03/10 14:46:30 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.15.2.1 2000/06/14 16:31:25 ume Exp %
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp %
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -44,7 +44,7 @@
 file transfer program
 .Sh SYNOPSIS
 .Nm
-.Op Fl adeginptUvV
+.Op Fl 46adeginptUvV
 .Op Fl P Ar port
 .Op Fl s Ar src_addr
 .Op Ar host Op Ar port
@@ -73,6 +73,14 @@
 Options may be specified at the command line, or to the
 command interpreter.
 .Bl -tag -width Fl
+.It Fl 4
+Forces
+.Nm
+to use IPv4 addresses only.
+.It Fl 6
+Forces
+.Nm
+to use IPv6 addresses only.
 .It Fl a
 Causes
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/groups.1 man1/groups.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/groups.1	Tue Mar 21 06:31:18 2000
+++ man1/groups.1	Mon Jul  3 19:52:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)groups.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/id/groups.1,v 1.4 1999/08/28 01:02:06 peter Exp %
+.\" %FreeBSD: src/usr.bin/id/groups.1,v 1.4.2.1 2000/06/30 09:51:45 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
@@ -43,7 +43,7 @@
 .Op Ar user
 .Sh DESCRIPTION
 The
-.Nm groups
+.Nm
 utility has been obsoleted by the
 .Xr id 1
 utility, and is equivalent to
@@ -53,12 +53,12 @@
 is suggested for normal interactive use.
 .Pp
 The
-.Nm groups
+.Nm
 utility displays the groups to which you (or the optionally specified user)
 belong.
-.Pp
+.Sh DIAGNOSTICS
 The
-.Nm groups
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr id 1
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/id.1 man1/id.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/id.1	Tue Mar 21 06:31:18 2000
+++ man1/id.1	Mon Jul  3 19:52:18 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/id/id.1,v 1.7 1999/09/01 22:56:44 chris Exp %
+.\" %FreeBSD: src/usr.bin/id/id.1,v 1.7.2.1 2000/06/30 09:51:45 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt ID 1
@@ -42,7 +42,7 @@
 .Nm id
 .Nd return user identity
 .Sh SYNOPSIS
-.Nm
+.Nm id
 .Op Ar user
 .Nm id
 .Fl G Op Fl n
@@ -74,7 +74,7 @@
 In this case, the real and effective IDs are assumed to be the same.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl G
 Display the different group IDs (effective, real and supplementary)
 as white-space separated numbers, in no particular order.
@@ -121,7 +121,7 @@
 .It Fl u
 Display the effective user ID as a number.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ipcrm.1 man1/ipcrm.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ipcrm.1	Tue Mar 21 06:31:20 2000
+++ man1/ipcrm.1	Mon Jul  3 19:52:18 2000
@@ -21,15 +21,14 @@
 .\" 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.7 1999/08/28 01:02:13 peter Exp %
+.\" %FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.7.2.1 2000/05/09 14:12:48 sheldonh Exp %
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
 .Os
 .Sh NAME
 .Nm ipcrm
-.Nd remove the specified message queues, semaphore sets, and shared memory
-segments
+.Nd "remove the specified message queues, semaphore sets, and shared segments"
 .Sh SYNOPSIS
 .Nm
 .Op Fl q Ar msqid
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/jobid.1 man1/jobid.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/jobid.1	Tue Mar 21 06:30:39 2000
+++ man1/jobid.1	Mon Jul  3 19:51:34 2000
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5 2000/03/03 09:28:05 sheldonh Exp %
+.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5.2.3 2000/05/10 10:20:53 sheldonh Exp %
 .\"
 .Dd September 1, 1999
 .Dt BUILTIN 1
@@ -41,7 +41,6 @@
 .Nm chdir ,
 .Nm command ,
 .Nm continue ,
-.Nm cwd ,
 .Nm default ,
 .Nm dirs ,
 .Nm do ,
@@ -152,14 +151,9 @@
 Users of other shells will need to consult the documentation supplied
 with the other shells.
 .Bl -column "continueXX" "ExternalXX" "csh(1)" "sh(1)" -offset indent
-.\"
-.\" XXX:
-.\" The correct table header here can not be rendered with mdoc's current
-.\" argument maximum.  When mdoc can handle sufficient arguments, the
-.\" correct table header will be as follows:
-.\" .It Em Command Ta Em External Ta Xr csh 1 Ta Xr sh 1
-.\"
-.It Em Command	External	csh	sh
+.It Xo
+.Em Command Ta Em External Ta Xo
+.Xc Xc Xr csh 1 Ta Xr sh 1
 .It Ic alias Ta \&No Ta Yes Ta Yes
 .It Ic alloc Ta \&No Ta Yes Ta \&No
 .It Ic bg Ta \&No Ta Yes Ta Yes
@@ -170,7 +164,6 @@
 .It Ic chdir Ta \&No Ta Yes Ta \&No
 .It Ic command Ta \&No Ta \&No Ta Yes
 .It Ic continue Ta \&No Ta Yes Ta \&No
-.It Ic cwd Ta \&No Ta Yes Ta \&No
 .It Ic default Ta \&No Ta Yes Ta \&No
 .It Ic dirs Ta \&No Ta Yes Ta \&No
 .It Ic do Ta \&No Ta \&No Ta Yes
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/join.1 man1/join.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/join.1	Tue Mar 21 06:31:21 2000
+++ man1/join.1	Mon Jul  3 19:52:18 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/join/join.1,v 1.3 1999/08/28 01:02:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/join/join.1,v 1.3.2.1 2000/06/30 09:51:48 ps Exp %
 .\"
 .Dd April 28, 1995
 .Dt JOIN 1
@@ -57,9 +57,15 @@
 .Ar file1
 .Ar file2
 .Sh DESCRIPTION
-The join utility performs an ``equality join'' on the specified files
+The
+.Nm
+utility performs an
+.Dq equality join
+on the specified files
 and writes the result to the standard output.
-The ``join field'' is the field in each file by which the files are compared.
+The
+.Dq join field
+is the field in each file by which the files are compared.
 The first field in each line is used by default.
 There is one line in the output for each pair of lines in
 .Ar file1
@@ -80,7 +86,7 @@
 Both file numbers and field numbers are 1 based, i.e. the first file on
 the command line is file number 1 and the first field is field number 1.
 The following options are available:
-.Bl -tag -width Fl
+.Bl -tag -width indent
 .It Fl a Ar file_number
 In addition to the default output, produce a line for each unpairable
 line in file
@@ -107,7 +113,9 @@
 is a file number and
 .Ar field
 is a field number.
-The elements of list must be either comma (``,'') or whitespace separated.
+The elements of list must be either comma
+.Pf ( Dq , Ns )
+or whitespace separated.
 (The latter requires quoting to protect it from the shell, or, a simpler
 approach is to use multiple
 .Fl o
@@ -144,12 +152,12 @@
 using the
 .Fl b
 option, on the fields on which they are to be joined, otherwise
-.Nm join
+.Nm
 may not report all field matches.
 When the field delimiter characters are specified by the
 .Fl t
 option, the collating sequence should be the same as
-.Xr sort
+.Xr sort 1
 without the
 .Fl b
 option.
@@ -158,22 +166,24 @@
 .Ar file1
 or
 .Ar file2
-is ``-'', the standard input is used.
-.Pp
+is
+.Dq - ,
+the standard input is used.
+.Sh DIAGNOSTICS
 The
-.Nm join
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh COMPATIBILITY
 For compatibility with historic versions of
-.Nm join ,
+.Nm Ns ,
 the following options are available:
-.Bl -tag -width Fl
+.Bl -tag -width indent
 .It Fl a
 In addition to the default output, produce a line for each unpairable line
 in both file 1 and file 2.
 (To distinguish between this and
 .Fl a Ar file_number ,
-.Nm join
+.Nm
 currently requires that the latter not include any white space.)
 .It Fl j1 Ar field
 Join on the
@@ -189,22 +199,25 @@
 field of both file 1 and file 2.
 .It Fl o Ar list ...
 Historical implementations of
-.Nm join
+.Nm
 permitted multiple arguments to the
 .Fl o
 option.
-These arguments were of the form ``file_number.field_number'' as described
+These arguments were of the form
+.Ql file_number.field_number
+as described
 for the current
 .Fl o
 option.
-This has obvious difficulties in the presence of files named ``1.2''.
+This has obvious difficulties in the presence of files named
+.Ql 1.2 .
 .El
 .Pp
 These options are available only so historic shellscripts don't require
 modification and should not be used.
 .Sh STANDARDS
 The
-.Nm join
+.Nm
 command is expected to be
 .St -p1003.2
 compatible.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/kbdcontrol.1 man1/kbdcontrol.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/kbdcontrol.1	Tue Mar 21 06:32:03 2000
+++ man1/kbdcontrol.1	Mon Jul  3 19:53:06 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.18 1999/11/18 16:09:40 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.18.2.1 2000/05/09 14:12:49 sheldonh Exp %
 .\"
 .Dd June 30, 1999
 .Dt KBDCONTROL 1
@@ -65,9 +65,11 @@
 the bell will not be rung when the ringing process is in the background vty.
 .It Fl r Ar delay.repeat | Ar speed
 Set keyboard
-.Ar delay (250, 500, 750, 1000)
+.Ar delay
+(250, 500, 750, 1000)
 and
-.Ar repeat (34, 38, 42, 46, 50, 55, 59, 63, 68, 76, 84, 92, 100, 110, 118, 126, 
+.Ar repeat
+(34, 38, 42, 46, 50, 55, 59, 63, 68, 76, 84, 92, 100, 110, 118, 126, 
 136, 152, 168, 184, 200, 220, 236, 252, 272, 304, 336, 368, 400, 440,
 472, 504)
 rates, or if a
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ld-elf.so.1.1 man1/ld-elf.so.1.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ld-elf.so.1.1	Tue Mar 21 06:30:06 2000
+++ man1/ld-elf.so.1.1	Mon Jul  3 19:50:51 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.18 2000/01/29 03:16:54 jdp Exp %
+.\" %FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.18.2.1 2000/03/28 09:04:19 sheldonh Exp %
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
@@ -144,4 +144,5 @@
 .Sh SEE ALSO
 .Xr elf 5 ,
 .Xr ld 1 ,
+.Xr ldd 1 ,
 .Xr ldconfig 8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ldd.1 man1/ldd.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ldd.1	Tue Mar 21 06:31:23 2000
+++ man1/ldd.1	Mon Jul  3 19:52:21 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.12 2000/03/01 12:19:50 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.12.2.3 2000/05/10 15:46:58 phantom Exp %
 .\"
 .Dd October 22, 1993
 .Dt LDD 1
@@ -12,9 +12,11 @@
 .Op Fl f Ar format
 .Ar program ...
 .Sh DESCRIPTION
-.Nm ldd
+.Nm
 displays all shared objects that are needed to run the given program.
-Contrary to nm(1), the list includes
+Contrary to
+.Xr nm 1 ,
+the list includes
 .Dq indirect
 dependencies that are the result of needed shared objects which themselves
 depend on yet other shared objects.
@@ -25,7 +27,7 @@
 The argument is a format string passed to
 .Xr rtld 1
 and allows customization of
-.Nm ldd Ns 's
+.Nm Ns 's
 output.
 See
 .Xr rtld 1
@@ -38,14 +40,15 @@
 files for the definitive meaning of all the fields.
 .Sh SEE ALSO
 .Xr ld 1 ,
-.Xr ld.so 1 ,
-.Xr nm 1
+.Xr nm 1 ,
+.Xr rtld 1
 .Sh HISTORY
 A
-.Nm ldd
-utility first appeared in SunOS 4.0, it appeared in its current form
-in FreeBSD 1.1.
+.Nm
+utility first appeared in SunOS 4.0, it appeared in its current form in
+.Fx 1.1 .
 .Pp
 The
 .Fl v
-support is based on code written by John Polstra <jdp@polstra.com>
+support is based on code written by
+.An John Polstra Aq jdp@polstra.com
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/leave.1 man1/leave.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/leave.1	Tue Mar 21 06:31:23 2000
+++ man1/leave.1	Mon Jul  3 19:52:21 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/leave/leave.1,v 1.4 1999/08/28 01:02:45 peter Exp %
+.\" %FreeBSD: src/usr.bin/leave/leave.1,v 1.4.2.1 2000/06/30 09:51:49 ps Exp %
 .\"
 .Dd April 28, 1995
 .Dt LEAVE 1
@@ -57,9 +57,8 @@
 exits just before it would have
 printed the next message.
 .Pp
-Options:
-.Pp
-.Bl -tag -width flag
+The following options are available:
+.Bl -tag -width indent
 .It Ar hhmm
 The time of day is in the form
 .Ar hhmm
@@ -81,7 +80,8 @@
 If no argument is given,
 .Nm
 prompts with "When do you
-have to leave?". A reply of newline causes
+have to leave?".
+A reply of newline causes
 .Nm
 to exit,
 otherwise the reply is assumed to be a time.
@@ -90,7 +90,8 @@
 or
 .Pa .profile .
 .Pp
-Leave ignores interrupts, quits, and terminates.
+.Nm Leave
+ignores interrupts, quits, and terminates.
 To get rid of it you should either log off or use
 .Ql kill \-s KILL
 giving its process id.
Only in man1: less.1
Only in man1: lesskey.1
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/limits.1 man1/limits.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/limits.1	Tue Mar 21 06:31:24 2000
+++ man1/limits.1	Mon Jul  3 19:52:23 2000
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" %FreeBSD: src/usr.bin/limits/limits.1,v 1.14 1999/10/09 20:47:58 green Exp %
+.\" %FreeBSD: src/usr.bin/limits/limits.1,v 1.14.2.1 2000/07/02 09:50:17 ps Exp %
 .\"
 .Dd January 15, 1996
 .Dt LIMITS 1
@@ -57,7 +57,7 @@
 .Xr env 1
 and run a program with the selected resources.
 Three uses of the
-.Nm limits
+.Nm
 command are possible:
 .Pp
 .Bl -hang -width indent
@@ -99,9 +99,9 @@
 The calling shell is determined by examining the entries in the
 .Pa /proc
 filesystem for the parent process.
-If the shell is known (ie. it is one of sh, csh, bash, tcsh, ksh,
+If the shell is known (i.e. it is one of sh, csh, bash, tcsh, ksh,
 pdksh or rc),
-.Nm limits
+.Nm
 emits 'limit' or 'ulimit' commands in the format understood by
 that shell.
 If the name of the shell cannot be determined, then the 'ulimit'
@@ -116,13 +116,13 @@
 central database of settings in the login class database.
 .Pp
 Within a shell script,
-.Nm limits
+.Nm
 will normally be used with eval within backticks as follows:
 .Pp
 .Dl eval `limits -e -C daemon`
 .Pp
 which causes the output of
-.Nm limits
+.Nm
 to be evaluated and set by the current shell.
 .El
 .Pp
@@ -140,7 +140,7 @@
 for the "default" class are used, if it exists, or the "root" class if
 the user is a superuser account.
 .It Fl S
-Selects display or setting of "soft" (or current) resource limits.
+Select display or setting of "soft" (or current) resource limits.
 If specific limits settings follow this switch, only soft limits are
 affected unless overridden later with either the
 .Fl H
@@ -148,7 +148,7 @@
 .Fl B
 flags.
 .It Fl H
-Selects display or setting of "hard" (or maximum) resource limits.
+Select display or setting of "hard" (or maximum) resource limits.
 If specific limits settings follow this switch, only hard limits are
 affected until overridden later with either the
 .Fl S
@@ -156,7 +156,7 @@
 .Fl B
 flags.
 .It Fl B
-Selects display or setting of both "soft" (current) or "hard" (maximum)
+Select display or setting of both "soft" (current) or "hard" (maximum)
 resource limits.
 If specific limits settings follow this switch, both soft and hard
 limits are affected until overridden later with either the
@@ -165,40 +165,40 @@
 .Fl H
 flags.
 .Fl e
-Selects "eval mode" formatting for output.
+Select "eval mode" formatting for output.
 This is valid only on display mode and cannot be used when running a
 command.
 The exact syntax used for output depends upon the type of shell from
 which
-.Nm limits
+.Nm
 is invoked.
 .It Fl b Op Ar limit
 Selects or sets the
 .Em sbsize
 resource limit.
 .It Fl c Op Ar limit
-Selects or sets (if 'limit' is specified) the
+Select or set (if 'limit' is specified) the
 .Em coredumpsize
 resource limit.
 A value of 0 disables core dumps.
 .It Fl d Op Ar limit
-Selects or sets (if 'limit' is specified) the
+Select or set (if 'limit' is specified) the
 .Em datasize
 resource limit.
 .It Fl f Op Ar limit
-Selects or sets the
+Select or set the
 .Em filesize
 resource limit.
 .It Fl l Op Ar limit
-Selects or sets the
+Select or set the
 .Em memorylocked
 resource limit.
 .It Fl m Op Ar limit
-Selects or sets the
+Select or set the
 .Em memoryuse
 size limit.
 .It Fl n Op Ar limit
-Selects or sets the
+Select or set the
 .Em openfiles
 resource limit.  The system-wide limit on the maximum number of
 open files per process can be viewed using the 'sysctl kern.maxfilesperproc'
@@ -206,15 +206,15 @@
 system is limited to the value displayed by the 'sysctl kern.maxfiles'
 command.
 .It Fl s Op Ar limit
-Selects or sets the
+Select or set the
 .Em stacksize
 resource limit.
 .It Fl t Op Ar limit
-Selects or sets the
+Select or set the
 .Em cputime
 resource limit.
 .It Fl u Op Ar limit
-Selects or sets the
+Select or set the
 .Em maxproc
 resource limit.  The system-wide limit on the maximum number of processes
 allowed per UID can be viewed using the 'sysctl kern.maxprocperuid' command.
@@ -222,8 +222,16 @@
 in the entire system is limited to the value given by
 the 'sysctl kern.maxproc' command.
 .Pp
-Valid values for 'limit' in the above set of flags consist of either the
-string 'infinity' or 'inf' for an infinite (or kernel-defined maximum)
+Valid values for
+.Ar limit
+in the above set of flags consist of either the
+string
+.Em infinity ,
+.Em inf ,
+.Em unlimited
+or
+.Em unlimit
+for an infinite (or kernel-defined maximum)
 limit, or a numeric value maybe followed by a suffix.
 Values which relate to size default to a value in bytes, or one of the
 following suffixes may be used as a multiplier:
@@ -265,7 +273,7 @@
 The option
 .Sq Fl E
 causes
-.Nm limits
+.Nm
 to completely ignore the environment it inherits.
 .It Fl a
 This option forces all resource settings to be displayed even if
@@ -282,17 +290,17 @@
 Non-root users may, however, lower them or change "soft" resource limits
 within to any value below the hard limit.
 When invoked to execute a program, the failure of
-.Nm limits
+.Nm
 to raise a hard limit is considered a fatal error.
 .El
 .Sh DIAGNOSTICS
 .Nm Limits
-exits with EXIT_FAILURE if usage is incorrect in any way; ie. an invalid
+exits with EXIT_FAILURE if usage is incorrect in any way; i.e. an invalid
 option, or set/display options are selected in the same invocation,
 .Fl e
 is used when running a program, etc.
 When run in display or eval mode,
-.Nm limits
+.Nm
 exits with a status of EXIT_SUCCESS.
 When run in command mode and execution of the command succeeds, the exit status
 will be whatever the executed program returns.
@@ -311,18 +319,26 @@
 does not handle commands with equal (``='') signs in their
 names, for obvious reasons.
 .Pp
-When eval output is selected, the /proc filesystem must be installed
+When eval output is selected, the
+.Pa /proc
+filesystem must be installed
 and mounted for the shell to be correctly determined, and therefore
 output syntax correct for the running shell.
-The default output is valid for /bin/sh, so this means that any
+The default output is valid for
+.Pa /bin/sh ,
+so this means that any
 usage of
-.Nm limits
-in eval mode prior mounting /proc may only occur in standard bourne
+.Nm
+in eval mode prior mounting
+.Pa /proc
+may only occur in standard bourne
 shell scripts.
 .Pp
 .Nm Limits
 makes no effort to ensure that resource settings emitted or displayed
 are valid and settable by the current user.
 Only a superuser account may raise hard limits, and when doing so
-the FreeBSD kernel will silently lower limits to values less than
+the
+.Fx
+kernel will silently lower limits to values less than
 specified if the values given are too high.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/logger.1 man1/logger.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/logger.1	Tue Mar 21 06:31:25 2000
+++ man1/logger.1	Mon Jul  3 19:52:24 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/logger/logger.1,v 1.4 1999/08/28 01:03:08 peter Exp %
+.\" %FreeBSD: src/usr.bin/logger/logger.1,v 1.4.2.1 2000/06/30 09:51:49 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
@@ -51,9 +51,8 @@
 .Xr syslog  3
 system log module.
 .Pp
-Options:
-.Pp
-.Bl -tag -width "message"
+The following options are available:
+.Bl -tag -width indent
 .It Fl i
 Log the process id of the logger process
 with each line.
@@ -80,7 +79,7 @@
 flag is not
 provided, standard input is logged.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/logname.1 man1/logname.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/logname.1	Tue Mar 21 06:31:28 2000
+++ man1/logname.1	Mon Jul  3 19:52:24 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/usr.bin/logname/logname.1,v 1.5 1999/08/28 01:03:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/logname/logname.1,v 1.5.2.1 2000/06/30 09:51:50 ps Exp %
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
@@ -57,7 +57,7 @@
 .Ev USER
 environment variables
 because the environment cannot be trusted.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/logout.1 man1/logout.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/logout.1	Tue Mar 21 06:30:39 2000
+++ man1/logout.1	Mon Jul  3 19:51:34 2000
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5 2000/03/03 09:28:05 sheldonh Exp %
+.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5.2.3 2000/05/10 10:20:53 sheldonh Exp %
 .\"
 .Dd September 1, 1999
 .Dt BUILTIN 1
@@ -41,7 +41,6 @@
 .Nm chdir ,
 .Nm command ,
 .Nm continue ,
-.Nm cwd ,
 .Nm default ,
 .Nm dirs ,
 .Nm do ,
@@ -152,14 +151,9 @@
 Users of other shells will need to consult the documentation supplied
 with the other shells.
 .Bl -column "continueXX" "ExternalXX" "csh(1)" "sh(1)" -offset indent
-.\"
-.\" XXX:
-.\" The correct table header here can not be rendered with mdoc's current
-.\" argument maximum.  When mdoc can handle sufficient arguments, the
-.\" correct table header will be as follows:
-.\" .It Em Command Ta Em External Ta Xr csh 1 Ta Xr sh 1
-.\"
-.It Em Command	External	csh	sh
+.It Xo
+.Em Command Ta Em External Ta Xo
+.Xc Xc Xr csh 1 Ta Xr sh 1
 .It Ic alias Ta \&No Ta Yes Ta Yes
 .It Ic alloc Ta \&No Ta Yes Ta \&No
 .It Ic bg Ta \&No Ta Yes Ta Yes
@@ -170,7 +164,6 @@
 .It Ic chdir Ta \&No Ta Yes Ta \&No
 .It Ic command Ta \&No Ta \&No Ta Yes
 .It Ic continue Ta \&No Ta Yes Ta \&No
-.It Ic cwd Ta \&No Ta Yes Ta \&No
 .It Ic default Ta \&No Ta Yes Ta \&No
 .It Ic dirs Ta \&No Ta Yes Ta \&No
 .It Ic do Ta \&No Ta \&No Ta Yes
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/lpr.1 man1/lpr.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/lpr.1	Tue Mar 21 06:32:05 2000
+++ man1/lpr.1	Mon Jul  3 19:53:34 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.11 2000/03/01 14:08:50 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.11.2.1 2000/06/27 19:55:40 wollman Exp %
 .\" "
 .Dd June 6, 1993
 .Dt LPR 1
@@ -47,6 +47,7 @@
 .Op Fl L Ar locale
 .Op Fl T Ar title
 .Op Fl U Ar user
+.Op Fl Z Ar daemon-options
 .Op Fl i Ar numcols
 .Op Fl 1234 Ar font
 .Op Fl w Ns Ar num
@@ -180,10 +181,14 @@
 Use
 .Ar locale
 specified as argument instead of one found in environment.
-Use "C" to reset locale to default.
+(Only effective when filtering through
+.Xr pr 1
+is requested using the
+.Fl p
+option.)
 .It Fl T Ar title
 Title name for
-.Xr pr  1 ,
+.Xr pr 1 ,
 instead of the file name.
 .It Fl U Ar user
 User name to print on the burst page,
@@ -191,6 +196,22 @@
 This option is only honored if the real user-id is daemon
 (or that specified in the printcap file instead of daemon),
 and is intended for those instances where print filters wish to requeue jobs.
+.It Fl Z Ar daemon-options
+Some spoolers, such as
+.Tn LPRng ,
+accept additional per-job options using a
+.Ql Z
+control line.
+When
+.Fl Z
+is specified, and
+.Fl p
+.Pq Xr pr 1
+is not requested, the specified
+.Ar daemon-options
+will be passed to the remote
+.Tn LPRng
+spooler.
 .It Fl i numcols
 The output is indented by
 .Pq Ar numcols .
@@ -202,7 +223,7 @@
 .El
 .Sh ENVIRONMENT
 If the following environment variable exists, it is used by
-.Nm lpr :
+.Nm Ns :
 .Bl -tag -width PRINTER
 .It Ev PRINTER
 Specifies an alternate default printer.
@@ -256,7 +277,28 @@
 Fonts for
 .Xr troff 1
 and
-.Xr tex
+.Tn TeX
 reside on the host with the printer.
 It is currently not possible to
 use local font libraries.
+.Pp
+The
+.Ql Z
+control file line is used for two different purposes; for
+standard
+.Fx
+.Xr lpd 8 ,
+it specifies a locale to be passed to
+.Xr pr 1 .
+For
+.Tn LPRng
+.Xr lpd 8 ,
+it specifies additional options to be interpreted by the spooler's
+input and output filters.
+When submitting jobs via
+.Nm Ns ,
+.Fl p
+.Fl L Ar locale
+is used in the former context, and
+.Fl Z Ar daemon-options
+is used in the latter.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ls.1 man1/ls.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ls.1	Tue Mar 21 06:28:23 2000
+++ man1/ls.1	Mon Jul  3 19:48:39 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" %FreeBSD: src/bin/ls/ls.1,v 1.33 2000/03/02 14:53:20 sheldonh Exp %
+.\" %FreeBSD: src/bin/ls/ls.1,v 1.33.2.1 2000/06/28 00:18:22 joe Exp %
 .\"
 .Dd July 29, 1994
 .Dt LS 1
@@ -381,8 +381,10 @@
 based on the width provided.
 (See
 .Fl C . )
-.It Ev TZ
-The timezone to use when displaying dates.
+.It Ev LANG
+The locale to use when determining the order of day and month in the long
+.Fl l
+format output.
 See
 .Xr environ 7
 for more information.
@@ -394,6 +396,11 @@
 columns have changeable widths.  The fields are,
 in order: inode, block count, number of links, user name,
 group name, flags, file size, file name.
+.It Ev TZ
+The timezone to use when displaying dates.
+See
+.Xr environ 7
+for more information.
 .El
 .Sh COMPATIBILITY
 The group field is now automatically included in the long listing for
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/lsvfs.1 man1/lsvfs.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/lsvfs.1	Tue Mar 21 06:31:29 2000
+++ man1/lsvfs.1	Mon Jul  3 19:52:24 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.7 1999/08/28 01:03:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.7.2.1 2000/06/30 09:51:50 ps Exp %
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
@@ -13,14 +13,14 @@
 .Op Ar vfsname Ar ...
 .Sh DESCRIPTION
 The
-.Nm lsvfs
+.Nm
 command lists information about the currently loaded virtual filesystem
 modules.  When
 .Ar vfsname
 arguments are given,
-.Nm lsvfs
+.Nm
 lists information about the specified VFS modules.  Otherwise,
-.Nm lsvfs
+.Nm
 lists all currently loaded modules.
 The information is as follows:
 .Pp
@@ -47,5 +47,4 @@
 A
 .Nm
 command appeared in
-.Tn FreeBSD
-2.0.
+.Fx 2.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/make.1 man1/make.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/make.1	Tue Mar 21 06:31:29 2000
+++ man1/make.1	Mon Jul  3 19:52:25 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.29 2000/03/01 12:19:52 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/make/make.1,v 1.29.2.1 2000/05/20 20:17:20 will Exp %
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
@@ -118,6 +118,9 @@
 on error.
 .It Ar j
 Print debugging information about running multiple shells.
+.It Ar l
+Print commands in Makefiles regardless of whether or not they are prefixed
+by @ or other "quiet" flags.  Also known as "loud" behavior.
 .It Ar m
 Print debugging information about making targets, including modification
 dates.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/makewhatis.1 man1/makewhatis.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/makewhatis.1	Tue Mar 21 06:29:15 2000
+++ man1/makewhatis.1	Mon Jul  3 19:49:46 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.14 1999/09/11 18:21:16 ache Exp %
+.\" %FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.14.2.1 2000/06/20 10:42:06 alex Exp %
 .Dd January 12, 1995
 .Dt MAKEWHATIS 1
 .Os FreeBSD 2.1
@@ -122,7 +122,7 @@
 .Bl -tag -width /etc/master.passwdxx -compact
 .It Pa */man/whatis
 whatis database
-.It Pa /etc/weekly
+.It Pa /etc/periodic/weekly/320.whatis
 run
 .Nm makewhatis.local
 every week
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/man.1 man1/man.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/man.1	Tue Mar 21 06:29:14 2000
+++ man1/man.1	Mon Jul  3 19:49:45 2000
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" %FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.10 1999/12/20 14:34:29 asmodai Exp %
+.\" %FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.10.2.2 2000/04/23 16:57:02 mpp Exp %
 .\"
 .Dd Jan 5, 1991
 .Dt MAN 1
@@ -145,9 +145,9 @@
 is set, its value is used to determine the set of preprocessors run
 before running nroff or troff.  By default, pages are passed through
 the table preprocessor before nroff.
-.It Ev MANSEC
+.It Ev MANSECT
 If
-.Ev MANSEC
+.Ev MANSECT
 is set, its value is used to determine which manual sections to search.
 .It Ev PAGER
 If
@@ -163,7 +163,7 @@
 one would use:
 .Dl man getopt
 .Pp
-However, when referred to a specific section of the manual,
+However, when referring to a specific section of the manual,
 such as
 .Xr getopt 3 ,
 one would use:
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/mkfifo.1 man1/mkfifo.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/mkfifo.1	Tue Mar 21 06:31:30 2000
+++ man1/mkfifo.1	Mon Jul  3 19:52:26 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\" %FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.6 1999/08/28 01:04:05 peter Exp %
+.\" %FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.6.2.1 2000/06/30 09:51:51 ps Exp %
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
@@ -79,10 +79,10 @@
 The
 .Nm
 command requires write permission in the parent directory.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
-command exits 0 if successful, and >0 if an error occurred.
+utility exits 0 on success, and >0 if an error occurs.
 .Sh STANDARDS
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/more.1 man1/more.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/more.1	Tue Mar 21 06:31:31 2000
+++ man1/more.1	Mon Jul  3 19:52:22 2000
@@ -1,338 +1,1502 @@
-.\" Copyright (c) 1988, 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-.\"
-.\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/more/more.1,v 1.18 2000/03/01 12:19:56 sheldonh Exp %
-.\"
-.Dd April 18, 1994
-.Dt MORE 1
-.Os
-.Sh NAME
-.Nm more
-.Nd file perusal filter for crt viewing
-.Sh SYNOPSIS
-.Nm
-.Op Fl ceinsu
-.Op Fl t Ar tag
-.Op Fl x Ar tabs
-.Op Fl / Ar pattern
-.Op Ar
-.Sh DESCRIPTION
-.Nm More
-is a filter for paging through text one screenful at a time.  It
-uses
-.Xr termcap  3
-so it can run on a variety of terminals.  There is even limited support
-for hardcopy terminals.  (On a hardcopy terminal, lines which should be
-printed at the top of the screen are prefixed with an up-arrow.)
-.Ar File
-may be a single dash (``-''), implying stdin.
-.Sh OPTIONS
-Command line options are described below.
-Options are also taken from the environment variable
-.Ev MORE
-(make sure to precede them with a dash (``-'')) but command
-line options will override them.
-.Bl -tag -width flag
-.It Fl c
-Normally,
-.Nm
-will repaint the screen by scrolling from the bottom of the screen.
-If the
-.Fl c
-option is set, when
-.Nm
-needs to change the entire display, it will paint from the top line down.
-.It Fl e
-Normally, if displaying a single file,
-.Nm
-exits as soon as it reaches end-of-file.  The
-.Fl e
-option tells
-.Nm
-to
-exit if it reaches end-of-file twice without an intervening operation.
-.It Fl i
-The
-.Fl i
-option causes searches to ignore case; that is,
-uppercase and lowercase are considered identical.
-.It Fl n
-The
-.Fl n
-flag suppresses line numbers.
-The default (to use line numbers) may cause
-.Nm
-to run more slowly in some cases, especially with a very large input file.
-Suppressing line numbers with the
-.Fl n
-flag will avoid this problem.
-Using line numbers means: the line number will be displayed in the
-.Cm =
-command, and the
-.Cm v
-command will pass the current line number to the editor.
-.It Fl s
-The
-.Fl s
-option causes
-consecutive blank lines to be squeezed into a single blank line.
-.It Fl t
-The
-.Fl t
-option, followed immediately by a tag, will edit the file
-containing that tag.  For more information, see the
-.Xr ctags  1
-command.
-.It Fl u
-By default,
-.Nm
-treats backspaces and
-.Dv CR-LF
-sequences specially.  Backspaces which appear
-adjacent to an underscore character are displayed as underlined text.
-Backspaces which appear between two identical characters are displayed
-as emboldened text.
-.Dv CR-LF
-sequences are compressed to a single newline
-character.  The
-.Fl u
-option causes backspaces to always be displayed as
-control characters, i.e. as the two character sequence ``^H'', and
-.Dv CR-LF
-to be left alone.
-.It Fl x
-The
-.Fl x
-option sets tab stops every
-.Ar N
-positions.
-The default for
-.Ar N
-is 8.
-.It Fl /
-The
-.Fl /
-option specifies a string that will be searched for before
-each file is displayed.
-.Sh COMMANDS
-Interactive commands for
-.Nm
-are based on
-.Xr vi  1  .
-Some commands may be preceded by a decimal number, called N in the
-descriptions below.
+.TH LESS 1 "Version 354: 23 Mar 2000"
+.SH NAME
+less \- opposite of more
+.SH SYNOPSIS
+.B "less -?"
+.br
+.B "less --help"
+.br
+.B "less -V"
+.br
+.B "less --version"
+.br
+.B "less [-[+]aBcCdeEfgGiImMnNqQrsSuUVwX]"
+.br
+.B "     [-b \fIbufs\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]"
+.br
+.B "     [-{oO} \fIlogfile\fP] [-p \fIpattern\fP] [-P \fIprompt\fP] [-t \fItag\fP]"
+.br
+.B "     [-T \fItagsfile\fP] [-x \fItab\fP] [-y \fIlines\fP] [-[z] \fIlines\fP]"
+.br
+.B "     [+[+]\fIcmd\fP] [--] [\fIfilename\fP]..."
+.br
+(See the OPTIONS section for alternate option syntax with long option names.)
+
+.SH DESCRIPTION
+.I Less
+is a program similar to 
+.I more
+(1), but which allows backward movement
+in the file as well as forward movement.
+Also,
+.I less
+does not have to read the entire input file before starting,
+so with large input files it starts up faster than text editors like
+.I vi
+(1).
+.I Less
+uses termcap (or terminfo on some systems),
+so it can run on a variety of terminals.
+There is even limited support for hardcopy terminals.
+(On a hardcopy terminal, lines which should be printed at the top
+of the screen are prefixed with a caret.)
+.PP
+Commands are based on both
+.I more
+and
+.I vi.
+Commands may be preceded by a decimal number, 
+called N in the descriptions below.
+The number is used by some commands, as indicated.
+
+.SH COMMANDS
 In the following descriptions, ^X means control-X.
-.Pp
-.Bl -tag -width Ic
-.It Ic h
+ESC stands for the ESCAPE key; for example ESC-v means the
+two character sequence "ESCAPE", then "v".
+.IP "h or H"
 Help: display a summary of these commands.
 If you forget all the other commands, remember this one.
-.It Xo
-.Ic SPACE
-.No or
-.Ic f
-.No or
-.Ic \&^F
-.Xc
-Scroll forward N lines, default one window.
-If N is more than the screen size, only the final screenful is displayed.
-.It Ic b No or Ic \&^B
-Scroll backward N lines, default one window (see option -z below).
+.IP "SPACE or ^V or f or ^F"
+Scroll forward N lines, default one window (see option -z below).
 If N is more than the screen size, only the final screenful is displayed.
-.It Xo
-.Ic j
-.No or
-.Ic RETURN
-.No or
-.Ic DOWN-ARROW
-.Xc
+Warning: some systems use ^V as a special literalization character.
+.IP "z"
+Like SPACE, but if N is specified, it becomes the new window size.
+.IP "ESC-SPACE"
+Like SPACE, but scrolls a full screenful, even if it reaches
+end-of-file in the process.
+.IP "RETURN or ^N or e or ^E or j or ^J"
 Scroll forward N lines, default 1.
 The entire N lines are displayed, even if N is more than the screen size.
-.It Ic k No or Ic UP-ARROW
-Scroll backward N lines, default 1.
-The entire N lines are displayed, even if N is more than the screen size.
-.It Ic LEFT-ARROW
-Scroll leftwards N columns, default 1, or turn on line-wrapping if the
-screen is cannot be scrolled leftwards.
-.It Ic RIGHT-ARROW
-Turn off line-wrapping or scroll rightwards N columns, default 1,
-if line wrapping is already off.
-.It Ic HOME
-Toggle horizontal scrolling and associated line-wrapping on and off.
-.It Ic d No or Ic \&^D
+.IP "d or ^D"
 Scroll forward N lines, default one half of the screen size.
-If N is specified, it becomes the new default for
+If N is specified, it becomes the new default for 
 subsequent d and u commands.
+.IP "b or ^B or ESC-v"
+Scroll backward N lines, default one window (see option -z below).
+If N is more than the screen size, only the final screenful is displayed.
+.IP "w"
+Like ESC-v, but if N is specified, it becomes the new window size.
+.IP "y or ^Y or ^P or k or ^K"
+Scroll backward N lines, default 1.
 The entire N lines are displayed, even if N is more than the screen size.
-.It Ic u No or Ic \&^U
+Warning: some systems use ^Y as a special job control character.
+.IP "u or ^U"
 Scroll backward N lines, default one half of the screen size.
-If N is specified, it becomes the new default for
+If N is specified, it becomes the new default for 
 subsequent d and u commands.
-The entire N lines are displayed, even if N is more than the screen size.
-.It Ic g
-Go to line N in the file, default 1 (beginning of file).
-.It Ic G
-Go to line N in the file, default the end of the file.
-.It Ic p No or Ic \&%
-Go to a position N percent into the file.  N should be between 0
-and 100.  (This works if standard input is being read, but only if
-.Nm
-has already read to the end of the file.  It is always fast, but
-not always useful.)
-.It Ic r No or Ic \&^L
+.IP "ESC-) or RIGHTARROW"
+Scroll horizontally right N characters, default 8.
+This behaves best if you also set the -S option (chop lines).
+Note that if you wish to enter a number N, you must use ESC-), not RIGHTARROW,
+because the arrow is taken to be a line editing command
+(see the LINE EDITING section).
+.IP "ESC-( or LEFTARROW"
+Scroll horizontally left N characters, default 8.
+.IP "r or ^R or ^L"
 Repaint the screen.
-.It Ic R
+.IP R
 Repaint the screen, discarding any buffered input.
 Useful if the file is changing while it is being viewed.
-.It Ic m
-Followed by any lowercase letter,
+.IP "F"
+Scroll forward, and keep trying to read when the
+end of file is reached.
+Normally this command would be used when already at the end of the file.
+It is a way to monitor the tail of a file which is growing
+while it is being viewed.
+(The behavior is similar to the "tail -f" command.)
+.IP "g or < or ESC-<"
+Go to line N in the file, default 1 (beginning of file).
+(Warning: this may be slow if N is large.)
+.IP "G or > or ESC->"
+Go to line N in the file, default the end of the file.
+(Warning: this may be slow if N is large,
+or if N is not specified and
+standard input, rather than a file, is being read.)
+.IP "p or %"
+Go to a position N percent into the file.
+N should be between 0 and 100.
+.IP "{"
+If a left curly bracket appears in the top line displayed
+on the screen,
+the { command will go to the matching right curly bracket.
+The matching right curly bracket is positioned on the bottom
+line of the screen.
+If there is more than one left curly bracket on the top line,
+a number N may be used to specify the N-th bracket on the line.
+.IP "}"
+If a right curly bracket appears in the bottom line displayed
+on the screen,
+the } command will go to the matching left curly bracket.
+The matching left curly bracket is positioned on the top
+line of the screen.
+If there is more than one right curly bracket on the top line,
+a number N may be used to specify the N-th bracket on the line.
+.IP "("
+Like {, but applies to parentheses rather than curly brackets.
+.IP ")"
+Like }, but applies to parentheses rather than curly brackets.
+.IP "["
+Like {, but applies to square brackets rather than curly brackets.
+.IP "]"
+Like }, but applies to square brackets rather than curly brackets.
+.IP "ESC-^F"
+Followed by two characters,
+acts like {, but uses the two characters as open and close brackets,
+respectively.
+For example, "ESC ^F < >" could be used to 
+go forward to the > which matches the < in the top displayed line.
+.IP "ESC-^B"
+Followed by two characters,
+acts like }, but uses the two characters as open and close brackets,
+respectively.
+For example, "ESC ^B < >" could be used to 
+go backward to the < which matches the > in the bottom displayed line.
+.IP m
+Followed by any lowercase letter, 
 marks the current position with that letter.
-.It Ic \&'
+.IP "'"
 (Single quote.)
 Followed by any lowercase letter, returns to the position which
 was previously marked with that letter.
 Followed by another single quote, returns to the position at
-which the last "large" movement command was executed, or the
-beginning of the file if no such movements have occurred.
-All marks are lost when a new file is examined.
-.It Ic \&/ Ns Ar pattern
+which the last "large" movement command was executed.
+Followed by a ^ or $, jumps to the beginning or end of the
+file respectively.
+Marks are preserved when a new file is examined,
+so the ' command can be used to switch between input files.
+.IP "^X^X"
+Same as single quote.
+.IP /pattern
 Search forward in the file for the N-th line containing the pattern.
 N defaults to 1.
-The pattern is a POSIX.2
-.Dq extended format
-regular expression, as described in
-.Xr re_format 7 .
-The search starts at the second line displayed.
-.It Ic \&? Ns Ar pattern
+The pattern is a regular expression, as recognized by
+.I ed.
+The search starts at the second line displayed
+(but see the -a and -j options, which change this).
+.sp
+Certain characters are special
+if entered at the beginning of the pattern;
+they modify the type of search rather than become part of the pattern:
+.RS
+.IP "^N or !"
+Search for lines which do NOT match the pattern.
+.IP "^E or *"
+Search multiple files.
+That is, if the search reaches the END of the current file 
+without finding a match,
+the search continues in the next file in the command line list.
+.IP "^F or @"
+Begin the search at the first line of the FIRST file
+in the command line list,
+regardless of what is currently displayed on the screen
+or the settings of the -a or -j options.
+.IP "^K"
+Highlight any text which matches the pattern on the current screen, 
+but don't move to the first match (KEEP current position).
+.IP "^R"
+Don't interpret regular expression metacharacters;
+that is, do a simple textual comparison.
+.RE
+.IP ?pattern
 Search backward in the file for the N-th line containing the pattern.
 The search starts at the line immediately before the top line displayed.
-.It Ic \&/\&! Ns Ar pattern
-Like /, but the search is for the N-th line
-which does NOT contain the pattern.
-.It Ic \&?\&! Ns Ar pattern
-Like ?, but the search is for the N-th line
-which does NOT contain the pattern.
-.It Ic n No and Ic N
-Repeat previous search,
-in same or opposite direction respectively,
-for N-th line containing the last pattern
-(or
-.Tn NOT
-containing the last pattern, if the previous search
-was /! or ?!).
-.It Ic E Ns Op Ar filename
+.sp
+Certain characters are special as in the / command:
+.RS
+.IP "^N or !"
+Search for lines which do NOT match the pattern.
+.IP "^E or *"
+Search multiple files.
+That is, if the search reaches the beginning of the current file 
+without finding a match,
+the search continues in the previous file in the command line list.
+.IP "^F or @"
+Begin the search at the last line of the last file
+in the command line list,
+regardless of what is currently displayed on the screen
+or the settings of the -a or -j options.
+.IP "^K"
+As in forward searches.
+.IP "^R"
+As in forward searches.
+.RE
+.IP "ESC-/pattern"
+Same as "/*".
+.IP "ESC-?pattern"
+Same as "?*".
+.IP n
+Repeat previous search, for N-th line containing the last pattern.
+If the previous search was modified by ^N, the search is made for the
+N-th line NOT containing the pattern.
+If the previous search was modified by ^E, the search continues
+in the next (or previous) file if not satisfied in the current file.
+If the previous search was modified by ^R, the search is done
+without using regular expressions.
+There is no effect if the previous search was modified by ^F or ^K.
+.IP N
+Repeat previous search, but in the reverse direction.
+.IP "ESC-n"
+Repeat previous search, but crossing file boundaries.
+The effect is as if the previous search were modified by *.
+.IP "ESC-N"
+Repeat previous search, but in the reverse direction
+and crossing file boundaries.
+.IP "ESC-u"
+Undo search highlighting.
+Turn off highlighting of strings matching the current search pattern. 
+If highlighting is already off because of a previous ESC-u command,
+turn highlighting back on.
+Any search command will also turn highlighting back on.
+(Highlighting can also be disabled by toggling the -G option;
+in that case search commands do not turn highlighting back on.)
+.IP ":e [filename]"
 Examine a new file.
-If the filename is missing, the "current" file (see the N and P commands
+If the filename is missing, the "current" file (see the :n and :p commands
 below) from the list of files in the command line is re-examined.
-If the filename is a pound sign (#), the previously examined file is
-re-examined.
-.It Ic \&:n
+A percent sign (%) in the filename is replaced by the name of the
+current file.  
+A pound sign (#) is replaced by the name of the previously examined file.
+However, two consecutive percent signs are simply 
+replaced with a single percent sign.  
+This allows you to enter a filename that contains a percent sign
+in the name.
+Similarly, two consecutive pound signs are replaced with a single pound sign.
+The filename is inserted into the command line list of files
+so that it can be seen by subsequent :n and :p commands.
+If the filename consists of several files, they are all inserted into
+the list of files and the first one is examined.
+If the filename contains one or more spaces,
+the entire filename should be enclosed in double quotes
+(also see the -" option).
+.IP "^X^V or E"
+Same as :e.
+Warning: some systems use ^V as a special literalization character.
+On such systems, you may not be able to use ^V.
+.IP ":n"
 Examine the next file (from the list of files given in the command line).
-If a number N is specified (not to be confused with the command N),
-the N-th next file is examined.
-.It Ic \&:p
-Examine the previous file.
+If a number N is specified, the N-th next file is examined.
+.IP ":p"
+Examine the previous file in the command line list.
 If a number N is specified, the N-th previous file is examined.
-.It Ic \&:t
-Go to supplied tag.
-.It Ic t
-Go forward in tag queue [gtags only].
-.It Ic T
-Go backward in tag queue [gtags only].
-.It Ic v
-Invokes an editor to edit the current file being viewed.
-The editor is taken from the environment variable
-.Ev EDITOR ,
-or defaults to
-.Xr vi  1  .
-.It Ic \&= No or Ic \&^G
-These options print out the number of the file currently being displayed
-relative to the total number of files there are to display, the current
-line number, the current byte number and the total bytes to display, and
-what percentage of the file has been displayed.  If
-.Nm
-is reading from stdin, or the file is shorter than a single screen, some
-of these items may not be available.  Note, all of these items reference
-the first byte of the last line displayed on the screen.
-.It Xo
-.Ic q
-.No or
-.Ic \&:q
-.No or
-.Ic ZZ
-.Xc
+.IP ":x"
+Examine the first file in the command line list.
+If a number N is specified, the N-th file in the list is examined.
+.IP ":d"
+Remove the current file from the list of files.
+.IP "= or ^G or :f"
+Prints some information about the file being viewed,
+including its name
+and the line number and byte offset of the bottom line being displayed.
+If possible, it also prints the length of the file,
+the number of lines in the file
+and the percent of the file above the last displayed line.
+.IP \-
+Followed by one of the command line option letters (see OPTIONS below),
+this will change the setting of that option
+and print a message describing the new setting.
+If a ^P (CONTROL-P) is entered immediately after the dash,
+the setting of the option is changed but no message is printed.
+If the option letter has a numeric value (such as -b or -h),
+or a string value (such as -P or -t),
+a new value may be entered after the option letter.
+If no new value is entered, a message describing
+the current setting is printed and nothing is changed.
+.IP \-\-
+Like the \- command, but takes a long option name (see OPTIONS below)
+rather than a single option letter.
+You must press RETURN after typing the option name.
+A ^P immediately after the second dash suppresses printing of a 
+message describing the new setting, as in the \- command.
+.IP \-+
+Followed by one of the command line option letters
+this will reset the option to its default setting
+and print a message describing the new setting.
+(The "\-+\fIX\fP" command does the same thing
+as "\-+\fIX\fP" on the command line.)
+This does not work for string-valued options.
+.IP \-\-+
+Like the \-+ command, but takes a long option name
+rather than a single option letter.
+.IP \-!
+Followed by one of the command line option letters,
+this will reset the option to the "opposite" of its default setting
+and print a message describing the new setting.
+This does not work for numeric or string-valued options.
+.IP \-\-!
+Like the \-! command, but takes a long option name
+rather than a single option letter.
+.IP _
+(Underscore.)
+Followed by one of the command line option letters,
+this will print a message describing the current setting of that option.
+The setting of the option is not changed.
+.IP __
+(Double underscore.)
+Like the _ (underscore) command, but takes a long option name
+rather than a single option letter.
+You must press RETURN after typing the option name.
+.IP +cmd
+Causes the specified cmd to be executed each time a new file is examined.
+For example, +G causes 
+.I less
+to initially display each file starting at the end 
+rather than the beginning.
+.IP V
+Prints the version number of 
+.I less 
+being run.
+.IP "q or Q or :q or :Q or ZZ"
 Exits
-.Nm more .
-.El
-.Sh ENVIRONMENT
-.Nm More
-utilizes the following environment variables, if they exist:
-.Bl -tag -width Fl
-.It Ev MORE
-This variable may be set with favored options to
-.Nm more .
-.It Ev EDITOR
-Specify default editor.
-.It Ev SHELL
-Current shell in use (normally set by the shell at login time).
-.It Ev TERM
-Specifies terminal type, used by more to get the terminal
-characteristics necessary to manipulate the screen.
-.El
-.Sh SEE ALSO
-.Xr ctags 1 ,
-.Xr global 1 ,
-.Xr gtags 1 ,
-.Xr vi 1
-.Sh BUGS
-Reading files with long lines is slow.
-.Pp
-CRLF-terminated 80 character lines are proceeded by an extraneous blank line.
-.Pp
-Immediate transitions from bold text to underlined text cause the
-underlining to be not existing.
-.Pp
-Sometimes searches match lines that do not contain the pattern being
-searched for.
-.Pp
-The HOME and ARROW keys will only work if you use the correct vt100
-escape sequences for them.
-.Sh AUTHORS
-This software is derived from software contributed to Berkeley
-by
-.An Mark Nudleman .
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .
+.I less.
+.PP
+The following 
+four
+commands may or may not be valid, depending on your particular installation.
+.PP
+.IP v
+Invokes an editor to edit the current file being viewed.
+The editor is taken from the environment variable VISUAL if defined,
+or EDITOR if VISUAL is not defined,
+or defaults to "vi" if neither VISUAL nor EDITOR is defined.
+See also the discussion of LESSEDIT under the section on PROMPTS below.
+.IP "! shell-command"
+Invokes a shell to run the shell-command given.
+A percent sign (%) in the command is replaced by the name of the
+current file.  
+A pound sign (#) is replaced by the name of the previously examined file.
+"!!" repeats the last shell command.
+"!" with no shell command simply invokes a shell.
+On Unix systems, the shell is taken from the environment variable SHELL,
+or defaults to "sh".
+On MS-DOS and OS/2 systems, the shell is the normal command processor.
+.IP "| <m> shell-command"
+<m> represents any mark letter.
+Pipes a section of the input file to the given shell command.
+The section of the file to be piped is between the first line on
+the current screen and the position marked by the letter.
+<m> may also be ^ or $ to indicate beginning or end of file respectively.
+If <m> is . or newline, the current screen is piped.
+.IP "s filename"
+Save the input to a file.
+This only works if the input is a pipe, not an ordinary file.
+.PP
+.SH OPTIONS
+Command line options are described below.
+Most options may be changed while
+.I less 
+is running, via the "\-" command.
+.PP
+Most options may be given in one of two forms: 
+either a dash followed by a single letter,
+or two dashes followed by a long option name.
+A long option name may be abbreviated as long as
+the abbreviation is unambiguous.
+For example, --quit-at-eof may be abbreviated --quit, but not
+--qui, since both --quit-at-eof and --quiet begin with --qui.
+Some long option names are in uppercase, such as --QUIT-AT-EOF, as
+distinct from --quit-at-eof.
+Such option names need only have their first letter capitalized;
+the remainder of the name may be in either case.
+For example, --Quit-at-eof is equivalent to --QUIT-AT-EOF.
+.PP
+Options are also taken from the environment variable "LESS".
+For example, 
+to avoid typing "less -options ..." each time 
+.I less 
+is invoked, you might tell 
+.I csh:
+.sp
+setenv LESS "-options"
+.sp
+or if you use 
+.I sh:
+.sp
+LESS="-options"; export LESS
+.sp
+On MS-DOS, you don't need the quotes, but you should replace any 
+percent signs in the options string by double percent signs.
+.sp
+The environment variable is parsed before the command line,
+so command line options override the LESS environment variable.
+If an option appears in the LESS variable, it can be reset
+to its default value on the command line by beginning the command
+line option with "\-+".
+.sp
+For options like -P or -D which take a following string,
+a dollar sign ($) must be used to signal the end of the string.
+For example, to set two -D options on MS-DOS, you must have
+a dollar sign between them, like this:
+.sp
+LESS="-Dn9.1$-Ds4.1"
+.sp
+.IP "-? or --help"
+This option displays a summary of the commands accepted by
+.I less
+(the same as the h command).
+(Depending on how your shell interprets the question mark,
+it may be necessary to quote the question mark, thus: "-\\?".)
+.IP "-a or --search-skip-screen"
+Causes searches to start after the last line
+displayed on the screen, 
+thus skipping all lines displayed on the screen.
+By default, searches start at the second line on the screen
+(or after the last found line; see the -j option).
+.IP "-b\fIn\fP or --buffers=\fIn\fP"
+Specifies the number of buffers
+.I less
+will use for each file.
+Buffers are 1K, and by default 10 buffers are used for each file
+(except if the file is a pipe; see the -B option).
+The number \fIn\fP specifies a different number of buffers to use.
+.IP "-B or --auto-buffers"
+By default, when data is read from a pipe,
+buffers are allocated automatically as needed.
+If a large amount of data is read from the pipe, this can cause
+a large amount of memory to be allocated.
+The -B option disables this automatic allocation of buffers for pipes,
+so that only the number of buffers specified by the -b option are used.
+Warning: use of -B can result in erroneous display, since only the
+most recently viewed part of the file is kept in memory; 
+any earlier data is lost.
+.IP "-c or --clear-screen"
+Causes full screen repaints to be painted from the top line down.
+By default,
+full screen repaints are done by scrolling from the bottom of the screen.
+.IP "-C or --CLEAR-SCREEN"
+The -C option is like -c, but the screen is cleared before it is repainted.
+.IP "-d or --dumb"
+The -d option suppresses the error message
+normally displayed if the terminal is dumb;
+that is, lacks some important capability,
+such as the ability to clear the screen or scroll backward.
+The -d option does not otherwise change the behavior of
+.I less
+on a dumb terminal).
+.IP "-D\fBx\fP\fIcolor\fP or --color=\fBx\fP\fIcolor\fP"
+[MS-DOS only]
+Sets the color of the text displayed.
+\fBx\fP is a single character which selects the type of text whose color is 
+being set: n=normal, s=standout, d=bold, u=underlined, k=blink.
+\fIcolor\fP is a pair of numbers separated by a period.  
+The first number selects the foreground color and the second selects 
+the background color of the text.
+A single number \fIN\fP is the same as \fIN.0\fP.
+.IP "-e or --quit-at-eof"
+Causes 
+.I less 
+to automatically exit
+the second time it reaches end-of-file.
+By default, the only way to exit 
+.I less
+is via the "q" command.
+.IP "-E or --QUIT-AT-EOF"
+Causes 
+.I less
+to automatically exit the first time it reaches end-of-file.
+.IP "-f or --force"
+Forces non-regular files to be opened.
+(A non-regular file is a directory or a device special file.)
+Also suppresses the warning message when a binary file is opened.
+By default,
+.I less
+will refuse to open non-regular files.
+.IP "-F or --quit-if-one-screen"
+Causes
+.I less
+to automatically exit
+if the entire file can be displayed on the first screen.
+.IP "-g or --hilite-search"
+Normally, 
+.I less 
+will highlight ALL strings which match the last search command.
+The -g option changes this behavior to highlight only the particular string 
+which was found by the last search command.
+This can cause 
+.I less 
+to run somewhat faster than the default.
+.IP "-G or --HILITE-SEARCH"
+The -G option suppresses all highlighting of strings found by search commands.
+.IP "-h\fIn\fP or ---max-back-scroll=\fIn\fP"
+Specifies a maximum number of lines to scroll backward.
+If it is necessary to scroll backward more than \fIn\fP lines,
+the screen is repainted in a forward direction instead.
+(If the terminal does not have the ability to scroll
+backward, -h0 is implied.)
+.IP "-i or --ignore-case"
+Causes searches to ignore case; that is,
+uppercase and lowercase are considered identical.
+This option is ignored if any uppercase letters
+appear in the search pattern; 
+in other words,
+if a pattern contains uppercase letters, then that search does not ignore case.
+.IP "-I or --IGNORE-CASE"
+Like -i, but searches ignore case even if 
+the pattern contains uppercase letters.
+.IP "-j\fIn\fP or --jump-target=\fIn\fP"
+Specifies a line on the screen where the "target" line
+is to be positioned.
+A target line is the object of a text search, 
+tag search, jump to a line number,
+jump to a file percentage, or jump to a marked position.
+The screen line is specified by a number: the top line on the screen
+is 1, the next is 2, and so on.
+The number may be negative to specify a line relative to the bottom
+of the screen: the bottom line on the screen is -1, the second
+to the bottom is -2, and so on.
+If the -j option is used, searches begin at the line immediately
+after the target line.
+For example, if "-j4" is used, the target line is the
+fourth line on the screen, so searches begin at the fifth line
+on the screen.
+.IP "-k\fIfilename\fP or --lesskey-file=\fIfilename\fP"
+Causes
+.I less
+to open and interpret the named file as a
+.I lesskey
+(1) file.
+Multiple -k options may be specified.
+If the LESSKEY or LESSKEY_SYSTEM environment variable is set, or
+if a lesskey file is found in a standard place (see KEY BINDINGS),
+it is also used as a 
+.I lesskey
+file.
+.IP "-m or --long-prompt"
+Causes 
+.I less
+to prompt verbosely (like \fImore\fP),
+with the percent into the file.
+By default,
+.I less
+prompts with a colon.
+.IP "-M or --LONG-PROMPT"
+Causes 
+.I less
+to prompt even more verbosely than 
+.I more.
+.IP "-n or --line-numbers"
+Suppresses line numbers.
+The default (to use line numbers) may cause
+.I less
+to run more slowly in some cases, especially with a very large input file.
+Suppressing line numbers with the -n option will avoid this problem.
+Using line numbers means: the line number will be displayed in the verbose
+prompt and in the = command,
+and the v command will pass the current line number to the editor
+(see also the discussion of LESSEDIT in PROMPTS below).
+.IP "-N or --LINE-NUMBERS"
+Causes a line number to be displayed at the beginning of
+each line in the display.
+.IP "-o\fIfilename\fP or --log-file=\fIfilename\fP"
+Causes
+.I less
+to copy its input to the named file as it is being viewed.
+This applies only when the input file is a pipe,
+not an ordinary file.
+If the file already exists, 
+.I less
+will ask for confirmation before overwriting it.
+.IP "-O\fIfilename\fP or --LOG-FILE=\fIfilename\fP"
+The -O option is like -o, but it will overwrite an existing
+file without asking for confirmation.
+.sp
+If no log file has been specified,
+the -o and -O options can be used from within 
+.I less
+to specify a log file.
+Without a file name, they will simply report the name of the log file.
+The "s" command is equivalent to specifying -o from within
+.I less.
+.IP "-p\fIpattern\fP or --pattern=\fIpattern\fP"
+The -p option on the command line is equivalent to 
+specifying +/\fIpattern\fP;
+that is, it tells
+.I less
+to start at the first occurrence of \fIpattern\fP in the file.
+.IP "-P\fIprompt\fP or --prompt=\fIprompt\fP"
+Provides a way to tailor the three prompt
+styles to your own preference.
+This option would normally be put in the LESS environment
+variable, rather than being typed in with each 
+.I less
+command.
+Such an option must either be the last option in the LESS variable,
+or be terminated by a dollar sign.
+-Ps followed by a string changes the default (short) prompt 
+to that string.
+-Pm changes the medium (-m) prompt.
+-PM changes the long (-M) prompt.
+-Ph changes the prompt for the help screen.
+-P= changes the message printed by the = command.
+All prompt strings consist of a sequence of 
+letters and special escape sequences.
+See the section on PROMPTS for more details.
+.IP "-q or --quiet or --silent"
+Causes moderately "quiet" operation:
+the terminal bell is not rung 
+if an attempt is made to scroll past the end of the file
+or before the beginning of the file.
+If the terminal has a "visual bell", it is used instead.
+The bell will be rung on certain other errors,
+such as typing an invalid character.
+The default is to ring the terminal bell in all such cases.
+.IP "-Q or --QUIET or --SILENT"
+Causes totally "quiet" operation:
+the terminal bell is never rung.
+.IP "-r or --raw-control-chars"
+Causes "raw" control characters to be displayed.
+The default is to display control characters using the caret notation;
+for example, a control-A (octal 001) is displayed as "^A".
+Warning: when the -r option is used,
+.I less
+cannot keep track of the actual appearance of the screen
+(since this depends on how the screen responds to
+each type of control character).
+Thus, various display problems may result,
+such as long lines being split in the wrong place.
+.IP "-R or --RAW-CONTROL-CHARS"
+Like -r, but tries to keep track of the screen appearance where possible.
+This works only if the input consists of normal text and possibly some
+ANSI "color" escape sequences, which are sequences of the form:
+.sp
+	ESC [ ... m
+.sp
+where the "..." is zero or more characters other than "m".
+For the purpose of keeping track of screen appearance,
+all control characters and all ANSI color escape sequences are
+assumed to not move the cursor.
+You can make
+.I less
+think that characters other than "m" can end ANSI color escape sequences
+by setting the environment variable LESSANSIENDCHARS to the list of
+characters which can end a color escape sequence.
+.IP "-s or --squeeze-blank-lines"
+Causes consecutive blank lines to be squeezed into a single blank line.
+This is useful when viewing
+.I nroff
+output.
+.IP "-S or --chop-long-lines"
+Causes lines longer than the screen width to be
+chopped rather than folded.
+That is, the remainder of a long line is simply discarded.
+The default is to fold long lines; that is, display the remainder
+on the next line.
+.IP "-t\fItag\fP or --tag=\fItag\fP"
+The -t option, followed immediately by a TAG,
+will edit the file containing that tag.
+For this to work, there must be a file called "tags" in the
+current directory, which was previously built by the 
+.I ctags
+(1) command.
+This option may also be specified from within 
+.I less 
+(using the \- command) as a way of examining a new file.
+The command ":t" is equivalent to specifying -t from within
+.I less.
+.IP "-T\fItagsfile\fP or --tag-file=\fItagsfile\fP"
+Specifies a tags file to be used instead of "tags".
+.IP "-u or --underline-special"
+Causes backspaces and carriage returns to be treated as printable characters;
+that is, they are sent to the terminal when they appear in the input.
+.IP "-U or --UNDERLINE-SPECIAL"
+Causes backspaces, tabs and carriage returns to be 
+treated as control characters;
+that is, they are handled as specified by the -r option.
+.sp
+By default, if neither -u nor -U is given,
+backspaces which appear adjacent to an underscore character
+are treated specially:
+the underlined text is displayed 
+using the terminal's hardware underlining capability.
+Also, backspaces which appear between two identical characters
+are treated specially: 
+the overstruck text is printed 
+using the terminal's hardware boldface capability.
+Other backspaces are deleted, along with the preceding character.
+Carriage returns immediately followed by a newline are deleted.
+other carriage returns are handled as specified by the -r option.
+Text which is overstruck or underlined can be searched for
+if neither -u nor -U is in effect.
+.IP "-V or --version"
+Displays the version number of 
+.I less.
+.IP "-w or --hilite-unread"
+Temporarily highlights the first "new" line after a forward movement
+of a full page.
+The first "new" line is the line immediately following the line previously
+at the bottom of the screen.
+Also highlights the target line after a g or p command.
+The highlight is removed at the next command which causes movement.
+.IP "-W or --HILITE-UNREAD"
+Like -w, but temporarily highlights the first new line after any 
+forward movement command larger than one line.
+.IP "-x\fIn\fP or --tabs=\fIn\fP"
+Sets tab stops every \fIn\fP positions.
+The default for \fIn\fP is 8.
+.IP "-X or --no-init"
+Disables sending the termcap initialization and deinitialization strings
+to the terminal.
+This is sometimes desirable if the deinitialization string does
+something unnecessary, like clearing the screen.
+.IP "-y\fIn\fP or --max-forw-scroll=\fIn\fP"
+Specifies a maximum number of lines to scroll forward.
+If it is necessary to scroll forward more than \fIn\fP lines,
+the screen is repainted instead.
+The -c or -C option may be used to repaint from the top of
+the screen if desired.
+By default, any forward movement causes scrolling.
+.IP "-[z]\fIn\fP or --window=\fIn\fP"
+Changes the default scrolling window size to \fIn\fP lines.
+The default is one screenful.
+The z and w commands can also be used to change the window size.
+The "z" may be omitted for compatibility with
+.I more.
+If the number
+.I n
+is negative, it indicates 
+.I n
+lines less than the current screen size.
+For example, if the screen is 24 lines, \fI-z-4\fP sets the 
+scrolling window to 20 lines.  If the screen is resized to 40 lines,
+the scrolling window automatically changes to 36 lines.
+.IP -"\fIcc\fP\ or\ --quotes=\fIcc\fP
+Changes the filename quoting character.
+This may be necessary if you are trying to name a file
+which contains both spaces and quote characters.
+Followed by a single character, this changes the quote character to that
+character.
+Filenames containing a space should then be surrounded by that character
+rather than by double quotes.
+Followed by two characters, changes the open quote to the first character,
+and the close quote to the second character.
+Filenames containing a space should then be preceded by the open quote
+character and followed by the close quote character.
+Note that even after the quote characters are changed, this option
+remains -" (a dash followed by a double quote).
+.IP "-~ or --tilde"
+Normally lines after end of file are displayed as a single tilde (~).
+This option causes lines after end of file to be displayed as blank lines.
+.IP --
+A command line argument of "--" marks the end of option arguments.
+Any arguments following this are interpreted as filenames.
+This can be useful when viewing a file whose name begins with a "-" or "+".
+.IP +
+If a command line option begins with \fB+\fP,
+the remainder of that option is taken to be an initial command to
+.I less.
+For example, +G tells
+.I less
+to start at the end of the file rather than the beginning,
+and +/xyz tells it to start at the first occurrence of "xyz" in the file.
+As a special case, +<number> acts like +<number>g; 
+that is, it starts the display at the specified line number
+(however, see the caveat under the "g" command above).
+If the option starts with ++, the initial command applies to
+every file being viewed, not just the first one.
+The + command described previously
+may also be used to set (or change) an initial command for every file.
+
+.SH "LINE EDITING"
+When entering command line at the bottom of the screen
+(for example, a filename for the :e command,
+or the pattern for a search command),
+certain keys can be used to manipulate the command line.
+Most commands have an alternate form in [ brackets ] which can be used if
+a key does not exist on a particular keyboard. 
+(The bracketed forms do not work in the MS-DOS version.)
+Any of these special keys may be entered literally by preceding
+it with the "literal" character, either ^V or ^A.
+A backslash itself may also be entered literally by entering two backslashes.
+.IP "LEFTARROW [ ESC-h ]"
+Move the cursor one space to the left.
+.IP "RIGHTARROW [ ESC-l ]"
+Move the cursor one space to the right.
+.IP "^LEFTARROW [ ESC-b or ESC-LEFTARROW ]"
+(That is, CONTROL and LEFTARROW simultaneously.)
+Move the cursor one word to the left.
+.IP "^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ]"
+(That is, CONTROL and RIGHTARROW simultaneously.)
+Move the cursor one word to the right.
+.IP "HOME [ ESC-0 ]"
+Move the cursor to the beginning of the line.
+.IP "END [ ESC-$ ]"
+Move the cursor to the end of the line.
+.IP "BACKSPACE"
+Delete the character to the left of the cursor,
+or cancel the command if the command line is empty.
+.IP "DELETE or [ ESC-x ]"
+Delete the character under the cursor.
+.IP "^BACKSPACE [ ESC-BACKSPACE ]"
+(That is, CONTROL and BACKSPACE simultaneously.)
+Delete the word to the left of the cursor.
+.IP "^DELETE [ ESC-X or ESC-DELETE ]"
+(That is, CONTROL and DELETE simultaneously.)
+Delete the word under the cursor.
+.IP "UPARROW [ ESC-k ]"
+Retrieve the previous command line.
+.IP "DOWNARROW [ ESC-j ]"
+Retrieve the next command line.
+.IP "TAB"
+Complete the partial filename to the left of the cursor.
+If it matches more than one filename, the first match
+is entered into the command line.
+Repeated TABs will cycle thru the other matching filenames.
+If the completed filename is a directory, a "/" is appended to the filename.
+(On MS-DOS systems, a "\\" is appended.)
+The environment variable LESSSEPARATOR can be used to specify a 
+different character to append to a directory name.
+.IP "BACKTAB [ ESC-TAB ]"
+Like, TAB, but cycles in the reverse direction thru the matching filenames.
+.IP "^L"
+Complete the partial filename to the left of the cursor.
+If it matches more than one filename, all matches are entered into
+the command line (if they fit).
+.IP "^U (Unix) or ESC (MS-DOS)"
+Delete the entire command line,
+or cancel the command if the command line is empty.
+If you have changed your line-kill character in Unix to something
+other than ^U, that character is used instead of ^U.
+
+.SH "KEY BINDINGS"
+You may define your own 
+.I less
+commands by using the program 
+.I lesskey
+(1)
+to create a lesskey file.
+This file specifies a set of command keys and an action
+associated with each key.
+You may also use
+.I lesskey
+to change the line-editing keys (see LINE EDITING),
+and to set environment variables.
+If the environment variable LESSKEY is set,
+.I less
+uses that as the name of the lesskey file.
+Otherwise, 
+.I less
+looks in a standard place for the lesskey file:
+On Unix systems,
+.I less
+looks for a lesskey file called "$HOME/.less".
+On MS-DOS and Windows systems,
+.I less
+looks for a lesskey file called "$HOME/_less", and if it is not found there,
+then looks for a lesskey file called "_less" in any directory specified
+in the PATH environment variable.
+On OS/2 systems,
+.I less
+looks for a lesskey file called "$HOME/less.ini", and if it is not found,
+then looks for a lesskey file called "less.ini" in any directory specified
+in the INIT environment variable, and if it not found there,
+then looks for a lesskey file called "less.ini" in any directory specified
+in the PATH environment variable.
+See the
+.I lesskey
+manual page for more details.
+.P
+A system-wide lesskey file may also be set up to provide key bindings.
+If a key is defined in both a local lesskey file and in the
+system-wide file, key bindings in the local file take precedence over 
+those in the system-wide file.
+If the environment variable LESSKEY_SYSTEM is set,
+.I less
+uses that as the name of the system-wide lesskey file.
+Otherwise,
+.I less 
+looks in a standard place for the system-wide lesskey file:
+On Unix systems, the system-wide lesskey file is /usr/local/bin/.sysless.
+(However, if 
+.I less 
+was built with a different binary directory than /usr/local/bin,
+that directory is where the .sysless file is found.)
+On MS-DOS and Windows systems, the system-wide lesskey file is c:\\_sysless.
+On OS/2 systems, the system-wide lesskey file is c:\\sysless.ini.
+
+.SH "INPUT PREPROCESSOR"
+You may define an "input preprocessor" for 
+.I less.
+Before
+.I less
+opens a file, it first gives your input preprocessor a chance to modify the
+way the contents of the file are displayed.
+An input preprocessor is simply an executable program (or shell script),
+which writes the contents of the file to a different file,
+called the replacement file.
+The contents of the replacement file are then displayed 
+in place of the contents of the original file.
+However, it will appear to the user as if the original file is opened;
+that is, 
+.I less
+will display the original filename as the name of the current file.
+.PP
+An input preprocessor receives one command line argument, the original filename,
+as entered by the user.
+It should create the replacement file, and when finished,
+print the name of the replacement file to its standard output.
+If the input preprocessor does not output a replacement filename, 
+.I less
+uses the original file, as normal.
+The input preprocessor is not called when viewing standard input.
+To set up an input preprocessor, set the LESSOPEN environment variable
+to a command line which will invoke your input preprocessor.
+This command line should include one occurrence of the string "%s", 
+which will be replaced by the filename
+when the input preprocessor command is invoked.
+.PP
+When 
+.I less
+closes a file opened in such a way, it will call another program,
+called the input postprocessor,
+which may perform any desired clean-up action (such as deleting the
+replacement file created by LESSOPEN).
+This program receives two command line arguments, the original filename
+as entered by the user, and the name of the replacement file.
+To set up an input postprocessor, set the LESSCLOSE environment variable 
+to a command line which will invoke your input postprocessor.
+It may include two occurrences of the string "%s"; 
+the first is replaced with the original name of the file and 
+the second with the name of the replacement file, 
+which was output by LESSOPEN.
+.PP
+For example, on many Unix systems, these two scripts will allow you
+to keep files in compressed format, but still let
+.I less
+view them directly:
+.PP
+lessopen.sh:
+.br
+	#! /bin/sh
+.br
+	case "$1" in
+.br
+	*.Z)	uncompress -c $1  >/tmp/less.$$  2>/dev/null
+.br
+		if [ -s /tmp/less.$$ ]; then 
+.br
+			echo /tmp/less.$$
+.br
+		else
+.br
+			rm -f /tmp/less.$$
+.br
+		fi
+.br
+		;;
+.br
+	esac
+.PP
+lessclose.sh:
+.br
+	#! /bin/sh
+.br
+	rm $2
+.PP
+To use these scripts, put them both where they can be executed and
+set LESSOPEN="lessopen.sh\ %s", and
+LESSCLOSE="lessclose.sh\ %s\ %s".
+More complex LESSOPEN and LESSCLOSE scripts may be written
+to accept other types of compressed files, and so on.
+.PP
+It is also possible to set up an input preprocessor to
+pipe the file data directly to 
+.I less,
+rather than putting the data into a replacement file.
+This avoids the need to decompress the entire file before 
+starting to view it.
+An input preprocessor that works this way is called an input pipe.
+An input pipe, instead of writing the name of a replacement file on
+its standard output,
+writes the entire contents of the replacement file on its standard output.
+If the input pipe does not write any characters on its standard output,
+then there is no replacement file and 
+.I less
+uses the original file, as normal.
+To use an input pipe,
+make the first character in the LESSOPEN environment variable a 
+vertical bar (|) to signify that the input preprocessor is an input pipe.
+.PP
+For example, on many Unix systems, this script will work like the
+previous example scripts:
+.PP
+lesspipe.sh:
+.br
+	#! /bin/sh
+.br
+	case "$1" in
+.br
+	*.Z)	uncompress -c $1  2>/dev/null
+.br
+		;;
+.br
+	esac
+.br
+.PP
+To use this script, put it where it can be executed and set
+LESSOPEN="|lesspipe.sh %s".
+When an input pipe is used, a LESSCLOSE postprocessor can be used,
+but it is usually not necessary since there is no replacement file
+to clean up.
+In this case, the replacement file name passed to the LESSCLOSE
+postprocessor is "-".
+
+.SH "NATIONAL CHARACTER SETS"
+There are three types of characters in the input file:
+.IP "normal characters"
+can be displayed directly to the screen.
+.IP "control characters"
+should not be displayed directly, but are expected to be found
+in ordinary text files (such as backspace and tab).
+.IP "binary characters"
+should not be displayed directly and are not expected to be found
+in text files.
+.PP
+A "character set" is simply a description of which characters are to
+be considered normal, control, and binary.
+The LESSCHARSET environment variable may be used to select a character set.
+Possible values for LESSCHARSET are:
+.IP ascii
+BS, TAB, NL, CR, and formfeed are control characters,
+all chars with values between 32 and 126 are normal,
+and all others are binary.
+.IP iso8859
+Selects an ISO 8859 character set.
+This is the same as ASCII, except characters between 160 and 255 are
+treated as normal characters.
+.IP latin1
+Same as iso8859.
+.IP dos
+Selects a character set appropriate for MS-DOS.
+.IP ebcdic
+Selects an EBCDIC character set.
+.IP koi8-r
+Selects a Russian character set.
+.IP next
+Selects a character set appropriate for NeXT computers.
+.IP utf-8
+Selects the UTF-8 encoding of the ISO 10646 character set.
+.PP
+If the LESSCHARSET environment variable is not set,
+the default character set is latin1.
+However, if the string "UTF-8" is found in the LC_ALL, LC_CTYPE or LANG
+environment variables, then the default character set is utf-8 instead.
+.PP
+In special cases, it may be desired to tailor
+.I less
+to use a character set other than the ones definable by LESSCHARSET.
+In this case, the environment variable LESSCHARDEF can be used
+to define a character set.
+It should be set to a string where each character in the string represents
+one character in the character set.
+The character "." is used for a normal character, "c" for control,
+and "b" for binary.
+A decimal number may be used for repetition.
+For example, "bccc4b." would mean character 0 is binary,
+1, 2 and 3 are control, 4, 5, 6 and 7 are binary, and 8 is normal.
+All characters after the last are taken to be the same as the last,
+so characters 9 through 255 would be normal.
+(This is an example, and does not necessarily 
+represent any real character set.)
+.PP
+This table shows the value of LESSCHARDEF which is equivalent
+to each of the possible values for LESSCHARSET:
+.sp
+	ascii\ 	8bcccbcc18b95.b
+.br
+	dos\ \ \ 	8bcccbcc12bc5b95.b.
+.br
+	ebcdic	5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b
+.br
+	\ \ \ \ \ \ 	9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b.
+.br
+	iso8859	8bcccbcc18b95.33b.
+.br
+	koi8-r	8bcccbcc18b95.b128.
+.br
+	latin1	8bcccbcc18b95.33b.
+.br
+	next\ \ 	8bcccbcc18b95.bb125.bb
+.PP
+If neither LESSCHARSET nor LESSCHARDEF is set, 
+but your system supports the 
+.I setlocale
+interface,
+.I less
+will use setlocale to determine the character set.
+setlocale is controlled by setting the LANG or LC_CTYPE environment variables.
+.PP
+Control and binary characters are displayed in standout (reverse video).
+Each such character is displayed in caret notation if possible
+(e.g. ^A for control-A).  Caret notation is used only if 
+inverting the 0100 bit results in a normal printable character.
+Otherwise, the character is displayed as a hex number in angle brackets.
+This format can be changed by 
+setting the LESSBINFMT environment variable.
+LESSBINFMT may begin with a "*" and one character to select 
+the display attribute:
+"*k" is blinking, "*d" is bold, "*u" is underlined, "*s" is standout,
+and "*n" is normal.
+If LESSBINFMT does not begin with a "*", normal attribute is assumed.
+The remainder of LESSBINFMT is a string which may include one
+printf-style escape sequence (a % followed by x, X, o, d, etc.).
+For example, if LESSBINFMT is "*u[%x]", binary characters
+are displayed in underlined hexadecimal surrounded by brackets.
+The default if no LESSBINFMT is specified is "*s<%X>".
+
+.SH "PROMPTS"
+The -P option allows you to tailor the prompt to your preference.
+The string given to the -P option replaces the specified prompt string.
+Certain characters in the string are interpreted specially.
+The prompt mechanism is rather complicated to provide flexibility,
+but the ordinary user need not understand the details of constructing
+personalized prompt strings.
+.sp
+A percent sign followed by a single character is expanded
+according to what the following character is:
+.IP "%b\fIX\fP"
+Replaced by the byte offset into the current input file.
+The b is followed by a single character (shown as \fIX\fP above)
+which specifies the line whose byte offset is to be used.
+If the character is a "t", the byte offset of the top line in the
+display is used,
+an "m" means use the middle line,
+a "b" means use the bottom line,
+a "B" means use the line just after the bottom line,
+and a "j" means use the "target" line, as specified by the -j option.
+.IP "%B"
+Replaced by the size of the current input file.
+.IP "%c"
+Replaced by the column number of the text appearing in the first
+column of the screen.
+.IP "%d\fIX\fP"
+Replaced by the page number of a line in the input file.
+The line to be used is determined by the \fIX\fP, as with the %b option.
+.IP "%D"
+Replaced by the number of pages in the input file,
+or equivalently, the page number of the last line in the input file.
+.IP "%E"
+Replaced by the name of the editor (from the VISUAL environment variable,
+or the EDITOR environment variable if VISUAL is not defined).
+See the discussion of the LESSEDIT feature below.
+.IP "%f"
+Replaced by the name of the current input file.
+.IP "%i"
+Replaced by the index of the current file in the list of
+input files.
+.IP "%l\fIX\fP"
+Replaced by the line number of a line in the input file.
+The line to be used is determined by the \fIX\fP, as with the %b option.
+.IP "%L"
+Replaced by the line number of the last line in the input file.
+.IP "%m"
+Replaced by the total number of input files.
+.IP "%p\fIX\fP"
+Replaced by the percent into the current input file, based on byte offsets.
+The line used is determined by the \fIX\fP as with the %b option.
+.IP "%P\fIX\fP"
+Replaced by the percent into the current input file, based on line numbers.
+The line used is determined by the \fIX\fP as with the %b option.
+.IP "%s"
+Same as %B.
+.IP "%t"
+Causes any trailing spaces to be removed.
+Usually used at the end of the string, but may appear anywhere.
+.IP "%x"
+Replaced by the name of the next input file in the list.
+.PP
+If any item is unknown (for example, the file size if input
+is a pipe), a question mark is printed instead.
+.PP
+The format of the prompt string can be changed
+depending on certain conditions.
+A question mark followed by a single character acts like an "IF":
+depending on the following character, a condition is evaluated.
+If the condition is true, any characters following the question mark
+and condition character, up to a period, are included in the prompt.
+If the condition is false, such characters are not included.
+A colon appearing between the question mark and the
+period can be used to establish an "ELSE": any characters between
+the colon and the period are included in the string if and only if
+the IF condition is false.
+Condition characters (which follow a question mark) may be:
+.IP "?a"
+True if any characters have been included in the prompt so far.
+.IP "?b\fIX\fP"
+True if the byte offset of the specified line is known.
+.IP "?B"
+True if the size of current input file is known.
+.IP "?c"
+True if the text is horizontally shifted (%c is not zero).
+.IP "?d\fIX\fP"
+True if the page number of the specified line is known.
+.IP "?e"
+True if at end-of-file.
+.IP "?f"
+True if there is an input filename
+(that is, if input is not a pipe).
+.IP "?l\fIX\fP"
+True if the line number of the specified line is known.
+.IP "?L"
+True if the line number of the last line in the file is known.
+.IP "?m"
+True if there is more than one input file.
+.IP "?n"
+True if this is the first prompt in a new input file.
+.IP "?p\fIX\fP"
+True if the percent into the current input file, based on byte offsets,
+of the specified line is known.
+.IP "?P\fIX\fP"
+True if the percent into the current input file, based on line numbers,
+of the specified line is known.
+.IP "?s"
+Same as "?B".
+.IP "?x"
+True if there is a next input file
+(that is, if the current input file is not the last one).
+.PP
+Any characters other than the special ones
+(question mark, colon, period, percent, and backslash)
+become literally part of the prompt.
+Any of the special characters may be included in the prompt literally
+by preceding it with a backslash.
+.PP
+Some examples:
+.sp
+?f%f:Standard input.
+.sp
+This prompt prints the filename, if known;
+otherwise the string "Standard input".
+.sp
+?f%f .?ltLine %lt:?pt%pt\\%:?btByte %bt:-...
+.sp
+This prompt would print the filename, if known.
+The filename is followed by the line number, if known,
+otherwise the percent if known, otherwise the byte offset if known.
+Otherwise, a dash is printed.
+Notice how each question mark has a matching period,
+and how the % after the %pt
+is included literally by escaping it with a backslash.
+.sp
+?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\\:\ %x..%t
+.sp
+This prints the filename if this is the first prompt in a file,
+followed by the "file N of N" message if there is more
+than one input file.
+Then, if we are at end-of-file, the string "(END)" is printed
+followed by the name of the next file, if there is one.
+Finally, any trailing spaces are truncated.
+This is the default prompt.
+For reference, here are the defaults for
+the other two prompts (-m and -M respectively).
+Each is broken into two lines here for readability only.
+.nf
+.sp
+?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\\:\ %x.:
+	?pB%pB\\%:byte\ %bB?s/%s...%t
+.sp
+?f%f\ .?n?m(file\ %i\ of\ %m)\ ..?ltlines\ %lt-%lb?L/%L.\ :
+	byte\ %bB?s/%s.\ .?e(END)\ ?x-\ Next\\:\ %x.:?pB%pB\\%..%t
+.sp
+.fi
+And here is the default message produced by the = command:
+.nf
+.sp
+?f%f\ .?m(file\ %i\ of\ %m)\ .?ltlines\ %lt-%lb?L/%L.\ .
+	byte\ %bB?s/%s.\ ?e(END)\ :?pB%pB\\%..%t
+.fi
+.PP
+The prompt expansion features are also used for another purpose:
+if an environment variable LESSEDIT is defined, it is used
+as the command to be executed when the v command is invoked.
+The LESSEDIT string is expanded in the same way as the prompt strings.
+The default value for LESSEDIT is:
+.nf
+.sp
+	%E\ ?lm+%lm.\ %f
+.sp
+.fi
+Note that this expands to the editor name, followed by a + and the
+line number, followed by the file name.
+If your editor does not accept the "+linenumber" syntax, or has other
+differences in invocation syntax, the LESSEDIT variable can be 
+changed to modify this default.
+
+.SH SECURITY
+When the environment variable LESSSECURE is set to 1,
+.I less
+runs in a "secure" mode.
+This means these features are disabled:
+.RS
+.IP "!"
+the shell command
+.IP "|"
+the pipe command
+.IP ":e"
+the examine command.
+.IP "v"
+the editing command
+.IP "s  -o"
+log files
+.IP "-k"
+use of lesskey files
+.IP "-t"
+use of tags files
+.IP " "
+metacharacters in filenames, such as *
+.IP " "
+filename completion (TAB, ^L)
+.RE
+.PP
+Less can also be compiled to be permanently in "secure" mode.
+
+.SH "ENVIRONMENT VARIABLES"
+Environment variables may be specified either in the system environment
+as usual, or in a 
+.I lesskey
+(1) file.
+If environment variables are defined in more than one place, 
+variables defined in a local lesskey file take precedence over
+variables defined in the system environment, which take precedence
+over variables defined in the system-wide lesskey file.
+.IP COLUMNS
+Sets the number of columns on the screen.
+Takes precedence over the number of columns specified by the TERM variable.
+(But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
+the window system's idea of the screen size takes precedence over the
+LINES and COLUMNS environment variables.)
+.IP EDITOR
+The name of the editor (used for the v command).
+.IP HOME
+Name of the user's home directory (used to find a lesskey file on Unix systems).
+.IP "HOMEDRIVE, HOMEPATH"
+Concatenation of the HOMEDRIVE and HOMEPATH environment variables is
+the name of the user's home directory if the HOME variable is not set
+(only in the Windows version).
+.IP INIT
+Name of the user's init directory (used to find a lesskey file on OS/2 systems).
+.IP LANG
+Language for determining the character set.
+.IP LC_CTYPE
+Language for determining the character set.
+.IP LESS
+Options which are passed to 
+.I less
+automatically.
+.IP LESSANSIENDCHARS
+Characters which are assumed to end an ANSI color escape sequence
+(default "m").
+.IP LESSBINFMT
+Format for displaying non-printable, non-control characters.
+.IP LESSCHARDEF
+Defines a character set.
+.IP LESSCHARSET
+Selects a predefined character set.
+.IP LESSCLOSE
+Command line to invoke the (optional) input-postprocessor.
+.IP LESSECHO
+Name of the lessecho program (default "lessecho").
+The lessecho program is needed to expand metacharacters, such as * and ?,
+in filenames on Unix systems.
+.IP LESSEDIT
+Editor prototype string (used for the v command).
+See discussion under PROMPTS.
+.IP LESSKEY
+Name of the default lesskey(1) file.
+.IP LESSKEY_SYSTEM
+Name of the default system-wide lesskey(1) file.
+.IP LESSMETACHARS
+List of characters which are considered "metacharacters" by the shell.
+.IP LESSMETAESCAPE
+Prefix which less will add before each metacharacter in a
+command sent to the shell.
+If LESSMETAESCAPE is an empty string, commands containing
+metacharacters will not be passed to the shell.
+.IP LESSOPEN
+Command line to invoke the (optional) input-preprocessor.
+.IP LESSSECURE
+Runs less in "secure" mode.
+See discussion under SECURITY.
+.IP LESSSEPARATOR
+String to be appended to a directory name in filename completion.
+.IP LINES
+Sets the number of lines on the screen.
+Takes precedence over the number of lines specified by the TERM variable.
+(But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
+the window system's idea of the screen size takes precedence over the
+LINES and COLUMNS environment variables.)
+.IP PATH
+User's search path (used to find a lesskey file 
+on MS-DOS and OS/2 systems).
+.IP SHELL
+The shell used to execute the ! command, as well as to expand filenames.
+.IP TERM
+The type of terminal on which
+.I less
+is being run.
+.IP VISUAL
+The name of the editor (used for the v command).
+
+.SH "SEE ALSO"
+lesskey(1)
+
+.SH WARNINGS
+The = command and prompts (unless changed by -P)
+report the line numbers of the lines at the top and bottom of the screen,
+but the byte and percent of the line after the one at the bottom of the screen.
+.PP
+If the :e command is used to name more than one file,
+and one of the named files has been viewed previously,
+the new files may be entered into the list in an unexpected order.
+.PP
+On certain older terminals (the so-called "magic cookie" terminals),
+search highlighting will cause an erroneous display.
+On such terminals, search highlighting is disabled by default 
+to avoid possible problems.
+.PP
+In certain cases, when search highlighting is enabled and 
+a search pattern begins with a ^,
+more text than the matching string may be highlighted.
+(This problem does not occur when less is compiled to use the POSIX
+regular expression package.)
+.PP
+On some systems,
+.I setlocale
+claims that ASCII characters 0 thru 31 are control characters 
+rather than binary characters.
+This causes 
+.I less 
+to treat some binary files as ordinary, non-binary files.
+To workaround this problem, set the environment variable
+LESSCHARSET to "ascii" (or whatever character set is appropriate).
+.PP
+See http://www.flash.net/~marknu/less for the latest list of known bugs in this
+version of less.
+
+.SH COPYRIGHT
+Copyright (C) 2000  Mark Nudelman
+.PP
+less is part of the GNU project and is free software.
+You can redistribute it and/or modify it
+under the terms of either
+(1) the GNU General Public License as published by
+the Free Software Foundation; or (2) the Less License.
+See the file README in the less distribution for more details
+regarding redistribution.
+You should have received a copy of the GNU General Public License 
+along with the source for less; see the file COPYING.
+If not, write to the Free Software Foundation, 59 Temple Place,
+Suite 330, Boston, MA  02111-1307, USA.
+You should also have received a copy of the Less License;
+see the file LICENSE.
+.PP
+less is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+.SH AUTHOR
+.PP
+Mark Nudelman <marknu@flash.net>
+.br
+Send bug reports or comments to the above address or to bug-less@gnu.org.
+
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/mt.1 man1/mt.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/mt.1	Tue Mar 21 06:31:31 2000
+++ man1/mt.1	Mon Jul  3 19:52:30 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.19 2000/03/02 14:53:31 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.19.2.1 2000/06/30 09:51:51 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt MT 1
@@ -40,7 +40,7 @@
 .Nm mt
 .Nd magnetic tape manipulating program
 .Sh SYNOPSIS
-.Nm
+.Nm mt
 .Op Fl f Ar tapename
 .Ar command
 .Op Ar count
@@ -192,15 +192,15 @@
 .Pp
 .Bl -tag -width 123456789 -compact
 .It off
-Turn compression off
+Turn compression off.
 .It on
-Turn compression on
+Turn compression on.
 .It none
 Same as
-.Ar off
+.Ar off .
 .It enable
 Same as
-.Ar on
+.Ar on .
 .It IDRC
 IBM Improved Data Recording Capability compression (0x10).
 .It DCLZ
@@ -224,7 +224,7 @@
 does not exist;
 .Nm
 uses the device
-.Pa /dev/nrsa0 .
+.Pa /dev/nsa0 .
 .Pp
 .Nm Mt
 returns a 0 exit status when the operation(s) were successful,
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ncplist.1 man1/ncplist.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ncplist.1	Tue Mar 21 06:31:47 2000
+++ man1/ncplist.1	Mon Jul  3 19:52:48 2000
@@ -1,7 +1,7 @@
-.\" %FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.3 2000/03/01 12:20:03 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.3.2.1 2000/03/23 12:07:32 sheldonh Exp %
 .Dd Jun 24, 1999
 .Dt NCPLIST 1
-.Os FreeBSD 3.2
+.Os
 .Sh NAME
 .Nm ncplist
 .Nd Displays various information about ncplib and NetWare servers
@@ -13,11 +13,11 @@
 The
 .Nm
 command used to display state of ncplib and NetWare servers.
-First argument
-are one letter
+The first argument
+is a one letter
 .Ar command
 following by optional
-.Ar args
+.Ar args .
 .Pp
 The commands are:
 .Bl -tag -width indent
@@ -25,36 +25,43 @@
 Lists bindery objects of
 .Ar type
 on a specified
-.Ar server.
-.Ar Type
+.Ar server .
+The
+.Ar type
+argument
 can be one of the following:
 .Bd -literal -offset indent
 Type	Meaning
 user	bindery users
 group	bindery groups
 pserver	bindery print servers
-tree	tree name hosted by given server.
+tree	tree name hosted by given server
 .Ed
 .Pp
-Please note that if you are not logged in to the specified server list can be
-incomplete or empty.
+Note that if you are not logged in to the specified server,
+the list may be incomplete or empty.
 .It c
-List active NCP connections on local machine.
+List active NCP connections on the local machine.
 .It s Op Ar server
-Displays NetWare servers known to given
+Display
+.Tn NetWare
+servers known to a given
 .Ar server .
-If no server is specified nearest server will be used.
+If no server is specified, the nearest server will be used.
 .It u Ar server
-Displays a list of users logged-in on given
+Displays a list of users logged in on a given
 .Ar server .
-If you are not logged in to the specified server list will be empty.
+If you are not logged in to the specified server,
+the list will be empty.
 .It q Ar server Op Ar pattern
-Displays bindery queues on given
+Displays bindery queues on a given
 .Ar server .
 .It v Ar server
-Displays mounted volumes on given
+Displays mounted volumes on a given
 .Ar server .
 .El
+.Sh IMPLEMENTATION NOTES
+This utility is provided mostly for educational purposes.
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
 .It Pa ~/.nwfsrc
@@ -62,14 +69,13 @@
 See
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 for details.
-
-.Sh NOTES
-This utility provided mostly for educational purposes.
-
-.Sh BUGS
-to number a few
-
-.Sh AUTHOR
-.An Boris Popov Aq bp@butya.kz
-,
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 4.0 .
+.Sh AUTHORS
+.An Boris Popov Aq bp@butya.kz ,
 .Aq rbp@chat.ru
+.Sh BUGS
+Please report any bugs to the author.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ncplogin.1 man1/ncplogin.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ncplogin.1	Tue Mar 21 06:31:47 2000
+++ man1/ncplogin.1	Mon Jul  3 19:52:49 2000
@@ -1,184 +1,237 @@
-.\" %FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.4 2000/03/06 09:45:30 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.4.2.2 2000/03/27 10:52:05 sheldonh Exp %
 .Dd Sep 15, 1999
 .Dt NCPLOGIN 1
-.Os FreeBSD 4.0
+.Os
 .Sh NAME
 .Nm ncplogin
-.Nd create permanent connection to a NetWare server,
+.Nd create permanent connection to a NetWare server
 .Sh SYNOPSIS
 .Nm ncplogin
-.Op Fl S Ar server Fl U Ar user
+.Op Fl BCDN
+.Op Fl S Ar server
+.Op Fl U Ar user
 .Op Fl A Ar host
-.Op Fl B
-.Op Fl C
-.Op Fl D
 .Op Fl I Ar level
 .Op Fl M Ar mode
-.Op Fl N
-.\" hm, which is right way to do this ?
-.Op Fl O Ar owner Op :group
-.Op Fl O Ar :group
-|
+.Oo
+.Fl O Xo
+.Op Ar owner Ns
+.Op : Ns Ar group
+.Xc
+.Oc
 .Op Fl R Ar retrycount
 .Op Fl T Ar tree
 .Op Fl W Ar timeout
-.Ar /server:user
+.Nm ncplogin
+.Op Fl BCDN
+.Op Fl A Ar host
+.Op Fl I Ar level
+.Op Fl M Ar mode
+.Oo
+.Fl O Xo
+.Op Ar owner Ns
+.Op : Ns Ar group
+.Xc
+.Oc
+.Op Fl R Ar retrycount
+.Op Fl T Ar tree
+.Op Fl W Ar timeout
+.No / Ns Ar server Ns : Ns Ar user
 .Sh DESCRIPTION
-Connections to a NetWare server can be created and used independently from
+Connections to a
+.Tn NetWare
+server can be created and used independently of the
 .Xr mount_nwfs 8
 command.
-Connection can be created by any user.
+Connections can be created by any user.
 Each user can have multiple
-connections, but NetWareServer:NetWareUser pair should be unique.
+connections, but each NetWareServer:NetWareUser pair should be unique.
 .Pp
 The
-.Nm ncplogin
-command used to create permanent connection to a NetWare server.
-Permanent
-connection will stay connected even if no applications use it.
-This allows
-user to run different ncp* programs without specifying file server and user
-to use.
-This connection can be destroyed by
+.Nm
+command is used to create a permanent connection to a
+.Tn NetWare
+server.
+Permanent connections will stay connected even if no applications use them.
+This allows users to run different ncp* programs
+without specifying a file server and user to use.
+Established connections can be destroyed with the
 .Xr ncplogout 1 
 command.
 .Pp
-Upper case options described in this manual are common for other ncp* programs
-and referred as
-.Ar connection options.
+Upper case options described in this manual
+are common for other ncp* programs and are referred to as
+.Qq connection options .
 Options
 .Fl U
 and
 .Fl S
-are mutually exclusive with
-.Ar /server:user
+are mutually exclusive with the
+.No / Ns Ar server Ns : Ns Ar user
 syntax.
 .Pp
 The options are:
 .Bl -tag -width indent
 .It Fl S Ar server
-name of NetWare server to connect.
-This affect only IPX severs for native IP
-see 
+Specify the name of the
+.Tn NetWare server to connect to.
+This affect only
+.Tn IPX
+servers.
+For native
+.Tn IP
+servers, see the
 .Fl A
 option.
 .It Fl U Ar user
-name of user used in login sequence.
+Specify the name of the user used in the login sequence.
 .It Fl A Ar host
-use UDP protocol to connect to NetWare 5.x server specified by
+Use the
+.Tn UDP
+protocol to connect to a
+.Tn NetWare
+5.x server specified by the
 .Ar host
-parameter.
+argument.
 .It Fl C
-don't convert password to uppercase.
+Do not convert the password to uppercase.
 .It Fl D
-Marks connection as primary.
-Can be used to modify already established 
-connection.
-Only
+Mark the connection as primary.
+The option can be used to modify existing connections.
+Only the
 .Nm
-program accept that option.
+program accepts this option.
 .It Fl I Ar signature_level
-try to use
+Try to use
 .Ar signature_level .
+Available values are:
 .Bd -literal -offset indent
 Value   Meaning
 0	disable signatures
-1	enable, use if server require them.
-2	ask server for signing, but agree to work without.
-3	signatures are required.
+1	enable (use if required by server)
+2	request but do not require signing
+3	require signatures
 .Ed
-Please note that only packet headers signing are implemented.
+.Pp
+Note that only packet header signing is implemented.
 .It Fl M Ar mode
-Just like files connections can be shared by users.
-The bits in
+Share this connection.
+The bits in the
 .Ar mode
-argument behaves much like file permissions:
+argument are similar to standard file permissions:
 .Bd -literal -offset indent
 Mask    Meaning
 4	READ    - connection will be visible.
 2	WRITE   - connection can be closed/modified
 1	EXECUTE - user allowed to execute requests.
 .Ed
-By default connection created with mode 0700 and only owner can do
-anything with it.
-If you want to share the connection, for example with group 
-you may specify 0750 value.
-This means group can do NCP request, but can't
-destroy connection.
-When user doesn't explicitly specify server to use, ncp*
-programs try to find suitable connection in the next order:
 .Pp
-1. Try to find connection owned by user.
+By default, the connection is created with
+.Ar mode
+0700
+and only the owner can use it.
+Specifying 0750 as the argument to the
+.Fl M
+option would allow read-only group access as well.
+This would allow the group to perform
+.Tn NCP
+requests,
+but not to destroy the connection.
+When a server is not explicitly specified,
+ncp* programs try to find a suitable connection in the following order:
+.Bl -enum -offset indent
+.It
+Try to find a connection owned by the user.
 If there is more than one such 
-connection it try to figure out which is primary.
-Primary flag controlled
-by
+connection, try to determine which one is primary.
+The primary flag is set with the
 .Fl D
 option.
-.Pp
-2. If previous fail, first shared connection will be used.
+.It
+If the primary connection could not be determined,
+the first shared connection will be used.
+.El
 .It Fl N
-don't ask for a password.
-While loading
+Do not prompt for a password.
+At run time,
 .Nm
-reads ~/.nwfsrc file to get additional configuration parameters and
-password.
-If no password found for the specified SERVER:USER pair,
+reads the
+.Pa ~/.nwfsrc
+file for additional configuration parameters and a password.
+If no password is found for the specified
+.Ar server Ns : Ns Ar user
+pair,
 .Nm
 prompts for it.
 .It Fl O
-Just like files, connection has 
-.Ar owner and
+Specify the
+.Ar owner
+and
 .Ar group
-attributes.
-Newly created connection takes
+attributes for the connection.
+Newly created connections take the
 .Ar owner
-parameter from creator's userid and
+attribute from the creating user's username and the
 .Ar group
-paramter
-from creator's primary group.
-This can be overrided with this option.
-Only superuser can override an
+attribute from the creating user's primary group.
+This option overrides that behaviour.
+Only the superuser can override the
 .Ar owner
-parameter.
+attribute for a connection.
 .It Fl P
-Marks connection as permanent.
+Mark the connection as permanent.
 .Nm
-always create permanent connection.
+always creates permanent connections.
 This option can be used in other ncp*
 programs.
 .It Fl R Ar retry_count
-specifies number of retries before drop the connection.
+Specify the number of retries to be performed
+before dropping the connection.
 The default value is 10.
-
-Note: after connection marked 'BAD' each request will try to restore it.
-This process restore only NCP connection, but do not reopen any opened files.
+.Pp
+Note: after a connection is marked
+.Sq BAD ,
+each request will try to restore it.
+This process restores only the
+.Tn NCP
+connection;
+it does not reopen any files that were open
+at the time that the connection was marked
+.Sq BAD .
 .It Fl W Ar timeout
-This specifies server request timeout in seconds.
+Specify the server request timeout in seconds.
 The default is 5 seconds.
-.It Ar /server:user
-This syntax provided for the sake of simplicity and mutually exclusive with
+.It / Ns Ar server Ns : Ns Ar user
+This syntax is provided for the sake of simplicity
+and is mutually exclusive with the
 .Fl S
 and
 .Fl U
 options.
 .El
+.Sh IMPLEMENTATION NOTES
+Low level connection management is implemented in the
+.Pa ncp.ko
+module.
+The
+.Xr IPXrouted 8
+program is also required for
+.Tn IPX
+support.
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
 .It Pa ~/.nwfsrc
-keeps static parameters for connections and other information.
+keeps static parameters for connections and other information
 See
 .Pa /usr/share/examples/nwclient/dot.nwfsrc
 for details.
-
-.Sh NOTES
-Low level connection management performed by ncp.ko module.
-For an IPX
-protocol it is also necessary to load IPXrouted program.
-
-.Sh BUGS
-to number a few
-
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Fx 4.0 .
 .Sh AUTHORS
 .An Boris Popov Aq bp@butya.kz ,
 .Aq rbp@chat.ru
+.Sh BUGS
+Please report any bugs to the author.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ncplogout.1 man1/ncplogout.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ncplogout.1	Tue Mar 21 06:31:47 2000
+++ man1/ncplogout.1	Mon Jul  3 19:52:49 2000
@@ -1,10 +1,10 @@
-.\" %FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.3 2000/03/01 12:20:05 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.3.2.1 2000/03/24 07:47:05 sheldonh Exp %
 .Dd Sep 15, 1999
 .Dt NCPLOGOUT 1
-.Os FreeBSD 4.0
+.Os
 .Sh NAME
 .Nm ncplogout
-.Nd shedule permanent connection to close
+.Nd schedule permanent connection to close
 .Sh SYNOPSIS
 .Nm ncplogout
 .Op -S Ar server
@@ -12,39 +12,45 @@
 .Op -c Ar handle
 .Nm ncplogout
 .Op -c Ar handle
-.Ar /server:user
+.No / Ns Ar server Ns : Ns Ar user
 .Sh DESCRIPTION
 The
 .Nm
-will shedule connection created by
+will schedule a connection created by
 .Xr ncplogin 1
-command to close.
-If connection is busy (i.e. used by other processes) it will
-be closed when last process terminated.
-This command is similar to DOS 
+command to be closed.
+If the connection is busy (i.e. used by other processes) it will
+be closed when the last process using it is terminated.
+This command is similar to the
+.Tn DOS 
 logout.exe command.
 .Pp
 The options are:
 .Bl -tag -width indent
 .It Fl S Ar server
-name of Netware server to identify connection.
+Specify the name of the
+.Tn Netware
+server to which the connection should be terminated.
 Can be omitted if there is only
 one connection active.
 .It Fl U Ar user
-name of user used to identify connection.
+Specify the name of the user to use when identifying the connection.
 Can be omitted if there is only
 one connection active.
 .It Fl c Ar handle
-close connection by handle.
-List of available handles can be obtained via
+Close a connection by handle.
+A list of available handles can be obtained with the following command:
 .Bd -literal -offset indent
 	ncplist c
 .Ed
-command.
 .El
-.Sh BUGS
-to number a few
-
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 4.0 .
 .Sh AUTHORS
 .An Boris Popov Aq bp@butya.kz ,
 .Aq bp@freebsd.org
+.Sh BUGS
+Please report any bugs to the author.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/nohup.1 man1/nohup.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/nohup.1	Tue Mar 21 06:31:32 2000
+++ man1/nohup.1	Mon Jul  3 19:52:31 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/nohup/nohup.1,v 1.6 1999/09/14 11:46:03 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/nohup/nohup.1,v 1.6.2.1 2000/07/02 09:52:14 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt NOHUP 1
@@ -44,14 +44,15 @@
 .Sh SYNOPSIS
 .Nm
 .Ar command
-.Op Ar arg ...
+.Op Ar arguments
 .Sh DESCRIPTION
 The
 .Nm
 utility invokes
 .Ar command
 with
-its arguments
+its
+.Ar arguments
 and at this time sets the signal
 .Dv SIGHUP
 to be ignored.
@@ -78,7 +79,7 @@
 manual page.
 .Sh ENVIRONMENT
 The following variable is utilized by
-.Nm nohup .
+.Nm Ns :
 .Bl -tag -width flag
 .It Ev HOME
 If the output file
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/opieinfo.1 man1/opieinfo.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/opieinfo.1	Tue Mar 21 06:31:32 2000
+++ man1/opieinfo.1	Mon Jul  3 19:52:31 2000
@@ -1,7 +1,7 @@
 .\" opieinfo.1: Manual page for the opieinfo(1) program.
 .\"
 .\" %%% portions-copyright-cmetz-96
-.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
+.\" Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
 .\" Reserved. The Inner Net License Version 2 applies to these portions of
 .\" the software.
 .\" You should have received a copy of the license with this software. If
@@ -19,6 +19,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinfo.1).
 .\"
+.\"	%FreeBSD: src/contrib/opie/opieinfo.1,v 1.3.6.1 2000/06/09 07:14:56 kris Exp %
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/opiekey.1 man1/opiekey.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/opiekey.1	Tue Mar 21 06:31:32 2000
+++ man1/opiekey.1	Mon Jul  3 19:52:31 2000
@@ -1,7 +1,7 @@
 .\" opiekey.1: Manual page for the opiekey(1) program.
 .\"
 .\" %%% portions-copyright-cmetz-96
-.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
+.\" Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
 .\" Reserved. The Inner Net License Version 2 applies to these portions of
 .\" the software.
 .\" You should have received a copy of the license with this software. If
@@ -25,6 +25,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(key.1).
 .\"
+.\"	%FreeBSD: src/contrib/opie/opiekey.1,v 1.3.6.1 2000/06/09 07:14:56 kris Exp %
 .ll 6i
 .pl 10.5i
 .lt 6.0i
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/opiepasswd.1 man1/opiepasswd.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/opiepasswd.1	Tue Mar 21 06:31:32 2000
+++ man1/opiepasswd.1	Mon Jul  3 19:52:32 2000
@@ -1,7 +1,7 @@
 .\" opiepasswd.1: Manual page for the opiepasswd(1) program.
 .\"
 .\" %%% portions-copyright-cmetz-96
-.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
+.\" Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
 .\" Reserved. The Inner Net License Version 2 applies to these portions of
 .\" the software.
 .\" You should have received a copy of the license with this software. If
@@ -21,6 +21,7 @@
 .\"	Written at Bellcore for the S/Key Version 1 software distribution
 .\"		(keyinit.1).
 .\"
+.\"	%FreeBSD: src/contrib/opie/opiepasswd.1,v 1.3.6.1 2000/06/09 07:14:57 kris Exp %
 .ll 6i 
 .pl 10.5i 
 .lt 6.0i
Only in man1: otp-md4.1
Only in man1: otp-md5.1
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/paste.1 man1/paste.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/paste.1	Tue Mar 21 06:31:33 2000
+++ man1/paste.1	Mon Jul  3 19:52:32 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/paste/paste.1,v 1.4 1999/08/28 01:04:53 peter Exp %
+.\" %FreeBSD: src/usr.bin/paste/paste.1,v 1.4.2.1 2000/06/30 09:51:52 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt PASTE 1
@@ -70,7 +70,9 @@
 .Ar list
 is reused.
 This continues until a line from the last input file (in default operation)
-or the last line in each file (using the -s option) is displayed, at which
+or the last line in each file (using the
+.Fl s
+option) is displayed, at which
 time
 .Nm
 begins selecting characters from the beginning of
@@ -97,7 +99,9 @@
 order.
 The newline character of every line except the last line in each input
 file is replaced with the tab character, unless otherwise specified by
-the -d option.
+the
+.Fl d
+option.
 .El
 .Pp
 If
@@ -106,7 +110,7 @@
 input is used; standard input is read one line at a time, circularly,
 for each instance of
 .Ql Fl .
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/pim6stat.1 man1/pim6stat.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/pim6stat.1	Tue Mar 21 06:32:12 2000
+++ man1/pim6stat.1	Mon Jul  3 19:53:14 2000
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: pim6stat.1,v 1.3 1999/12/16 05:38:06 jinmei Exp %
-.\"	%FreeBSD: src/usr.sbin/pim6sd/pim6stat.1,v 1.1 2000/01/28 05:10:45 shin Exp %
+.\" %FreeBSD: src/usr.sbin/pim6sd/pim6stat.1,v 1.1.2.2 2000/05/06 14:22:21 phantom Exp %
 .\"
 .Dd July 28, 1999
 .Dt PIM6STAT 1
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6stat
 .Nd show PIM for IPv6 status
@@ -49,7 +49,7 @@
 to standard output.
 .Pp
 Options supported by
-.Nm pim6stat :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl d
 specifies to show the status of a dense mode daemon (if running).
@@ -67,7 +67,7 @@
 daemon and outputs the dumpfile.
 .El
 .Sh FILES
-.Bl -tag -width /var/run/pim6sd.pid -compact
+.Bl -tag -width /var/run/pim6sd.pidX -compact
 .It Pa /var/run/pim6sd.pid
 The default PID file for a sparse mode daemon.
 .It Pa /var/run/pim6dd.pid
@@ -80,12 +80,16 @@
 The default statistics dump file for a sparse mode daemon.
 .El
 .Sh SEE ALSO
-.Xr pim6sd 8 ,
-.Xr pim6dd 8
+.Xr pim6dd 8 ,
+.Xr pim6sd 8
 .Sh HISTORY
 The
 .Nm
 command first appeared in KAME IPv6 protocol stack kit.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initially integrated into
+.Fx 4.0
 .Sh BUGS
 .Nm Pim6stat
 needs superuser privilege.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/printenv.1 man1/printenv.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/printenv.1	Tue Mar 21 06:31:33 2000
+++ man1/printenv.1	Mon Jul  3 19:52:32 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6 2000/03/01 12:20:08 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6.2.3 2000/06/30 09:51:52 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
@@ -61,6 +61,13 @@
 is specified and it is not defined in the environment,
 .Nm printenv
 returns exit status 1, else it returns status 0.
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Pp
 .Nm Env
 executes
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/quota.1 man1/quota.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/quota.1	Tue Mar 21 06:31:33 2000
+++ man1/quota.1	Mon Jul  3 19:52:33 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/quota/quota.1,v 1.7 1999/08/28 01:04:59 peter Exp %
+.\" %FreeBSD: src/usr.bin/quota/quota.1,v 1.7.2.1 2000/07/02 09:57:51 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
@@ -59,9 +59,8 @@
 displays users' disk usage and limits.
 By default only the user quotas are printed.
 .Pp
-Options:
-.Pp
-.Bl -tag -width Ds
+The following options are available:
+.Bl -tag -width indent
 .It Fl g
 Print group quotas for the group 
 of which the user is a member.
@@ -105,14 +104,14 @@
 .Nm Quota
 tries to report the quotas of all mounted filesystems.
 If the filesystem is mounted via
-.Nm NFS ,
+.Tn NFS ,
 it will attempt to contact the
 .Xr rpc.rquotad 8
 daemon on the
-.Nm NFS
+.Tn NFS
 server.
 For
-.Nm UFS
+.Tn UFS
 filesystems, quotas must be turned on in
 .Pa /etc/fstab .
 If
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/rtld.1 man1/rtld.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/rtld.1	Tue Mar 21 06:30:06 2000
+++ man1/rtld.1	Mon Jul  3 19:50:51 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.18 2000/01/29 03:16:54 jdp Exp %
+.\" %FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.18.2.1 2000/03/28 09:04:19 sheldonh Exp %
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
@@ -144,4 +144,5 @@
 .Sh SEE ALSO
 .Xr elf 5 ,
 .Xr ld 1 ,
+.Xr ldd 1 ,
 .Xr ldconfig 8
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/rup.1 man1/rup.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/rup.1	Tue Mar 21 06:31:35 2000
+++ man1/rup.1	Mon Jul  3 19:52:34 2000
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/rup/rup.1,v 1.7 1999/08/28 01:05:26 peter Exp %
+.\" %FreeBSD: src/usr.bin/rup/rup.1,v 1.7.2.1 2000/06/30 09:51:55 ps Exp %
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
@@ -45,7 +45,7 @@
 .Sh DESCRIPTION
 .Nm Rup
 displays a summary of the current system status of a particular
-.Em host 
+.Ar host 
 or all hosts on the local network.
 The output shows the current time of day, how long the system has
 been up,
@@ -58,7 +58,8 @@
 daemon must be running on the remote host for this command to
 work.
 .Nm Rup
-uses an RPC protocol defined in /usr/include/rpcsvc/rstat.x.
+uses an RPC protocol defined in
+.Pa /usr/include/rpcsvc/rstat.x .
 .Sh EXAMPLE
 .Bd -unfilled -offset indent -compact
 example% rup otherhost
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/ruptime.1 man1/ruptime.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/ruptime.1	Tue Mar 21 06:31:35 2000
+++ man1/ruptime.1	Mon Jul  3 19:52:34 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\" %FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.8 1999/11/01 19:42:02 nik Exp %
+.\" %FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.8.2.1 2000/06/30 09:45:00 ps Exp %
 .\"
 .Dd April 5, 1994
 .Dt RUPTIME 1
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Nm Ruptime
 gives a status line like
-.Ar uptime
+.Xr uptime 1
 for each machine on the local network; these are formed from packets
 broadcast by each host on the network once every three minutes.
 .Pp
@@ -55,13 +55,12 @@
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
-Users idle an hour or more are not counted unless the
-.Fl a
-flag is given.
+Include all users.  By default, if a user hasn't typed to the system for
+an hour or more, then the user will be omitted from the output.
 .It Fl l
 Sort by load average.
 .It Fl r
-Reverses the sort order.
+Reverse the sort order.
 .It Fl t
 Sort by uptime.
 .It Fl u
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/rusers.1 man1/rusers.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/rusers.1	Tue Mar 21 06:31:35 2000
+++ man1/rusers.1	Mon Jul  3 19:52:35 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.8 2000/03/01 12:20:09 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.8.2.1 2000/06/30 09:51:55 ps Exp %
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
@@ -46,13 +46,21 @@
 The
 .Nm
 command produces output similar to
-.Xr who ,
-but for the list of hosts or all machines on the local
+.Xr who 1 ,
+but for the list of
+.Ar host Ns s
+or all machines on the local
 network.
-For each host responding to the rusers query,
+For each
+.Ar host
+responding to the
+.Nm
+query,
 the hostname with the names of the users currently logged
 on is printed on each line.
-The rusers command will wait for
+The
+.Nm
+command will wait for
 one minute to catch late responders.
 .Pp
 The following options are available:
@@ -68,16 +76,16 @@
 .El
 .Sh DIAGNOSTICS
 .Bl -tag -width indent
-.It rusers: RPC: Program not registered
+.It Nm Ns : RPC: Program not registered
 The
 .Xr rpc.rusersd 8
 daemon has not been started on the remote host.
-.It rusers: RPC: Timed out
+.It Nm Ns : RPC: Timed out
 A communication error occurred.  Either the network is
 excessively congested, or the
 .Xr rpc.rusersd 8
 daemon has terminated on the remote host.
-.It rusers: RPC: Port mapper failure - RPC: Timed out
+.It Nm Ns : "RPC: Port mapper failure - RPC: Timed out"
 The remote host is not running the portmapper (see
 .Xr portmap 8 ),
 and cannot accommodate any RPC-based services.  The host may be down.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/rwall.1 man1/rwall.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/rwall.1	Tue Mar 21 06:31:35 2000
+++ man1/rwall.1	Mon Jul  3 19:52:35 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.7 2000/03/01 12:20:09 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.7.2.1 2000/06/30 09:51:56 ps Exp %
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
@@ -45,7 +45,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command sends a message to the users logged into the specified host.
+command sends a message to the users logged into the specified
+.Ar host .
 The
 message to be sent can be typed in and terminated with EOF or it can
 be in a
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/rwho.1 man1/rwho.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/rwho.1	Tue Mar 21 06:31:35 2000
+++ man1/rwho.1	Mon Jul  3 19:52:35 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwho.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/rwho/rwho.1,v 1.6 1999/08/28 01:05:33 peter Exp %
+.\" %FreeBSD: src/usr.bin/rwho/rwho.1,v 1.6.2.1 2000/06/30 09:51:56 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
@@ -45,7 +45,7 @@
 The
 .Nm
 command produces output similar to
-.Xr who ,
+.Xr who 1 ,
 but for all machines on the local network.
 If no report has been
 received from a machine for 5 minutes then
@@ -53,15 +53,17 @@
 assumes the machine is down, and does not report users last known
 to be logged into that machine.
 .Pp
-If a user hasn't typed to the system for a minute or more, then
+If a user has not typed to the system for a minute or more, then
 .Nm
-reports this idle time.  If a user hasn't typed to the system for
-an hour or more, then
-the user will be omitted from the output of
-.Nm
-unless the
-.Fl a
-flag is given.
+reports this idle time.
+.Pp
+The following option is available:
+.Bl -tag -width indent
+.It Fl a
+Include all users.
+By default, if a user hasn't typed to the system for
+an hour or more, then the user will be omitted from the output.
+.El
 .Sh FILES
 .Bl -tag -width /var/rwho/whod.* -compact
 .It Pa /var/rwho/whod.*
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/sasc.1 man1/sasc.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/sasc.1	Tue Mar 21 06:31:47 2000
+++ man1/sasc.1	Mon Jul  3 19:52:49 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.9 2000/03/01 12:20:10 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.9.2.1 2000/06/30 09:47:52 ps Exp %
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
@@ -57,7 +57,7 @@
 When
 .Nm
 is called with no option only the current settings are reported.
-.Sh OPTIONS
+.Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl s Bq ASC_SRESSW
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/sockstat.1 man1/sockstat.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/sockstat.1	Tue Mar 21 06:31:36 2000
+++ man1/sockstat.1	Mon Jul  3 19:52:36 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.6 2000/03/01 12:20:10 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.6.2.1 2000/06/30 09:51:57 ps Exp %
 .\"
 .Dd April 13, 1999
 .Dt SOCKSTAT 1
@@ -62,7 +62,7 @@
 .Xr fstat 1 ,
 .Xr netstat 1 ,
 .Xr inet 4 ,
-.Xr inet6 4 .
+.Xr inet6 4
 .Sh HISTORY
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/tar.1 man1/tar.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/tar.1	Tue Mar 21 06:29:20 2000
+++ man1/tar.1	Mon Jul  3 19:49:50 2000
@@ -4,7 +4,7 @@
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"	Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
 .\"
-.\" %FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.22 2000/03/01 10:40:18 nik Exp %
+.\" %FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.22.2.1 2000/07/01 11:33:38 ps Exp %
 .\"
 .Dd 25 August 1997
 .Os FreeBSD
@@ -350,14 +350,14 @@
 .Ed
 .Pp
 To create a compressed archive on diskette, using gzip, use a command-line like
-.Dl tar --block-compress -z -c -v -f /dev/rfd1a -b 36 tar/
+.Dl tar --block-compress -z -c -v -f /dev/fd1a -b 36 tar/
 .Pp
 Note that you cannot mix bundled flags and --style flags; you can use
 single-letter flags in the manner above, rather than having to type
-.Dl tar --block-compress --gzip --verbose --file /dev/rfd1a --block-size 20 tar/
+.Dl tar --block-compress --gzip --verbose --file /dev/fd1a --block-size 20 tar/
 .Pp
 The above-created diskette can be listed with
-.Dl tar tvfbz /dev/rfd1a 36
+.Dl tar tvfbz /dev/fd1a 36
 .Pp
 To join two tar archives into a single archive, use
 .Dl tar Af archive1.tar archive2.tar
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/tcpslice.1 man1/tcpslice.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/tcpslice.1	Tue Mar 21 06:32:19 2000
+++ man1/tcpslice.1	Mon Jul  3 19:53:24 2000
@@ -17,7 +17,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.7 1999/08/28 01:20:14 peter Exp %
+.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.7.2.1 2000/05/09 14:12:49 sheldonh Exp %
 .\"
 .Dd October 14, 1991
 .Dt TCPSLICE 1
@@ -241,7 +241,8 @@
 .Nm Tcpslice
 refuses to write to its output if it is a terminal
 (as indicated by
-.Xr isatty 3 ). This is not a bug but a feature,
+.Xr isatty 3 ) .
+This is not a bug but a feature,
 to prevent it from spraying binary data to the user's terminal.
 Note that this means you must either redirect
 .Pa stdout
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/tee.1 man1/tee.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/tee.1	Tue Mar 21 06:31:37 2000
+++ man1/tee.1	Mon Jul  3 19:52:37 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/tee/tee.1,v 1.4 1999/08/28 01:06:21 peter Exp %
+.\" %FreeBSD: src/usr.bin/tee/tee.1,v 1.4.2.1 2000/06/30 09:51:57 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt TEE 1
@@ -76,13 +76,13 @@
 except in the event of the
 .Fl i
 option.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh STANDARDS
 The
 .Nm
-function is expected to be
+utility is expected to be
 .St -p1003.2
 compatible.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/telnet.1 man1/telnet.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/telnet.1	Tue Mar 21 06:31:45 2000
+++ man1/telnet.1	Mon Jul  3 19:52:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\" %FreeBSD: src/usr.bin/telnet/telnet.1,v 1.15 2000/01/27 09:28:33 shin Exp %
+.\" %FreeBSD: src/usr.bin/telnet/telnet.1,v 1.15.2.1 2000/06/14 16:31:26 ume Exp %
 .\"
 .Dd January 27, 2000
 .Dt TELNET 1
@@ -42,7 +42,7 @@
 protocol
 .Sh SYNOPSIS
 .Nm
-.Op Fl 8EFKLNacdfrx
+.Op Fl 468EFKLNacdfrx
 .Op Fl S Ar tos
 .Op Fl X Ar authtype
 .Op Fl e Ar escapechar
@@ -75,6 +75,14 @@
 .Pp
 Options:
 .Bl -tag -width indent
+.It Fl 4
+Forces
+.Nm
+to use IPv4 addresses only.
+.It Fl 6
+Forces
+.Nm
+to use IPv6 addresses only.
 .It Fl 8
 Specifies an 8-bit data path.  This causes an attempt to
 negotiate the
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/tip.1 man1/tip.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/tip.1	Tue Mar 21 06:31:38 2000
+++ man1/tip.1	Mon Jul  3 19:52:38 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.7 2000/03/01 12:20:21 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.7.2.1 2000/04/23 16:52:35 bsd Exp %
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
@@ -269,6 +269,11 @@
 (num) The baud rate at which the connection was established;
 abbreviated
 .Ar ba  .
+.It Ar chardelay
+(num) Number of milliseconds to delay after the transmission of
+each character;
+abbreviated
+.Ar cdelay  .
 .It Ar dialtimeout
 (num) When dialing a phone number, the time (in seconds)
 to wait for a connection to be established; abbreviated
@@ -310,6 +315,11 @@
 .It Ar host
 (str) The name of the host to which you are connected; abbreviated
 .Ar ho  .
+.It Ar linedelay
+(num) Number of milliseconds to delay after the transmission of
+each line;
+abbreviated
+.Ar ldelay  .
 .It Ar login
 (str) Pathname of a login shell script to run once connected; standard input
 and output are redirected to the remote host.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/touch.1 man1/touch.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/touch.1	Tue Mar 21 06:31:38 2000
+++ man1/touch.1	Mon Jul  3 19:52:38 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/touch/touch.1,v 1.6 1999/08/28 01:06:46 peter Exp %
+.\" %FreeBSD: src/usr.bin/touch/touch.1,v 1.6.2.1 2000/06/30 09:51:58 ps Exp %
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
@@ -123,7 +123,7 @@
 .Dq SS
 letter pair is not specified, the value defaults to 0.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/uniq.1 man1/uniq.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/uniq.1	Tue Mar 21 06:31:40 2000
+++ man1/uniq.1	Mon Jul  3 19:52:40 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/uniq/uniq.1,v 1.5 1999/08/28 01:07:07 peter Exp %
+.\" %FreeBSD: src/usr.bin/uniq/uniq.1,v 1.5.2.1 2000/06/30 09:51:58 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt UNIQ 1
@@ -114,7 +114,7 @@
 If additional arguments are specified on the command line, the first
 argument is used as the name of an input file, the second is used
 as the name of an output file.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/wc.1 man1/wc.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/wc.1	Tue Mar 21 06:31:42 2000
+++ man1/wc.1	Mon Jul  3 19:52:43 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/usr.bin/wc/wc.1,v 1.6 1999/08/28 01:07:33 peter Exp %
+.\" %FreeBSD: src/usr.bin/wc/wc.1,v 1.6.2.1 2000/06/30 09:51:59 ps Exp %
 .\"
 .Dd April 19, 1994
 .Dt WC 1
@@ -83,7 +83,7 @@
 .Pp
 If no files are specified, the standard input is used and no
 file name is displayed.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff -ur /home/horikawa/man-jp/work/fbsd-400r/man/man1/whoami.1 man1/whoami.1
--- /home/horikawa/man-jp/work/fbsd-400r/man/man1/whoami.1	Tue Mar 21 06:31:18 2000
+++ man1/whoami.1	Mon Jul  3 19:52:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)whoami.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/id/whoami.1,v 1.4 1999/08/28 01:02:08 peter Exp %
+.\" %FreeBSD: src/usr.bin/id/whoami.1,v 1.4.2.1 2000/06/30 09:51:48 ps Exp %
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
@@ -42,7 +42,7 @@
 .Nm whoami
 .Sh DESCRIPTION
 The
-.Nm whoami
+.Nm
 utility has been obsoleted by the
 .Xr id 1
 utility, and is equivalent to
@@ -52,11 +52,11 @@
 is suggested for normal interactive use.
 .Pp
 The
-.Nm whoami
+.Nm
 utility displays your effective user ID as a name.
-.Pp
+.Sh DIAGNOSTICS
 The
-.Nm whoami
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr id 1

----Next_Part(Tue_Jul__4_21:42:03_2000_179)----
