From owner-man-jp-reviewer@jp.freebsd.org  Tue May 30 12:41:22 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA69428;
	Tue, 30 May 2000 12:41:22 +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 MAA69407
	for <man-jp-reviewer@jp.freebsd.org>; Tue, 30 May 2000 12:41:16 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.26.194.201] (helo=localhost)
	by smtp1.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp-reviewer@jp.freebsd.org
	id 12wctU-0005rn-00; Mon, 29 May 2000 23:40:40 -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(Mon_May_29_23:25:06_2000_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <20000529233859W.horikawa@psinet.com>
Date: Mon, 29 May 2000 23:38:59 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 7373
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 2580
Subject: [man-jp-reviewer 2580] diff to 4.0-RELEASE (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(Mon_May_29_23:25:06_2000_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 4.0-RELEASE $B$X$N:9J,$G$9(B (man1)


----Next_Part(Mon_May_29_23:25:06_2000_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=jdiff_4.0-RELEASE_1

Index: man1/a2p.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/a2p.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 a2p.1
--- man1/a2p.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/a2p.1	2000/05/30 03:06:33
@@ -167,7 +167,7 @@
 $B$7$+$7!"A4$F$NG[NsE:;z<0$@$1$G$J$/!"A4$F$N(B substr() $B$*$h$S(B index() $B4X?t$b(B
 $BE,9g$9$k$h$&$K=$@5$7$J$1$l$P$J$i$J$$$3$H$rK:$l$J$$$G2<$5$$!#(B
 .PP
-"# awk $B$OGO</$@$+$i$3$&$d$C$F9)IW$7$F$^$9(B" $B$H$$$C$?5$$NMx$$$?%3%a%s%H$O!"(B
+"# awk $B$OGO</$@$+$i$3$&$d$C$F9)IW$7$F$$$^$9(B" $B$H$$$C$?5$$NMx$$$?%3%a%s%H$O!"(B
 $B$=$N$^$^=$@5$5$l$:$KEO$5$l$^$9!#(B
 .PP
 awk $B%9%/%j%W%H$O$7$P$7$P%7%'%k%9%/%j%W%H$KKd$a9~$^$l!"(B
Index: man1/biff.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/biff.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 biff.1
--- man1/biff.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/biff.1	2000/05/30 03:06:35
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)biff.1	6.5 (Berkeley) 3/14/91
-.\" %FreeBSD: src/usr.bin/biff/biff.1,v 1.7 1999/09/01 20:25:44 hoek Exp %
+.\" %FreeBSD: src/usr.bin/biff/biff.1,v 1.8 2000/03/01 12:19:32 sheldonh Exp %
 .\"
 .\" jpman %Id: biff.1,v 1.2 1997/04/01 07:08:32 mutoh Stab %
 .\"
Index: man1/builtin.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/builtin.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 builtin.1
--- man1/builtin.1	2000/02/15 14:34:58	1.1.1.1
+++ man1/builtin.1	2000/05/30 03:06:38
@@ -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.3 1999/12/20 16:29:56 sheldonh Exp %
+.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.5 2000/03/03 09:28:05 sheldonh Exp %
 .\"
 .\" jpman %Id: builtin.1,v 0.0 1999/12/11 15:12:46 horikawa Stab %
 .Dd September 1, 1999
@@ -84,6 +84,7 @@
 .Nm printf ,
 .Nm pushd ,
 .Nm pwd ,
+.Nm read ,
 .Nm readonly ,
 .Nm rehash ,
 .Nm repeat ,
@@ -210,6 +211,7 @@
 .It Ic printf Ta Yes Ta Yes Ta Yes
 .It Ic pushd Ta \&No Ta Yes Ta \&No
 .It Ic pwd Ta Yes Ta \&No Ta Yes
+.It Ic read Ta \&No Ta \&No Ta Yes
 .It Ic readonly Ta \&No Ta \&No Ta Yes
 .It Ic rehash Ta \&No Ta Yes Ta \&No
 .It Ic repeat Ta \&No Ta Yes Ta \&No
@@ -252,7 +254,7 @@
 .Sh $BNr;K(B
 .Nm
 $B%^%K%e%"%k%Z!<%8$,:G=i$KEP>l$7$?$N$O(B
-.Fx 4.0
+.Fx 3.4
 $B$G$9!#(B
 .Sh $B:n<T(B
 $B$3$N%^%K%e%"%k%Z!<%8$O(B
Index: man1/calendar.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/calendar.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 calendar.1
--- man1/calendar.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/calendar.1	2000/05/30 03:06:40
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1	8.1 (Berkeley) 6/29/93
-.\" %FreeBSD: src/usr.bin/calendar/calendar.1,v 1.15 1999/08/28 00:59:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/calendar/calendar.1,v 1.16 2000/03/01 12:19:34 sheldonh Exp %
 .\" jpman %Id: calendar.1,v 1.2 1997/04/20 09:45:28 jsakai Stab %
 .\"
 .Dd June 29, 1993
Index: man1/cccp.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/cccp.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cccp.1
--- man1/cccp.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/cccp.1	2000/05/30 03:06:45
@@ -413,7 +413,7 @@
 .B \-dD
 `\|\c
 .B \-dM\c
-\&\|' $B$K;w$F$^$9$,!"(B2 $B$D$NAj0cE@$,$"$j$^$9!#$3$l$O4{Dj5A%^%/%m$r(B
+\&\|' $B$K;w$F$$$^$9$,!"(B2 $B$D$NAj0cE@$,$"$j$^$9!#$3$l$O4{Dj5A%^%/%m$r(B
 $B=PNO(B\c
 .I $B$7$^$;$s(B\c
 \&$B!#$^$?!"(B`\|\c
@@ -447,7 +447,7 @@
 .BR \-MM\  [ \-MG ]
 $B$3$l$O(B `\|\c
 .B \-M\c
-\&\|' $B$K;w$F$^$9$,!"(B`\|\c
+\&\|' $B$K;w$F$$$^$9$,!"(B`\|\c
 .B #include
 "\c
 .I file\c
@@ -462,7 +462,7 @@
 .BI \-MD\  file
 $B$3$l$b(B `\|\c
 .B \-M\c
-\&\|' $B$K;w$F$^$9$,!"0MB8>pJs$,(B`\|\c
+\&\|' $B$K;w$F$$$^$9$,!"0MB8>pJs$,(B`\|\c
 .I file\c
 \&\|' $B$K=q$-=P$5$l$^$9!#(B\(em\&`\|\c
 .B \-MD\c
@@ -489,7 +489,7 @@
 .BI \-MMD\  file
 `\|\c
 .B \-MD\c
-\&\|' $B$K;w$F$^$9$,!"%f!<%6$N%X%C%@%U%!%$%k$N$_$r07$$!"%7%9%F%`%X%C%@$O(B
+\&\|' $B$K;w$F$$$^$9$,!"%f!<%6$N%X%C%@%U%!%$%k$N$_$r07$$!"%7%9%F%`%X%C%@$O(B
 $BL5;k$9$kE@$,0[$J$j$^$9!#(B
 .TP
 .B \-H
Index: man1/cdcontrol.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/cdcontrol.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cdcontrol.1
--- man1/cdcontrol.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/cdcontrol.1	2000/05/30 03:06:45
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.19 1999/08/28 01:15:43 peter Exp %
+.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.21 2000/03/02 14:53:34 sheldonh Exp %
 .\" jpman %Id: cdcontrol.1,v 1.3 1997/07/22 09:20:03 mutoh Stab %
 .\"
 .Dd July 3, 1995
Index: man1/chgrp.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/chgrp.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 chgrp.1
--- man1/chgrp.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/chgrp.1	2000/05/30 03:06:47
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
-.\" %FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.8 1999/11/27 19:25:07 obrien Exp %
+.\" %FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.9 2000/03/08 16:31:41 obrien Exp %
 .\" jpman %Id: chgrp.1,v 1.3 1997/05/19 16:29:32 horikawa Stab %
 .\"
 .Dd March 31, 1994
@@ -46,13 +46,11 @@
 $B$rJQ99$9$k(B
 .Sh $B=q<0(B
 .Nm chgrp
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl f
-.Op Fl h
-.Op Fl v
 .Ar group
 .Ar
 .Sh $B2r@b(B
Index: man1/chmod.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/chmod.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 chmod.1
--- man1/chmod.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/chmod.1	2000/05/30 03:06:49
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" %FreeBSD: src/bin/chmod/chmod.1,v 1.16 1999/11/27 19:25:08 obrien Exp %
+.\" %FreeBSD: src/bin/chmod/chmod.1,v 1.17 2000/02/17 03:17:03 unfurl Exp %
 .\"
 .\" jpman %Id: chmod.1,v 1.2 1997/04/01 01:37:14 mutoh Stab %
 .Dd March 31, 1994
@@ -64,7 +64,7 @@
 .Fl R
 $B%*%W%7%g%s$,;XDj$5$l$F$$$l$P!"0z?t$,%7%s%\%j%C%/%j%s%/$N$H$-!"$=$l$r(B
 $B$?$I$C$FJQ99$7$^$9!#(B
-($B%G%#%l%/%H%j%D%j!<C5:wCf$K8+$D$+$C$?%7%s%\%j%C%/%j%s%/$O(B
+($B%G%#%l%/%H%j%D%j!<C5:wCf$K8+$D$+$C$?%7%s%\%j%C%/%j%s%/$O!"%G%U%)%k%H$G$O(B
 $B$=$l0J>eDI@W$7$^$;$s(B)
 .It Fl L
 .Fl R
@@ -174,9 +174,8 @@
 $B%7%s%\%k$K$h$k;XDj$O0J2<$NJ8K!$K=>$$$^$9!#(B
 .Bd -literal -offset indent
 mode         ::= clause [, clause ...]
-clause       ::= [who ...] [action ...] last_action
+clause       ::= [who ...] [action ...] action
 action       ::= op [perm ...]
-last_action  ::= op [perm ...]
 who          ::= a | u | g | o
 op           ::= + | \- | =
 perm         ::= r | s | t | w | x | X | u | g | o
Index: man1/chpass.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/chpass.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 chpass.1
--- man1/chpass.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/chpass.1	2000/05/30 03:06:52
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.21 1999/12/17 14:43:33 phantom Exp %
+.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.23 2000/03/02 14:53:28 sheldonh Exp %
 .\"
 .\" jpman %Id: chpass.1,v 1.2 1997/03/31 14:06:36 horikawa Stab %
 .Dd December 30, 1993
Index: man1/colldef.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/colldef.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 colldef.1
--- man1/colldef.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/colldef.1	2000/05/30 03:06:54
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/colldef/colldef.1,v 1.7 1999/08/28 00:59:44 peter Exp %
+.\" %FreeBSD: src/usr.bin/colldef/colldef.1,v 1.8 2000/03/01 12:19:36 sheldonh Exp %
 .\"
 .\" jpman %Id: colldef.1,v 1.3 1997/09/04 16:33:17 horikawa Stab %
 .\"
Index: man1/cpio.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/cpio.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cpio.1
--- man1/cpio.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/cpio.1	2000/05/30 03:06:58
@@ -94,7 +94,7 @@
 .BR cpio
 $B$G$3$N7A<0$r%5%]!<%H$9$k$o$1$G$O$"$j$^$;$s!#8=>u$G$3$N%U%)!<%^%C%H$r(B
 $B%5%]!<%H$9$k(B cpio $B$O!"(BGNU cpio $B$H!"(BUnix System V R4 $B$N(B cpio $B$N$_$G$9!#(B
-crc $B%U%)!<%^%C%H$O!"(Bnew ASCII $B%U%)!<%^%C%H$H;w$F$^$9$,!"%"!<%+%$%V:n@.;~$K(B
+crc $B%U%)!<%^%C%H$O!"(Bnew ASCII $B%U%)!<%^%C%H$H;w$F$$$^$9$,!"%"!<%+%$%V:n@.;~$K(B
 .B cpio 
 $B$,3F%U%!%$%k$K$D$$$F%A%'%C%/%5%`$r7W;;$7!"%"!<%+%$%VFb$K4^$a$k$H$3$m$,(B
 $B0[$J$j$^$9!#$3$N%A%'%C%/%5%`$O!"%"!<%+%$%V$+$i%U%!%$%k$r<h$j=P$9;~$N(B
Index: man1/crunchgen.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/crunchgen.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 crunchgen.1
--- man1/crunchgen.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/crunchgen.1	2000/05/30 03:07:00
@@ -22,7 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" %FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.9 1999/08/28 01:15:55 peter Exp %
+.\" %FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.11 2000/03/01 14:08:47 sheldonh Exp %
 .\"
 .Dd September 29, 1997
 .\" jpman %Id: crunchgen.1,v 1.3 1997/07/29 13:43:59 konuma Stab %
@@ -34,6 +34,7 @@
 .Sh $B=q<0(B
 .Nm \&crunchgen
 .Op Fl fql
+.Op Fl h Ar makefile-header-name
 .Op Fl m Ar makefile-name
 .Op Fl c Ar c-file-name
 .Op Fl e Ar exec-file-name
@@ -97,6 +98,13 @@
 $B%-%c%C%7%e$r>C5n$7!"%-%c%C%7%e$5$l$F$$$?%Q%i%a!<%?$r6/@)E*$K:F7W;;$7$^$9!#(B
 .It Fl l
 $BL>A0$NI=<(!#$3$N%P%$%J%j$,BP1~$9$kL>A0$r0lMwI=<($7$^$9!#(B
+.It Fl h Ar makefile-header-name
+.Nm crunchgen
+$B$,@8@.$9$k(B Makefile $B$N@hF,$K4^$a$k%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
+make $B$NJQ?t$rDj5A$9$k$N$KJXMx$G$9!#(B
+$B$3$l$K$O!"(Bmake $B$NF0:n$K1F6A$rM?$(!"4D6-JQ?t$r2p$7$F$G$OLLE]$G$"$k!"(B
+.Ar RELEASE_CRUNCH
+$B$,4^$^$l$^$9!#(B
 .It Fl m Ar makefile-name
 $B=PNO$9$k(B Makefile $B$NL>A0$r(B
 .Ar makefile-name
@@ -157,6 +165,15 @@
 .Nm
 $B%Q%i%a!<%?$r;XDj$G$-$^$9!#(B
 .Bl -tag -width indent
+.It Nm special Ar progname Nm objvar Ar variable_name
+$B%W%m%0%i%`MQ(B
+.Ar progname
+$B$N%*%V%8%'%/%H%U%!%$%k0lMw$rJ];}$9$k(B make $BJQ?t$NL>A0$r@_Dj$7$^$9!#(B
+$B$3$l$ODL>o(B
+.Nm OBJS
+$B$G$9$,!"(BMakefile $B$K$h$C$F$O!"B>$NLsB+$,9%$^$7$$>l9g$d!"(B
+.Nm SSHD_OBJS
+$B$N$h$&$K%W%m%0%i%`L>$,A0$KIU$/$b$N$,$"$j$^$9!#(B
 .It Nm special Ar progname Nm srcdir Ar pathname
 $B%W%m%0%i%`(B
 .Ar progname
Index: man1/csh.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/csh.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 csh.1
--- man1/csh.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/csh.1	2000/05/30 03:07:21
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\" %FreeBSD: src/bin/csh/csh.1,v 1.16 1999/09/14 11:46:01 sheldonh Exp %
+.\" %FreeBSD: src/bin/csh/csh.1,v 1.18 2000/02/17 03:40:21 unfurl Exp %
 .\"
 .\" jpman %Id: csh.1,v 1.2 1997/04/08 00:35:51 h-nokubi Stab %
 .\"	Japanese translation for jpman-0.2 checked by jpman project 96.12.23
@@ -59,9 +59,9 @@
 $BBPOCE*$J%m%0%$%s!&%7%'%k!"$^$?(B
 $B%7%'%k!&%9%/%j%W%H$N%3%^%s%I!&%W%m%;%C%5$NN>J}$NMQES$G;H$o$l$^$9!#(B
 .Ss $B0z?t%j%9%H=hM}(B
-$B%7%'%k$X$N:G=i$N0z?t(B($BBh(B 0 $B0z?t(B)$B$,(B
 .Ql Fl \&
-$B$G;O$^$k>l9g!"%7%'%k$O%m%0%$%s!&%7%'%k$H$J$j$^$9!#(B
+$B$G;O$^$k%W%m%0%i%`L>$G%7%'%k$,<B9T$5$l$?>l9g!"(B
+$B%7%'%k$O%m%0%$%s!&%7%'%k$H$J$j$^$9!#(B
 $B%7%'%k$r(B
 .Ql Fl l
 $B%U%i%0$r;XDj$7$F5/F0$9$k$3$H$G$b%m%0%$%s!&%7%'%k$K$G$-$^$9!#(B
Index: man1/ctm.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/ctm.1,v
retrieving revision 1.2
diff -u -r1.2 ctm.1
--- man1/ctm.1	2000/02/23 01:53:28	1.2
+++ man1/ctm.1	2000/05/30 03:07:23
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.16 2000/01/11 07:46:32 kris Exp %
+.\" %FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.17 2000/01/29 21:44:34 chuckr Exp %
 .\" jpman %Id: ctm.1,v 1.3 1997/09/27 16:26:57 ryo2 Stab %
 .\"
 .Dd Mar 25, 1995
@@ -234,13 +234,12 @@
 .Pp
 .Sh $B%;%-%e%j%F%#(B
 .Pp
-CTM $B$O(B
-.Bf Em 
+CTM $B<+?H!"(B
 $B0BA4$G$O$J$$%W%m%H%3%k$G$9(B
-.Ef
 - $B%=!<%9%3!<%I$X2C$($i$l$?=$@5$,?.Mj$G$-$k$H$3$m$+$iAw$i$l$?$3$H$r(B
 $BG'>Z$7$^$;$s$N$G!"(B
-CTM $B%G%k%?$rEE;R%a!<%kEy$N?.Mj$G$-$J$$G^BN$+$iF@$?>l9g$K$OCm0U$,I,MW$G$9!#(B
+$BDL>o$NEE;R%a!<%kEy$N?.Mj$G$-$J$$G^BN$+$i(B
+CTM $B%G%k%?$rF@$?>l9g$K$OCm0U$,I,MW$G$9!#(B
 CTM $B%G%k%?$r56B$$7$F!"@5Ev$J$b$N$r8r49$^$?$O>e=q$-$7!"(B
 $B0-0U$"$k%3!<%I$r$"$J$?$N%=!<%9%D%j!<$KA^F~$9$k$3$H$O!"(B
 $B967b<T$K$H$C$FHf3SE*4JC1$G$9!#(B
@@ -248,12 +247,18 @@
 $B$3$l$r46CN$G$-$k$N$O!"8e$N%G%k%?$,F1$8%U%!%$%k$r?($m$&$H$9$k;~E@$G$9!#(B
 $B$3$N;~E@$G!"(BMD $B%A%'%C%/%5%`$,<:GT$7$^$9!#(B
 .Pp
-$B>-Mh$N%P!<%8%g%s$N(B
-.Fx
-$B$G$O!"0E9f=pL>$G(B CTM $B%G%k%?$rG'>Z$9$k$3$H$G!"(B
-$B$3$NLdBj$r2r7h$9$k$+$b$7$l$^$;$s!#(B
-$B$7$+$7EvLL$O!"(BCTM $B<hF@$r!"(B
-$BEE;R%a!<%k$G$O$J$/(B FTP $B$G<hF@$9$k$3$H$r6/$/4+$a$^$9!#(B
+$B$3$l$r2sHr$7$F0BA4$J$b$N$K$9$k$?$a$K!"(B
+freebsd.org $B$,:n$C$?(B CTM $BItIJ$K$O!"(B
+GNU Privacy Guard $B%f!<%F%#%j%F%#8_49$J%U%)!<%^%C%H$G0E9fE*$K=pL>$7$F$$$^$9!#(B
+$B$3$N%f!<%F%#%j%F%#$O(B /usr/ports/security/gpg $B$*$h$S(B
+Pretty Good Privacy v5 $B%f!<%F%#%j%F%#(B
+/usr/ports/security/pgp5 $B$+$iF~<j$G$-$^$9!#(B
+$BE,@Z$J8x3+80$O(B ctm@freebsd.org $B$r(B finger $B$9$k$3$H$GF@$i$l$^$9!#(B
+.Pp
+$B$3$N$h$&$K=pL>$5$l$?(B CTM $B%G%k%?$O!"(B
+$B8!CN$5$l$k$3$H$J$/967b<T$,2~JQ$9$k$3$H$O$G$-$^$;$s!#(B
+$B$=$l$f$(!"(BCTM $B%G%k%?$rEE;R%a!<%k$G<u?.$9$k>l9g$K$O!"(B
+GPG $B$^$?$O(B PGP5 $B$r;HMQ$7$F=pL>$r3NG'$9$k$3$H$r4+$a$^$9!#(B
 .Sh $B4D6-JQ?t(B
 .Ev TMPDIR
 $B$K%Q%9L>$,%;%C%H$5$l$F$$$k$H!"(Bctm $B$O0l;~%U%!%$%k$NCV$->l=j$H$7$F(B
Index: man1/ctm_rmail.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/ctm_rmail.1,v
retrieving revision 1.2
diff -u -r1.2 ctm_rmail.1
--- man1/ctm_rmail.1	2000/02/23 01:53:28	1.2
+++ man1/ctm_rmail.1	2000/05/30 03:07:25
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.18 2000/01/11 07:46:33 kris Exp %
+.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.19 2000/01/29 21:44:42 chuckr Exp %
 .\" jpman %Id: ctm_rmail.1,v 1.3 1997/09/27 16:25:48 ryo2 Stab %
 .\"
 .Dd January 24, 1995
@@ -380,13 +380,12 @@
 $B$N<B9T$r2DG=$K$9$k$?$a$N$b$N$G$9!#(B
 .Sh $B%;%-%e%j%F%#(B
 .Pp
-CTM $B$O(B
-.Bf Em 
+CTM $B<+?H!"(B
 $B0BA4$G$O$J$$%W%m%H%3%k$G$9(B
-.Ef
 - $B%=!<%9%3!<%I$X2C$($i$l$?=$@5$,?.Mj$G$-$k$H$3$m$+$iAw$i$l$?$3$H$r(B
 $BG'>Z$7$^$;$s$N$G!"(B
-CTM $B%G%k%?$rEE;R%a!<%kEy$N?.Mj$G$-$J$$G^BN$+$iF@$?>l9g$K$OCm0U$,I,MW$G$9!#(B
+$BDL>o$NEE;R%a!<%kEy$N?.Mj$G$-$J$$G^BN$+$i(B
+CTM $B%G%k%?$rF@$?>l9g$K$OCm0U$,I,MW$G$9!#(B
 CTM $B%G%k%?$r56B$$7$F!"@5Ev$J$b$N$r8r49$^$?$O>e=q$-$7!"(B
 $B0-0U$"$k%3!<%I$r$"$J$?$N%=!<%9%D%j!<$KA^F~$9$k$3$H$O!"(B
 $B967b<T$K$H$C$FHf3SE*4JC1$G$9!#(B
@@ -394,12 +393,18 @@
 $B$3$l$r46CN$G$-$k$N$O!"8e$N%G%k%?$,F1$8%U%!%$%k$r?($m$&$H$9$k;~E@$G$9!#(B
 $B$3$N;~E@$G!"(BMD $B%A%'%C%/%5%`$,<:GT$7$^$9!#(B
 .Pp
-$B>-Mh$N%P!<%8%g%s$N(B
-.Fx
-$B$G$O!"0E9f=pL>$G(B CTM $B%G%k%?$rG'>Z$9$k$3$H$G!"(B
-$B$3$NLdBj$r2r7h$9$k$+$b$7$l$^$;$s!#(B
-$B$7$+$7EvLL$O!"(BCTM $B<hF@$r!"(B
-$BEE;R%a!<%k$G$O$J$/(B FTP $B$G<hF@$9$k$3$H$r6/$/4+$a$^$9!#(B
+$B$3$l$r2sHr$7$F0BA4$J$b$N$K$9$k$?$a$K!"(B
+freebsd.org $B$,:n$C$?(B CTM $BItIJ$K$O!"(B
+GNU Privacy Guard $B%f!<%F%#%j%F%#8_49$J%U%)!<%^%C%H$G0E9fE*$K=pL>$7$F$$$^$9!#(B
+$B$3$N%f!<%F%#%j%F%#$O(B /usr/ports/security/gpg $B$*$h$S(B
+Pretty Good Privacy v5 $B%f!<%F%#%j%F%#(B
+/usr/ports/security/pgp5 $B$+$iF~<j$G$-$^$9!#(B
+$BE,@Z$J8x3+80$O(B ctm@freebsd.org $B$r(B finger $B$9$k$3$H$GF@$i$l$^$9!#(B
+.Pp
+$B$3$N$h$&$K=pL>$5$l$?(B CTM $B%G%k%?$O!"(B
+$B8!CN$5$l$k$3$H$J$/967b<T$,2~JQ$9$k$3$H$O$G$-$^$;$s!#(B
+$B$=$l$f$(!"(BCTM $B%G%k%?$rEE;R%a!<%k$G<u?.$9$k>l9g$K$O!"(B
+GPG $B$^$?$O(B PGP5 $B$r;HMQ$7$F=pL>$r3NG'$9$k$3$H$r4+$a$^$9!#(B
 .\" This next request is for sections 1, 6, 7 & 8 only
 .Sh $B4D6-JQ?t(B
 $B%G%k%?$rE,MQ$9$k$N$J$i$P(B
Index: man1/cursor.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/cursor.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cursor.1
--- man1/cursor.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/cursor.1	2000/05/30 03:07:27
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)cursor.1, 3.20, Last Edit-Date: [Mon Dec 19 20:30:40 1994]
-.\" %FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.5 1999/08/28 01:17:42 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.6 2000/03/01 14:08:51 sheldonh Exp %
 .\" jpman %Id: cursor.1,v 1.3 1997/07/22 17:10:13 horikawa Stab %
 .\"
 .Dd December 19, 1994
Index: man1/cut.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/cut.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cut.1
--- man1/cut.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/cut.1	2000/05/30 03:07:27
@@ -33,7 +33,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" %FreeBSD: src/usr.bin/cut/cut.1,v 1.8 1999/08/28 00:59:59 peter Exp %
+.\" %FreeBSD: src/usr.bin/cut/cut.1,v 1.9 2000/03/01 12:19:37 sheldonh Exp %
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
 .\" jpman %Id: cut.1,v 1.2 1997/03/29 02:27:38 horikawa Stab %
Index: man1/date.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/date.1,v
retrieving revision 1.2
diff -u -r1.2 date.1
--- man1/date.1	2000/02/23 01:53:28	1.2
+++ man1/date.1	2000/05/30 03:07:30
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\" %FreeBSD: src/bin/date/date.1,v 1.33 2000/01/12 00:29:16 brian Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.34 2000/03/07 20:54:17 sheldonh Exp %
 .\"
 .\" jpman %Id: date.1,v 1.2 1997/03/31 23:25:55 mutoh Stab %
 .Dd November 17, 1993
@@ -110,7 +110,13 @@
 .Fl n
 $B%*%W%7%g%s$r;XDj$7$?>l9g$K$O!"B>$N%^%7%s$N;~9o$OJQ99$7$^$;$s!#(B
 .It Fl r
-$B4p=`;~E@(B (1970 $BG/(B 1 $B7n(B 1 $BF|(B) $B$+$i(B
+$B4p=`;~E@(B
+.Po
+00:00:00 UTC, January 1, 1970;
+.Xr time 3
+$B;2>H(B
+.Pc
+$B$+$i(B
 .Ar seconds
 $BIC7P2a$7$?F|;~$rI=<($7$^$9!#(B
 .It Fl t
Index: man1/dd.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/dd.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 dd.1
--- man1/dd.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/dd.1	2000/05/30 03:07:34
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" %FreeBSD: src/bin/dd/dd.1,v 1.11 1999/08/27 23:14:03 peter Exp %
+.\" %FreeBSD: src/bin/dd/dd.1,v 1.15 2000/03/01 05:28:45 green Exp %
 .\"
 .\" jpman %Id: dd.1,v 1.3 1997/05/16 00:16:21 h-nokubi Stab %
 .Dd January 13, 1994
@@ -92,6 +92,12 @@
 $BI8=`F~NO$N$+$o$j$K(B
 .Ar file
 $B$+$iF~NO$r9T$$$^$9!#(B
+.It Cm iseek= Ns Ar n
+$BF~NO%U%!%$%k$N(B
+.Va n
+$B%V%m%C%/L\$K%7!<%/$7$^$9!#(B
+.Cm skip= Ns Ar n
+$B$HF1$8$G$9!#(B
 .It Cm obs= Ns Ar n
 $B=PNO%V%m%C%/$N%5%$%:$r%G%U%)%k%H$N(B 512 $B%P%$%H$KBe$($F(B
 .Va n
@@ -103,10 +109,16 @@
 .Cm notrunc
 $B$,;XDj$5$l$J$$$+$.$j!"IaDL$N=PNO%U%!%$%k$G$O:G8e$N(B 1 $B%V%m%C%/%5%$%:$K(B
 $BK~$?$J$$%G!<%?$O@Z$j5M$a$i$l$^$9!#(B
-$B=PNO%U%!%$%k$N:G=i$NItJ,$,%9%-%C%W$5$l$k>l9g$O(B (
-.Cm seek
+$B=PNO%U%!%$%k$N:G=i$NItJ,$,%7!<%/$5$l$FDL$j2a$.$k>l9g$O(B (
+.Cm oseek
 $B%*%Z%i%s%I;2>H(B)
 $B=PNO%U%!%$%k$O(B $B$=$3$^$G@Z$j5M$a$i$l$^$9!#(B
+.It Cm oseek= Ns Ar n
+$B=PNO%U%!%$%k$N(B
+.Va n
+$B%V%m%C%/L\$K%7!<%/$7$^$9!#(B
+.Cm seek= Ns Ar n
+$B$HF1$8$G$9!#(B
 .It Cm seek= Ns Ar n
 $B%3%T!<$9$kA0$K!"=PNOB&%U%!%$%k$N3+;O0LCV$r@hF,$+$i(B
 .Va n
@@ -267,7 +279,7 @@
 .El
 .El
 .Pp
-$B%5%$%:$N;XDj$O(B 10 $B?J$N%P%$%H?t$,4|BT$5$l$^$9!#(B
+$B%5%$%:$N;XDj$O(B 10 $B?J!&(B 8 $B?J!&(B 16 $B?J$N%P%$%H?t$,4|BT$5$l$^$9!#(B
 $B?t;z$N:G8e$K(B ``b'', ``k'', ``m'', ``g'', ``w'' $B$r$D$1$?>l9g!"(B
 $B$=$N?t;z$K!"(B
 512, 1024 (1K), 1048576 (1M), 1073741824 (1G),
Index: man1/du.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/du.1,v
retrieving revision 1.2
diff -u -r1.2 du.1
--- man1/du.1	2000/02/23 01:53:28	1.2
+++ man1/du.1	2000/05/30 03:07:34
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" %FreeBSD: src/usr.bin/du/du.1,v 1.13 2000/01/25 17:46:58 mharo Exp %
+.\" %FreeBSD: src/usr.bin/du/du.1,v 1.15 2000/03/02 14:53:29 sheldonh Exp %
 .\" jpman %Id: du.1,v 1.3 1997/06/18 16:43:08 horikawa Stab %
 .\"
 .Dd April 1, 1994
Index: man1/ed.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/ed.1,v
retrieving revision 1.2
diff -u -r1.2 ed.1
--- man1/ed.1	2000/02/23 01:53:28	1.2
+++ man1/ed.1	2000/05/30 03:07:41
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/bin/ed/ed.1,v 1.16 2000/01/10 12:20:30 phantom Exp %
+.\" %FreeBSD: src/bin/ed/ed.1,v 1.17 2000/03/01 10:43:03 sheldonh Exp %
 .\" jpman %Id: ed.1,v 1.2 1997/06/09 15:03:56 jsakai Stab %
 .Dd May 21, 1993
 .Dt ED 1
Index: man1/fdformat.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/fdformat.1,v
retrieving revision 1.2
diff -u -r1.2 fdformat.1
--- man1/fdformat.1	2000/02/23 01:53:28	1.2
+++ man1/fdformat.1	2000/05/30 03:07:43
@@ -21,10 +21,10 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" jpman %Id: fdformat.1,v 1.3 1997/04/06 15:39:38 horikawa Stab %
-.\" %FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.16 2000/01/23 12:49:42 asmodai Exp %
 .\"
+.\" %FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.17 2000/03/01 14:07:39 sheldonh Exp %
 .\"
+.\" jpman %Id: fdformat.1,v 1.3 1997/04/06 15:39:38 horikawa Stab %
 .Dd September 16, 1993
 .Os
 .Dt FDFORMAT 1
Index: man1/fdwrite.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/fdwrite.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fdwrite.1
--- man1/fdwrite.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/fdwrite.1	2000/05/30 03:07:43
@@ -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.11 1999/10/17 15:57:16 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.12 2000/03/01 14:07:40 sheldonh Exp %
 .\" jpman %Id: fdwrite.1,v 1.4 1997/07/26 21:35:54 horikawa Stab %
 .\"
 .\"
Index: man1/fetch.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/fetch.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fetch.1
--- man1/fetch.1	2000/02/15 14:34:49	1.1.1.1
+++ man1/fetch.1	2000/05/30 03:07:48
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/fetch/fetch.1,v 1.32 1999/10/23 15:22:53 green Exp %
+.\" %FreeBSD: src/usr.bin/fetch/fetch.1,v 1.33 2000/03/01 12:19:38 sheldonh Exp %
 .\"
 .\" jpman %Id: fetch.1,v 1.4 1997/08/15 06:31:28 horikawa Stab %
 .Dd February 22, 1999
Index: man1/file.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/file.1,v
retrieving revision 1.2
diff -u -r1.2 file.1
--- man1/file.1	2000/02/23 01:53:28	1.2
+++ man1/file.1	2000/05/30 03:07:50
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/file/file.1,v 1.15 2000/01/23 01:48:10 mpp Exp %
+.\" %FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp %
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
Index: man1/find.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/find.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 find.1
--- man1/find.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/find.1	2000/05/30 03:07:55
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" %FreeBSD: src/usr.bin/find/find.1,v 1.22 1999/12/19 15:43:18 roberto Exp %
+.\" %FreeBSD: src/usr.bin/find/find.1,v 1.23 2000/03/01 10:48:32 nik Exp %
 .\"
 .\" jpman %Id: find.1,v 1.4 1997/09/23 14:13:10 horikawa Stab %
 .Dd May 9, 1995
Index: man1/finger.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/finger.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 finger.1
--- man1/finger.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/finger.1	2000/05/30 03:07:57
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" %FreeBSD: src/usr.bin/finger/finger.1,v 1.8 1999/08/28 01:01:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/finger/finger.1,v 1.9 2000/03/01 12:19:40 sheldonh Exp %
 .\" jpman %Id: finger.1,v 1.2 1997/04/07 05:53:49 mutoh Stab %
 .\"
 .Dd August 1, 1997
Index: man1/fmt.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/fmt.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fmt.1
--- man1/fmt.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/fmt.1	2000/05/30 03:07:57
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/fmt/fmt.1,v 1.6 1999/08/28 01:01:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/fmt/fmt.1,v 1.7 2000/03/09 09:27:40 sheldonh Exp %
 .\" jpman %Id: fmt.1,v 1.2 1997/03/29 03:55:54 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -41,7 +41,7 @@
 .Nd $B4JC1$J%F%-%9%H%U%)!<%^%C%?(B
 .Sh $B=q<0(B
 .Nm
-.Fl c
+.Op Fl c
 .Oo
 .Ar goal
 .Op Ar maximum
Index: man1/ftp.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/ftp.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ftp.1
--- man1/ftp.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/ftp.1	2000/05/30 03:08:08
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.12 1999/08/28 01:01:32 peter Exp %
+.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.15 2000/03/10 14:46:30 sheldonh Exp %
 .\" 	%NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp %
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -35,7 +35,7 @@
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\" jpman %Id: ftp.1,v 1.3 1997/08/20 12:54:33 horikawa Stab %
 .\"
-.Dd August 18, 1997
+.Dd January 27, 2000
 .Dt FTP 1
 .Os BSD 4.2
 .Sh $BL>>N(B
@@ -62,6 +62,9 @@
 $BI8=`$N%U%!%$%kE>Aw%W%m%H%3%k$rMQ$$$F%U%!%$%kE>Aw$r<B8=$9$k$?$a$N%3%^%s%I$G$9!#(B
 $BK\%3%^%s%I$O!"%M%C%H%o!<%/$r2p$7$F@\B3$5$l$F$$$k%3%s%T%e!<%?4V$G(B
 $B%U%!%$%k$rE>Aw$9$k<jCJ$r%f!<%6$KDs6!$7$^$9!#(B
+$BK\%P!<%8%g%s$O!"(B
+IPv4 $B$H6&$K!"(B
+IPv6 ($B%$%s%?!<%M%C%H%W%m%H%3%k%P!<%8%g%s(B 6) $B$r%5%]!<%H$7$^$9!#(B
 .Pp
 $B=q<0$N8e$m$+$i(B 3 $B$D$N;HMQNc$N7A<0$G$O(B HTTP $B$^$?$O(B FTP $B%W%m%H%3%k$N(B
 $B$$$:$l$+$r;H$C$F%U%!%$%k$r%+%l%s%H%G%#%l%/%H%j$K<hF@$7$^$9!#(B
@@ -646,7 +649,7 @@
 .Ev PAGER 
 $B$G;XDj$5$l$?%W%m%0%i%`(B
 ($B%G%U%)%k%H$O(B
-.Xr less 1
+.Xr more 1
 ) $B$r;H$C$FI=<($7$^$9!#(B
 .It Ic passive
 $B%Q%C%7%V%b!<%I$r@Z$jBX$($^$9!#%Q%C%7%V%b!<%I$,%*%s(B
@@ -672,7 +675,17 @@
 ($BCm(B: ftp $B%5!<%P$,(B RFC 1123 $B$N(B
 .Dv PASV
 $B%3%^%s%I$r%5%]!<%H$7$F$$$kI,MW$,$"$j$^$9$,!"%5%]!<%H$7$F$$$J$$(B
-$B>l9g$b$"$j$^$9!#(B)
+$B>l9g$b$"$j$^$9!#(B
+IPv6 $B%5!<%P$K@\B3$7$F$$$k>l9g!"(B
+.Dv EPSV/EPRT
+$B%Z%"$H(B
+.Dv LPSV/LPRT
+$B%Z%"$r;H$$!"(B
+.Dv PASV
+$B$H(B
+.Dv PORT
+$B$O;H$o$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+$BB>$OF1$8$G$9!#(B)
 .It Ic preserve
 $B<u$1<h$C$?%U%!%$%k$N99?7F|;~$rJ]B8$9$k$+$I$&$+$r@Z$jBX$($^$9!#(B
 .It Ic progress
@@ -1124,7 +1137,7 @@
 .Dq globbing
 $B$,5v2D$5$l$F$$$k>l9g!"(B
 $B%m!<%+%k%U%!%$%kL>$O(B
-.Xr csh  1
+.Xr csh 1
 $B$N%U%!%$%kL>E83+5,B'$K$7$?$,$C$FE83+$5$l$^$9!#(B
 ($B>\:Y$O(B
 .Ic glob 
@@ -1366,6 +1379,8 @@
 .Nx 1.3
 $B$G(B
 Luke Mewburn $B$K$h$C$F!"(BJason Thorpe $B$N%"%7%9%?%s%H$rF@$F<BAu$5$l$^$7$?!#(B
+.Pp
+IPv6 $B%5%]!<%H$O(B  WIDE/KAME $B%W%m%8%'%/%H$,DI2C$7$^$7$?!#(B
 .Sh $B%P%0(B
 $BB?$/$N%3%^%s%I$N@5$7$$F0:n$O!"%j%b!<%H%5!<%P$NE,@Z$JF0:n$K0MB8$7$^$9!#(B
 .Pp
@@ -1377,3 +1392,6 @@
 $BIT@5E>Aw$r$R$-5/$3$9$3$H$,(B
 $B$"$j$^$9!#$3$NLdBj$r2sHr$9$k$?$a$K$O%P%$%J%j%b!<%I$rMQ$$$F(B
 $B%U%!%$%kE>Aw$r$7$F2<$5$$!#(B
+.Pp
+.Ev ftp_proxy
+$BEy$N%W%m%-%75!G=$O!"(BIPv6 $B@\B3$G$OF0:n$7$J$$$+$b$7$l$^$;$s!#(B
Index: man1/gcore.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/gcore.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gcore.1
--- man1/gcore.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/gcore.1	2000/05/30 03:08:08
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/gcore/gcore.1,v 1.7 1999/08/28 01:01:38 peter Exp %
+.\" %FreeBSD: src/usr.bin/gcore/gcore.1,v 1.8 2000/03/01 12:19:41 sheldonh Exp %
 .\" jpman %Id: gcore.1,v 1.3 1997/08/20 12:27:20 horikawa Stab %
 .\"
 .Dd April 18, 1994
Index: man1/getopt.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/getopt.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 getopt.1
--- man1/getopt.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/getopt.1	2000/05/30 03:08:10
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/getopt/getopt.1,v 1.9 1999/09/05 05:50:38 phantom Exp %
+.\" %FreeBSD: src/usr.bin/getopt/getopt.1,v 1.10 2000/03/01 12:19:42 sheldonh Exp %
 .\"
 .\" jpman %Id: getopt.1,v 1.3 1997/06/19 14:12:53 take Stab %
 .Dd April 3, 1999
Index: man1/gprof.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/gprof.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gprof.1
--- man1/gprof.1	2000/02/15 14:34:50	1.1.1.1
+++ man1/gprof.1	2000/05/30 03:08:13
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gprof.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/gprof/gprof.1,v 1.11 1999/08/28 01:01:55 peter Exp %
+.\" %FreeBSD: src/usr.bin/gprof/gprof.1,v 1.12 2000/03/01 12:19:46 sheldonh Exp %
 .\" jpman %Id: gprof.1,v 1.2 1997/05/06 00:50:59 mutoh Stab %
 .\"
 .Dd June 6, 1993
Index: man1/install.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/install.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 install.1
--- man1/install.1	2000/02/15 14:34:51	1.1.1.1
+++ man1/install.1	2000/05/30 03:08:15
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/xinstall/install.1,v 1.15 1999/12/06 05:01:14 obrien Exp %
+.\" %FreeBSD: src/usr.bin/xinstall/install.1,v 1.16 2000/03/01 12:20:16 sheldonh Exp %
 .\"
 .\" jpman %Id: install.1,v 1.3 1997/11/12 13:03:24 horikawa Stab %
 .Dd September 22, 1996
Index: man1/kbdmap.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/kbdmap.1,v
retrieving revision 1.2
diff -u -r1.2 kbdmap.1
--- man1/kbdmap.1	2000/02/23 01:53:28	1.2
+++ man1/kbdmap.1	2000/05/30 03:08:15
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.16 2000/01/23 20:20:55 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.17 2000/03/01 14:07:41 sheldonh Exp %
 .\" jpman %Id: kbdmap.1,v 1.3 1997/08/10 18:29:41 horikawa Stab %
 
 .Dd Mar 25, 1995
Index: man1/kcon.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/kcon.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 kcon.1
--- man1/kcon.1	2000/02/15 14:34:51	1.1.1.1
+++ man1/kcon.1	2000/05/30 03:08:17
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)kcon.1, 3.20, Last Edit-Date: [Wed Jan 25 16:34:56 1995]
-.\" %FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.6 1999/08/28 01:17:44 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.7 2000/03/01 14:08:52 sheldonh Exp %
 .\" jpman %Id: kcon.1,v 1.3 1997/07/22 17:43:18 horikawa Stab %
 .\"
 .Dd January 25, 1995
Index: man1/keyinit.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/keyinit.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 keyinit.1
--- man1/keyinit.1	2000/02/15 14:34:51	1.1.1.1
+++ man1/keyinit.1	2000/05/30 03:08:17
@@ -1,5 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
-.\" %FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.7 1999/08/28 01:02:26 peter Exp %
+.\" %FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.8 2000/03/01 12:19:47 sheldonh Exp %
 .\"
 .\" jpman %Id: keyinit.1,v 1.4 1997/07/26 21:39:55 horikawa Stab %
 .Dd July 20, 1993
Index: man1/keylogin.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/keylogin.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 keylogin.1
--- man1/keylogin.1	2000/02/15 14:34:51	1.1.1.1
+++ man1/keylogin.1	2000/05/30 03:08:17
@@ -1,6 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" %FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.4 1999/08/28 01:02:27 peter Exp %
+.\" %FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.5 2000/03/01 12:19:49 sheldonh Exp %
 .\"
 .\" jpman %Id: keylogin.1,v 1.3 1998/10/04 20:50:45 vanitas Stab %
 .\"
Index: man1/last.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/last.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 last.1
--- man1/last.1	2000/02/15 14:34:51	1.1.1.1
+++ man1/last.1	2000/05/30 03:08:19
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/last/last.1,v 1.5 1999/08/28 01:02:39 peter Exp %
+.\" %FreeBSD: src/usr.bin/last/last.1,v 1.6 2000/03/01 12:19:50 sheldonh Exp %
 .\" jpman %Id: last.1,v 1.2 1997/05/12 06:02:31 yugawa Stab %
 .\"
 .Dd June 6, 1993
Index: man1/ldd.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/ldd.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ldd.1
--- man1/ldd.1	2000/02/15 14:34:52	1.1.1.1
+++ man1/ldd.1	2000/05/30 03:08:19
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.11 1999/08/28 23:20:47 mpp Exp %
+.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.12 2000/03/01 12:19:50 sheldonh Exp %
 .\"
 .Dd October 22, 1993
 .\" jpman %Id: ldd.1,v 1.3 1997/07/15 14:15:08 konuma Stab %
Index: man1/lint.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/lint.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lint.1
--- man1/lint.1	2000/02/15 14:34:52	1.1.1.1
+++ man1/lint.1	2000/05/30 03:08:24
@@ -29,7 +29,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/xlint/xlint/lint.1,v 1.7 1999/08/28 01:07:55 peter Exp %
+.\" %FreeBSD: src/usr.bin/xlint/xlint/lint.1,v 1.8 2000/03/01 12:20:22 sheldonh Exp %
 .\"
 .Dd August 28, 1994
 .\" jpman %Id: lint.1,v 1.3 1997/08/19 00:42:59 h-nokubi Stab %
Index: man1/loadfont.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/loadfont.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 loadfont.1
--- man1/loadfont.1	2000/02/15 14:34:52	1.1.1.1
+++ man1/loadfont.1	2000/05/30 03:08:24
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)loadfont.1, 3.20, Last Edit-Date: [Tue Apr  4 13:06:00 1995]
-.\" %FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.8 1999/08/28 01:17:48 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.9 2000/03/01 14:08:54 sheldonh Exp %
 .\" jpman %Id: loadfont.1,v 1.2 1997/03/29 06:19:33 horikawa Stab %
 .\"
 .Dd April 4, 1995
Index: man1/locate.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/locate.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 locate.1
--- man1/locate.1	2000/02/15 14:34:52	1.1.1.1
+++ man1/locate.1	2000/05/30 03:08:26
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.12 1999/08/28 01:02:58 peter Exp %
+.\" %FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.16 2000/03/06 09:45:28 sheldonh Exp %
 .\"	jpman %Id: locate.1,v 1.3 1997/05/19 16:39:18 horikawa Stab %
 .\"
 .Dd June 6, 1993
@@ -45,7 +45,7 @@
 .Op Fl Scims
 .Op Fl l Ar limit
 .Op Fl d Ar database 
-pattern ...
+.Ar pattern ...
 .Sh $B2r@b(B
 .Nm locate
 $B$O%G!<%?%Y!<%9$r;H$C$FA4$F$N%Q%9$r8!:w$7!"(B
Index: man1/lp.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/lp.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lp.1
--- man1/lp.1	2000/02/15 14:34:52	1.1.1.1
+++ man1/lp.1	2000/05/30 03:08:29
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.8 1999/08/28 01:16:50 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.12 2000/03/08 10:13:50 sheldonh Exp %
 .\" jpman %Id: lp.1,v 1.3 1997/07/01 19:59:08 ken Stab %
 .\"
 .Dd January 22, 1995
@@ -42,7 +42,8 @@
 .Nd $B%W%j%s%H%9%W!<%i$N%U%m%s%H%(%s%I(B
 .Sh $B=q<0(B
 .Nm lp
-.Op Fl c
+.Op Fl cs
+.Op Fl o Ar option
 .Op Fl d Ar printer
 .Op Fl n Ar num
 .Op Ar name ...
@@ -55,7 +56,7 @@
 $B$O!"E,@Z$J0z?t$r$D$1$F(B
 .Xr lpr 1
 $B$r5/F0$7$^$9!#(B
-
+.Pp
 $BDL>o!"(B
 .Nm
 $B$O;XDj$5$l$?%U%!%$%k$r%?!<%2%C%H$H$9$k%W%j%s%?$G%W%j%s%H$7$^$9!#(B
@@ -84,6 +85,15 @@
 $B;XDj$5$l$?3F%U%!%$%k$r(B
 .Ar num
 $BIt$:$D%W%j%s%H=PNO$7$^$9!#(B
+.It Fl o Ar option
+$B%W%j%s%?8GM-$N%*%W%7%g%s$G$9!#(B
+SVR $B$H$N8_49@-$N$?$a$@$1$KDs6!$5$l$F$$$k%*%W%7%g%s$G$"$j!"(B
+$B%5%]!<%H$5$l$F$$$^$;$s!#(B
+.It Fl s
+$BL[$C$FF0:n$7$^$9!#(B
+.St -susv2
+$B$H$N8_49@-$N$?$a$@$1$KDs6!$5$l$F$$$k%*%W%7%g%s$G$"$j!"(B
+$B%5%]!<%H$5$l$F$$$^$;$s!#(B
 .El
 .Sh $B4D6-JQ?t(B
 $B>e$G=R$Y$?$h$&$K!"4D6-JQ?t(B
@@ -91,7 +101,6 @@
 $B$*$h$S(B
 .Ev PRINTER
 $B$,%?!<%2%C%H$H$9$k%W%j%s%?$rA*Br$9$k$N$KMQ$$$i$l$^$9!#(B
-
 .Sh $B4XO"9`L\(B
 .Xr lpr 1
 .Sh $B5,3J(B
Index: man1/lpr.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/lpr.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lpr.1
--- man1/lpr.1	2000/02/15 14:34:52	1.1.1.1
+++ man1/lpr.1	2000/05/30 03:08:31
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.10 1999/11/30 16:15:22 ache Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.11 2000/03/01 14:08:50 sheldonh Exp %
 .\" jpman %Id: lpr.1,v 1.3 1997/08/11 14:28:54 horikawa Stab %
 .\"
 .Dd June 6, 1993
Index: man1/ls.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/ls.1,v
retrieving revision 1.2
diff -u -r1.2 ls.1
--- man1/ls.1	2000/04/11 16:57:31	1.2
+++ man1/ls.1	2000/05/30 03:08:33
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" %FreeBSD: src/bin/ls/ls.1,v 1.31 1999/10/16 16:17:54 obrien Exp %
+.\" %FreeBSD: src/bin/ls/ls.1,v 1.33 2000/03/02 14:53:20 sheldonh Exp %
 .\"
 .\" jpman %Id: ls.1,v 1.3 1997/05/19 17:21:06 horikawa Stab %
 .Dd July 29, 1994
Index: man1/mail.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/mail.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mail.1
--- man1/mail.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/mail.1	2000/05/30 03:08:40
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.17 1999/11/08 03:54:37 jkoshy Exp %
+.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.18 2000/03/01 12:19:51 sheldonh Exp %
 .\" jpman %Id: mail.1,v 1.3 1997/10/30 01:42:49 h-nokubi Stab %
 .\"
 .Dd December 30, 1993
Index: man1/make.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/make.1,v
retrieving revision 1.2
diff -u -r1.2 make.1
--- man1/make.1	2000/02/23 01:53:28	1.2
+++ man1/make.1	2000/05/30 03:08:49
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\" %FreeBSD: src/usr.bin/make/make.1,v 1.27 2000/01/19 10:44:28 ru Exp %
+.\" %FreeBSD: src/usr.bin/make/make.1,v 1.29 2000/03/01 12:19:52 sheldonh Exp %
 .\"
 .\" this file based on that translated to japanese on NetBSD Japanese Reference
 .\" Manual Project, and modefied to fit FreeBSD Reference Manual
Index: man1/mcon.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/mcon.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mcon.1
--- man1/mcon.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/mcon.1	2000/05/30 03:08:51
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)mcon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:28:22 1994]
-.\" %FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.7 1999/08/28 01:17:48 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.8 2000/03/01 14:08:55 sheldonh Exp %
 .\" jpman %Id: mcon.1,v 1.3 1997/08/20 12:33:46 horikawa Stab %
 .\"
 .Dd January 3, 1994
Index: man1/mkstr.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/mkstr.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mkstr.1
--- man1/mkstr.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/mkstr.1	2000/05/30 03:08:51
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.6 1999/08/28 01:04:11 peter Exp %
+.\" %FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.7 2000/03/01 12:19:53 sheldonh Exp %
 .\" jpman %Id: mkstr.1,v 1.2 1997/03/29 06:22:47 horikawa Stab %
 .\"
 .Dd June 6, 1993
Index: man1/mktemp.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/mktemp.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mktemp.1
--- man1/mktemp.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/mktemp.1	2000/05/30 03:08:54
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.6 1999/10/30 14:03:43 phantom Exp %
+.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.7 2000/03/01 12:19:54 sheldonh Exp %
 .\" From: %OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp %
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.6 1999/10/30 14:03:43 phantom Exp %
+.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.7 2000/03/01 12:19:54 sheldonh Exp %
 .\"
 .Dd November, 20, 1996
 .Dt MKTEMP 1
Index: man1/more.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/more.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 more.1
--- man1/more.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/more.1	2000/05/30 03:08:56
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)more.1	5.15 (Berkeley) 7/29/91
-.\" %FreeBSD: src/usr.bin/more/more.1,v 1.17 1999/12/28 05:56:33 hoek Exp %
+.\" %FreeBSD: src/usr.bin/more/more.1,v 1.18 2000/03/01 12:19:56 sheldonh Exp %
 .\"
 .\" jpman %Id: more.1,v 1.4 1997/08/11 14:30:57 horikawa Stab %
 .\"
Index: man1/msgs.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/msgs.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 msgs.1
--- man1/msgs.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/msgs.1	2000/05/30 03:08:58
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.bin/msgs/msgs.1,v 1.8 1999/08/28 01:04:21 peter Exp %
+.\" %FreeBSD: src/usr.bin/msgs/msgs.1,v 1.9 2000/03/01 12:19:58 sheldonh Exp %
 .\" jpman %Id: msgs.1,v 1.2 1997/03/29 06:23:20 horikawa Stab %
 .\"
 .Dd April 28, 1995
Index: man1/mt.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/mt.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mt.1
--- man1/mt.1	2000/02/15 14:34:53	1.1.1.1
+++ man1/mt.1	2000/05/30 03:09:03
@@ -31,9 +31,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.17 1999/08/28 01:04:23 peter Exp %
+.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.19 2000/03/02 14:53:31 sheldonh Exp %
 .\" jpman %Id: mt.1,v 1.3 1997/06/16 09:29:17 taku Stab %
-.\" jpman original revision: 1.12.2.3
 .\"
 .Dd June 6, 1993
 .Dt MT 1
Index: man1/netstat.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/netstat.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 netstat.1
--- man1/netstat.1	2000/02/15 14:34:54	1.1.1.1
+++ man1/netstat.1	2000/05/30 03:09:05
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.20 1999/12/13 20:08:44 guido Exp %
+.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.22 2000/03/11 14:33:13 shin Exp %
 .\"
 .\" jpman %Id: netstat.1,v 1.4 1997/10/11 07:45:56 horikawa Stab %
 .\"
@@ -42,7 +42,7 @@
 .Nd $B%M%C%H%o!<%/$N>uBV$rI=<($9$k(B
 .Sh $B=q<0(B
 .Nm netstat
-.Op Fl AaLn
+.Op Fl AaLln
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -203,6 +203,8 @@
 1 $BHVL\$N?t$O!"<u$1IU$1$i$l$J$+$C$?@\B3?t$G$9!#(B
 2 $BHVL\$N?t$O!"<u$1IU$1$i$l$J$+$C$?IT40A4$J@\B3?t$N9g7W$G$9!#(B
 3 $BHVL\$N?t$O!"BT$A9TNs$K7R$,$l$?@\B3$N:GBg?t$G$9!#(B
+.It Fl l
+$B40A4$J(B IPv6 $B%"%I%l%9$rI=<($7$^$9!#(B
 .It Fl M
 $B%G%U%)%k%H$G;HMQ$5$l$k(B
 .Pa /dev/kmem
Index: man1/passwd.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/passwd.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 passwd.1
--- man1/passwd.1	2000/02/15 14:34:54	1.1.1.1
+++ man1/passwd.1	2000/05/30 03:09:07
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/passwd/passwd.1,v 1.16 1999/08/28 01:04:51 peter Exp %
+.\" %FreeBSD: src/usr.bin/passwd/passwd.1,v 1.18 2000/03/01 12:20:07 sheldonh Exp %
 .\"
 .\" jpman %Id: passwd.1,v 1.4 1997/07/21 09:41:51 konuma Stab %
 .Dd June 6, 1993
@@ -70,8 +70,20 @@
 $B@_Dj$,M%@h$7$^$9(B) $B$G!"%"%k%U%!%Y%C%H$@$1$K$J$i$J(B
 $B$$$h$&$K$9$Y$-$G$9!#%Q%9%o!<%I$N:GBgJ8;z?t$O!"(B
 .Dv _PASSWORD_LEN
-($B8=:_$O(B128$BJ8;z(B) $B$h$jC;$/$J$1$l$P$J$j$^$;$s!#(B
-$B?t;z!"%"%k%U%!%Y%C%H$NBgJ8;z!"%a%?%-%c%i%/%?$N;HMQ$r?d>)$7$^$9!#(B
+($B8=:_$O(B 128 $BJ8;z(B) $B$h$jC;$$$3$H$,I,MW$G$9!#(B
+.Pp
+$B?75,%Q%9%o!<%I$OBgJ8;z$H>.J8;z$r:.9g$7$F4^$`I,MW$,$"$j$^$9(B
+($B%f!<%6$N%m%0%$%s%/%i%9$KBP$7$F(B
+.Xr login.conf 5
+$B$N(B
+.if t ``mixpasswordcase''
+.if n "mixpasswordcase"
+$B$N@_Dj$r;HMQ$9$k$3$H$G!">e=q$-2DG=$G$9(B)$B!#(B
+$B>.J8;z$@$1$N%o%9%o!<%I$N$_5v2D2DG=$J>l9g$K!"(B
+$B>.J8;z%Q%9%o!<%I$r5v$9$HM-MQ$G$7$g$&!#(B
+$BNc$($P(B Windows $B%/%i%$%"%s%H$rG'>Z$9$k$?$a$K(B Samba $B$r;HMQ$9$k>l9g$,!"(B
+$B3:Ev$7$^$9!#(B
+$BB>$N$9$Y$F$N>l9g!"?t;z!"BgJ8;z!"%a%?J8;z$,?d>)$5$l$^$9!#(B
 .Pp
 $B?7$7$$%Q%9%o!<%I$,3NG'$5$l$?$i(B
 .Nm passwd
Index: man1/pax.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pax.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pax.1
--- man1/pax.1	2000/02/15 14:34:54	1.1.1.1
+++ man1/pax.1	2000/05/30 03:09:16
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/pax/pax.1,v 1.10 1999/08/27 23:14:44 peter Exp %
+.\" %FreeBSD: src/bin/pax/pax.1,v 1.12 2000/03/02 14:53:22 sheldonh Exp %
 .\" jpman %Id: pax.1,v 1.4 1997/08/25 03:45:37 horikawa Stab %
 .\"
 .Dd April 18, 1994
Index: man1/perl.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/perl.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 perl.1
--- man1/perl.1	2000/02/15 14:34:54	1.1.1.1
+++ man1/perl.1	2000/05/30 03:10:08
@@ -1026,7 +1026,7 @@
 	}
 
 .fi
-$B<B:]!"8=:_$N$H$3$m$3$N$h$&$K<BAu$5$l$F$^$9!#(B
+$B<B:]!"8=:_$N$H$3$m$3$N$h$&$K<BAu$5$l$F$$$^$9!#(B
 ($B$3$l$O!"%^%7%s>e$K(B /bin/csh $B$,$J$1$l$P!"6uGr$r4^$`%U%!%$%kL>$G$O(B
 $BF0$+$J$$$3$H$r0UL#$7$^$9!#(B)
 $B$b$A$m$s!">e$NA`:n$r9T$J$&0lHVC;$$J}K!$O!"(B
@@ -5279,7 +5279,7 @@
 
 .fi
 $BNc$($P!"0J2<$K$h$j%Q%C%1!<%8Fb$N$9$Y$F$NJQ?t$r=PNO$G$-$^$9!#(B
-$B$3$l$O(B perl $B%i%$%V%i%j$N(B dumpvar.pl $B$+$i<h$C$F$^$9(B:
+$B$3$l$O(B perl $B%i%$%V%i%j$N(B dumpvar.pl $B$+$i<h$C$F$$$^$9(B:
 .nf
 .ne 11
 	package dumpvar;
@@ -5584,7 +5584,7 @@
 	open(FOO,"echo $foo|");	# $BBLL\$@$1$I(B..
 	open(FOO,"-|") || exec \'echo\', $foo;	# OK
 
-	$zzz = `echo $foo`;		# $B4m81!#(B zzz $B$O1x$l$F$^$9!#(B
+	$zzz = `echo $foo`;		# $B4m81!#(B zzz $B$O1x$l$F$$$^$9!#(B
 
 	unlink $abc,$foo;		# $B4m81(B
 	umask $foo;			# $B4m81(B
@@ -5902,7 +5902,7 @@
 $B$3$l$K$h$j!"J8;zNs$+$iJ#?t$N%^%C%A$r8!:w$9$k$3$H$G!"(B
 $B%Q%?!<%s%^%C%A$r7+$jJV$7$^$9!#(B
 .PP
-$^T $B$r=|$$$F!"$9$Y$F$N(B $^X $BJQ?t$,A}$($F$^$9!#(B
+$^T $B$r=|$$$F!"$9$Y$F$N(B $^X $BJQ?t$,A}$($F$$$^$9!#(B
 .PP
 FILEHANDLE $B$KBP$9$k%G%U%)%k%H$N%Z!<%8@hF,%U%)!<%^%C%H$O!"(Btop $B$G$J$/(B
 FILEHANDLE_TOP $B$K$J$C$F$$$^$9!#(B
Index: man1/pkg_add.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pkg_add.1,v
retrieving revision 1.2
diff -u -r1.2 pkg_add.1
--- man1/pkg_add.1	2000/04/02 06:53:31	1.2
+++ man1/pkg_add.1	2000/05/30 03:10:10
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.33 1999/09/01 10:04:42 jkh Exp %
+.\" %FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.35 2000/03/01 14:08:59 sheldonh Exp %
 .\"
 .\" jpman %Id: pkg_add.1,v 1.3 1997/06/09 04:19:05 jsakai Stab %
 .Dd November 25, 1994
@@ -451,6 +451,7 @@
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1 ,
 .Xr mktemp 3 ,
 .Xr sysconf 3 ,
 .Xr mtree 8
Index: man1/pkg_create.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pkg_create.1,v
retrieving revision 1.2
diff -u -r1.2 pkg_create.1
--- man1/pkg_create.1	2000/04/02 06:53:31	1.2
+++ man1/pkg_create.1	2000/05/30 03:10:15
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.31 1999/09/11 03:52:24 max Exp $	
+.\" %FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.35 2000/03/01 14:09:01 sheldonh Exp %	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
@@ -232,9 +232,7 @@
 .Cm tar
 $B$r<B9T(B) $B$r;2>H$7$F$/$@$5$$!#(B
 .It Fl D Ar displayfile
-package $B$r%$%s%9%H!<%k$7$?8e$K%U%!%$%k$r(B (
-.Xr more 1
-$B$rMQ$$$F(B) $BI=<($7$^$9!#(B
+package $B$r%$%s%9%H!<%k$7$?8e$K%U%!%$%k$r(B ($BO"7k$7$FI8=`=PNO$X(B) $BI=<($7$^$9!#(B
 $B!V$[$H$s$I(B free $B$J%=%U%H%&%'%"!W$J$I$K$*$$$F!"(B
 $BK!E*$JDLCN$N$h$&$J$b$N$J$I$KJXMx$G$7$g$&!#(B
 .It Fl m Ar mtreefile
@@ -480,6 +478,7 @@
 .Xr pkg_add 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1 ,
 .Xr sysconf 3
 .Sh $BNr;K(B
 .Nm
Index: man1/pkg_delete.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pkg_delete.1,v
retrieving revision 1.2
diff -u -r1.2 pkg_delete.1
--- man1/pkg_delete.1	2000/04/02 06:53:31	1.2
+++ man1/pkg_delete.1	2000/05/30 03:10:17
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.15 1999/09/01 10:04:46 jkh Exp %
+.\" %FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.16 2000/02/29 15:13:53 jhb Exp %
 .\"
 .\" jpman %Id: pkg_delete.1,v 1.3 1997/06/09 08:35:00 jsakai Stab %
 .\"
@@ -254,6 +254,7 @@
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1 ,
 .Xr mktemp 3 ,
 .Xr mtree 8
 .Sh $B:n<T(B
Index: man1/pkg_info.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pkg_info.1,v
retrieving revision 1.3
diff -u -r1.3 pkg_info.1
--- man1/pkg_info.1	2000/04/02 06:53:31	1.3
+++ man1/pkg_info.1	2000/05/30 03:10:17
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.23 2000/01/07 13:25:53 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.24 2000/02/29 15:13:54 jhb Exp %
 .\"
 .\" jpman %Id: pkg_info.1,v 1.3 1997/06/08 14:11:48 jsakai Stab %
 .\"
@@ -170,6 +170,7 @@
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
+.Xr pkg_version 1 ,
 .Xr mktemp 3 ,
 .Xr mtree 8
 .Sh $B:n<T(B
Index: man1/pkg_version.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pkg_version.1,v
retrieving revision 1.2
diff -u -r1.2 pkg_version.1
--- man1/pkg_version.1	2000/04/02 06:53:31	1.2
+++ man1/pkg_version.1	2000/05/30 03:10:19
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.3 1999/12/03 06:08:11 billf Exp %
+.\"	%FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.5 2000/03/01 14:09:02 sheldonh Exp %
 .\" jpman %Id: pkg_version.1,v 1.3 1999/12/05 08:25:39 horikawa Stab %
 .Dd July 17, 1998
 .Dt PKG_VERSION 1
@@ -117,7 +117,8 @@
 .Xr fetch 1 ,
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
-.Xr pkg_delete 1 .
+.Xr pkg_delete 1 ,
+.Xr pkg_info 1
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /usr/ports/INDEX -compact
 .It Pa /usr/ports/INDEX
Index: man1/pr.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/pr.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pr.1
--- man1/pr.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/pr.1	2000/05/30 03:10:22
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/pr/pr.1,v 1.8 1999/11/30 15:09:25 ache Exp %
+.\" %FreeBSD: src/usr.bin/pr/pr.1,v 1.9 2000/03/01 12:20:07 sheldonh Exp %
 .\"
 .\" jpman %Id: pr.1,v 1.3 1997/06/30 16:45:20 horikawa Stab %
 .\"
Index: man1/printenv.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/printenv.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 printenv.1
--- man1/printenv.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/printenv.1	2000/05/30 03:10:24
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/printenv/printenv.1,v 1.5 1999/08/28 01:04:56 peter Exp %
+.\" %FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6 2000/03/01 12:20:08 sheldonh Exp %
 .\" jpman %Id: printenv.1,v 1.2 1997/04/17 13:59:49 j5306050 Stab %
 .\"
 .Dd June 6, 1993
Index: man1/rdist.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/rdist.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rdist.1
--- man1/rdist.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/rdist.1	2000/05/30 03:10:28
@@ -30,9 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
-.\" %FreeBSD: src/usr.bin/rdist/rdist.1,v 1.12 1999/08/28 01:05:08 peter Exp %
+.\" %FreeBSD: src/usr.bin/rdist/rdist.1,v 1.13 2000/03/01 12:20:08 sheldonh Exp %
 .\"
-.\" Original Revision: 1.10
 .\" jpman %Id: rdist.1,v 1.2 1997/06/05 02:50:01 yugawa Stab %
 .\"
 .Dd March 17, 1994
@@ -316,7 +315,7 @@
 .Ic except_pat
 $B%3%^%s%I$O!"(B
 .Ic except
-$B%3%^%s%I$H;w$F$^$9$,!"(B
+$B%3%^%s%I$H;w$F$$$^$9$,!"(B
 .Ar pattern list
 $B$H$7$F@55,I=8=$rMQ$$$?%j%9%H$r;XDj$G$-$k$H$3$m$,0[$J$j$^$9(B
 ($B>\:Y$K$D$$$F$O!"(B
Index: man1/rpcgen.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/rpcgen.1,v
retrieving revision 1.2
diff -u -r1.2 rpcgen.1
--- man1/rpcgen.1	2000/02/23 01:53:28	1.2
+++ man1/rpcgen.1	2000/05/30 03:10:31
@@ -1,5 +1,5 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
-.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.10 2000/01/23 01:48:15 mpp Exp %
+.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.12 2000/03/01 12:20:08 sheldonh Exp %
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .\"
 .\" jpman %Id: rpcgen.1,v 1.2 1997/06/08 13:49:19 jsakai Stab %
Index: man1/rtprio.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/rtprio.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rtprio.1
--- man1/rtprio.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/rtprio.1	2000/05/30 03:10:33
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.18 1999/11/27 17:10:35 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.19 2000/03/01 14:07:43 sheldonh Exp %
 .\"
 .\" jpman %Id: rtprio.1,v 1.3 1997/09/23 16:41:42 horikawa Stab %
 .\"
Index: man1/rusers.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/rusers.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rusers.1
--- man1/rusers.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/rusers.1	2000/05/30 03:10:33
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.7 1999/08/28 01:05:29 peter Exp %
+.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.8 2000/03/01 12:20:09 sheldonh Exp %
 .\" jpman %Id: rusers.1,v 1.3 1997/08/20 12:45:29 horikawa Stab %
 .\"
 .Dd April 23, 1991
Index: man1/rwall.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/rwall.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rwall.1
--- man1/rwall.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/rwall.1	2000/05/30 03:10:33
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.6 1999/08/28 01:05:31 peter Exp %
+.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.7 2000/03/01 12:20:09 sheldonh Exp %
 .\" jpman %Id: rwall.1,v 1.2 1997/05/21 00:38:04 mutoh Stab %
 .\"
 .Dd April 23, 1991
Index: man1/sasc.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/sasc.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sasc.1
--- man1/sasc.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/sasc.1	2000/05/30 03:10:35
@@ -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.8 1999/08/28 01:05:34 peter Exp %
+.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.9 2000/03/01 12:20:10 sheldonh Exp %
 .\" jpman %Id: sasc.1,v 1.3 1997/07/22 17:55:16 horikawa Stab %
 .\"
 .Dd January 6, 1995
Index: man1/scon.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/scon.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 scon.1
--- man1/scon.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/scon.1	2000/05/30 03:10:37
@@ -29,7 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)scon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:30:48 1994]
-.\" %FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.7 1999/08/28 01:17:49 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.8 2000/03/01 14:08:57 sheldonh Exp %
 .\" jpman %Id: scon.1,v 1.3 1997/07/26 21:45:58 horikawa Stab %
 .\"
 .Dd December 31, 1993
Index: man1/script.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/script.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 script.1
--- man1/script.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/script.1	2000/05/30 03:10:37
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/script/script.1,v 1.9 1999/12/13 23:37:56 billf Exp %
+.\" %FreeBSD: src/usr.bin/script/script.1,v 1.12 2000/03/06 23:06:11 green Exp %
 .\" jpman %Id: script.1,v 1.2 1997/03/29 08:26:02 horikawa Stab %
 .\"
 .Dd June 6, 1993
Index: man1/sgsc.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/sgsc.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sgsc.1
--- man1/sgsc.1	2000/02/15 14:34:55	1.1.1.1
+++ man1/sgsc.1	2000/05/30 03:10:42
@@ -27,7 +27,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\"
-.\" %FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.7 1999/11/27 17:13:08 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.8 2000/03/01 14:07:44 sheldonh Exp %
 .\"
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" jpman %Id: sgsc.1,v 1.3 1997/06/12 22:00:17 horikawa Stab %
Index: man1/skey.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/skey.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 skey.1
--- man1/skey.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/skey.1	2000/05/30 03:10:44
@@ -1,7 +1,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)skey.1	1.1 	10/28/93
-.\" %FreeBSD: src/lib/libskey/skey.1,v 1.3 1999/08/28 00:05:26 peter Exp %
+.\" %FreeBSD: src/lib/libskey/skey.1,v 1.4 2000/03/02 09:13:24 sheldonh Exp %
 .\" jpman %Id: skey.1,v 1.2 1997/05/04 13:37:08 horikawa Stab %
 .\"
 .lt 6.0i
Index: man1/sleep.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/sleep.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sleep.1
--- man1/sleep.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/sleep.1	2000/05/30 03:10:44
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.14 1999/10/28 17:41:33 ru Exp %
+.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.15 2000/03/02 14:53:22 sheldonh Exp %
 .\"
 .\" jpman %Id: sleep.1,v 1.2 1997/05/04 13:38:26 horikawa Stab %
 .\"
Index: man1/sockstat.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/sockstat.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sockstat.1
--- man1/sockstat.1	2000/02/15 14:34:58	1.1.1.1
+++ man1/sockstat.1	2000/05/30 03:10:44
@@ -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.4 1999/09/06 13:14:24 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.6 2000/03/01 12:20:10 sheldonh Exp %
 .\"
 .\" jpman %Id: sockstat.1,v 1.3 1999/05/07 16:58:23 kuma Stab %
 .\"
@@ -63,7 +63,8 @@
 .Sh $B4XO"9`L\(B
 .Xr fstat 1 ,
 .Xr netstat 1 ,
-.Xr inet 4
+.Xr inet 4 ,
+.Xr inet6 4
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
Index: man1/startslip.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/startslip.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 startslip.1
--- man1/startslip.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/startslip.1	2000/05/30 03:10:46
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/startslip/startslip.1,v 1.15 1999/08/28 00:14:27 peter Exp %
+.\" %FreeBSD: src/sbin/startslip/startslip.1,v 1.16 2000/03/01 11:26:55 sheldonh Exp %
 .\"
 .\" jpman %Id: startslip.1,v 1.3 1997/08/19 03:06:09 h-nokubi Stab %
 .\"
Index: man1/stty.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/stty.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 stty.1
--- man1/stty.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/stty.1	2000/05/30 03:10:51
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/stty/stty.1,v 1.12 1999/08/27 23:15:42 peter Exp %
+.\" %FreeBSD: src/bin/stty/stty.1,v 1.13 2000/03/01 10:43:07 sheldonh Exp %
 .\"
 .\" jpman %Id: stty.1,v 1.2 1997/06/05 04:05:59 yugawa Stab %
 .Dd April 18, 1994
Index: man1/su.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/su.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 su.1
--- man1/su.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/su.1	2000/05/30 03:10:53
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/su/su.1,v 1.16 1999/08/28 01:05:55 peter Exp %
+.\" %FreeBSD: src/usr.bin/su/su.1,v 1.17 2000/03/01 12:20:11 sheldonh Exp %
 .\" jpman %Id: su.1,v 1.3 1997/05/19 16:52:17 horikawa Stab %
 .\"
 .\" this is for hilit19's braindeadness: "
Index: man1/systat.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/systat.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 systat.1
--- man1/systat.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/systat.1	2000/05/30 03:10:58
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/systat/systat.1,v 1.21 1999/08/28 01:06:05 peter Exp %
+.\" %FreeBSD: src/usr.bin/systat/systat.1,v 1.23 2000/03/02 14:53:32 sheldonh Exp %
 .\"
 .\" jpman %Id: systat.1,v 1.3 1997/10/05 12:58:19 horikawa Stab %
 .\"
@@ -47,7 +47,7 @@
 .Sh $B2r@b(B
 .Nm systat
 $B$O%7%9%F%`$N3F<oE}7W>pJs$r%9%/%j!<%s;X8~$JJ}K!$G(B
-.Xr curses 3
+.Xr ncurses 3
 $B$N(B curses $B%9%/%j!<%s%G%#%9%W%l%$%i%$%V%i%j$rMQ$$$FI=<($7$^$9!#(B
 .Pp
 .Nm systat
Index: man1/talk.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/talk.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 talk.1
--- man1/talk.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/talk.1	2000/05/30 03:11:00
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/talk/talk.1,v 1.5 1999/08/28 01:06:15 peter Exp %
+.\" %FreeBSD: src/usr.bin/talk/talk.1,v 1.6 2000/03/01 12:20:11 sheldonh Exp %
 .\" jpman %Id: talk.1,v 1.2 1997/05/04 13:39:47 horikawa Stab %
 .\"
 .Dd June 6, 1993
Index: man1/tar.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/tar.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tar.1
--- man1/tar.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/tar.1	2000/05/30 03:11:02
@@ -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.21 1999/08/27 23:37:02 peter Exp %
+.\" %FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.22 2000/03/01 10:40:18 nik Exp %
 .\"
 .\" jpman %Id: tar.1,v 1.2 1997/06/24 07:09:44 bobson Stab %
 .Dd 25 August 1997
@@ -457,7 +457,6 @@
 .Xr compress 1 ,
 .Xr gzip 1 ,
 .Xr pax 1 ,
-.Xr ft 8 ,
 .Xr rmt 8
 .\" .Sh $B5,3J(B
 .Sh $BNr;K(B
Index: man1/tcopy.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/tcopy.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tcopy.1
--- man1/tcopy.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/tcopy.1	2000/05/30 03:11:04
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\" %FreeBSD: src/usr.bin/tcopy/tcopy.1,v 1.6 1999/08/28 01:06:20 peter Exp %
+.\" %FreeBSD: src/usr.bin/tcopy/tcopy.1,v 1.7 2000/03/01 12:20:12 sheldonh Exp %
 .\" jpman %Id: tcopy.1,v 1.2 1997/03/29 11:44:52 horikawa Stab %
 .\"
 .Dd April 17, 1994
Index: man1/tcpdump.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/tcpdump.1,v
retrieving revision 1.2
diff -u -r1.2 tcpdump.1
--- man1/tcpdump.1	2000/02/23 01:53:28	1.2
+++ man1/tcpdump.1	2000/05/30 03:11:18
@@ -114,7 +114,7 @@
 $B%W%m%0%i%`$NCGJR$N7A$G%Q%1%C%H%^%C%A%s%0%3!<%I$r%@%s%W$7$^$9!#(B
 .TP
 .B \-ddd
-($B@hF,$K8D?t$rIU2C$7$?(B)$B==?J?t$N7A$G%Q%1%C%H%^%C%A%s%0%3!<%I$r%@%s%W$7$^$9!#(B
+($B@hF,$K8D?t$rIU2C$7$?(B) $B==?J?t$N7A$G%Q%1%C%H%^%C%A%s%0%3!<%I$r%@%s%W$7$^$9!#(B
 .TP
 .B \-e
 $B3F%@%s%W9T$4$H$K!"%j%s%/%l%Y%k$N%X%C%@$r=PNO$7$^$9!#(B
@@ -122,7 +122,7 @@
 .B \-f
 $B30It%[%9%H$N(B IP $B%"%I%l%9$K$D$$$F$O!"%7%s%\%k$G$J$/?tCM$GI=<($7$^$9!#(B
 ($BK\%*%W%7%g%s$O!"(BSun $B$N(B yp $B%5!<%P$K=EBg$J>c32$,H/@8$9$k$N$r2sHr$9$k$3(B
-$B$H$r0U?^$7$F$^$9!#(B\(em $BDL>o$O!"(BSun $B$N(B yp $B%5!<%P$O!"%m!<%+%k$KB8:_$7$J$$(B
+$B$H$r0U?^$7$F$$$^$9!#(B\(em $BDL>o$O!"(BSun $B$N(B yp $B%5!<%P$O!"%m!<%+%k$KB8:_$7$J$$(B
 IP $B%"%I%l%9$r1J5W$KJQ49$7$D$E$1$F%O%s%0$7$^$9!#(B)
 .TP
 .B \-F
@@ -133,7 +133,7 @@
 \fIinterface\fP $B$G;XDj$5$l$?%$%s%?%U%'!<%9$r4F;k$7$^$9!#(B
 $B;XDj$5$l$J$$>l9g$K$O!"(B\fItcpdump\fP $B$O%7%9%F%`%$%s%?%U%'!<%9%j%9%H$NCf$G(B
 $B:G$b>.$5$$HV9f$N2TF/Cf$N$b$N$r8!:w$7!"4F;k$9$k%$%s%?%U%'!<%9$H$7$F@_Dj(B
-$B$7$^$9(B($B%k!<%W%P%C%/%$%s%?%U%'!<%9$O8!:w$7$^$;$s(B)$B!#(B
+$B$7$^$9(B ($B%k!<%W%P%C%/%$%s%?%U%'!<%9$O8!:w$7$^$;$s(B)$B!#(B
 $B$3$NF0:n$O!":G=i$K%$%s%?%U%'!<%9$,A*Br$5$l$?;~E@$G=*N;$7$^$9!#(B
 .TP
 .B \-l
@@ -145,7 +145,7 @@
 $B$N$h$&$K;HMQ$7$^$9!#(B
 .TP
 .B \-n
-$B%"%I%l%9(B(IP $B%"%I%l%9$d%]!<%HHV9f$J$I(B)$B$rL>A0$KJQ49$7$^$;$s!#(B
+$B%"%I%l%9(B (IP $B%"%I%l%9$d%]!<%HHV9f$J$I(B) $B$rL>A0$KJQ49$7$^$;$s!#(B
 .TP
 .B \-N
 $B%[%9%HL>$N$&$A!"%I%a%$%sL>$NI=<($r$7$^$;$s!#Nc$($P!"K\%*%W%7%g%s$r(B
@@ -164,20 +164,20 @@
 $B$NC;=L7A$H$7$F;H$&$3$H$O=PMh$^$;$s!#(B
 .TP
 .B \-q
-$BAGAa$$(B($B@E$+$J(B?)$B=PNO$r9T$J$$$^$9!#=PNO$9$k9T$rC;$/$9$k$?$a$K!"DL>o=PNO(B
+$BAGAa$$(B ($B@E$+$J(B?) $B=PNO$r9T$J$$$^$9!#=PNO$9$k9T$rC;$/$9$k$?$a$K!"DL>o=PNO(B
 $B$5$l$k%W%m%H%3%k>pJs$N0lIt$O=PNO$5$l$^$;$s!#(B
 .TP
 .B \-r
-$B%Q%1%C%H$r!"(B\fIfile\fR $B$G;XDj$7$?%U%!%$%k(B (-w $B%*%W%7%g%s$G:n@.$5$l$^$9(B)$B$+(B
+$B%Q%1%C%H$r!"(B\fIfile\fR $B$G;XDj$7$?%U%!%$%k(B  (-w $B%*%W%7%g%s$G:n@.$5$l$^$9(B) $B$+(B
 $B$iFI$_9~$_$^$9!#(B\fIfile\fR $B$H$7$F(B``-''$B$,;XDj$5$l$?>l9g$OI8=`F~NO$,MQ$$$i(B
 $B$l$^$9!#(B
 .TP
 .B \-s
-$B%G%U%)%k%H$N(B 68 $B%P%$%H(B(SunOS $B$N(B NIT $B$G$O:G>.CM$O<B:]$K$O(B 96)$B$G$O$J$/$F!"(B
+$B%G%U%)%k%H$N(B 68 $B%P%$%H(B (SunOS $B$N(B NIT $B$G$O:G>.CM$O<B:]$K$O(B 96) $B$G$O$J$/$F!"(B
 \fIsnaplen\fP $B$@$1$N%G!<%?$r3F%Q%1%C%H$+$i<hF@$7$^$9!#(B68 $B%P%$%H$H$$$&(B
 $B%G!<%?D9$O!"(BIP, ICMP, TCP, UDP $B$N%Q%1%C%H$r<hF@$9$kJ,$K$O==J,$G$9$,!"(B
 $B%M!<%`%5!<%P$d(B NFS $B$N%Q%1%C%H$K$D$$$F$O%W%m%H%3%k>pJs$,@Z$j5M$a$i$l$k$3(B
-$B$H$,$"$j$^$9(B($B$3$l$K$D$$$F$O!"0J8e$N@bL@$r;2>H$7$F2<$5$$(B)$B!#(B
+$B$H$,$"$j$^$9(B ($B$3$l$K$D$$$F$O!"0J8e$N@bL@$r;2>H$7$F2<$5$$(B)$B!#(B
 $B%9%J%C%W%7%g%C%H$,8B$i$l$?NL$7$+$H$l$:$K@Z$j(B
 $B5M$a$i$l$?%Q%1%C%H$O!"=PNO$K(B ``[|\fIproto\fP]'' $B$H$$$&J8;zNs$,$$$C$7$g(B
 $B$KI=<($5$l$^$9!#(B \fIproto\fP $B$O!"@Z$j5M$a$,9T$o$l$?%W%m%H%3%k%l%Y%k$NL>(B
@@ -207,7 +207,7 @@
 $B3F9TKh$K%?%$%`%9%?%s%W$r?M4V$,FI$_$d$9$$7A$KJQ49$;$:$K=PNO$7$^$9!#(B
 .TP
 .B \-v
-($B>/$7$G$O$"$j$^$9$,(B)$B=PNO>pJs$rA}$d$7$^$9!#Nc$($P!"(BIP $B%Q%1%C%HCf$N(B
+($B>/$7$G$O$"$j$^$9$,(B) $B=PNO>pJs$rA}$d$7$^$9!#Nc$($P!"(BIP $B%Q%1%C%HCf$N(B
 TTL $B$d!"%5!<%S%9>pJs$N7?$r=PNO$7$^$9!#(B
 .TP
 .B \-vv
@@ -243,7 +243,7 @@
 $B$+$i@.$jN)$A$^$9!#(B
 $B%W%j%_%F%#%V$ODL>o(B 1 $B$D0J>e$N8BDj;R$N$D$$$?(B
 .I id
-($BL>A0$b$7$/$OHV9f(B)$B$+$i@.$jN)$A$^$9!#8BDj;R$O!"(B3 $B<oN`$"$j$^$9!#(B
+($BL>A0$b$7$/$OHV9f(B) $B$+$i@.$jN)$A$^$9!#8BDj;R$O!"(B3 $B<oN`$"$j$^$9!#(B
 .IP \fI$B7?(B\fP
 $B8BDj;R$O(B id $BL>$dHV9f$,;2>H$9$k$b$N$N<oN`$r;X$7$^$9!#7?$K$O(B
 .BR host $B!"(B
@@ -302,7 +302,7 @@
 $B$7$^$9!#$b$7%W%m%H%3%k8BDj;R$,;XDj$5$l$J$$>l9g$K$O!">e5-$N%W%m%H%3%k$N(B
 $B$&$A!"7?$KL7=b$7$J$$$9$Y$F$N$b$N$,;XDj$5$l$?$b$N$H$_$J$7$^$9!#(B
 $BNc$($P(B `src foo' $B$O!"(B`(ip or arp or rarp) src foo' ($B$3$l$,@5$7$$7A<0$G$J(B
-$B$$;v$r=|$$$F(B)$B$H!"(B`net bar' $B$O(B `(ip or arp or rarp) net bar' $B$HF15A$G$"(B
+$B$$;v$r=|$$$F(B) $B$H!"(B`net bar' $B$O(B `(ip or arp or rarp) net bar' $B$HF15A$G$"(B
 $B$j!"$^$?(B `port 53' $B$O(B `(tcp or udp) port 53' $B$HF15A$G$9!#(B
 .LP
 [`fddi' $B$O<B:]$K$O(B `ether' $B$NJLL>$K$J$C$F$$$^$9!#2r@O$G$O$3$l$i$r(B``$BFCDj$N(B
@@ -378,7 +378,7 @@
 \fIhost\fP $B$G$"$j!"Aw?.85$H08@h$N$I$A$i$N(B IP $B%"%I%l%9$b(B \fIhost\fP $B$G$J$$(B
 $B$H$$$&$3$H$G$9!#(B
 \fIhost\fP $B$O(B /etc/hosts $B%U%!%$%k$H(B /etc/ethers $B$NN>J}$GDj5A$5$l$F$$$kL>A0$r(B
-$B;XDj$9$kI,MW$,$"$j$^$9(B($BEy2A$JI=8=$O!"(B
+$B;XDj$9$kI,MW$,$"$j$^$9(B ($BEy2A$JI=8=$O!"(B
 .in +.5i
 .nf
 \fBether host \fIehost \fBand not host \fIhost\fR
@@ -389,7 +389,7 @@
 .IP "\fBdst net \fInet\fR"
 $B%Q%1%C%H$N08@h(B IP $B%"%I%l%9$,!"(B\fInet\fP $B$G;XDj$5$l$?%M%C%H%o!<%/$KB0$9$k$b$N$G(B
 $B$"$k>l9g$K??$H$J$j$^$9!#(B\fInet\fP $B$O!"%"%I%l%9CM$b$7$/$O(B /etc/networks $B$G(B
-$BDj5A$5$l$?%M%C%H%o!<%/L>$N$$$:$l$+$r;XDj2DG=$G$9(B($B>\$7$/$O!"(B\fInetworks(4)\fP
+$BDj5A$5$l$?%M%C%H%o!<%/L>$N$$$:$l$+$r;XDj2DG=$G$9(B ($B>\$7$/$O!"(B\fInetworks(4)\fP
 $B$r;2>H(B)$B!#(B
 .IP "\fBsrc net \fInet\fR"
 $B%Q%1%C%H$NAw?.85(B IP $B%"%I%l%9$,!"(B\fInet\fP $B$G;XDj$5$l$?%M%C%H%o!<%/$KB0$9$k$b$N$G(B
@@ -406,15 +406,16 @@
 $B7h$^$k%M%C%H%o!<%/$KB0$9$k$b$N$G$"$k>l9g$K??$H$J$j$^$9!#(B
 \fBsrc\fR $B$d(B \fBdst\fR $B$r;XDj$9$k;v$b2DG=$G$9!#(B
 .IP "\fBdst port \fIport\fR"
-$B%Q%1%C%H$,(B ip/tcp (TCP $B%Q%1%C%H(B)$B$b$7$/$O(B ip/udp(UDP $B%Q%1%C%H(B)$B$G$"$j!"08@h(B
+$B%Q%1%C%H$,(B ip/tcp (TCP $B%Q%1%C%H(B) $B$b$7$/$O(B ip/udp (UDP $B%Q%1%C%H(B) $B$G$"$j!"08@h(B
 $B%]!<%HHV9f$,(B \fIport\fP $B$N>l9g$K??$H$J$j$^$9!#(B
 \fIport\fP $B$G;XDj$5$l$k%]!<%HHV9f$O!"CM$b$7$/$O(B /etc/services $B$GDj5A(B
-$B$5$l$F$$$k%5!<%S%9L>$G;XDj2DG=$G$9(B(
+$B$5$l$F$$$k%5!<%S%9L>$G;XDj2DG=$G$9(B (
 .IR tcp (4P)
 $B$d(B
 .IR udp (4P)
 $B$r;2>H(B)$B!#(B
-$B%]!<%HHV9f$,%5!<%S%9L>$K$F;XDj$5$l$?>l9g!"%]!<%HHV9f$H%W%m%H%3%k$NN>J}$,%A%'%C%/(B
+$B%]!<%HHV9f$,%5!<%S%9L>$K$F;XDj$5$l$?>l9g!"(B
+$B%]!<%HHV9f$H%W%m%H%3%k$NN>J}$,%A%'%C%/(B
 $BBP>]$K$J$j$^$9!#%]!<%HHV9f$d!"$"$$$^$$$J%5!<%S%9L>$,;XDj$5$l$?>l9g$K$O!"(B
 $B%]!<%HHV9f$N$_$,%A%'%C%/BP>]$H$J$j$^$9(B($BNc$($P!"(B\fBdst port 513\fR $B$O!"(B
 tcp/login $B$H(B udp/who $B$NN>J}$r=PNO$7!"(B\fBport domain\fR $B$O!"(Btcp/domain 
@@ -451,14 +452,14 @@
 .in -.5i
 $B$HEy2A$G$9!#(B
 .IP "\fBip proto \fIprotocol\fR"
-$B%Q%1%C%H$,(B \fIprotocol\fP $B$G;XDj$7$?%W%m%H%3%k7?$N(B IP $B%Q%1%C%H(B(
+$B%Q%1%C%H$,(B \fIprotocol\fP $B$G;XDj$7$?%W%m%H%3%k7?$N(B IP $B%Q%1%C%H(B (
 $B>\:Y$O(B
 .IR ip (4P)
-$B$r;2>H(B)$B$N>l9g$K??$H$J$j$^$9!#(B
+$B$r;2>H(B) $B$N>l9g$K??$H$J$j$^$9!#(B
 \fIprotocol\fP $B$O!"?t;z$b$7$/$O(B
 \fIicmp\fP, \fIigrp\fP, \fIudp\fP, \fInd\fP, \fItcp\fP
 $B$N$$$:$l$+$NL>A0$,;XDj2DG=$G$9!#(B\fItcp\fP, \fIudp\fP, \fIicmp\fP $B$N(B
-$B3F<1JL;R$O%-!<%o!<%I$G$b$G$"$j!"%P%C%/%9%i%C%7%e(B(\\)(C-shell $B$G$O(B \\\\)$B$rMQ(B
+$B3F<1JL;R$O%-!<%o!<%I$G$b$G$"$j!"%P%C%/%9%i%C%7%e(B (\\)(C-shell $B$G$O(B \\\\) $B$rMQ(B
 $B$$$F%(%9%1!<%W$7$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
 .IP "\fBether broadcast\fR"
 $B%Q%1%C%H$,%$!<%5%M%C%H%V%m!<%I%-%c%9%H%Q%1%C%H$N>l9g$K??$H$J$j$^$9!#(B\fIether\fP
@@ -477,10 +478,10 @@
 $B%Q%1%C%H$,(B \fIprotocol\fR $B$G;XDj$7$?(B ether $B7?$N>l9g$K??$K$J$j$^$9!#(B
 \fIprotocol\fP $B$O!"?t;z$b$7$/$O(B \fIip\fP, \fIarp\fP, \fIrarp\fP $B$N$h$&$J(B
 $BL>A0$r;XDj2DG=$G$9!#(B
-$B$3$l$i$N<1JL;R$O%-!<%o!<%I$G$b$"$j!"%P%C%/%9%i%C%7%e(B(\\)$B$G%(%9%1!<%W$7(B
+$B$3$l$i$N<1JL;R$O%-!<%o!<%I$G$b$"$j!"%P%C%/%9%i%C%7%e(B (\\) $B$G%(%9%1!<%W$7(B
 $B$J$1$l$P$J$i$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
-[FDDI $B$N>l9g(B($BNc$($P(B `\fBfddi protocol arp\fR')$B!"%W%m%H%3%k$N<1JL$O(B
-IEEE802.2 $B$NO@M}%j%s%/@)8f(B(LLC)$B%X%C%@$K$h$C$F9T$o$l$^$9!#DL>o$3$l$O(B FDDI
+[FDDI $B$N>l9g(B ($BNc$($P(B `\fBfddi protocol arp\fR')$B!"%W%m%H%3%k$N<1JL$O(B
+IEEE802.2 $B$NO@M}%j%s%/@)8f(B (LLC) $B%X%C%@$K$h$C$F9T$o$l$^$9!#DL>o$3$l$O(B FDDI
 $B%X%C%@$N>e$NAX$K$"$j$^$9!#(B\fItcpdump\fP $B$O!"%W%m%H%3%k<1JL;R$G(B
 $B%U%#%k%?%j%s%0$9$k$H$-$O!"$9$Y$F$N(B FDDI $B%Q%1%C%H$O(B LLC $B%X%C%@$r4^$_!"(B
 $B$+$D$=$N(B LLC $B%X%C%@$,$$$o$f$k(B SNAP $B7A<0$G$"$k$H2>Dj$7$^$9!#(B]
@@ -532,7 +533,7 @@
 $B$/$@$5$$!#(B
 .IP  "\fIexpr relop expr\fR"
 \fIrelop\fR$B$O!"(B>, <, >=, <=, =, != $B$N$$$:$l$+$G$"$j!"(B\fIexpr\fR $B$NItJ,$K(B
-$B$O!"(B($BI8=`(B C $B8@8l$N9=J8$GI=8=$5$l$?(B)$B@0?tDj?t$dDL>o$NFs9`1i;;;R(B [+, -, *, /,
+$B$O!"(B($BI8=`(B C $B8@8l$N9=J8$GI=8=$5$l$?(B) $B@0?tDj?t$dDL>o$NFs9`1i;;;R(B [+, -, *, /,
 &, |]$B!"(Blength $B1i;;;R!"$=$7$FFC<l$J%Q%1%C%H%G!<%?$X$N%"%/%;%91i;;;R$J$I$+(B
 $B$i$J$k;;=QI=8=$,F~$C$F!"$=$N4X78$,@.N)$9$k>l9g$K??$H$J$j$^$9!#(B
 $B%Q%1%C%HFbIt$N%G!<%?$K%"%/%;%9$9$k$?$a$K$O!"0J2<$N9=J8$rMQ$$$^$9!#(B
@@ -661,7 +662,7 @@
 .RE
 .LP
 $B%m!<%+%k%M%C%H%o!<%/30$N%[%9%H$H$NDL?.$K$*$$$F!"(BTCP $B$K$h$k3FDL?.C10L(B
-$B$N%9%?!<%H%Q%1%C%H$H%(%s%I%Q%1%C%H(B(SYN $B$H(B FIN $B%Q%1%C%H(B)$B$rI=<($9$k$K$O!"0J(B
+$B$N%9%?!<%H%Q%1%C%H$H%(%s%I%Q%1%C%H(B (SYN $B$H(B FIN $B%Q%1%C%H(B) $B$rI=<($9$k$K$O!"0J(B
 $B2<$N$h$&$K<B9T$7$^$9!#(B
 .RS
 .nf
@@ -689,7 +690,7 @@
 .fi
 .RE
 .LP
-echo $BMW5a(B/$B1~Ez0J30(B($B$D$^$j(B ping $B%Q%1%C%H0J30(B)$B$NA4$F$N(B ICMP $B%Q%1%C%H$r(B
+echo $BMW5a(B/$B1~Ez0J30(B ($B$D$^$j(B ping $B%Q%1%C%H0J30(B) $B$NA4$F$N(B ICMP $B%Q%1%C%H$r(B
 $BI=<($9$k$K$O!"0J2<$N$h$&$K<B9T$7$^$9!#(B
 .RS
 .nf
@@ -715,16 +716,16 @@
 FDDI $B%M%C%H%o!<%/$K$*$$$F$O!"(B'-e' $B%*%W%7%g%s$,;XDj$5$l$k$H(B \fItcpdump\fP
 $B$O!"(B`$B%U%l!<%`@)8f(B'$B%U%#!<%k%I!"H/?.85$H08@h%"%I%l%9!"$=$7$F%Q%1%C%HD9$r(B
 $B=PNO$7$^$9!#(B`$B%U%l!<%`@)8f(B'$B%U%#!<%k%I$O%Q%1%C%H$N;D$j$NItJ,$N2r<a$r7hDj(B
-$B$7$^$9!#(B(IP $B%G!<%?%0%i%`$r4^$`$h$&$J(B)$BDL>o$N%Q%1%C%H$O(B `async' $B%Q%1%C%H$G!"(B
+$B$7$^$9!#(B(IP $B%G!<%?%0%i%`$r4^$`$h$&$J(B) $BDL>o$N%Q%1%C%H$O(B `async' $B%Q%1%C%H$G!"(B
 0 $B$+$i(B 7 $B$N4V$NM%@h=g0L$r;}$A$^$9!#Nc$($P!"(B`\fBasync4\fR' $B$G$9!#$3$&$7$?(B
 $B%Q%1%C%H$O(B IEEE802.2 $B$NO@M}%j%s%/@)8f(B (LLC) $B%Q%1%C%H$r4^$`$H2>Dj$5$l$^$9!#(B
 LLC $B%X%C%@$O!"$=$l$,(B ISO $B%G!<%?%0%i%`$G$J$$>l9g$d$$$o$f$k(B SNAP $B%Q%1%C%H$N$H(B
 $B$-$K$O=PNO$5$l$^$9!#(B
 .LP
-\fI($BCm0U(B:$B0J2<$N5-=R$O!"MxMQ<T$,(B RFC1144 $B$K5-=R$5$l$F$$$k(B SLIP $B05=L%"(B
-$B%k%4%j%:%`$K$D$$$F$NCN<1$,$"$kA0Ds$G=q$$$F$^$9!#(B)\fP
+\fI ($BCm0U(B:$B0J2<$N5-=R$O!"MxMQ<T$,(B RFC1144 $B$K5-=R$5$l$F$$$k(B SLIP $B05=L(B
+$B%"%k%4%j%:%`$K$D$$$F$NCN<1$,$"$kA0Ds$G=q$$$F$$$^$9!#(B)\fP
 .LP
-SLIP $B$K$h$k%j%s%/$K$*$$$F$O!"J}8~;X<(;R(B(``I'' $B$,F~NOJ}8~!"(B``O''
+SLIP $B$K$h$k%j%s%/$K$*$$$F$O!"J}8~;X<(;R(B (``I'' $B$,F~NOJ}8~!"(B``O''
 $B$,=PNOJ}8~(B)$B!"%Q%1%C%H7?!"$=$7$F05=L>pJs$,=PNO$5$l$^$9!#(B
 $B%Q%1%C%H7?$O!":G=i$K=PNO$5$l$^$9!#%Q%1%C%H7?$K$O(B \fIip\fP$B!"(B\fIutcp\fP$B!"$=$7$F(B
 \fIctcp\fP $B$N(B 3 $B$D$,$"$j$^$9!#(B
@@ -732,15 +733,16 @@
 TCP $B%Q%1%C%H$N>l9g$K$O!"%3%M%/%7%g%s<1JL;R$,%Q%1%C%H7?$KB3$$$F=PNO$5$l$^$9!#(B
 $B%Q%1%C%H$,05=L$5$l$F$$$k>l9g!"Id9f2=$5$l$?%X%C%@$,=PNO$5$l$^$9!#(B
 $BFC<l$J>l9g$O(B \fB*S+\fIn\fR $B$d(B \fB*SA+\fIn\fR $B$N$h$&$K=PNO$5$l$^$9!#$3$3(B
-$B$G(B \fIn\fR $B$O!"%7!<%1%s%9HV9f(B($B$b$7$/$O%7!<%1%s%9HV9f$*$h$S(B ack)$B$,JQ99$5$l$?2s(B
+$B$G(B \fIn\fR $B$O!"%7!<%1%s%9HV9f(B ($B$b$7$/$O%7!<%1%s%9HV9f$*$h$S(B ack) $B$,JQ99$5$l$?2s(B
 $B?t$G$9!#FC<l$J>l9g$G$J$1$l$P!"(B0 $B2s0J>e$NJQ99$K$D$$$F=PNO$5$l$^$9!#(B
-$BJQ99$O!"(BU ($B6[5^(B(urgent)$B%]%$%s%?(B)$B!"(BW($B%&%#%s%I%&(B)$B!"(BA(ack)$B!"(BS($B%7!<%1%s%9HV9f(B)$B!"(B
-$B$=$7$F(B I($B%Q%1%C%H(B ID)$B$G<($5$l!"JQF0NL(B(+n or -n)$B$b$7$/$O?7$7$$CM(B(=n)$B$,B3$-$^$9!#(B
+$BJQ99$O!"(BU ($B6[5^(B (urgent) $B%]%$%s%?(B)$B!"(BW ($B%&%#%s%I%&(B)$B!"(BA (ack)$B!"(BS ($B%7!<%1%s%9HV9f(B)$B!"(B
+$B$=$7$F(B I ($B%Q%1%C%H(B ID) $B$G<($5$l!"JQF0NL(B (+n or -n)
+$B$b$7$/$O?7$7$$CM(B (=n) $B$,B3$-$^$9!#(B
 $B:G8e$K!"%Q%1%C%HFb$N%G!<%?$NAmNL$*$h$S05=L%X%C%@D9$,=PNO$5$l$^$9!#(B
 .LP
 $BNc$($P!"0J2<$N9T$O!"=PNOJ}8~$N05=L(B TCP $B%Q%1%C%H$r!"0EL[$N%3%M%/%7%g%s<1JL;R(B
 $B$H$H$b$KI=<($7$F$$$^$9!#(Back $B$O(B 6 $BJQ$o$j!"%7!<%1%s%9HV9f$O(B 49 $BJQ$o$j!"%Q%1%C%H(B
-ID $B$O(B 6 $BJQ$o$C$F$^$9!#(B3 $B%P%$%H$N%G!<%?$H(B6 $B%P%$%H$N05=L%X%C%@$,B8:_$7$^$9!#(B
+ID $B$O(B 6 $BJQ$o$C$F$$$^$9!#(B3 $B%P%$%H$N%G!<%?$H(B6 $B%P%$%H$N05=L%X%C%@$,B8:_$7$^$9!#(B
 .RS
 .nf
 \fBO ctcp * A+6 S+49 I+6 3 (6)\fP
@@ -763,8 +765,8 @@
 .RE
 1$B9TL\$O!"%[%9%H(B rtsg $B$,!"%[%9%H(B csam $B$N%$!<%5%M%C%H%"%I%l%9$rLd$$9g$o$;$k(B
 $BL\E*$G(B arp $B%Q%1%C%H$rAw?.$7$F$$$k$3$H$r0UL#$7$^$9!#%[%9%H(B csam $B$O!"<+J,<+?H(B
-$B$N%$!<%5%M%C%H%"%I%l%9$rJVEz$7$F$$$^$9(B($B$3$NNc$G$O!"%$!<%5%M%C%H%"%I%l%9(B
-$B$OBgJ8;z$G!"%$%s%?!<%M%C%H%"%I%l%9It$O>.J8;z$GI=5-$7$F$^$9(B)$B!#(B
+$B$N%$!<%5%M%C%H%"%I%l%9$rJVEz$7$F$$$^$9(B ($B$3$NNc$G$O!"%$!<%5%M%C%H%"%I%l%9(B
+$B$OBgJ8;z$G!"%$%s%?!<%M%C%H%"%I%l%9It$O>.J8;z$GI=5-$7$F$$$^$9(B)$B!#(B
 .LP
 \fBtcpdump \-n\fP $B$H$7$F5/F0$7$?>l9g$K$O!">/$7>iD9$K$J$j$^$9!#(B
 .RS
@@ -788,13 +790,13 @@
 .RE
 $B:G=i$N%Q%1%C%H$K$D$$$F$O!"Aw?.85$N%$!<%5%M%C%H%"%I%l%9$O(B RTSG $B$G$"$j!"(B
 $B08@h$O%$!<%5%M%C%H%V%m!<%I%-%c%9%H%"%I%l%9!"7?%U%#!<%k%I$K$O(B 16 $B?J?t$NCM(B
-0806(ETHER_ARP $B$r0UL#$7$^$9(B)$B$,3JG<$5$l$F$*$j!"Am%Q%1%C%HD9$O(B 64 $B%P%$%H$G$"$k(B
-$B$HI=<($7$F$^$9!#(B
+0806 (ETHER_ARP $B$r0UL#$7$^$9(B) $B$,3JG<$5$l$F$*$j!"Am%Q%1%C%HD9$O(B 64 $B%P%$%H$G$"$k(B
+$B$HI=<($7$F$$$^$9!#(B
 .HD
 TCP $B%Q%1%C%H(B
 .LP
 \fI($BCm0U(B:$B0J2<$N5-=R$O!"(BRFC793 $B$K5-=R$5$l$F$$$k(B TCP $B%W%m%H%3%k$K$D$$$F$NCN<1(B
-$B$,$"$k$3$H$rA0Ds$K5-=R$5$l$F$^$9!#$3$NCN<1$,$J$$>l9g!"K\5-=R$H(B tcpdump $B$N(B
+$B$,$"$k$3$H$rA0Ds$K5-=R$5$l$F$$$^$9!#$3$NCN<1$,$J$$>l9g!"K\5-=R$H(B tcpdump $B$N(B
 $B$$$:$l$b$"$J$?$K$OLr$KN)$?$J$$$G$7$g$&!#(B)\fP
 .LP
 TCP $B%W%m%H%3%k9T$N0lHLE*$J7A<0$O!"0J2<$NDL$j$G$9!#(B
@@ -806,18 +808,18 @@
 .fi
 .RE
 \fIsrc\fP $B$H(B \fIdst\fP $B$O!"$=$l$>$lAw?.85$H08@h$N(B IP $B%"%I%l%9$H(B
-$B%]!<%HHV9f$G$9!#(B\fIflags\fP $B$NItJ,$K$O!"(BS (SYN),F (FIN), P (PUSH) ,R (RST)
-$B$NAH$_9g$o$;!"$b$7$/$OC1$J$k(B `.' ($B%U%i%0$J$7(B)$B$,F~$j$^$9!#(B
+$B%]!<%HHV9f$G$9!#(B\fIflags\fP $B$NItJ,$K$O!"(BS (SYN), F (FIN), P (PUSH), R (RST)
+$B$NAH$_9g$o$;!"$b$7$/$OC1$J$k(B `.' ($B%U%i%0$J$7(B) $B$,F~$j$^$9!#(B
 \fIdata-seqno\fP $B$O!"$3$N%Q%1%C%HFb$N%G!<%?$,%7!<%1%s%96u4V$N$I$NItJ,$K(B
-$B$"$?$k$+$r<($7$^$9(B($B0J2<$NNc$r;2>H$7$F2<$5$$(B)$B!#(B
+$B$"$?$k$+$r<($7$^$9(B ($B0J2<$NNc$r;2>H$7$F2<$5$$(B)$B!#(B
 \fIack\fP $B$O!"K\%3%M%/%7%g%s>e$r5UJ}8~$K<!$KN.$l$k%G!<%?%Q%1%C%H$N(B
 $B%7!<%1%s%9HV9f$G$9!#(B
 \fIwindow\fP $B$O!"K\%3%M%/%7%g%s$N5UJ}8~$N%Q%1%C%H$r3JG<$9$k%P%C%U%!%5%$%:(B
 $B$G$9!#(B
-\fIurg\fP $B$O!"%Q%1%C%HCf$K(B `urgent'($B6[5^(B)$B%G!<%?$,3JG<$5$l$F$$$k$3$H$r<($7$^(B
+\fIurg\fP $B$O!"%Q%1%C%HCf$K(B `urgent' ($B6[5^(B) $B%G!<%?$,3JG<$5$l$F$$$k$3$H$r<($7$^(B
 $B$9!#(B
-\fIoptions\fP $B$O!"Nc$($P(B <mss 1024> $B$N$h$&$K!"%"%s%0%k%V%i%1%C%H(B($BBg>.5-9f(B)$B$G(B
-$B$/$/$i$l$?(B tcp $B%*%W%7%g%s$G$9!#(B
+\fIoptions\fP $B$O!"Nc$($P(B <mss 1024> $B$N$h$&$K!"%"%s%0%k%V%i%1%C%H(B ($BBg>.5-9f(B) $B$G(B
+$B3g$i$l$?(B tcp $B%*%W%7%g%s$G$9!#(B
 .LP
 \fIsrc$B!"(Bdst\fP$B!"$=$7$F(B \fIflags\fP $B$O!">o$KI=<($5$l$^$9!#B>$N%U%#!<%k%I$O!"(B
 $B%Q%1%C%H$N(B TCP $B%X%C%@$K0MB8$7!"I=<($G$-$k>l9g$@$1I=<($5$l$^$9!#(B
@@ -853,7 +855,7 @@
 csam $B$O!"(Brtsg $B$+$iAw$i$l$?%Q%1%C%H$HN`;w$7$?%Q%1%C%H$rAw$jJV$7$^$9$,!"(B
 rtsg $B$NAw$C$?(B SYN $B$KBP$9$k(B ack $B$,4^$^$l$k$H$3$m$,0[$J$j(B
 $B$^$9!#B3$$$F!"(Brtsg $B$O(B csam $B$N(B SYN $B$KBP$9$k(B ack $B$rJV$7$^$9!#(B
-`.' $B$O!"(BS (SYN),F (FIN), P (PUSH) ,R (RST) $B$N$$$:$l$N%U%i%0$b(B
+`.' $B$O!"(BS (SYN), F (FIN), P (PUSH), R (RST) $B$N$$$:$l$N%U%i%0$b(B
 $BN)$C$F$$$J$$$3$H$r0UL#$7$^$9!#(B
 $B%Q%1%C%H$O%G!<%?$r4^$^$J$$$?$a!"%G!<%?%7!<%1%s%9HV9f$OF~$j$^$;$s!#(B
 ack $B%7!<%1%s%9HV9f$,>.$5$$@0?t(B (1) $B$G$"$k$3$H$KCm0U$7$F2<$5$$!#(B
@@ -861,17 +863,17 @@
 $B%7!<%1%s%9HV9f$rI=<($7$^$9!#DL?.$N$=$N8e$N%Q%1%C%H$K$D$$$F$O!"8=:_$N(B
 $B%Q%1%C%H%7!<%1%s%9HV9f$H!"$3$N:G=i$N%7!<%1%s%9HV9f$N4V$N:9$rI=<($7$^$9!#(B
 $B$3$N$3$H$O!":G=i$K<hF@$7$?0J9_$N%7!<%1%s%9HV9f$O!"DL?.%G!<%?%9%H%j!<%`(B
-$B$NAjBP0LCV$H$7$F2r<a$G$-$k$3$H$r0UL#$7$^$9(B($B:G=i$N3FJ}8~$N%G!<%?%P%$%H(B
+$B$NAjBP0LCV$H$7$F2r<a$G$-$k$3$H$r0UL#$7$^$9(B ($B:G=i$N3FJ}8~$N%G!<%?%P%$%H(B
 $B$O(B 1 $B$G$9(B)$B!#(B`-S' $B$O!"K\5!G=$rL58z$K$7!"85$N%7!<%1%s%9HV9f$rI=<($7$^$9!#(B
 .LP
 6 $B9TL\$G$O!"(Brtsg $B$O(B csam $B$K(B 19 $B%P%$%H$N%G!<%?$rAw?.$7$F$$$^$9(B (rtsg \(-> csam $B$N(B
 $BJ}8~$NDL?.$K$*$1$k!"(B2 $B%P%$%HL\$+$i(B 20 $B%P%$%HL\$^$G$N%G!<%?(B)$B!#(BPUSH $B%U%i%0$,(B
 $B$3$N%Q%1%C%H$G$O@_Dj$5$l$F$$$^$9!#(B
 7 $B9TL\$G$O!"(Bcsam $B$O(B rtsg $B$+$i(B 20 $B%P%$%H$^$G$N%G!<%?$r<u$1$H$C$?;]$N(B
-$B%l%9%]%s%9$r(B rtsg $B$KJV$7$F$^$9!#(Bcsam $B$N<u?.%&%#%s%I%&$,(B19$B%P%$%H>.$5$/$J$C(B
+$B%l%9%]%s%9$r(B rtsg $B$KJV$7$F$$$^$9!#(Bcsam $B$N<u?.%&%#%s%I%&$,(B19$B%P%$%H>.$5$/$J$C(B
 $B$?$3$H$+$i!"$3$l$i$N%G!<%?$N$[$H$s$I$O!"%=%1%C%H%P%C%U%!$NCf$KB8:_$9$k(B
 $B$3$H$,J,$+$j$^$9!#(B
-csam $B$O!"(Brtsg $B$K(B 1 $B%P%$%H$N%G!<%?$rAw?.$7$F$^$9!#(B
+csam $B$O!"(Brtsg $B$K(B 1 $B%P%$%H$N%G!<%?$rAw?.$7$F$$$^$9!#(B
 8 $B9T$a$H(B 9 $B9T$a$G$O!"(Bcsam $B$O6[5^(B (urgent) $B$G(B PUSH $B%U%i%0$N@_Dj$5$l$?(B
 2 $B%P%$%H%G!<%?$rAw?.$7$F$$$^$9!#(B
 .LP
@@ -910,7 +912,7 @@
 UDP $B%M!<%`%5!<%PMW5a(B
 .LP
 \fI($BCm0U(B:$B0J2<$N5-=R$O!"(BRFC1035 $B$K5-=R$5$l$F$$$k(B
-$B%I%a%$%s%5!<%S%9%W%m%H%3%k$NCN<1$,$"$k$3$H$rA0Ds$K=q$+$l$F$^$9!#$b$7$3(B
+$B%I%a%$%s%5!<%S%9%W%m%H%3%k$NCN<1$,$"$k$3$H$rA0Ds$K=q$+$l$F$$$^$9!#$b$7$3(B
 $B$l$i$NCN<1$,$J$$>l9g$K$O!"0J2<$N5-=R$OL$CN$N8@8l$G=q$+$l$F$$$k$+$N$h$&(B
 $B$K8+$($k$G$7$g$&!#(B)\fP
 .LP
@@ -926,7 +928,7 @@
 .RE
 $B%[%9%H(B \fIh2opolo\fP $B$O!"(B\fIhelios\fP $B>e$N%I%a%$%s%5!<%P$KBP$7$F(B
 \fIucbvax.berkeley.edu\fP $B$N%[%9%HL>$KBP1~$9$k%"%I%l%9%l%3!<%I(B (qtype=A)
-$B$rLd$$9g$o$;$F$^$9!#(B
+$B$rLd$$9g$o$;$F$$$^$9!#(B
 $BLd$$9g$o$;$N(B ID $B$O(B `3' $B$G$"$j!"(B`+' $B$O(B\fI$B:F5"MW5a(B\fP$B%U%i%0$,@_Dj$5$l$F(B
 $B$$$k$3$H$r0UL#$7$^$9!#Ld$$9g$o$;$ND9$5$O(B 37 $B%P%$%H$G$"$j!"$3$NCf$K(B UDP $B$*$h$S(B
 IP $B$N%W%m%H%3%k%X%C%@$ND9$5$O4^$_$^$;$s!#<ALdA`:n$OIaDL$NA`:n(B (\fIQuery\fP)
@@ -944,7 +946,7 @@
 .I arcount
 $B$,!"(B`[\fIn\fPa]'$B!"(B `[\fIn\fPn]' $B!"$b$7$/$O(B `[\fIn\fPau]' $B$N$h$&$J7A<0$G(B
 $BI=<($5$l$^$9!#(B\fIn\fP $B$O!"$=$l$>$l$N8D?t$G$9!#(B
-$B1~Ez%S%C%H$N$$$:$l$+$,@_Dj$5$l$F$$$k(B(AA, RA $B$b$7$/$O(B rcode)$B>l9g!"(B
+$B1~Ez%S%C%H$N$$$:$l$+$,@_Dj$5$l$F$$$k(B (AA, RA, rcode $B$N$$$:$l$+(B) $B>l9g!"(B
 $B$b$7$/$O(B`0 $B$G$J$1$l$P$J$i$J$$(B'$B%S%C%H$,(B 2 $B%P%$%HL\$H(B 3 $B%P%$%HL\$K@_Dj$5$l$F$$(B
 $B$k>l9g$K$O!"(B`[b2&3=\fIx\fP]' $B$,=PNO$5$l$^$9!#(B\fIx\fP $B$O!"%X%C%@$N(B 2 $B%P%$%H(B
 $BL\$*$h$S(B 3 $B%P%$%HL\$NCM$r(B 16 $B?J$GI=$7$?$b$N$G$9!#(B
@@ -965,7 +967,7 @@
 $B:G=i$NNc$O!"(B\fIh2opolo\fP $B$+$i$N<ALd(B ID 3 $B$NMW5a$KBP$7!"(B\fIhelios\fP $B$,(B
 3 $B$D$N%"%s%5!<%l%3!<%I!"(B3 $B$D$N%M!<%`%5!<%P%l%3!<%I!"$=$7$F(B 7 $B$D$N(B
 $B%*!<%=%j%F%#%l%3!<%I$r;}$C$F$$$k%Q%1%C%H$GJVEz$7$F$$$k$H$$$&$b$N$G$9!#(B
-$B:G=i$N%"%s%5!<%l%3!<%I$O!"%?%$%W(B A($B%"%I%l%9(B)$B$G$"$j!"$=$N%G!<%?$O(B
+$B:G=i$N%"%s%5!<%l%3!<%I$O!"%?%$%W(B A ($B%"%I%l%9(B) $B$G$"$j!"$=$N%G!<%?$O(B
 IP $B%"%I%l%9(B 128.32.137.3 $B$G$9!#(BUDP $B$H(B IP $B$N%X%C%@$r=|$$$?Am%5%$%:$O(B
 273 $B%P%$%H$G$9!#(B
 A $B%l%3!<%I$N%/%i%9(B (C_IN) $B$HF1MM$K(B, op (Query) $B$*$h$S1~Ez%3!<%I(B
@@ -979,8 +981,7 @@
 $B%"%s%5!<%l%3!<%I$,$J$$$?$a!"7?!"%/%i%9!"%G!<%?$O=PNO$5$l$^$;$s!#(B
 .LP
 $B=PNO$5$l$k2DG=@-$N$"$kB>$N%U%i%0%-%c%i%/%?$O!"(B`\-' ($B:F5"MxMQ(B,RA,$B$,(B 
-$B@_Dj$5$l$F$$$J$$(B)$B$*$h$S(B `|' ($B%a%C%;!<%8@Z<N$F(B, TC, $B$,@_Dj$5$l$F$$(B
-$B$k(B)$B$G$9!#(B
+$B@_Dj$5$l$F$$$J$$(B)$B$*$h$S(B `|' ($B%a%C%;!<%8@Z<N$F(B, TC, $B$,@_Dj$5$l$F$$$k(B) $B$G$9!#(B
 `question' $B%;%/%7%g%s$K4^$^$l$k%(%s%H%j$,$A$g$&$I(B 1 $B$D$G$J$$>l9g$K$O!"(B
 `[\fIn\fPq]' $B$,=PNO$5$l$^$9!#(B
 .LP
@@ -1014,11 +1015,11 @@
 .fi
 .RE
 $B:G=i$N9T$G$O!"%[%9%H(B \fIsushi\fP $B$,(B ID\fI6709\fP $B$N%H%i%s%6%/%7%g%s$r(B
-\fIwrl\fP $B$KAw?.$7$^$9(B($BAw?.85%[%9%H$KB3$/?t;z$O%H%i%s%6%/%7%g%s(B ID
+\fIwrl\fP $B$KAw?.$7$^$9(B ($BAw?.85%[%9%H$KB3$/?t;z$O%H%i%s%6%/%7%g%s(B ID
 $B$G$"$j!"Aw?.85%]!<%HHV9f$G(B\fI$B$J$$(B\fP$B$3$H$KCm0U$7$F2<$5$$(B)$B!#MW5a(B
 $B%5%$%:$O!"(BUDP $B$*$h$S(B IP $B%X%C%@$N%5%$%:$r=|$$$F(B 112 $B%P%$%H$G$9!#A`:n$O!"(B
 $B%U%!%$%k%O%s%I%k(B (\fIfh\fP) 21,24/10.731657119 $B$KBP$9$k(B \fIreadlink\fP
-($B%7%s%\%j%C%/%j%s%/FI$_9~$_(B)$B$G$9!#(B
+($B%7%s%\%j%C%/%j%s%/FI$_9~$_(B) $B$G$9!#(B
 ($B$3$NNc$N$h$&$K1?$,NI$1$l$P!"%U%!%$%k%O%s%I%k$O%G%P%$%9$N%a%8%c!<!"(B
 $B%^%$%J!<HV9f$N%Z%"$H!"$=$l$KB3$/(B i $B%N!<%IHV9f$H@$BeHV9f$H2r<a$9$k$3$H$,$G(B
 $B$-$^$9!#(B)
@@ -1045,16 +1046,16 @@
 .fi
 .RE
 (\-v $B$O(B IP $B%X%C%@$N(B TTL, ID, $B$=$7$F%U%i%0%a%s%F!<%7%g%s%U%#!<%k%I$b=PNO$7(B
-$B$^$9$,!"$3$NNc$G$O>JN,$7$F$$$^$9!#(B)$B:G=i$N9T$G$O!"(B\fIsushi\fP $B$O(B 
+$B$^$9$,!"$3$NNc$G$O>JN,$7$F$$$^$9!#(B) $B:G=i$N9T$G$O!"(B\fIsushi\fP $B$O(B 
 \fIwrl\fP $B$KBP$7$F%U%!%$%k(B 21,11/12.195 $B$N%*%U%;%C%H(B 24576 $B%P%$%HL\$+(B
 $B$i(B 8192 $B%P%$%H$rFI$`$h$&$KMW5a$7$F$$$^$9!#(B\fIwrl\fP $B$O(B `ok' $B$HJVEz$7$F$$(B
 $B$^$9!#(B2 $B9T$a$K<($7$?%Q%1%C%H$O1~Ez$N:G=i$N%U%i%0%a%s%H$J$N$G!"(B1472 
-$B%P%$%H$7$+$"$j$^$;$s(B($B$=$NB>$N%G!<%?$O7QB3$9$k%U%i%0%a%s%HCf$KB3$-$^$9(B
+$B%P%$%H$7$+$"$j$^$;$s(B ($B$=$NB>$N%G!<%?$O7QB3$9$k%U%i%0%a%s%HCf$KB3$-$^$9(B
 $B$,!"$3$l$i$N%U%i%0%a%s%H$O(B NFS $B%X%C%@$b(B UDP $B%X%C%@$5$($b;}$?$J$$$N$G!";H$o(B
 $B$l$k%U%#%k%?%j%s%0$NI=8=$K$h$C$F$O=PNO$5$l$J$$$G$7$g$&(B)$B!#(B\-v $B%U%i%0$,$"(B
-$B$k$N$G$$$/$D$+$N%U%!%$%kB0@-(B($B%U%!%$%k%G!<%?$KDI2C$5$l$FJV$5$l$F$/$k(B)$B$,(B
-$B=PNO$5$l$^$9!#$=$l$i$O%U%!%$%k$N7?(B($BIaDL$N%U%!%$%k$J$i(B``REG'')$B!"(B(8 $B?J?t(B
-$BI=8=$N(B)$B%U%!%$%k%b!<%I!"(Buid $B$H(B gid$B!"$=$7$F%U%!%$%k$NBg$-$5$G$9!#(B
+$B$k$N$G$$$/$D$+$N%U%!%$%kB0@-(B ($B%U%!%$%k%G!<%?$KDI2C$5$l$FJV$5$l$F$/$k(B) $B$,(B
+$B=PNO$5$l$^$9!#$=$l$i$O%U%!%$%k$N7?(B ($BIaDL$N%U%!%$%k$J$i(B``REG'')$B!"(B(8 $B?J?t(B
+$BI=8=$N(B) $B%U%!%$%k%b!<%I!"(Buid $B$H(B gid$B!"$=$7$F%U%!%$%k$NBg$-$5$G$9!#(B
 .LP
 \-v $B%U%i%0$,(B 2 $B2s0J>e;XDj$5$l$k$H!"$5$i$K>\$7$$>pJs$,=PNO$5$l$^$9!#(B
 .LP
@@ -1070,7 +1071,7 @@
 KIP Appletalk (DDP in UDP)
 .LP
 UDP $B%G!<%?%0%i%`$G%+%W%;%k2=$5$l$?(B Appletalk DDP $B%Q%1%C%H$O!"%+%W%;%k2=(B
-$B$r2r$+$l!"(BDDP $B%Q%1%C%H$H$7$F%@%s%W$5$l$^$9(B($BA4$F$N(B UDP $B%X%C%@>pJs$OGK4~(B
+$B$r2r$+$l!"(BDDP $B%Q%1%C%H$H$7$F%@%s%W$5$l$^$9(B ($BA4$F$N(B UDP $B%X%C%@>pJs$OGK4~(B
 $B$5$l$^$9(B)$B!#(B
 $B%U%!%$%k(B
 .I /etc/atalk.names
@@ -1089,7 +1090,7 @@
 .fi
 .RE
 $B:G=i$N(B 2 $B9T$O!"(BAppletalk $B%M%C%H%o!<%/L>$r7h$a$F$$$^$9!#(B3 $B9T$a$O!"(B
-$BFCDj$N%[%9%H$NL>A0$r7h$a$F$$$^$9(B($B%[%9%H$O!"(B3 $B%*%/%F%C%HL\$NM-L5$G(B
+$BFCDj$N%[%9%H$NL>A0$r7h$a$F$$$^$9(B ($B%[%9%H$O!"(B3 $B%*%/%F%C%HL\$NM-L5$G(B
 $B%M%C%H%o!<%/$H6hJL$5$l$^$9!#%M%C%H%o!<%/HV9f$O!"(B2 $B%*%/%F%C%H$N?t;z(B
 $B$+$i!"%[%9%HHV9f$O(B 3 $B%*%/%F%C%H$N?t;z$+$i9=@.$5$l$kI,MW$,$"$j$^$9!#(B)
 $B?t;z$HL>A0$O!"6uGrJ8;z$b$7$/$O%?%VJ8;z$G6h@Z$i$l$^$9!#$3$N(B
@@ -1114,20 +1115,20 @@
 $B$,$J$$$+!"$3$N%U%!%$%k$NCf$K%[%9%HHV9f5Z$S%M%C%H%o!<%/HV9f$N%(%s%H%j$,(B
 $BB8:_$7$J$$>l9g$K$O!"%"%I%l%9$O?t;z$GI=<($5$l$^$9!#(B)
 $B:G=i$NNc$O!"%M%C%H%o!<%/(B 144.1 $B$NCf$N%N!<%I(B 209
-$B$N(B NBP(DDP port 2) $B$,!"%M%C%H%o!<%/(B icsd $B$N%N!<%I(B 112 $B$N%[%9%H$N(B
+$B$N(B NBP (DDP port 2) $B$,!"%M%C%H%o!<%/(B icsd $B$N%N!<%I(B 112 $B$N%[%9%H$N(B
 $B%]!<%H(B 220 $B$r3+$$$F$$$k2?<T$+$K%G!<%?$rAw?.$7$F$$$^$9!#(B
 $B<!$N9T$O!"(B1 $B9T$a$H$[$\F1$8Nc$G$9$,!"Aw?.85$N%N!<%IL>$,4{CN$G$"$k(B
 (`office') $B$H$3$m$,0[$J$j$^$9!#(B
 3 $B9TL\$NNc$O!"%M%C%H%o!<%/(B jssmag $B$N%N!<%I(B 149 $B$N%]!<%H(B 235 $B$+$i!"(Bicsd-net $B$N(B
 NBP $B%]!<%H$K%V%m!<%I%-%c%9%H$G%G!<%?Aw?.$r$7$F$$$^$9(B
-($B%V%m!<%I%-%c%9%H%"%I%l%9(B(255)$B$O!"%[%9%HHV9f$J$7$G%M%C%H%o!<%/HV9f$N$_(B
+($B%V%m!<%I%-%c%9%H%"%I%l%9(B (255) $B$O!"%[%9%HHV9f$J$7$G%M%C%H%o!<%/HV9f$N$_(B
 $B$,I=<($5$l$F$$$k$H$3$m$G$o$+$j$^$9!#$3$N$3$H$+$i!"(B/etc/atalk.names $B$G$O(B
 $B%N!<%IL>$H%M%C%H%o!<%/L>$r6hJL$9$kJ}$,$h$$$3$H$,J,$+$j$^$9(B)$B!#(B
 .LP
 NBP (name binding protocol) $B$*$h$S(B ATP (Appletalk transaction protocol)
 $B%Q%1%C%H$G$O!"$=$NFbMF$O2r<a$5$l$^$9!#(B
-$BB>$N%W%m%H%3%k$O!"%W%m%H%3%kL>(B($B$b$7$/$O!"%W%m%H%3%k$,EPO?$5$l$F$$$J$$>l(B
-$B9g$K$O!"%W%m%H%3%kHV9f(B)$B$*$h$S%Q%1%C%H%5%$%:$r%@%s%W$7$^$9!#(B
+$BB>$N%W%m%H%3%k$O!"%W%m%H%3%kL>(B ($B$b$7$/$O!"%W%m%H%3%k$,EPO?$5$l$F$$$J$$>l(B
+$B9g$K$O!"%W%m%H%3%kHV9f(B) $B$*$h$S%Q%1%C%H%5%$%:$r%@%s%W$7$^$9!#(B
 
 \fBNBP $B%Q%1%C%H(B\fP $B$O!"0J2<$N$h$&$J7A<0$GI=<($5$l$^$9!#(B
 .RS
@@ -1142,8 +1143,8 @@
 $B:G=i$N9T$O!"%l!<%6%i%$%?$NL>A08!:wMW5a$G$"$j!"%M%C%H%o!<%/(B icsd $B$N%[%9%H(B
 112 $B$+$iAw$i$l!"%M%C%H%o!<%/(B jssmag $B$X$H%V%m!<%I%-%c%9%H$5$l$F$$$^$9!#(B
 $B8!:w$N$?$a$N(B nbp $B$N(B ID $B$O(B 190 $B$G$9!#(B
-$B<!$N9T$O(B jssmag.209 $B$+$i$N!"$3$NMW5a$N1~Ez(B($BF1$8(B ID $B$r;}$D$3$H$KCm0U$7$F2<$5(B
-$B$$(B)$B$G!"(B $B%]!<%H(B 250 $B$KEPO?$5$l$?(B RM1140 $B$H$$$&L>A0$N%l!<%6%i%$%?$,$"$k$HEz(B
+$B<!$N9T$O(B jssmag.209 $B$+$i$N!"$3$NMW5a$N1~Ez(B ($BF1$8(B ID $B$r;}$D$3$H$KCm0U$7$F2<$5(B
+$B$$(B) $B$G!"(B $B%]!<%H(B 250 $B$KEPO?$5$l$?(B RM1140 $B$H$$$&L>A0$N%l!<%6%i%$%?$,$"$k$HEz(B
 $B$($F$$$^$9!#(B
 3 $B9T$a$O!"F1$8MW5a$KBP$9$kB>$N%[%9%H$+$i$N1~Ez$G!"(B
 $B%[%9%H(B techpit $B$,!"%]!<%H(B 186 $B$KEPO?$5$l$?%l!<%6%i%$%?(B "techpit" $B$r;}$C$F$$(B
@@ -1176,13 +1177,13 @@
 .LP
 helios $B$O!"(B8 $B$D$N(B 512 $B%P%$%H$N%Q%1%C%H$G1~Ez$7$F$$$^$9!#%H%i%s%6%/%7%g%s(B ID
 $B$N8e$K$D$E$/(B`:$B?t(B'$B$O!"%Q%1%C%H%7!<%1%s%9HV9f$r!"3g8LCf$N?tCM$O(B ATP $B%X%C%@(B
-$B$r=|$$$?%Q%1%C%HCf$N%G!<%?NL$r<($7$F$^$9!#%Q%1%C%H%7!<%1%s%9(B 7 $B$N$H$3$m(B
-$B$N(B `*' $B$O!"(BEOM $B%S%C%H$,@_Dj$5$l$F$$$k$3$H$r<($7$F$^$9!#(B
+$B$r=|$$$?%Q%1%C%HCf$N%G!<%?NL$r<($7$F$$$^$9!#%Q%1%C%H%7!<%1%s%9(B 7 $B$N$H$3$m(B
+$B$N(B `*' $B$O!"(BEOM $B%S%C%H$,@_Dj$5$l$F$$$k$3$H$r<($7$F$$$^$9!#(B
 .LP
-jssmag.209 $B$O!"%Q%1%C%H%7!<%1%s%9HV9f(B 3 $B$H(B 5 $B$N%Q%1%C%H$N:FAwMW5a$r$7$F$^$9!#(B
+jssmag.209 $B$O!"%Q%1%C%H%7!<%1%s%9HV9f(B 3 $B$H(B 5 $B$N%Q%1%C%H$N:FAwMW5a$r$7$F$$$^$9!#(B
 helios $B$O$=$l$i$r:FAw$7!"$=$N8e(B jssmag.209 $B$O%H%i%s%6%/%7%g%s$r2rJ|$7$^$9!#(B
 $B:G8e$N9T$G!"(Bjssmag.209 $B$O<!$NMW5a$r3+;O$7$^$9!#$3$NMW5a$NI=<((B
-$B$GIU2C$5$l$F$$$k(B `*' $B$O!"(BXO(`exactly once') $B$,@_Dj$5$l$F$$$J$$$3$H$r<($7$^$9!#(B
+$B$GIU2C$5$l$F$$$k(B `*' $B$O!"(BXO (`exactly once') $B$,@_Dj$5$l$F$$$J$$$3$H$r<($7$^$9!#(B
 
 .HD
 IP $B%U%i%0%a%s%F!<%7%g%s(B
@@ -1197,7 +1198,7 @@
 .fi
 .RE
 ($B:G=i$N7A<0$G$O!"$^$@%U%i%0%a%s%H$,$"$k$3$H$r<($7!"(B2 $BHV$a$N7A<0$O!"(B
-$B$3$l$,:G8e$N%U%i%0%a%s%H$G$"$k$3$H$r<($7$F$^$9!#(B)
+$B$3$l$,:G8e$N%U%i%0%a%s%H$G$"$k$3$H$r<($7$F$$$^$9!#(B)
 .LP
 \fIId\fP $B$O!"%U%i%0%a%s%H(B ID $B$G$9!#(B\fIsize\fP $B$O!"%U%i%0%a%s%H%5%$%:$r(B
 $B%P%$%HC10L$G$"$i$o$7$?$b$N$G$9!#$?$@$7(B IP $B%X%C%@%5%$%:$O4^$_$^$;$s!#(B
@@ -1227,7 +1228,7 @@
 $BHV9f$rCN$k=Q$,$J$$$+$i$G$9!#(B
 $B<!$K!":G=i$N9T$N(B TCP $B%7!<%1%s%9>pJs$O!"%Q%1%C%H$,(B 308 $B%P%$%H$N%f!<%6%G!<%?(B
 $B$r;}$C$F$k$+$N$h$&$KI=<($5$l$^$9$,!"<B:]$K$O(B 512 $B%P%$%H$N%f!<%6%G!<%?$r(B
-$B;}$C$F$^$9(B(308 $B%P%$%H$,:G=i$N%U%i%0J,$G!"(B204 $B%P%$%H$,(B 2 $BHVL\$N%U%i%0J,$G(B
+$B;}$C$F$$$^$9(B (308 $B%P%$%H$,:G=i$N%U%i%0J,$G!"(B204 $B%P%$%H$,(B 2 $BHVL\$N%U%i%0J,$G(B
 $B$9(B)$B!#%7!<%1%s%9%9%Z!<%9$N7j$r$5$,$7$?$j!"%Q%1%C%H$N(B ack $B$NBP1~$,@5$7$$(B
 $B$+$r$3$N%G!<%?$G8+$h$&$H$7$F$O$$$1$^$;$s!#(B
 .LP
@@ -1268,7 +1269,7 @@
 $B$$%G!<%?%5%$%:$r7W;;$9$k$h$&$K@_7W$7$J$*$9I,MW$,$"$j$^$9!#(B
 .LP
 $B%M!<%`%5!<%P$K$D$$$F$N5U0z$-$K$D$$$F$O!"@5$7$/%@%s%W$5$l$^$;$s!#(B
-$B<B:]$NMW5a$G$O$J$/!"(B(empty)$B%/%(%9%A%g%s%;%/%7%g%s$,!"(B
+$B<B:]$NMW5a$G$O$J$/!"(B(empty) $B%/%(%9%A%g%s%;%/%7%g%s$,!"(B
 $B%"%s%5!<%;%/%7%g%s$K=PNO$5$l$^$9!#(B
 $B5U0z$-$K$D$$$F$O$=$l<+BN$,%P%0$G$"$k$H?.$8!"(Btcpdump $B$G$O$J$/5U0z$-$rMW5a$9$k(B
 $B%W%m%0%i%`$r=$@5$9$k$Y$-$H9M$($k?MC#$b$$$^$9!#(B
@@ -1276,12 +1277,12 @@
 Apple Ethertalk DDP $B%Q%1%C%H$O!"(BKIP DDP $B%Q%1%C%H$HF1MM$K4JC1$K%@%s%W=PMh(B
 $B$k$h$&$K$7$?$$$N$G$9$,!"<B:]$O$=$&$G$O$"$j$^$;$s!#(B
 $B$b$72f!9$,!"(BEthertalk $B$NMxMQ$r>)$a$k$?$a$K2?$+$d$m$&$H$$$&5$$K$J$C$?$H$7(B
-$B$F$b(B($B$=$&$G$O$J$$$N$G$9$,(B)$B!"(BLBL(Lawrence Berkeley Laboratory) $B$N$I$N(B
+$B$F$b(B ($B$=$&$G$O$J$$$N$G$9$,(B)$B!"(BLBL (Lawrence Berkeley Laboratory) $B$N$I$N(B
 $B%M%C%H%o!<%/>e$K$b(B Ethertalk $B$rDL$9$3$H$O5v$5$l$F$$$^$;$s$+$i!"$=$N%3!<%I(B
 $B$N;n83$O=PMh$^$;$s!#(B
 .LP
 $B2F;~4V$H$NJQ99$N;~$K%Q%1%C%H%H%l!<%9$r9T$&$H!"%?%$%`%9%?%s%W$OJQ998e$N(B
-$B;~9o$H$O$:$l$F$7$^$$$^$9(B($B;~4VJQ2=$OL5;k$5$l$^$9(B)$B!#(B
+$B;~9o$H$O$:$l$F$7$^$$$^$9(B ($B;~4VJQ2=$OL5;k$5$l$^$9(B)$B!#(B
 .LP
 FDDI $B%X%C%@$rA`:n$9$k$h$&$J%U%#%k%?$NI=8=$K$*$$$F$O!"A4$F$N(B 
 FDDI $B%Q%1%C%H$O%+%W%;%k2=$5$l$?(B Ethernet $B%Q%1%C%H$G$"$k$H2>Dj$7$^$9!#(B
Index: man1/telnet.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/telnet.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 telnet.1
--- man1/telnet.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/telnet.1	2000/05/30 03:11:25
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\" %FreeBSD: src/usr.bin/telnet/telnet.1,v 1.14 1999/08/28 01:06:23 peter Exp %
+.\" %FreeBSD: src/usr.bin/telnet/telnet.1,v 1.15 2000/01/27 09:28:33 shin Exp %
 .\"
 .\" jpman %Id: telnet.1,v 1.2 1997/05/23 00:55:09 mutoh Stab %
 .\"
-.Dd March 1, 1994
+.Dd January 27, 2000
 .Dt TELNET 1
 .Os BSD 4.2
 .Sh $BL>>N(B
@@ -449,7 +449,7 @@
 $B%*%W%7%g%s$r%j%b!<%H%[%9%H$KAw?.$7$^$9!#(B
 $BK\%3%^%s%I$O!"(B
 .Ic close
-$B$H;w$F$^$9$,!"%j%b!<%H%[%9%H$,(B
+$B$H;w$F$$$^$9$,!"%j%b!<%H%[%9%H$,(B
 .Dv LOGOUT
 $B%*%W%7%g%s$r%5%]!<%H$7$F$$$J$$>l9g$K$O!"2?$b5/$-$^$;$s!#(B
 $B$7$+$7$J$,$i!"%j%b!<%H%[%9%H$,(B
@@ -532,7 +532,9 @@
 $B$r;2>H$7$F2<$5$$(B) $B$b$7$/$O!"(B
 $B%I%C%HI=5-$N(BIP$B%"%I%l%9(B (
 .Xr inet 3
-$B$r;2>H$7$F2<$5$$(B) $B$G;XDj$7$^$9!#(B
+$B$r;2>H$7$F2<$5$$(B) $B$b$7$/$O!"(B
+IPv6 $B%[%9%HL>$b$7$/$O%3%m%sIU$-(B 16 $B?J5-K!$N(B IPv6 $B%"%I%l%9(B
+$B$G;XDj$7$^$9!#(B
 .Fl l
 $B%*%W%7%g%s$O(B
 .Ev ENVIRON
@@ -1319,6 +1321,8 @@
 $B%3%^%s%I$O!"(B
 .Bx 4.2
 $B$G$O$8$a$F<BAu$5$l$^$7$?!#(B
+.Pp
+IPv6 $B%5%]!<%H$O(B WIDE/KAME $B%W%m%8%'%/%H$,DI2C$7$^$7$?!#(B
 .Sh $BCm0U(B
 $B%j%b!<%H%7%9%F%`$NCf$K$O!"(B\*(Lqold line by line\*(Rq $B%b!<%I$G(B
 $B<jF0$G%(%3!<%P%C%/$r@Z$jBX$($J$1$l$P$J$i$J$$>l9g$,$"$j$^$9!#(B
Index: man1/test.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/test.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 test.1
--- man1/test.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/test.1	2000/05/30 03:11:27
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" %FreeBSD: src/bin/test/test.1,v 1.10 1999/08/27 23:15:48 peter Exp %
+.\" %FreeBSD: src/bin/test/test.1,v 1.11 2000/03/01 10:43:09 sheldonh Exp %
 .\"
 .\" jpman %Id: test.1,v 1.2 1997/03/31 03:43:49 ryo2 Stab %
 .\"
Index: man1/tip.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/tip.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tip.1
--- man1/tip.1	2000/02/15 14:34:56	1.1.1.1
+++ man1/tip.1	2000/05/30 03:11:32
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.6 1999/08/28 01:06:35 peter Exp %
+.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.7 2000/03/01 12:20:21 sheldonh Exp %
 .\" jpman %Id: tip.1,v 1.3 1997/07/26 21:48:01 horikawa Stab %
 .\"
 .Dd April 18, 1994
Index: man1/uuencode.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/uuencode.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 uuencode.1
--- man1/uuencode.1	2000/02/15 14:34:57	1.1.1.1
+++ man1/uuencode.1	2000/05/30 03:11:32
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.8 1999/08/28 01:07:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.9 2000/03/01 12:20:12 sheldonh Exp %
 .\" jpman %Id: uuencode.1,v 1.2 1997/03/29 11:57:08 horikawa Stab %
 .\"
 .Dd June 6, 1993
Index: man1/vacation.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/vacation.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vacation.1
--- man1/vacation.1	2000/02/15 14:34:57	1.1.1.1
+++ man1/vacation.1	2000/05/30 03:11:34
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\" %FreeBSD: src/usr.bin/vacation/vacation.1,v 1.9 1999/08/28 01:07:19 peter Exp %
+.\" %FreeBSD: src/usr.bin/vacation/vacation.1,v 1.10 2000/03/01 12:20:14 sheldonh Exp %
 .\"
 .\" jpman %Id: vacation.1,v 1.3 1997/08/19 03:07:07 h-nokubi Stab %
 .\"
Index: man1/vidcontrol.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/vidcontrol.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vidcontrol.1
--- man1/vidcontrol.1	2000/02/15 14:34:57	1.1.1.1
+++ man1/vidcontrol.1	2000/05/30 03:11:36
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.22 1999/10/30 14:25:55 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.24 2000/03/01 14:07:45 sheldonh Exp %
 .\"
 .\" jpman %Id: vidcontrol.1,v 1.3 1997/08/04 01:31:25 mitchy Stab %
 .Dd June 30, 1999
@@ -30,6 +30,7 @@
 .Op Fl i Cm adapter | mode
 .Op Fl l Ar screen_map
 .Op Fl L
+.Op Fl M Ar char
 .Op Fl m Cm on | off
 .Op Fl r Ar foreground Ar background
 .Op Fl s Ar number
@@ -127,6 +128,10 @@
 $B8=:_$N%S%G%*%"%@%W%?$K4X$9$k>pJs$rI=<($7$^$9!#(B
 .It Fl i Cm mode
 $B8=:_$N%S%G%*%O!<%I%&%'%"$K$F;HMQ2DG=$J%S%G%*%b!<%I$rI=<($7$^$9!#(B
+.It Fl M Ar char
+$B%^%&%9%]%$%s%?$rIA$/4pK\$H$J$kJ8;z$r(B
+.Ar char
+$B$K$7$^$9!#(B
 .It Fl m Cm on | off
 $B%^%&%9%]%$%s%?$r(B
 .Cm on
Index: man1/vt220keys.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/vt220keys.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vt220keys.1
--- man1/vt220keys.1	2000/02/15 14:34:57	1.1.1.1
+++ man1/vt220keys.1	2000/05/30 03:11:38
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.6 1999/08/28 23:20:50 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.7 2000/03/01 14:08:59 sheldonh Exp %
 .\"
 .TH VT220KEYS 1 
 .\" jpman %Id: vt220keys.1,v 1.3 1997/07/22 18:00:12 horikawa Stab %
Index: man1/whois.1
===================================================================
RCS file: /home/cvs/man-jp/man/man1/whois.1,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 whois.1
--- man1/whois.1	2000/02/15 14:34:57	1.1.1.1
+++ man1/whois.1	2000/05/30 03:11:38
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.13 1999/12/31 12:20:17 ru Exp %
+.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.15 2000/03/02 22:51:17 obrien Exp %
 .\"
 .\" jpman %Id: whois.1,v 1.3 1997/06/14 04:30:33 kubo Stab %
 .Dd November 17, 1999
@@ -61,6 +61,10 @@
 $B$*$h$S(B
 .Tn RIPE
 $B0J30$,%+%P!<$9$kA4@$3&$N(B IP $BHV9f$,$"$j$^$9!#(B
+$BO"Mm@h(B ($B%O%s%I%k(B) $B>pJs$O!"(BNIC $B%O%s%I%k$N8e$K(B "-ARIN" $B$rIU$1$F8!:w$7$^$9(B:
+.Pp
+.D1 Ic $ whois -a foo3-ARIN
+.Pp
 .It Fl d
 US Department of Defense
 $B%G!<%?%Y!<%9$r;HMQ$7$^$9!#(B
@@ -100,6 +104,10 @@
 .Pq Tn whois.internic.net
 $B$O4{$K(B Network Solutions, Inc. $B$N<h$j07$$$G$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
 $B>\:Y$O(B http://www.internic.net/ $B$r;2>H$7$F$/$@$5$$!#(B
+$BO"Mm@h(B ($B%O%s%I%k(B) $B>pJs$O!"(BNIC $B%O%s%I%k$NA0$K(B "handle " $B$rIU$1$F8!:w$7$^$9(B:
+.Pp
+.D1 Ic $ whois -i 'handle foo3'
+.Pp
 .It Fl m
 Route Arbiter Database
 .Pq Tn RADB

----Next_Part(Mon_May_29_23:25:06_2000_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=diff_4.0_RELEASE_1

diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/biff.1 man1/biff.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/biff.1	Thu Jan 27 23:35:46 2000
+++ man1/biff.1	Tue Mar 21 06:31:10 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/biff/biff.1,v 1.7 1999/09/01 20:25:44 hoek Exp $
+.\" $FreeBSD: src/usr.bin/biff/biff.1,v 1.8 2000/03/01 12:19:32 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
@@ -85,5 +85,6 @@
 .Nm
 command appeared in 
 .Bx 4.0 .
-It was named after the dog of Heidi Stettner. He died
+It was named after the dog of Heidi Stettner.
+He died
 in August 1993, at 15.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/builtin.1 man1/builtin.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/builtin.1	Thu Jan 27 23:34:51 2000
+++ man1/builtin.1	Tue Mar 21 06:30:39 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.3 1999/12/20 16:29:56 sheldonh Exp $
+.\"	$FreeBSD: src/share/man/man1/builtin.1,v 1.5 2000/03/03 09:28:05 sheldonh Exp $
 .\"
 .Dd September 1, 1999
 .Dt BUILTIN 1
@@ -83,6 +83,7 @@
 .Nm printf ,
 .Nm pushd ,
 .Nm pwd ,
+.Nm read ,
 .Nm readonly ,
 .Nm rehash ,
 .Nm repeat ,
@@ -211,6 +212,7 @@
 .It Ic printf Ta Yes Ta Yes Ta Yes
 .It Ic pushd Ta \&No Ta Yes Ta \&No
 .It Ic pwd Ta Yes Ta \&No Ta Yes
+.It Ic read Ta \&No Ta \&No Ta Yes
 .It Ic readonly Ta \&No Ta \&No Ta Yes
 .It Ic rehash Ta \&No Ta Yes Ta \&No
 .It Ic repeat Ta \&No Ta Yes Ta \&No
@@ -254,7 +256,7 @@
 The
 .Nm
 manual page first appeared in
-.Fx 4.0 .
+.Fx 3.4 .
 .Sh AUTHORS
 This manual page was written by
 .An Sheldon Hearn Aq sheldonh@FreeBSD.org .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/calendar.1 man1/calendar.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/calendar.1	Thu Jan 27 23:35:46 2000
+++ man1/calendar.1	Tue Mar 21 06:31:11 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
-.\" $FreeBSD: src/usr.bin/calendar/calendar.1,v 1.15 1999/08/28 00:59:17 peter Exp $
+.\" $FreeBSD: src/usr.bin/calendar/calendar.1,v 1.16 2000/03/01 12:19:34 sheldonh Exp $
 .\"
 .Dd June 29, 1993
 .Dt CALENDAR 1
@@ -86,7 +86,8 @@
 .Pp
 To handle calendars in your national code table you can specify
 .Dq LANG=<locale_name>
-in the calendar file as early as possible. To handle national Easter
+in the calendar file as early as possible.
+To handle national Easter
 names in the calendars
 .Dq Easter=<national_name>
 (for Catholic Easter) or
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/cdcontrol.1 man1/cdcontrol.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/cdcontrol.1	Thu Jan 27 23:37:13 2000
+++ man1/cdcontrol.1	Tue Mar 21 06:31:55 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.19 1999/08/28 01:15:43 peter Exp $
+.\" $FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.21 2000/03/02 14:53:34 sheldonh Exp $
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
@@ -13,7 +13,8 @@
 .Op Ar command ...
 .Sh DESCRIPTION
 .Nm Cdcontrol
-is a program to control audio features of a CD drive. The device is a name such
+is a program to control audio features of a CD drive.
+The device is a name such
 as
 .Pa cd0
 or
@@ -50,7 +51,8 @@
 .Pp
 The available commands are listed below.  Only as many
 characters as are required to uniquely identify a command
-need be specified. Word
+need be specified.
+Word
 .Em play
 can be omitted.
 .Bl -tag -width Cm
@@ -77,7 +79,8 @@
 .Ar end_s ,
 in seconds and 
 .Ar end_f
-(frame number). Minutes are in the range 0-99. Seconds are in the range 0-59.
+(frame number). Minutes are in the range 0-99.
+Seconds are in the range 0-59.
 Frame numbers are in the range 0-74.
 
 .It Cm play Op Ar #start_block Op length
@@ -88,10 +91,12 @@
 logical blocks.
 
 .It Cm pause
-Stop playing. Do not stop the disc.
+Stop playing.
+Do not stop the disc.
 
 .It Cm resume
-Resume playing. Used after the 
+Resume playing.
+Used after the 
 .Em pause
 command.
 
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/chgrp.1 man1/chgrp.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/chgrp.1	Thu Jan 27 23:37:13 2000
+++ man1/chgrp.1	Tue Mar 21 06:31:55 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.8 1999/11/27 19:25:07 obrien Exp $
+.\" $FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.9 2000/03/08 16:31:41 obrien Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHGRP 1
@@ -43,13 +43,11 @@
 .Nd change group
 .Sh SYNOPSIS
 .Nm chgrp
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl f
-.Op Fl h
-.Op Fl v
 .Ar group
 .Ar
 .Sh DESCRIPTION
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/chmod.1 man1/chmod.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/chmod.1	Thu Jan 27 23:30:26 2000
+++ man1/chmod.1	Tue Mar 21 06:28:18 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.16 1999/11/27 19:25:08 obrien Exp $
+.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.17 2000/02/17 03:17:03 unfurl Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -65,7 +65,8 @@
 If the
 .Fl R
 option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
+(Symbolic links encountered in the tree traversal are not followed by
+default.)
 .It Fl L
 If the
 .Fl R
@@ -81,11 +82,11 @@
 Do not display a diagnostic message if
 .Nm
 could not modify the mode for
+.Va file .
 .It Fl v
 Cause
 .Nm
 to be verbose, showing files as the mode is modified.
-.Va file .
 .El
 .Pp
 Symbolic links do not have modes, so unless the
@@ -171,9 +172,8 @@
 The symbolic mode is described by the following grammar:
 .Bd -literal -offset indent
 mode         ::= clause [, clause ...]
-clause       ::= [who ...] [action ...] last_action
+clause       ::= [who ...] [action ...] action
 action       ::= op [perm ...]
-last_action  ::= op [perm ...]
 who          ::= a | u | g | o
 op           ::= + | \- | =
 perm         ::= r | s | t | w | x | X | u | g | o
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/chpass.1 man1/chpass.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/chpass.1	Thu Jan 27 23:35:48 2000
+++ man1/chpass.1	Tue Mar 21 06:31:12 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.21 1999/12/17 14:43:33 phantom Exp $
+.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.23 2000/03/02 14:53:28 sheldonh Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -89,7 +89,8 @@
 .Xr crypt 3 ,
 as an argument.
 .It Fl e Ar expiretime
-Change the account expire time. This option is used to set the expire time
+Change the account expire time.
+This option is used to set the expire time
 from a script as if it was done in the interactive editor.
 .It Fl s Ar newshell
 Attempt to change the user's shell to
@@ -259,7 +260,8 @@
 can only make changes to the NIS passwd maps through
 .Xr rpc.yppasswdd 8 ,
 which normally only permits changes to a user's password, shell and GECOS
-fields. Except when invoked by the super-user on the NIS master server,
+fields.
+Except when invoked by the super-user on the NIS master server,
 .Nm
 (and, similarly,
 .Xr passwd 1 )
@@ -270,7 +272,8 @@
 Furthermore,
 .Xr rpc.yppasswdd 8
 requires password authentication before it will make any
-changes. The only user allowed to submit changes without supplying
+changes.
+The only user allowed to submit changes without supplying
 a password is the super-user on the NIS master server; all other users,
 including those with root privileges on NIS clients (and NIS slave
 servers) must enter a password.
@@ -308,11 +311,13 @@
 .Em "Password authentication is required" .
 .Nm Chpass
 will prompt for the user's NIS password before effecting
-any changes. If the password is invalid, all changes will be
+any changes.
+If the password is invalid, all changes will be
 discarded.
 .Pp
 Exception: the super-user on the NIS master server is allowed to
-submit changes without supplying a password. (The super-user may
+submit changes without supplying a password.
+(The super-user may
 choose to turn off this feature using the
 .Fl o
 flag, described below.)
@@ -345,7 +350,8 @@
 .Xr passwd 1
 or
 .Xr yppasswd 1
-to change their NIS passwords. The super-user is allowed to specify
+to change their NIS passwords.
+The super-user is allowed to specify
 a new password (even though the
 .Dq Password:
 field does not show
@@ -381,20 +387,24 @@
 .Nm Chpass
 uses the system domain name by default, as set by the
 .Xr domainname 1
-command. The
+command.
+The
 .Fl d
 option can be used to override a default, or to specify a domain
 when the system domain name is not set.
 .It Fl h Ar host
-Specify the name or address of an NIS server to query. Normally,
+Specify the name or address of an NIS server to query.
+Normally,
 .Nm
 will communicate with the NIS master host specified in the
 .Pa master.passwd
 or
 .Pa passwd
-maps. On hosts that have not been configured as NIS clients, there is
+maps.
+On hosts that have not been configured as NIS clients, there is
 no way for the program to determine this information unless the user
-provides the hostname of a server. Note that the specified hostname need
+provides the hostname of a server.
+Note that the specified hostname need
 not be that of the NIS master server; the name of any server, master or
 slave, in a given NIS domain will do.
 .Pp
@@ -422,7 +432,8 @@
 .Fl o
 flag can be used to force
 .Nm
-to use the standard update mechanism instead. This option is provided
+to use the standard update mechanism instead.
+This option is provided
 mainly for testing purposes.
 .El
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/colldef.1 man1/colldef.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/colldef.1	Thu Jan 27 23:35:50 2000
+++ man1/colldef.1	Tue Mar 21 06:31:12 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/colldef/colldef.1,v 1.7 1999/08/28 00:59:44 peter Exp $
+.\" $FreeBSD: src/usr.bin/colldef/colldef.1,v 1.8 2000/03/01 12:19:36 sheldonh Exp $
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
@@ -43,12 +43,14 @@
 .Fn strxfrm
 and
 .Fn strcoll
-functions. It is used to define the many ways in which
+functions.
+It is used to define the many ways in which
 strings can be ordered and collated.
 .Fn strxfrm
 transforms
 its first argument and places the result in its second
-argument. The transformed string is such that it can be
+argument.
+The transformed string is such that it can be
 correctly ordered with other transformed strings by using
 .Fn strcmp ,
 .Fn strncmp ,
@@ -89,18 +91,21 @@
 .Pp
 Of these, only the
 .Ar order
-statement is required. When
+statement is required.
+When
 .Ar charmap
 or
 .Ar substitute
 is
-supplied, these statements must be ordered as above. Any
+supplied, these statements must be ordered as above.
+Any
 statements after the order statement are ignored.
 .Pp
 Lines in the specification file beginning with a
 .Ar #
 are
-treated as comments and are ignored. Blank lines are also
+treated as comments and are ignored.
+Blank lines are also
 ignored.
 .Pp
 .Ar charmap charmapfile
@@ -112,7 +117,8 @@
 .Pp
 The format of
 .Ar charmapfile
-is shown below. Symbol
+is shown below.
+Symbol
 names are separated from their values by TAB or
 SPACE characters. symbol-value can be specified in
 a hexadecimal (\ex\fI??\fR) or octal (\e\fI???\fR)
@@ -150,7 +156,8 @@
 .Pp
 .Ar order_list
 is a list of symbols, separated by semi colons, that defines the
-collating sequence. The
+collating sequence.
+The
 special symbol
 .Ar ...
 specifies, in a short-hand
@@ -230,7 +237,8 @@
 .Pp
 The backslash character
 .Ar \e
-is used for continuation. In this case, no characters are permitted
+is used for continuation.
+In this case, no characters are permitted
 after the backslash character.
 .Sh EXIT STATUS
 .Nm Colldef
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/crunchgen.1 man1/crunchgen.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/crunchgen.1	Thu Jan 27 23:37:16 2000
+++ man1/crunchgen.1	Tue Mar 21 06:32:00 2000
@@ -22,7 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
-.\" $FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.9 1999/08/28 01:15:55 peter Exp $
+.\" $FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.11 2000/03/01 14:08:47 sheldonh Exp $
 .\"
 .Dd September 29, 1997
 .Dt CRUNCHGEN 1
@@ -33,6 +33,7 @@
 .Sh SYNOPSIS
 .Nm \&crunchgen
 .Op Fl fql
+.Op Fl h Ar makefile-header-name
 .Op Fl m Ar makefile-name
 .Op Fl c Ar c-file-name
 .Op Fl e Ar exec-file-name
@@ -89,6 +90,14 @@
 Flush cache.  Forces the recalculation of cached parameters.
 .It Fl l
 List names.  Lists the names this binary will respond to.
+.It Fl h Ar makefile-header-name
+Set the name of a file to be included at the beginning of the
+Makefiles generated by
+.Nm crunchgen .
+This is useful to define some make variables such as
+.Ar RELEASE_CRUNCH
+or similar, which might affect the behaviour of make and
+are annoying to pass through environment variables.
 .It Fl m Ar makefile-name
 Set output Makefile name to
 .Ar makefile-name .
@@ -179,6 +188,15 @@
 pathname to each file in the
 .Nm objs
 list.
+.It Nm special Ar progname Nm objvar Ar variable_name
+Sets the name of the Make variable which holds the list of
+object files for program
+.Ar progname .
+This is normally
+.Nm OBJS
+but some Makefiles might like to use other conventions or
+prepend the program's name to the variable, e.g.
+.Nm SSHD_OBJS .
 .It Nm special Ar progname Nm keep Ar symbol-name ...
 Add specified list of symbols to the keep list for program
 .Ar progname .
@@ -186,7 +204,8 @@
 .Fl k
 option for the
 .Xr crunchide 1
-phase. This option is to be used as a last resort as its use can cause a
+phase.
+This option is to be used as a last resort as its use can cause a
 symbol conflict, however in certain instances it may be the only way to
 have a symbol resolve.
 .El
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/csh.1 man1/csh.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/csh.1	Thu Jan 27 23:30:27 2000
+++ man1/csh.1	Tue Mar 21 06:28:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\" $FreeBSD: src/bin/csh/csh.1,v 1.16 1999/09/14 11:46:01 sheldonh Exp $
+.\" $FreeBSD: src/bin/csh/csh.1,v 1.18 2000/02/17 03:40:21 unfurl Exp $
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -59,7 +59,7 @@
 It is used both as an interactive login shell and
 a shell script command processor.
 .Ss Argument list processing
-If the first argument (argument 0) to the shell is
+If the shell is executed with a program name starting with
 .Ql Fl \& ,
 then this is a login shell.
 A login shell also can be specified by invoking the shell with the 
@@ -132,12 +132,11 @@
 .Pa .cshrc
 is executed.
 .It Fl X
-Is to
-.Fl x
-as
-.Fl V
-is to
-.Fl v .
+Cause the
+.Ar echo
+variable to be set even before
+.Pa .cshrc
+is executed.
 .El
 .Pp
 After processing of flag arguments, if arguments remain but none of the
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ctm.1 man1/ctm.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ctm.1	Thu Jan 27 23:37:17 2000
+++ man1/ctm.1	Tue Mar 21 06:32:00 2000
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.16 2000/01/11 07:46:32 kris Exp $
+.\" $FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.17 2000/01/29 21:44:34 chuckr Exp $
 .\"
 .Dd Mar 25, 1995
 .Os
@@ -225,15 +225,12 @@
 .Pp
 .Sh SECURITY
 .Pp
-CTM is an
-.Bf Em 
-INSECURE PROTOCOL
-.Ef
+On its own, CTM is an insecure protocol
 - there is no authentication performed that the
 changes applied to the source code were sent by a
 trusted party, and so care should be taken if the
 CTM deltas are obtained via an unauthenticated
-medium such as email.
+medium such as regular email.
 It is a relatively simple matter for an attacker
 to forge a CTM delta to replace or precede the
 legitimate one and insert malicious code into your
@@ -243,12 +240,20 @@
 delta attempts to touch the same file, at which
 point the MD5 checksum will fail.
 .Pp
-A future version of
-.Fx
-may solve this problem by authenticating CTM
-deltas using cryptographic signatures, but in the
-mean time it is strongly recommended that you
-obtain the CTM deltas via FTP, and not via email.
+To remedy this insecurity, CTM pieces generated by
+freebsd.org are cryptographically signed in a
+format compatible with the GNU Privacy Guard
+utility, available in /usr/ports/security/gpg, and
+the Pretty Good Privacy v5 utility,
+/usr/ports/security/pgp5.
+The relevant public key can be obtained by
+fingering ctm@freebsd.org.
+.Pp
+CTM deltas which are thus signed cannot be
+undetectably altered by an attacker.
+Therefore it is recommended that you make use of
+GPG or PGP5 to verify the signatures if you
+receive your CTM deltas via email.
 .Sh ENVIRONMENT
 .Ev TMPDIR,
 if set to a pathname, will cause ctm to use that pathname
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ctm_rmail.1 man1/ctm_rmail.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ctm_rmail.1	Thu Jan 27 23:37:17 2000
+++ man1/ctm_rmail.1	Tue Mar 21 06:32:00 2000
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.18 2000/01/11 07:46:33 kris Exp $
+.\" $FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.19 2000/01/29 21:44:42 chuckr Exp $
 .\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
@@ -365,15 +365,12 @@
 on the (non-FreeBSD) machine that this example was taken from.
 .Sh SECURITY
 .Pp
-CTM is an
-.Bf Em 
-INSECURE PROTOCOL
-.Ef
+On its own, CTM is an insecure protocol
 - there is no authentication performed that the
 changes applied to the source code were sent by a
 trusted party, and so care should be taken if the
 CTM deltas are obtained via an unauthenticated
-medium such as email.
+medium such as regular email.
 It is a relatively simple matter for an attacker
 to forge a CTM delta to replace or precede the
 legitimate one and insert malicious code into your
@@ -383,12 +380,20 @@
 delta attempts to touch the same file, at which
 point the MD5 checksum will fail.
 .Pp
-A future version of
-.Fx
-may solve this problem by authenticating CTM
-deltas using cryptographic signatures, but in the
-mean time it is strongly recommended that you
-obtain the CTM deltas via FTP, and not via email.
+To remedy this insecurity, CTM delta pieces generated by
+freebsd.org are cryptographically signed in a
+format compatible with the GNU Privacy Guard
+utility, available in /usr/ports/security/gpg, and
+the Pretty Good Privacy v5 utility,
+/usr/ports/security/pgp5.
+The relevant public key can be obtained by
+fingering ctm@freebsd.org.
+.Pp
+CTM deltas which are thus signed cannot be
+undetectably altered by an attacker.
+Therefore it is recommended that you make use of
+GPG or PGP5 to verify the signatures if you
+receive your CTM deltas via email.
 .\" This next request is for sections 1, 6, 7 & 8 only
 .Sh ENVIRONMENT
 If deltas are to be applied then
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/cursor.1 man1/cursor.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/cursor.1	Thu Jan 27 23:38:17 2000
+++ man1/cursor.1	Tue Mar 21 06:32:33 2000
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)cursor.1, 3.20, Last Edit-Date: [Mon Dec 19 20:30:40 1994]
-.\" $FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.5 1999/08/28 01:17:42 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.6 2000/03/01 14:08:51 sheldonh Exp $
 .\"
 .Dd December 19, 1994
 .Dt CURSOR 1
@@ -52,7 +52,8 @@
 .It Fl d
 Specifies a device for which the cursor shape is set.
 .It Fl n
-Sets the virtual screen number to apply the following parameters to. Not
+Sets the virtual screen number to apply the following parameters to.
+Not
 specifying this parameter implies the current virtual screen or the screen
 referenced by the -d parameter.
 .It Fl s
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/cut.1 man1/cut.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/cut.1	Thu Jan 27 23:35:52 2000
+++ man1/cut.1	Tue Mar 21 06:31:13 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/cut/cut.1,v 1.8 1999/08/28 00:59:59 peter Exp $
+.\" $FreeBSD: src/usr.bin/cut/cut.1,v 1.9 2000/03/01 12:19:37 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt CUT 1
@@ -66,7 +66,8 @@
 The items specified by
 .Ar list
 can be in terms of column position or in terms of fields delimited
-by a special character. Column numbering starts from 1.
+by a special character.
+Column numbering starts from 1.
 .Pp
 .Ar list
 is a comma or whitespace separated set of increasing numbers and/or
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/date.1 man1/date.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/date.1	Thu Jan 27 23:30:27 2000
+++ man1/date.1	Tue Mar 21 06:28:19 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.33 2000/01/12 00:29:16 brian Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.34 2000/03/07 20:54:17 sheldonh Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -112,9 +112,14 @@
 .Nm
 from setting the time for other than the current machine.
 .It Fl r
-Print out the date and time in
+Print out the date and time that is
 .Ar seconds
-from the Epoch.
+from the Epoch
+.Po
+00:00:00 UTC, January 1, 1970;
+see
+.Xr time 3
+.Pc .
 .It Fl t
 Set the kernel's value for minutes west of
 .Tn GMT .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/dd.1 man1/dd.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/dd.1	Thu Jan 27 23:30:28 2000
+++ man1/dd.1	Tue Mar 21 06:28:19 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD: src/bin/dd/dd.1,v 1.11 1999/08/27 23:14:03 peter Exp $
+.\" $FreeBSD: src/bin/dd/dd.1,v 1.15 2000/03/01 05:28:45 green Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -96,6 +96,12 @@
 Read input from
 .Ar file
 instead of the standard input.
+.It Cm iseek= Ns Ar n
+Seek on the input file
+.Va n
+blocks.
+This is synonymous with
+.Cm skip= Ns Ar n .
 .It Cm obs= Ns Ar n
 Set the output block size to
 .Va n
@@ -107,10 +113,16 @@
 Any regular output file is truncated unless the
 .Cm notrunc
 conversion value is specified.
-If an initial portion of the output file is skipped (see the
-.Cm seek
+If an initial portion of the output file is seeked past (see the
+.Cm oseek
 operand),
 the output file is truncated at that point.
+.It Cm oseek= Ns Ar n
+Seek on the output file
+.Va n
+blocks.
+This is synonymous with
+.Cm seek= Ns Ar n .
 .It Cm seek= Ns Ar n
 Seek
 .Va n
@@ -282,7 +294,8 @@
 .El
 .El
 .Pp
-Where sizes are specified, a decimal number of bytes is expected.
+Where sizes are specified, a decimal, octal, or hexadecimal number of
+bytes is expected.
 If the number ends with a ``b'', ``k'', ``m'', ``g'',  or ``w'', the
 number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G)
 or the number of bytes in an integer, respectively.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/du.1 man1/du.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/du.1	Thu Jan 27 23:35:53 2000
+++ man1/du.1	Tue Mar 21 06:31:14 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD: src/usr.bin/du/du.1,v 1.13 2000/01/25 17:46:58 mharo Exp $
+.\" $FreeBSD: src/usr.bin/du/du.1,v 1.15 2000/03/02 14:53:29 sheldonh Exp $
 .\"
 .Dd April 1, 1994
 .Dt DU 1
@@ -65,7 +65,8 @@
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl P
-No symbolic links are followed. (default)
+No symbolic links are followed.
+(default)
 .It Fl H
 Symbolic links on the command line are followed, symbolic links in file
 hierarchies are not followed.
@@ -82,7 +83,8 @@
 This option exists solely for conformance with
 .St -xpg4 .
 .It Fl s
-Display an entry for each specified file. (Equivalent to
+Display an entry for each specified file.
+(Equivalent to
 .Fl d
 0 )
 .It Fl d Ar depth
@@ -122,7 +124,8 @@
 .Ev BLOCKSIZE
 is set, and the
 .Fl k
-option is not specified, the block counts will be displayed in 1024-byte blocks. If
+option is not specified, the block counts will be displayed in 1024-byte blocks.
+If
 .Ev BLOCKSIZE
 is not set, and the
 .Fl k
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ed.1 man1/ed.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ed.1	Fri Jan 28 00:23:58 2000
+++ man1/ed.1	Tue Mar 21 07:54:08 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/bin/ed/ed.1,v 1.16 2000/01/10 12:20:30 phantom Exp $
+.\" $FreeBSD: src/bin/ed/ed.1,v 1.17 2000/03/01 10:43:03 sheldonh Exp $
 .Dd May 21, 1993
 .Dt ED 1
 .Os
@@ -116,7 +116,8 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl s
-Suppress diagnostics. This should be used if
+Suppress diagnostics.
+This should be used if
 .Nm Ns 's
 standard input is from a script.
 .It Fl x
@@ -175,7 +176,8 @@
 and is legal wherever it makes sense.
 .Pp
 An address range is two addresses separated either by a comma or
-semi-colon. The value of the first address in a range cannot exceed the
+semi-colon.
+The value of the first address in a range cannot exceed the
 value of the second.  If only one address is given in a range, then
 the second address is set to the given address.  If an
 .Em n Ns -tuple
@@ -453,7 +455,8 @@
 .It (.,.)d
 Delete the addressed lines from the buffer.
 If there is a line after the deleted range, then the current address is set
-to this line. Otherwise the current address is set to the line
+to this line.
+Otherwise the current address is set to the line
 before the deleted range.
 .It e Ar file
 Edit
@@ -588,7 +591,8 @@
 their line numbers.  The current address is set to the last line
 printed.
 .It (.,.)p
-Print the addressed lines. The current address is set to the last line
+Print the addressed lines.
+The current address is set to the last line
 printed.
 .It P
 Toggle the command prompt on and off.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fdformat.1 man1/fdformat.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fdformat.1	Thu Jan 27 23:37:19 2000
+++ man1/fdformat.1	Tue Mar 21 06:32:01 2000
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.16 2000/01/23 12:49:42 asmodai Exp $
+.\" $FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.17 2000/03/01 14:07:39 sheldonh Exp $
 .\"
 .Dd September 16, 1993
 .Os
@@ -76,7 +76,8 @@
 .It Fl f Ar capacity
 The normal way to specify the desired formatting parameters.
 .Ar Capacity
-is the number of kilobytes to format. Valid choices are 360, 720, 800, 820,
+is the number of kilobytes to format.
+Valid choices are 360, 720, 800, 820,
 1200, 1440, 1480 or 1720.
 .It Fl n
 Don't verify floppy after formatting.
@@ -106,7 +107,8 @@
 If the
 .Fl q
 flag has not been specified, the user is asked for a confirmation
-of the intended formatting process. In order to continue, an answer
+of the intended formatting process.
+In order to continue, an answer
 of
 .Dq y
 must be given.
@@ -136,7 +138,8 @@
 will finally change to
 .Sq Em E .
 .Pp
-An exit status of 0 is returned upon successful operation. Exit status
+An exit status of 0 is returned upon successful operation.
+Exit status
 1 is returned on any errors during floppy formatting, and an exit status
 of 2 reflects invalid arguments given to the program (along with an
 appropriate information written to diagnostic output).
@@ -149,7 +152,8 @@
 has been developed for 386BSD 0.1
 and upgraded to the new
 .Xr fdc 4
-floppy disk driver. It later became part of the
+floppy disk driver.
+It later became part of the
 .Fx 1.1
 system.
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fdwrite.1 man1/fdwrite.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fdwrite.1	Thu Jan 27 23:37:19 2000
+++ man1/fdwrite.1	Tue Mar 21 06:32:02 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.11 1999/10/17 15:57:16 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.12 2000/03/01 14:07:40 sheldonh Exp $
 .\"
 .\"
 .Dd September 16, 1993
@@ -51,7 +51,8 @@
 R and C, which indicates completion of Input, Zero-fill, Format
 Write, Read and Compare of current track respectively.
 .It Fl y
-Don't ask for presence of a floppy disk in the drive. This non-interactive flag
+Don't ask for presence of a floppy disk in the drive.
+This non-interactive flag
 is useful for shell scripts.
 .It Fl f Ar inputfile
 Input file to read.  If none is given, stdin is assumed.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fetch.1 man1/fetch.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fetch.1	Thu Jan 27 23:35:55 2000
+++ man1/fetch.1	Tue Mar 21 06:31:15 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.32 1999/10/23 15:22:53 green Exp $
+.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.33 2000/03/01 12:19:38 sheldonh Exp $
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 4.0
@@ -27,7 +27,8 @@
 .Tn FTP
 or the
 .Tn HTTP
-protocol. In the first form of the command, the
+protocol.
+In the first form of the command, the
 .Ar URL
 may be of the form 
 .Li http://site.domain/path/to/the/file
@@ -108,7 +109,8 @@
 .Tn FTP
 protocol.  This is useful for crossing certain sorts of firewalls.
 .It Fl q
-Quiet mode. Do not report transfer progress on the terminal.
+Quiet mode.
+Do not report transfer progress on the terminal.
 .It Fl R
 The filenames specified are ``precious'', and should not be deleted
 under any circumstances, even if the transfer failed or was incomplete.
@@ -128,7 +130,8 @@
 from downloading a file that is either incomplete or the wrong version,
 given the correct size of the file in advance.
 .It Fl s
-Ask server for size of file in bytes and print it to stdout. Do not
+Ask server for size of file in bytes and print it to stdout.
+Do not
 actually fetch the file.
 .It Fl T Ar seconds
 Set timeout value to
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/file.1 man1/file.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/file.1	Thu Jan 27 23:35:56 2000
+++ man1/file.1	Tue Mar 21 06:31:15 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/file/file.1,v 1.15 2000/01/23 01:48:10 mpp Exp $
+.\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
@@ -330,7 +330,8 @@
 program, and are not covered by the above restrictions.
 .Sh BUGS
 There must be a better way to automate the construction of the Magic
-file from all the glop in Magdir. What is it?
+file from all the glop in Magdir.
+What is it?
 Better yet, the magic file should be compiled into binary (say,
 .Xr ndbm 3
 or, better yet, fixed-length
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/find.1 man1/find.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/find.1	Thu Jan 27 23:35:56 2000
+++ man1/find.1	Tue Mar 21 06:31:15 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" $FreeBSD: src/usr.bin/find/find.1,v 1.22 1999/12/19 15:43:18 roberto Exp $
+.\" $FreeBSD: src/usr.bin/find/find.1,v 1.23 2000/03/01 10:48:32 nik Exp $
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
@@ -63,7 +63,7 @@
 The
 .Fl H
 option causes the file information and file type (see
-.Xr stat 2)
+.Xr stat 2 )
 returned for each symbolic link specified on the command line to be 
 those of the file referenced by the link, not the link itself.
 If the referenced file does not exist, the file information and type will
@@ -74,7 +74,7 @@
 The
 .Fl L
 option causes the file information and file type (see
-.Xr stat 2)
+.Xr stat 2 )
 returned for each symbolic link to be those of the file referenced by the
 link, not the link itself.
 If the referenced file does not exist, the file information and type will
@@ -83,7 +83,7 @@
 The
 .Fl P
 option causes the file information and file type (see
-.Xr stat 2)
+.Xr stat 2 )
 returned for each symbolic link to be those of the link itself.
 This is the default.
 .It Fl X
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/finger.1 man1/finger.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/finger.1	Thu Jan 27 23:35:57 2000
+++ man1/finger.1	Tue Mar 21 06:31:15 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.8 1999/08/28 01:01:12 peter Exp $
+.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.9 2000/03/01 12:19:40 sheldonh Exp $
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
@@ -55,7 +55,8 @@
 displays the user's login name, real name, terminal name and write
 status (as a ``*'' before the terminal name if write permission is
 denied), idle time, login time, and either office location and office
-phone number, or the remote host. If
+phone number, or the remote host.
+If
 .Fl h
 is given, the remote host is printed (the default).  If
 .Fl o
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fmt.1 man1/fmt.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/fmt.1	Thu Jan 27 23:35:57 2000
+++ man1/fmt.1	Tue Mar 21 06:31:15 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/fmt/fmt.1,v 1.6 1999/08/28 01:01:17 peter Exp $
+.\" $FreeBSD: src/usr.bin/fmt/fmt.1,v 1.7 2000/03/09 09:27:40 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt FMT 1
@@ -40,7 +40,7 @@
 .Nd simple text formatter
 .Sh SYNOPSIS
 .Nm
-.Fl c
+.Op Fl c
 .Oo
 .Ar goal
 .Op Ar maximum
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ftp.1 man1/ftp.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ftp.1	Thu Jan 27 23:35:59 2000
+++ man1/ftp.1	Tue Mar 21 06:31:16 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ftp/ftp.1,v 1.12 1999/08/28 01:01:32 peter Exp $
+.\" $FreeBSD: src/usr.bin/ftp/ftp.1,v 1.15 2000/03/10 14:46:30 sheldonh Exp $
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd August 18, 1997
+.Dd January 27, 2000
 .Dt FTP 1
 .Os BSD 4.2
 .Sh NAME
@@ -61,6 +61,7 @@
 standard File Transfer Protocol.
 The program allows a user to transfer files to and from a
 remote network site.
+The version supports IPv6 (Internet protocol version 6), as well as IPv4.
 .Pp
 The latter three usage formats will fetch a file using either the
 HTTP or FTP protocols into the current directory.
@@ -661,7 +662,7 @@
 and display with the program defined in
 .Ev PAGER 
 (which defaults to
-.Xr less 1 ).
+.Xr more 1 ) .
 .It Ic passive
 Toggle passive mode.  If passive mode is turned on
 (default is off), the ftp client will
@@ -682,7 +683,18 @@
 traffic.
 (Note that though ftp servers are required to support the
 .Dv PASV
-command by RFC 1123, some do not.)
+command by RFC 1123, some do not.
+Please note that if you are connecting to IPv6 ftp server,
+the program will use
+.Dv EPSV/EPRT
+pair and
+.Dv LPSV/LPRT
+pair,
+instead of
+.Dv PASV
+and
+.Dv PORT .
+The meaning is the same.)
 .It Ic preserve
 Toggle preservation of modification times on retrieved files.
 .It Ic progress
@@ -1153,7 +1165,7 @@
 is enabled,
 local file names are expanded
 according to the rules used in the
-.Xr csh  1  ;
+.Xr csh 1 ;
 c.f. the
 .Ic glob
 command.
@@ -1402,6 +1414,8 @@
 preservation were implemented in
 .Nx 1.3
 by Luke Mewburn, with assistance from Jason Thorpe.
+.Pp
+IPv6 support was added by WIDE/KAME Project.
 .Sh BUGS
 Correct execution of many commands depends upon proper behavior
 by the remote server.
@@ -1416,3 +1430,7 @@
 .Bx 4.2
 servers using the ascii type.
 Avoid this problem by using the binary image type.
+.Pp
+Proxying functionalities, such as
+.Ev ftp_proxy ,
+may not work for IPv6 connection.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/gcore.1 man1/gcore.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/gcore.1	Thu Jan 27 23:36:57 2000
+++ man1/gcore.1	Tue Mar 21 06:31:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD: src/usr.bin/gcore/gcore.1,v 1.7 1999/08/28 01:01:38 peter Exp $
+.\" $FreeBSD: src/usr.bin/gcore/gcore.1,v 1.8 2000/03/01 12:19:41 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
@@ -53,7 +53,8 @@
 .Dq Pa core.<pid> .
 The process identifier,
 .Ar pid ,
-must be given on the command line. If no executable image is
+must be given on the command line.
+If no executable image is
 specified,
 .Nm
 will use
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/getopt.1 man1/getopt.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/getopt.1	Thu Jan 27 23:36:00 2000
+++ man1/getopt.1	Tue Mar 21 06:31:17 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/getopt/getopt.1,v 1.9 1999/09/05 05:50:38 phantom Exp $
+.\" $FreeBSD: src/usr.bin/getopt/getopt.1,v 1.10 2000/03/01 12:19:42 sheldonh Exp $
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
@@ -96,7 +96,8 @@
 Written by
 .An Henry Spencer ,
 working from a Bell Labs manual page.
-Behavior believed identical to the Bell version. Example changed in
+Behavior believed identical to the Bell version.
+Example changed in
 .Fx
 version 3.2 and 4.0.
 .Sh BUGS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/gprof.1 man1/gprof.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/gprof.1	Thu Jan 27 23:36:02 2000
+++ man1/gprof.1	Tue Mar 21 06:31:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gprof.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/gprof/gprof.1,v 1.11 1999/08/28 01:01:55 peter Exp $
+.\" $FreeBSD: src/usr.bin/gprof/gprof.1,v 1.12 2000/03/01 12:19:46 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt GPROF 1
@@ -62,7 +62,8 @@
 reads the given object file (the default is
 .Pa a.out)
 and establishes the relation between it's symbol table
-and the call graph profile. The default graph profile file name is the name
+and the call graph profile.
+The default graph profile file name is the name
 of the executable with the suffix
 .Pa .gmon 
 appended.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/grep.1 man1/grep.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/grep.1	Thu Jan 27 23:31:50 2000
+++ man1/grep.1	Tue Mar 21 06:29:05 2000
@@ -1,5 +1,5 @@
 .\" grep man page
-.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.15 2000/01/18 09:46:39 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.16 2000/01/31 13:28:56 ru Exp $
 .if !\n(.g \{\
 .	if !\w|\*(lq| \{\
 .		ds lq ``
@@ -13,93 +13,39 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.8 2000/01/17 00:55:06 alainm Exp $
+.Id $Id: grep.1,v 1.9 2000/01/26 03:42:16 alainm Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep, zgrep \- print lines matching a pattern
 .SH SYNOPSIS
 .B grep
-.RB [ \- [ ABC ]
-.IR NUM ]
-.RB [ \-EFGHLUVZabchilnqrsuvwxyz ]
+.RI [ options ]
+.I PATTERN
+.RI [ FILE .\|.\|.]
+.br
+.B grep
+.RI [ options ]
 .RB [ \-e
 .I PATTERN
 |
 .B \-f
 .IR FILE ]
-.RB [ \-d
-.IR ACTION ]
-.RB [ \-\^\-binary-files=\fITYPE\fP ]
-.RB [ \-\^\-directories=\fIACTION\fP ]
-.RB [ \-\^\-extended-regexp ]
-.RB [ \-\^\-fixed-strings ]
-.RB [ \-\^\-basic-regexp ]
-.RB [ \-\^\-regexp=\fIPATTERN\fP ]
-.RB [ \-\^\-file=\fIFILE\fP ]
-.RB [ \-\^\-ignore-case ]
-.RB [ \-\^\-word-regexp ]
-.RB [ \-\^\-line-regexp ]
-.RB [ \-\^\-line-regexp ]
-.RB [ \-\^\-no-messages ]
-.RB [ \-\^\-invert-match ]
-.RB [ \-\^\-version ]
-.RB [ \-\^\-help ]
-.RB [ \-\^\-byte-offset ]
-.RB [ \-\^\-line-number ]
-.RB [ \-\^\-with-filename ]
-.RB [ \-\^\-no-filename ]
-.RB [ \-\^\-quiet ]
-.RB [ \-\^\-silent ]
-.RB [ \-\^\-text ]
-.RB [ \-\^\-files-without-match ]
-.RB [ \-\^\-files-with-matches ]
-.RB [ \-\^\-count ]
-.RB [ \-\^\-before-context=\fINUM\fP ]
-.RB [ \-\^\-after-context=\fINUM\fP ]
-.RB [ \-\^\-context [ =\fINUM\fP ]]
-.RB [ \-\^\-binary ]
-.RB [ \-\^\-unix-byte-offsets ]
-.RB [ \-\^\-mmap ]
-.RB [ \-\^\-null ]
-.RB [ \-\^\-recursive ]
-.RB [ \-\^\-decompress ]
-.RI [ file .\|.\|.]
+.RI [ FILE .\|.\|.]
 .SH DESCRIPTION
 .PP
 .B grep
 searches the named input
-.I files
+.IR FILE s
 (or standard input if no files are named, or
 the file name
 .B \-
 is given)
 for lines containing a match to the given
-.IR pattern .
+.IR PATTERN .
 By default,
 .B grep
 prints the matching lines.
 .PP
-There are three major variants of
-.BR grep ,
-controlled by the following options.
-.PD 0
-.TP
-.BR \-G ", " \-\^\-basic-regexp
-Interpret
-.I pattern
-as a basic regular expression (see below).  This is the default.
-.TP
-.BR \-E ", " \-\^\-extended-regexp
-Interpret
-.I pattern
-as an extended regular expression (see below).
-.TP
-.BR \-F ", " \-\^\-fixed-strings
-Interpret
-.I pattern
-as a list of fixed strings, separated by newlines,
-any of which is to be matched.
-.PP
 In addition, two variant programs
 .B egrep
 and
@@ -114,40 +60,31 @@
 .B zgrep
 is the same as
 .BR "grep\ \-Z" .
-.PD
-.PP
-All variants of
-.B grep
-understand the following options:
-.PD 0
+.SH OPTIONS
 .TP
 .BI \-A " NUM" "\fR,\fP \-\^\-after-context=" NUM
 Print
 .I NUM
 lines of trailing context after matching lines.
 .TP
+.BR \-a ", " \-\^\-text
+Process a binary file as if it were text; this is equivalent to the
+.B \-\^\-binary-files=text
+option.
+.TP
 .BI \-B " NUM" "\fR,\fP \-\^\-before-context=" NUM
 Print
 .I NUM
 lines of leading context before matching lines.
 .TP
-.BI \-C " \fR[\fPNUM\fR]\fP" "\fR,\fP \-\^\-context\fR[\fP=" NUM\fR]\fP
+\fB\-C\fP [\fINUM\fP], \fB\-\fP\fINUM\fP, \fB\-\^\-context\fP[\fB=\fP\fINUM\fP]
 Print
 .I NUM
 lines (default 2) of output context.
 .TP
-.BI \- NUM
-Same as
-.BI \-\^\-context= NUM
-lines of leading and trailing context.  However,
-.B grep
-will never print any given line more than once.
-.TP
-.BR \-V ", " \-\^\-version
-Print the version number of
-.B grep
-to standard error.  This version number should
-be included in all bug reports (see below).
+.BR \-b ", " \-\^\-byte-offset
+Print the byte offset within the input file before
+each line of output.
 .TP
 .BI \-\^\-binary-files= TYPE
 If the first few bytes of a file indicate that the file contains binary
@@ -167,7 +104,9 @@
 is
 .BR without-match ,
 .B grep
-assumes that a binary file does not match.
+assumes that a binary file does not match; this is equivalent to the 
+.B \-I
+option.
 If
 .I TYPE
 is
@@ -175,8 +114,6 @@
 .B grep
 processes a binary file as if it were text; this is equivalent to the
 .B \-a
-or
-.B \-\^\-text
 option.
 .I Warning:
 .B "grep \-\^\-binary-files=text"
@@ -184,10 +121,6 @@
 which can have nasty side effects if the output is a terminal and if the
 terminal driver interprets some of it as commands.
 .TP
-.BR \-b ", " \-\^\-byte-offset
-Print the byte offset within the input file before
-each line of output.
-.TP
 .BR \-c ", " \-\^\-count
 Suppress normal output; instead print a count of
 matching lines for each input file.
@@ -218,18 +151,34 @@
 .B \-r
 option.
 .TP
+.BR \-E ", " \-\^\-extended-regexp
+Interpret
+.I PATTERN
+as an extended regular expression (see below).
+.TP
 .BI \-e " PATTERN" "\fR,\fP \-\^\-regexp=" PATTERN
 Use
 .I PATTERN
 as the pattern; useful to protect patterns beginning with
 .BR \- .
 .TP
+.BR \-F ", " \-\^\-fixed-strings
+Interpret
+.I PATTERN
+as a list of fixed strings, separated by newlines,
+any of which is to be matched.
+.TP
 .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE
 Obtain patterns from
 .IR FILE ,
 one per line.
 The empty file contains zero patterns, and therfore matches nothing.
 .TP
+.BR \-G ", " \-\^\-basic-regexp
+Interpret
+.I PATTERN
+as a basic regular expression (see below).  This is the default.
+.TP
 .BR \-H ", " \-\^\-with-filename
 Print the filename for each match.
 .TP
@@ -237,9 +186,18 @@
 Suppress the prefixing of filenames on output
 when multiple files are searched.
 .TP
+.B \-\^\-help
+Output a brief help message.
+.TP
+.BR \-I
+Process a binary file as if it did not contain matching data; this is
+equivalent to the
+.B \-\^\-binary-files=without-match
+option.
+.TP
 .BR \-i ", " \-\^\-ignore-case
 Ignore case distinctions in both the
-.I pattern
+.I PATTERN
 and the input files.
 .TP
 .BR \-L ", " \-\^\-files-without-match
@@ -254,6 +212,21 @@
 would normally have been printed.  The scanning will
 stop on the first match.
 .TP
+.B \-\^\-mmap
+If possible, use the
+.BR mmap (2)
+system call to read input, instead of
+the default
+.BR read (2)
+system call.  In some situations,
+.B \-\^\-mmap
+yields better performance.  However,
+.B \-\^\-mmap
+can cause undefined behavior (including core dumps)
+if an input file shrinks while
+.B grep
+is operating, or if an I/O error occurs.
+.TP
 .BR \-n ", " \-\^\-line-number
 Prefix each line of output with the line number
 within its input file.
@@ -297,29 +270,6 @@
 .B \-s
 and should redirect output to /dev/null instead.
 .TP
-.BR \-a ", " \-\^\-text
-Process a binary file as if it were text; this is equivalent to the
-.B \-\^\-binary-files=text
-option.
-.TP
-.BR \-v ", " \-\^\-invert-match
-Invert the sense of matching, to select non-matching lines.
-.TP
-.BR \-w ", " \-\^\-word-regexp
-Select only those lines containing matches that form whole words.
-The test is that the matching substring must either be at the
-beginning of the line, or preceded by a non-word constituent
-character.  Similarly, it must be either at the end of the line
-or followed by a non-word constituent character.  Word-constituent
-characters are letters, digits, and the underscore.
-.TP
-.BR \-x ", " \-\^\-line-regexp
-Select only those matches that exactly match the whole line.
-.TP
-.B \-y
-Obsolete synonym for
-.BR \-i .
-.TP
 .BR \-U ", " \-\^\-binary
 Treat the file(s) as binary.  By default, under MS-DOS and MS-Windows,
 .BR grep
@@ -351,20 +301,29 @@
 option is also used;
 it has no effect on platforms other than MS-DOS and MS-Windows.
 .TP
-.B \-\^\-mmap
-If possible, use the
-.BR mmap (2)
-system call to read input, instead of
-the default
-.BR read (2)
-system call.  In some situations,
-.B \-\^\-mmap
-yields better performance.  However,
-.B \-\^\-mmap
-can cause undefined behavior (including core dumps)
-if an input file shrinks while
+.BR \-V ", " \-\^\-version
+Print the version number of
 .B grep
-is operating, or if an I/O error occurs.
+to standard error.  This version number should
+be included in all bug reports (see below).
+.TP
+.BR \-v ", " \-\^\-invert-match
+Invert the sense of matching, to select non-matching lines.
+.TP
+.BR \-w ", " \-\^\-word-regexp
+Select only those lines containing matches that form whole words.
+The test is that the matching substring must either be at the
+beginning of the line, or preceded by a non-word constituent
+character.  Similarly, it must be either at the end of the line
+or followed by a non-word constituent character.  Word-constituent
+characters are letters, digits, and the underscore.
+.TP
+.BR \-x ", " \-\^\-line-regexp
+Select only those matches that exactly match the whole line.
+.TP
+.B \-y
+Obsolete synonym for
+.BR \-i .
 .TP
 .BR \-Z ", " \-\^\-null
 Output a zero byte (the \s-1ASCII\s0
@@ -383,14 +342,10 @@
 .B "xargs \-0"
 to process arbitrary file names,
 even those that contain newline characters.
-.PD
-.LP
-Following option is only available if compiled with zlib(3) library:
-.PD 0
 .TP
-.B \-Z, --decompress
+.BR \-Z ", " \-\^\-decompress
 Decompress the input data before searching.
-.PD
+This option is only available if compiled with zlib(3) library.
 .SH "REGULAR EXPRESSIONS"
 .PP
 A regular expression is a pattern that describes a set of strings.
@@ -424,7 +379,7 @@
 in the list.
 For example, the regular expression
 .B [0123456789]
-matches any single digit.  A range of ASCII characters
+matches any single digit.  A range of characters
 may be specified by giving the first and last characters, separated
 by a hyphen.
 Finally, certain named classes of characters are predefined.
@@ -445,8 +400,9 @@
 .B [[:alnum:]]
 means
 .BR [0-9A-Za-z] ,
-except the latter form is dependent upon the ASCII character encoding,
-whereas the former is portable.
+except the latter form depends upon the \s-1POSIX\s0 locale and the
+\s-1ASCII\s0 character encoding, whereas the former is independent
+of locale and character set.
 (Note that the brackets in these class names are part of the symbolic
 names, and must be included in addition to the brackets delimiting
 the bracket list.)  Most metacharacters lose their special meaning
@@ -590,14 +546,84 @@
 instead of reporting a syntax error in the regular expression.
 \s-1POSIX.2\s0 allows this behavior as an extension, but portable scripts
 should avoid it.
-.SH ENVIRONMENT
-The environment variable
+.SH "ENVIRONMENT VARIABLES"
+.TP
 .B GREP_OPTIONS
-can hold a set of default
-options for
-.I grep.
-These options are interpreted first and can be overwritten by explicit command
-line parameters.
+This variable specifies default options to be placed in front of any
+explicit options.  For example, if
+.B GREP_OPTIONS
+is
+.BR "'\-\^\-binary-files=without-match \-\^\-directories=skip'" ,
+.B grep
+behaves as if the two options
+.B \-\^\-binary-files=without-match
+and
+.B \-\^\-directories=skip
+had been specified before any explicit options.
+Option specifications are separated by whitespace.
+A backslash escapes the next character,
+so it can be used to specify an option containing whitespace or a backslash.
+.TP
+\fBLC_ALL\fP, \fBLC_MESSAGES\fP, \fBLANG\fP
+These variables specify the
+.B LC_MESSAGES
+locale, which determines the language that
+.B grep
+uses for messages.
+The locale is determined by the first of these variables that is set.
+American English is used if none of these environment variables are set,
+or if the message catalog is not installed, or if
+.B grep
+was not compiled with national language support (\s-1NLS\s0).
+.TP
+\fBLC_ALL\fP, \fBLC_CTYPE\fP, \fBLANG\fP
+These variables specify the
+.B LC_CTYPE
+locale, which determines the type of characters, e.g., which
+characters are whitespace.
+The locale is determined by the first of these variables that is set.
+The \s-1POSIX\s0 locale is used if none of these environment variables
+are set, or if the locale catalog is not installed, or if
+.B grep
+was not compiled with national language support (\s-1NLS\s0).
+.TP
+.B POSIXLY_CORRECT
+If set,
+.B grep
+behaves as \s-1POSIX.2\s0 requires; otherwise,
+.B grep
+behaves more like other \s-1GNU\s0 programs.
+\s-1POSIX.2\s0 requires that options that follow file names must be
+treated as file names; by default, such options are permuted to the
+front of the operand list and are treated as options.
+Also, \s-1POSIX.2\s0 requires that unrecognized options be diagnosed as
+\*(lqillegal\*(rq, but since they are not really against the law the default
+is to diagnose them as \*(lqinvalid\*(rq.
+.B POSIXLY_CORRECT
+also disables \fB_\fP\fIN\fP\fB_GNU_nonoption_argv_flags_\fP,
+described below.
+.TP
+\fB_\fP\fIN\fP\fB_GNU_nonoption_argv_flags_\fP
+(Here
+.I N
+is
+.BR grep 's
+numeric process ID.)  If the
+.IR i th
+character of this environment variable's value is
+.BR 1 ,
+do not consider the
+.IR i th
+operand of
+.B grep
+to be an option, even if it appears to be one.
+A shell can put this variable in the environment for each command it runs,
+specifying which operands are the results of file name wildcard
+expansion and therefore should not be treated as options.
+This behavior is available only with the \s-1GNU\s0 C library, and only
+when
+.B POSIXLY_CORRECT
+is not set.
 .SH DIAGNOSTICS
 .PP
 Normally, exit status is 0 if matches were found,
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/install.1 man1/install.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/install.1	Thu Jan 27 23:36:50 2000
+++ man1/install.1	Tue Mar 21 06:31:44 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/xinstall/install.1,v 1.15 1999/12/06 05:01:14 obrien Exp $
+.\" $FreeBSD: src/usr.bin/xinstall/install.1,v 1.16 2000/03/01 12:20:16 sheldonh Exp $
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
@@ -107,7 +107,8 @@
 .Xr chflags 1
 for a list of possible flags and their meanings.
 .It Fl g
-Specify a group. A numeric GID is allowed.
+Specify a group.
+A numeric GID is allowed.
 .It Fl M
 Disable all use of
 .Xr mmap 2 .
@@ -118,7 +119,8 @@
 .Xr chmod  1
 for a description of possible mode values.
 .It Fl o
-Specify an owner. A numeric UID is allowed.
+Specify an owner.
+A numeric UID is allowed.
 .It Fl p
 Preserve the modification time.
 Copy the file, as if the
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ipftest.1 man1/ipftest.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ipftest.1	Thu Jan 27 23:37:21 2000
+++ man1/ipftest.1	Tue Mar 21 06:32:02 2000
@@ -1,6 +1,6 @@
 .TH ipftest 1
 .SH NAME
-ipftest \- test packet filter rules with arbitary input.
+ipftest \- test packet filter rules with arbitrary input.
 .SH SYNOPSIS
 .B ipftest
 [
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/kbdmap.1 man1/kbdmap.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/kbdmap.1	Thu Jan 27 23:37:23 2000
+++ man1/kbdmap.1	Tue Mar 21 06:32:03 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.16 2000/01/23 20:20:55 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.17 2000/03/01 14:07:41 sheldonh Exp $
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
@@ -55,7 +55,8 @@
 It is strongly recommended to not choose 
 .Tn MSDOS 
 codepage keymaps
-or fonts. Use the 
+or fonts.
+Use the 
 .Tn ISO 
 standard version if available! 
 .Tn X11 
@@ -73,7 +74,8 @@
 Run as command
 .Xr vidfont 1 .
 .It Fl d , Fl default
-Use default language. Ignore
+Use default language.
+Ignore
 .Ev LANG
 environment variable.
 .It Fl h , Fl help
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/kcon.1 man1/kcon.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/kcon.1	Thu Jan 27 23:38:18 2000
+++ man1/kcon.1	Tue Mar 21 06:32:33 2000
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)kcon.1, 3.20, Last Edit-Date: [Wed Jan 25 16:34:56 1995]
-.\" $FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.6 1999/08/28 01:17:44 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.7 2000/03/01 14:08:52 sheldonh Exp $
 .\"
 .Dd January 25, 1995
 .Dt KCON 1
@@ -56,7 +56,8 @@
 .Bl -tag -width flag
 .It Fl d Ar delay
 Specifies the delay after which the last key entered will be repeated by the
-Keyboard. Valid values are 0..3 corresponding to delays of 250, 500, 750 and
+Keyboard.
+Valid values are 0..3 corresponding to delays of 250, 500, 750 and
 1000 milliseconds.
 .It Fl l
 Displays the current keyboard map in use by the driver.
@@ -76,7 +77,8 @@
 .Fl l
 option.
 .It Fl r Ar rate
-Specifies the character repetition rate. Valid argument values are 0...31
+Specifies the character repetition rate.
+Valid argument values are 0...31
 corresponding to rates of 30 characters/second ... 2 characters/second.
 .It Fl R
 Reset the Keyboard.
@@ -92,7 +94,8 @@
 Switches display of control codes to hexadecimal in the listing of the current map.
 To be used in conjunction with the
 .Fl l
-option. This is the default behaviour.
+option.
+This is the default behaviour.
 .Sh FILES
 .Bl -tag -width /usr/share/misc/keycap.pcvt -compact
 .It Pa /usr/share/misc/keycap.pcvt
@@ -104,10 +107,13 @@
 .Xr keycap 5
 .Sh BUGS
 .Nm kcon
-detects several inconsistencies in the keycap database. In case of errors
+detects several inconsistencies in the keycap database.
+In case of errors
 .Nm kcon
-exits with an error message. If this happens, the keyboard may remain in
-an undefined state. To recover from such situation, execute
+exits with an error message.
+If this happens, the keyboard may remain in
+an undefined state.
+To recover from such situation, execute
 .Nm kcon -m default
 .Sh EXAMPLES
 The command
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/keyinit.1 man1/keyinit.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/keyinit.1	Thu Jan 27 23:36:08 2000
+++ man1/keyinit.1	Tue Mar 21 06:31:22 2000
@@ -1,5 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
-.\" $FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.7 1999/08/28 01:02:26 peter Exp $
+.\" $FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.8 2000/03/01 12:19:47 sheldonh Exp $
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
@@ -15,7 +15,8 @@
 .Nm Keyinit
 initializes the system so you can use S/Key one-time passwords to
 login.  The program will ask you to enter a secret pass phrase; enter a
-phrase of several words in response. After the S/Key database has been
+phrase of several words in response.
+After the S/Key database has been
 updated you can login using either your regular UNIX password or using
 S/Key one-time passwords. 
 .Pp
@@ -32,8 +33,10 @@
 .Pp
 .Nm Keyinit
 requires you to type your secret password, so it should
-be used only on a secure terminal. For example, on the console of a
-workstation. If you are using
+be used only on a secure terminal.
+For example, on the console of a
+workstation.
+If you are using
 .Nm
 while logged in over an
 untrusted network, follow the instructions given below with the
@@ -64,7 +67,8 @@
 then run
 .Nm key
 in another window to generate the correct 6 English words
-for that count and seed. You can then
+for that count and seed.
+You can then
 "cut" and "paste" them or copy them into the
 .Nm
 window.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/keylogin.1 man1/keylogin.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/keylogin.1	Thu Jan 27 23:36:08 2000
+++ man1/keylogin.1	Tue Mar 21 06:31:22 2000
@@ -1,6 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.4 1999/08/28 01:02:27 peter Exp $
+.\" $FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.5 2000/03/01 12:19:49 sheldonh Exp $
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
@@ -15,7 +15,8 @@
 prompts the user for their login password, and uses it to decrypt
 the user's secret key stored in the
 .Xr publickey 5
-database. Once decrypted, the user's key is stored by the local
+database.
+Once decrypted, the user's key is stored by the local
 key server process
 .Xr keyserv 8
 to be used by any secure network services, such as NFS.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/last.1 man1/last.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/last.1	Thu Jan 27 23:36:10 2000
+++ man1/last.1	Tue Mar 21 06:31:23 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/last/last.1,v 1.5 1999/08/28 01:02:39 peter Exp $
+.\" $FreeBSD: src/usr.bin/last/last.1,v 1.6 2000/03/01 12:19:50 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt LAST 1
@@ -98,7 +98,8 @@
 .Dq Li "last root -t console"
 would list all of
 .Dq Li root Ns 's
-sessions as well as all sessions on the console terminal. If no
+sessions as well as all sessions on the console terminal.
+If no
 users, hostnames or terminals are specified,
 .Nm last
 prints a record of
@@ -128,7 +129,8 @@
 .Xr ac 8
 .Sh BUGS
 If a login shell should terminate abnormally for some reason, it is likely
-that a logout record won't be written to the wtmp file. In this case,
+that a logout record won't be written to the wtmp file.
+In this case,
 .Nm last
 will indicate the logout time as "shutdown".
 .Sh HISTORY
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ldd.1 man1/ldd.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ldd.1	Thu Jan 27 23:36:10 2000
+++ man1/ldd.1	Tue Mar 21 06:31:23 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.11 1999/08/28 23:20:47 mpp Exp $
+.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.12 2000/03/01 12:19:50 sheldonh Exp $
 .\"
 .Dd October 22, 1993
 .Dt LDD 1
@@ -21,11 +21,13 @@
 .Pp
 Zero, one or two
 .Fl f
-options may be given. The argument is a format string passed to
+options may be given.
+The argument is a format string passed to
 .Xr rtld 1
 and allows customization of
 .Nm ldd Ns 's
-output. See
+output.
+See
 .Xr rtld 1
 for a list of recognized conversion characters.
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/lint.1 man1/lint.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/lint.1	Thu Jan 27 23:36:51 2000
+++ man1/lint.1	Tue Mar 21 06:31:44 2000
@@ -29,7 +29,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/xlint/xlint/lint.1,v 1.7 1999/08/28 01:07:55 peter Exp $
+.\" $FreeBSD: src/usr.bin/xlint/xlint/lint.1,v 1.8 2000/03/01 12:20:22 sheldonh Exp $
 .\"
 .Dd August 28, 1994
 .Dt LINT 1
@@ -61,7 +61,8 @@
 .Nm
 attempts to detect features of the named C program files
 that are likely to be bugs, to be non-portable, or to be
-wasteful. It also performs stricter type checking then does
+wasteful.
+It also performs stricter type checking then does
 the C compiler.
 .Nm
 runs the C preprocessor as its first phase, with the
@@ -77,7 +78,8 @@
 Among the possible problems that are currently noted are
 unreachable statements, loops not entered at the top,
 variables declared and not used, and logical expressions
-with constant values. Function calls are checked for
+with constant values.
+Function calls are checked for
 inconsistencies, such as calls to functions that return
 values in some places and not in others, functions called
 with varying numbers of arguments, function calls that
@@ -88,7 +90,8 @@
 .Pp
 Filename arguments ending with
 .Pa \&.c
-are taken to be C source files. Filename arguments with
+are taken to be C source files.
+Filename arguments with
 names ending with
 .Pa \&.ln
 are taken to be the result of an earlier invocation of
@@ -98,7 +101,8 @@
 .Fl o
 or
 .Fl C
-option in effect. The
+option in effect.
+The
 .Pa \&.ln
 files are analogous to the
 .Pa \&.o
@@ -123,7 +127,8 @@
 .Nm
 appends the standard C lint library
 .Pq Pa llib-lc.ln
-to the end of the list of files. When the
+to the end of the list of files.
+When the
 .Fl i
 option is used, the
 .Pa \&.ln
@@ -134,13 +139,15 @@
 .Fl i
 options are used, the
 .Pa llib-l Ns Ar library Ns Pa \&.ln
-files are ignored. When the
+files are ignored.
+When the
 .Fl i
 option is
 .Em omitted
 the second pass of
 .Nm
-checks this list of files for mutual compatibility. At this point,
+checks this list of files for mutual compatibility.
+At this point,
 if a complaint stems not from a given source file, but from one of
 its included files, the source filename will be printed followed by
 a question mark.
@@ -162,7 +169,8 @@
 .It Fl b
 Report
 .Sy break
-statements that cannot be reached. This is not the default
+statements that cannot be reached.
+This is not the default
 because, unfortunately, most
 .Xr lex 1
 and many
@@ -180,11 +188,13 @@
 .It Fl g
 Don't print warnings for some extensions of
 .Xr gcc 1
-to the C language. Currently these are nonconstant initializers in
+to the C language.
+Currently these are nonconstant initializers in
 automatic aggregate initializations, arithmetic on pointer to void,
 zero sized structures, subscripting of non-lvalue arrays, prototypes
 overriding old style function declarations and long long
-integer types. The
+integer types.
+The
 .Fl g
 flag also turns on the keywords
 .Sy asm
@@ -203,7 +213,8 @@
 .Pa \&.ln
 file for every
 .Pa \&.c
-file on the command line. These
+file on the command line.
+These
 .Pa \&.ln
 files are the product of
 .Nm lint Ns 's
@@ -217,7 +228,8 @@
 In case of redeclarations report the position of the
 previous declaration.
 .It Fl s
-Strict ANSI C mode. Issue warnings and errors required by ANSI C.
+Strict ANSI C mode.
+Issue warnings and errors required by ANSI C.
 Also do not produce warnings for constructs which behave
 differently in traditional C and ANSI C. With the
 .Fl s
@@ -227,14 +239,17 @@
 .It Fl t
 Traditional C mode.
 .Li __STDC__
-is not predefined in this mode. Warnings are printed for constructs
+is not predefined in this mode.
+Warnings are printed for constructs
 not allowed in traditional C. Warnings for constructs which behave
-differently in traditional C and ANSI C are suppressed. Preprocessor
+differently in traditional C and ANSI C are suppressed.
+Preprocessor
 macros describing the machine type (e.g.
 .Li sun3 Ns )
 and machine architecture (e.g.
 .Li m68k Ns )
-are defined without leading and trailing underscores. The keywords
+are defined without leading and trailing underscores.
+The keywords
 .Sy const Ns ,
 .Sy volatile
 and
@@ -266,7 +281,8 @@
 .Pa \&.c
 and
 .Pa \&.ln
-input files. After all global definitions of functions and
+input files.
+After all global definitions of functions and
 variables in these files are written to the newly created library,
 .Nm
 checks all input files, including libraries specified with the
@@ -279,7 +295,8 @@
 .Xr cpp 1 ,
 as if by a
 .Li #define
-directive. If no definition is given,
+directive.
+If no definition is given,
 .Ar name
 is defined as 1.
 .It Fl I Ns Ar directory
@@ -309,16 +326,19 @@
 .Ar outputfile .
 The output file produced is the input that is given to
 .Nm lint Ns 's
-second pass. The
+second pass.
+The
 .Fl o
-option simply saves this file in the named output file. If the
+option simply saves this file in the named output file.
+If the
 .Fl i
 option is also used the files are not checked for compatibility.
 To produce a
 .Pa llib-l Ns Ar library Ns Pa \&.ln
 without extraneous messages, use of the
 .Fl u
-option is suggested. The
+option is suggested.
+The
 .Fl v
 option is useful if the source file(s) for the lint library
 are just external interfaces.
@@ -362,7 +382,8 @@
 .Sy case
 or
 .Sy default
-labelled statement. This directive should be placed immediately
+labelled statement.
+This directive should be placed immediately
 preceding the label.
 .It Li /* LINTLIBRARY */
 At the beginning of a file, mark all functions and variables defined
@@ -377,7 +398,8 @@
 .Li */
 .Xc
 Suppresses any intra-file warning except those dealing with
-unused variables or functions. This directive should be placed
+unused variables or functions.
+This directive should be placed
 on the line immediately preceding where the lint warning occurred.
 .It Li /* LONGLONG */
 Suppress complaints about use of long long integer types.
@@ -391,7 +413,8 @@
 .Nm
 check the first
 .Pq Ar n Ns No -1
-arguments as usual. The
+arguments as usual.
+The
 .Ar n Ns No -th
 argument is interpreted as a
 .Sy printf
@@ -402,10 +425,12 @@
 to treat function declaration prototypes as function definitions
 if
 .Ar n
-is non-zero. This directive can only be used in conjunction with
+is non-zero.
+This directive can only be used in conjunction with
 the
 .Li /* LINTLIBRARY */
-directive. If
+directive.
+If
 .Ar n
 is zero, function prototypes will be treated normally.
 .It Li /* SCANFLIKE Ns Ar n Li */
@@ -413,14 +438,16 @@
 .Nm
 check the first
 .Pq Ar n Ns No -1
-arguments as usual. The
+arguments as usual.
+The
 .Ar n Ns No -th
 argument is interpreted as a
 .Sy scanf
 format string that is used to check the remaining arguments.
 .It Li /* VARARGS Ns Ar n Li */
 Suppress the usual checking for variable numbers of arguments in
-the following function declaration. The data types of the first
+the following function declaration.
+The data types of the first
 .Ar n
 arguments are checked; a missing
 .Ar n
@@ -433,16 +460,19 @@
 .Fl o
 options allows for incremental use of
 .Nm
-on a set of C source files. Generally, one invokes
+on a set of C source files.
+Generally, one invokes
 .Nm
 once for each source file with the
 .Fl i
-option. Each of these invocations produces a
+option.
+Each of these invocations produces a
 .Pa \&.ln
 file that corresponds to the
 .Pa \&.c
 file, and prints all messages that are about just that
-source file. After all the source files have been separately
+source file.
+After all the source files have been separately
 run through
 .Nm lint ,
 it is invoked once more (without the
@@ -451,7 +481,8 @@
 .Pa \&.ln
 files with the needed
 .Fl l Ns Ar library
-options. this will print all the inter-file inconsistencies. This
+options. this will print all the inter-file inconsistencies.
+This
 scheme works well with
 .Xr make 1 ;
 it allows
@@ -466,7 +497,8 @@
 .It Ev LIBDIR
 the directory where the lint libraries specified by the
 .Fl l Ns Ar library
-option must exist. If this environment variable is undefined,
+option must exist.
+If this environment variable is undefined,
 then the default path
 .Pa /usr/libdata/lint
 will be used to search for the libraries.
@@ -505,7 +537,8 @@
 runs, cause certain errors that were reported when the libraries
 were created to be reported again, and cause line numbers and file
 names from the original source used to create those libraries
-to be reported in error messages. For these reasons, it is recommended
+to be reported in error messages.
+For these reasons, it is recommended
 to use the
 .Fl C
 option to create lint libraries.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/loadfont.1 man1/loadfont.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/loadfont.1	Thu Jan 27 23:38:18 2000
+++ man1/loadfont.1	Tue Mar 21 06:32:34 2000
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)loadfont.1, 3.20, Last Edit-Date: [Tue Apr  4 13:06:00 1995]
-.\" $FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.8 1999/08/28 01:17:48 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.9 2000/03/01 14:08:54 sheldonh Exp $
 .\"
 .Dd April 4, 1995
 .Dt LOADFONT 1
@@ -51,7 +51,8 @@
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
-Specifies the slot, the font is to load into. EGA boards have four 
+Specifies the slot, the font is to load into.
+EGA boards have four 
 slots and VGA boards have eight slots available for downloading fonts.
 .It Fl d
 Specifies the devicefile to use.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/locate.1 man1/locate.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/locate.1	Thu Jan 27 23:36:13 2000
+++ man1/locate.1	Tue Mar 21 06:31:24 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.12 1999/08/28 01:02:58 peter Exp $
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.16 2000/03/06 09:45:28 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -44,7 +44,7 @@
 .Op Fl Scims
 .Op Fl l Ar limit
 .Op Fl d Ar database 
-pattern ...
+.Ar pattern ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -85,7 +85,8 @@
 and NUL
 .Pq Sq \e0 .
 The 8-bit character support doesn't waste extra space for
-plain ASCII file names. Characters less than 32 or greater than 127
+plain ASCII file names.
+Characters less than 32 or greater than 127
 are stored in 2 bytes.
 
 The following options are available:
@@ -107,7 +108,8 @@
 
 The option
 .Ar database
-may be a colon-separated list of databases. A single colon is a reference
+may be a colon-separated list of databases.
+A single colon is a reference
 to the default database.
 
 $ locate -d $HOME/lib/mydb: foo
@@ -164,7 +166,9 @@
 .Xr mmap 2 
 instead of the 
 .Xr stdio 3 
-library. This is the default behavior. Usually faster in most cases.
+library.
+This is the default behavior.
+Usually faster in most cases.
 .It Fl s
 Use the
 .Xr stdio 3
@@ -217,20 +221,22 @@
 database was built by user 
 .Dq nobody .
 .Xr find 1
-skip directories,
+skips directories,
 which are not readable for user 
 .Dq nobody , 
 group
 .Dq nobody ,
 or
-world. E.g. if your HOME directory ist not world-readable, all your
+world.
+E.g. if your HOME directory is not world-readable, all your
 files are 
 .Ar not
 in the database.
 
 The
 .Nm
-database is not byte order independent. It is not possible
+database is not byte order independent.
+It is not possible
 to share the databases between machines with different byte order.
 The current 
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/lp.1 man1/lp.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/lp.1	Thu Jan 27 23:37:25 2000
+++ man1/lp.1	Tue Mar 21 06:32:04 2000
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.8 1999/08/28 01:16:50 peter Exp $
+.\" $FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.12 2000/03/08 10:13:50 sheldonh Exp $
 .\"
 .Dd January 22, 1995
 .Dt LP 1
@@ -41,7 +41,8 @@
 .Nd front-end to the print spooler
 .Sh SYNOPSIS
 .Nm lp
-.Op Fl c
+.Op Fl cs
+.Op Fl o Ar option
 .Op Fl d Ar printer
 .Op Fl n Ar num
 .Op Ar name ...
@@ -52,7 +53,7 @@
 specification.  It effectively invokes
 .Xr lpr 1
 with the proper set of arguments.
-
+.Pp
 It generally prints the named files on the destination printer.
 .Pp
 The following options are available:
@@ -64,7 +65,8 @@
 longer required.  The application can then safely delete or modify the
 files without affecting the output operation.
 .It Fl d Ar dest
-Specify a particular printer. If no
+Specify a particular printer.
+If no
 .Fl d
 is provided on the command line, the contents of the environment
 variables
@@ -77,6 +79,15 @@
 Specify that
 .Ar num
 copies of each of the named files shall be printed.
+.It Fl o Ar option
+Printer specific options.
+Not supported, provided only as a compatibility
+option for SVR.
+.It Fl s
+Silent operation.
+Not supported,
+provided only as a compatibility option for
+.St -susv2 .
 .El
 .Sh ENVIRONMENT
 As described above, the variables
@@ -84,7 +95,6 @@
 and
 .Ev PRINTER
 are examined to select the destination printer.
-
 .Sh SEE ALSO
 .Xr lpr 1
 .Sh STANDARDS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/lpr.1 man1/lpr.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/lpr.1	Thu Jan 27 23:37:26 2000
+++ man1/lpr.1	Tue Mar 21 06:32:05 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.10 1999/11/30 16:15:22 ache Exp $
+.\" $FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.11 2000/03/01 14:08:50 sheldonh Exp $
 .\" "
 .Dd June 6, 1993
 .Dt LPR 1
@@ -58,7 +58,8 @@
 become available.  If no names appear, the standard input is assumed.
 .Pp
 The following single letter options are used to notify the line printer
-spooler that the files are not standard text files. The spooling daemon will
+spooler that the files are not standard text files.
+The spooling daemon will
 use the appropriate filters to print the data accordingly.
 .Bl -tag -width indent
 .It Fl c
@@ -144,7 +145,8 @@
 cat foo.c bar.c more.c \&| lpr \-#3
 .Ed
 .Pp
-will give three copies of the concatenation of the files. Often
+will give three copies of the concatenation of the files.
+Often
 a site will disable this feature to encourage use of a photocopier
 instead.
 .It Xo
@@ -255,5 +257,6 @@
 .Xr troff 1
 and
 .Xr tex
-reside on the host with the printer. It is currently not possible to
+reside on the host with the printer.
+It is currently not possible to
 use local font libraries.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ls.1 man1/ls.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ls.1	Thu Jan 27 23:30:31 2000
+++ man1/ls.1	Tue Mar 21 06:28:23 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.31 1999/10/16 16:17:54 obrien Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.33 2000/03/02 14:53:20 sheldonh Exp $
 .\"
 .Dd July 29, 1994
 .Dt LS 1
@@ -100,7 +100,8 @@
 options are specified.
 .It Fl L
 If argument is a symbolic link, list the file or directory the link references
-rather than the link itself. This option cancels the
+rather than the link itself.
+This option cancels the
 .Fl P
 option.
 .It Fl P
@@ -145,7 +146,8 @@
 option is specified, print the file size allocation in kilobytes,
 not blocks.  This option overrides the environment variable BLOCKSIZE.
 .It Fl l
-(The lowercase letter ``ell.'')  List in long format. (See below.)
+(The lowercase letter ``ell.'')  List in long format.
+(See below.)
 If the output is to a terminal, a total sum for all the file
 sizes is output on a line before the long listing.
 .It Fl n
@@ -260,7 +262,8 @@
 .Pp
 If the file is a character special or block special file,
 the major and minor device numbers for the file are displayed
-in the size field. If the file is a symbolic link the pathname of the
+in the size field.
+If the file is a symbolic link the pathname of the
 linked-to file is preceded by
 .Dq \-> .
 .Pp
@@ -325,7 +328,8 @@
 searchable.
 .It Sy \-
 The file is neither readable, writable, executable,
-nor set-user-ID nor set-group-ID mode, nor sticky. (See below.)
+nor set-user-ID nor set-group-ID mode, nor sticky.
+(See below.)
 .El
 .Pp
 These next two apply only to the third character in the last group
@@ -335,7 +339,8 @@
 The sticky bit is set
 (mode
 .Li 1000 ) ,
-but not execute or search permission. (See
+but not execute or search permission.
+(See
 .Xr chmod 1
 or
 .Xr sticky 8 . )
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mail.1 man1/mail.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mail.1	Thu Jan 27 23:36:17 2000
+++ man1/mail.1	Tue Mar 21 06:31:29 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.17 1999/11/08 03:54:37 jkoshy Exp $
+.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.18 2000/03/01 12:19:51 sheldonh Exp $
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
@@ -1037,7 +1037,8 @@
 .It Pa /usr/share/misc/mail.rc
 .It Pa /usr/local/etc/mail.rc
 .It Pa /etc/mail.rc
-System-wide initialization files. Each file will be sourced, in order,
+System-wide initialization files.
+Each file will be sourced, in order,
 if it exists.
 .El
 .Sh SEE ALSO
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/make.1 man1/make.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/make.1	Thu Jan 27 23:36:17 2000
+++ man1/make.1	Tue Mar 21 06:31:29 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.27 2000/01/19 10:44:28 ru Exp $
+.\" $FreeBSD: src/usr.bin/make/make.1,v 1.29 2000/03/01 12:19:52 sheldonh Exp $
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
@@ -70,7 +70,7 @@
 If the file
 .Ql Pa .depend
 can be found, it is also read (see
-.Xr mkdep 1) .
+.Xr mkdep 1 ) .
 .Pp
 This manual page is intended as a reference document only.
 For a more thorough introduction to
@@ -108,7 +108,8 @@
 .It Ar d
 Print debugging information about directory searching and caching.
 .It Ar f
-Print debugging information about the execution of for loops. Currently a
+Print debugging information about the execution of for loops.
+Currently a
 no-op.
 .It Ar "g1"
 Print the input graph before making anything.
@@ -157,7 +158,8 @@
 .It Fl j Ar max_jobs
 Specify the maximum number of jobs that
 .Nm
-may have running at any one time. Turns compatibility mode off, unless the
+may have running at any one time.
+Turns compatibility mode off, unless the
 .Ar B
 flag is also specified.
 .It Fl k
@@ -497,7 +499,8 @@
 may contain anything that
 may be specified on
 .Nm make Ns 's
-command line. Its contents are stored in
+command line.
+Its contents are stored in
 .Nm make Ns 's
 .Va .MAKEFLAGS
 variable.
@@ -671,7 +674,8 @@
 .Ar %
 then it is assumed that they are
 anchored at the end of each word, so only suffixes or entire
-words may be replaced. Otherwise
+words may be replaced.
+Otherwise
 .Ar %
 is the substring of
 .Ar old_string
@@ -701,7 +705,8 @@
 Un-define the specified global variable.
 Only global variables may be un-defined.
 .It Ic \&.error Ar message
-Terminate processing of the makefile immediately. The filename of the
+Terminate processing of the makefile immediately.
+The filename of the
 makefile, the line on which the error was encountered and the specified
 message are printed to standard output and
 .Nm make
@@ -912,7 +917,8 @@
 .El
 After the for
 .Ar expression
-is evaluated, it is split into words. The
+is evaluated, it is split into words.
+The
 iteration
 .Ar variable
 is successively set to each word, and substituted in the
@@ -974,7 +980,8 @@
 If special
 .Ic .WAIT
 source is appears in a dependency line, the sources that precede it are
-made before the sources that succeed it in the line. Loops are not being
+made before the sources that succeed it in the line.
+Loops are not being
 detected and targets that form loops will be silently ignored.
 .El
 .Sh "SPECIAL TARGETS"
@@ -1010,7 +1017,8 @@
 option.
 .It Ic .INCLUDES
 A list of suffixes that indicate files that can be included in a source
-file. The suffix must have already been declared with
+file.
+The suffix must have already been declared with
 .Ic .SUFFIXES ;
 any suffix so declared will have the directories on its search path (see
 .Ic .PATH )
@@ -1083,7 +1091,8 @@
 .It Ic .PHONY
 Apply the
 .Ic .PHONY
-attribute to any specified sources. Targets with this attribute are always
+attribute to any specified sources.
+Targets with this attribute are always
 considered to be out of date.
 .It Ic .PRECIOUS
 Apply the
@@ -1173,7 +1182,8 @@
 .Pp
 The evaluation of
 .Ar expression
-in a test is very simple-minded. Currently, the only form that works is
+in a test is very simple-minded.
+Currently, the only form that works is
 .Ql .if ${VAR} op something
 For instance, you should write tests as
 .Ql .if ${VAR} = "string"
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mcon.1 man1/mcon.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mcon.1	Thu Jan 27 23:38:20 2000
+++ man1/mcon.1	Tue Mar 21 06:32:34 2000
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)mcon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:28:22 1994]
-.\" $FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.7 1999/08/28 01:17:48 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.8 2000/03/01 14:08:55 sheldonh Exp $
 .\"
 .Dd January 3, 1994
 .Dt MCON 1
@@ -62,10 +62,12 @@
 .Nm
 program must be called with an argument
 .Ar device
-that specifies the device node used for the mouse emulation. This is
+that specifies the device node used for the mouse emulation.
+This is
 usually the first device node of the
 .Xr pcvt 4
-driver not being used as a virtual terminal device. E.\ g., if you
+driver not being used as a virtual terminal device.
+E.\ g., if you
 have configured eight virtual terminals
 .Pq the default value ,
 named
@@ -91,7 +93,8 @@
 .Ar button key
 to emulate either the left, middle, or right mouse button.
 .Ar Button key
-is the usual name for that key. Normal ASCII keys are denoted by the
+is the usual name for that key.
+Normal ASCII keys are denoted by the
 character they're labeled with, function keys are named
 .Em f1
 through
@@ -108,8 +111,10 @@
 .It Fl a Ar accel-time
 Set the time limit for the internal accelerator to
 .Ar accel-time
-milliseconds. Key events occurring after a longer time than this limit
-will move the mouse cursor in single steps. Key events arriving more
+milliseconds.
+Key events occurring after a longer time than this limit
+will move the mouse cursor in single steps.
+Key events arriving more
 frequently will move the cursor accelerated by a factor of 6. Note that
 despite of
 .Em milliseconds
@@ -121,9 +126,11 @@
 .It Fl s Ar 1 | true | yes
 The first form disables, the second form enables the
 .Em sticky
-behaviour of the mouse buttons. Sticky mouse keys behave much like
+behaviour of the mouse buttons.
+Sticky mouse keys behave much like
 toggle-buttons: on first press, they become active, on second press,
-they're deactivated. Pressing another button will deactivate any
+they're deactivated.
+Pressing another button will deactivate any
 other sticky button anyway.
 
 Sticky buttons might be more convenient since you don't need 20 fingers
@@ -144,7 +151,8 @@
 .Sh BUGS
 The key names used to map the button-emulating keys to scan codes
 .Pq and vica verse
-are based on the American keyboard layout. This would usually not
+are based on the American keyboard layout.
+This would usually not
 cause any trouble since the
 .Dq button-of-choice
 is certainly some function key that should be equal for any national
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mkstr.1 man1/mkstr.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mkstr.1	Thu Jan 27 23:36:19 2000
+++ man1/mkstr.1	Tue Mar 21 06:31:30 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.6 1999/08/28 01:04:11 peter Exp $
+.\" $FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.7 2000/03/01 12:19:53 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt MKSTR 1
@@ -129,7 +129,8 @@
 .Sh BUGS
 .Nm
 was intended for the limited architecture of the PDP 11 family.
-Very few programs actually use it. The Pascal interpreter,
+Very few programs actually use it.
+The Pascal interpreter,
 .Xr \&pi 1
 and the editor,
 .Xr \&ex 1
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mktemp.1 man1/mktemp.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mktemp.1	Thu Jan 27 23:36:19 2000
+++ man1/mktemp.1	Tue Mar 21 06:31:30 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.6 1999/10/30 14:03:43 phantom Exp $
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.7 2000/03/01 12:19:54 sheldonh Exp $
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.6 1999/10/30 14:03:43 phantom Exp $
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.7 2000/03/01 12:19:54 sheldonh Exp $
 .\"
 .Dd November, 20, 1996
 .Dt MKTEMP 1
@@ -89,7 +89,8 @@
 .Ar prefix
 and the
 .Ev TMPDIR
-environment variable if set. The default location if
+environment variable if set.
+The default location if
 .Ev TMPDIR
 is not set is
 .Pa /tmp .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/more.1 man1/more.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/more.1	Thu Jan 27 23:36:20 2000
+++ man1/more.1	Tue Mar 21 06:31:31 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD: src/usr.bin/more/more.1,v 1.17 1999/12/28 05:56:33 hoek Exp $
+.\" $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
@@ -135,7 +135,8 @@
 .Fl x
 option sets tab stops every
 .Ar N
-positions. The default for
+positions.
+The default for
 .Ar N
 is 8.
 .It Fl /
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/msgs.1 man1/msgs.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/msgs.1	Thu Jan 27 23:36:20 2000
+++ man1/msgs.1	Tue Mar 21 06:31:31 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: src/usr.bin/msgs/msgs.1,v 1.8 1999/08/28 01:04:21 peter Exp $
+.\" $FreeBSD: src/usr.bin/msgs/msgs.1,v 1.9 2000/03/01 12:19:58 sheldonh Exp $
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
@@ -87,7 +87,8 @@
 will pick up where it last left off.
 .It Fl s
 Append the current message to the file ``Messages'' in the current directory;
-`s\-' will save the previously displayed message. A `s' or `s\-' may
+`s\-' will save the previously displayed message.
+A `s' or `s\-' may
 be followed by a space and a file name to receive the message replacing
 the default ``Messages''.
 .It Fl m
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mt.1 man1/mt.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/mt.1	Thu Jan 27 23:36:21 2000
+++ man1/mt.1	Tue Mar 21 06:31:31 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.17 1999/08/28 01:04:23 peter Exp $
+.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.19 2000/03/02 14:53:31 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt MT 1
@@ -94,17 +94,26 @@
 .Ar count
 setmarks.
 .It Cm rdhpos
-Read Hardware block position. Some drives do not support this. The block
-number reported is specific for that hardware only. The count argument is
+Read Hardware block position.
+Some drives do not support this.
+The block
+number reported is specific for that hardware only.
+The count argument is
 ignored.
 .It Cm rdspos
-Read SCSI logical block position. Some drives do not support this. The
+Read SCSI logical block position.
+Some drives do not support this.
+The
 count argument is ignored.
 .It Cm sethpos
-Set Hardware block position. Some drives do not support this. The count
+Set Hardware block position.
+Some drives do not support this.
+The count
 argument is interpreted as a hardware block to which to position the tape.
 .It Cm setspos
-Set SCSI logical block position. Some drives do not support this. The count
+Set SCSI logical block position.
+Some drives do not support this.
+The count
 argument is interpreted as a SCSI logical block to which to position the tape.
 .It Cm rewind
 Rewind the tape
@@ -119,20 +128,26 @@
 Re-tension the tape
 (one full wind forth and back, Count is ignored).
 .It Cm status
-Print status information about the tape unit. For SCSI magnetic tape devices,
+Print status information about the tape unit.
+For SCSI magnetic tape devices,
 the current operating modes of density, blocksize, and whether compression
-is enabled is reported. The current state of the driver (what it thinks that
-it is doing with the device) is reported. If the driver knows the relative
-position from BOT (in terms of filemarks and records), it prints that. Note
+is enabled is reported.
+The current state of the driver (what it thinks that
+it is doing with the device) is reported.
+If the driver knows the relative
+position from BOT (in terms of filemarks and records), it prints that.
+Note
 that this information is not definitive (only BOT, End of Recorded Media, and
 hardware or SCSI logical block position (if the drive supports such) are
 considered definitive tape positions).
 .It Cm errstat
-Print (and clear) error status information about this device. For every normal
+Print (and clear) error status information about this device.
+For every normal
 operation (e.g., a read or a write) and every control operation (e.g,, a
 rewind), the driver stores up the last command executed and it's associated
 status and any residual counts (if any). This command retrieves and prints this
-information. If possible, this also clears any latched error information.
+information.
+If possible, this also clears any latched error information.
 .It Cm blocksize
 Set the block size for the tape unit.  Zero means variable-length
 blocks.
@@ -147,18 +162,21 @@
 exactly, an informational message is printed about what the given
 string has been taken for.
 .It Cm geteotmodel
-Fetch and print out the current EOT filemark model. The model states how
+Fetch and print out the current EOT filemark model.
+The model states how
 many filemarks will be written at close if a tape was being written.
 .It Cm seteotmodel
 Set (from the
 .Ar count
 argument)
-and print out the current and EOT filemark model. Typically this will be
+and print out the current and EOT filemark model.
+Typically this will be
 .Ar 2
 filemarks, but some devices (typically QIC cartridge drives) can
 only write
 .Ar 1
-filemark. Currently you can only choose a value of
+filemark.
+Currently you can only choose a value of
 .Ar 1
 or
 .Ar 2 .
@@ -282,7 +300,7 @@
 2. Parallel recorded.
 3. Old format known as QIC-11.
 5. Helical scan.
-6. This is not an American National Standard. The reference is based on
+6. This is not an American National Standard.  The reference is based on
    an industry standard definition of the media format.
 .Ed
 
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ncplist.1 man1/ncplist.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ncplist.1	Thu Jan 27 23:36:57 2000
+++ man1/ncplist.1	Tue Mar 21 06:31:47 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.1 1999/10/20 11:31:01 bp Exp $
+.\" $FreeBSD: src/usr.bin/ncplist/ncplist.1,v 1.3 2000/03/01 12:20:03 sheldonh Exp $
 .Dd Jun 24, 1999
 .Dt NCPLIST 1
 .Os FreeBSD 3.2
@@ -12,7 +12,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command used to display state of ncplib and NetWare servers. First argument
+command used to display state of ncplib and NetWare servers.
+First argument
 are one letter
 .Ar command
 following by optional
@@ -57,8 +58,9 @@
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
 .It Pa ~/.nwfsrc
-keeps description for each connection. See
-.Xr nwfsrc 8
+keeps description for each connection.
+See
+.Pa /usr/share/examples/nwclient/dot.nwfsrc
 for details.
 
 .Sh NOTES
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ncplogin.1 man1/ncplogin.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ncplogin.1	Thu Jan 27 23:36:58 2000
+++ man1/ncplogin.1	Tue Mar 21 06:31:47 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.2 1999/11/14 13:39:49 bp Exp $
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogin.1,v 1.4 2000/03/06 09:45:30 sheldonh Exp $
 .Dd Sep 15, 1999
 .Dt NCPLOGIN 1
 .Os FreeBSD 4.0
@@ -26,15 +26,20 @@
 .Sh DESCRIPTION
 Connections to a NetWare server can be created and used independently from
 .Xr mount_nwfs 8
-command. Connection can be created by any user. Each user can have multiple
+command.
+Connection can be created by any user.
+Each user can have multiple
 connections, but 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
+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
+to use.
+This connection can be destroyed by
 .Xr ncplogout 1 
 command.
 .Pp
@@ -52,7 +57,8 @@
 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
+name of NetWare server to connect.
+This affect only IPX severs for native IP
 see 
 .Fl A
 option.
@@ -65,8 +71,10 @@
 .It Fl C
 don't convert password to uppercase.
 .It Fl D
-Marks connection as primary. Can be used to modify already established 
-connection. Only
+Marks connection as primary.
+Can be used to modify already established 
+connection.
+Only
 .Nm
 program accept that option.
 .It Fl I Ar signature_level
@@ -81,7 +89,8 @@
 .Ed
 Please note that only packet headers signing are implemented.
 .It Fl M Ar mode
-Just like files connections can be shared by users. The bits in
+Just like files connections can be shared by users.
+The bits in
 .Ar mode
 argument behaves much like file permissions:
 .Bd -literal -offset indent
@@ -91,50 +100,62 @@
 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*
+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. If there is more than one such 
-connection it try to figure out which is primary. Primary flag controlled
+1. Try to find connection owned by user.
+If there is more than one such 
+connection it try to figure out which is primary.
+Primary flag controlled
 by
 .Fl D
 option.
 .Pp
 2. If previous fail, first shared connection will be used.
 .It Fl N
-don't ask for a password. While loading
+don't ask for a password.
+While loading
 .Nm
 reads ~/.nwfsrc file to get additional configuration parameters and
-password. If no password found for the specified SERVER:USER pair,
+password.
+If no password found for the specified SERVER:USER pair,
 .Nm
 prompts for it.
 .It Fl O
 Just like files, connection has 
 .Ar owner and
 .Ar group
-attributes. Newly created connection takes
+attributes.
+Newly created connection takes
 .Ar owner
 parameter from creator's userid and
 .Ar group
 paramter
 from creator's primary group.
-This can be overrided with this option. Only superuser can override an
+This can be overrided with this option.
+Only superuser can override an
 .Ar owner
 parameter.
 .It Fl P
 Marks connection as permanent.
 .Nm
-always create permanent connection. This option can be used in other ncp*
+always create permanent connection.
+This option can be used in other ncp*
 programs.
 .It Fl R Ar retry_count
-specifies number of retries before drop the connection. The default value is 10.
+specifies number of retries before drop 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.
 .It Fl W Ar timeout
-This specifies server request timeout in seconds. The default is 5 seconds.
+This specifies 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
 .Fl S
@@ -145,12 +166,14 @@
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact
 .It Pa ~/.nwfsrc
-keeps static parameters for connections and other information. See
+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
+Low level connection management performed by ncp.ko module.
+For an IPX
 protocol it is also necessary to load IPXrouted program.
 
 .Sh BUGS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ncplogout.1 man1/ncplogout.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/ncplogout.1	Thu Jan 27 23:36:58 2000
+++ man1/ncplogout.1	Tue Mar 21 06:31:47 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.2 1999/11/14 13:39:49 bp Exp $
+.\" $FreeBSD: src/usr.bin/ncplogin/ncplogout.1,v 1.3 2000/03/01 12:20:05 sheldonh Exp $
 .Dd Sep 15, 1999
 .Dt NCPLOGOUT 1
 .Os FreeBSD 4.0
@@ -18,20 +18,25 @@
 .Nm
 will shedule 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 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 
 logout.exe command.
 .Pp
 The options are:
 .Bl -tag -width indent
 .It Fl S Ar server
-name of Netware server to identify connection. Can be omitted if there is only
+name of Netware server to identify connection.
+Can be omitted if there is only
 one connection active.
 .It Fl U Ar user
-name of user used to identify connection. Can be omitted if there is only
+name of user used to identify 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 connection by handle.
+List of available handles can be obtained via
 .Bd -literal -offset indent
 	ncplist c
 .Ed
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/netstat.1 man1/netstat.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/netstat.1	Thu Jan 27 23:36:21 2000
+++ man1/netstat.1	Tue Mar 21 06:31:31 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.20 1999/12/13 20:08:44 guido Exp $
+.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.22 2000/03/11 14:33:13 shin Exp $
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
@@ -40,7 +40,7 @@
 .Nd show network status
 .Sh SYNOPSIS
 .Nm netstat
-.Op Fl AaLn
+.Op Fl AaLln
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -198,10 +198,13 @@
 .Ar protocol,
 respectively.
 .It Fl L
-Show the size of the various listen queues. The first count shows the
+Show the size of the various listen queues.
+The first count shows the
 number of unaccepted connections.
 The second count shows the amount of unaccepted incomplete connections.
 The third count is the maximum number of queued connections.
+.It Fl l
+Print full IPv6 address.
 .It Fl M
 Extract values associated with the name list from the specified core
 instead of the default
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/passwd.1 man1/passwd.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/passwd.1	Thu Jan 27 23:36:25 2000
+++ man1/passwd.1	Tue Mar 21 06:31:33 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.16 1999/08/28 01:04:51 peter Exp $
+.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.18 2000/03/01 12:20:07 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
@@ -70,8 +70,17 @@
 Its total length must be less than
 .Dv _PASSWORD_LEN
 (currently 128 characters).
-Numbers, upper case letters and meta characters
-are encouraged.
+.Pp
+The new password should contain a mixture of upper and lower case
+characters (which may be overridden using the
+.Xr login.conf 5
+.if t ``mixpasswordcase''
+.if n "mixpasswordcase"
+setting for a user's login class).  Allowing lower case passwords may
+be useful where the password file will be used in situations where only
+lower case passwords are permissable, such as when using Samba to
+authenticate Windows clients.  In all other situations, numbers, upper
+case letters and meta characters are encouraged.
 .Pp
 Once the password has been verified,
 .Nm passwd
@@ -101,13 +110,15 @@
 if only the local password is modified.
 .Sh NIS INTERACTION
 .Nm Passwd
-has built-in support for NIS. If a user exists in the NIS password
+has built-in support for NIS.
+If a user exists in the NIS password
 database but does not exist locally,
 .Nm passwd
 automatically switches into 
 .if t ``yppasswd''
 .if n "yppasswd"
-mode. If the specified
+mode.
+If the specified
 user does not exist in either the local password database of the
 NIS password maps,
 .Nm passwd
@@ -120,9 +131,11 @@
 it will allow any changes to the NIS password maps).
 This restriction applies even to the
 super-user, with one important exception: the password authentication is
-bypassed for the super-user on the NIS master server. This means that
+bypassed for the super-user on the NIS master server.
+This means that
 the super-user on the NIS master server can make unrestricted changes to
-anyone's NIS password. The super-user on NIS client systems and NIS slave
+anyone's NIS password.
+The super-user on NIS client systems and NIS slave
 servers still needs to provide a password before the update will be processed.
 .Pp
 The following additional options are supported for use with NIS:
@@ -142,7 +155,8 @@
 into 
 .if t ``local only''
 .if n "local only"
-mode. This flag can be used to change the entry
+mode.
+This flag can be used to change the entry
 for a local user when an NIS user exists with the same login name.
 For example, you will sometimes find entries for system 
 .if t ``placeholder''
@@ -151,28 +165,35 @@
 .Pa bin
 or
 .Pa daemon
-in both the NIS password maps and the local user database. By
+in both the NIS password maps and the local user database.
+By
 default,
 .Nm passwd
-will try to change the NIS password. The
+will try to change the NIS password.
+The
 .Fl l
 flag can be used to change the local password instead.
 .It Fl d Ar domain
-Specify what domain to use when changing an NIS password. By default,
+Specify what domain to use when changing an NIS password.
+By default,
 .Nm passwd
-assumes that the system default domain should be used. This flag is
+assumes that the system default domain should be used.
+This flag is
 primarily for use by the superuser on the NIS master server: a single
-NIS server can support multiple domains. It is also possible that the
+NIS server can support multiple domains.
+It is also possible that the
 domainname on the NIS master may not be set (it is not necessary for
 an NIS server to also be a client) in which case the
 .Nm passwd
 command needs to be told what domain to operate on.
 .It Fl s Ar host
-Specify the name of an NIS server. This option, in conjunction
+Specify the name of an NIS server.
+This option, in conjunction
 with the
 .Fl d
 option, can be used to change an NIS password on a non-local NIS
-server. When a domain is specified with the
+server.
+When a domain is specified with the
 .Fl d
 option and
 .Nm passwd
@@ -183,14 +204,16 @@
 .if n "localhost".
 This can be overidden with the
 .Fl s
-flag. The specified hostname need not be the name of an NIS master: the
+flag.
+The specified hostname need not be the name of an NIS master: the
 name of the NIS master for a given map can be determined by querying any
 NIS server (master or slave) in a domain, so specifying the name of a
 slave server will work equally well.
 .Pp
 .It Fl o
 Do not automatically override the password authentication checks for the
-super-user on the NIS master server; assume 'old' mode instead. This
+super-user on the NIS master server; assume 'old' mode instead.
+This
 flag is of limited practical use but is useful for testing.
 .El
 .Sh FILES
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pax.1 man1/pax.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pax.1	Thu Jan 27 23:30:32 2000
+++ man1/pax.1	Tue Mar 21 06:28:24 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/pax/pax.1,v 1.10 1999/08/27 23:14:44 peter Exp $
+.\" $FreeBSD: src/bin/pax/pax.1,v 1.12 2000/03/02 14:53:22 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -480,7 +480,8 @@
 .It Fl k
 Do not overwrite existing files.
 .It Fl l
-Link files. (The letter ell).
+Link files.
+(The letter ell).
 In the
 .Em copy
 mode (
@@ -623,7 +624,8 @@
 .Cm g
 continues to apply the substitution expression to the pathname substring
 which starts with the first character following the end of the last successful
-substitution. The first unsuccessful substitution stops the operation of the
+substitution.
+The first unsuccessful substitution stops the operation of the
 .Cm g
 option.
 The optional trailing
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_add.1 man1/pkg_add.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_add.1	Thu Jan 27 23:37:42 2000
+++ man1/pkg_add.1	Tue Mar 21 06:32:12 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.33 1999/09/01 10:04:42 jkh Exp $
+.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.35 2000/03/01 14:08:59 sheldonh Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_ADD 1
@@ -71,7 +71,8 @@
 .It Ar pkg-name [... pkg-name]
 The named packages are installed.  A package name of - will cause
 .Nm
-to read from stdin. If the packages are not found in the current
+to read from stdin.
+If the packages are not found in the current
 working directory, 
 .Nm
 will search them in each directory named by
@@ -89,7 +90,8 @@
 that you cannot deinstall it later, so only use this option if
 you know what you are doing!
 .It Fl r
-Use the remote fetching feature. This will determine the appropriate
+Use the remote fetching feature.
+This will determine the appropriate
 objformat and release and then fetch and install the package. 
 .It Fl f
 Force installation to proceed even if prerequisite packages are not
@@ -344,7 +346,8 @@
 .Ar install
 script that does both
 .Dq before and after
-actions. But, separating the
+actions.
+But, separating the
 functionality is more advantageous and easier from a maintainence viewpoint.
 .It
 After installation is complete, a copy of the packing list,
@@ -378,7 +381,8 @@
 .Ev PKG_PATH
 is used if a given package can't be found.  The environment variable
 should be a series of entries seperated by colons.  Each entry
-consists of a directory name. The current directory may be indicated
+consists of a directory name.
+The current directory may be indicated
 implicitly by an empty directory name, or explicitly by a single
 period.
 .Pp
@@ -407,7 +411,8 @@
 .Ev PACKAGESITE
 specifies an alternate location for 
 .Nm
-to fetch from. This variable subverts the automatic directory logic
+to fetch from.
+This variable subverts the automatic directory logic
 that
 .Nm
 uses when the 
@@ -438,6 +443,7 @@
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1 ,
 .Xr mktemp 3 ,
 .Xr sysconf 3 ,
 .Xr mtree 8
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_create.1 man1/pkg_create.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_create.1	Thu Jan 27 23:37:42 2000
+++ man1/pkg_create.1	Tue Mar 21 06:32:12 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.31 1999/09/11 03:52:24 max Exp $	
+.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.35 2000/03/01 14:09:01 sheldonh Exp $	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
@@ -110,7 +110,8 @@
 .Ar iscript
 to be the pre-install procedure for the package.  This can be any executable
 program (or shell script).  It will be invoked automatically when the
-package is later installed. It will be passed the package's name as the
+package is later installed.
+It will be passed the package's name as the
 first argument.
 
 .Cm Note:
@@ -128,7 +129,8 @@
 .Ar piscript
 to be the post-install procedure for the package.  This can be any
 executable program (or shell script).  It will be invoked automatically
-when the package is later installed. It will be passed the package's name as
+when the package is later installed.
+It will be passed the package's name as
 the first argument.
 .It Fl P Ar pkgs
 Set the initial package dependency list to
@@ -149,7 +151,8 @@
 .Ar dscript
 to be the de-install procedure for the package.  This can be any executable
 program (or shell script).  It will be invoked automatically when the
-package is later (if ever) de-installed. It will be passed the package's
+package is later (if ever) de-installed.
+It will be passed the package's
 name as the first argument.
 
 .Cm Note:
@@ -167,7 +170,8 @@
 .Ar pdscript
 to be the post-deinstall procedure for the package.  This can be any
 executable program (or shell script).  It will be invoked automatically when
-the package is later de-installed. It will be passed the package's name as
+the package is later de-installed.
+It will be passed the package's name as
 the first argument.
 
 .It Fl r Ar rscript
@@ -218,8 +222,7 @@
 .Fl -help
 flag) for further information on using this flag.
 .It Fl D Ar displayfile
-Display the file (using
-.Xr more 1 )
+Display the file (by concatenating it to stdout)
 after installing the package.  Useful for things like
 legal notices on almost-free software, etc.
 .It Fl m Ar mtreefile
@@ -374,7 +377,7 @@
 something) yet have the installer ignore it.
 .It Cm @name Ar name
 Set the name of the package.  This is mandatory and is usually
-put at the top.  This name is potentially different than the name of
+put at the top.  This name is potentially different from the name of
 the file it came in, and is used when keeping track of the package
 for later deinstallation.  Note that
 .Nm
@@ -458,6 +461,7 @@
 .Xr pkg_add 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1 ,
 .Xr sysconf 3
 .Sh HISTORY
 The
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_delete.1 man1/pkg_delete.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_delete.1	Thu Jan 27 23:37:43 2000
+++ man1/pkg_delete.1	Tue Mar 21 06:32:12 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.15 1999/09/01 10:04:46 jkh Exp $
+.\" $FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.16 2000/02/29 15:13:53 jhb Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_DELETE 1
@@ -237,6 +237,7 @@
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1 ,
 .Xr mktemp 3 ,
 .Xr mtree 8
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_info.1 man1/pkg_info.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_info.1	Thu Jan 27 23:37:43 2000
+++ man1/pkg_info.1	Tue Mar 21 06:32:13 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.23 2000/01/07 13:25:53 phantom Exp $
+.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.24 2000/02/29 15:13:54 jhb Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_INFO 1
@@ -164,6 +164,7 @@
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
+.Xr pkg_version 1 ,
 .Xr mktemp 3 ,
 .Xr mtree 8
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_version.1 man1/pkg_version.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pkg_version.1	Thu Jan 27 23:37:43 2000
+++ man1/pkg_version.1	Tue Mar 21 06:32:13 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.3 1999/12/03 06:08:11 billf Exp $
+.\"	$FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.5 2000/03/01 14:09:02 sheldonh Exp $
 .Dd July 17, 1998
 .Dt PKG_VERSION 1
 .Os FreeBSD
@@ -105,7 +105,8 @@
 .Xr fetch 1 ,
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
-.Xr pkg_delete 1 .
+.Xr pkg_delete 1 ,
+.Xr pkg_info 1
 .Sh FILES
 .Bl -tag -width /usr/ports/INDEX -compact
 .It Pa /usr/ports/INDEX
@@ -125,11 +126,13 @@
 .Dl % pkg_version ftp://ftp.FreeBSD.org/pub/FreeBSD/ports-current/INDEX
 .Pp
 The command below generates a file of commands to run to update the installed
-files. It is
+files.
+It is
 .Bf Em
 not
 .Ef
-suggested that you run these commands automatically. Always review the
+suggested that you run these commands automatically.
+Always review the
 suggestions, and then cut-and-paste (or retype) the commands you want to run.
 .Pp
 .Dl % pkg_version -c > do_update
@@ -149,7 +152,8 @@
 that don't change the version number (e.g. small delta bugfixes in the
 package/port itself) aren't detected.
 .Pp
-Commands output doesn't know about dependencies between packages. For
+Commands output doesn't know about dependencies between packages.
+For
 example, you might have two versions of Tcl installed because two other
 packages require the different versions.
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pr.1 man1/pr.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/pr.1	Thu Jan 27 23:36:25 2000
+++ man1/pr.1	Tue Mar 21 06:31:33 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/usr.bin/pr/pr.1,v 1.8 1999/11/30 15:09:25 ache Exp $
+.\" $FreeBSD: src/usr.bin/pr/pr.1,v 1.9 2000/03/01 12:20:07 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt PR 1
@@ -159,7 +159,8 @@
 .Fl column
 option.
 .It Fl d
-Produce output that is double spaced. An extra
+Produce output that is double spaced.
+An extra
 .Em <newline>
 character is output following every
 .Em <newline>
@@ -266,7 +267,8 @@
 If
 .Ar char
 (any nondigit character) is given, it is appended to the line number to
-separate it from whatever follows. The default for
+separate it from whatever follows.
+The default for
 .Ar char
 is a
 .Em <tab> .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/printenv.1 man1/printenv.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/printenv.1	Thu Jan 27 23:36:26 2000
+++ man1/printenv.1	Tue Mar 21 06:31:33 2000
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/printenv/printenv.1,v 1.5 1999/08/28 01:04:56 peter Exp $
+.\" $FreeBSD: src/usr.bin/printenv/printenv.1,v 1.6 2000/03/01 12:20:08 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
@@ -79,7 +79,8 @@
 .It Fl i
 Execute the
 .Ar command
-with only those environment values specified. The environment inherited
+with only those environment values specified.
+The environment inherited
 by
 .Nm env
 is ignored completely.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rdist.1 man1/rdist.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rdist.1	Thu Jan 27 23:36:27 2000
+++ man1/rdist.1	Tue Mar 21 06:31:34 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
-.\" $FreeBSD: src/usr.bin/rdist/rdist.1,v 1.12 1999/08/28 01:05:08 peter Exp $
+.\" $FreeBSD: src/usr.bin/rdist/rdist.1,v 1.13 2000/03/01 12:20:08 sheldonh Exp $
 .\"
 .Dd March 17, 1994
 .Dt RDIST 1
@@ -90,7 +90,8 @@
 will update all of the files and directories listed in
 .Ar distfile  .
 Otherwise, the argument is taken to be the name of a file to be updated
-or the label of a command to execute. If label and file names conflict,
+or the label of a command to execute.
+If label and file names conflict,
 it is assumed to be a label.
 These may be used together to update specific files
 using specific commands.
@@ -141,7 +142,8 @@
 can be the empty string, one name, or a list of names surrounded by
 parentheses and separated by tabs and/or spaces.
 .It Fl h
-Follow symbolic links. Copy the file that the link points to rather than the
+Follow symbolic links.
+Copy the file that the link points to rather than the
 link itself.
 .It Fl i
 Ignore unresolved links.
@@ -149,42 +151,53 @@
 will normally try to maintain the link structure of files being transferred
 and warn the user if all the links cannot be found.
 .It Fl m Ar host
-Limit which machines are to be updated. Multiple
+Limit which machines are to be updated.
+Multiple
 .Fl m
 arguments can be given to limit updates to a subset of the hosts listed in the
 .Ar distfile  .
 .It Fl n
-Print the commands without executing them. This option is
+Print the commands without executing them.
+This option is
 useful for debugging
 .Ar distfile  .
 .It Fl q
-Quiet mode. Files that are being modified are normally
-printed on standard output. The
+Quiet mode.
+Files that are being modified are normally
+printed on standard output.
+The
 .Fl q
 option suppresses this.
 .It Fl R
-Remove extraneous files. If a directory is being updated, any files that exist
+Remove extraneous files.
+If a directory is being updated, any files that exist
 on the remote host that do not exist in the master directory are removed.
 This is useful for maintaining truly identical copies of directories.
 .It Fl v
-Verify that the files are up to date on all the hosts. Any files
+Verify that the files are up to date on all the hosts.
+Any files
 that are out of date will be displayed but no files will be changed
 nor any mail sent.
 .It Fl w
-Whole mode. The whole file name is appended to the destination directory
-name. Normally, only the last component of a name is used when renaming files.
+Whole mode.
+The whole file name is appended to the destination directory
+name.
+Normally, only the last component of a name is used when renaming files.
 This will preserve the directory structure of the files being
-copied instead of flattening the directory structure. For example,
+copied instead of flattening the directory structure.
+For example,
 renaming a list of files such as ( dir1/f1 dir2/f2 ) to dir3 would create
 files dir3/dir1/f1 and dir3/dir2/f2 instead of dir3/f1 and dir3/f2.
 .It Fl y
-Younger mode. Files are normally updated if their
+Younger mode.
+Files are normally updated if their
 .Ar mtime
 and
 .Ar size
 (see
 .Xr stat  2  )
-disagree. The
+disagree.
+The
 .Fl y
 option causes
 .Nm
@@ -199,7 +212,8 @@
 .Ar Distfile
 contains a sequence of entries that specify the files
 to be copied, the destination hosts, and what operations to perform
-to do the updating. Each entry has one of the following formats.
+to do the updating.
+Each entry has one of the following formats.
 .Pp
 .Bd -literal -offset indent -compact
 <variable name> `=' <name list>
@@ -223,10 +237,12 @@
 if the file is out of date on the host which is being updated (second format) or
 the file is newer than the time stamp file (third format).
 .Pp
-Labels are optional. They are used to identify a command for partial updates.
+Labels are optional.
+They are used to identify a command for partial updates.
 .Pp
 Newlines, tabs, and blanks are only used as separators and are
-otherwise ignored. Comments begin with `#' and end with a newline.
+otherwise ignored.
+Comments begin with `#' and end with a newline.
 .Pp
 Variables to be expanded begin with `$' followed by one character or
 a name enclosed in curly braces (see the examples at the end).
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rpcgen.1 man1/rpcgen.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rpcgen.1	Thu Jan 27 23:36:28 2000
+++ man1/rpcgen.1	Tue Mar 21 06:31:34 2000
@@ -1,5 +1,5 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
-.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.10 2000/01/23 01:48:15 mpp Exp $
+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.12 2000/03/01 12:20:08 sheldonh Exp $
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .Dd March 28, 1993
 .Dt RPCGEN 1
@@ -87,7 +87,8 @@
 .Pp
 .Nm Rpcgen
 can also generate sample client and server files
-that can be customized to suit a particular application. The
+that can be customized to suit a particular application.
+The
 .Fl \&Sc ,
 .Fl \&Ss
 and
@@ -95,7 +96,8 @@
 options generate sample client, server and makefile, respectively. 
 The
 .Fl a
-option generates all files, including sample files. If the
+option generates all files, including sample files.
+If the
 .Ar infile
 is
 .Pa proto.x ,
@@ -286,7 +288,8 @@
 dispatch tables.
 .It Fl i Ar size
 Size at which to start generating inline code.
-This option is useful for optimization. The default size is 5.
+This option is useful for optimization.
+The default size is 5.
 .Pp
 Note: in order to provide backwards compatibility with the older
 .Nm
@@ -371,8 +374,10 @@
 routine to do initialization.
 .It Fl M
 Generate multithread-safe stubs for passing arguments and results between
-rpcgen generated code and user written code. This option is useful 
-for users who want to use threads in their code. However, the
+rpcgen generated code and user written code.
+This option is useful 
+for users who want to use threads in their code.
+However, the
 .Xr rpc_svc_calls 3
 functions are not yet MT-safe, which means that rpcgen generated server-side
 code will not be MT-safe.
@@ -509,5 +514,5 @@
 .Xr inetd 8
 .\" .BR rpc_svc_calls (3)
 .Rs
-.%T The Nm rpcgen No chapter in the NETP manual
+.%T The rpcgen chapter in the NETP manual
 .Re
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rtprio.1 man1/rtprio.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rtprio.1	Thu Jan 27 23:37:53 2000
+++ man1/rtprio.1	Tue Mar 21 06:32:17 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.18 1999/11/27 17:10:35 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.19 2000/03/01 14:07:43 sheldonh Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -198,7 +198,8 @@
 starve normal priority processes.
 .Sh AUTHORS
 .An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk
-is the original author. This
+is the original author.
+This
 implementation in
 .Bx Free
 was substantially rewritten by
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rusers.1 man1/rusers.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rusers.1	Thu Jan 27 23:36:30 2000
+++ man1/rusers.1	Tue Mar 21 06:31: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.7 1999/08/28 01:05:29 peter Exp $
+.\" $FreeBSD: src/usr.bin/rusers/rusers.1,v 1.8 2000/03/01 12:20:09 sheldonh Exp $
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
@@ -48,9 +48,11 @@
 command produces output similar to
 .Xr who ,
 but for the list of hosts or all machines on the local
-network. For each host responding to the rusers query,
+network.
+For each host responding to the rusers query,
 the hostname with the names of the users currently logged
-on is printed on each line. The rusers command will wait for
+on is printed on each line.
+The rusers command will wait for
 one minute to catch late responders.
 .Pp
 The following options are available:
@@ -58,7 +60,8 @@
 .It Fl a
 Print all machines responding even if no one is currently logged in.
 .It Fl l
-Print a long format listing. This includes the user name, host name,
+Print a long format listing.
+This includes the user name, host name,
 tty that the user is logged in to, the date and time the user
 logged in, the amount of time since the user typed on the keyboard,
 and the remote host they logged in from (if applicable).
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rwall.1 man1/rwall.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/rwall.1	Thu Jan 27 23:36:30 2000
+++ man1/rwall.1	Tue Mar 21 06:31: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.6 1999/08/28 01:05:31 peter Exp $
+.\" $FreeBSD: src/usr.bin/rwall/rwall.1,v 1.7 2000/03/01 12:20:09 sheldonh 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. The
+command sends a message to the users logged into the specified host.
+The
 message to be sent can be typed in and terminated with EOF or it can
 be in a
 .Ar file .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sasc.1 man1/sasc.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sasc.1	Thu Jan 27 23:36:59 2000
+++ man1/sasc.1	Tue Mar 21 06:31:47 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.8 1999/08/28 01:05:34 peter Exp $
+.\" $FreeBSD: src/usr.bin/sasc/sasc.1,v 1.9 2000/03/01 12:20:10 sheldonh Exp $
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
@@ -49,10 +49,12 @@
 The
 .Nm
 utility provides shell level access to the ioctl
-requests served by the handy scanner device driver asc. Please see
+requests served by the handy scanner device driver asc.
+Please see
 .Xr asc 4
 for the exact meaning of the requests.  Generally they modify
-the output and behavior of the asc scanner device. When
+the output and behavior of the asc scanner device.
+When
 .Nm
 is called with no option only the current settings are reported.
 .Sh OPTIONS
@@ -65,9 +67,11 @@
 Normally the parameters are shown after the modifications have been
 performed.
 .It Fl f Ar file
-Operate on a different scanner device node given by filename. Note
+Operate on a different scanner device node given by filename.
+Note
 that even though there may exist more than one node of scanner device
-several of them will refer the same device unit. The modifications are
+several of them will refer the same device unit.
+The modifications are
 performed od the unit regardless of the device node by which it is
 accessed.
 .It Fl r Ar resolution Bq ASC_SRES
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/scon.1 man1/scon.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/scon.1	Thu Jan 27 23:38:19 2000
+++ man1/scon.1	Tue Mar 21 06:32:34 2000
@@ -29,7 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)scon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:30:48 1994]
-.\" $FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.7 1999/08/28 01:17:49 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.8 2000/03/01 14:08:57 sheldonh Exp $
 .\"
 .Dd December 31, 1993
 .Dt SCON 1
@@ -89,12 +89,15 @@
 the command line should be applied to.
 .It Fl f
 Some programs which silently assume 24 lines when they run on a VT220 show
-incorrect behaviour when the terminal has really 25 lines. To support full
+incorrect behaviour when the terminal has really 25 lines.
+To support full
 VT220 behaviour, it is possible to force pcvt to select only 24 lines when
-it is running in 25-lines pure VT mode and/or in 28-lines HP-mode. The
+it is running in 25-lines pure VT mode and/or in 28-lines HP-mode.
+The
 .Fl f
 option requires one additional parameter, the string 'on' or 'off' to switch
-this mode for a virtual screen on or off respectively. This mode has no effect
+this mode for a virtual screen on or off respectively.
+This mode has no effect
 if any other vertical resolutions are selected than the two above mentioned.
 .It Fl h
 Prints a usage/help text.
@@ -112,14 +115,17 @@
 Switch the specified/current screen into a pure VT220 mode without recognizing
 any HP escape sequences and without displaying function key labels.
 .It Fl H
-Switch the specified/current screen into a mixed HP/VT220 mode. That is, that
+Switch the specified/current screen into a mixed HP/VT220 mode.
+That is, that
 in addition to the full VT220 emulation, the HP function key labels and the
 escape sequences for handling the labels are available to the user.
 .It Fl s
-Specify the number of character lines on the screen. Possible parameters are
+Specify the number of character lines on the screen.
+Possible parameters are
 25, 28, 35, 40, 43 or 50. To use all this screen sizes, the fonts required
 for proper operation of a desired size have to be downloaded to the EGA/VGA
-font ram. This option is available only for EGA and VGA boards.
+font ram.
+This option is available only for EGA and VGA boards.
 .It Fl p
 Modify VGA palette
 .Pq DAC .
@@ -132,7 +138,8 @@
 .Fl V .
 Naturally, option
 .Fl p
-is available only for VGA boards. Three flavors are available.
+is available only for VGA boards.
+Three flavors are available.
 
 If used with argument
 .Dq Ar default ,
@@ -143,13 +150,17 @@
 
 If used with argument
 .Dq Ar list ,
-the current VGA DAC palette entries are listed. Each entry contains
+the current VGA DAC palette entries are listed.
+Each entry contains
 the table index, values for red, green, and blue, and if there's a
-known name for this entry, the color name. Trailing empty table
+known name for this entry, the color name.
+Trailing empty table
 slots (RGB values all zero) are omitted.
 
-Otherwise, four comma-separated arguments are expected. The first
-denotes the number of palette entry to be modified. This may be either
+Otherwise, four comma-separated arguments are expected.
+The first
+denotes the number of palette entry to be modified.
+This may be either
 a number between 0 and 255, or the usual name of an associated color
 .Pq case-insensitive .
 The following values for red, green and blue are restricted to 0 through 63
@@ -166,11 +177,13 @@
 .It Fl t
 Specifying
 .Fl t
-will activate the screen saver. The behaviour depends on
+will activate the screen saver.
+The behaviour depends on
 .Ar timeout :
 if
 .Ar timeout
-is given as 0, the screen saver is turned off. Otherwise,
+is given as 0, the screen saver is turned off.
+Otherwise,
 .Ar timeout
 is taken as a number of seconds to wait until activating the
 screen saver.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/script.1 man1/script.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/script.1	Thu Jan 27 23:36:31 2000
+++ man1/script.1	Tue Mar 21 06:31:35 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/script/script.1,v 1.9 1999/12/13 23:37:56 billf Exp $
+.\" $FreeBSD: src/usr.bin/script/script.1,v 1.12 2000/03/06 23:06:11 green Exp $
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
@@ -109,9 +109,8 @@
 .Xr vi 1 ,
 create garbage in the typescript file.
 .Nm Script
-works best with commands that do not manipulate the
-screen, the results are meant to emulate a hardcopy
-terminal.
+works best with commands that do not manipulate the screen.
+The results are meant to emulate a hardcopy terminal, not an addressable one.
 .Sh ENVIRONMENT
 The following environment variable is utilized by
 .Nm script :
@@ -121,10 +120,12 @@
 .Ev SHELL
 exists, the shell forked by
 .Nm
-will be that shell. If
+will be that shell.
+If
 .Ev SHELL
 is not set, the Bourne shell
-is assumed. (Most shells set this variable automatically).
+is assumed.
+(Most shells set this variable automatically).
 .El
 .Sh SEE ALSO
 .Xr csh 1
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sed.1 man1/sed.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sed.1	Thu Jan 27 23:36:31 2000
+++ man1/sed.1	Tue Mar 21 06:31:35 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/usr.bin/sed/sed.1,v 1.8 1999/12/29 22:22:32 steve Exp $
+.\" $FreeBSD: src/usr.bin/sed/sed.1,v 1.9 2000/02/15 03:00:47 unfurl Exp $
 .\"
 .Dd December 30, 1993
 .Dt SED 1
@@ -140,12 +140,16 @@
 A command line with one address selects all of the pattern spaces
 that match the address.
 .Pp
-A command line with two addresses selects the inclusive range from
-the first pattern space that matches the first address through the next
-pattern space that matches the second.
-(If the second address is a number less than or equal to the line number
-first selected, only that line is selected.)
-Starting at the first line following the selected range,
+A command line with two addresses selects an inclusive range.  This
+range starts with the first pattern space that matches the first
+address.  The end of the range is the next following pattern space
+that matches the second address.  If the second address is a number
+less than or equal to the line number first selected, only that
+line is selected.  In the case when the second address is a context
+address, sed does not re-match the second address against the
+pattern space that matched the first address.  Starting at the
+first line following the selected range, sed starts looking again
+for the first address.
 .Nm
 starts looking again for the first address.
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sgsc.1 man1/sgsc.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sgsc.1	Thu Jan 27 23:38:22 2000
+++ man1/sgsc.1	Tue Mar 21 06:32:35 2000
@@ -27,7 +27,7 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\"
-.\" $FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.7 1999/11/27 17:13:08 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.8 2000/03/01 14:07:44 sheldonh Exp $
 .\"
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .Dd January 6, 1995
@@ -49,10 +49,12 @@
 The
 .Nm
 utility provides shell level access to the ioctl
-requests served by the handy scanner device driver gsc. Please see
+requests served by the handy scanner device driver gsc.
+Please see
 .Xr gsc 4
 for the exact meaning of the requests.  Generally they modify
-the output and behaviour of the gsc scanner device. When
+the output and behaviour of the gsc scanner device.
+When
 .Nm
 is called with no option only the current settings are reported.
 .Pp
@@ -65,9 +67,11 @@
 Normally the parameters are shown after the modifications have been
 performed.
 .It Fl f Ar file
-Operate on a different scanner device node given by filename. Note
+Operate on a different scanner device node given by filename.
+Note
 that even though there may exist more than one node of scanner device
-several of them will refer the same device unit. The modifications are
+several of them will refer the same device unit.
+The modifications are
 performed od the unit regardless of the device node by which it is
 accessed.
 .It Fl r Ar resolution [GSC_SRES]
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/skey.1 man1/skey.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/skey.1	Thu Jan 27 23:29:34 2000
+++ man1/skey.1	Tue Mar 21 06:27:35 2000
@@ -1,7 +1,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)skey.1	1.1 	10/28/93
-.\" $FreeBSD: src/lib/libskey/skey.1,v 1.3 1999/08/28 00:05:26 peter Exp $
+.\" $FreeBSD: src/lib/libskey/skey.1,v 1.4 2000/03/02 09:13:24 sheldonh Exp $
 .\"
 .lt 6.0i
 .TH KEY 1 "28 October 1993"
@@ -11,8 +11,10 @@
 .SH DESCRIPTION
 .I S/key
 is a procedure for using one time password to authenticate access to
-computer systems. It uses 64 bits of information transformed by the
-MD4 algorithm. The user supplies the 64 bits in the form of 6 English
+computer systems.
+It uses 64 bits of information transformed by the
+MD4 algorithm.
+The user supplies the 64 bits in the form of 6 English
 words that are generated by a secure computer.
 Example use of the S/key program 
 .I key
@@ -28,7 +30,8 @@
  	>
 .sp
 The programs that are part of the S/Key system are keyinit, key, and
-keyinfo. Keyinit is used to get your ID set up, key is
+keyinfo.
+Keyinit is used to get your ID set up, key is
 used to get the one time password each time,
 keyinfo is used to extract information from the S/Key database.
 .sp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sleep.1 man1/sleep.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sleep.1	Thu Jan 27 23:30:35 2000
+++ man1/sleep.1	Tue Mar 21 06:28:26 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.14 1999/10/28 17:41:33 ru Exp $
+.\" $FreeBSD: src/bin/sleep/sleep.1,v 1.15 2000/03/02 14:53:22 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
@@ -89,7 +89,8 @@
 .Dl (sleep 1800; sh command_file >& errors)&
 .Pp
 This incantation would wait a half hour before
-running the script command_file. (See the
+running the script command_file.
+(See the
 .Xr at 1
 utility.)
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sockstat.1 man1/sockstat.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/sockstat.1	Thu Jan 27 23:36:32 2000
+++ man1/sockstat.1	Tue Mar 21 06:31: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.4 1999/09/06 13:14:24 sheldonh Exp $
+.\" $FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.6 2000/03/01 12:20:10 sheldonh Exp $
 .\"
 .Dd April 13, 1999
 .Dt SOCKSTAT 1
@@ -37,7 +37,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command lists open Internet sockets. The information listed for each
+command lists open Internet sockets.
+The information listed for each
 socket is:
 .Bl -tag -width "FOREIGN ADDRESS"
 .It Li USER
@@ -60,7 +61,8 @@
 .Sh SEE ALSO
 .Xr fstat 1 ,
 .Xr netstat 1 ,
-.Xr inet 4 .
+.Xr inet 4 ,
+.Xr inet6 4 .
 .Sh HISTORY
 The
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/startslip.1 man1/startslip.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/startslip.1	Thu Jan 27 23:34:24 2000
+++ man1/startslip.1	Tue Mar 21 06:30:20 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.15 1999/08/28 00:14:27 peter Exp $
+.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.16 2000/03/01 11:26:55 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
@@ -170,21 +170,26 @@
 .Ev LINE
 environment variable.
 .It Fl K Ar keepalive
-Set SLIP "keep alive" timeout in seconds. If FRAME_END not received during this
-time period, a reconnect will occur. Active "out fill" timeout expected from other
+Set SLIP "keep alive" timeout in seconds.
+If FRAME_END not received during this
+time period, a reconnect will occur.
+Active "out fill" timeout expected from other
 side.
 Default value is no timeout.
 .It Fl O Ar outfill
-Set SLIP "out fill" timeout in seconds. It causes at least one FRAME_END
+Set SLIP "out fill" timeout in seconds.
+It causes at least one FRAME_END
 to be sent during this timeout.
 Needed for "keep alive" timeout on other side.
 Default value is no timeout.
 .It Fl S Ar unit
-Set SLIP unit number directly. Use with caution, no check for two
+Set SLIP unit number directly.
+Use with caution, no check for two
 interfaces with same number made.
 Default is dynamic assignment.
 .It Fl L
-Use uucp-style device locking. You need it unless you start
+Use uucp-style device locking.
+You need it unless you start
 .Nm
 from external program which already does uucp locking.
 Default case is no uucp locking to satisfy such programs.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/stty.1 man1/stty.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/stty.1	Thu Jan 27 23:30:35 2000
+++ man1/stty.1	Tue Mar 21 06:28:26 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/stty/stty.1,v 1.12 1999/08/27 23:15:42 peter Exp $
+.\" $FreeBSD: src/bin/stty/stty.1,v 1.13 2000/03/01 10:43:07 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
@@ -313,7 +313,8 @@
 is set, echo control characters as ^X.  Otherwise control characters
 echo as themselves.
 .It Cm echoprt Pq Fl echoprt
-For printing terminals. If set, echo erased characters backwards within ``\\''
+For printing terminals.
+If set, echo erased characters backwards within ``\\''
 and ``/''.  Otherwise, disable this feature.
 .It Cm noflsh Pq Fl noflsh
 Disable (enable) flush after
@@ -467,7 +468,8 @@
 to a pty.
 .It Cm raw Pq Fl raw
 If set, change the modes of the terminal so that no input or output processing
-is performed. If unset, change the modes of the terminal to some reasonable
+is performed.
+If unset, change the modes of the terminal to some reasonable
 state that performs input and output processing.  Note that since the
 terminal driver no longer has a single
 .Dv RAW
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/su.1 man1/su.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/su.1	Thu Jan 27 23:36:33 2000
+++ man1/su.1	Tue Mar 21 06:31:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD: src/usr.bin/su/su.1,v 1.16 1999/08/28 01:05:55 peter Exp $
+.\" $FreeBSD: src/usr.bin/su/su.1,v 1.17 2000/03/01 12:20:11 sheldonh Exp $
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
@@ -131,7 +131,8 @@
 .Nm
 will fail.
 .It Fl c Ar class
-Use the settings of the specified login class. Only allowed for the super-user.
+Use the settings of the specified login class.
+Only allowed for the super-user.
 .El
 .Pp
 The
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/systat.1 man1/systat.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/systat.1	Thu Jan 27 23:36:35 2000
+++ man1/systat.1	Tue Mar 21 06:31:37 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.21 1999/08/28 01:06:05 peter Exp $
+.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.23 2000/03/02 14:53:32 sheldonh Exp $
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
@@ -46,7 +46,7 @@
 .Nm Systat
 displays various system statistics in a screen oriented fashion
 using the curses screen display library,
-.Xr curses 3 .
+.Xr ncurses 3 .
 .Pp
 While
 .Nm
@@ -239,7 +239,8 @@
 .Tn I/O
 statistics in bar graph form (default).
 .It Cm kbpt
-Toggle the display of kilobytes per transaction. (the default is to
+Toggle the display of kilobytes per transaction.
+(the default is to
 not display kilobytes per transaction).
 .El
 .It Ic swap
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/talk.1 man1/talk.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/talk.1	Thu Jan 27 23:36:36 2000
+++ man1/talk.1	Tue Mar 21 06:31:37 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/talk/talk.1,v 1.5 1999/08/28 01:06:15 peter Exp $
+.\" $FreeBSD: src/usr.bin/talk/talk.1,v 1.6 2000/03/01 12:20:11 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt TALK 1
@@ -80,7 +80,8 @@
 talk: respond with: talk your_name@your_machine
 .Ed
 .Pp
-to the user you wish to talk to. At this point, the recipient
+to the user you wish to talk to.
+At this point, the recipient
 of the message should reply by typing
 .Pp
 .Dl talk \ your_name@your_machine
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/tar.1 man1/tar.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/tar.1	Thu Jan 27 23:32:17 2000
+++ man1/tar.1	Tue Mar 21 06:29:20 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.21 1999/08/27 23:37:02 peter Exp $
+.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.22 2000/03/01 10:40:18 nik Exp $
 .\"
 .Dd 25 August 1997
 .Os FreeBSD
@@ -410,7 +410,6 @@
 .Xr compress 1 ,
 .Xr gzip 1 ,
 .Xr pax 1 ,
-.Xr ft 8 ,
 .Xr rmt 8
 .\" .Sh STANDARDS
 .Sh HISTORY
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/tcopy.1 man1/tcopy.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/tcopy.1	Thu Jan 27 23:36:36 2000
+++ man1/tcopy.1	Tue Mar 21 06:31:37 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\" $FreeBSD: src/usr.bin/tcopy/tcopy.1,v 1.6 1999/08/28 01:06:20 peter Exp $
+.\" $FreeBSD: src/usr.bin/tcopy/tcopy.1,v 1.7 2000/03/01 12:20:12 sheldonh Exp $
 .\"
 .Dd April 17, 1994
 .Dt TCOPY 1
@@ -90,7 +90,8 @@
 .Bx 4.3 .
 .Sh BUGS
 Writting an image of a tape to a file does not preserve much more than
-the raw data. Block size(s) and tape EOF marks are lost which would
+the raw data.
+Block size(s) and tape EOF marks are lost which would
 otherwise be preserved in a tape-to-tape copy.
 
 EOD is determined by two sequential EOF marks with no data between.
@@ -101,6 +102,8 @@
 
 When using the copy/verify option \-c
 .Xr tcopy 1
-does not rewind the tapes prior to start. A rewind is performed
-after writing prior to the verification stage. If one doesn't start
+does not rewind the tapes prior to start.
+A rewind is performed
+after writing prior to the verification stage.
+If one doesn't start
 at BOT then the comparison may not be of the intended data.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/telnet.1 man1/telnet.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/telnet.1	Thu Jan 27 23:36:53 2000
+++ man1/telnet.1	Tue Mar 21 06:31:45 2000
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\" $FreeBSD: src/usr.bin/telnet/telnet.1,v 1.14 1999/08/28 01:06:23 peter Exp $
+.\" $FreeBSD: src/usr.bin/telnet/telnet.1,v 1.15 2000/01/27 09:28:33 shin Exp $
 .\"
-.Dd March 1, 1994
+.Dd January 27, 2000
 .Dt TELNET 1
 .Os BSD 4.2
 .Sh NAME
@@ -564,9 +564,10 @@
 .Tn TELNET
 server at the default port.
 The host specification may be either a host name (see
-.Xr hosts  5  )
-or an Internet address specified in the \*(Lqdot notation\*(Rq (see
-.Xr inet 3 ) .
+.Xr hosts  5  ) ,
+an Internet address specified in the \*(Lqdot notation\*(Rq (see
+.Xr inet 3 ) ,
+or IPv6 host name or IPv6 coloned-hexadecimal addreess.
 The
 .Fl l
 option may be used to specify the user name
@@ -1390,6 +1391,8 @@
 .Nm
 command appeared in
 .Bx 4.2 .
+.Pp
+IPv6 support was added by WIDE/KAME project.
 .Sh NOTES
 .Pp
 On some remote systems, echo has to be turned off manually when in
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/test.1 man1/test.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/test.1	Thu Jan 27 23:30:36 2000
+++ man1/test.1	Tue Mar 21 06:28:26 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/test/test.1,v 1.10 1999/08/27 23:15:48 peter Exp $
+.\" $FreeBSD: src/bin/test/test.1,v 1.11 2000/03/01 10:43:09 sheldonh Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
@@ -94,7 +94,8 @@
 .Ar file
 exists and is a symbolic link.
 This operator is retained for compatibility with previous versions of
-this program. Do not rely on its existence; use
+this program.
+Do not rely on its existence; use
 .Fl L
 instead.
 .It Fl k Ar file
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/tip.1 man1/tip.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/tip.1	Thu Jan 27 23:36:37 2000
+++ man1/tip.1	Tue Mar 21 06:31: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.6 1999/08/28 01:06:35 peter Exp $
+.\" $FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.7 2000/03/01 12:20:21 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
@@ -312,12 +312,14 @@
 .Ar ho  .
 .It Ar login
 (str) Pathname of a login shell script to run once connected; standard input
-and output are redirected to the remote host. Leading tildes in the pathname
+and output are redirected to the remote host.
+Leading tildes in the pathname
 are expanded expansion; abbreviated
 .Ar li  .
 .It Ar logout
 (str) Pathname of a shell script to run before disconnecting; standard input
-and output are redirected to the remote host. Leading tildes in the pathname
+and output are redirected to the remote host.
+Leading tildes in the pathname
 are expanded expansion; abbreviated
 .Ar lo  .
 .It Ar prompt
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/uuencode.1 man1/uuencode.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/uuencode.1	Thu Jan 27 23:36:43 2000
+++ man1/uuencode.1	Tue Mar 21 06:31:41 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.8 1999/08/28 01:07:17 peter Exp $
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.9 2000/03/01 12:20:12 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
@@ -93,7 +93,8 @@
 .Ar file
 and write output to standard output.
 .It Fl s
-Do not strip output pathname to base filename. By default 
+Do not strip output pathname to base filename.
+By default 
 .Nm uudecode 
 deletes any prefix ending with the last slash '/' for security
 purpose.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vacation.1 man1/vacation.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vacation.1	Thu Jan 27 23:36:44 2000
+++ man1/vacation.1	Tue Mar 21 06:31:41 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD: src/usr.bin/vacation/vacation.1,v 1.9 1999/08/28 01:07:19 peter Exp $
+.\" $FreeBSD: src/usr.bin/vacation/vacation.1,v 1.10 2000/03/01 12:20:14 sheldonh Exp $
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
@@ -75,7 +75,8 @@
 in the same manner as those received for the user's
 login name.
 .It Fl d
-Enable debugging mode. See below.
+Enable debugging mode.
+See below.
 .It Fl i
 Initialize the vacation database files.  It should be used
 before you modify your
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vidcontrol.1 man1/vidcontrol.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vidcontrol.1	Thu Jan 27 23:38:00 2000
+++ man1/vidcontrol.1	Tue Mar 21 06:32:22 2000
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.22 1999/10/30 14:25:55 phantom Exp $
+.\" $FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.24 2000/03/01 14:07:45 sheldonh Exp $
 .\"
 .Dd June 30, 1999
 .Dt VIDCONTROL 1
@@ -29,6 +29,7 @@
 .Op Fl i Cm adapter | mode
 .Op Fl l Ar screen_map
 .Op Fl L
+.Op Fl M Ar char
 .Op Fl m Cm on | off
 .Op Fl r Ar foreground Ar background
 .Op Fl s Ar number
@@ -49,7 +50,8 @@
 The following command line options are supported:
 .Bl -tag -width indent
 .It Ar mode
-Select a new video mode. The modes currently recognized are:
+Select a new video mode.
+The modes currently recognized are:
 .Ar 80x25 ,
 .Ar 80x30 ,
 .Ar 80x43 ,
@@ -81,7 +83,8 @@
 .Sx Video Mode Support
 below.
 .It Ar foreground Op Ar background
-Change colors when displaying text. Specify the foreground color
+Change colors when displaying text.
+Specify the foreground color
 (e.g.
 .Dq vidcontrol white ) ,
 or both a foreground and background colors
@@ -102,7 +105,8 @@
 .Ar color .
 This option may not be always supported by the video driver.
 .It Fl c Cm normal | blink | destructive
-Change the cursor appearance. The cursor is either an inverting block 
+Change the cursor appearance.
+The cursor is either an inverting block 
 .Pq Cm normal
 that eventually can 
 .Cm blink .
@@ -122,6 +126,9 @@
 Shows info about the current video adapter.
 .It Fl i Cm mode
 Shows the possible video modes with the current video hardware.
+.It Fl M Ar char
+Sets the base character used to render the mouse pointer to
+.Ar char .
 .It Fl m Cm on | off
 Switch the mouse pointer
 .Cm on
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vidfont.1 man1/vidfont.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vidfont.1	Thu Jan 27 23:37:23 2000
+++ man1/vidfont.1	Tue Mar 21 06:32:03 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.16 2000/01/23 20:20:55 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.17 2000/03/01 14:07:41 sheldonh Exp $
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
@@ -55,7 +55,8 @@
 It is strongly recommended to not choose 
 .Tn MSDOS 
 codepage keymaps
-or fonts. Use the 
+or fonts.
+Use the 
 .Tn ISO 
 standard version if available! 
 .Tn X11 
@@ -73,7 +74,8 @@
 Run as command
 .Xr vidfont 1 .
 .It Fl d , Fl default
-Use default language. Ignore
+Use default language.
+Ignore
 .Ev LANG
 environment variable.
 .It Fl h , Fl help
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vt220keys.1 man1/vt220keys.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/vt220keys.1	Thu Jan 27 23:38:19 2000
+++ man1/vt220keys.1	Tue Mar 21 06:32:34 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.6 1999/08/28 23:20:50 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.7 2000/03/01 14:08:59 sheldonh Exp $
 .\"
 .TH VT220KEYS 1 
 .UC 4
@@ -13,7 +13,8 @@
 .SH DESCRIPTION
 .I Vt220keys
 sets up a "vt220 terminal" in vt200 mode to allow user
-definition of the SHIFTED function keys. Each
+definition of the SHIFTED function keys.
+Each
 \f2keyname\f1 specified on the command line will be loaded with
 the corresponding \f2keystring\f1.  
 A \f2keyname\f1 is one of the  following "words":
@@ -114,7 +115,8 @@
 to press the SHIFT key and ESC to generate the escape sequence.
 .sp
 Some editors, allow other character(s) to be substituted for the 
-escape character. For example with 
+escape character.
+For example with 
 .B emacs
 include this line in your .emacs_pro:
 .br
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/whois.1 man1/whois.1
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man1/whois.1	Thu Jan 27 23:36:49 2000
+++ man1/whois.1	Tue Mar 21 06:31:43 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.13 1999/12/31 12:20:17 ru Exp $
+.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.15 2000/03/02 22:51:17 obrien Exp $
 .\"
 .Dd November 17, 1999
 .Dt WHOIS 1
@@ -58,6 +58,11 @@
 covered neither by
 .Tn APNIC nor by
 .Tn RIPE .
+Contact (handle) information should be looked up by appending "-ARIN" to the
+NIC handle:
+.Pp
+.D1 Ic $ whois -a foo3-ARIN
+.Pp
 .It Fl d
 Use the US Department of Defense
 database.  It contains points of contact for subdomains of
@@ -89,17 +94,25 @@
 .Tn \&.ORG
 and
 .Tn \&.EDU
-domains. NOTE! The registration of these domains is now done by a number of
+domains.
+NOTE! The registration of these domains is now done by a number of
 independent and competing registrars and this database holds no information
 on the domains registered by organizations other than Network Solutions, Inc. 
 Also, note that the InterNIC database
 .Pq Tn whois.internic.net
-is no longer handled by Network Solutions, Inc. For details, see:
+is no longer handled by Network Solutions, Inc.
+For details, see:
 http://www.internic.net/.
+Contact (handle) information should be looked up by prefixing "handle " to the
+NIC handle in the querry:
+.Pp
+.D1 Ic $ whois -i 'handle foo3'
+.Pp
 .It Fl m
 Use the Route Arbiter Database
 .Pq Tn RADB
-database. It contains route policy specifications for a large
+database.
+It contains route policy specifications for a large
 number of operators' networks.
 .It Fl p
 Use the Asia/Pacific Network Information Center

----Next_Part(Mon_May_29_23:25:06_2000_809)----
