From owner-man-jp-reviewer@jp.freebsd.org  Tue May 30 12:43:52 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA69933;
	Tue, 30 May 2000 12:43:52 +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 MAA69916
	for <man-jp-reviewer@jp.freebsd.org>; Tue, 30 May 2000 12:43:44 +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 12wcvZ-0005t0-00; Mon, 29 May 2000 23:42:49 -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:30:11_2000_601)--"
Content-Transfer-Encoding: 7bit
Message-Id: <20000529234108T.horikawa@psinet.com>
Date: Mon, 29 May 2000 23:41:08 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 11514
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 2584
Subject: [man-jp-reviewer 2584] diff to 4.0-RELEASE (man8)
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:30:11_2000_601)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

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

----Next_Part(Mon_May_29_23:30:11_2000_601)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: jdiff_4.0-RELEASE_8
Content-Disposition: attachment; filename=jdiff_4.0-RELEASE_8

Index: man8/IPXrouted.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/IPXrouted.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 IPXrouted.8
--- man8/IPXrouted.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/IPXrouted.8	2000/05/30 03:19:47
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.7 1999/08/28 01:15:00 peter Exp %
+.\" %FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.8 2000/03/01 14:07:47 sheldonh Exp %
 .\"
 .\" jpman %Id: IPXrouted.8,v 1.3 1997/07/27 13:00:54 horikawa Stab %
 .\"
Index: man8/adduser.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/adduser.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 adduser.8
--- man8/adduser.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/adduser.8	2000/05/30 03:19:50
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.28 1999/08/28 01:15:11 peter Exp %
+.\" %FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.30 2000/03/06 09:45:31 sheldonh Exp %
 .\" jpman %Id: adduser.8,v 1.4 1997/08/07 17:53:51 ken Stab %
 .\"
 .Dd January 9, 1995
Index: man8/adjkerntz.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/adjkerntz.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 adjkerntz.8
--- man8/adjkerntz.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/adjkerntz.8	2000/05/30 03:19:52
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.17 1999/08/28 00:12:14 peter Exp %
+.\" %FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.18 2000/03/01 11:26:58 sheldonh Exp %
 .\" jpman %Id: adjkerntz.8,v 1.4 1997/07/26 21:28:35 horikawa Stab %
 .\"
 .Dd April 4, 1996
Index: man8/amd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/amd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 amd.8
--- man8/amd.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/amd.8	2000/05/30 03:19:55
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" %Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp %
-.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.5 1999/11/05 12:56:09 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.6 2000/03/01 10:48:31 nik Exp %
 .\"
 .\" jpman %Id: amd.8,v 1.2 1997/04/15 00:24:08 mutoh Stab %
 .\"
Index: man8/apm.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/apm.8,v
retrieving revision 1.2
diff -u -r1.2 apm.8
--- man8/apm.8	2000/02/23 01:53:30	1.2
+++ man8/apm.8	2000/05/30 03:19:57
@@ -8,7 +8,7 @@
 .\" responsible for the proper functioning of this software, nor does 
 .\" the author assume any responsibility for damages incurred with its 
 .\"
-.\" %FreeBSD: src/usr.sbin/apm/apm.8,v 1.15 2000/01/23 09:59:31 asmodai Exp %
+.\" %FreeBSD: src/usr.sbin/apm/apm.8,v 1.16 2000/03/01 14:07:50 sheldonh Exp %
 .\"
 .\" use.
 .\"
Index: man8/badsect.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/badsect.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 badsect.8
--- man8/badsect.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/badsect.8	2000/05/30 03:19:57
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/badsect/badsect.8,v 1.8 1999/08/28 00:12:27 peter Exp %
+.\" %FreeBSD: src/sbin/badsect/badsect.8,v 1.10 2000/03/01 11:26:59 sheldonh Exp %
 .\" jpman %Id: badsect.8,v 1.2 1997/03/31 13:30:12 horikawa Stab %
 .\"
 .Dd June 5, 1993
@@ -48,9 +48,6 @@
 $BDL>o$N%U%)!<%^%C%?$O!"%P%C%I%;%/%?$r%"%/%;%9$G$-$J$$$h$&$K$7$^$9!#(B
 $B$3$N$H$-!"%U%)!<%^%C%?$O%I%i%$%PMQ$K%P%C%I%;%/%?$N%U%)%o!<%G%#%s%0%F!<%V%k$r(B
 $B:n$j$^$9!#(B
-$B>\$7$/$O(B
-.Xr bad144 8
-$B$r;2>H$7$F$/$@$5$$!#(B
 $B$b$7%I%i%$%P$,I8=`$G%P%C%I%V%m%C%/$r%5%]!<%H$7$F$$$k$J$i$P!"(B
 $B%P%C%I%V%m%C%/$r8IN)$5$;$k$?$a$K$O$=$NJ}K!$r;HMQ$9$Y$-$G$9!#(B
 $B$J$<$J$i$P%P%C%I%V%m%C%/%U%)%o!<%G%#%s%0$O%Q%C%/$r40A4$K8+$;!"(B
@@ -115,7 +112,6 @@
 $B$O$=$N(B inode $B$r!"%P%C%I%V%m%C%/$r4^$`(B
 $BDL>o%U%!%$%k$K%3%s%P!<%H$7$^$9!#(B
 .Sh $B4XO"9`L\(B
-.Xr bad144 8 ,
 .Xr fsck 8
 .Sh $B?GCG(B
 .Nm
Index: man8/boot_i386.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/boot_i386.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 boot_i386.8
--- man8/boot_i386.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/boot_i386.8	2000/05/30 03:20:01
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/sbin/reboot/boot_i386.8,v 1.22 1999/10/15 12:50:18 phantom Exp %
+.\" %FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23 2000/03/03 09:51:45 jkoshy Exp %
 .\"
 .\" jpman %Id: boot_i386.8,v 1.5 1997/12/04 18:33:50 ken Exp %
 .\"
@@ -95,7 +95,7 @@
 $B%V!<%H%V%m%C%/$,%m!<%I$5$l$?$"$H$G!"<!$N$h$&$J%W%m%s%W%H$,8=$l$^$9!#(B
 .Bd -literal
 >> FreeBSD/i386 BOOT
-Default: 0:wd(0,a)/kernel
+Default: 0:ad(0,a)/kernel
 boot:
 .Ed
 .Pp
@@ -130,8 +130,8 @@
 $B$k(B BIOS $B%5%]!<%H$,I,MW$H$J$k$3$H$KCm0U$7$F2<$5$$!#(B
 .Pp
 $B%5%]!<%H$5$l$F$$$k%$%s%?%U%'!<%9$r0J2<$K$"$2$^$9!#(B
-.Bl -tag -width "wdXX" -compact
-.It wd
+.Bl -tag -width "adXX" -compact
+.It ad
 WD100[2367] $B$H$=$N8_49%3%s%H%m!<%i>e$N(B ST506, IDE, ESDI, RLL $B%G%#%9%/(B
 .It fd
 5 1/4" $B$^$?$O(B 3 1/2" $B9bL)EY(B $B%U%m%C%T(B
Index: man8/bootparamd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/bootparamd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bootparamd.8
--- man8/bootparamd.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/bootparamd.8	2000/05/30 03:20:01
@@ -1,7 +1,6 @@
 .\" @(#)bootparamd.8
-.\" %FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.8 1999/08/28 01:15:39 peter Exp %
+.\" %FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.9 2000/03/01 14:09:03 sheldonh Exp %
 .\"
-.\" Original Revision: 1.6
 .\" jpman %Id: bootparamd.8,v 1.3 1997/07/26 21:54:02 horikawa Stab %
 .Dd November 8, 1989
 .Dt BOOTPARAMD 8
Index: man8/camcontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/camcontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 camcontrol.8
--- man8/camcontrol.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/camcontrol.8	2000/05/30 03:20:08
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.18 1999/12/17 00:28:05 ken Exp %
+.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.19 2000/03/01 11:27:01 sheldonh Exp %
 .\"
 .\" jpman %Id: camcontrol.8,v 1.4 1998/12/22 02:35:45 oku Stab %
 .\" WORD: defect list		$B%G%#%U%'%/%H%j%9%H(B[camcontrol.8]
Index: man8/chat.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/chat.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 chat.8
--- man8/chat.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/chat.8	2000/05/30 03:20:12
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" %FreeBSD: src/usr.bin/chat/chat.8,v 1.13 1999/08/28 00:59:32 peter Exp %
+.\" %FreeBSD: src/usr.bin/chat/chat.8,v 1.15 2000/03/02 14:53:27 sheldonh Exp %
 .\" jpman %Id: chat.8,v 1.3 1997/08/31 14:02:42 horikawa Stab %
 .\" SH section heading
 .\" SS subsection heading
Index: man8/chkgrp.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/chkgrp.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 chkgrp.8
--- man8/chkgrp.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/chkgrp.8	2000/05/30 03:20:12
@@ -24,7 +24,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/chkgrp/chkgrp.8,v 1.6 1999/10/17 15:46:58 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.7 2000/03/01 14:07:53 sheldonh Exp %
 .\" jpman %Id: chkgrp.8,v 1.3 1998/10/10 09:04:49 yohta Stab %
 .\"
 .Dd May 5, 1998
Index: man8/chown.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/chown.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 chown.8
--- man8/chown.8	2000/02/15 14:34:58	1.1.1.1
+++ man8/chown.8	2000/05/30 03:20:15
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" %FreeBSD: src/usr.sbin/chown/chown.8,v 1.9 1999/11/27 19:25:07 obrien Exp %
+.\" %FreeBSD: src/usr.sbin/chown/chown.8,v 1.10 2000/03/08 16:31:42 obrien Exp %
 .\"
 .\" jpman %Id: chown.8,v 1.3 1997/05/19 16:59:53 horikawa Stab %
 .\"
@@ -42,23 +42,19 @@
 .Nd $B;XDj$7$?%U%!%$%k$N=jM-<T$*$h$S%0%k!<%W$rJQ99$9$k(B
 .Sh $B=q<0(B
 .Nm chown
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl f
-.Op Fl h
-.Op Fl v
 .Ar owner Ns Op Ar :group
 .Ar
 .Nm chown
+.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: man8/config.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/config.8,v
retrieving revision 1.2
diff -u -r1.2 config.8
--- man8/config.8	2000/02/23 01:53:30	1.2
+++ man8/config.8	2000/05/30 03:20:17
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)config.8	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/usr.sbin/config/config.8,v 1.20 2000/01/23 20:16:21 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/config/config.8,v 1.21 2000/03/01 14:07:54 sheldonh Exp %
 .\"
 .\" jpman %Id: config.8,v 1.2 1997/03/31 13:33:05 horikawa Stab %
 .\"
Index: man8/diskpart.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/diskpart.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 diskpart.8
--- man8/diskpart.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/diskpart.8	2000/05/30 03:20:17
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)diskpart.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/diskpart/diskpart.8,v 1.4 1999/08/28 01:16:04 peter Exp %
+.\" %FreeBSD: src/usr.sbin/diskpart/diskpart.8,v 1.5 2000/03/01 10:42:25 nik Exp %
 .\"
 .\" Original Revision: 1.2
 .\" jpman %Id: diskpart.8,v 1.3 1997/10/11 07:43:12 horikawa Stab %
@@ -69,16 +69,12 @@
 $B$K%G%#%9%/%5%$%:$r@)8B$9$k$3$H$r;X<($7$^$9!#(B
 .El
 .Pp
-.Xr bad144 8
-$B%?%$%W$NITNI%;%/%?%U%)%o!<%G%#%s%0$r9T$&%G%#%9%/$G$O!"(B
+$BITNI%;%/%?%U%)%o!<%G%#%s%0$r9T$&%G%#%9%/$G$O!"(B
 $B$3$N$?$a$NNN0h$ODL>o%G%#%9%/$N:G8e$N%Q!<%F%#%7%g%s$K3NJ]$5$l$^$9$,!"(B
 $B$3$NNN0h$O:n@.$5$l$k%F!<%V%k$K$O1F6A$rM?$($^$;$s!#(B
 $BITNI%;%/%?%U%)%o!<%G%#%s%0$N$?$a$K$O!"%F!<%V%k$NJ#@=%3%T!<$N$?$a$N(B
 1$B%H%i%C%/$H!"ITNI%;%/%?$r%^%C%W$9$k$?$a$N(B 126 $B%;%/%?$N%W!<%k$r3NJ]$9(B
 $B$k$N$K==J,$J%H%i%C%/?t$,M=Ls$5$l$^$9!#(B
-$B>\$7$/$O(B
-.Xr bad144 8
-$B$r;2>H$7$F$/$@$5$$!#(B
 $B%7%j%s%@?t$NG\?t$G$J$$$H$7$F$b!"%G%#%9%/$N:G8e$KITNI(B
 $B%;%/%?CV49$d$=$NB>$N@)8f%(%j%"$N$?$a$NNN0h$r3NJ]$9$kL\E*$G!"(B
 .Fl s
@@ -123,8 +119,7 @@
 .Nm
 $B$O%8%*%a%H%j>pJs$r5a$a$k%W%m%s%W%H$r=P$7$^$9!#(B
 .Sh $B4XO"9`L\(B
-.Xr disktab 5 ,
-.Xr bad144 8
+.Xr disktab 5
 .Sh $B%P%0(B
 $B%G%U%)%k%H$N%Q!<%F%#%7%g%s%5%$%:$N$[$H$s$I$O(B(RP06 $B$N$h$&$J(B)$B2a5n$N0d(B
 $BJ*$K4p$E$$$F$$$k$N$G!"K~B-$N$$$+$J$$G[CV$K$J$k$+$b$7$l$^$;$s!#(B
Index: man8/dump.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/dump.8,v
retrieving revision 1.2
diff -u -r1.2 dump.8
--- man8/dump.8	2000/02/23 01:53:30	1.2
+++ man8/dump.8	2000/05/30 03:20:21
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/dump/dump.8,v 1.25 2000/01/23 01:29:54 mpp Exp %
+.\" %FreeBSD: src/sbin/dump/dump.8,v 1.27 2000/03/01 11:27:03 sheldonh Exp %
 .\"
 .\" jpman %Id: dump.8,v 1.2 1997/06/12 05:57:09 yugawa Stab %
 .Dd May 1, 1995
@@ -319,7 +319,6 @@
 .El
 .Sh $B4XO"9`L\(B
 .Xr fstab 5 ,
-.Xr ft 8 ,
 .Xr restore 8 ,
 .Xr rmt 8
 .Sh $B?GCG(B
Index: man8/fdcontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/fdcontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fdcontrol.8
--- man8/fdcontrol.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/fdcontrol.8	2000/05/30 03:20:21
@@ -24,7 +24,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.8 1999/10/17 15:52:26 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.9 2000/03/01 14:07:55 sheldonh Exp %
 .\"
 .\" Original Revision: 1.5
 .\" jpman %Id: fdcontrol.8,v 1.3 1997/08/16 13:14:53 horikawa Stab %
Index: man8/fdisk.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/fdisk.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fdisk.8
--- man8/fdisk.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/fdisk.8	2000/05/30 03:20:26
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.16 1999/08/28 00:13:01 peter Exp %
+.\" %FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17 2000/03/10 22:02:59 imp Exp %
 .\"
 .\" jpman %Id: fdisk.8,v 1.4 1997/07/26 21:56:04 horikawa Stab %
 .Dd October 4, 1996
@@ -9,7 +9,7 @@
 .Nd PC $B%Q!<%F%#%7%g%s$N%a%s%F%J%s%9%W%m%0%i%`(B
 .Sh $B=q<0(B
 .Nm fdisk
-.Op Fl Baeitu
+.Op Fl BIaistu
 .Op Fl b Ar bootcode
 .Op Fl 1234
 .Op Ar disk
@@ -67,7 +67,7 @@
 $B$b$7(B
 .Fl f
 $B$,$J$1$l$P!"L5;k$5$l$^$9!#(B
-.It Fl e
+.It Fl I
 $BC10l$N(B FreeBSD $B%9%i%$%9$,%G%#%9%/A4BN$H$J$k$h$&$K!"(B
 $B%;%/%?(B 0 $B$NFbMF$r=i4|2=$7$^$9!#(B
 .It Fl f Ar configfile
@@ -103,6 +103,8 @@
 $B$,$J$1$l$P!"(B
 .Fl u
 $B$N0UL#$b4^$_$^$9!#(B
+.It Fl s
+$B%5%^%j>pJs$rI=<($7!"=*N;$7$^$9!#(B
 .It Fl t
 $B%F%9%H%b!<%I(B; $B%Q!<%F%#%7%g%s%F!<%V%kCM$r=q$-9~$_$^$;$s!#0lHL$K(B
 .Fl f
Index: man8/fore_dnld.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/fore_dnld.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 fore_dnld.8
--- man8/fore_dnld.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/fore_dnld.8	2000/05/30 03:20:26
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) %FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.2 1999/08/28 00:12:20 peter Exp %
+.\" @(#) %FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.4 2000/03/01 11:27:44 sheldonh Exp %
 .\" jpman %Id: fore_dnld.8,v 1.3 1998/11/21 14:56:04 horikawa Stab %
 .\"
 .\" WORD: COPYRIGHT	$BCx:n8"(B[.SH]
@@ -76,11 +76,16 @@
 .fi
 .SH $BCm(B
 .PP
+PCA200E $B%"%@%W%?$KBP$7$F$O!"%3%^%s%I%i%$%s$G%U%!%$%k$r;XDj$J$$>l9g!"(B
+$BAH$_9~$_$N%P!<%8%g%s(B 3.0.1 $B%^%$%/%m%3!<%I$,;HMQ$5$l$^$9!#(B
+.PP
 FORE Systems $B<R$K$h$C$FG[I[$5$l$k%^%$%/%m%3!<%I$O!"D>@\(B SBA $B%[%9%H(B ATM 
 $B%"%@%W%?$K%@%&%s%m!<%I$G$-$k$h$&$K$J$C$F$$$^$;$s!#Ds6!$5$l$?(B
 $B%^%$%/%m%3!<%I$r(B "objcopy" $B%3%^%s%I$G=hM}$7$F!"%@%&%s%m!<%I$KE,$7$?(B
 $B%$%a!<%8$r@8@.$9$kI,MW$,$"$j$^$9!#(B"objcopy" $B$N0z?t$O!"(B"-S -l -Fcoff"
-$B$G$9!#(BPCA $B%[%9%H(B ATM $B%"%@%W%?MQ$K(B FORE Systems $B<R$+$iG[I[$5$l$k(B
+$B$G$9!#(B
+.Pp
+PCA $B%[%9%H(B ATM $B%"%@%W%?MQ$K(B FORE Systems $B<R$+$iG[I[$5$l$k(B
 $B%^%$%/%m%3!<%I$K$D$$$F$O!"$H$/$K=hM}$9$kI,MW$O$"$j$^$;$s!#(B
 .SH $B4XO"9`L\(B
 .PP
Index: man8/ftpd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ftpd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ftpd.8
--- man8/ftpd.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/ftpd.8	2000/05/30 03:20:31
@@ -30,10 +30,10 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/libexec/ftpd/ftpd.8,v 1.29 1999/08/28 00:09:29 peter Exp %
+.\" %FreeBSD: src/libexec/ftpd/ftpd.8,v 1.31 2000/02/17 02:14:11 peter Exp %
 .\"
 .\" jpman %Id: ftpd.8,v 1.3 1997/09/08 07:23:46 kuma Stab %
-.Dd April 19, 1994
+.Dd January 27, 2000
 .Dt FTPD 8
 .Os BSD 4.2
 .Sh $BL>>N(B
@@ -42,6 +42,8 @@
 $B%$%s%?!<%M%C%H%U%!%$%kE>Aw%W%m%H%3%k%5!<%P(B
 .Sh $B=q<0(B
 .Nm ftpd
+.Op Fl 4
+.Op Fl 6
 .Op Fl dl
 .Op Fl A
 .Op Fl D
@@ -140,6 +142,16 @@
 $B%G!<%b%s$N%W%m%;%9(B ID $B$r(B
 .Ar file
 $B$K=q$-=P$7$^$9!#(B
+.It Fl 6
+.Fl D
+$B$,;XDj$5$l$F$$$k>l9g!"(BAF_INET6 $B%=%1%C%H7PM3$N@\B3$r<u$1IU$1$^$9!#(B
+.It Fl 4
+.Fl D
+$B$,;XDj$5$l$F$$$k>l9g!"(BIPv4 $B@\B3$r<u$1IU$1$^$9!#(B
+.Fl 6
+$B$b$^$?;XDj$5$l$F$$$k>l9g!"(BIPv4 $B@\B3$r(B AF_INET6 $B%=%1%C%H7PM3$G<u$1IU$1$^$9!#(B
+.Fl 6
+$B$,;XDj$5$l$F$$$J$$>l9g!"(BIPv4 $B@\B3$r(B AF_INET $B%=%1%C%H7PM3$G<u$1IU$1$^$9!#(B
 .It Fl A
 $BF?L>(B ftp $B%"%/%;%9$N$_5v2D$7$^$9!#(B
 .El
@@ -210,6 +222,10 @@
 .It XMKD Ta "make a directory (deprecated)"
 .It XPWD Ta "print the current working directory (deprecated)"
 .It XRMD Ta "remove a directory (deprecated)"
+.It LPSV Ta "prepare for server-to-server transfer, multiprotocol"
+.It LPRT Ta "specify data connection port, multiprotocol"
+.It EPSV Ta "prepare for server-to-server transfer, multiprotocol"
+.It EPRT Ta "specify data connection port, multiprotocol"
 .El
 .Pp
 $B0J2<$K<($7$?HsI8=`%3%^%s%I$"$k$$$O(B
@@ -330,14 +346,6 @@
 $B%[!<%`%G%#%l%/%H%j$O(B
 .Dq root
 $B$N=jM-$H$7!"C/$b=q$-9~$_$G$-$J$$$h$&$K$7$^$9!#(B
-.It Pa ~ftp/bin
-$B$3$N%G%#%l%/%H%j$O(B
-.Dq root
-$B$N=jM-$H$7!"C/$b=q$-9~$_$G$-$J$$$h$&$K$7$^$9(B ($B%b!<%I(B 555)$B!#(B
-list $B%3%^%s%I$N%5%]!<%H$N$?$a!"$3$3$K(B
-.Xr ls 1
-$B%W%m%0%i%`$rCV$/$3$H$,I,MW$G$9!#(B
-$B$3$N%W%m%0%i%`$N%b!<%I$O(B 111 $B$H$9$Y$-$G$9!#(B
 .It Pa ~ftp/etc
 $B$3$N%G%#%l%/%H%j$O(B
 .Dq root
@@ -456,3 +464,4 @@
 $B%3%^%s%I$O(B
 .Bx 4.2
 $B$+$iEP>l$7$^$7$?!#(B
+IPv6 $B%5%]!<%H$O(B WIDE Hydrangea IPv6 $B%9%?%C%/%-%C%H$GDI2C$5$l$^$7$?!#(B
Index: man8/ifconfig.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ifconfig.8,v
retrieving revision 1.2
diff -u -r1.2 ifconfig.8
--- man8/ifconfig.8	2000/02/23 01:53:30	1.2
+++ man8/ifconfig.8	2000/05/30 03:20:35
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" %FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.24 2000/01/23 01:30:03 mpp Exp %
+.\" %FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.27 2000/03/01 11:27:04 sheldonh Exp %
 .\"
 .\" jpman %Id: ifconfig.8,v 1.2 1997/03/31 14:09:47 horikawa Stab %
 .\"
@@ -133,11 +133,14 @@
 .Nm
 $B$G$O0J2<$N%Q%i%a!<%?$,MxMQ$G$-$^$9(B:
 .Bl -tag -width indent
+.It Cm add
+``alias'' $B%Q%i%a!<%?$NJLL>$G$9!#(B
+BSD/OS $B$H$N8_49@-$N$?$a$KF3F~$5$l$^$7$?!#(B
 .It Cm alias
 $B;XDj$7$?%$%s%?%U%'!<%9$K!"%M%C%H%o!<%/%"%I%l%9$rDI2C$7$F;XDj$7$^$9!#(B
 $B$3$l$O%M%C%H%o!<%/HV9f$rJQ99$7$?:]$K!"0JA0$N%"%I%l%9$KAw$i$l$k%Q%1%C%H$r(B
 $B<u$1$H$j$?$$>l9g$J$I$KJXMx$G$9!#(B
-$B%(%$%j%"%9$,!"(B
+$B%"%I%l%9$,!"(B
 $BK\%$%s%?%U%'!<%9$N:G=i$N%M%C%H%o!<%/%"%I%l%9$HF1$8%5%V%M%C%H>e$N>l9g!"(B
 $B%M%C%H%^%9%/(B 0xffffffff $B$r;XDj$9$kI,MW$,$"$j$^$9!#(B
 .It Cm anycast
@@ -332,6 +335,9 @@
 Appletalk $B$O(B netmask $B$G$O$J$/$3$NJ}K!$r;HMQ$7$^$9$,!"(B
 .Fx
 $B$NFbIt$K$*$$$F$O(B netmask $B$N=89g$H$7$F<BAu$7$F$$$^$9!#(B
+.It Cm remove
+``delete'' $B%Q%i%a!<%?$NJLL>$G$9!#(B
+BSD/OS $B$H$N8_49@-$N$?$a$KF3F~$5$l$^$7$?!#(B
 .It Cm phase
 $B$3$l$KB3$/0z?t$O!"(B
 $B%$%s%?%U%'!<%9$K@\B3$5$l$?(B Appletalk $B%M%C%H%o!<%/$N(B
Index: man8/ilmid.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ilmid.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ilmid.8
--- man8/ilmid.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/ilmid.8	2000/05/30 03:20:35
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) %FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.2 1999/08/28 00:12:22 peter Exp %
+.\" @(#) %FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.3 2000/03/01 11:27:46 sheldonh Exp %
 .\" jpman %Id: ilmid.8,v 1.3 1998/12/23 21:22:41 vanitas Stab %
 .\"
 .\"
Index: man8/inetd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/inetd.8,v
retrieving revision 1.2
diff -u -r1.2 inetd.8
--- man8/inetd.8	2000/02/23 01:53:30	1.2
+++ man8/inetd.8	2000/05/30 03:20:42
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.43 2000/01/25 14:52:09 shin Exp %
+.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.46 2000/03/01 08:20:17 sheldonh Exp %
 .\"
 .\" jpman %Id: inetd.8,v 1.2 1997/05/16 07:22:24 yugawa Stab %
 .Dd February 7, 1996
@@ -81,7 +81,7 @@
 .It Fl d
 $B%G%P%C%0%b!<%I$K$7$^$9!#(B
 .It Fl l
-$B%m%0$r$H$j$^$9!#(B
+$B@.8y$7$?@\B3$N%m%0$r$H$j$^$9!#(B
 .It Fl w
 $B30It%5!<%S%9$KBP$7$F(B TCP Wrapping $B$r%*%s$K$7$^$9!#(B
 TCP Wrappers $B%5%]!<%H$K$D$$$F$N99$J$k>pJs$K$D$$$F$O!"(B
@@ -102,27 +102,37 @@
 .It Fl R Ar rate
 1 $BJ,4V$K5/F0$G$-$k:GBg$N%5!<%S%9?t$r;XDj$7$^$9!#%G%U%)%k%H$O(B 256 $B$G$9!#(B
 .It Fl a
-$B4F;k$9$k(B IP $B%"%I%l%9$r;XDj$7$^$9!#(B
-$BBe$j$K%[%9%HL>$b;XDj2DG=$G$"$j!"(B
-$B$=$N>l9g!"(B
-$B%[%9%HL>$K4XO"IU$1$i$l$?(B IP $B%"%I%l%9$*$h$S(B/$B$^$?$O(B IPv6 $B%"%I%l%9$,;HMQ$5$l$^$9!#(B
-$BDL>o!"%[%9%HL>$N;XDj$O(B
+$B%P%$%s%I$9$k(B IP $B%"%I%l%9$r;XDj$7$^$9!#(B
+$BBe$j$K!"%[%9%HL>$r;XDj2DG=$G$9!#(B
+$B$3$N>l9g!"%[%9%HL>$KBP1~$9$k(B IPv4 $B$^$?$O(B IPv6 $B$N%"%I%l%9$,;HMQ$5$l$^$9!#(B
+$BDL>o!"(B
+.Nm
+$B$,(B
+.Xr jail 8
+$BFb$G5/F0$5$l$k;~E@$G!"%[%9%HL>$,;XDj$5$l$^$9!#(B
+$B$3$N>l9g!"%[%9%HL>$O(B
 .Xr jail 8
-$B$H6&$K;HMQ$5$l!"%[%9%HL>$OO49v(B (jail) $B4D6-$KBP1~$7$^$9!#(B
-
+$B4D6-$KBP1~$9$k$b$N$G$9!#(B
+.Pp
 $B%[%9%HL>;XDj$,;HMQ$5$l!"(BIPv4 $B$*$h$S(B IPv6 $BN>J}$N%P%$%s%I$rK>$`>l9g!"(B
-$B3F%5!<%S%9$KBP$7$F(B 2 $B%(%s%H%j;XDj$9$kI,MW$,$"$j$^$9!#$3$l$O!"(B
 .Pa /etc/inetd.conf
-$B$K$*$$$F!"(BIPv4 $BMQ$K(B 1 $B$D!"(BIPv6 $BMQ$K(B 1 $B$D;XDj$7$^$9!#(B
-$BNc$($P<!$N$h$&$K$7$^$9(B:
-.Bd -literal
-telnet       stream  tcp4  nowait root  /usr/libexec/telnetd  telnetd
-telnet       stream  tcp6  nowait root  /usr/libexec/telnetd  telnetd
-.Ed
-
-$B>\:Y$K$D$$$F$O(B
+$B$N3F%5!<%S%9$KBP$7$F!"(B
+$B3F%P%$%s%I$KBP$9$kE,@Z$J(B
+.Em $B%W%m%H%3%k(B
+$B$N%(%s%H%j$,I,MW$G$9!#(B
+$BNc$($P(B TCP $B%Y!<%9$N%5!<%S%9$O(B 2 $B%(%s%H%j$,I,MW$G$"$j!"(B
+$B$R$H$D$O(B
+.Em $B%W%m%H%3%k(B
+$B$K(B
+.Dq tcp4
+$B$r;HMQ$7!"$b$&$R$H$D$O(B
+.Dq tcp6
+$B$r;HMQ$7$^$9!#(B
+$B8e$G@bL@$9$k(B
 .Pa /etc/inetd.conf
-$B$N%W%m%H%3%k%U%#!<%k%I$N@bL@$r8+$F$/$@$5$$!#(B
+$B$N(B
+.Em $B%W%m%H%3%k(B
+$B%U%#!<%k%I$r;2>H$7$F$/$@$5$$!#(B
 .It Fl p
 $B%G%U%)%k%H$H$O0[$J$k%W%m%;%9(B ID $B$rJ];}$9$k%U%!%$%k$r;XDj$7$^$9!#(B
 .El
@@ -241,43 +251,47 @@
 $B$d(B
 .Dq udp
 $B$J$I$G$9!#(B
-$B$3$N>l9g!"8eJ}8_49@-$N$?$a!"K\%(%s%H%j$O(B IPv4 $B$N$_$r<uM}2DG=$G$9!#(B
+$B$3$N>l9g!"8eJ}8_49@-$N$?$a!"0EL[E*$KK\%(%s%H%j$O(B IPv4 $B$r0UL#$7$^$9!#(B
 $BL>A0(B
 .Dq tcp4 ,
 .Dq udp4
-$B$O!"%(%s%H%j$r(B IPv4 $B$KFC2=$7$^$9!#(B
+$B$O!"(BIPv4 $B$N$_$r;XDj$7$^$9!#(B
 $BL>A0(B
 .Dq tcp6 ,
 .Dq udp6
-$B$O!"%(%s%H%j$r(B IPv6 $B$KFC2=$7$^$9!#(B
+$B$O!"(BIPv6 $B$N$_$r;XDj$7$^$9!#(B
 $BL>A0(B
 .Dq tcp46 ,
 .Dq udp46
-$B$O!"%(%s%H%j$K(B IPv4 $B$H(B IPv6 $B$NN>J}$r<uM}$5$;$^$9!#(B
-$B$3$N:]!"(BAF_INET6 $B%o%$%k%I%+!<%I$G%P%$%s%I$5$l$?%=%1%C%H$r;HMQ$7$^$9!#(B
+$B$O!"%(%s%H%j$K(B IPv6 $B$H%o%$%k%I%+!<%I(B
+.Dv AF_INET6
+$B%=%1%C%H7PM3$N(B IPv6 $B$NN>J}$r<uM}$5$;$^$9!#(B
 $B%5!<%S%9$,(B T/TCP $B7PM3$GE~C#2DG=$H$9$k$?$a$K$O!"(B
 .Dq tcp/ttcp
 $B$r;XDj$9$kI,MW$,$"$j$^$9!#(B
-$B8eJ}8_49@-$N$?$a!"K\%(%s%H%j$O(B IPv4 $B$N$_$r<uM}2DG=$G$9!#(B
+$B8eJ}8_49@-$N$?$a!"0EL[E*$KK\%(%s%H%j$O(B IPv4 $B$r0UL#$7$^$9!#(B
 $BL>A0(B
 .Dq tcp4/ttcp
-$B$O!"%(%s%H%j$r(B IPv4 $B$KFC2=$7$^$9!#(B
+$B$O!"(BIPv4 $B$N$_$r;XDj$7!"(B
 $BL>A0(B
 .Dq tcp6/ttcp
-$B$O!"%(%s%H%j$r(B IPv6 $B$KFC2=$7$^$9!#(B
+$B$O!"(BIPv6 $B$N$_$r;XDj$7$^$9!#(B
 $BL>A0(B
 .Dq tcp46/ttcp
-$B$O!"%(%s%H%j$K(B IPv4 $B$H(B IPv6 $B$NN>J}$r<uM}$5$;$^$9!#(B
-$B$3$N:]!"(BAF_INET6 $B%o%$%k%I%+!<%I$G%P%$%s%I$5$l$?%=%1%C%H$r;HMQ$7$^$9!#(B
-RPC $B%Y!<%9$N%5!<%S%9$N>l9g!"(B
+$B$O!"%(%s%H%j$K(B IPv6 $B$H%o%$%k%I%+!<%I(B
+.Dv AF_INET6
+$B%=%1%C%H7PM3$N(B IPv6 $B$NN>J}$r<uM}$5$;$^$9!#(B
+RPC $B%Y!<%9$N%5!<%S%9(B ($B8=:_$N$H$3$m(B IPv4 $B$N$_%5%]!<%H$5$l$^$9(B) $B$N>l9g!"(B
 .Dq rpc/tcp
 $B$d(B
 .Dq rpc/udp 
 $B$N$h$&$J;XDj$K$J$j$^$9!#(B
-$B8=:_$N$H$3$m!"(BIPv4 $B$N$_$,(B rpc $B%5!<%S%9$G%5%]!<%H$5$l$F$$$^$9(B
 TCPMUX $B%5!<%S%9$O(B
-.Dq tcp
-$B$r;H$o$J$1$l$P$J$j$^$;$s!#(B
+.Dq tcp ,
+.Dq tcp4 ,
+.Dq tcp6 ,
+.Dq tcp46
+$B$N$$$:$l$+$r;HMQ$9$kI,MW$,$"$j$^$9!#(B
 .Pp
 .Em wait/nowait
 $B%(%s%H%j$O!"(B
@@ -474,15 +488,21 @@
 tcpmux	stream	tcp	nowait	root	internal
 .Ed
 .Pp
-IPv6 $B>e$G$b(B TCPMUX $B%5!<%S%9$rDs6!$7$?$$>l9g!"(B
-$B>e5-(B tcp $B$NBe$j$K(B tcp46 $B$^$?$O(B tcp6 $B$r;XDj2DG=$G$9!#(B
-.Pp
 .Fl l
 $B%*%W%7%g%s$,;XDj$5$l$?>l9g!"(B
 .Nm
 $B$O@\B3$r<u$1IU$1$k$?$S!"%(%s%H%j$r(B syslog $B$K5-O?$7$^$9!#(B
 $B$3$N:]!"MxMQ2DG=$G$"$l$P!"(B
 $BA*Br$5$l$?%5!<%S%9$HMW5a$rH/$7$?%j%b!<%H$N(B IP $BHV9f$r5-O?$7$^$9!#(B
+$B@_Dj%U%!%$%k$GB>$K;XDj$7$F$*$i$:!"(B
+.Fl W
+$B$H(B
+.Fl w
+$B$N%*%W%7%g%s$r;XDj$7$F$$$J$$$H!"(B
+.Nm
+$B$O(B
+.Dq daemon
+$B%U%!%7%j%F%#$KBP$7$F%m%0=PNO$7$^$9!#(B
 .Pp
 .Dv SIGHUP
 $B$r<u$1$H$k$H!"(B
@@ -512,13 +532,14 @@
 $B%5!<%S%9$,%i%C%T%s%0$5$l$^$9!#(B
 $BN>J}$N%*%W%7%g%s$,;XDj$5$l$?>l9g!"(B
 $BFbIt%5!<%S%9$H30It%5!<%S%9$NN>J}$r%i%C%T%s%0$9$k$h$&$K$J$j$^$9!#(B
-.Pp
+$B$I$A$i$N%i%C%T%s%0%*%W%7%g%s$b!"<:GT$7$?@\B3$r(B
+.Dq auth
+syslog $B%U%!%7%j%F%#$G%m%0$7$^$9!#(B
+$B%i%C%T%s%0%*%W%7%g%s$K(B
 .Fl l
-$B%*%W%7%g%s$,;XDj$5$l$?>l9g!"(B
-$B$9$Y$F$N@\B3$N;n$_$O!"(B
-$B5v2D$5$l$F$$$k!&5qH]$5$l$F$$$k!&%i%C%T%s%0$5$l$F$$$J$$$N(B
-$B$$$:$l$G$"$k$+$,5-O?$5$l$^$9!#(B
-$B;XDj$5$l$J$$>l9g!"5qH]$5$l$?MW5a$N$_$,5-O?$5$l$^$9!#(B
+$B%U%i%0$rDI2C$9$k$H!"@.8y$7$?@\B3$b(B
+.Dq auth
+$B%U%!%7%j%F%#$X$N%m%0$K4^$a$k$h$&$K$J$j$^$9!#(B
 .Pp
 .Dq wait
 $B%5!<%S%9$KBP$9$kMW5a$O!"(B
@@ -544,8 +565,7 @@
 $B%5!<%S%9$N%G!<%b%sL>$H$7$F$O!"(B
 .Pa inetd.conf
 $B$G;XDj$5$l$k%5!<%S%9L>$r;HMQ$9$Y$-$G$9!#(B
-.Sh TCPMUX
-.Pp
+.Ss TCPMUX
 .Tn RFC 1078 
 $B$O(B TCPMUX $B%W%m%H%3%k$K$D$$$F=R$Y$F$$$^$9!#(B
 $B!V(B TCP $B%/%i%$%"%s%H$OB>$N%[%9%H$K(B TCP $B%]!<%HHV9f(B 1 $B$G@\B3$7$^$9!#(B
@@ -575,22 +595,20 @@
 $B$O(B
 .Pa inetd.conf
 $B$K$"$k(B TCPMUX $B%5!<%S%9$N0lMw$r=PNO$7$^$9!#(B
-.Sh IPSEC
+.Ss IPsec
 $BK\<BAu$O!"3F%=%1%C%H$KBP$9$k(B IPsec $B%]%j%7@_Dj$N%5%]!<%H$N$?$a$N(B
 $B$A$g$C$H$7$?%O%C%/$r4^$_$^$9!#(B
-.Dq Li "#@"
-$B$+$i3+;O$9$kFCJL$J7A<0$N%3%a%s%H9T$,!"%]%j%7;X<(;R$H$7$FF/$-$^$9!#(B
-$B>e$NJ}$N%3%a%s%H$NFbMF$,!"(B
+.Dq Li #@
+$B$+$i3+;O$9$kFCJL$J7A<0$N%3%a%s%H9T$,!"%]%j%7;X<(;R$H$7$F2r<a$5$l$^$9!#(B
+.Dq Li #@
+$B$N8e$N$9$Y$F$,!"(B
 .Xr ipsec_set_policy 3
-$B$K5-=R$5$l$F$$$k$h$&$K!"(BIPsec $B%]%j%7J8;zNs$H$7$F07$o$l$^$9!#(B
-.Li "#@"
-$B9T$O!"(B
+$B$K5-=R$5$l$F$$$k$h$&$K!"(BIPsec $B%]%j%7J8;zNs$H$7$F;HMQ$5$l$^$9!#(B
+$B3F%]%j%7;XDj;R$O!"(B
 .Pa inetd.conf
-$B$K$*$$$F8eB3$9$k$9$Y$F$N9T$K1F6A$7$^$9$N$G!"(B
-.Li "#@"
-$B$@$1$N(B
-.Pq $B%]%j%7J8;zNsL5$7$N(B
-$B%3%a%s%H9T$r;H$&$3$H$G(B IPsec $B%]%j%7$r%j%;%C%H2DG=$G$9!#(B
+$BCf$G8eB3$9$k$9$Y$F$N9T$KE,MQ$5$l!"(B
+$B$3$l$O<!$N%]%j%7;XDj;R$,EP>l$9$k$^$GB3$-$^$9!#(B
+$B6u$N%]%j%7;XDj;R$O!"(BIPsec $B%]%j%7$r%j%;%C%H$7$^$9!#(B
 .Pp
 $BIT@5$J(B IPsec $B%]%j%7J8;zNs$,(B
 .Pa inetd.conf
@@ -598,7 +616,7 @@
 .Nm
 $B$O(B
 .Xr syslog 3
-$B$r;HMQ$7$F(B
+$B%$%s%?%U%'!<%9$r;HMQ$7$F(B
 $B%(%i!<%a%C%;!<%8$r;D$7!"=*N;$7$^$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /var/run/inetd.pid -compact
@@ -741,8 +759,8 @@
 4.1
 $B$,6!5k$5$l$F$+$i!"(B
 $B$=$l$K$J$i$C$F:n$i$l$^$7$?!#(B
-IPsec $B$N%O%C%/$O!"(B1999 $BG/$K(B KAME $B%W%m%8%'%/%H$,DI2C$7$^$7$?!#(B
-.Tn FreeBSD
+IPsec $B$N%O%C%/$O!"(B1999 $BG/$K(B KAME $B%W%m%8%'%/%H$,Ds6!$7$^$7$?!#(B
+.Fx
 $B$N(B TCP Wrappers $B%5%]!<%H$,:G=i$KEP>l$7$?$N$O(B
 .Fx 3.2
 $B$G$9!#(B
Index: man8/init.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/init.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 init.8
--- man8/init.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/init.8	2000/05/30 03:20:44
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/sbin/init/init.8,v 1.21 1999/12/16 02:15:53 nik Exp %
+.\" %FreeBSD: src/sbin/init/init.8,v 1.22 2000/03/01 11:27:06 sheldonh Exp %
 .\"
 .\" jpman %Id: init.8,v 1.2 1997/05/27 08:12:44 yugawa Stab %
 .\"
Index: man8/ipf.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ipf.8,v
retrieving revision 1.2
diff -u -r1.2 ipf.8
--- man8/ipf.8	2000/02/23 01:53:30	1.2
+++ man8/ipf.8	2000/05/30 03:20:46
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.3 2000/02/10 03:17:49 peter Exp %
 .TH IPF 8
 .\" jpman %Id: ipf.1,v 1.3 1998/10/15 12:27:39 kuma Stab %
 .SH $BL>>N(B
Index: man8/ipfstat.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ipfstat.8,v
retrieving revision 1.2
diff -u -r1.2 ipfstat.8
--- man8/ipfstat.8	2000/02/23 01:53:30	1.2
+++ man8/ipfstat.8	2000/05/30 03:20:46
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.3 2000/02/10 03:17:50 peter Exp %
 .TH ipfstat 8
 .\" jpman %Id: ipfstat.8,v 1.3 1998/10/14 10:49:51 horikawa Stab %
 .SH $BL>>N(B
@@ -17,7 +18,7 @@
 /dev/kmem $B$rD4$Y$^$9!#(B
 $B$3$N%3%^%s%I$,<B9T$G$-$+$D5!G=$7$&$k$?$a$K$O!"(B/dev/kmem $B$H%+!<%M%k(B
 $B$=$N$b$N$rFI$a$kI,MW$,$"$j$^$9!#(B
-$B%+!<%M%k$NL>A0$O!"%G%U%)%k%H$G$O(B \fB/vmunix\fP $B$H$D$1$i$l$F$$$^$9!#(B
+$B%+!<%M%k$NL>A0$O!"%G%U%)%k%H$G$O(B \fB/kernel\fP $B$H$D$1$i$l$F$$$^$9!#(B
 .PP
 \fBipfstat\fP $B$N%G%U%)%k%H$NF0:n$O!"%+!<%M%k$,%U%#%k%?$rDL$7$F(B
 $B%Q%1%C%H$r$d$j$H$j$9$k4V$KC_@Q$5$l$?E}7W$r<h$j=P$7$FI=<($9$k$3$H$G$9!#(B
@@ -84,7 +85,7 @@
 .br
 /dev/ipstate
 .br
-/vmunix
+/kernel
 .SH $B4XO"9`L\(B
 ipf(8)
 .SH $B%P%0(B
Index: man8/ipmon.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ipmon.8,v
retrieving revision 1.2
diff -u -r1.2 ipmon.8
--- man8/ipmon.8	2000/02/23 01:53:30	1.2
+++ man8/ipmon.8	2000/05/30 03:20:46
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.6 2000/02/10 03:17:50 peter Exp %
 .TH ipmon 8
 .\" jpman %Id: ipmon.8,v 1.3 1998/10/12 11:28:11 horikawa Stab %
 .\"
@@ -158,4 +159,4 @@
 /dev/ipstate
 .SH $B4XO"9`L\(B
 ipl(4), ipf(8), ipfstat(8), ipnat(8)
-.SH $B%P%0(B
+.\" .SH $B%P%0(B
Index: man8/isdnd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdnd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdnd.8
--- man8/isdnd.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdnd.8	2000/05/30 03:20:51
@@ -24,7 +24,7 @@
 .\"
 .\"	%Id: isdnd.8,v 1.27 1999/12/13 22:11:55 hm Exp % 
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.7 1999/12/14 21:07:27 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.9 2000/03/06 09:45:32 sheldonh Exp %
 .\"
 .\"	last edit-date: [Mon Dec 13 22:57:10 1999]
 .\"
Index: man8/isdndebug.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdndebug.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdndebug.8
--- man8/isdndebug.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdndebug.8	2000/05/30 03:20:51
@@ -24,7 +24,7 @@
 .\"
 .\"	%Id: isdndebug.8,v 1.10 1999/12/13 22:11:55 hm Exp %
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.7 1999/12/14 21:07:35 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.8 2000/03/01 14:09:07 sheldonh Exp %
 .\"
 .\"	last edit-date: [Mon Dec 13 23:01:42 1999]
 .\"
Index: man8/isdndecode.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdndecode.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdndecode.8
--- man8/isdndecode.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdndecode.8	2000/05/30 03:20:53
@@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:03:21 1999]
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.7 1999/12/14 21:07:37 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.9 2000/03/01 14:09:09 sheldonh Exp %
 .\"
 .\" jpman %Id: isdndecode.8,v 1.3 1999/02/01 21:31:04 vanitas Stab %
 .\" isdndecode.8 $B$H(B isdntrace.8 $B$O6&DLItJ,$,B?$$$?$a!"Aj8_$K;2>H(B
@@ -178,7 +178,7 @@
 .Pp
 $B$O!"(BD $B%A%c%M%k$N%H%l!<%9$r<uF0%3%s%H%m!<%i(B 0 $B>e$G3+;O$7$^$9!#(B
 $B$3$N:]!"(BB $B%A%c%M%k$N%H%l!<%90J30$O$9$Y$FM-8z$K$5$l!"(B
-$B$9$Y$F$O=PNO%U%!%$%k(B /tmp/isdn.decode $B$X=q$-9~$^$l$^$9!#(B
+$B$9$Y$F$O=PNO%U%!%$%k(B /var/tmp/isdn.decode $B$X=q$-9~$^$l$^$9!#(B
 
 .Sh $B4XO"9`L\(B
 .Xr isdnd 8
Index: man8/isdnmonitor.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdnmonitor.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdnmonitor.8
--- man8/isdnmonitor.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdnmonitor.8	2000/05/30 03:20:55
@@ -24,7 +24,7 @@
 .\"
 .\"	%Id: isdnmonitor.8,v 1.8 1999/12/13 22:11:55 hm Exp %
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.7 1999/12/14 21:07:41 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.8 2000/03/01 14:09:10 sheldonh Exp %
 .\"
 .\"	last edit-date: [Mon Dec 13 23:04:25 1999]
 .\" jpman %Id: isdnmonitor.8,v 1.3 1999/02/02 14:47:43 horikawa Stab %
Index: man8/isdntel.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdntel.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdntel.8
--- man8/isdntel.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdntel.8	2000/05/30 03:20:55
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:05:59 1999]
 .\"	
-.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.7 1999/12/14 21:07:44 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.9 2000/03/06 09:45:34 sheldonh Exp %
 .\"
 .\"	%Id: isdntel.8,v 1.9 1999/12/13 22:11:55 hm Exp %
 .\"
Index: man8/isdntelctl.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdntelctl.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdntelctl.8
--- man8/isdntelctl.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdntelctl.8	2000/05/30 03:20:58
@@ -26,7 +26,7 @@
 .\" jpman %Id: isdntelctl.8,v 1.3 1999/02/07 01:48:07 yohta Stab %
 .\" WORD: sound format	$B2;$N7A<0(B [isdntelctl.8]
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.7 1999/12/14 21:07:46 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.8 2000/03/01 14:09:13 sheldonh Exp %
 .\"
 .\"	last edit-date: [Mon Dec 13 23:06:45 1999]
 .\"
Index: man8/isdntrace.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/isdntrace.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 isdntrace.8
--- man8/isdntrace.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/isdntrace.8	2000/05/30 03:20:58
@@ -24,7 +24,7 @@
 .\"
 .\"	%Id: isdntrace.8,v 1.12 1999/12/13 22:11:55 hm Exp %
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.7 1999/12/14 21:07:49 hm Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.9 2000/03/02 14:53:42 sheldonh Exp %
 .\"
 .\"	last edit-date: [Mon Dec 13 23:08:17 1999]
 .\"
Index: man8/ispcvt.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ispcvt.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ispcvt.8
--- man8/ispcvt.8	2000/02/15 14:34:59	1.1.1.1
+++ man8/ispcvt.8	2000/05/30 03:21:00
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)ispcvt.1, 3.20, Last Edit-Date: [Tue Apr  4 12:35:54 1995]
-.\" %FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.8 1999/08/28 01:17:43 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.9 2000/03/01 14:09:21 sheldonh Exp %
 .\"
 .\" Original Revision: 1.6
 .\" jpman %Id: ispcvt.8,v 1.3 1997/09/09 04:05:01 yugawa Stab %
Index: man8/ldconfig.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ldconfig.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ldconfig.8
--- man8/ldconfig.8	2000/02/15 14:35:00	1.1.1.1
+++ man8/ldconfig.8	2000/05/30 03:21:02
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.17 1999/08/28 00:13:20 peter Exp %
+.\" %FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.19 2000/03/06 09:45:27 sheldonh Exp %
 .\" jpman %Id: ldconfig.8,v 1.3 1997/07/22 16:49:42 horikawa Stab %
 .\"
 .Dd October 3, 1993
Index: man8/lpc.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/lpc.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lpc.8
--- man8/lpc.8	2000/02/15 14:35:00	1.1.1.1
+++ man8/lpc.8	2000/05/30 03:21:04
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpc.8	8.5 (Berkeley) 4/28/95
-.\" %FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.7 1999/08/28 01:16:51 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.8 2000/03/01 14:09:15 sheldonh Exp %
 .\"
 .\" Original Revision: 1.5
 .\" jpman %Id: lpc.8,v 1.2 1997/05/23 00:47:48 mutoh Stab %
Index: man8/lpd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/lpd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lpd.8
--- man8/lpd.8	2000/02/15 14:35:00	1.1.1.1
+++ man8/lpd.8	2000/05/30 03:21:07
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\" %FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.13 1999/11/30 16:15:14 ache Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.14 2000/03/01 14:09:16 sheldonh Exp %
 .\"
 .\" jpman %Id: lpd.8,v 1.2 1997/03/31 13:34:37 horikawa Stab %
 .\"
Index: man8/lptcontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/lptcontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lptcontrol.8
--- man8/lptcontrol.8	2000/02/15 14:35:00	1.1.1.1
+++ man8/lptcontrol.8	2000/05/30 03:21:07
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" %FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.11 1999/11/27 16:54:36 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.12 2000/03/01 14:07:58 sheldonh Exp %
 .\"
 .\" jpman %Id: lptcontrol.8,v 1.3 1997/08/16 13:20:55 horikawa Stab %
 .Dd September 3, 1994
Index: man8/map-mbone.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/map-mbone.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 map-mbone.8
--- man8/map-mbone.8	2000/02/15 14:35:00	1.1.1.1
+++ man8/map-mbone.8	2000/05/30 03:21:07
@@ -1,6 +1,5 @@
-.\" %FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.6 1999/08/28 23:20:48 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.7 2000/03/01 14:08:07 sheldonh Exp %
 .\"
-.\" Original Revision: 1.5
 .\" jpman %Id: map-mbone.8,v 1.2 1997/06/06 10:31:25 bobson Stab %
 .Dd May 8, 1995
 .Dt MAP-MBONE 8
Index: man8/memcontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/memcontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 memcontrol.8
--- man8/memcontrol.8	2000/02/15 14:35:10	1.1.1.1
+++ man8/memcontrol.8	2000/05/30 03:21:09
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" %FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.2 1999/10/09 16:37:37 chris Exp %
+.\" %FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.3 2000/03/01 14:08:00 sheldonh Exp %
 .\" 
 .\" jpman %Id: memcontrol.8,v 1.3 1999/12/05 08:25:43 horikawa Stab %
 .Dd September 28, 1999
Index: man8/mergemaster.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mergemaster.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mergemaster.8
--- man8/mergemaster.8	2000/02/15 14:35:10	1.1.1.1
+++ man8/mergemaster.8	2000/05/30 03:21:11
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4 1999/10/26 19:06:31 billf Exp %
+.\" %FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.5 2000/03/01 14:08:02 sheldonh Exp %
 .\"
 .\" jpman %Id: mergemaster.8,v 1.3 1999/12/05 08:25:49 horikawa Stab %
 .Dd September 10, 1999
Index: man8/mixer.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mixer.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mixer.8
--- man8/mixer.8	2000/02/15 14:35:00	1.1.1.1
+++ man8/mixer.8	2000/05/30 03:21:11
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.8 1999/11/27 16:55:50 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.10 2000/03/01 14:08:04 sheldonh Exp %
 .\"
 .\" jpman %Id: mixer.8,v 1.3 1997/08/16 13:24:56 horikawa Stab %
 .Dd January 9, 1997
@@ -120,8 +120,7 @@
 $B%G%U%)%k%H$N%_%-%5%G%P%$%9(B
 .El
 .Sh $B4XO"9`L\(B
-.Xr cdcontrol 1 ,
-.Xr cdplay 1
+.Xr cdcontrol 1
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
Index: man8/mknod.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mknod.8,v
retrieving revision 1.2
diff -u -r1.2 mknod.8
--- man8/mknod.8	2000/02/23 01:53:30	1.2
+++ man8/mknod.8	2000/05/30 03:21:13
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.10 2000/01/06 17:51:45 obrien Exp %
+.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.11 2000/03/01 11:27:10 sheldonh Exp %
 .\"
 .\" jpman %Id: mknod.8,v 1.2 1997/03/31 13:37:12 horikawa Stab %
 .\"
Index: man8/mount.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mount.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mount.8
--- man8/mount.8	2000/02/15 14:35:01	1.1.1.1
+++ man8/mount.8	2000/05/30 03:21:16
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" %FreeBSD: src/sbin/mount/mount.8,v 1.29 1999/09/28 15:49:47 obrien Exp %
+.\" %FreeBSD: src/sbin/mount/mount.8,v 1.31 2000/03/01 11:27:12 sheldonh Exp %
 .\"
 .\" jpman %Id: mount.8,v 1.2 1997/05/03 11:26:50 horikawa Stab %
 .\"
@@ -375,11 +375,6 @@
 .Sh $B%P%0(B
 $B0[>o$J%U%!%$%k%7%9%F%`$r%^%&%s%H$9$k$H!"(B
 $B%7%9%F%`%/%i%C%7%e$r0z$-5/$3$9$3$H$,$"$j$^$9!#(B
-.Pp
-``mount -u'' $B$r;HMQ$7$F!"(B
-$B%U%!%$%k%7%9%F%`$NHsF14|F0:n$HDL>oF0:n$r@Z$jBX$($?$j!"(B
-$BFI$_=q$-%"%/%;%9$HFI$_9~$_@lMQ%"%/%;%9$r@Z$jBX$($?$j$9$k$H!"(B
-$BCWL?E*$K%U%!%$%k%7%9%F%`$rGK2u$9$k$3$H$,$"$j$^$9!#(B
 .Sh $B7Y9p(B
 $B%^%&%s%H$K@.8y$7$?8e$K%^%&%s%H$5$l$?%U%!%$%k%7%9%F%`$+$i(B
 .Pa ".."
Index: man8/mount_msdos.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mount_msdos.8,v
retrieving revision 1.2
diff -u -r1.2 mount_msdos.8
--- man8/mount_msdos.8	2000/02/23 01:53:30	1.2
+++ man8/mount_msdos.8	2000/05/30 03:21:18
@@ -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/sbin/mount_msdos/mount_msdos.8,v 1.18 2000/01/08 16:47:55 ache Exp %
+.\" %FreeBSD: src/sbin/mount_msdos/mount_msdos.8,v 1.19 2000/03/01 11:27:14 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_msdos.8,v 1.3 1997/09/08 01:55:26 seki Stab %
 .\"
Index: man8/mount_nfs.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mount_nfs.8,v
retrieving revision 1.2
diff -u -r1.2 mount_nfs.8
--- man8/mount_nfs.8	2000/02/23 01:53:30	1.2
+++ man8/mount_nfs.8	2000/05/30 03:21:20
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" %FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.16 2000/01/13 21:47:18 dillon Exp %
+.\" %FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.18 2000/03/02 14:53:25 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_nfs.8,v 1.3 1997/05/19 17:04:14 horikawa Stab %
 .\""
Index: man8/mount_ntfs.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mount_ntfs.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mount_ntfs.8
--- man8/mount_ntfs.8	2000/02/15 14:35:09	1.1.1.1
+++ man8/mount_ntfs.8	2000/05/30 03:21:23
@@ -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/sbin/mount_ntfs/mount_ntfs.8,v 1.5 1999/08/28 00:13:32 peter Exp %
+.\" %FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.6 2000/03/01 11:27:17 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_ntfs.8,v 1.2 1999/05/07 11:25:09 horikawa Stab %
 .\" revision 1.2.2.2 $B$KDI=>:Q(B
Index: man8/mount_portal.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mount_portal.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mount_portal.8
--- man8/mount_portal.8	2000/02/15 14:35:02	1.1.1.1
+++ man8/mount_portal.8	2000/05/30 03:21:25
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" %FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.7 1999/08/28 00:13:36 peter Exp %
+.\" %FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.8 2000/03/01 11:27:20 sheldonh Exp %
 .\"
 .\" jpman %Id: mount_portal.8,v 1.2 1997/03/31 13:38:30 horikawa Stab %
 .\"
Index: man8/moused.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/moused.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 moused.8
--- man8/moused.8	2000/02/15 14:35:03	1.1.1.1
+++ man8/moused.8	2000/05/30 03:21:29
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.26 1999/12/17 10:05:36 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.27 2000/03/01 14:08:06 sheldonh Exp %
 .\"
 .\" jpman %Id: moused.8,v 1.3 1997/07/22 16:52:17 horikawa Stab %
 .Dd December 3, 1997
Index: man8/mrinfo.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mrinfo.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mrinfo.8
--- man8/mrinfo.8	2000/02/15 14:35:03	1.1.1.1
+++ man8/mrinfo.8	2000/05/30 03:21:29
@@ -1,6 +1,5 @@
-.\" %FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.8 1999/08/28 23:20:48 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.9 2000/03/01 14:08:08 sheldonh Exp %
 .\"
-.\" Original Revision: 1.7
 .\" jpman %Id: mrinfo.8,v 1.2 1997/05/25 15:18:08 horikawa Stab %
 .Dd May 8, 1995
 .Dt MRINFO 8
Index: man8/mrouted.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/mrouted.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mrouted.8
--- man8/mrouted.8	2000/02/15 14:35:03	1.1.1.1
+++ man8/mrouted.8	2000/05/30 03:21:36
@@ -1,6 +1,6 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
 .\"
-.\" %FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.15 1999/08/28 23:20:48 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.16 2000/03/01 14:08:08 sheldonh Exp %
 .\"
 .\" jpman %Id: mrouted.8,v 1.3 1997/07/26 22:00:11 horikawa Stab %
 .Dd May 8, 1995
Index: man8/natd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/natd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 natd.8
--- man8/natd.8	2000/02/15 14:35:04	1.1.1.1
+++ man8/natd.8	2000/05/30 03:21:38
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" %FreeBSD: src/sbin/natd/natd.8,v 1.25 1999/10/30 19:33:41 mpp Exp %
+.\" %FreeBSD: src/sbin/natd/natd.8,v 1.27 2000/03/01 11:27:22 sheldonh Exp %
 .\" jpman %Id%
 .Dd 15 April 1997
 .Os FreeBSD
@@ -50,7 +50,7 @@
 $B$3$N%W%m%0%i%`$O!"J#?t$N(B NIC $B$H$H$b$K;HMQ$9$k$3$H$r0U?^$7$F$$$^$9(B -
 PPP $B%j%s%/>e$G(B NAT $B$r9T$$$?$$>l9g!"(B
 .Xr ppp 8
-$B$N(B -alias $B%9%$%C%A$r;HMQ$7$F$/$@$5$$!#(B
+$B$N(B -nat $B%9%$%C%A$r;HMQ$7$F$/$@$5$$!#(B
 
 .Pp
 .Nm natd
Index: man8/newfs.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/newfs.8,v
retrieving revision 1.2
diff -u -r1.2 newfs.8
--- man8/newfs.8	2000/02/23 01:53:30	1.2
+++ man8/newfs.8	2000/05/30 03:21:43
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.24 2000/01/23 01:30:05 mpp Exp %
+.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.26 2000/03/01 11:27:24 sheldonh Exp %
 .\"
 .\" jpman %Id: newfs.8,v 1.3 1997/07/26 22:02:06 horikawa Stab %
 .Dd May 3, 1995
@@ -353,6 +353,7 @@
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
+.Xr camcontrol 8 ,
 .Xr disklabel 8 ,
 .Xr diskpart 8 ,
 .Xr dumpfs 8 ,
Index: man8/newfs_msdos.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/newfs_msdos.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 newfs_msdos.8
--- man8/newfs_msdos.8	2000/02/15 14:35:04	1.1.1.1
+++ man8/newfs_msdos.8	2000/05/30 03:21:45
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.6 1999/08/28 00:13:52 peter Exp %
+.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.7 2000/03/01 11:27:25 sheldonh Exp %
 .\" jpman %Id: newfs_msdos.8,v 1.3 1998/10/10 09:07:02 yohta Stab %
 .\" 
 .Dd July 6, 1998
Index: man8/newsyslog.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/newsyslog.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 newsyslog.8
--- man8/newsyslog.8	2000/02/15 14:35:04	1.1.1.1
+++ man8/newsyslog.8	2000/05/30 03:21:47
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.22 1999/11/27 16:57:27 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.23 2000/03/01 14:08:09 sheldonh Exp %
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
Index: man8/nextboot.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/nextboot.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 nextboot.8
--- man8/nextboot.8	2000/02/15 14:35:04	1.1.1.1
+++ man8/nextboot.8	2000/05/30 03:21:47
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.10 1999/08/28 00:13:06 peter Exp %
+.\" %FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.11 2000/03/01 11:27:47 sheldonh Exp %
 .\" jpman %Id: nextboot.8,v 1.3 1997/08/16 13:35:00 horikawa Stab %
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
Index: man8/nfsd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/nfsd.8,v
retrieving revision 1.2
diff -u -r1.2 nfsd.8
--- man8/nfsd.8	2000/02/23 01:53:30	1.2
+++ man8/nfsd.8	2000/05/30 03:21:49
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\" %FreeBSD: src/sbin/nfsd/nfsd.8,v 1.11 2000/01/13 21:47:20 dillon Exp %
+.\" %FreeBSD: src/sbin/nfsd/nfsd.8,v 1.12 2000/03/01 11:27:27 sheldonh Exp %
 .\"
 .\" jpman %Id: nfsd.8,v 1.2 1997/03/31 14:53:57 horikawa Stab %
 .\"
Index: man8/ng_pptpgre.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ng_pptpgre.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ng_pptpgre.8
--- man8/ng_pptpgre.8	2000/02/15 14:35:10	1.1.1.1
+++ man8/ng_pptpgre.8	2000/05/30 03:21:49
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" %FreeBSD: src/sys/modules/netgraph/pptpgre/ng_pptpgre.8,v 1.3 1999/12/21 01:25:17 julian Exp %
+.\" %FreeBSD: src/sys/modules/netgraph/pptpgre/ng_pptpgre.8,v 1.4 2000/03/10 20:38:24 archie Exp %
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
 .\"
 .\" jpman %Id: ng_pptpgre.8,v 1.3 2000/01/03 03:17:39 horikawa Stab %
@@ -41,7 +41,7 @@
 .Os FreeBSD
 .Sh $BL>>N(B
 .Nm ng_pptpgre
-.Nd PPP $B%W%m%H%3%k(B netgraph $B%N!<%I%?%$%W(B
+.Nd PPTP GRE $B%W%m%H%3%k(B netgraph $B%N!<%I%?%$%W(B
 .Sh $B=q<0(B
 .Fd #include <netgraph/ng_pptpgre.h>
 .Sh $B2r@b(B
Index: man8/ngctl.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ngctl.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ngctl.8
--- man8/ngctl.8	2000/02/15 14:35:10	1.1.1.1
+++ man8/ngctl.8	2000/05/30 03:21:52
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.4 1999/12/21 01:25:01 julian Exp %
+.\" %FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.5 2000/03/01 14:08:10 sheldonh Exp %
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .\" jpman %Id: ngctl.8,v 1.3 1999/12/17 05:27:44 mitchy Stab %
Index: man8/nos-tun.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/nos-tun.8,v
retrieving revision 1.2
diff -u -r1.2 nos-tun.8
--- man8/nos-tun.8	2000/02/23 01:53:30	1.2
+++ man8/nos-tun.8	2000/05/30 03:21:52
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\" 
-.\" %FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.5 2000/01/23 01:30:05 mpp Exp %
+.\" %FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.6 2000/03/01 11:27:29 sheldonh Exp %
 .\" jpman %Id: nos-tun.8,v 1.3 1998/10/12 22:52:07 vanitas Stab %
 .\" 
 .Dd April 11, 1998
Index: man8/pam_radius.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pam_radius.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pam_radius.8
--- man8/pam_radius.8	2000/02/15 14:35:10	1.1.1.1
+++ man8/pam_radius.8	2000/05/30 03:21:54
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.2 1999/08/28 00:05:20 peter Exp %
+.\" %FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.3 2000/03/02 09:14:21 sheldonh Exp %
 .\" jpman %Id: pam_radius.8,v 1.3 1999/09/15 14:34:02 yt-kage Stab %
 .\"
 .Dd August 2, 1999
Index: man8/pccardc.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pccardc.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pccardc.8
--- man8/pccardc.8	2000/02/15 14:35:09	1.1.1.1
+++ man8/pccardc.8	2000/05/30 03:21:56
@@ -26,7 +26,7 @@
 .\"
 .\" Translated to English by Hiroki Sato <hrs@geocities.co.jp>
 .\"
-.\" %FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.6 1999/12/02 19:31:28 imp Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.7 2000/03/01 14:09:18 sheldonh Exp %
 .\"
 .\" jpman %Id: pccardc.8,v 1.3 1999/05/13 14:04:07 horikawa Stab %
 .\" $B86J8$G$"$k(B PAO $B$N(B pccardc.8 $B$r$[$\$=$N$^$^MxMQ$7$F$$$^$9(B
Index: man8/pccardd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pccardd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pccardd.8
--- man8/pccardd.8	2000/02/15 14:35:04	1.1.1.1
+++ man8/pccardd.8	2000/05/30 03:21:56
@@ -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/pccard/pccardd/pccardd.8,v 1.16 1999/08/28 01:17:36 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.17 2000/03/01 14:09:19 sheldonh Exp %
 .\"
 .\" jpman %Id: pccardd.8,v 1.4 1997/07/26 22:04:06 horikawa Stab %
 .\"
Index: man8/pciconf.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pciconf.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pciconf.8
--- man8/pciconf.8	2000/02/15 14:35:04	1.1.1.1
+++ man8/pciconf.8	2000/05/30 03:21:58
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.7 1999/11/27 16:59:06 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.8 2000/03/01 14:08:12 sheldonh Exp %
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
Index: man8/ping.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ping.8,v
retrieving revision 1.2
diff -u -r1.2 ping.8
--- man8/ping.8	2000/02/23 01:53:30	1.2
+++ man8/ping.8	2000/05/30 03:22:03
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/ping/ping.8,v 1.24 2000/01/20 20:48:48 billf Exp %
+.\" %FreeBSD: src/sbin/ping/ping.8,v 1.25 2000/03/01 11:27:30 sheldonh Exp %
 .\"
 .\" jpman %Id: ping.8,v 1.3 1997/10/11 08:00:36 horikawa Stab %
 .Dd March 1, 1997
Index: man8/portmap.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/portmap.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 portmap.8
--- man8/portmap.8	2000/02/15 14:35:05	1.1.1.1
+++ man8/portmap.8	2000/05/30 03:22:03
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)portmap.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.6 1999/08/28 01:18:10 peter Exp %
+.\" %FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.7 2000/03/02 18:15:46 cwt Exp %
 .\"
 .\" Original Revision: 1.4
 .\" jpman %Id: portmap.8,v 1.2 1997/03/31 14:54:58 horikawa Stab %
@@ -80,9 +80,15 @@
 .Tn RPC
 $B%5!<%P$,5/F0$5$l$kA0$K3+;O$5$l$kI,MW$,$"$j$^$9!#(B
 .Pp
+.Nm
+$B$O!"(B
+.Xr hosts_access 5 
+$B%"%/%;%9@)8f$r%G%U%)%k%H$G;HMQ$7$^$9!#(B
+$B%"%/%;%9@)8f%Q%?!<%s$O(B IP $B%"%I%l%9$N$_$r;2>H2DG=$G$9!#(B
+.Pp
 $BDL>o!"(B
 .Nm
-$B$O!"B>$N%G!<%b%s$HF1$8$h$&$K!"5/F0$5$l$?C<Kv$NF0:n$K$O1F6A$5$l$^$;$s!#(B
+$B$O!"B>$N%G!<%b%s$HF1MM!"%U%)!<%/$7$F5/F0$5$l$?C<Kv$+$i<+8J$r@Z$jN%$7$^$9!#(B
 .Nm
 $B$O!"(B
 .Xr syslog 3
@@ -98,6 +104,7 @@
 $B%"%/%;%9%3%s%H%m!<%k%A%'%C%/$K4X$9$k>iD9$J%m%0$r<h$j$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
+.Xr hosts_access 5 ,
 .Xr inetd.conf 5 ,
 .Xr inetd 8 ,
 .Xr rpcinfo 8
Index: man8/ppp.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ppp.8,v
retrieving revision 1.2
diff -u -r1.2 ppp.8
--- man8/ppp.8	2000/02/23 01:53:30	1.2
+++ man8/ppp.8	2000/05/30 03:22:39
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.207 2000/01/07 03:11:56 brian Exp %
+.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209 2000/03/02 14:53:35 sheldonh Exp %
 .\"
 .\" jpman %Id: ppp.8,v 1.4 1997/06/08 18:41:58 saeki Stab %
 .\" WORD: expect string	$B<u?.BT$AJ8;zNs(B (chat.8)
@@ -2819,7 +2819,7 @@
 $BK\%*%W%7%g%s$r(B enable $B$K$9$k$H!"(B
 .Nm
 $B$O8E$$%$%s%?%U%'!<%9%"%I%l%9$N%H%i%U%#%C%/$r(B NAT $B%(%s%8%s(B
-.Pq Xr libalias 5 $B;2>H(B
+.Pq Xr libalias 3 $B;2>H(B
 $B$rDL$9$h$&$K$J$j!"(B(
 .Fl auto
 $B%b!<%I$G$O(B)
@@ -4081,7 +4081,7 @@
 .Pp
 $BJ#?t%l%Y%k$N%M%9%H$K$D$$$F!"(B
 $B%(%9%1!<%WJ8;z$N;HMQJ}K!$K(B ($B:FEY(B) $BCm0U$7$F$/$@$5$$!#(B
-$B$3$3$G$O!"(B4 $B$D$N%Q!<%6$,F0:n$7$F$^$9!#(B
+$B$3$3$G$O!"(B4 $B$D$N%Q!<%6$,F0:n$7$F$$$^$9!#(B
 1 $BHVL\$O!"%*%j%8%J%k$N9T$r%Q!<%:$7!"(B3 $B$D$N0z?t$H$7$FFI$_$^$9!#(B
 2 $BHVL\$O!"Bh(B 3 $B0z?t$r(B 11 $B8D$N0z?t$H$7$FFI$_$^$9!#(B
 $B$3$3$G!"(B
Index: man8/pppd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pppd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pppd.8
--- man8/pppd.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/pppd.8	2000/05/30 03:22:53
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" %FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.19 1999/08/28 01:19:07 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.20 2000/03/03 09:11:26 sheldonh Exp %
 .\" jpman %Id: pppd.8,v 1.2 1997/05/27 00:43:48 mutoh Stab %
 .\" SH section heading
 .\" SS subsection heading
Index: man8/pppstats.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pppstats.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pppstats.8
--- man8/pppstats.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/pppstats.8	2000/05/30 03:22:53
@@ -1,4 +1,4 @@
-.\"	@(#) %FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.9 1999/08/28 01:19:11 peter Exp %
+.\"	@(#) %FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.10 2000/03/03 09:11:28 sheldonh Exp %
 .\" jpman %Id: pppstats.8,v 1.2 1997/05/23 09:03:43 mitchy Stab %
 .\"
 .TH PPPSTATS 8 "26 June 1995"
Index: man8/procctl.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/procctl.8,v
retrieving revision 1.2
diff -u -r1.2 procctl.8
--- man8/procctl.8	2000/02/23 01:53:30	1.2
+++ man8/procctl.8	2000/05/30 03:22:53
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.6 2000/01/23 02:09:52 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.7 2000/02/21 11:05:56 ru Exp %
 .\"
 .\" jpman %Id: procctl.8,v 1.3 1998/10/12 14:27:48 horikawa Stab %
 .Dd Nov 23, 1997
@@ -9,11 +9,10 @@
 .Nd procfs $B%$%Y%s%H%U%i%0$N%/%j%"(B
 .Sh $B=q<0(B
 .Nm
-.Ar command
-.Op Ar ...
+.Ar pid ...
 .Sh $B2r@b(B
 .Nm
-$B$O(B
+$B%3%^%s%I$O(B
 .Xr truss 1
 $B$K$h$C$F;H$o$l$k(B
 .Xr procfs 5
@@ -24,7 +23,7 @@
 $B$3$N(B
 .Nm
 $B%3%^%s%I$r;H$&$3$H$,=PMh$^$9!#(B
-$B%3%^%s%I%*%W%7%g%s$O%W%m%;%9(BID$B$N%j%9%H$G$9(B;
+$B0z?t$O%W%m%;%9(B ID $B$N%j%9%H$G$9(B;
 .Nm
 $B%3%^%s%I$O$3$N%j%9%H$r=g<!I>2A$7$^$9!#(B
 $B$=$7$F!"%j%9%H$KL@<($5$l$?$=$l$>$l$N%W%m%;%9$KBP1~$9$k%$%Y%s%H%^%9%/(B
Index: man8/pw.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pw.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pw.8
--- man8/pw.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/pw.8	2000/05/30 03:23:00
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/pw/pw.8,v 1.17 1999/08/28 01:19:18 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pw/pw.8,v 1.19 2000/03/02 14:53:37 sheldonh Exp %
 .\" jpman %Id: pw.8,v 1.3 1997/10/28 15:30:48 kuriyama Stab %
 .\"
 .\" WORD: primary group		$B%W%i%$%^%j%0%k!<%W(B(/etc/passwd $B$N%0%k!<%W(BID$B$G7h$^$k%0%k!<%W(B)
Index: man8/pwd_mkdb.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/pwd_mkdb.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pwd_mkdb.8
--- man8/pwd_mkdb.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/pwd_mkdb.8	2000/05/30 03:23:02
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.14 1999/12/02 16:39:13 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.15 2000/03/01 14:08:18 sheldonh Exp %
 .\"
 .\" jpman %Id: pwd_mkdb.8,v 1.3 1997/08/27 12:36:09 horikawa Stab %
 .\"
Index: man8/quotacheck.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/quotacheck.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 quotacheck.8
--- man8/quotacheck.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/quotacheck.8	2000/05/30 03:23:04
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.5 1999/09/06 20:55:28 mph Exp %
+.\" %FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.6 2000/03/01 11:27:33 sheldonh Exp %
 .\" jpman %Id: quotacheck.8,v 1.2 1997/05/19 05:05:46 mitchy Stab %
 .\"
 .Dd June 5, 1993
Index: man8/rc.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/rc.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rc.8
--- man8/rc.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/rc.8	2000/05/30 03:23:04
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/share/man/man8/rc.8,v 1.8 1999/08/28 00:21:01 peter Exp %
+.\" %FreeBSD: src/share/man/man8/rc.8,v 1.9 2000/03/03 14:05:02 sheldonh Exp %
 .\" jpman %Id: rc.8,v 1.3 1997/08/16 13:37:00 horikawa Stab %
 .\"
 .Dd December 11, 1993
@@ -53,7 +53,7 @@
 .Nm rc.shutdown
 .Sh $B2r@b(B
 .Nm rc
-$B$O<+F0%j%V!<%H=hM}(B ($BB>$N%9%/%j%W%H$r8F$S$^$9(B) $B$r@)8f$9$k%3%^%s%I%9%/%j%W%H$G!"(B
+$B$O<+F0%j%V!<%H=hM}$r@)8f$9$k%3%^%s%I%9%/%j%W%H(B ($BB>$N%9%/%j%W%H$r8F$S$^$9(B) $B$G!"(B
 .Nm rc.local
 $B$OFCDj%5%$%H$KFC2=$7$?%3%^%s%I$r5-=R$9$k%9%/%j%W%H$G$9!#(B
 $B:#F|$G$O!"(B
@@ -70,7 +70,7 @@
 .Xr rc.conf 5
 $B$r;2>H$7$F$/$@$5$$!#(B
 .Pp
-.Nm Rc.shutdown
+.Nm rc.shutdown
 $B$O!"%7%9%F%`%7%c%C%H%@%&%s$K$*$$$F<B9T$5$l$k$3$H$,I,MW$J%3%^%s%I$r;}$D(B
 $B%3%^%s%I%9%/%j%W%H$G$9!#(B
 .Pp
Index: man8/reboot.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/reboot.8,v
retrieving revision 1.2
diff -u -r1.2 reboot.8
--- man8/reboot.8	2000/02/23 01:53:30	1.2
+++ man8/reboot.8	2000/05/30 03:23:06
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/sbin/reboot/reboot.8,v 1.9 2000/01/10 12:24:47 phantom Exp %
+.\" %FreeBSD: src/sbin/reboot/reboot.8,v 1.10 2000/03/01 11:27:35 sheldonh Exp %
 .\"
 .\" jpman %Id: reboot.8,v 1.3 1997/06/06 11:35:27 bobson Stab %
 .\"
Index: man8/restore.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/restore.8,v
retrieving revision 1.2
diff -u -r1.2 restore.8
--- man8/restore.8	2000/02/23 01:53:30	1.2
+++ man8/restore.8	2000/05/30 03:23:11
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/restore/restore.8,v 1.17 2000/01/10 12:27:33 phantom Exp %
+.\" %FreeBSD: src/sbin/restore/restore.8,v 1.20 2000/03/01 11:27:37 sheldonh Exp %
 .\"
 .\" jpman %Id: restore.8,v 1.2 1997/03/31 14:58:10 horikawa Stab %
 .Dd May 1, 1995
@@ -43,32 +43,32 @@
 .Sh $B=q<0(B
 .Nm restore
 .Fl i
-.Op Fl chkmuvy
+.Op Fl chkmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm restore
 .Fl R
-.Op Fl ckuvy
+.Op Fl ckNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm restore
 .Fl r
-.Op Fl ckuvy
+.Op Fl ckNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm restore
 .Fl t
-.Op Fl chkuvy
+.Op Fl chkNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Op file ...
 .Nm restore
 .Fl x
-.Op Fl chkmuvy
+.Op Fl chkmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
@@ -285,6 +285,9 @@
 $BE83+$r!"%U%!%$%kL>$G$O$J$/(B inode $BHV9f$K$h$C$F9T$$$^$9!#(B
 $B$3$l$O?t8D$N%U%!%$%k$N$_$rE83+$7$?$$>l9g$G!"%U%!%$%k$N40A4$J%Q%9L>$r(B
 $B:F@8$9$k$3$H$rKI$.$?$$>l9g$KM-MQ$G$9!#(B
+.It Fl N
+$BDL>oDL$jE83+$7$^$9$,!"<B:]$K$OJQ99$r%G%#%9%/$X=q$-9~$_$^$;$s!#(B
+$B%@%s%W%a%G%#%"$N40A4@-$N3NG'$dB>$N%F%9%HL\E*$K;HMQ2DG=$G$9!#(B
 .It Fl s Ar fileno
 $B%^%k%A%U%!%$%k%F!<%W$N(B
 .Ar fileno
@@ -394,7 +397,6 @@
 .El
 .Sh $B4XO"9`L\(B
 .Xr dump 8 ,
-.Xr ft 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr rmt 8
Index: man8/rexecd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/rexecd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rexecd.8
--- man8/rexecd.8	2000/02/15 14:35:06	1.1.1.1
+++ man8/rexecd.8	2000/05/30 03:23:11
@@ -112,11 +112,11 @@
 .Pp
 .Bl -tag -width Ds
 .It Sy username too long
-$B%f!<%6L>$,(B 16 $BJ8;z$r1[$($F$^$9!#(B
+$B%f!<%6L>$,(B 16 $BJ8;z$r1[$($F$$$^$9!#(B
 .It Sy password too long
-$B%Q%9%o!<%I$,(B 16 $BJ8;z$r1[$($F$^$9!#(B
+$B%Q%9%o!<%I$,(B 16 $BJ8;z$r1[$($$$F$^$9!#(B
 .It Sy command too long
-$B%3%^%s%I%i%$%s$ND9$5$,(B($B@_Dj$5$l$F$$$k(B)$B%7%9%F%`$N0z?t$ND9$5@)8B$r1[$($F$^$9!#(B
+$B%3%^%s%I%i%$%s$ND9$5$,(B($B@_Dj$5$l$F$$$k(B)$B%7%9%F%`$N0z?t$ND9$5@)8B$r1[$($F$$$^$9!#(B
 .It Sy Login incorrect.
 $B%Q%9%o!<%I%U%!%$%k$N%(%s%H%j$KEv3:%f!<%6L>$,$"$j$^$;$s!#(B
 .It Sy Password incorrect.
Index: man8/rndcontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/rndcontrol.8,v
retrieving revision 1.2
diff -u -r1.2 rndcontrol.8
--- man8/rndcontrol.8	2000/02/23 01:53:30	1.2
+++ man8/rndcontrol.8	2000/05/30 03:23:13
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.12 2000/01/23 02:09:58 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.13 2000/03/01 14:08:20 sheldonh Exp %
 .\"
 .\" jpman %Id: rndcontrol.8,v 1.3 1997/08/16 13:39:03 horikawa Stab %
 .\"
Index: man8/rpc.yppasswdd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/rpc.yppasswdd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rpc.yppasswdd.8
--- man8/rpc.yppasswdd.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/rpc.yppasswdd.8	2000/05/30 03:23:15
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.10 1999/08/28 01:19:40 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.12 2000/03/02 14:53:37 sheldonh Exp %
 .\" jpman %Id: rpc.yppasswdd.8,v 1.3 1997/08/31 14:17:34 horikawa Stab %
 .\"
 .Dd February 8, 1996
Index: man8/rpc.ypxfrd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/rpc.ypxfrd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rpc.ypxfrd.8
--- man8/rpc.ypxfrd.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/rpc.ypxfrd.8	2000/05/30 03:23:18
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.8 1999/08/28 01:19:46 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.9 2000/03/01 14:08:25 sheldonh Exp %
 .\" jpman %Id: rpc.ypxfrd.8,v 1.3 1997/09/04 17:48:28 horikawa Stab %
 .\"
 .Dd June 2, 1996
Index: man8/rwhod.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/rwhod.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rwhod.8
--- man8/rwhod.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/rwhod.8	2000/05/30 03:23:20
@@ -30,13 +30,12 @@
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" %FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.12 1999/08/28 01:19:50 peter Exp %
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwhod.8	8.2 (Berkeley) 12/11/93
+.\" %FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.13 2000/01/29 01:54:58 chris Exp %
 .\"
-.\" Original Revision: 1.9.2.1
 .\" jpman %Id: rwhod.8,v 1.3 1997/10/11 07:49:54 horikawa Stab %
 .\"
 .Dd December 11, 1993
Index: man8/sa.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/sa.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sa.8
--- man8/sa.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/sa.8	2000/05/30 03:23:20
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/sa/sa.8,v 1.10 1999/08/28 01:19:53 peter Exp %
+.\" %FreeBSD: src/usr.sbin/sa/sa.8,v 1.11 2000/01/29 01:54:59 chris Exp %
 .\" jpman %Id: sa.8,v 1.2 1997/03/31 15:00:26 horikawa Stab %
 .\"
 .Dd February 25, 1994
Index: man8/showmount.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/showmount.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 showmount.8
--- man8/showmount.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/showmount.8	2000/05/30 03:23:22
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\" %FreeBSD: src/usr.bin/showmount/showmount.8,v 1.7 1999/08/28 01:05:42 peter Exp %
+.\" %FreeBSD: src/usr.bin/showmount/showmount.8,v 1.8 2000/03/01 12:20:18 sheldonh Exp %
 .\" jpman %Id: showmount.8,v 1.2 1997/05/03 13:44:20 horikawa Stab %
 .\"
 .Dd March 29, 1995
Index: man8/sicontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/sicontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sicontrol.8
--- man8/sicontrol.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/sicontrol.8	2000/05/30 03:23:22
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.10 1999/10/30 15:38:19 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.11 2000/03/01 14:08:29 sheldonh Exp %
 .\"
 .\" jpman %Id: sicontrol.8,v 1.2 1997/06/17 17:49:35 saeki Stab %
 .Dd September 26,1995
Index: man8/slattach.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/slattach.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 slattach.8
--- man8/slattach.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/slattach.8	2000/05/30 03:23:24
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"	%Header: /home/ncvs/src/sbin/slattach/slattach.8,v 1.13 1997/04/16 09:56:30 danny Exp %
-.\" %FreeBSD: src/sbin/slattach/slattach.8,v 1.15 1999/08/28 00:14:25 peter Exp %
+.\" %FreeBSD: src/sbin/slattach/slattach.8,v 1.16 2000/03/01 11:27:39 sheldonh Exp %
 .\" jpman %Id: slattach.8,v 1.2 1997/05/19 05:35:41 mitchy Stab %
 .\"
 .Dd April 4, 1993
Index: man8/sliplogin.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/sliplogin.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sliplogin.8
--- man8/sliplogin.8	2000/02/15 14:35:07	1.1.1.1
+++ man8/sliplogin.8	2000/05/30 03:23:27
@@ -30,9 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
-.\" %FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.11 1999/08/28 01:19:59 peter Exp %
+.\" %FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.12 2000/03/01 14:08:32 sheldonh Exp %
 .\"
-.\" Original Revision: 1.9
 .\" jpman %Id: sliplogin.8,v 1.3 1997/07/26 22:10:08 horikawa Stab %
 .\"
 .Dd January 5, 1994
Index: man8/slstat.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/slstat.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 slstat.8
--- man8/slstat.8	2000/02/15 14:35:08	1.1.1.1
+++ man8/slstat.8	2000/05/30 03:23:29
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" %FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.13 1999/08/28 01:20:00 peter Exp %
+.\" %FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.14 2000/03/01 14:08:34 sheldonh Exp %
 .\" jpman %Id: slstat.8,v 1.2 1997/05/24 05:28:27 mitchy Stab %
 .\"
 .Dd October 11, 1996
Index: man8/spppcontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/spppcontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 spppcontrol.8
--- man8/spppcontrol.8	2000/02/15 14:35:09	1.1.1.1
+++ man8/spppcontrol.8	2000/05/30 03:23:31
@@ -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/sbin/spppcontrol/spppcontrol.8,v 1.5 1999/08/28 00:14:26 peter Exp %
+.\" %FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6 2000/03/01 11:27:41 sheldonh Exp %
 .\"
 .Dd October 11, 1997
 .Os
Index: man8/sticky.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/sticky.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sticky.8
--- man8/sticky.8	2000/02/15 14:35:08	1.1.1.1
+++ man8/sticky.8	2000/05/30 03:23:31
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man8/sticky.8,v 1.6 1999/08/28 00:21:01 peter Exp %
+.\" %FreeBSD: src/share/man/man8/sticky.8,v 1.7 2000/03/03 14:05:03 sheldonh Exp %
 .\"
 .\" jpman %Id: sticky.8,v 1.3 1997/07/19 12:27:09 konuma Stab %
 .\"
Index: man8/swapon.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/swapon.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 swapon.8
--- man8/swapon.8	2000/02/15 14:35:08	1.1.1.1
+++ man8/swapon.8	2000/05/30 03:23:33
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/swapon/swapon.8,v 1.14 1999/09/26 00:05:45 nik Exp %
+.\" %FreeBSD: src/sbin/swapon/swapon.8,v 1.15 2000/02/28 21:29:37 gsutter Exp %
 .\"
 .\" jpman %Id: swapon.8,v 1.2 1997/05/03 13:45:14 horikawa Stab %
 .\"
@@ -90,7 +90,7 @@
 .Sh $B%P%0(B
 $B%G%P%$%9$X$N%Z!<%8%s%0$H%9%o%C%T%s%0$rDd;_$9$kJ}K!$O$"$j$^$;$s!#(B
 $B$G$9$+$i!"(B
-$B%7%9%F%`F0:nCf$K%G%P%$%9$N%^%&%s%H$r2r=|$7$F;HMQ$9$k$3$H$OIT2DG=$G$9!#(B
+$B%7%9%F%`F0:nCf$K%^%&%s%H$5$l$?%G%P%$%9$N%^%&%s%H$r2r=|$9$k$3$H$OIT2DG=$G$9!#(B
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
Index: man8/sysctl.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/sysctl.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sysctl.8
--- man8/sysctl.8	2000/02/15 14:35:08	1.1.1.1
+++ man8/sysctl.8	2000/05/30 03:23:36
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/sbin/sysctl/sysctl.8,v 1.22 1999/11/22 08:42:59 des Exp %
+.\" %FreeBSD: src/sbin/sysctl/sysctl.8,v 1.23 2000/02/26 16:55:21 steve Exp %
 .\" jpman %Id: sysctl.8,v 1.2 1997/05/30 00:57:58 yugawa Stab %
 .\"
 .Dd September 23, 1994
Index: man8/syslogd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/syslogd.8,v
retrieving revision 1.2
diff -u -r1.2 syslogd.8
--- man8/syslogd.8	2000/02/23 01:53:30	1.2
+++ man8/syslogd.8	2000/05/30 03:23:36
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.20 2000/01/23 20:22:22 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.22 2000/03/01 14:08:36 sheldonh Exp %
 .\"
 .\" jpman %Id: syslogd.8,v 1.3 1997/05/19 17:08:30 horikawa Stab %
 .\"
@@ -131,7 +131,7 @@
 19 $B8D$^$GDI2C$N%m%0MQ%=%1%C%H$r;XDj2DG=$G$9!#(B
 $B<g$JMQK!$O!"(B
 $BMM!9$K(B chroot $B$7$?%U%!%$%k6u4V$K$*$$$FDI2C$N%m%0MQ%=%1%C%H$r(B
-.Pa /dev/log
+.Pa /var/run/log
 $B$KCV$/$H$$$&$b$N$G$9!#(B
 .It Fl s
 $B%;%-%e%"%b!<%I$GA`:n$7$^$9!#%j%b!<%H%^%7%s$+$i$N%m%0%a%C%;!<%8$r%m%0$7$^$;$s!#(B
Index: man8/tunefs.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/tunefs.8,v
retrieving revision 1.2
diff -u -r1.2 tunefs.8
--- man8/tunefs.8	2000/02/23 01:53:30	1.2
+++ man8/tunefs.8	2000/05/30 03:23:38
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/tunefs/tunefs.8,v 1.10 2000/01/07 13:05:04 phantom Exp %
+.\" %FreeBSD: src/sbin/tunefs/tunefs.8,v 1.11 2000/03/01 11:27:43 sheldonh Exp %
 .\"
 .\" jpman %Id: tunefs.8,v 1.3 1997/07/26 22:16:10 horikawa Stab %
 .\"
Index: man8/usbd.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/usbd.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 usbd.8
--- man8/usbd.8	2000/02/15 14:35:08	1.1.1.1
+++ man8/usbd.8	2000/05/30 03:23:40
@@ -32,7 +32,7 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
-.\" %FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.8 1999/12/30 10:46:08 kuriyama Exp %
+.\" %FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.9 2000/03/01 14:08:37 sheldonh Exp %
 .\"
 .\"
 .Dd July 12, 1998
Index: man8/vinum.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/vinum.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vinum.8
--- man8/vinum.8	2000/02/15 14:35:08	1.1.1.1
+++ man8/vinum.8	2000/05/30 03:24:01
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" %Id: vinum.8,v 1.13 2000/01/03 03:12:56 grog Exp grog %
-.\" %FreeBSD: src/sbin/vinum/vinum.8,v 1.32 2000/01/05 05:59:08 grog Exp %
+.\" %FreeBSD: src/sbin/vinum/vinum.8,v 1.33 2000/03/01 07:22:10 grog Exp %
 .\"
 .\" jpman %Id: vinum.8,v 1.3 1999/01/05 15:15:53 horikawa Stab %
 .\" WORD: attach	$B7k9g(B ($B$9$k(B)
@@ -583,10 +583,12 @@
 .It DEBUG_ADDRESSES (1)
 .br
 $B%j%/%(%9%HCf$N%P%C%U%!>pJs$rI=<($7$^$9!#(B
+.ig
 .It DEBUG_NUMOUTPUT (2)
 .br
 .Dv vp->v_numoutput
 $B$NCM$rI=<($7$^$9!#(B
+..
 .It DEBUG_RESID (4)
 .br
 .Fn complete_rqe
@@ -1339,9 +1341,21 @@
 $BFC$K!"(B
 .Fl f
 $B%U%i%0$O$3$NMW5a$KM%@h$7$^$;$s!#(B
-$B$3$N%3%^%s%I$,F0:n$9$k$N$O!"(B
+$BDL>o!"(B
+.Nm stop
+$B%3%^%s%I$O!"=*N;A0$K8=:_$N@_Dj$r%G%#%9%/$X=q$-La$7$^$9!#(B
+$B@_Dj$N99?7$,L58z$K$J$C$F$$$k>l9g$K$O$3$l$O$G$-$^$;$s$N$G!"(B
+$B@_Dj$N99?7$,L58z$K$J$C$F$$$k>l9g$K$O(B
+.Nm
+$B$ODd;_$7$^$;$s!#(B
+$B$3$l$r>e=q$-$9$k$K$O(B
+.Fl f
+$B%U%i%0$r;XDj$7$^$9!#(B
+.Pp
+.Nm stop
+$B%3%^%s%I$O(B
 .Nm
-$B$,(B kld $B$H$7$F%m!<%I$5$l$F$$$k>l9g$N$_$G$9!#(B
+$B$,(B kld $B$H$7$F%m!<%I$5$l$F$$$k>l9g$N$_F0:n$7$^$9!#(B
 $B@EE*$K9=@.$5$l$?%I%i%$%P$r%"%s%m!<%I$9$k$3$H$O$G$-$J$$$+$i$G$9!#(B
 .Nm
 $B$,@EE*$K9=@.$5$l$F$$$k>l9g!"(B
@@ -2543,11 +2557,35 @@
 .Bl -enum
 .It
 .Nm
-$B$O%G%P%$%9$r(B UFS $B%Q!<%F%#%7%g%s>e$K$O:n@.$9$k$h$&MW5a$5$l$k$H!"(B
-.if t ``wrong partition type''
-.If n "wrong partition type"
-$B$H$$$&%(%i!<%a%C%;!<%8$rJV$7$^$9!#(B
-$B%Q!<%F%#%7%g%s%?%$%W$O!"(B``vinum'' $B$G$"$kI,MW$,$"$j$^$9!#(B
+$B%I%i%$%V$O(B UNIX $B%G%#%9%/%Q!<%F%#%7%g%s$G$"$j!"%Q!<%F%#%7%g%s%?%$%W(B
+.Ar vinum
+$B$G$"$k$3$H$,I,MW$G$9!#(B
+$B$3$l$O!"%Q!<%F%#%7%g%s%?%$%W$,(B
+.Ar 4.2BSD
+$B$G$"$k$3$H$r4|BT$9$k(B
+.Nm ccd
+$B$H$O0[$J$j$^$9!#(B
+$B$3$N(B ccd $B$NF0:n$O!"<+J,$NB-85$r$9$/$&$3$H$K$J$j$^$9(B:
+.Nm ccd 
+$B$G$O!"MQ0U$K%U%!%$%k%7%9%F%`$r>e=q$-$G$-$F$7$^$$$^$9!#(B
+.Nm
+$B$G$O$=$N$h$&$J$3$H$O5v$7$^$;$s!#(B
+.Pp
+$BF1MM$NM}M3$G!"(B
+.Nm vinum Ar start
+$B%3%^%s%I$O!"%Q!<%F%#%7%g%s(B
+.Ar c
+$B>e$N%I%i%$%V$r<u$1IU$1$^$;$s!#(B
+$B%Q!<%F%#%7%g%s(B
+.Ar c
+$B$O!"%G%#%9%/A4BN$rI=8=$9$k$?$a$K%7%9%F%`$,;HMQ$7!"%?%$%W(B
+.Ar unused
+$B$G$"$kI,MW$,$"$j$^$9!#(B
+$B$3$3$K$OL@3N$JL7=b$,$"$k$N$G!"(B
+.Ar c
+$B%Q!<%F%#%7%g%s$r;HMQ$7$J$$$3$H$K$h$j(B
+.Nm
+$B$OLdBj$r2r7h$7$F$$$^$9!#(B
 .It
 $BJ#?t$N%W%l%C%/%9$+$i$J$k%\%j%e!<%`:n@.;~$K!"(B
 .Nm
@@ -2631,37 +2669,6 @@
 .Pp
 $B8E$$%P!<%8%g%s$N(B kld $B$d%f!<%6%i%s%I%W%m%0%i%`$r;H$&$H!"(B
 $B$3$N%(%i!<$,H/@8$9$k$3$H$,$"$j$^$9!#(B
-.It
-.Nm
-$B%I%i%$%V$O(B UNIX $B%G%#%9%/%Q!<%F%#%7%g%s$G$"$j!"%Q!<%F%#%7%g%s%?%$%W(B
-.Ar vinum
-$B$r;HMQ$7$^$9!#(B
-$B$3$l$O!"%Q!<%F%#%7%g%s%?%$%W$,(B
-.Ar 4.2BSD
-$B$H$J$k(B
-.Nm ccd
-$B$H$O0c$$$^$9!#(B
-$B$3$N(B ccd $B$NF0:n$O!"<+J,$NB-85$r$9$/$&$3$H$K$J$j$^$9(B:
-.Nm ccd 
-$B$G$O!"MF0W$K%U%!%$%k%7%9%F%`$r>e=q$-$G$-$F$7$^$$$^$9!#(B
-.Nm
-$B$G$O$=$N$h$&$J$3$H$O5v$7$^$;$s!#(B
-.Pp
-$BF1MM$NM}M3$G!"(B
-.Nm vinum Ar start
-$B%3%^%s%I$O!"%Q!<%F%#%7%g%s(B
-.Ar c
-$B>e$N%I%i%$%V$r<u$1IU$1$^$;$s!#(B
-$B%Q!<%F%#%7%g%s(B
-.Ar c
-$B$O!"%G%#%9%/A4BN$rI=8=$9$k$?$a$K%7%9%F%`$,;HMQ$7!"%?%$%W(B
-.Ar unused
-$B$G$"$kI,MW$,$"$j$^$9!#(B
-$B$3$3$K$OL@3N$JL7=b$,$"$k$N$G!"(B
-.Ar c
-$B%Q!<%F%#%7%g%s$r;HMQ$7$J$$$3$H$K$h$j(B
-.Nm
-$B$OLdBj$r2r7h$7$F$$$^$9!#(B
 .It
 .Nm vinum Ar read
 $B%3%^%s%I$NJ8K!$O!"EG$-5$$r:E$9$b$N$G$9!#(B
Index: man8/vipw.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/vipw.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 vipw.8
--- man8/vipw.8	2000/02/15 14:35:09	1.1.1.1
+++ man8/vipw.8	2000/05/30 03:24:03
@@ -30,7 +30,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.sbin/vipw/vipw.8,v 1.6 1999/12/02 16:39:14 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.7 2000/03/01 14:08:38 sheldonh Exp %
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
 .\"
Index: man8/vnconfig.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/vnconfig.8,v
retrieving revision 1.4
diff -u -r1.4 vnconfig.8
--- man8/vnconfig.8	2000/02/23 01:53:30	1.4
+++ man8/vnconfig.8	2000/05/30 03:24:05
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.13 2000/01/23 20:26:20 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14 2000/02/17 02:54:36 gsutter Exp %
 .\"
 .\" jpman %Id: vnconfig.8,v 1.2 1997/05/03 13:45:51 horikawa Stab %
 .\"
@@ -259,7 +259,7 @@
 $B$^$?%U%!%$%k%7%9%F%`$r4^$s$G$$$?(B VN $B%Q!<%F%#%7%g%s$K(B
 fsck $B$r<B9T$9$k$3$H$b2DG=$G$9!#(B
 .Pp
-.Dl vnconfig -e -s labels,reserve -S 400m vn0
+.Dl vnconfig -e -s labels,reserve -S 400m vn1
 .Dl disklabel -r -w vn1 auto
 .Dl newfs /dev/rvn1c
 .Dl mount /dev/vn1c /usr/obj
Index: man8/wicontrol.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/wicontrol.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 wicontrol.8
--- man8/wicontrol.8	2000/02/15 14:35:09	1.1.1.1
+++ man8/wicontrol.8	2000/05/30 03:24:08
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.11 1999/11/25 20:45:49 wpaul Exp %
+.\" %FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.14 2000/03/02 14:53:39 sheldonh Exp %
 .\"
 .\" jpman %Id: wicontrol.8,v 1.3 1999/07/31 05:08:56 kuma Stab %
 .\"
@@ -60,6 +60,13 @@
 .Nm wicontrol
 .Fl i Ar iface Fl d Ar max data length
 .Nm wicontrol
+.Fl i Ar iface Fl e Ar 0|1
+.Nm wicontrol
+.Fl i Ar iface Fl k Ar key
+.Op Fl v Ar 1|2|3|4
+.Nm wicontrol
+.Fl i Ar iface Fl T Ar 1|2|3|4
+.Nm wicontrol
 .Fl i Ar iface Fl r Ar RTS threshold
 .Nm wicontrol
 .Fl i Ar iface Fl f Ar frequency
@@ -199,6 +206,35 @@
 $B;XDj$7$?%$%s%?%U%'!<%9$N!"Aw<u?.%U%l!<%`%5%$%:$N:GBg$r;XDj$7$^$9!#(B
 .Ar max data length
 $B$O!"(B350 $B$+$i(B 2304 $B$^$G$NG$0U$N?tCM$G$9!#%G%U%)%k%H$O(B 2304 $B$G$9!#(B
+.It Fl i Ar iface Fl e Ar 0|1
+WEP $B0E9f2=$rM-8z2=$^$?$OL58z2=$7$^$9!#(B
+$B;HMQ2DG=$JCM$O(B
+.Ar 0
+($B0E9f2=L58z(B) $B$^$?$O(B
+.Ar 1
+($B0E9f2=M-8z(B) $B$G$9!#(B
+$B0E9f2=$O%G%U%)%k%H$G$OL58z$G$9!#(B
+.It Fl i Ar iface Fl k Ar key "[-v 1|2|3|4]"
+WEP $B0E9f2=%-!<$r@_Dj$7$^$9!#(B
+$B%W%m%0%i%`2DG=$J0E9f2=%-!<$O!"%G%U%)%k%H$G(B 4 $B8D$"$j$^$9!#(B
+$B8D!9$N%-!<$O(B
+.Fl v
+$B%U%i%0$G@_Dj2DG=$G$9!#(B
+.Fl v
+$B%U%i%0$,;XDj$5$l$J$$$H!":G=i$N%-!<$,@_Dj$5$l$^$9!#(B
+$B0E9f2=%-!<$O!"DL>o%F%-%9%H(B ($B$9$J$o$A(B "hello") $B$^$?$O0lO"$N(B 16 $B?J?t(B
+($B$9$J$o$A(B "0x1234512345") $B$N$I$A$i$+$G$9!#(B
+WaveLAN Turbo Silver $B%+!<%I$G$O!"%-!<$O(B 40 $B%S%C%H$K@)8B$5$l$F$$$^$9$N$G!"(B
+$B%-!<$O(B 5 $BJ8;z$^$G$N%F%-%9%HJ8;zNs$+(B 10 $B7e$N(B 16 $B?J?t$G$9!#(B
+WaveLAN Turbo Gold $B%+!<%I$G$O!"%-!<$O(B 128 $B%S%C%H$^$G$G$9$N$G!"(B
+$B%-!<$O(B 16 $BJ8;z$^$G$N%F%-%9%HJ8;zNs$+(B 32 $B7e$N(B 16 $B?J?t$G$9!#(B
+.Pp
+$BCm(B: NIC $B$X%-!<$r%W%m%0%i%`$9$k$?$a$K;HMQ$5$l$k9=B$BNCf$N%U%#!<%k%I$O!"(B
+$B8=:_(B 14 $B%P%$%H$G$"$j!"(B16 $B%P%$%H$G$O$"$j$^$;$s!#(B
+$B$3$NJ}K!$G$I$&$d$C$F(B
+128 $B%S%C%H%-!<$r(B gold $B%+!<%I$X%W%m%0%i%`2DG=$H$9$k$N$+!";d$K$OJ,$+$j$^$;$s!#(B
+.It Fl i Ar iface Fl T Ar 1|2|3|4
+4 $B8D$N(B WEP $B0E9f2=%-!<$N$I$l$r;HMQ$7$FE>Aw%Q%1%C%H$r0E9f2=$9$k$+$r;XDj$7$^$9!#(B
 .It Fl i Ar iface Fl r Ar RTS threshold
 $B;XDj$7$?%$%s%?%U%'!<%9$N(B RTS/CTS $BogCM$r@_Dj$7$^$9!#(B
 $B$3$l$O!"(BRTS/CTS $B%O%s%I%7%'!<%/6-3&$K;HMQ$9$k%P%$%H?t$r@)8f$7$^$9!#(B
Index: man8/yp_mkdb.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/yp_mkdb.8,v
retrieving revision 1.2
diff -u -r1.2 yp_mkdb.8
--- man8/yp_mkdb.8	2000/02/23 01:53:30	1.2
+++ man8/yp_mkdb.8	2000/05/30 03:24:10
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.11 2000/01/23 20:31:22 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.12 2000/03/01 14:08:41 sheldonh Exp %
 .\"
 .\" jpman %Id: yp_mkdb.8,v 1.3 1997/05/19 17:09:21 horikawa Stab %
 .\"
Index: man8/ypbind.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ypbind.8,v
retrieving revision 1.2
diff -u -r1.2 ypbind.8
--- man8/ypbind.8	2000/02/23 01:53:30	1.2
+++ man8/ypbind.8	2000/05/30 03:24:12
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.14 2000/01/23 20:32:24 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.15 2000/03/01 14:08:43 sheldonh Exp %
 .\"
 .\" jpman %Id: ypbind.8,v 1.4 1997/06/18 16:55:44 horikawa Stab %
 .\"
Index: man8/ypinit.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ypinit.8,v
retrieving revision 1.2
diff -u -r1.2 ypinit.8
--- man8/ypinit.8	2000/02/23 01:53:31	1.2
+++ man8/ypinit.8	2000/05/30 03:24:14
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.6 2000/01/23 02:10:00 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.7 2000/03/01 14:08:45 sheldonh Exp %
 .\"
 .\" jpman %Id: ypinit.8,v 1.3 1998/10/10 14:46:05 horikawa Stab %
 .\"
Index: man8/yppush.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/yppush.8,v
retrieving revision 1.2
diff -u -r1.2 yppush.8
--- man8/yppush.8	2000/02/23 01:53:31	1.2
+++ man8/yppush.8	2000/05/30 03:24:14
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.11 2000/01/23 20:33:38 charnier Exp %
+.\" %FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.12 2000/03/01 14:08:44 sheldonh Exp %
 .\"
 .\" jpman %Id: yppush.8,v 1.3 1997/09/09 04:08:40 yugawa Stab %
 .\"
Index: man8/ypserv.8
===================================================================
RCS file: /home/cvs/man-jp/man/man8/ypserv.8,v
retrieving revision 1.2
diff -u -r1.2 ypserv.8
--- man8/ypserv.8	2000/02/23 01:53:31	1.2
+++ man8/ypserv.8	2000/05/30 03:24:17
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.20 2000/01/23 02:10:01 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22 2000/03/02 14:53:40 sheldonh Exp %
 .\"
 .\" jpman %Id: ypserv.8,v 1.3 1997/05/19 17:11:16 horikawa Stab %
 .\"

----Next_Part(Mon_May_29_23:30:11_2000_601)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_4.0_RELEASE_8
Content-Disposition: attachment; filename=diff_4.0_RELEASE_8

diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/IPXrouted.8 man8/IPXrouted.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/IPXrouted.8	Thu Jan 27 23:37:00 2000
+++ man8/IPXrouted.8	Tue Mar 21 06:31:48 2000
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.7 1999/08/28 01:15:00 peter Exp $
+.\" $FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.8 2000/03/01 14:07:47 sheldonh Exp $
 .\"
 .Dd Oct 11, 1995
 .Dt IPXROUTED 8
@@ -70,7 +70,8 @@
 .It Fl S
 Do not supply Service Advertizing Protocol 
 .Nm (SAP)
-information. The default is to supply 
+information.
+The default is to supply 
 .Nm SAP 
 information.
 .It Fl t
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/adduser.8 man8/adduser.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/adduser.8	Thu Jan 27 23:37:01 2000
+++ man8/adduser.8	Tue Mar 21 06:31:48 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/adduser/adduser.8,v 1.28 1999/08/28 01:15:11 peter Exp $
+.\" $FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.30 2000/03/06 09:45:31 sheldonh Exp $
 .\"
 .Dd January 9, 1995
 .Dt ADDUSER 8
@@ -59,14 +59,18 @@
 .Op Fl v | verbose
 .Sh DESCRIPTION
 .Nm Adduser 
-is a simple program for adding new users. Adduser checks
-the passwd, group and shell databases. It creates passwd/group entries,
+is a simple program for adding new users.
+Adduser checks
+the passwd, group and shell databases.
+It creates passwd/group entries,
 .Ev HOME
 directory, dotfiles and sends the new user a welcome message.
 .Sh RESTRICTIONS
 .Bl -tag -width Ds -compact
 .It Sy username
-Login name. May contain only  lowercase characters or digits. Maximum length
+Login name.
+May contain only lowercase characters or digits.
+Maximum length
 is 16 characters (see 
 .Xr setlogin 2
 BUGS section). 
@@ -81,7 +85,8 @@
 and recompile the
 world; people have done this and it works, but you will have problems
 with any precompiled programs, or source that assumes the 8-character
-name limit and NIS. The NIS protocol mandates an 8-character username.
+name limit and NIS.
+The NIS protocol mandates an 8-character username.
 If you need a longer login name for e-mail addresses,
 you can define an alias in
 .Pa /etc/aliases .
@@ -186,7 +191,8 @@
 .Ar uid
 on up.
 .It Sy -verbose,-v
-Many warnings, questions. Recommended for novice users.
+Many warnings, questions.
+Recommended for novice users.
 .Sh FORMATS
 .Bl -tag -width Ds -compact
 .Ql Pa #
@@ -198,7 +204,8 @@
 .Pa /etc/adduser.conf
 for more details.
 .It Sy message file
-Eval variables in this file. See
+Eval variables in this file.
+See
 .Pa /etc/adduser.message
 for more
 details.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/adjkerntz.8 man8/adjkerntz.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/adjkerntz.8	Thu Jan 27 23:33:58 2000
+++ man8/adjkerntz.8	Tue Mar 21 06:30:06 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.17 1999/08/28 00:12:14 peter Exp $
+.\" $FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.18 2000/03/01 11:26:58 sheldonh Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
@@ -43,7 +43,8 @@
 .Nm Adjkerntz
 also informs the kernel about machine timezone shifts to
 maintain proper timestamps for local time file systems such as the MS-DOS
-file system. The main purpose of this thing is not general fixing of
+file system.
+The main purpose of this thing is not general fixing of
 initially broken MS-DOS file timestamp idea but keeping
 the same timestamps between
 .Bx Free
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/amd.8 man8/amd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/amd.8	Thu Jan 27 23:37:04 2000
+++ man8/amd.8	Tue Mar 21 06:31:49 2000
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.5 1999/11/05 12:56:09 obrien Exp $
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.6 2000/03/01 10:48:31 nik Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -274,7 +274,7 @@
 option.
 .It Fl T Ar tag
 Specify a tag to use with
-.Xr amd.conf 5.
+.Xr amd.conf 5 .
 All Map entries tagged with tag will be processed.   
 Map entries that are not tagged are always processed.
 Map entries that are tagged with a tag other than
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ancontrol.8 man8/ancontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ancontrol.8	Thu Jan 27 23:37:10 2000
+++ man8/ancontrol.8	Tue Mar 21 06:31:54 2000
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.1 2000/01/14 20:40:57 wpaul Exp $
+.\" $FreeBSD: src/usr.sbin/ancontrol/ancontrol.8,v 1.3 2000/03/02 14:53:33 sheldonh Exp $
 .\"
 .Dd September 10, 1999
 .Dt ANCONTROL 8
@@ -88,11 +88,14 @@
 command controls the operation of Aironet wireless networking
 devices via the
 .Xr an 4
-driver. Most of the parameters that can be changed relate to the
-IEEE 802.11 protocol which the Aironet cards implement. This includes
+driver.
+Most of the parameters that can be changed relate to the
+IEEE 802.11 protocol which the Aironet cards implement.
+This includes
 the station name, whether the station is operating in ad-hoc (point
 to point) or infrastructure mode, and the network name of a service
-set to join. The
+set to join.
+The
 .Nm
 command can also be used to view the current NIC status, configuration
 and to dump out the values of the card's statistics counters.
@@ -107,39 +110,51 @@
 The options are as follows:
 .Bl -tag -width Fl
 .It Fl i Ar iface Fl A
-Display the prefered access point list. The AP list can be used by
+Display the prefered access point list.
+The AP list can be used by
 stations to specify the MAC address of access points with which it
-wishes to associate. If no AP list is specified (the default) then
+wishes to associate.
+If no AP list is specified (the default) then
 the station will associate with the first access point that it finds
-which serves the SSID(s) specified in the SSID list. The AP list can
+which serves the SSID(s) specified in the SSID list.
+The AP list can
 be modified with the
 .Fl a
 option.
 .It Fl i Ar iface Fl N
-Display the SSID list. This is a list of service set IDs (i.e. network names)
-with which the station wishes to associate. There may be up to three SSIDs
+Display the SSID list.
+This is a list of service set IDs (i.e. network names)
+with which the station wishes to associate.
+There may be up to three SSIDs
 in the list: the station will go through the list in ascending order and
 associate with the first matching SSID that it finds.
 .It Fl i Ar iface Fl S
-Display NIC status information. This includes the current operating
+Display NIC status information.
+This includes the current operating
 status, current BSSID, SSID, channel, beacon period and currently
-associated access point. The operating mode indicates the state of
-the NIC, MAC status and receiver status. When the "synced" keyword
+associated access point.
+The operating mode indicates the state of
+the NIC, MAC status and receiver status.
+When the "synced" keyword
 appears, it means the NIC has successfully associated with an access
 point, associated with an ad-hoc "master" station, or become a "master"
-itself. The beacon period can be anything between 20 and 976 milliseconds.
+itself.
+The beacon period can be anything between 20 and 976 milliseconds.
 The default is 100.
 .It Fl i Ar iface Fl I
-Display NIC capability information. This shows the device type,
+Display NIC capability information.
+This shows the device type,
 frequency, speed and power level capablities and firmware revision levels.
 .It Fl i Ar iface Fl T
 Display the NIC's internal statistics counters.
 .It Fl i Ar iface Fl C
-Display current NIC configuration. This shows the current operation mode,
+Display current NIC configuration.
+This shows the current operation mode,
 receive mode, MAC address, power save settings, various timing settings,
 channel selection, diversity, transmit power and transmit speed.
 .It Fl i Ar iface Fl t Ar 0|1|2|3|4
-Select transmit speed. The available settings are as follows:
+Select transmit speed.
+The available settings are as follows:
 .Bd -filled -offset indent
 .Bl -column "TX rate " "NIC speed "
 .Em "TX rate	NIC speed"
@@ -154,7 +169,8 @@
 Note that the 5.5 and 11Mbps settings are only supported on the 4800
 series adapters: the 4500 series adapters have a maximum speed of 2Mbps.
 .It Fl i Ar iface Fl s Ar 0|1|2|3
-Set power save mode. Valid selections are as follows:
+Set power save mode.
+Valid selections are as follows:
 .Bd -filled -offset indent
 .Bl -column "Selection " "Power save mode "
 .Em "Selection	Power save mode"
@@ -168,24 +184,32 @@
 Note that for IBSS (ad-hoc) mode, only PSP mode is supported, and only
 if the ATIM window is non-zero.
 .It Fl i Ar iface Fl a Ar AP "[-v 1|2|3|4]"
-Set prefered access point. The
+Set prefered access point.
+The
 .Ar AP
 is specified as a MAC address consisting of 6 hexadecimal values
-separated by colons. By default, the
+separated by colons.
+By default, the
 .Fl a
-option only sets the first entry in the AP list. The
+option only sets the first entry in the AP list.
+The
 .Fl v
 modifier can be used to specify exactly which AP list entry is to be
-modified. If the
+modified.
+If the
 .Fl v
 flag is not used, the first AP list entry will be changed.
 .It Fl i Ar iface Fl b Ar beacon period
-Set the ad-hoc mode beacon period. The becon period is specified in
-milliseconds. The default is 100ms.
+Set the ad-hoc mode beacon period.
+The becon period is specified in
+milliseconds.
+The default is 100ms.
 .It Fl i Ar iface Fl d Ar 0|1|2|3 "-v 0|1"
-Select the antenna diversity. Aironet devices can be configured with up
+Select the antenna diversity.
+Aironet devices can be configured with up
 to two antennas, and transmit and receive diversity can be configured
-accordingly. Valid selections are as follows:
+accordingly.
+Valid selections are as follows:
 .Bd -filled -offset indent
 .Bl -column "Selection " "Diversity "
 .Em "Selection	Diversity"
@@ -196,7 +220,8 @@
 .El
 .Ed
 .Pp
-The receive and transmit diversity can be set independently. The user
+The receive and transmit diversity can be set independently.
+The user
 must specify which diversity setting is to be modified by using the
 .Fl v
 option: selection
@@ -205,54 +230,74 @@
 .Ar 1
 sets the transmit diversity.
 .It Fl i Ar iface Fl j Ar netjoin timeout
-Set the ad-hoc network join timeout. When a station is first activated
+Set the ad-hoc network join timeout.
+When a station is first activated
 in ad-hoc mode, it will search out a 'master' station with the desired
-SSID and associate with it. If the station is unable to locate another
+SSID and associate with it.
+If the station is unable to locate another
 station with the same SSID after a suitable timeout, it sets itself up
-as the 'master' so that other stations may associate with it. This
+as the 'master' so that other stations may associate with it.
+This
 timeout defaults to 10000 milliseconds (10 seconds) but may be changed
-with this option. The timeout should be specified in milliseconds.
+with this option.
+The timeout should be specified in milliseconds.
 .It i Ar iface Fl l Ar station name
-Set the station name used internally by the NIC. The
+Set the station name used internally by the NIC.
+The
 .Ar station name
-can be any text string up to 16 characters in length. The default name
+can be any text string up to 16 characters in length.
+The default name
 is set by the driver to "FreeBSD."
 .It Fl i Ar iface Fl m Ar mac address
-Set the station address for the specified interface. The
+Set the station address for the specified interface.
+The
 .Ar mac address
 is specified as a series of six hexadecimal values separated by colons,
-e.g.: 00:60:1d:12:34:56. This programs the new address into the card
+e.g.: 00:60:1d:12:34:56.
+This programs the new address into the card
 and updates the interface as well.
 .It Fl i Ar iface Fl n Ar SSID "[-v 1|2|3]"
 Set the desired SSID (network name). There are three SSIDs which allows
 the NIC to work with access points at several locations without needing
-to be reconfigured. The NIC checks each SSID in sequence when searching
-for a match. The SSID to be changed can be specified with the
+to be reconfigured.
+The NIC checks each SSID in sequence when searching
+for a match.
+The SSID to be changed can be specified with the
 .Fl v
-modifier option. If the
+modifier option.
+If the
 .Fl v
 flag isn't used, the first SSID in the list is set.
 .It Fl i Ar iface Fl o Ar 0|1
-Set the operating mode of the Aironet interface. Valid selections are
+Set the operating mode of the Aironet interface.
+Valid selections are
 .Ar 0
 for ad-hoc mode and
 .Ar 1
-for infrastructure mode. The default driver setting is for ad-hoc
+for infrastructure mode.
+The default driver setting is for ad-hoc
 mode.
 .It Fl i Ar iface Fl p Ar tx power
-Set the transmit power level in milliwatts. Valid power settings
+Set the transmit power level in milliwatts.
+Valid power settings
 vary depending on the actual NIC and can be viewed by dumping the
 device capabilities with the
 .Fl I
-flag. Typical values are 1, 5, 20, 50 and 100mW. Selecting 0 sets
+flag.
+Typical values are 1, 5, 20, 50 and 100mW.
+Selecting 0 sets
 the factory default.
 .It Fl i Ar iface Fl c Ar channel
-Set the radio frequency of a given interface. The
+Set the radio frequency of a given interface.
+The
 .Ar frequency
-should be specfied as a channel ID as shown in the table below. The
+should be specfied as a channel ID as shown in the table below.
+The
 list of available frequencies is dependent on radio regulations specified
-by regional authorities. Recognized regulatory authorities include
-the FCC (United States), ETSI (Europe), France and Japan. Frequencies
+by regional authorities.
+Recognized regulatory authorities include
+the FCC (United States), ETSI (Europe), France and Japan.
+Frequencies
 in the table are specified in Mhz.
 .Bd -filled -offset indent
 .Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan "
@@ -275,22 +320,30 @@
 .Ed
 .Pp
 If an illegal channel is specified, the
-NIC will revert to its default channel. For NICs sold in the United States
+NIC will revert to its default channel.
+For NICs sold in the United States
 and Europe, the default channel is 3. For NICs sold in France, the default
-channel is 11. For NICs sold in Japan, the only available channel is 14.
+channel is 11.
+For NICs sold in Japan, the only available channel is 14.
 Note that two stations must be set to the same channel in order to
 communicate.
 .It Fl i Ar iface Fl f Ar fragmentation threshold
-Set the fragmentation threshold in bytes. This threshold controls the
+Set the fragmentation threshold in bytes.
+This threshold controls the
 point at which outgoing packets will be split into multiple fragments.
 If a single fragment is not sent successfully, only that fragment will
-need to be retransmitted instead of the whole packet. The fragmentation
-threshold can be anything from 64 to 2312 bytes. The default is 2312.
+need to be retransmitted instead of the whole packet.
+The fragmentation
+threshold can be anything from 64 to 2312 bytes.
+The default is 2312.
 .It Fl i Ar iface Fl r Ar RTS threshold
-Set the RTS/CTS threshold for a given interface. This controls the
-number of bytes used for the RTS/CTS handhake boundary. The
+Set the RTS/CTS threshold for a given interface.
+This controls the
+number of bytes used for the RTS/CTS handhake boundary.
+The
 .Ar RTS threshold
-can be any value between 0 and 2312. The default is 2312.
+can be any value between 0 and 2312.
+The default is 2312.
 .It Fl h
 Prints a list of available options and sample usage.
 .El
@@ -304,7 +357,8 @@
 .Fx 3.0 .
 .Sh BUGS
 The statistics counters do not seem to show the amount of transmit
-and received frames as increasing. This is likely due to the fact that
+and received frames as increasing.
+This is likely due to the fact that
 the
 .Xr an 4
 driver uses unmodified packet mode instead of letting the NIC perform
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/apm.8 man8/apm.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/apm.8	Thu Jan 27 23:38:11 2000
+++ man8/apm.8	Tue Mar 21 06:32:27 2000
@@ -8,7 +8,7 @@
 .\" responsible for the proper functioning of this software, nor does 
 .\" the author assume any responsibility for damages incurred with its 
 .\"
-.\" $FreeBSD: src/usr.sbin/apm/apm.8,v 1.15 2000/01/23 09:59:31 asmodai Exp $
+.\" $FreeBSD: src/usr.sbin/apm/apm.8,v 1.16 2000/03/01 14:07:50 sheldonh Exp $
 .\"
 .\" use.
 .Dd November 1, 1994
@@ -111,7 +111,8 @@
 resuming from this state on timer or Ring Indicator events.  The
 output of apm tells what your laptop claims to support.
 .It Fl z
-Suspend the system. It is equivalent to
+Suspend the system.
+It is equivalent to
 .Nm zzz .
 .El
 .Sh BUGS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/badsect.8 man8/badsect.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/badsect.8	Thu Jan 27 23:33:59 2000
+++ man8/badsect.8	Tue Mar 21 06:30:07 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.8 1999/08/28 00:12:27 peter Exp $
+.\" $FreeBSD: src/sbin/badsect/badsect.8,v 1.10 2000/03/01 11:26:59 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
@@ -45,9 +45,7 @@
 .Nm Badsect
 makes a file to contain a bad sector.  Normally, bad sectors
 are made inaccessible by the standard formatter, which provides
-a forwarding table for bad sectors to the driver; see
-.Xr bad144 8
-for details.
+a forwarding table for bad sectors to the driver.
 If a driver supports the bad blocking standard it is much preferable to
 use that method to isolate bad blocks, since the bad block forwarding
 makes the pack appear perfect, and such packs can then be copied with
@@ -74,7 +72,8 @@
 First mount the file system, and change to its root directory.
 Make a directory
 .Li BAD
-there. Run
+there.
+Run
 .Nm
 giving as argument the
 .Ar BAD
@@ -112,7 +111,6 @@
 .Xr fsck 8
 to convert the inode to a regular file containing the bad block.
 .Sh SEE ALSO
-.Xr bad144 8 ,
 .Xr fsck 8
 .Sh DIAGNOSTICS
 .Nm Badsect
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/boot_i386.8 man8/boot_i386.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/boot_i386.8	Thu Jan 27 23:34:20 2000
+++ man8/boot_i386.8	Tue Mar 21 06:30:16 2000
@@ -38,7 +38,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.22 1999/10/15 12:50:18 phantom Exp $
+.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23 2000/03/03 09:51:45 jkoshy Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
@@ -91,7 +91,7 @@
 you should see a prompt similar to the following:
 .Bd -literal
 >> FreeBSD/i386 BOOT
-Default: 0:wd(0,a)/kernel
+Default: 0:ad(0,a)/kernel
 boot:
 .Ed
 .Pp
@@ -124,8 +124,8 @@
 boot file image.
 .Pp
 The supported interfaces are:
-.Bl -tag -width "wdXX" -compact
-.It wd
+.Bl -tag -width "adXX" -compact
+.It ad
 ST506, IDE, ESDI, RLL disks on a WD100[2367] or lookalike
 controller
 .It fd
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/bootparamd.8 man8/bootparamd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/bootparamd.8	Thu Jan 27 23:37:12 2000
+++ man8/bootparamd.8	Tue Mar 21 06:31:55 2000
@@ -1,5 +1,5 @@
 .\" @(#)bootparamd.8
-.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.8 1999/08/28 01:15:39 peter Exp $
+.\" $FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.9 2000/03/01 14:09:03 sheldonh Exp $
 .Dd November 8, 1989
 .Dt BOOTPARAMD 8
 .Os
@@ -14,16 +14,19 @@
 .Sh DESCRIPTION
 .Nm Bootparamd
 is a server process that provides information to diskless clients
-necessary for booting. It consults the
+necessary for booting.
+It consults the
 .Pa /etc/bootparams
 file. 
 .Pp
 This version will allow the use of aliases on the hostname in the
 .Pa /etc/bootparams
-file. The returned hostname to the whoami request done by the booting client
+file.
+The returned hostname to the whoami request done by the booting client
 will be the name that appears in 
 .Pa /etc/bootparams
-and not the canonical name. In this way you can keep the answer short enough
+and not the canonical name.
+In this way you can keep the answer short enough
 so that machines that can not handle long hostnames won't fail during boot.
 .Sh OPTIONS
 .Bl -tag -width Fl
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/burncd.8 man8/burncd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/burncd.8	Thu Jan 27 23:37:12 2000
+++ man8/burncd.8	Tue Mar 21 06:31:55 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.sbin/burncd/burncd.8,v 1.2 2000/01/15 15:51:47 sos Exp $
+.\" $FreeBSD: src/usr.sbin/burncd/burncd.8,v 1.6 2000/03/04 07:26:23 sos Exp $
 .\"
 .Dd January 6, 2000
 .Os
@@ -68,10 +68,18 @@
 may be one of:
 .Pp
 .Bl -tag -width XXXXXXXXXXXX
+.It Ar msinfo
+Show the first LBA of the last track on the media 
+and the next writeable address on the media for use with the
+.Xr mkisofs 1 Ns 's
+.Fl C 
+switch when adding additional data to ISO filesystems with extra sessions.
 .It Ar blank
-Blank a CD-RW medium. This uses the fast blanking method, so data are not physically overwritten, only those areas that make the media appear blank for further usage.
+Blank a CD-RW medium.
+This uses the fast blanking method, so data are not physically overwritten, only those areas that make the media appear blank for further usage.
 .It Ar fixate
-Fixate the medium so that the TOC is generated and the media can be used in an ordinary CD drive. The driver defaults to creating multisession media. Should be the last command to 
+Fixate the medium so that the TOC is generated and the media can be used in an ordinary CD drive. The driver defaults to creating multisession media.
+Should be the last command to 
 .Nm
 as the program exits when this has been done.
 .It Ar raw | audio
@@ -79,6 +87,12 @@
 .It Ar data | mode1
 Set the write mode to produce data (mode1) tracks for the following image files
 on the command line.
+.It Ar mode2
+Set the write mode to produce data (mode2) tracks for the following image files
+on the command line.
+.It Ar XAmode1
+Set the write mode to produce data (XAmode1) tracks for the following image
+files on the command line.
 .It Ar filename
 All other arguments are treated as filenames of images to write to the media.
 .El
@@ -102,7 +116,8 @@
 Probably, please report when found.
 .Sh HISTORY
 .Nm burncd
-is currently under development. The
+is currently under development.
+The
 .Nm
 command appeared in
 .Fx 4.0 .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/camcontrol.8 man8/camcontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/camcontrol.8	Thu Jan 27 23:34:00 2000
+++ man8/camcontrol.8	Tue Mar 21 06:30:07 2000
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.18 1999/12/17 00:28:05 ken Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.19 2000/03/01 11:27:01 sheldonh Exp $
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
@@ -257,7 +257,8 @@
 Tell the kernel to reset the given bus (XPT_RESET_BUS) by issuing a SCSI bus
 reset for that bus, or to reset the given bus:target:lun
 (XPT_RESET_DEV), typically by issuing a BUS DEVICE RESET message after
-connecting to that device. Note that this can have a destructive impact
+connecting to that device.
+Note that this can have a destructive impact
 on the system.
 .It defects
 Send the SCSI READ DEFECT DATA (10) command (0x37) to the given device, and
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/chat.8 man8/chat.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/chat.8	Thu Jan 27 23:35:47 2000
+++ man8/chat.8	Tue Mar 21 06:31:11 2000
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.13 1999/08/28 00:59:32 peter Exp $
+.\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.15 2000/03/02 14:53:27 sheldonh Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -18,39 +18,52 @@
 .SH DESCRIPTION
 .LP
 The \fIchat\fR program defines a conversational exchange between the
-computer and the modem. Its primary purpose is to establish the
+computer and the modem.
+Its primary purpose is to establish the
 connection between the Point-to-Point Protocol Daemon (\fIpppd\fR) and
 the remote's \fIpppd\fR process.
 .SH OPTIONS
 .TP
 .B -f \fI<chat file>
-Read the chat script from the chat \fIfile\fR. The use of this option
-is mutually exclusive with the chat script parameters. The user must
-have read access to the file. Multiple lines are permitted in the
-file. Space or horizontal tab characters should be used to separate
+Read the chat script from the chat \fIfile\fR.
+The use of this option
+is mutually exclusive with the chat script parameters.
+The user must
+have read access to the file.
+Multiple lines are permitted in the
+file.
+Space or horizontal tab characters should be used to separate
 the strings.
 .TP
 .B -t \fI<timeout>
-Set the timeout for the expected string to be received. If the string
+Set the timeout for the expected string to be received.
+If the string
 is not received within the time limit then the reply string is not
-sent. An alternate reply may be sent or the script will fail if there
-is no alternate reply string. A failed script will cause the
+sent.
+An alternate reply may be sent or the script will fail if there
+is no alternate reply string.
+A failed script will cause the
 \fIchat\fR program to terminate with a non-zero error code.
 .TP
 .B -r \fI<report file>
-Set the file for output of the report strings. If you use the keyword
-\fIREPORT\fR, the resulting strings are written to this file. If this
+Set the file for output of the report strings.
+If you use the keyword
+\fIREPORT\fR, the resulting strings are written to this file.
+If this
 option is not used and you still use \fIREPORT\fR keywords, the
 \fIstderr\fR file is used for the report strings.
 .TP
 .B -e
-Start with the echo option turned on. Echoing may also be turned on
+Start with the echo option turned on.
+Echoing may also be turned on
 or off at specific points in the chat script by using the \fIECHO\fR
-keyword. When echoing is enabled, all output from the modem is echoed
+keyword.
+When echoing is enabled, all output from the modem is echoed
 to \fIstderr\fR.
 .TP
 .B -v
-Request that the \fIchat\fR script be executed in a verbose mode. The
+Request that the \fIchat\fR script be executed in a verbose mode.
+The
 \fIchat\fR program will then log the execution state of the chat
 script as well as all text received from the modem and the output
 strings sent to the modem.  The default is to log through
@@ -62,8 +75,10 @@
 .TP
 .B -V
 Request that the \fIchat\fR script be executed in a stderr verbose
-mode. The \fIchat\fR program will then log all text received from the
-modem and the output strings sent to the modem to the stderr device. This
+mode.
+The \fIchat\fR program will then log all text received from the
+modem and the output strings sent to the modem to the stderr device.
+This
 device is usually the local console at the station running the chat or
 pppd program.
 .TP
@@ -113,20 +128,24 @@
 string ppp and then expect the prompt "ssword:". When it receives the
 prompt for the password, it will send the password hello2u2.
 .LP
-A carriage return is normally sent following the reply string. It is not
+A carriage return is normally sent following the reply string.
+It is not
 expected in the "expect" string unless it is specifically requested by using
 the \\r character sequence.
 .LP
 The expect sequence should contain only what is needed to identify the
-string. Since it is normally stored on a disk file, it should not contain
-variable information. It is generally not acceptable to look for time
+string.
+Since it is normally stored on a disk file, it should not contain
+variable information.
+It is generally not acceptable to look for time
 strings, network identification strings, or other variable pieces of data as
 an expect string.
 .LP
 To help correct for characters which may be corrupted during the initial
 sequence, look for the string "ogin:" rather than "login:". It is possible
 that the leading "l" character may be received in error and you may never
-find the string even though it was sent by the system. For this reason,
+find the string even though it was sent by the system.
+For this reason,
 scripts look for "ogin:" rather than "login:" and "ssword:" rather than
 "password:".
 .LP
@@ -136,21 +155,27 @@
 .LP
 In other words, expect ....ogin:, send ppp, expect ...ssword:, send hello2u2.
 .LP
-In actual practice, simple scripts are rare. At the vary least, you
+In actual practice, simple scripts are rare.
+At the vary least, you
 should include sub-expect sequences should the original string not be
-received. For example, consider the following script:
+received.
+For example, consider the following script:
 .IP
 ogin:--ogin: ppp ssword: hello2u2
 .LP
-This would be a better script than the simple one used earlier. This would look
+This would be a better script than the simple one used earlier.
+This would look
 for the same login: prompt, however, if one was not received, a single
-return sequence is sent and then it will look for login: again. Should line
+return sequence is sent and then it will look for login: again.
+Should line
 noise obscure the first login prompt then sending the empty line will
 usually generate a login prompt again.
 .SH COMMENTS
-Comments can be embedded in the chat script. A comment is a line which
+Comments can be embedded in the chat script.
+A comment is a line which
 starts with the \fB#\fR (hash) character in column 1. Such comment
-lines are just ignored by the chat program. If a '#' character is to
+lines are just ignored by the chat program.
+If a '#' character is to
 be expected as the first character of the expect sequence, you should
 quote the expect string.
 If you want to wait for a prompt that starts with a # (hash)
@@ -162,27 +187,42 @@
 .LP
 
 .SH ABORT STRINGS
-Many modems will report the status of the call as a string. These
-strings may be \fBCONNECTED\fR or \fBNO CARRIER\fR or \fBBUSY\fR. It
+Many modems will report the status of the call as a string.
+These
+strings may be \fBCONNECTED\fR or \fBNO CARRIER\fR or \fBBUSY\fR.
+It
 is often desirable to terminate the script should the modem fail to
-connect to the remote. The difficulty is that a script would not know
-exactly which modem string it may receive. On one attempt, it may
+connect to the remote.
+The difficulty is that a script would not know
+exactly which modem string it may receive.
+On one attempt, it may
 receive \fBBUSY\fR while the next time it may receive \fBNO CARRIER\fR.
 .LP
 These "abort" strings may be specified in the script using the \fIABORT\fR
-sequence. It is written in the script as in the following example:
+sequence.
+It is written in the script as in the following example:
 .IP
 ABORT BUSY ABORT 'NO CARRIER' '' ATZ OK ATDT5551212 CONNECT
 .LP
-This sequence will expect nothing; and then send the string ATZ. The
-expected response to this is the string \fIOK\fR. When it receives \fIOK\fR,
-the string ATDT5551212 to dial the telephone. The expected string is
-\fICONNECT\fR. If the string \fICONNECT\fR is received the remainder of the
-script is executed. However, should the modem find a busy telephone, it will
-send the string \fIBUSY\fR. This will cause the string to match the abort
-character sequence. The script will then fail because it found a match to
-the abort string. If it received the string \fINO CARRIER\fR, it will abort
-for the same reason. Either string may be received. Either string will
+This sequence will expect nothing; and then send the string ATZ.
+The
+expected response to this is the string \fIOK\fR.
+When it receives \fIOK\fR,
+the string ATDT5551212 to dial the telephone.
+The expected string is
+\fICONNECT\fR.
+If the string \fICONNECT\fR is received the remainder of the
+script is executed.
+However, should the modem find a busy telephone, it will
+send the string \fIBUSY\fR.
+This will cause the string to match the abort
+character sequence.
+The script will then fail because it found a match to
+the abort string.
+If it received the string \fINO CARRIER\fR, it will abort
+for the same reason.
+Either string may be received.
+Either string will
 terminate the \fIchat\fR script.
 .SH CLR_ABORT STRINGS
 This sequence allows for clearing previously set \fBABORT\fR strings.
@@ -196,7 +236,8 @@
 terminal), standard error will normally be redirected to the file
 /etc/ppp/connect-errors.
 .LP
-\fBSAY\fR strings must be enclosed in single or double quotes. If
+\fBSAY\fR strings must be enclosed in single or double quotes.
+If
 carriage return and line feed are needed in the string to be output,
 you must explicitly add them to your string.
 .LP
@@ -229,7 +270,8 @@
 \fIetc ...\fR
 .LP
 This sequence will only present the SAY strings to the user and all
-the details of the script will remain hidden. For example, if the
+the details of the script will remain hidden.
+For example, if the
 above script works, the user will see:
 .IP
 Dialling your ISP...
@@ -240,28 +282,35 @@
 .LP
 
 .SH REPORT STRINGS
-A \fBreport\fR string is similar to the ABORT string. The difference
+A \fBreport\fR string is similar to the ABORT string.
+The difference
 is that the strings, and all characters to the next control character
 such as a carriage return, are written to the report file.
 .LP
 The report strings may be used to isolate the transmission rate of the
-modem's connect string and return the value to the chat user. The
+modem's connect string and return the value to the chat user.
+The
 analysis of the report string logic occurs in conjunction with the
-other string processing such as looking for the expect string. The use
+other string processing such as looking for the expect string.
+The use
 of the same string for a report and abort sequence is probably not
 very useful, however, it is possible.
 .LP
 The report strings to no change the completion code of the program.
 .LP
 These "report" strings may be specified in the script using the \fIREPORT\fR
-sequence. It is written in the script as in the following example:
+sequence.
+It is written in the script as in the following example:
 .IP
 REPORT CONNECT ABORT BUSY '' ATDT5551212 CONNECT '' ogin: account
 .LP
 This sequence will expect nothing; and then send the string
-ATDT5551212 to dial the telephone. The expected string is
-\fICONNECT\fR. If the string \fICONNECT\fR is received the remainder
-of the script is executed. In addition the program will write to the
+ATDT5551212 to dial the telephone.
+The expected string is
+\fICONNECT\fR.
+If the string \fICONNECT\fR is received the remainder
+of the script is executed.
+In addition the program will write to the
 expect-file the string "CONNECT" plus any characters which follow it
 such as the connection rate.
 .SH CLR_REPORT STRINGS
@@ -271,11 +320,15 @@
 entries so that new strings can use that space.
 .SH ECHO
 The echo options controls whether the output from the modem is echoed
-to \fIstderr\fR. This option may be set with the \fI-e\fR option, but
-it can also be controlled by the \fIECHO\fR keyword. The "expect-send"
+to \fIstderr\fR.
+This option may be set with the \fI-e\fR option, but
+it can also be controlled by the \fIECHO\fR keyword.
+The "expect-send"
 pair \fIECHO\fR \fION\fR enables echoing, and \fIECHO\fR \fIOFF\fR
-disables it. With this keyword you can select which parts of the
-conversation should be visible. For instance, with the following
+disables it.
+With this keyword you can select which parts of the
+conversation should be visible.
+For instance, with the following
 script:
 .IP
 ABORT   'BUSY'
@@ -341,7 +394,8 @@
 \fIetc ...\fR
 .LP
 .SH TIMEOUT
-The initial timeout value is 45 seconds. This may be changed using the \fB-t\fR
+The initial timeout value is 45 seconds.
+This may be changed using the \fB-t\fR
 parameter.
 .LP
 To change the timeout value for the next expect string, the following
@@ -350,21 +404,26 @@
 ATZ OK ATDT5551212 CONNECT TIMEOUT 10 ogin:--ogin: TIMEOUT 5 assword: hello2u2
 .LP
 This will change the timeout to 10 seconds when it expects the login:
-prompt. The timeout is then changed to 5 seconds when it looks for the
+prompt.
+The timeout is then changed to 5 seconds when it looks for the
 password prompt.
 .LP
 The timeout, once changed, remains in effect until it is changed again.
 .SH SENDING EOT
 The special reply string of \fIEOT\fR indicates that the chat program
-should send an EOT character to the remote. This is normally the
-End-of-file character sequence. A return character is not sent
+should send an EOT character to the remote.
+This is normally the
+End-of-file character sequence.
+A return character is not sent
 following the EOT.
 .PR
 The EOT sequence may be embedded into the send string using the
 sequence \fI^D\fR.
 .SH GENERATING BREAK
 The special reply string of \fIBREAK\fR will cause a break condition
-to be sent. The break is a special signal on the transmitter. The
+to be sent.
+The break is a special signal on the transmitter.
+The
 normal processing on the receiver is to change the transmission rate.
 It may be used to cycle through the available transmission rates on
 the remote until you are able to receive a valid login prompt.
@@ -372,27 +431,35 @@
 The break sequence may be embedded into the send string using the
 \fI\\K\fR sequence.
 .SH ESCAPE SEQUENCES
-The expect and reply strings may contain escape sequences. All of the
-sequences are legal in the reply string. Many are legal in the expect.
+The expect and reply strings may contain escape sequences.
+All of the
+sequences are legal in the reply string.
+Many are legal in the expect.
 Those which are not valid in the expect sequence are so indicated.
 .TP
 .B ''
-Expects or sends a null string. If you send a null string then it will still
-send the return character. This sequence may either be a pair of apostrophe
+Expects or sends a null string.
+If you send a null string then it will still
+send the return character.
+This sequence may either be a pair of apostrophe
 or quote characters.
 .TP
 .B \\\\b
 represents a backspace character.
 .TP
 .B \\\\c
-Suppresses the newline at the end of the reply string. This is the only
-method to send a string without a trailing return character. It must
-be at the end of the send string. For example,
+Suppresses the newline at the end of the reply string.
+This is the only
+method to send a string without a trailing return character.
+It must
+be at the end of the send string.
+For example,
 the sequence hello\\c will simply send the characters h, e, l, l, o.
 .I (not valid in expect.)
 .TP
 .B \\\\d
-Delay for one second. The program uses sleep(1) which will delay to a
+Delay for one second.
+The program uses sleep(1) which will delay to a
 maximum of one second.
 .I (not valid in expect.)
 .TP
@@ -404,11 +471,13 @@
 Send a newline or linefeed character.
 .TP
 .B \\\\N
-Send a null character. The same sequence may be represented by \\0.
+Send a null character.
+The same sequence may be represented by \\0.
 .I (not valid in expect.)
 .TP
 .B \\\\p
-Pause for a fraction of a second. The delay is 1/10th of a second.
+Pause for a fraction of a second.
+The delay is 1/10th of a second.
 .I (not valid in expect.)
 .TP
 .B \\\\q
@@ -422,8 +491,10 @@
 Send or expect a carriage return.
 .TP
 .B \\\\s
-Represents a space character in the string. This may be used when it
-is not desirable to quote the strings which contains spaces. The
+Represents a space character in the string.
+This may be used when it
+is not desirable to quote the strings which contains spaces.
+The
 sequence 'HI TIM' and HI\\sTIM are the same.
 .TP
 .B \\\\t
@@ -446,22 +517,26 @@
 codes.
 .TP
 .B 0
-The normal termination of the program. This indicates that the script
+The normal termination of the program.
+This indicates that the script
 was executed without error to the normal conclusion.
 .TP
 .B 1
 One or more of the parameters are invalid or an expect string was too
-large for the internal buffers. This indicates that the program as not
+large for the internal buffers.
+This indicates that the program as not
 properly executed.
 .TP
 .B 2
-An error occurred during the execution of the program. This may be due
+An error occurred during the execution of the program.
+This may be due
 to a read or write operation failing for some reason or chat receiving
 a signal such as SIGINT.
 .TP
 .B 3
 A timeout event occurred when there was an \fIexpect\fR string without
-having a "-subsend" string. This may mean that you did not program the
+having a "-subsend" string.
+This may mean that you did not program the
 script correctly for the condition or that some unexpected event has
 occurred and the expected string could not be found.
 .TP
@@ -482,16 +557,20 @@
 condition.
 .LP
 Using the termination code, it is possible to determine which event
-terminated the script. It is possible to decide if the string "BUSY"
+terminated the script.
+It is possible to decide if the string "BUSY"
 was received from the modem as opposed to "NO DIAL TONE". While the
 first event may be retried, the second will probably have little
 chance of succeeding during a retry.
 .SH SEE ALSO
 Additional information about \fIchat\fR scripts may be found with UUCP
-documentation. The \fIchat\fR script was taken from the ideas proposed
+documentation.
+The \fIchat\fR script was taken from the ideas proposed
 by the scripts used by the \fIuucico\fR program.
 .LP
 uucico(1), uucp(1), syslog(3), syslogd(8).
 .SH COPYRIGHT
-The \fIchat\fR program is in public domain. This is not the GNU public
-license. If it breaks then you get to keep both pieces.
+The \fIchat\fR program is in public domain.
+This is not the GNU public
+license.
+If it breaks then you get to keep both pieces.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/chkgrp.8 man8/chkgrp.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/chkgrp.8	Thu Jan 27 23:37:13 2000
+++ man8/chkgrp.8	Tue Mar 21 06:31:55 2000
@@ -24,7 +24,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/chkgrp/chkgrp.8,v 1.6 1999/10/17 15:46:58 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.7 2000/03/01 14:07:53 sheldonh Exp $
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
@@ -38,7 +38,8 @@
 .Sh DESCRIPTION
 .Nm Chkgrp
 scans the given file or, failing that, the system-wide group file for
-errors. Specifically, it checks that every non-blank, non-comment
+errors.
+Specifically, it checks that every non-blank, non-comment
 entry is composed of four colon-separated fields, that none of them
 contains whitespace, and that the third field (the group ID) is
 numeric.
@@ -53,7 +54,8 @@
 For each error found,
 .Nm
 will print an error message containing the name of the file being
-scanned and the line number on which the error was found. Otherwise no
+scanned and the line number on which the error was found.
+Otherwise no
 output is produced.
 .Pp
 .Nm Chkgrp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/chown.8 man8/chown.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/chown.8	Thu Jan 27 23:37:13 2000
+++ man8/chown.8	Tue Mar 21 06:31:55 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD: src/usr.sbin/chown/chown.8,v 1.9 1999/11/27 19:25:07 obrien Exp $
+.\" $FreeBSD: src/usr.sbin/chown/chown.8,v 1.10 2000/03/08 16:31:42 obrien Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHOWN 8
@@ -40,23 +40,19 @@
 .Nd change file owner and group
 .Sh SYNOPSIS
 .Nm chown
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl f
-.Op Fl h
-.Op Fl v
 .Ar owner Ns Op Ar :group
 .Ar file ...
 .Nm chown
+.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/man8/config.8 man8/config.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/config.8	Thu Jan 27 23:37:14 2000
+++ man8/config.8	Tue Mar 21 06:31:56 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)config.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.20 2000/01/23 20:16:21 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.21 2000/03/01 14:07:54 sheldonh Exp $
 .\"
 .Dd April 19, 1994
 .Dt CONFIG 8
@@ -76,7 +76,8 @@
 .It Fl d Ar destdir
 Use
 .Ar destdir
-as the output directory, instead of the default one. Note
+as the output directory, instead of the default one.
+Note
 that config does not append
 .Ar SYSTEM_NAME
 to the directory given.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/diskpart.8 man8/diskpart.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/diskpart.8	Thu Jan 27 23:37:18 2000
+++ man8/diskpart.8	Tue Mar 21 06:32:01 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)diskpart.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/diskpart/diskpart.8,v 1.4 1999/08/28 01:16:04 peter Exp $
+.\" $FreeBSD: src/usr.sbin/diskpart/diskpart.8,v 1.5 2000/03/01 10:42:25 nik Exp $
 .\"
 .Dd June 6, 1993
 .Dt DISKPART 8
@@ -68,17 +68,13 @@
 option.
 .El
 .Pp
-On disks that use
-.Xr bad144 8
-type of
-bad-sector forwarding,
+On disks that use bad-sector forwarding,
 space is normally left in the last partition on the disk
 for a bad sector forwarding table, although this space
 is not reflected in the tables produced.  The space reserved
 is one track for the replicated copies of the table and
 sufficient tracks to hold a pool of 126 sectors to which bad sectors
-are mapped.  For more information, see 
-.Xr bad144 8 .
+are mapped.
 The
 .Fl s
 option is intended for other controllers which reserve some space at the end
@@ -128,7 +124,6 @@
 will prompt for the required disk geometry information.
 .Sh SEE ALSO
 .Xr disktab 5 ,
-.Xr bad144 8
 .Sh BUGS
 Most default partition sizes are based on historical artifacts
 (like the RP06), and may result in unsatisfactory layouts.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/dump.8 man8/dump.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/dump.8	Thu Jan 27 23:34:03 2000
+++ man8/dump.8	Tue Mar 21 06:30:08 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/dump/dump.8,v 1.25 2000/01/23 01:29:54 mpp Exp $
+.\" $FreeBSD: src/sbin/dump/dump.8,v 1.27 2000/03/01 11:27:03 sheldonh Exp $
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
@@ -64,7 +64,8 @@
 examines files
 on a filesystem
 and determines which files
-need to be backed up. These files
+need to be backed up.
+These files
 are copied to the given disk, tape or other
 storage medium for safe keeping (see the
 .Fl f
@@ -345,7 +346,6 @@
 .El
 .Sh SEE ALSO
 .Xr fstab 5 ,
-.Xr ft 8 ,
 .Xr restore 8 ,
 .Xr rmt 8
 .Sh DIAGNOSTICS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/fdcontrol.8 man8/fdcontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/fdcontrol.8	Thu Jan 27 23:37:18 2000
+++ man8/fdcontrol.8	Tue Mar 21 06:32:01 2000
@@ -24,7 +24,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.8 1999/10/17 15:52:26 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.9 2000/03/01 14:07:55 sheldonh Exp $
 .\"
 .Dd May 22, 1994
 .Os
@@ -77,13 +77,15 @@
 .Sh BUGS
 The
 .Nm
-command is currently under development. It's user interface is rather
+command is currently under development.
+It's user interface is rather
 silly and likely to change in future, options should be provided to
 allow anything being modified from the command line.
 .Pp
 The driver does actually support only two debug levels
 .Pq 0 and 1 ,
-where debug level 1 will generate huge amounts of output. It is likely
+where debug level 1 will generate huge amounts of output.
+It is likely
 to overflow the syslog if not used with extreme care.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
@@ -91,7 +93,8 @@
 .Xr fdc 4
 .Sh HISTORY
 .Nm Fdcontrol
-is currently under development. It's user interface and overall
+is currently under development.
+It's user interface and overall
 functionality are subjects to future improvements and changes.
 .Sh AUTHORS
 The program has been contributed by
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/fdisk.8 man8/fdisk.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/fdisk.8	Thu Jan 27 23:34:27 2000
+++ man8/fdisk.8	Tue Mar 21 06:30:22 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.16 1999/08/28 00:13:01 peter Exp $
+.\" $FreeBSD: src/sbin/i386/fdisk/fdisk.8,v 1.17 2000/03/10 22:02:59 imp Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
@@ -8,7 +8,7 @@
 .Nd PC partition table maintenance program
 .Sh SYNOPSIS
 .Nm fdisk
-.Op Fl Baeitu
+.Op Fl BIaistu
 .Op Fl b Ar bootcode
 .Op Fl 1234
 .Op Ar disk
@@ -62,7 +62,7 @@
 if
 .Fl f
 is given.
-.It Fl e
+.It Fl I
 Initialize the contents of sector 0 with one FreeBSD slice covering the entire disk.
 .It Fl f Ar configfile
 Set partition values using the file
@@ -93,6 +93,8 @@
 unless
 .Fl f
 is given.
+.It Fl s
+Print summary information and exit.
 .It Fl t
 Test mode; do not write partition values.  Generally used with the
 .Fl f
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/fore_dnld.8 man8/fore_dnld.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/fore_dnld.8	Thu Jan 27 23:33:59 2000
+++ man8/fore_dnld.8	Tue Mar 21 06:30:07 2000
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.2 1999/08/28 00:12:20 peter Exp $
+.\" @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.4 2000/03/01 11:27:44 sheldonh Exp $
 .\"
 .\"
 .de EX		\"Begin example
@@ -63,17 +63,25 @@
 Default is to use current directory.
 .TP
 .B -f objfile
-Specify the microcode binary file. Defaults are:
+Specify the microcode binary file.
+Defaults are:
 "sba200.obj" for SBA-200 adapters,
 "sba200e.obj" for SBA-200E adapters, and
 "pca200e.bin" for PCA-200E adapters. 
 .fi
 .SH NOTES
 .PP
+For the PCA200E adapter, if no file is specified on the command
+line a built-in copy of version 3.0.1 microcode is used.
+.PP
 Microcode as distributed by FORE Systems is not ready for downloading
-directly into SBA host ATM adapters. Instead, the supplied microcode needs
+directly into SBA host ATM adapters.
+Instead, the supplied microcode needs
 to be processed with the "objcopy" command to create an image suitable
-for downloading. Arguments to "objcopy" are "-S -l -Fcoff". Microcode as
+for downloading.
+Arguments to "objcopy" are "-S -l -Fcoff".
+.PP
+Microcode as
 distibuted by FORE Systems for the PCA host ATM adapter does not need
 to be processed.
 .SH "SEE ALSO"
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ftpd.8 man8/ftpd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ftpd.8	Thu Jan 27 23:53:40 2000
+++ man8/ftpd.8	Tue Mar 21 06:38:44 2000
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.29 1999/08/28 00:09:29 peter Exp $
+.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.31 2000/02/17 02:14:11 peter Exp $
 .\"
-.Dd April 19, 1994
+.Dd January 27, 2000
 .Dt FTPD 8
 .Os BSD 4.2
 .Sh NAME
@@ -41,6 +41,8 @@
 Internet File Transfer Protocol server
 .Sh SYNOPSIS
 .Nm ftpd
+.Op Fl 4
+.Op Fl 6
 .Op Fl d
 .Op Fl l Op Fl l
 .Op Fl A
@@ -135,6 +137,20 @@
 .Fl D
 is specified, write the daemon's process ID to
 .Ar file .
+.It Fl 6
+When
+.Fl D
+is specified, accept connections via AF_INET6 socket.
+.It Fl 4
+When
+.Fl D
+is specified, accept IPv4 connections.
+When
+.Fl 6
+is also specified, accept IPv4 connection via AF_INET6 socket.
+When
+.Fl 6
+is not specified, accept IPv4 connection via AF_INET socket.
 .It Fl A
 Allow only anonymous ftp access.
 .El
@@ -203,6 +219,10 @@
 .It XMKD Ta "make a directory (deprecated)"
 .It XPWD Ta "print the current working directory (deprecated)"
 .It XRMD Ta "remove a directory (deprecated)"
+.It LPSV Ta "prepare for server-to-server transfer, multiprotocol"
+.It LPRT Ta "specify data connection port, multiprotocol"
+.It EPSV Ta "prepare for server-to-server transfer, multiprotocol"
+.It EPRT Ta "specify data connection port, multiprotocol"
 .El
 .Pp
 The following non-standard or
@@ -326,14 +346,6 @@
 Make the home directory owned by
 .Dq root
 and unwritable by anyone.
-.It Pa ~ftp/bin
-Make this directory owned by
-.Dq root
-and unwritable by anyone (mode 555).
-The program
-.Xr ls 1
-must be present to support the list command.
-This program should be mode 111.
 .It Pa ~ftp/etc
 Make this directory owned by
 .Dq root
@@ -453,3 +465,4 @@
 .Nm
 command appeared in
 .Bx 4.2 .
+IPv6 support was added in WIDE Hydrangea IPv6 stack kit.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/genassym.8 man8/genassym.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/genassym.8	Thu Jan 27 23:35:59 2000
+++ man8/genassym.8	Tue Mar 21 06:31:16 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.bin/genassym/genassym.8,v 1.1 1999/12/23 11:07:44 marcel Exp $
+.\" $FreeBSD: src/usr.bin/genassym/genassym.8,v 1.2 2000/03/01 12:20:17 sheldonh Exp $
 .\"
 .Dd December 20, 1999
 .Dt GENASSYM 8
@@ -16,12 +16,14 @@
 .Nm
 command is a special-purpose program to generate assembler
 symbols from C code and is used to interface the low-level
-assembly code with the C code. This, for example, is used
+assembly code with the C code.
+This, for example, is used
 to build a FreeBSD kernel or module.
 Its
 .Ar objfile
 argument is the name of an ELF object file that holds the
-symbol definitions. These definitions are extracted from
+symbol definitions.
+These definitions are extracted from
 the object file and written to standard output or to the
 file specified with
 .Ar outfile ,
@@ -33,7 +35,8 @@
 are prefixed by
 .Nm assym_
 and are global data types, whose value is the value given
-to the symbol. The following C declaration
+to the symbol.
+The following C declaration
 .Bd -literal -offset indent -compact
 int assym_MY_SYMBOL = 3;
 .Ed
@@ -57,10 +60,12 @@
 command.
 .Sh BUGS
 Not all linkers store the size of the symbol in the ELF
-object file. The GNU linker for Alpha has this bug for
+object file.
+The GNU linker for Alpha has this bug for
 example (binutils 2.9.1). In those cases the size of the
 symbol is assumed to be equal to the word size of the ELF
-object file. For Alpha this is 64 bits and for i386 this
+object file.
+For Alpha this is 64 bits and for i386 this
 is 32 bits.
 .Sh HISTORY
 The
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ifconfig.8 man8/ifconfig.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ifconfig.8	Thu Jan 27 23:34:05 2000
+++ man8/ifconfig.8	Tue Mar 21 06:30:09 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.24 2000/01/23 01:30:03 mpp Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.27 2000/03/01 11:27:04 sheldonh Exp $
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
@@ -130,11 +130,14 @@
 The following parameters may be set with 
 .Nm ifconfig :
 .Bl -tag -width indent
+.It Cm add
+Another name for the ``alias'' parameter.  Introduced for compatibility
+with BSD/OS.
 .It Cm alias
 Establish an additional network address for this interface.
 This is sometimes useful when changing network numbers, and
 one wishes to accept packets addressed to the old interface.
-If the alias is on the same subnet as the first network adress
+If the address is on the same subnet as the first network address
 for this interface, a netmask of 0xffffffff has to be specified.
 .It Cm anycast
 (Inet6 only)
@@ -215,7 +218,8 @@
 to
 .Ar vlan_tag .
 This value is a 16-bit number which is used to create an 802.1Q
-vlan header for packets sent from the vlan interface. Note that
+vlan header for packets sent from the vlan interface.
+Note that
 .Cm vlan
 and
 .Cm vlandev
@@ -223,19 +227,24 @@
 .It Cm vlandev Ar iface
 If the interface is a vlan pseudo device, associate physical interface
 .Ar iface
-with it. Packets transmitted through the vlan interface will be
+with it.
+Packets transmitted through the vlan interface will be
 diverted to the specified physical interface
 .Ar iface
-with 802.1Q vlan encapsulation. Packets with 802.1Q encapsulation received
+with 802.1Q vlan encapsulation.
+Packets with 802.1Q encapsulation received
 by the parent interface with the correct vlan tag will be diverted to
-the associated vlan pseudo-interface. The vlan interface is assigned a
+the associated vlan pseudo-interface.
+The vlan interface is assigned a
 copy of the parent interface's flags and the parent's ethernet address.
 The
 .Cm vlandev
 and
 .Cm vlan
-must both be set at the same time. If the vlan interface already has
-a physical interface associated with it, this command will fail. To
+must both be set at the same time.
+If the vlan interface already has
+a physical interface associated with it, this command will fail.
+To
 change the association to another physical interface, the existing
 association must be cleared first.
 .Pp
@@ -251,7 +260,8 @@
 .It Fl vlandev Ar iface
 If the driver is a vlan pseudo device, disassociate the physical interface
 .Ar iface
-from it. This breaks the link between the vlan interface and its parent,
+from it.
+This breaks the link between the vlan interface and its parent,
 clears its vlan tag, flags and its link address and shuts the interface down.
 .It Cm metric Ar n
 Set the routing metric of the interface to
@@ -327,17 +337,23 @@
 .It Cm range
 Under appletalk, set the interface to respond to a 
 .Em netrange.
-of the form startnet-endnet. Appletalk uses this scheme instead of 
+of the form startnet-endnet.
+Appletalk uses this scheme instead of 
 netmasks though
 .Fx
 implements it internally as a set of netmasks.
+.It Cm remove
+Another name for the ``delete'' parameter.  Introduced for compatibility
+with BSD/OS.
 .It Cm phase
 The argument following this specifies the version (phase) of the 
-Appletalk network attached to the interface. Values of 1 or 2 are permitted.
+Appletalk network attached to the interface.
+Values of 1 or 2 are permitted.
 .It Cm link[0-2]
 Enable special processing of the link level of the interface.
 These three options are interface specific in actual effect, however,
-they are in general used to select special modes of operation. An example
+they are in general used to select special modes of operation.
+An example
 of this is to enable SLIP compression, or to select the connector type
 for some Ethernet cards.  Refer to the man page for the specific driver
 for more information.
@@ -400,7 +416,8 @@
 tried to alter an interface's configuration.
 .Sh BUGS
 IPv6 link-local addresses are required for several basic communication
-between IPv6 node. If they are deleted by
+between IPv6 node.
+If they are deleted by
 .Nm ifconfig
 manually, the kernel might show very strange behavior.
 So, such manual deletions are strongly discouraged.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ilmid.8 man8/ilmid.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ilmid.8	Thu Jan 27 23:33:59 2000
+++ man8/ilmid.8	Tue Mar 21 06:30:07 2000
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.2 1999/08/28 00:12:22 peter Exp $
+.\" @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.3 2000/03/01 11:27:46 sheldonh Exp $
 .\"
 .\"
 .de EX		\"Begin example
@@ -68,7 +68,8 @@
 .SH OPTIONS
 .TP
 .B \-d level
-Specify the debug level for optional protocol tracing. Messages are
+Specify the debug level for optional protocol tracing.
+Messages are
 written to /var/log/ilmid.
 .TP
 .B \-f
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/inetd.8 man8/inetd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/inetd.8	Thu Jan 27 23:37:20 2000
+++ man8/inetd.8	Tue Mar 21 06:32:02 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.43 2000/01/25 14:52:09 shin Exp $
+.\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.46 2000/03/01 08:20:17 sheldonh Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
@@ -79,9 +79,10 @@
 .It Fl d
 Turn on debugging.
 .It Fl l
-Turn on logging.
+Turn on logging of successful connections.
 .It Fl w
-Turn on TCP Wrapping for external services. See the
+Turn on TCP Wrapping for external services.
+See the
 .Sx "IMPLEMENTATION NOTES"
 section for more information on TCP Wrappers support.
 .It Fl W
@@ -101,22 +102,36 @@
 in one minute; the default is 256.
 .It Fl a
 Specify a specific IP address to bind to.
-Or a hostname can also be specified, and then an IP address and/or an
-IPv6 address corresponds to the hostname is used. Usually hostname
-specification is used in conjunction with
+Alternatively, a hostname can be specified,
+in which case the IPv4 or IPv6 address
+which corresponds to that hostname is used.
+Usually a hostname is specified when
+.Nm
+is run inside a
 .Xr jail 8 ,
-where the hostname corresponds to a jail environment.
-
-When hostname specification is used and either of IPv4 bind and IPv6
-bind is desired, you need to specify 2 entry for each service, one for
-IPv4 and one for IPv6, in /etc/inetd.conf.
+in which case the hostname corresponds to the
+.Xr jail 8
+environment.
+.Pp
+When hostname specification is used
+and both IPv4 and IPv6 bindings are desired,
+one entry with the appropriate
+.Em protocol
+type for each binding
+is required for each service in
+.Pa /etc/inetd.conf .
 For example,
-.Bd -literal
-telnet       stream  tcp4  nowait root  /usr/libexec/telnetd  telnetd
-telnet       stream  tcp6  nowait root  /usr/libexec/telnetd  telnetd
-.Ed
-
-See explanation for protocol field in /etc/inetd.conf for details.
+a TCP-based service would need two entries,
+one using
+.Dq tcp4
+for the
+.Em protocol
+and the other using
+.Dq tcp6 .
+See the explanation of the
+.Pa /etc/inetd.conf
+.Em protocol
+field below.
 .It Fl p
 Specify an alternate file in which to store the process ID.
 .El
@@ -197,7 +212,8 @@
 .Pa /etc/rpc . 
 The part on the right of the 
 .Dq /
-is the RPC version number. This
+is the RPC version number.
+This
 can simply be a single numeric argument or a range of versions.
 A range is bounded by the low version to the high version - 
 .Dq rusers/1-3 .
@@ -236,42 +252,54 @@
 Examples might be
 .Dq tcp
 or
-.Dq udp .
-In this case, this entry only accept IPv4 to keep backword
-compatibility.
+.Dq udp ,
+both of which imply IPv4 for backward compatibility.
 The names
-.Dq tcp4 ,
+.Dq tcp4
+and
 .Dq udp4
-specialized the entry to IPv4 only.
+specify IPv4 only.
 The names
-.Dq tcp6 ,
+.Dq tcp6
+and
 .Dq udp6
-specialized the entry to IPv6 only.
+specify IPv6 only.
 The names
-.Dq tcp46 ,
+.Dq tcp46
+and
 .Dq udp46
-let the entry accept each of IPv4 and IPv6 via AF_INET6 wildcard binded socket.
+specify that the entry accepts both IPv6 and IPv6 connections
+via a wildcard
+.Dv AF_INET6
+socket.
 If it is desired that the service is reachable via T/TCP, one should
 specify
-.Dq tcp/ttcp .
-This entry only accept IPv4 to keep backword compatibility.
+.Dq tcp/ttcp ,
+which implies IPv4 for backward compatibility.
 The name
-.Dq tcp4/ttcp ,
-specialized the entry to IPv4 only.
+.Dq tcp4/ttcp
+specifies IPv4 only, while
+.Dq tcp6/ttcp
+specifies IPv6 only.
 The name
-.Dq tcp6/ttcp ,
-specialized the entry to IPv6 only.
-The name
-.Dq tcp46/ttcp ,
-let the entry accept each of IPv4 and IPv6 via AF_INET6 wildcard binded socket.
-Rpc based services are specified with the 
+.Dq tcp46/ttcp
+specify that the entry accepts both IPv6 and IPv6 connections
+via a wildcard
+.Dv AF_INET6
+socket.
+Rpc based services
+(for which only IPv4 is supported at this time)
+are specified with the 
 .Dq rpc/tcp
 or 
 .Dq rpc/udp 
 service type.
-Currently only IPv4 is supported for rpc services.
 TCPMUX services must use 
-.Dq tcp .
+.Dq tcp ,
+.Dq tcp4 ,
+.Dq tcp6
+or
+.Dq tcp46 .
 .Pp
 The
 .Em wait/nowait
@@ -339,10 +367,13 @@
 .Dq /
 followed by the number to the
 .Dq nowait
-keyword. Normally
-(or if a value of zero is specified) there is no maximum. Otherwise,
+keyword.
+Normally
+(or if a value of zero is specified) there is no maximum.
+Otherwise,
 once the maximum is reached, further connection attempts will be
-queued up until an existing child process exits. This also works
+queued up until an existing child process exits.
+This also works
 in the case of
 .Dq wait
 mode, although a value other than one (the
@@ -352,7 +383,8 @@
 a
 .Dq /
 followed by the number to the maximum number of
-outstanding child processes. Once the maximum is reached, further
+outstanding child processes.
+Once the maximum is reached, further
 connections from this IP address will be dropped until the end of the
 minute.
 .Pp
@@ -410,11 +442,13 @@
 user name to the requesting ident client.  This is primarily useful
 when running this service on a NAT machine.
 .It Fl t Ar sec[.usec]
-Specify a timeout for the service. The default timeout is 10.0 seconds.
+Specify a timeout for the service.
+The default timeout is 10.0 seconds.
 .It Fl r
 Offer a real
 .Dq auth
-service, as per RFC 1413. All the remaining flags apply only in this case.
+service, as per RFC 1413.
+All the remaining flags apply only in this case.
 .It Fl f
 If the file
 .Pa .fakeid
@@ -477,15 +511,22 @@
 tcpmux	stream	tcp	nowait	root	internal
 .Ed
 .Pp
-Or if you wish to provide TCPMUX services also over IPv6, you can
-specify tcp46 or tcp6 instead of tcp above.
-.Pp
 When given the
 .Fl l
 option
 .Nm
 will log an entry to syslog each time a connection is accepted, noting the
 service selected and the IP-number of the remote requestor if available.
+Unless otherwise specified in the configuration file,
+and in the absence of the
+.Fl W
+and
+.Fl w
+options,
+.Nm
+will log to the
+.Dq daemon
+facility.
 .Pp
 The
 .Nm
@@ -510,24 +551,31 @@
 .Dq dgram
 except for 
 .Dq internal
-services. If the
+services.
+If the
 .Fl W
 option is given, such
 .Dq internal
-services will be wrapped. If both options are given, wrapping for both
+services will be wrapped.
+If both options are given, wrapping for both
 internal and external services will be enabled.
-.Pp
-If the
+Either wrapping option
+will cause failed connections to be logged to the
+.Dq auth
+syslog facility.
+Adding the
 .Fl l
-option is specified, all connection attempts are logged, whether they are
-allowed, denied or not wrapped at all. Otherwise, only denied requests will
-be logged.
+flag to the wrapping options will include successful connections in the
+logging to the
+.Dq auth
+facility.
 .Pp
 Note that
 .Nm
 only wraps requests for a
 .Dq wait
-service while no servers are available to service requests. Once a
+service while no servers are available to service requests.
+Once a
 connection to such a service has been allowed, inetd has no control
 over subsequent connections to the service until no more servers
 are left listening for connection requests.
@@ -540,14 +588,14 @@
 ).
 When reading that document, keep in mind that
 .Dq internal
-services have no associated daemon name. Therefore, the service name
+services have no associated daemon name.
+Therefore, the service name
 as specified in
 .Pa inetd.conf
 should be used as the daemon name for
 .Dq internal
 services.
-.Sh TCPMUX
-.Pp
+.Ss TCPMUX
 .Tn RFC 1078 
 describes the TCPMUX protocol:
 ``A TCP client connects to a foreign host on TCP port 1.  It sends the
@@ -572,30 +620,29 @@
 .Nm
 to list TCPMUX services in
 .Pa inetd.conf .
-.Sh IPSEC
-The implementation includes tiny hack to support IPsec policy setting for
-each of the socket.
+.Ss IPsec
+The implementation includes a tiny hack
+to support IPsec policy settings for each socket.
 A special form of comment line, starting with
-.Dq Li "#@" ,
-will work as policy specifier.
-The content of the above comment line will be treated as IPsec policy string,
+.Dq Li #@ ,
+is interpreted as a policy specifier.
+Everything after the
+.Dq Li #@
+will be used as an IPsec policy string,
 as described in
 .Xr ipsec_set_policy 3 .
-A
-.Li "#@"
-line will affect all the following lines in
-.Pa inetd.conf ,
-so you may want to reset IPsec policy by using a comment line with
-.Li "#@"
-only
-.Pq with no policy string .
+Each
+policy specifier is applied to all the following lines in
+.Pa inetd.conf
+until the next policy specifier.
+An empty policy specifer resets the IPsec policy.
 .Pp
-If invalid IPsec policy string appears on
+If an invalid IPsec policy specifier appears in
 .Pa inetd.conf ,
 .Nm
-will leave error message using
-.Xr syslog 3 ,
-and terminates itself.
+will provide an error message via the
+.Xr syslog 3
+interface and abort execution.
 .Sh "FILES"
 .Bl -tag -width /var/run/inetd.pid -compact
 .It Pa /etc/inetd.conf
@@ -637,7 +684,8 @@
 .No " server failing (looping), service terminated."
 .Xc
 The number of requests for the specified service in the past minute
-exceeded the limit. The limit exists to prevent a broken program
+exceeded the limit.
+The limit exists to prevent a broken program
 or a malicious user from swamping the system.
 This message may occur for several reasons:
 .Bl -enum -offset indent
@@ -676,10 +724,12 @@
 .Ar user
 exists in the 
 .Xr passwd 5
-database. The first message
+database.
+The first message
 occurs when
 .Nm
-(re)reads the configuration file. The second message occurs when the
+(re)reads the configuration file.
+The second message occurs when the
 service is invoked.
 .Pp
 .It Xo
@@ -736,8 +786,8 @@
 provided by
 .Tn SunOS
 4.1.
-IPsec hack was made by KAME project, in 1999.
+The IPsec hack was contributed by the KAME project in 1999.
 The
-.Tn FreeBSD
+.Fx
 TCP Wrappers support first appeared in 
 .Fx 3.2 .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/init.8 man8/init.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/init.8	Fri Jan 28 00:23:48 2000
+++ man8/init.8	Tue Mar 21 07:54:04 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/sbin/init/init.8,v 1.21 1999/12/16 02:15:53 nik Exp $
+.\" $FreeBSD: src/sbin/init/init.8,v 1.22 2000/03/01 11:27:06 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
@@ -289,7 +289,8 @@
 .Nm
 will try to run the
 .Pa /etc/rc.shutdown
-script. This script can be used to cleanly terminate specific programs such
+script.
+This script can be used to cleanly terminate specific programs such
 as
 .Nm innd
 (the InterNetNews server).
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipf.8 man8/ipf.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipf.8	Thu Jan 27 23:34:06 2000
+++ man8/ipf.8	Tue Mar 21 06:30:10 2000
@@ -1,3 +1,4 @@
+.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.3 2000/02/10 03:17:49 peter Exp $
 .TH IPF 8
 .SH NAME
 ipf \- alters packet filtering lists for IP packet input and output
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipfstat.8 man8/ipfstat.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipfstat.8	Thu Jan 27 23:34:07 2000
+++ man8/ipfstat.8	Tue Mar 21 06:30:10 2000
@@ -1,3 +1,4 @@
+.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.3 2000/02/10 03:17:50 peter Exp $
 .TH ipfstat 8
 .SH NAME
 ipfstat \- reports on packet filter statistics and filter list
@@ -14,7 +15,7 @@
 \fBipfstat\fP examines /dev/kmem using the symbols \fB_fr_flags\fP,
 \fB_frstats\fP, \fB_filterin\fP, and \fB_filterout\fP.
 To run and work, it needs to be able to read both /dev/kmem and the
-kernel itself.  The kernel name defaults to \fB/vmunix\fP.
+kernel itself.  The kernel name defaults to \fB/kernel\fP.
 .PP
 The default behaviour of \fBipfstat\fP
 is to retrieve and display the accumulated statistics which have been
@@ -76,7 +77,7 @@
 .br
 /dev/ipstate
 .br
-/vmunix
+/kernel
 .SH SEE ALSO
 ipf(8)
 .SH BUGS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipfw.8 man8/ipfw.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipfw.8	Thu Jan 27 23:34:07 2000
+++ man8/ipfw.8	Tue Mar 21 06:30:10 2000
@@ -1,7 +1,7 @@
 .\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.61 2000/01/08 11:19:19 luigi Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63 2000/02/28 15:21:12 ru Exp $
 .\"
-.Dd July 20, 1996
+.Dd February 16, 2000
 .Dt IPFW 8
 .Os FreeBSD
 .Sh NAME
@@ -12,161 +12,218 @@
 .Op Fl q
 .Oo
 .Fl p Ar preproc
-.Op Fl D Ar macro Ns Op Ns =value
+.Oo Fl D
+.Sm off
+.Ar macro
+.Op = Ar value
+.Sm on
+.Oc
 .Op Fl U Ar macro
 .Oc
 .Ar file
 .Nm ipfw
-.Oo
-.Fl f
-|
-.Fl q
-.Oc
-flush
+.Op Fl f | q
+.Cm flush
 .Nm ipfw
-.Oo
-.Fl q
-.Oc
-{zero|resetlog|delete}
+.Op Fl q
+.Es \&{ \&}
+.En Cm zero | resetlog | delete
 .Op Ar number ...
 .Nm ipfw
+.Op Fl s Op Ar field
 .Op Fl aftN
-{list|show}
+.Es \&{ \&}
+.En Cm list | show
 .Op Ar number ...
 .Nm ipfw
-.Oo
-.Fl q
-.Oc
-add
+.Op Fl q
+.Cm add
 .Op Ar number
-.Ar rule-body 
+.Ar rule-body
 .Nm ipfw
-pipe
+.Cm pipe
 .Ar number
-config
+.Cm config
 .Ar pipe-config-options
 .Nm ipfw
-pipe {delete|list|show}
+.Cm pipe
+.Es \&{ \&}
+.En Cm delete | list | show
 .Op Ar number ...
 .Sh DESCRIPTION
 .Nm
-is the user interface for controlling the IPFW firewall and
-.Nm dummynet
-traffic shaper in FreeBSD.
+is the user interface for controlling the
+.Xr ipfirewall 4
+and the
+.Xr dummynet 4
+traffic shaper in
+.Fx .
 .Pp
 Each incoming or outgoing packet is passed through the
 .Nm
-rules. In case a host is acting as a gateway, packets
-forwarded by the gateway are processed by
+rules.
+If host is acting as a gateway, packets forwarded by
+the gateway are processed by
 .Nm
-twice. In case a host is acting as a bridge, packets
-forwarded by the bridge are processed by
+twice.
+In case a host is acting as a bridge, packets forwarded by
+the bridge are processed by
 .Nm
 once.
 .Pp
-A firewall configuration is made of a list of numbered rules, which are
-scanned for each packet until a match is
-found and the relevant action is performed. Depending on the
-action and certain system settings, packets can be reinjected
-into the firewall at the rule after the matching one for further
-processing. All rules apply to all interfaces, so it is
-responsibility of the sysadmin to write the ruleset in such
-a way to minimize the number of checks.
+A firewall configuration is made of a list of numbered rules,
+which is scanned for each packet until a match is found and
+the relevant action is performed.
+Depending on the action and certain system settings, packets
+can be reinjected into the firewall at the rule after the
+matching one for further processing.
+All rules apply to all interfaces, so it is responsibility
+of the system administrator to write the ruleset in such a
+way as to minimize the number of checks.
 .Pp
 A configuration always includes a
-.Ar DEFAULT
+.Em DEFAULT
 rule (numbered 65535) which cannot be modified by the programmer
-and always matches packets. The action associated with the
-default rule can be either
-.Ar deny
+and always matches packets.
+The action associated with the default rule can be either
+.Cm deny
 or
-.Ar allow
+.Cm allow
 depending on how the kernel is configured.
 .Pp
-All rules have a few associated counters: a packet count and
-a byte count, a log count, and a timestamp indicating the time
-of the last match. Counters can be visualized or reset with
+If the ruleset includes one or more rules with the
+.Cm keep-state
+option, then
+.Nm
+assumes a
+.Em stateful
+behaviour, i.e. upon a match will create dynamic rules matching
+the exact parameters (addresses and ports) of the matching packet.
+.Pp
+These dynamic rules, which have a limited lifetime, are checked
+at the first occurrence of a
+.Cm check-state
+or
+.Cm keep-state
+rule, and are typically used to open the firewall on-demand to
+legitimate traffic only.
+See the
+.Sx RULE FORMAT
+and
+.Sx EXAMPLES
+sections below for more information on the stateful behaviour of
+.Nm ipfw .
+.Pp
+All rules (including dynamic ones) have a few associated counters:
+a packet count, a byte count, a log count and a timestamp
+indicating the time of the last match.
+Counters can be displayed or reset with
 .Nm
 commands.
 .Pp
 Rules can be added with the
-.Ar add
+.Cm add
 command; deleted individually with the
-.Ar delete
+.Cm delete
 command, and globally with the
-.Ar flush
-command; visualized, optionally with the content of
-the counters, using the
-.Ar show
+.Cm flush
+command; displayed, optionally with the content of the
+counters, using the
+.Cm show
 and
-.Ar list
-commands. Finally, counters can be reset with the
-.Ar zero
+.Cm list
+commands.
+Finally, counters can be reset with the
+.Cm zero
 and
-.Ar resetlog
+.Cm resetlog
 commands.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl a
-While listing, show counter values.  See also 
-.Dq show
+While listing, show counter values.
+See also the
+.Cm show
 command.
 .It Fl f
-Don't ask for confirmation for commands that can cause problems if misused
-(i.e. flush).
-.Ar Note ,
+Don't ask for confirmation for commands that can cause problems
+if misused,
+.No i.e. Cm flush .
+.Em Note ,
 if there is no tty associated with the process, this is implied.
 .It Fl q
-While adding, zeroing, resetlogging or flushing, be quiet about actions (implies
-.Fl f Ns ).
+While
+.Cm add Ns ing ,
+.Cm zero Ns ing ,
+.Cm resetlog Ns ging
+or
+.Cm flush Ns ing ,
+be quiet about actions
+.Po
+implies
+.Fl f
+.Pc .
 This is useful for adjusting rules by executing multiple
 .Nm
 commands in a script
 .Po
 e.g.,
-.Sq sh /etc/rc.firewall
+.Ql sh\ /etc/rc.firewall
 .Pc ,
 or by processing a file of many
-.Nm 
+.Nm
 rules,
-across a remote login session.  If a flush is performed in normal
-(verbose) mode (with the default kernel configuration), it prints a message.
-Because all rules are flushed, the
-message cannot be delivered to the login session.  This causes the
-remote login session to be closed and the remainder of the ruleset is
-not processed.  Access to the console is required to recover.
+across a remote login session.
+If a
+.Cm flush
+is performed in normal (verbose) mode (with the default kernel
+configuration), it prints a message.
+Because all rules are flushed, the message cannot be delivered
+to the login session.
+This causes the remote login session to be closed and the
+remainder of the ruleset is not processed.
+Access to the console is required to recover.
 .It Fl t
 While listing, show last match timestamp.
 .It Fl N
 Try to resolve addresses and service names in output.
+.It Fl s Op Ar field
+While listing pipes, sort according to one of the four
+counters (total and current packets or bytes).
 .El
 .Pp
-To ease configuration, rules can be put into a file which is processed
-using
+To ease configuration, rules can be put into a file which is
+processed using
 .Nm
-as shown in the first synopsis line. The
+as shown in the first synopsis line.
+The
 .Ar file
-will be read line by line and applied as arguments to the 
+will be read line by line and applied as arguments to the
 .Nm
-command.
+utility.
 .Pp
 Optionally, a preprocessor can be specified using
 .Fl p Ar preproc
 where
 .Ar file
-is to be piped through.  Useful preprocessors include
+is to be piped through.
+Useful preprocessors include
 .Xr cpp 1
 and
 .Xr m4 1 .
 If
 .Ar preproc
-doesn't start with a slash as its first character, the usual
+doesn't start with a slash
+.Pq Ql /
+as its first character, the usual
 .Ev PATH
-name search is performed.  Care should be taken with this in environments
-where not all filesystems are mounted (yet) by the time
+name search is performed.
+Care should be taken with this in environments where not all
+filesystems are mounted (yet) by the time
 .Nm
-is being run (e. g. since they are mounted over NFS).  Once
+is being run (e.g. when they are mounted over NFS).
+Once
 .Fl p
 has been specified, optional
 .Fl D
@@ -179,175 +236,195 @@
 .Pp
 The
 .Nm
-.Ar pipe
-commands are used to configure the traffic shaper, as shown in
-the ``TRAFFIC SHAPER CONFIGURATION'' section below.
-.Pp
+.Cm pipe
+commands are used to configure the traffic shaper, as shown in the
+.Sx TRAFFIC SHAPER CONFIGURATION
+section below.
 .Sh RULE FORMAT
 The
 .Nm
-rule format is the following
-.Pp
-.Op prob Ar match_probability
+rule format is the following:
+.Bd -ragged
+.Op Cm prob Ar match_probability
 .Ar action
-.Op log Op Ar logamount Ar number
+.Op Cm log Op Cm logamount Ar number
 .Ar proto
-from
-.Ar src
-to
-.Ar dst
-.Op interface-spec
+.Cm from Ar src
+.Cm to Ar dst
+.Op Ar interface-spec
 .Op Ar options
+.Ed
 .Pp
 Each packet can be filtered based on the following information that is
 associated with it:
 .Pp
-.Bl -tag -offset indent -compact -width xxxx
-.It Transmit and Receive Interface (by name or address)
-.It Direction (Incoming or Outgoing)
-.It Source and Destination IP Address (possibly masked)
-.It Protocol (TCP, UDP, ICMP, etc.)
-.It Source and Destination Port (lists, ranges or masks)
-.It TCP Flags
-.It IP Fragment Flag
-.It IP Options
-.It ICMP Types
-.It User/Group ID of the socket associated with the packet
+.Bl -tag -width "Source and destination IP address" -offset indent -compact
+.It Transmit and receive interface
+(by name or address)
+.It Direction
+(incoming or outgoing)
+.It Source and destination IP address
+(possibly masked)
+.It Protocol
+(TCP, UDP, ICMP, etc.)
+.It Source and destination port
+(lists, ranges or masks)
+.It TCP flags
+.It IP fragment flag
+.It IP options
+.It ICMP types
+.It User/group ID of the socket associated with the packet
 .El
 .Pp
-Note that may be dangerous to filter on the source IP address or
-source TCP/UDP port because either or both could easily be spoofed.
-.Pp
-.Ar prob match_probability
-.Bd -ragged -offset flag
-A match is only declared with the specified
-probability (floating point number between 0 and 1). This can be useful for a number of applications
-such as random packet drop or (in conjunction with
+Note that it may be dangerous to filter on the source IP
+address or source TCP/UDP port because either or both could
+easily be spoofed.
+.Bl -tag -width indent
+.It Cm prob Ar match_probability
+A match is only declared with the specified probability
+(floating point number between 0 and 1).
+This can be useful for a number of applications such as
+random packet drop or
+.Po
+in conjunction with
 .Xr dummynet 4
-) to simulate the effect of multiple paths leading to out-of-order
+.Pc
+to simulate the effect of multiple paths leading to out-of-order
 packet delivery.
-.Ed
-.Pp
-.Ar action :
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar allow
+.It Ar action :
+.Bl -tag -width indent
+.It Cm allow
 Allow packets that match rule.
-The search terminates. Aliases are
-.Ar pass ,
-.Ar permit ,
+The search terminates.
+Aliases are
+.Cm pass ,
+.Cm permit
 and
-.Ar accept .
-.It Ar deny
+.Cm accept .
+.It Cm deny
 Discard packets that match this rule.
 The search terminates.
-.Ar Drop
+.Cm drop
 is an alias for
-.Ar deny .
-.It Ar reject
-(Deprecated.) Discard packets that match this rule, and try to send an ICMP
+.Cm deny .
+.It Cm reject
+.Pq Deprecated .
+Discard packets that match this rule, and try to send an ICMP
 host unreachable notice.
 The search terminates.
-.It Ar unreach code
+.It Cm unreach Ar code
 Discard packets that match this rule, and try to send an ICMP
 unreachable notice with code
 .Ar code ,
 where
 .Ar code
-is a number from zero to 255, or one of these aliases:
-.Ar net ,
-.Ar host ,
-.Ar protocol ,
-.Ar port ,
-.Ar needfrag ,
-.Ar srcfail ,
-.Ar net-unknown ,
-.Ar host-unknown ,
-.Ar isolated ,
-.Ar net-prohib ,
-.Ar host-prohib ,
-.Ar tosnet ,
-.Ar toshost ,
-.Ar filter-prohib ,
-.Ar host-precedence ,
+is a number from 0 to 255, or one of these aliases:
+.Cm net , host , protocol , port ,
+.Cm needfrag , srcfail , net-unknown , host-unknown ,
+.Cm isolated , net-prohib , host-prohib , tosnet ,
+.Cm toshost , filter-prohib , host-precedence
 or
-.Ar precedence-cutoff .
+.Cm precedence-cutoff .
 The search terminates.
-.It Ar reset
-TCP packets only. Discard packets that match this rule,
-and try to send a TCP reset
-.Pq RST
-notice.
+.It Cm reset
+TCP packets only.
+Discard packets that match this rule, and try to send a TCP
+reset (RST) notice.
 The search terminates.
-.It Ar count
+.It Cm count
 Update counters for all packets that match rule.
 The search continues with the next rule.
-.It Ar divert port
+.It Cm check-state
+Checks the packet against the dynamic ruleset.
+If a match is found then the search terminates, otherwise
+we move to the next rule.
+If no
+.Cm check-state
+rule is found, the dynamic ruleset is checked at the first
+.Cm keep-state
+rule.
+.It Cm divert Ar port
 Divert packets that match this rule to the
 .Xr divert 4
 socket bound to port
 .Ar port .
 The search terminates.
-.It Ar tee port
+.It Cm tee Ar port
 Send a copy of packets matching this rule to the
 .Xr divert 4
 socket bound to port
 .Ar port .
 The search terminates and the original packet is accepted
-(but see BUGS below).
-.It Ar fwd ipaddr Op ,port
+.Po
+but see section
+.Sx BUGS
+below
+.Pc .
+.It Cm fwd Ar ipaddr Ns Xo
+.Op , Ns Ar port
+.Xc
 Change the next-hop on matching packets to
 .Ar ipaddr ,
 which can be an IP address in dotted quad or a host name.
 If
 .Ar ipaddr
-is not a directly-reachable address, the route 
-as found in the local routing table for that IP is used
-instead.
+is not a directly-reachable address, the route as found in
+the local routing table for that IP is used instead.
 If
 .Ar ipaddr
-is a local address, then on a packet entering the system from a remote
-host it will be diverted to
+is a local address, then on a packet entering the system
+from a remote host it will be diverted to
 .Ar port
-on the local machine, keeping the local address of the socket set
-to the original IP address the packet was destined for. This is intended
-for use with transparent proxy servers. If the IP is not
-a local address then the port number (if specified) is ignored and
-the rule only applies to packets leaving the system. This will
-also map addresses to local ports when packets are generated locally.
-The search terminates if this rule matches. If the port number is not 
-given then the port number in the packet is used, so that a packet for
-an external machine port Y would be forwarded to local port Y. The kernel
-must have been compiled with options IPFIREWALL_FORWARD.
-.It Ar pipe pipe_nr
+on the local machine, keeping the local address of the socket
+set to the original IP address the packet was destined for.
+This is intended for use with transparent proxy servers.
+If the IP is not a local address then the port number
+(if specified) is ignored and the rule only applies to packets
+leaving the system.
+This will also map addresses to local ports when packets are
+generated locally.
+The search terminates if this rule matches.
+If the port number is not given then the port number in the
+packet is used, so that a packet for an external machine port
+Y would be forwarded to local port Y.
+The kernel must have been compiled with the
+.Dv IPFIREWALL_FORWARD
+option.
+.It Cm pipe Ar pipe_nr
 Pass packet to a
 .Xr dummynet 4
-``pipe'' (for bandwidth limitation, delay etc.). See the
+.Dq pipe
+(for bandwidth limitation, delay, etc.).
+See the
 .Xr dummynet 4
-manpage for further information. The search terminates; however,
-on exit from the pipe and if the sysctl variable
-net.inet.ip.fw.one_pass is not set, the packet is passed again to
-the firewall code starting from the next rule.
-.It Ar skipto number
+manpage for further information.
+The search terminates; however, on exit from the pipe and if
+the
+.Xr sysctl 8
+variable
+.Em net.inet.ip.fw.one_pass
+is not set, the packet is passed again to the firewall code
+starting from the next rule.
+.It Cm skipto Ar number
 Skip all subsequent rules numbered less than
 .Ar number .
 The search continues with the first rule numbered
 .Ar number
 or higher.
 .El
-.Pp
-.Ar log Op Ar logamount Ar number
-.Bd -ragged -offset flag
+.It Cm log Op Cm logamount Ar number
 If the kernel was compiled with
 .Dv IPFIREWALL_VERBOSE ,
 then when a packet matches a rule with the
-.Ar log
+.Cm log
 keyword a message will be printed on the console.
 If the kernel was compiled with the
 .Dv IPFIREWALL_VERBOSE_LIMIT
 option, then by default logging will cease after the number
 of packets specified by the option are received for that
-particular chain entry. However, if
-.Ar logamount Ar number
+particular chain entry.
+However, if
+.Cm logamount Ar number
 is used, that
 .Ar number
 will be the default logging limit rather than
@@ -359,329 +436,395 @@
 through the
 .Xr sysctl 8
 interface in the MIB base of
-.Dv net.inet.ip.fw .
-.Ed
-.Pp
-.Ar proto :
-.Bd -ragged -offset flag
-An IP protocol specified by number or name (see
-.Pa /etc/protocols
-for a complete list).
+.Em net.inet.ip.fw .
+.It Ar proto
+An IP protocol specified by number or name (for a complete
+list see
+.Pa /etc/protocols ) .
 The
-.Ar ip
+.Cm ip
 or
-.Ar all
+.Cm all
 keywords mean any protocol will match.
-.Ed
-.Pp
-.Ar src 
-and
-.Ar dst :
-.Bd -ragged -offset flag
-.Ar <address/mask> Op Ar ports
+.It Ar src No and Ar dst :
+.Aq Ar address Ns / Ns Ar mask
+.Op Ar ports
 .Pp
 The
-.Em <address/mask>
+.Aq Ar address Ns / Ns Ar mask
 may be specified as:
-.Pp
-.Bl -hang -offset 0n -width 1234567890123456
+.Bl -tag -width indent
 .It Ar ipno
-An ipnumber of the form 1.2.3.4.
-Only this exact ip number match the rule.
-.It Ar ipno/bits
-An ipnumber with a mask width of the form 1.2.3.4/24.
-In this case all ip numbers from 1.2.3.0 to 1.2.3.255 will match.
-.It Ar ipno:mask
-An ipnumber with a mask of the form 1.2.3.4:255.255.240.0.
-In this case all ip numbers from 1.2.0.0 to 1.2.15.255 will match.
+An IP number of the form 1.2.3.4.
+Only this exact IP number will match the rule.
+.It Ar ipno Ns / Ns Ar bits
+An IP number with a mask width of the form 1.2.3.4/24.
+In this case all IP numbers from 1.2.3.0 to 1.2.3.255 will match.
+.It Ar ipno Ns : Ns Ar mask
+An IP number with a mask of the form 1.2.3.4:255.255.240.0.
+In this case all IP numbers from 1.2.0.0 to 1.2.15.255 will match.
 .El
 .Pp
 The sense of the match can be inverted by preceding an address with the
-.Dq not
-modifier, causing all other addresses to be matched instead. This
-does not affect the selection of port numbers.
+.Cm not
+modifier, causing all other addresses to be matched instead.
+This does not affect the selection of port numbers.
 .Pp
 With the TCP and UDP protocols, optional
 .Em ports
 may be specified as:
-.Pp
-.Bl -hang -offset flag
-.It Ns {port|port-port|port:mask} Ns Op ,port Ns Op ,...
-.El
+.Bd -ragged -offset indent
+.Sm off
+.Eo \&{
+.Ar port |
+.Ar port No \&- Ar port |
+.Ar port : mask
+.Ec \&} Op , Ar port Op , Ar ...
+.Sm on
+.Ed
 .Pp
 The
-.Ql -
+.Ql \&-
 notation specifies a range of ports (including boundaries).
 .Pp
 The
-.Ql \:
+.Ql \&:
 notation specifies a port and a mask, a match is declared if
 the port number in the packet matches the one in the rule,
 limited to the bits which are set in the mask.
 .Pp
-Service names (from 
+Service names (from
 .Pa /etc/services )
 may be used instead of numeric port values.
-A range may only be specified as the first value,
-and the length of the port list is limited to
+A range may only be specified as the first value, and the
+length of the port list is limited to
 .Dv IP_FW_MAX_PORTS
-(as defined in 
-.Pa /usr/src/sys/netinet/ip_fw.h )
-ports.
-A
-.Ql \e
-can be used to escape the
-.Ql -
+ports (as defined in
+.Pa /usr/src/sys/netinet/ip_fw.h ) .
+A backslash
+.Pq Ql \e
+can be used to escape the dash
+.Pq Ql -
 character in a service name:
 .Pp
-.Dl ipfw add count tcp from any ftp\e\e-data-ftp to any
+.Dl "ipfw add count tcp from any ftp\e\e-data-ftp to any"
 .Pp
 Fragmented packets which have a non-zero offset (i.e. not the first
 fragment) will never match a rule which has one or more port
-specifications.  See the
-.Ar frag
+specifications.
+See the
+.Cm frag
 option for details on matching fragmented packets.
-.Pp
-.Ed
-.Ar interface-spec :
-.Pp
-.Bd -ragged -offset flag
+.It Ar interface-spec
 Some combinations of the following specifiers are allowed:
-.Bl -hang -offset 0n -width 1234567890123456
-.It Ar in
+.Bl -tag -width "via ipno"
+.It Cm in
 Only match incoming packets.
-.It Ar out
+.It Cm out
 Only match outgoing packets.
-.It Ar via ifX
+.It Cm via Ar ifX
 Packet must be going through interface
-.Ar ifX.
-.It Ar via if*
+.Ar ifX .
+.It Cm via Ar if Ns Cm *
 Packet must be going through interface
 .Ar ifX ,
-where X is any unit number.
-.It Ar via any
+where
+.Ar X
+is any unit number.
+.It Cm via any
 Packet must be going through
 .Em some
 interface.
-.It Ar via ipno
+.It Cm via Ar ipno
 Packet must be going through the interface having IP address
 .Ar ipno .
 .El
 .Pp
 The
-.Ar via
+.Cm via
 keyword causes the interface to always be checked.
 If
-.Ar recv
+.Cm recv
 or
-.Ar xmit
+.Cm xmit
 is used instead of
-.Ar via ,
-then the only receive or transmit interface (respectively) is checked.
-By specifying both, it is possible to match packets based on both receive
-and transmit interface, e.g.:
+.Cm via ,
+then the only receive or transmit interface (respectively)
+is checked.
+By specifying both, it is possible to match packets based on
+both receive and transmit interface, e.g.:
 .Pp
 .Dl "ipfw add 100 deny ip from any to any out recv ed0 xmit ed1"
 .Pp
 The
-.Ar recv
-interface can be tested on either incoming or outgoing packets, while the
-.Ar xmit
-interface can only be tested on outgoing packets. So
-.Ar out
+.Cm recv
+interface can be tested on either incoming or outgoing packets,
+while the
+.Cm xmit
+interface can only be tested on outgoing packets.
+So
+.Cm out
 is required (and
-.Ar in
-invalid) whenever
-.Ar xmit
-is used. Specifying
-.Ar via
+.Cm in
+is invalid) whenever
+.Cm xmit
+is used.
+Specifying
+.Cm via
 together with
-.Ar xmit
+.Cm xmit
 or
-.Ar recv
+.Cm recv
 is invalid.
 .Pp
-A packet may not have a receive or transmit interface: packets originating
-from the local host have no receive interface, while packets destined for
-the local host have no transmit interface.
-.Ed
+A packet may not have a receive or transmit interface: packets
+originating from the local host have no receive interface,
+while packets destined for the local host have no transmit
+interface.
+.It Ar options :
+.Bl -tag -width indent
+.It Cm keep-state Op Ar method
+Upon a match, the firewall will create a dynamic rule, whose
+default behaviour is to matching bidirectional traffic between
+source and destination IP/port using the same protocol.
+The rule has a limited lifetime (controlled by a set of
+.Xr sysctl 8
+variables), and the lifetime is refreshed every time a matching
+packet is found.
 .Pp
-.Ar options :
-.Bl -hang -offset flag -width 1234567890123456
-.It frag
-Match if the packet is a fragment and this is not the first fragment
-of the datagram.
-.Ar frag
+The actual behaviour can be modified by specifying a different
+.Ar method ,
+although at the moment only the default one is specified.
+.It Cm bridged
+Matches only bridged packets.
+This can be useful for multicast or broadcast traffic, which
+would otherwise pass through the firewall twice: once during
+bridging, and a second time when the packet is delivered to
+the local stack.
+.Pp
+Apart from a small performance penalty, this would be a problem
+when using
+.Em pipes
+because the same packet would be accounted for twice in terms
+of bandwidth, queue occupation, and also counters.
+.It Cm frag
+Match if the packet is a fragment and this is not the first
+fragment of the datagram.
+.Cm frag
 may not be used in conjunction with either
-.Ar tcpflags
+.Cm tcpflags
 or TCP/UDP port specifications.
-.It ipoptions Ar spec
-Match if the IP header contains the comma separated list of 
+.It Cm ipoptions Ar spec
+Match if the IP header contains the comma separated list of
 options specified in
 .Ar spec .
 The supported IP options are:
 .Pp
-.Ar ssrr 
+.Cm ssrr
 (strict source route),
-.Ar lsrr 
+.Cm lsrr
 (loose source route),
-.Ar rr 
-(record packet route), and
-.Ar ts 
+.Cm rr
+(record packet route) and
+.Cm ts
 (timestamp).
 The absence of a particular option may be denoted
 with a
-.Dq ! .
-.It established
+.Ql ! .
+.It Cm established
+TCP packets only.
 Match packets that have the RST or ACK bits set.
+.It Cm setup
 TCP packets only.
-.It setup
 Match packets that have the SYN bit set but no ACK bit.
+.It Cm tcpflags Ar spec
 TCP packets only.
-.It tcpflags Ar spec
 Match if the TCP header contains the comma separated list of
 flags specified in
 .Ar spec .
 The supported TCP flags are:
 .Pp
-.Ar fin ,
-.Ar syn ,
-.Ar rst ,
-.Ar psh ,
-.Ar ack ,
+.Cm fin ,
+.Cm syn ,
+.Cm rst ,
+.Cm psh ,
+.Cm ack
 and
-.Ar urg .
+.Cm urg .
 The absence of a particular flag may be denoted
 with a
-.Dq ! .
+.Ql ! .
 A rule which contains a
-.Ar tcpflags
+.Cm tcpflags
 specification can never match a fragmented packet which has
-a non-zero offset.  See the
-.Ar frag
+a non-zero offset.
+See the
+.Cm frag
 option for details on matching fragmented packets.
-.It icmptypes Ar types
+.It Cm icmptypes Ar types
+ICMP packets only.
 Match if the ICMP type is in the list
 .Ar types .
-The list may be specified as any combination of ranges
-or individual types separated by commas.
+The list may be specified as any combination of ranges or
+individual types separated by commas.
 The supported ICMP types are:
 .Pp
 echo reply
-.Pq Ar 0 ,
+.Pq Cm 0 ,
 destination unreachable
-.Pq Ar 3 ,
+.Pq Cm 3 ,
 source quench
-.Pq Ar 4 ,
+.Pq Cm 4 ,
 redirect
-.Pq Ar 5 ,
+.Pq Cm 5 ,
 echo request
-.Pq Ar 8 ,
+.Pq Cm 8 ,
 router advertisement
-.Pq Ar 9 ,
+.Pq Cm 9 ,
 router solicitation
-.Pq Ar 10 ,
+.Pq Cm 10 ,
 time-to-live exceeded
-.Pq Ar 11 ,
+.Pq Cm 11 ,
 IP header bad
-.Pq Ar 12 ,
+.Pq Cm 12 ,
 timestamp request
-.Pq Ar 13 ,timestamp reply
-.Pq Ar 14 ,
+.Pq Cm 13 ,
+timestamp reply
+.Pq Cm 14 ,
 information request
-.Pq Ar 15 ,
+.Pq Cm 15 ,
 information reply
-.Pq Ar 16 ,
+.Pq Cm 16 ,
 address mask request
-.Pq Ar 17 ,
+.Pq Cm 17
 and address mask reply
-.Pq Ar 18
-.It Ar uid user
+.Pq Cm 18 .
+.It Cm uid Ar user
 Match all TCP or UDP packets sent by or received for a
 .Ar user .
 A
 .Ar user
 may be matched by name or identification number.
-.It Ar gid group
+.It Cm gid Ar group
 Match all TCP or UDP packets sent by or received for a
 .Ar group .
 A
 .Ar group
 may be matched by name or identification number.
 .El
+.El
 .Sh TRAFFIC SHAPER CONFIGURATION
-Ipfw is also the user interface for the
+The
+.Nm
+utility is also the user interface for the
 .Xr dummynet 4
 traffic shaper.
 The shaper operates by passing packets to objects called
-.Ar pipes ,
-which emulates a link with given bandwidth, propagation delay,
+.Em pipes ,
+which emulate a link with given bandwidth, propagation delay,
 queue size and packet loss rate.
 The
 .Nm
-pipe configuration format is the following
-.Pp
-.Ar pipe number config
-.Op bw Ar bandwidth
-.Op queue Ar {slots|size}
-.Op delay Ar delay-ms
-.Op plr Ar loss-probability
-.Op mask Ar {all | {dst-ip|src-ip|dst-port|src-port|proto} bitmask}
-.Op buckets Ar hash-table-size
+pipe configuration format is the following:
+.Bd -ragged
+.Cm pipe Ar number Cm config
+.Op Cm bw Ar bandwidth
+.Oo
+.Cm queue
+.Es \&{ \&}
+.En Ar slots | size
+.Oc
+.Op Cm delay Ar ms-delay
+.Op Cm plr Ar loss-probability
+.Op Cm mask Ar mask-specifier
+.Op Cm buckets Ar hash-table-size
+.Ed
 .Pp
 The following parameters can be configured for a pipe:
-.Bl -hang -offset flag -width 1234567890
-.It bw Ar bandwidth
+.Bl -tag -width indent
+.It Cm bw Ar bandwidth
 Bandwidth, measured in
-.Ar [K|M]{bit/s|Byte/s} .
+.Sm off
+.Oo
+.Cm K | M
+.Oc Eo \&{
+.Cm bit/s | Byte/s
+.Ec \&} .
+.Sm on
+.Pp
 A value of 0 (default) means unlimited bandwidth.
 The unit must follow immediately the number, as in
 .Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
-.It delay Ar ms-delay
-propagation delay, measured in milliseconds. The value is rounded
-to the next multiple of the clock tick (typically 10ms, but it is
-good practice to run kernels with "options HZ=1000" to reduce
-the granularity to 1ms or less). Default value is 0, meaning
-no delay.
-.It queue Ar {slots|size}
-queue size, in slots or KBytes. Default value is 50 slots, which
-is the typical queue size for Ethernet devices. Note that for
-slow speed links you should keep the queue size short or your
-traffic might be affected by a significant queueing delay. E.g.
-50  max-sized ethernet packets (1500
-bytes) mean 600Kbit or 20s of queue on a 30Kbit/s pipe.
-Even worse effect can result if you get
-packets from an interface with a much larger MTU e.g. the loopback
-interface with its 16KB packets.
-.It plr packet-loss-rate
-packet loss rate. NN is a floating-point number, with 0 meaning
-no loss, 1 means 100% loss. The loss rate is internally represented
-on 31 bits.
-.It mask Ar mask-specifier
-dummynet allows you to generate per-flow queues
-using a single pipe specification. A flow identifier is constructed
-by masking the IP addresses, ports and protocol types as specified
-in the pipe configuration. Packets with the same ID after masking fall
-into the same queue. Available mask specifiers are a combination
-of the following:
-.Ar dst-ip mask , src-ip mask ,
-.Ar dst-port mask , src-port mask ,
-.Ar proto mask
+.It Cm delay Ar ms-delay
+Propagation delay, measured in milliseconds.
+The value is rounded to the next multiple of the clock tick
+(typically 10ms, but it is a good practice to run kernels
+with
+.Dq "options HZ=1000"
+to reduce
+the granularity to 1ms or less).
+Default value is 0, meaning no delay.
+.It Cm queue Xo
+.Es \&{ \&}
+.En Ar slots | size Ns Cm Kbytes
+.Xc
+Queue size, in
+.Ar slots
 or
-.Ar all
+.Cm KBytes .
+Default value is 50 slots, which
+is the typical queue size for Ethernet devices.
+Note that for slow speed links you should keep the queue
+size short or your traffic might be affected by a significant
+queueing delay.
+E.g., 50 max-sized ethernet packets (1500 bytes) mean 600Kbit
+or 20s of queue on a 30Kbit/s pipe.
+Even worse effect can result if you get packets from an
+interface with a much larger MTU, e.g. the loopback interface
+with its 16KB packets.
+.It Cm plr Ar packet-loss-rate
+Packet loss rate.
+Argument
+.Ar packet-loss-rate
+is a floating-point number between 0 and 1, with 0 meaning no
+loss, 1 meaning 100% loss.
+The loss rate is internally represented on 31 bits.
+.It Cm mask Ar mask-specifier
+The
+.Xr dummynet 4
+allows you to generate per-flow queues using a single pipe
+specification.
+A flow identifier is constructed by masking the IP addresses,
+ports and protocol types as specified in the pipe configuration.
+Packets with the same identifier after masking fall into the
+same queue.
+Available mask specifiers are a combination of the following:
+.Cm dst-ip Ar mask ,
+.Cm src-ip Ar mask ,
+.Cm dst-port Ar mask ,
+.Cm src-port Ar mask ,
+.Cm proto Ar mask
+or
+.Cm all ,
 where the latter means all bits in all fields are significant.
-.It buckets Ar NN
-Specifies the size of the hash table used for storing the various queues.
-Default value is 64 controlled by the sysctl variable
-.Ar net.inet.ip.dummynet.hash_size ,
+.It Cm buckets Ar hash-table-size
+Specifies the size of the hash table used for storing the
+various queues.
+Default value is 64 controlled by the
+.Xr sysctl 8
+variable
+.Em net.inet.ip.dummynet.hash_size ,
 allowed range is 16 to 1024.
 .El
 .Sh CHECKLIST
 Here are some important points to consider when designing your
 rules:
-.Bl -bullet -hang -offset flag 
-.It 
-Remember that you filter both packets going in and out.
+.Bl -bullet
+.It
+Remember that you filter both packets going
+.Cm in
+and
+.Cm out .
 Most connections need packets going in both directions.
 .It
 Remember to test very carefully.
@@ -690,28 +833,33 @@
 Don't forget the loopback interface.
 .El
 .Sh FINE POINTS
-There is one kind of packet that the firewall will always discard,
-that is an IP fragment with a fragment offset of one.
-This is a valid packet, but it only has one use, to try to circumvent
-firewalls.
-.Pp
-If you are logged in over a network, loading the KLD version of
+There is one kind of packet that the firewall will always
+discard, that is an IP fragment with a fragment offset of
+one.
+This is a valid packet, but it only has one use, to try
+to circumvent firewalls.
+.Pp
+If you are logged in over a network, loading the
+.Xr kld 4
+version of
 .Nm
 is probably not as straightforward as you would think.
-I recommend this command line:
-.Bd -literal -offset center
+I recommend the following command line:
+.Bd -literal -offset indent
 kldload /modules/ipfw.ko && \e
-ipfw add 32000 allow all from any to any
+ipfw add 32000 allow ip from any to any
 .Ed
 .Pp
 Along the same lines, doing an
-.Bd -literal -offset center
+.Bd -literal -offset indent
 ipfw flush
 .Ed
 .Pp
 in similar surroundings is also a bad idea.
 .Pp
-The IP filter list may not be modified if the system security level
+The
+.Nm
+filter list may not be modified if the system security level
 is set to 3 or higher
 .Po
 see
@@ -719,11 +867,62 @@
 for information on system security levels
 .Pc .
 .Sh PACKET DIVERSION
-A divert socket bound to the specified port will receive all packets diverted
-to that port; see
-.Xr divert 4 .
+A
+.Xr divert 4
+socket bound to the specified port will receive all packets
+diverted to that port.
 If no socket is bound to the destination port, or if the kernel
-wasn't compiled with divert socket support, the packets are dropped.
+wasn't compiled with divert socket support, the packets are
+dropped.
+.Sh SYSCTL VARIABLES
+A set of
+.Xr sysctl 8
+variables controls the behaviour of the firewall.
+These are shown below together with their default value and
+meaning:
+.Bl -tag -width indent
+.It Em net.inet.ip.fw.debug : No 1
+Controls debugging messages produced by
+.Nm ipfw .
+.It Em net.inet.ip.fw.one_pass : No 1
+When set, permits only one pass through the firewall.
+Otherwise, after a pipe or divert action, the packet is
+reinjected in the firewall starting from the next rule.
+.It Em net.inet.ip.fw.verbose : No 1
+Enables verbose messages.
+.It Em net.inet.ip.fw.enable : No 1
+Enables the firewall.
+Setting this variable to 0 lets you run your machine without
+firewall even if compiled in.
+.It Em net.inet.ip.fw.verbose_limit : No 0
+Limits the number of messages produced by a verbose firewall.
+.It Em net.inet.ip.fw.dyn_buckets : No 256
+.It Em net.inet.ip.fw.curr_dyn_buckets : No 256
+The configured and current size of the hash table used to
+hold dynamic rules.
+This must be a power of 2.
+The table can only be resized when empty, so in order to
+resize it on the fly you will probably have to
+.Cm flush
+and reload the ruleset.
+.It Em net.inet.ip.fw.dyn_count : No 3
+Current number of dynamic rules
+.Pq read-only .
+.It Em net.inet.ip.fw.dyn_max : No 1000
+Maximum number of dynamic rules.
+When you hit this limit, no more dynamic rules can be
+installed until old ones expire.
+.It Em net.inet.ip.fw.dyn_ack_lifetime : No 300
+.It Em net.inet.ip.fw.dyn_syn_lifetime : No 20
+.It Em net.inet.ip.fw.dyn_fin_lifetime : No 20
+.It Em net.inet.ip.fw.dyn_rst_lifetime : No 5
+.It Em net.inet.ip.fw.dyn_short_lifetime : No 30
+These variables control the lifetime, in seconds, of dynamic
+rules.
+Upon the initial SYN exchange the lifetime is kept short,
+then increased after both SYN have been seen, then decreased
+again during the final FIN exchange or when a RST
+.El
 .Sh EXAMPLES
 This command adds an entry which denies all tcp packets from
 .Em cracker.evil.org
@@ -731,32 +930,83 @@
 .Em wolf.tambov.su
 from being forwarded by the host:
 .Pp
-.Dl ipfw add deny tcp from cracker.evil.org to wolf.tambov.su 23
-.Pp 
-This one disallows any connection from the entire crackers network to
-my host:
+.Dl "ipfw add deny tcp from cracker.evil.org to wolf.tambov.su telnet"
+.Pp
+This one disallows any connection from the entire crackers
+network to my host:
 .Pp
-.Dl ipfw add deny all from 123.45.67.0/24 to my.host.org
+.Dl "ipfw add deny ip from 123.45.67.0/24 to my.host.org"
+.Pp
+A first and efficient way to limit access (not using dynamic rules)
+is the use of the following rules:
+.Pp
+.Dl "ipfw add allow tcp from any to any established"
+.Dl "ipfw add allow tcp from net1 portlist1 to net2 portlist2 setup"
+.Dl "ipfw add allow tcp from net3 portlist3 to net3 portlist3 setup"
+.Dl "..."
+.Dl "ipfw add deny tcp from any to any"
+.Pp
+The first rule will be a quick match for normal TCP packets,
+but it will not match the initial SYN packet, which will be
+matched by the
+.Cm setup
+rules only for selected source/destination pairs.
+All other SYN packets will be rejected by the final
+.Cm deny
+rule.
+.Pp
+In order to protect a site from flood attacks involving fake
+TCP packets, it is safer to use dynamic rules:
+.Pp
+.Dl "ipfw add check-state"
+.Dl "ipfw add deny tcp from any to any established"
+.Dl "ipfw add allow tcp from my-net to any setup keep-state"
+.Pp
+This will let the firewall install dynamic rules only for
+those connection which start with a regular SYN packet coming
+from the inside of our network.
+Dynamic rules are checked when encountering the first
+.Cm check-state
+or
+.Cm keep-state
+rule.
+A
+.Cm check-state
+rule should be usually placed near the beginning of the
+ruleset to minimize the amount of work scanning the ruleset.
+Your mileage may vary.
+.Pp
+.Em BEWARE :
+stateful rules can be subject to denial-of-service attacks
+by a SYN-flood which opens a huge number of dynamic rules.
+The effects of such attacks can be partially limited by
+acting on a set of
+.Xr sysctl 8
+variables which control the operation of the firewall.
 .Pp
 Here is a good usage of the
-.Ar list
-command to see accounting records
-and timestamp information:
+.Cm list
+command to see accounting records and timestamp information:
 .Pp
-.Dl ipfw -at l
+.Dl ipfw -at list
 .Pp
 or in short form without timestamps:
 .Pp
-.Dl ipfw -a l
+.Dl ipfw -a list
 .Pp
-This rule diverts all incoming packets from 192.168.2.0/24 to divert port 5000:
+Next rule diverts all incoming packets from 192.168.2.0/24
+to divert port 5000:
 .Pp
-.Dl ipfw divert 5000 all from 192.168.2.0/24 to any in
+.Dl ipfw divert 5000 ip from 192.168.2.0/24 to any in
 .Pp
-The following rules show some of the applications of ipfw and
-dummynet for simulations and the like.
+The following rules show some of the applications of
+.Nm
+and
+.Xr dummynet 4
+for simulations and the like.
 .Pp
-This rule drops random packets with a probability of 5%
+This rule drops random incoming packets with a probability
+of 5%:
 .Pp
 .Dl "ipfw add prob 0.05 deny ip from any to any in"
 .Pp
@@ -765,17 +1015,19 @@
 .Dl "ipfw add pipe 10 ip from any to any"
 .Dl "ipfw pipe 10 config plr 0.05"
 .Pp
-We can use pipes to artificially limit bandwidth e.g. on a machine
-acting as a router, if we want to limit traffic from local clients
-on 192.168.2.0/24 we do:
+We can use pipes to artificially limit bandwidth, e.g. on a
+machine acting as a router, if we want to limit traffic from
+local clients on 192.168.2.0/24 we do:
 .Pp
 .Dl "ipfw add pipe 1 ip from 192.168.2.0/24 to any out"
 .Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
 .Pp
 note that we use the
-.Ql out
-specifier so that the rule is not used twice. Remember in fact
-that ipfw rules are checked both on incoming and outgoing packets.
+.Cm out
+modifier so that the rule is not used twice.
+Remember in fact that
+.Nm
+rules are checked both on incoming and outgoing packets.
 .Pp
 Should we like to simulate a bidirectional link with bandwidth
 limitations, the correct way is the following:
@@ -785,42 +1037,48 @@
 .Dl "ipfw pipe 1 config bw 64Kbit/s queue 10Kbytes"
 .Dl "ipfw pipe 2 config bw 64Kbit/s queue 10Kbytes"
 .Pp
-The above can be very useful e.g. if you want to see how your fancy
-Web page will look for a residential user which is connected only through
-a slow link.
-You should not use only
-one pipe for both directions, unless you want to simulate a half-duplex
-medium (e.g. appletalk, Ethernet, IRDA).
+The above can be very useful, e.g. if you want to see how
+your fancy Web page will look for a residential user which
+is connected only through a slow link.
+You should not use only one pipe for both directions, unless
+you want to simulate a half-duplex medium (e.g. AppleTalk,
+Ethernet, IRDA).
 It is not necessary that both pipes have the same configuration,
 so we can also simulate asymmetric links.
 .Pp
-Another typical application of the traffic shaper is to introduce some
-delay in the communication. This can affect a lot applications which do
-a lot of Remote Procedure Calls, and where the round-trip-time of the
-connection often becomes a limiting factor much more than bandwidth:
+Another typical application of the traffic shaper is to
+introduce some delay in the communication.
+This can affect a lot applications which do a lot of Remote
+Procedure Calls, and where the round-trip-time of the
+connection often becomes a limiting factor much more than
+bandwidth:
 .Pp
 .Dl "ipfw add pipe 1 ip from any to any out"
 .Dl "ipfw add pipe 2 ip from any to any in"
 .Dl "ipfw pipe 1 config delay 250ms bw 1Mbit/s"
 .Dl "ipfw pipe 2 config delay 250ms bw 1Mbit/s"
 .Pp
-Per-flow queueing can be useful for a variety of purposes. A very
-simple one is counting traffic:
+Per-flow queueing can be useful for a variety of purposes.
+A very simple one is counting traffic:
 .Pp
 .Dl "ipfw add pipe 1 tcp from any to any"
 .Dl "ipfw add pipe 1 udp from any to any"
 .Dl "ipfw add pipe 1 ip from any to any"
 .Dl "ipfw pipe 1 config mask all"
 .Pp
-The above set of rules will create queues (and collect statistics)
-for all traffic. Because the pipes have no limitations, the only
-effect is collecting statistics. Note that we need 3 rules, not just
-the last one, because when ipfw tries to match ip packets it will
-not consider ports, so we would not see connections on separate ports
-as different ones.
+The above set of rules will create queues (and collect
+statistics) for all traffic.
+Because the pipes have no limitations, the only effect is
+collecting statistics.
+Note that we need 3 rules, not just the last one, because
+when
+.Nm
+tries to match IP packets it will not consider ports, so we
+would not see connections on separate ports as different
+ones.
 .Pp
-A more sophisticated example is limiting the outbound traffic on a net
-with per-host limits, rather than per-network limits:
+A more sophisticated example is limiting the outbound traffic
+on a net with per-host limits, rather than per-network limits:
 .Pp
 .Dl "ipfw add pipe 1 ip from 192.168.2.0/24 to any out"
 .Dl "ipfw add pipe 2 ip from any to 192.168.2.0/24 in"
@@ -829,9 +1087,9 @@
 .Sh SEE ALSO
 .Xr cpp 1 ,
 .Xr m4 1 ,
+.Xr bridge 4 ,
 .Xr divert 4 ,
 .Xr dummynet 4 ,
-.Xr bridge 4 ,
 .Xr ip 4 ,
 .Xr ipfirewall 4 ,
 .Xr protocols 5 ,
@@ -847,25 +1105,26 @@
 .Pp
 .Em WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!
 .Pp
-This program can put your computer in rather unusable state. When
-using it for the first time, work on the console of the computer, and
-do
+This program can put your computer in rather unusable state.
+When using it for the first time, work on the console of the
+computer, and do
 .Em NOT
 do anything you don't understand.
 .Pp
-When manipulating/adding chain entries, service and protocol names are
-not accepted.
+When manipulating/adding chain entries, service and protocol names
+are not accepted.
 .Pp
 Incoming packet fragments diverted by
-.Ar divert
+.Cm divert
 or
-.Ar tee
+.Cm tee
 are reassembled before delivery to the socket.
 .Pp
 Packets that match a
-.Ar tee
+.Cm tee
 rule should not be immediately accepted, but should continue
-going through the rule list.  This may be fixed in a later version.
+going through the rule list.
+This may be fixed in a later version.
 .Sh AUTHORS
 .An Ugen J. S. Antsilevich ,
 .An Poul-Henning Kamp ,
@@ -877,11 +1136,16 @@
 Daniel Boulet
 for BSDI.
 .Pp
-Work on dummynet traffic shaper supported by Akamba Corp.
+Work on
+.Xr dummynet 4
+traffic shaper supported by Akamba Corp.
 .Sh HISTORY
-.Nm Ipfw
-first appeared in
+The
+.Nm
+utility first appeared in
 .Fx 2.0 .
-.Nm dummynet
+.Xr dummynet 4
 was introduced in
-.Fx 2.2.8
+.Fx 2.2.8 .
+Stateful extensions were introduced in
+.Fx 4.0 .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipmon.8 man8/ipmon.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ipmon.8	Thu Jan 27 23:34:07 2000
+++ man8/ipmon.8	Tue Mar 21 06:30:11 2000
@@ -1,3 +1,4 @@
+.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.6 2000/02/10 03:17:50 peter Exp $
 .TH ipmon 8
 .SH NAME
 ipmon \- monitors /dev/ipl for logged packets
@@ -96,7 +97,7 @@
 .TP
 .B \-O
 Specify which log files you do not wish to read from.  This is most sensibly
-used with the \fB-a\fP.  Letters available as paramters to this are the same
+used with the \fB-a\fP.  Letters available as parameters to this are the same
 as for \fB-o\fP.
 .TP
 .B \-s
@@ -145,4 +146,4 @@
 /dev/ipstate
 .SH SEE ALSO
 ipl(4), ipf(8), ipfstat(8), ipnat(8)
-.SH BUGS
+.\".SH BUGS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdnd.8 man8/isdnd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdnd.8	Thu Jan 27 23:38:13 2000
+++ man8/isdnd.8	Tue Mar 21 06:32:31 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnd.8,v 1.27 1999/12/13 22:11:55 hm Exp $ 
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.7 1999/12/14 21:07:27 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.9 2000/03/06 09:45:32 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 22:57:10 1999]
 .\"
@@ -66,7 +66,8 @@
 If debugging support is compiled into
 .Nm isdnd
 this option is used to specify the debugging level, or better which kind 
-of debugging messages are displayed. The debugging level is the sum of the
+of debugging messages are displayed.
+The debugging level is the sum of the
 following values:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
@@ -102,14 +103,16 @@
 .It Fl f
 Specifying this option causes
 .Nm isdnd
-to enter the full-screen mode of operation. When operating in this mode,
+to enter the full-screen mode of operation.
+When operating in this mode,
 entering the control character
 .Em Control-L
 causes the display to be refreshed and entering
 .Em Carriage-Return
 or
 .Em Enter
-will pop-up a command window. Because the
+will pop-up a command window.
+Because the
 .Nm
 daemon will not listen to messages while the command window is active,
 this command window will disappear automatically after 5 seconds without
@@ -119,7 +122,8 @@
 .Em Tab
 or
 .Em Space
-advances to the next menu item. To execute a command, press
+advances to the next menu item.
+To execute a command, press
 .Em Return
 or
 .Em Enter
@@ -133,13 +137,16 @@
 .It Fl L
 Specifies the name of the logfile which is used when the option
 .Em -l
-is set. See also the keyword
+is set.
+See also the keyword
 .Em rotatesuffix
 in the system section of
 .Xr isdnd.rc 5 .
 .It Fl P
 This option prints out the parsed and verified isdnd configuration in the same
-format as the isdnd.rc file. This output can be used as an isdnd.rc file. This 
+format as the isdnd.rc file.
+This output can be used as an isdnd.rc file.
+This 
 feature is especially useful when debugging an isdnd.rc file to see, what the
 default settings of options are when they are not set in the isdnd.rc input
 file.
@@ -163,7 +170,8 @@
 This option may be used to specify the logging facility in case
 .Xr syslog 3
 logging is configured and another facility than the default LOCAL0
-facility shall be used. The facility is to be specified as an integer in
+facility shall be used.
+The facility is to be specified as an integer in
 the range 0-11 or 16-23 (see the file /usr/include/syslog.h). 
 .It Fl t
 In conjunction with the 
@@ -175,7 +183,8 @@
 specifies a terminal type or termcap entry name (such as vt220) for the device
 used for
 .Nm isdnd
-full-screen output. This is useful if an unused (no getty running) tty line is
+full-screen output.
+This is useful if an unused (no getty running) tty line is
 used for full-screen output for which no 
 .Li TERM
 environment variable exists.
@@ -187,7 +196,8 @@
 .Em cmdl .
 .It Fl m
 If the isdn daemon is compiled with local or remote monitoring support,
-this option disables all monitoring access. It overrides the config
+this option disables all monitoring access.
+It overrides the config
 file option
 .Em monitor-allowed .
 .El
@@ -274,7 +284,8 @@
 in its entry section of the configuration corresponding to that connection 
 and issues a
 .Em I4B_CONNECT_REQ
-ioctl message to the kernel. The kernel now dials the remote side and
+ioctl message to the kernel.
+The kernel now dials the remote side and
 if the remote side accepts the call, the kernel sends a
 .Em MSG_CONNECT_ACTIVE_IND
 to the daemon.
@@ -323,7 +334,8 @@
 Sending a HUP signal to 
 .Nm
 causes all open connections to be terminated and the configuration file is
-reread. In case aliasfile handling was enabled, the aliasfile is also
+reread.
+In case aliasfile handling was enabled, the aliasfile is also
 reread.
 
 Sending a USR1 signal to 
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdndebug.8 man8/isdndebug.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdndebug.8	Thu Jan 27 23:38:12 2000
+++ man8/isdndebug.8	Tue Mar 21 06:32:31 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdndebug.8,v 1.10 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.7 1999/12/14 21:07:35 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.8 2000/03/01 14:09:07 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:01:42 1999]
 .\"
@@ -72,7 +72,8 @@
 .It Fl h
 Display the HSCX error counters.
 .It Fl l
-Specify the layer for which a command applies. Default is all layers.
+Specify the layer for which a command applies.
+Default is all layers.
 .It Fl m
 Set debugging mask for the selected layer(s) to display all possible
 debugging messages (maximum output).
@@ -82,7 +83,8 @@
 Set debugging mask for the selected layer(s) to the compiled in default
 (reset).
 .It Fl s
-Set debugging mask for the selected layer(s) to value. Value can be
+Set debugging mask for the selected layer(s) to value.
+Value can be
 specified in any number base supported by
 .Xr sscanf 3 .
 .It Fl u
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdndecode.8 man8/isdndecode.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdndecode.8	Thu Jan 27 23:38:15 2000
+++ man8/isdndecode.8	Tue Mar 21 06:32:32 2000
@@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:03:21 1999]
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.7 1999/12/14 21:07:37 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.9 2000/03/01 14:09:09 sheldonh Exp $
 .\"
 .Dd September 17, 1998
 .Dt ISDNDECODE 8
@@ -73,9 +73,11 @@
 in analyzer mode by using two passive cards and a custom cable which can
 be build as described in the file
 .Em cable.txt
-in the isdn4bsd source distribution. One card acts as a receiver for the
+in the isdn4bsd source distribution.
+One card acts as a receiver for the
 transmitting direction on the S0 bus while the other card acts as a receiver
-for the receiving direction on the S0 bus. Complete traffic monitoring is
+for the receiving direction on the S0 bus.
+Complete traffic monitoring is
 possible using this setup.
 
 .It Fl b
@@ -137,7 +139,8 @@
 process, the currently used logfiles are reopened, so that logfile
 rotation becomes possible.
 .Pp
-The decode output should be obvious. It is very handy to have the following
+The decode output should be obvious.
+It is very handy to have the following
 standard texts available when tracing ISDN protocols:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
@@ -165,7 +168,7 @@
 .Pp
 will start D channel tracing on passive controller 0 with all except B
 channel tracing enabled and logs everything into the output file 
-/tmp/isdn.decode.
+/var/tmp/isdn.decode.
 
 .Sh SEE ALSO
 .Xr isdnd 8
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdnmonitor.8 man8/isdnmonitor.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdnmonitor.8	Thu Jan 27 23:38:14 2000
+++ man8/isdnmonitor.8	Tue Mar 21 06:32:32 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdnmonitor.8,v 1.8 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.7 1999/12/14 21:07:41 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.8 2000/03/01 14:09:10 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:04:25 1999]
 .\"
@@ -52,17 +52,20 @@
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
-Switch to (curses-) fullscreen mode of operation. In this mode,
+Switch to (curses-) fullscreen mode of operation.
+In this mode,
 .Nm
 behaves nearly exactly as
 .Xr isdnd 8
-in fullscreen mode. In fullscreen mode, entering the control character
+in fullscreen mode.
+In fullscreen mode, entering the control character
 .Em Control-L
 causes the display to be refreshed and entering
 .Em Carriage-Return
 or
 .Em Enter
-will pop-up a command window. Because
+will pop-up a command window.
+Because
 .Nm
 will not listen to messages while the command window is active,
 this command window will disappear automatically after 5 seconds without
@@ -72,7 +75,8 @@
 .Em Tab
 or
 .Em Space
-advances to the next menu item. To execute a command, press
+advances to the next menu item.
+To execute a command, press
 .Em Return
 or
 .Em Enter
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdntel.8 man8/isdntel.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdntel.8	Thu Jan 27 23:38:14 2000
+++ man8/isdntel.8	Tue Mar 21 06:32:32 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Mon Dec 13 23:05:59 1999]
 .\"	
-.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.7 1999/12/14 21:07:44 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.9 2000/03/06 09:45:34 sheldonh Exp $
 .\"
 .\"	$Id: isdntel.8,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
@@ -50,11 +50,14 @@
 .It Fl a
 Use 
 .Ar aliasfile
-as the pathname for an aliasfile containing aliases for phone numbers. The
+as the pathname for an aliasfile containing aliases for phone numbers.
+The
 default path is
 .Em /etc/isdn/isdntel.alias .
 The format of an alias entry is the number string followed by one or more
-spaces or tabs. The rest of the line is taken as the alias string. Comments
+spaces or tabs.
+The rest of the line is taken as the alias string.
+Comments
 are introduced by a leading blank, tab or "#" character.
 .It Fl d
 Use
@@ -71,9 +74,11 @@
 Use
 .Ar playcommand
 as the command string to execute for playing a voice message to some audio
-output facility. The characters
+output facility.
+The characters
 .Em %s
-are replaced by the currently selected filename. The default string is
+are replaced by the currently selected filename.
+The default string is
 .Em cat %s | alaw2ulaw >/dev/audio
 .It Fl t
 The value for
@@ -82,7 +87,8 @@
 when there is no keyboard activity.
 .El
 .Pp
-The screen output should be obvious. If in doubt, consult the source.
+The screen output should be obvious.
+If in doubt, consult the source.
 .Sh SEE ALSO
 .Xr isdnd 8
 .Xr isdnd.rc 5
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdntelctl.8 man8/isdntelctl.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdntelctl.8	Thu Jan 27 23:38:14 2000
+++ man8/isdntelctl.8	Tue Mar 21 06:32:32 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntelctl.8,v 1.9 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.7 1999/12/14 21:07:46 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.8 2000/03/01 14:09:13 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:06:45 1999]
 .\"
@@ -54,7 +54,8 @@
 .It Fl g
 Get the sound format currently in use.
 .It Fl u
-Set the /dev/i4btel unit number. The default value is zero to access
+Set the /dev/i4btel unit number.
+The default value is zero to access
 device /dev/i4btel0.
 .It Fl A
 Do A-law (ISDN line) -> u-law (userland) conversion.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdntrace.8 man8/isdntrace.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/isdntrace.8	Thu Jan 27 23:38:12 2000
+++ man8/isdntrace.8	Tue Mar 21 06:32:31 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	$Id: isdntrace.8,v 1.12 1999/12/13 22:11:55 hm Exp $
 .\"
-.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.7 1999/12/14 21:07:49 hm Exp $
+.\" $FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.9 2000/03/02 14:53:42 sheldonh Exp $
 .\"
 .\"	last edit-date: [Mon Dec 13 23:08:17 1999]
 .\"
@@ -75,9 +75,11 @@
 in analyzer mode by using two passive cards and a custom cable which can
 be build as described in the file
 .Em cable.txt
-in the isdn4bsd source distribution. One card acts as a receiver for the
+in the isdn4bsd source distribution.
+One card acts as a receiver for the
 transmitting direction on the S0 bus while the other card acts as a receiver
-for the receiving direction on the S0 bus. Complete traffic monitoring is
+for the receiving direction on the S0 bus.
+Complete traffic monitoring is
 possible using this setup.
 .It Fl b
 switch B channel tracing on (default off).
@@ -96,7 +98,8 @@
 switch displaying of Layer 2 (Q.921) frames off (default on).
 .It Fl n
 This option takes a numeric argument specifying the minimum 
-frame size in octetts a frame must have to be displayed. (default 0)
+frame size in octetts a frame must have to be displayed.
+(default 0)
 .It Fl o
 switch off writing trace output to a file (default on).
 .It Fl p
@@ -116,7 +119,8 @@
 analyzing (default off).
 .It Fl F
 This option can only be used when option -P (playback from binary data file)
-is used. The -F option causes playback not to stop at end of file but rather
+is used.
+The -F option causes playback not to stop at end of file but rather
 to wait for additional data to be available from the input file.
 .Pp
 This option is useful when trace data is accumulated in binary format (to
@@ -139,7 +143,8 @@
 process, the currently used logfiles are reopened, so that logfile
 rotation becomes possible.
 .Pp
-The trace output should be obvious. It is very handy to have the following
+The trace output should be obvious.
+It is very handy to have the following
 standard texts available when tracing ISDN protocols:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
@@ -150,7 +155,8 @@
 .It Ar Q.931
 ISDN D-channel layer 3 protocol description.
 .It Ar 1TR6
-German-specific ISDN layer 3 protocol description. (NOTICE: decoding
+German-specific ISDN layer 3 protocol description.
+(NOTICE: decoding
 of the 1TR6 protocol is included but not supported since i dont have
 any longer access to a 1TR6 based ISDN installation.)
 .El
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ispcvt.8 man8/ispcvt.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ispcvt.8	Thu Jan 27 23:38:20 2000
+++ man8/ispcvt.8	Tue Mar 21 06:32:34 2000
@@ -28,7 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)ispcvt.1, 3.20, Last Edit-Date: [Tue Apr  4 12:35:54 1995]
-.\" $FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.8 1999/08/28 01:17:43 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.9 2000/03/01 14:09:21 sheldonh Exp $
 .\"
 .Dd April 4, 1995
 .Dt ISPCVT 8
@@ -44,7 +44,8 @@
 The
 .Nm ispcvt
 utility allows the user to check whether the current video driver compiled
-into the kernel is a pcvt driver. The major and minor release numbers of
+into the kernel is a pcvt driver.
+The major and minor release numbers of
 the driver are also checked.
 Furthermore
 .Nm ispcvt
@@ -58,13 +59,15 @@
 .It Fl d
 Specifies a device for which the check is done.
 .It Fl v
-Specifies being verbose. On success the name and revision is reported, on
+Specifies being verbose.
+On success the name and revision is reported, on
 failure which comparison failed.
 .It Fl c
 This options prints out the values of all
 .Dq Ar PCVT_XXXXXX
 #defines which were given to the compiler at the time the currently running
-kernel was compiled. Specifying
+kernel was compiled.
+Specifying
 .Fl v
 with the
 .Fl c
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/jail.8 man8/jail.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/jail.8	Thu Jan 27 23:37:22 2000
+++ man8/jail.8	Tue Mar 21 06:32:03 2000
@@ -1,4 +1,29 @@
 .\"
+.\"Copyright (c) 2000 Robert N. M. Watson
+.\"All rights reserved.
+.\"
+.\"Redistribution and use in source and binary forms, with or without
+.\"modification, are permitted provided that the following conditions
+.\"are met:
+.\"1. Redistributions of source code must retain the above copyright
+.\"   notice, this list of conditions and the following disclaimer.
+.\"2. Redistributions in binary form must reproduce the above copyright
+.\"   notice, this list of conditions and the following disclaimer in the
+.\"   documentation and/or other materials provided with the distribution.
+.\"
+.\"THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\"ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\"ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\"OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\"SUCH DAMAGE.
+.\"
+.\"
 .\"----------------------------------------------------------------------------
 .\""THE BEER-WARE LICENSE" (Revision 42):
 .\"<phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
@@ -6,7 +31,7 @@
 .\"this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\"----------------------------------------------------------------------------
 .\"
-.\"$FreeBSD: src/usr.sbin/jail/jail.8,v 1.7 1999/12/21 11:25:10 asmodai Exp $
+.\"$FreeBSD: src/usr.sbin/jail/jail.8,v 1.13 2000/03/01 14:07:56 sheldonh Exp $
 .\"
 .Dd April 28, 1999
 .Dt JAIL 8
@@ -30,24 +55,247 @@
 .Xr jail 2
 man page for further details.
 .Sh EXAMPLES
+.Ss Setting up a Jail Directory Tree
 This shows how to setup a jail directory tree:
 .Bd -literal 
 D=/here/is/the/jail
 cd /usr/src
 make hierarchy DESTDIR=$D
 make obj
+make depend
 make all
 make install DESTDIR=$D
 cd etc
-make distribution DESTDIR=$D
+make distribution DESTDIR=$D NO_MAKEDEV=yes
 cd $D/dev
 sh MAKEDEV jail
 cd $D
 ln -sf dev/null kernel
 .Ed
+.Ss Setting Up a Jail
+Do what was described in
+.Sx Setting Up a Jail Directory Tree
+to build the jail directory tree.  For the sake of this example, we will
+assume you built it in
+.Pa /data/jail/192.168.11.100 ,
+named for the jailed IP address.  Substitute below as needed with your
+own directory, IP address, and hostname.
+.Pp
+First, you will want to set up your real system's environment to be
+.Dq jail-friendly.
+For consistency, we will refer to the parent box as the
+.Dq host environment,
+and to the jailed virtual machine as the
+.Dq jail environment.
+Because jail is implemented using IP aliases, one of the first things to do
+is to disable IP services on the host system that listen on all local
+IP addresses for a service.  This means changing inetd to only listen on the
+appropriate IP address, and so forth.  Add the following to
+.Pa /etc/rc.conf
+in the host environment:
+.Bd -literal -offset indent
+sendmail_enable="NO"
+inetd_flags="-wW -a 192.168.11.23"
+portmap_enable="NO"
+syslogd_flags="-ss"
+.Ed
+.Pp
+.Li 192.169.11.23
+is the native IP address for the host system, in this example.  Daemons that
+run out of
+.Xr inetd 8
+can be easily set to use only the specified host IP address.  Other daemons
+will need to be manually configured--for some this is possible through
+the
+.Xr rc.conf 5
+flags entries, for others it is not possible without munging
+the per-application configuration files, or even recompiling.  For those
+applications that cannot specify the IP they run on, it is better to disable
+them, if possible.
+.Pp
+A number of daemons ship with the base system that may have problems when
+run from outside of a jail in a jail-centric environment.  This includes
+.Xr syslogd 8 ,
+.Xr sendmail 8 ,
+.Xr named 8 ,
+and
+.Xr portmap 8 .
+While sendmail and named can be configured to listen only on a specific
+IP using their configuration files, in most cases it is easier to simply
+run the daemons in jails only, and not in the host environment.  Syslogd
+cannot be configured to bind only a single IP, but can be configured to
+not bind a network port, using the ``-ss'' argument.  Attempting to serve
+NFS from the host environment may also cause confusion, and cannot be
+easily reconfigured to use only specific IPs, as some NFS services are
+hosted directly from the kernel.  Any third party network software running
+in the host environment should also be checked and configured so that it
+does not bind all IP addresses, which would result in those services also
+appearing to be offered by the jail environments.
+.Pp
+Once
+these daemons have been disabled or fixed in the host environment, it is
+best to reboot so that all daemons are in a known state, to reduce the
+potential for confusion later (such as finding that when you send mail
+to a jail, and its sendmail is down, the mail is delivered to the host,
+etc.)
+.Pp
+Start any jails for the first time without configuring the network
+interface so that you can clean it up a little and set up accounts.  As
+with any machine (virtual or not) you will need to set a root password, time
+zone, etc.  Before beginning, you may want to copy
+.Xr sysinstall 8
+into the tree so that you can use it to set things up easily.  Do this using:
+.Bd -literal -offset indent
+# mkdir /data/jail/192.168.11.100/stand
+# cp /stand/sysinstall /data/jail/192.168.11.100/stand
+.Ed
+.Pp
+Now start the jail:
+.Bd -literal -offset indent
+# jail /data/jail/192.168.11.100 testhostname 192.168.11.100 /bin/sh
+.Ed
+.Pp
+You will end up with a shell prompt, assuming no errors, within the jail.  You
+can now run
+.Pa /stand/sysinstall
+and do the post-install configuration to set various configuration options,
+or perform these actions manually by editing rc.conf, etc.
+.Pp
+.Bl -bullet -offset indent -compact
+.It
+Create an empty /etc/fstab to quell startup warnings about missing fstab
+.It
+Disable the port mapper (rc.conf: portmap_enable="NO")
+.It
+Run
+.Xr newaliases 1
+to quell sendmail warnings.
+.It
+Disable interface configuration to quell startup warnings about ifconfig
+(network_interfaces="")
+.It
+Configure /etc/resolv.conf
+so that name resolution within the jail will work correctly
+.It
+Set a root password, probably different from the real host system
+.It
+Set the timezone
+.It
+Add accounts for users in the jail environment
+.It
+Install any packages that you think the environment requires
+.El
+.Pp
+You may also want to perform any package-specific configuration (web servers,
+SSH servers, etc), patch up /etc/syslog.conf so it logs as you'd like, etc.
+.Pp
+Exit from the shell, and the jail will be shut down.
+.Ss Starting the Jail
+You are now ready to restart the jail and bring up the environment with
+all of its daemons and other programs.  To do this, first bring up the
+virtual host interface, and then start the jail's
+.Pa /etc/rc
+script from within the jail.
+.Pp
+NOTE: If you plan to allow untrusted users to have root access inside the
+jail, you may wish to consider setting the jail.set_hostname_allowed to
+0.  Please see the management reasons why this is a good idea.  If you
+do decide to set this variable, it must be set before starting any jails,
+and once each boot.
+.Bd -literal -offset indent
+# ifconfig ed0 inet alias 192.168.11.100 netmask 255.255.255.255
+# mount -t procfs proc /data/jail/192.168.11.100/proc
+# jail /data/jail/192.168.11.100 testhostname 192.168.11.100 \\
+	/bin/sh /etc/rc
+.Ed
+.Pp
+A few warnings will be produced, because most
+.Xr sysctl 8
+configuration variables cannot be set from within the jail, as they are
+global across all jails and the host environment.
+However, it should all
+work properly.
+You should be able to see
+.Xr inetd 8 ,
+.Xr syslogd 8 ,
+and other processes running within the jail using
+.Xr ps 1 ,
+with the
+.Dq J
+flag appearing beside jailed processes.  You should also be able to
+telnet to the hostname or IP address of the jailed environment, and log
+in using the acounts you created previously.
+.Ss Managing the jail
+Normal machine shutdown commands, such as
+.Xr halt 8 ,
+.Xr reboot 8 ,
+and
+.Xr shutdown 8 ,
+cannot be used successfully within the jail.  To kill all processes in a
+jail, you may log into the jail and, as root, use one of the following
+commands, depending on what you want to accomplish:
+.Pp
+.Bl -bullet -offset indent -compact
+.It
+.Li kill -TERM -1
+.It
+.Li kill -KILL -1
+.El
+.Pp
+This will send the
+.Dq TERM
+or
+.Dq KILL
+signals to all processes in the jail from within the jail.  Depending on
+the intended use of the jail, you may also want to run
+.Pa /etc/rc.shutdown
+from within the jail.  Currently there is no way to insert new processes 
+into a jail, so you must first log into the jail before performing these
+actions.
+.Pp
+To kill processes from outside the jail, you must individually identify the
+PID of each process to be killed.  The
+.Pa /proc/ Ns Va pid Ns Pa /status
+file contains, as its last field, the hostname of the jail in which the
+process runs, or
+.Dq -
+to indicate that the process is not running within a jail.  The
+.Xr ps 1
+command also shows a
+.Dq J
+flag for processes in a jail.  However, the hostname for a jail may be, by
+default, modified from within the jail, so the
+.Pa /proc
+status entry is unreliably by default.  To disable the setting of the hostname
+from within a jail, set the
+.Dq Va jail.set_hostname_allowed
+sysctl variable in the host environment to 0, which will affect all jails.
+You can have this sysctl set each boot using
+.Xr sysctl.conf 5 .
+Just add the following line to sysctl.conf:
+.Bd -literal -offset indent
+jail.set_hostname_allowed=0
+.Ed
+.Pp
+In a future version of FreeBSD, the mechanisms for managing jails will be
+more refined.
 .Sh SEE ALSO
+.Xr newaliases 1 ,
+.Xr ps 1 ,
 .Xr chroot 2 ,
-.Xr jail 2
+.Xr jail 2 ,
+.Xr procfs 5 ,
+.Xr rc.conf 5 ,
+.Xr sysctl.conf 5 ,
+.Xr halt 8 ,
+.Xr inetd 8 ,
+.Xr named 8 ,
+.Xr portmap 8 ,
+.Xr reboot 8 ,
+.Xr sendmail 8 ,
+.Xr shutdown 8 ,
+.Xr sysctl 8 ,
+.Xr syslogd 8
 .Sh HISTORY
 The
 .Fn jail
@@ -58,3 +306,20 @@
 R&D Associates
 .Dq Li http://www.rndassociates.com/
 who contributed it to FreeBSD.
+.Pp
+Robert Watson wrote the extended documentation, found a few bugs, added
+a few new features, and cleaned up the userland jail environment.
+.Sh BUGS
+Jail currently lacks strong management functionality, such as the ability
+to deliver signals to all processes in a jail, and to allow access to
+specific jail information via
+.Xr ps 1
+as opposed to
+.Xr procfs 5 .
+Similarly, it might be a good idea to add an
+address alias flag such that daemons listening on all IPs (INADDR_ANY)
+will not bind on that address, which would facilitate building a safe
+host environment such that host daemons do not impose on services offered
+from within jails.  Currently, the simplist answer is to minimize services
+offered on the host, possibly limiting it to services offered from inetd
+which is easily configurable.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ldconfig.8 man8/ldconfig.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ldconfig.8	Thu Jan 27 23:34:09 2000
+++ man8/ldconfig.8	Tue Mar 21 06:30:11 2000
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.17 1999/08/28 00:13:20 peter Exp $
+.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.19 2000/03/06 09:45:27 sheldonh Exp $
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
@@ -62,7 +62,8 @@
 are ignored.
 .Pp
 The shared libraries so found will be automatically available for loading
-if needed by the program being prepared for execution. This obviates the need
+if needed by the program being prepared for execution.
+This obviates the need
 for storing search paths within the executable.
 .Pp
 The
@@ -75,7 +76,8 @@
 .Sq \:
 separated list of directory paths which are searched by
 the dynamic linker
-when it needs to load a shared library. It can be viewed as the run-time
+when it needs to load a shared library.
+It can be viewed as the run-time
 equivalent of the
 .Fl L
 switch of
@@ -108,7 +110,8 @@
 are also rescanned for new shared libraries.
 .It Fl r
 List the current contents of the hints file
-on the standard output. The hints file is not modified.  The list of
+on the standard output.
+The hints file is not modified.  The list of
 directories stored in the hints file is included.
 .It Fl s
 Do not scan the built-in system directory
@@ -120,15 +123,20 @@
 Special care must be taken when loading shared libraries into the address
 space of
 .Ev set-user-Id
-programs. Whenever such a program is run,
+programs.
+Whenever such a program is run,
 the dynamic linker
 will only load shared libraries from the hints
-file. In particular, the
+file.
+In particular, the
 .Ev LD_LIBRARY_PATH
-is not used to search for libraries. Thus, the role of ldconfig is dual. In
+is not used to search for libraries.
+Thus, the role of ldconfig is dual.
+In
 addition to building a set of hints for quick lookup, it also serves to
 specify the trusted collection of directories from which shared objects can
-be safely loaded. It is presumed that the set of directories specified to
+be safely loaded.
+It is presumed that the set of directories specified to
 .Nm ldconfig
 are under control of the system's administrator.
 .Sh ENVIRONMENT
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/lpc.8 man8/lpc.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/lpc.8	Thu Jan 27 23:37:25 2000
+++ man8/lpc.8	Tue Mar 21 06:32:04 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpc.8	8.5 (Berkeley) 4/28/95
-.\" $FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.7 1999/08/28 01:16:51 peter Exp $
+.\" $FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.8 2000/03/01 14:09:15 sheldonh Exp $
 .\"
 .Dd April 28, 1995
 .Dt LPC 8
@@ -102,7 +102,8 @@
 .It Ic down No {\ all\ |\ printer\ } message ...
 Turn the specified printer queue off, disable printing and put
 .Em message
-in the printer status file. The message doesn't need to be quoted, the
+in the printer status file.
+The message doesn't need to be quoted, the
 remaining arguments are treated like
 .Xr echo 1 .
 This is normally used to take a printer down and let others know why
@@ -143,7 +144,8 @@
 Place the jobs in the order listed at the top of the printer queue.
 .Pp
 .It Ic up  No {\ all\ |\ printer\ }
-Enable everything and start a new printer daemon. Undoes the effects of
+Enable everything and start a new printer daemon.
+Undoes the effects of
 .Ic down .
 .Sh FILES
 .Bl -tag -width /var/spool/*/lockx -compact
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/lpd.8 man8/lpd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/lpd.8	Thu Jan 27 23:37:25 2000
+++ man8/lpd.8	Tue Mar 21 06:32:04 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.13 1999/11/30 16:15:14 ache Exp $
+.\" $FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.14 2000/03/01 14:09:16 sheldonh Exp $
 .\"
 .Dd April 19, 1994
 .Dt LPD 8
@@ -50,7 +50,8 @@
 file.  It makes a single pass through the
 .Xr printcap 5
 file to find out about the existing printers and
-prints any files left after a crash. It then uses the system calls
+prints any files left after a crash.
+It then uses the system calls
 .Xr listen 2
 and
 .Xr accept 2
@@ -71,7 +72,8 @@
 .Fl l
 flag causes
 .Nm
-to log valid requests received from the network. This can be useful
+to log valid requests received from the network.
+This can be useful
 for debugging purposes.
 .It Ar "port#"
 The Internet port number used to rendezvous
@@ -82,7 +84,8 @@
 argument.
 .El
 .Pp
-Access control is provided by two means. First, all requests must come from
+Access control is provided by two means.
+First, all requests must come from
 one of the machines listed in the file
 .Pa /etc/hosts.equiv
 or
@@ -162,7 +165,8 @@
 Graph File.  The file contains data produced by
 .Xr plot 3 .
 .It c
-Cifplot File. The file contains data produced by
+Cifplot File.
+The file contains data produced by
 .Em cifplot .
 .It v
 The file contains a raster image.
@@ -178,7 +182,8 @@
 .It \&4
 Troff Font S. Name of the font file to use instead of the default.
 .It W
-Width. Changes the page width (in characters) used by
+Width.
+Changes the page width (in characters) used by
 .Xr pr 1
 and the text filters.
 .It I
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/lptcontrol.8 man8/lptcontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/lptcontrol.8	Thu Jan 27 23:38:16 2000
+++ man8/lptcontrol.8	Tue Mar 21 06:32:33 2000
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
-.\" $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.11 1999/11/27 16:54:36 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.12 2000/03/01 14:07:58 sheldonh Exp $
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
 .Os FreeBSD 2
@@ -37,7 +37,8 @@
 a mode to another, this change will only take effect
 the next time the device is opened.
 .Pp
-Extended mode is anything the parallel port interface can support. For an
+Extended mode is anything the parallel port interface can support.
+For an
 ECP/ISA parallel port, it may be FIFO+DMA or ECP.
 .Pp
 The following command line options are supported:
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mailwrapper.8 man8/mailwrapper.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mailwrapper.8	Thu Jan 27 23:37:28 2000
+++ man8/mailwrapper.8	Tue Mar 21 06:32:06 2000
@@ -1,5 +1,5 @@
 .\"	$NetBSD: mailwrapper.8,v 1.6 1999/03/25 16:40:17 is Exp $
-.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.3 1999/12/31 08:03:27 ache Exp $
+.\" $FreeBSD: src/usr.sbin/mailwrapper/mailwrapper.8,v 1.4 2000/03/01 14:07:59 sheldonh Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -38,7 +38,8 @@
 .Nm mailwrapper
 .Nd invoke appropriate MTA software based on configuration file
 .Sh SYNOPSIS
-Special. See below.
+Special.
+See below.
 .Sh DESCRIPTION
 At one time, the only Mail Transfer Agent (MTA) software easily available
 was
@@ -70,13 +71,15 @@
 .Xr mailq 1
 and
 .Xr newaliases 1
-linked to it. The program knows to behave differently when its
+linked to it.
+The program knows to behave differently when its
 .Va argv[0]
 is
 .Dq mailq
 or
 .Dq newaliases
-and behaves appropriately. Typically, replacement MTAs provide similar 
+and behaves appropriately.
+Typically, replacement MTAs provide similar 
 functionality, either through a program that also switches behavior
 based on calling name, or through a set of programs that provide
 similar functionality.
@@ -140,7 +143,8 @@
 .Sh AUTHORS
 Perry E. Metzger <perry@piermont.com>
 .Sh BUGS
-The entire reason this program exists is a crock. Instead, a command
+The entire reason this program exists is a crock.
+Instead, a command
 for how to submit mail should be standardized, and all the "behave
 differently if invoked with a different name" behavior of things like
 .Xr mailq 1
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/map-mbone.8 man8/map-mbone.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/map-mbone.8	Thu Jan 27 23:37:31 2000
+++ man8/map-mbone.8	Tue Mar 21 06:32:07 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.6 1999/08/28 23:20:48 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.7 2000/03/01 14:08:07 sheldonh Exp $
 .\"
 .Dd May 8, 1995
 .Dt MAP-MBONE 8
@@ -25,24 +25,30 @@
 .Pp
 .Nm Map-mbone
 traverses neighboring multicast routers by sending the ASK_NEIGHBORS IGMP
-message to the multicast starting_router. If this multicast router responds,
+message to the multicast starting_router.
+If this multicast router responds,
 the version number and a list of their neighboring multicast router addresses is
-part of that response. If the responding router has recent multicast version
+part of that response.
+If the responding router has recent multicast version
 number, then 
 .Nm
 requests additional information such as metrics, thresholds, and flags from the
-multicast router. For each new occurrence of neighboring multicast router in 
+multicast router.
+For each new occurrence of neighboring multicast router in 
 the reply and provided the flooding option has been selected, then 
 .Nm
-asks each of this multicast router for a list of neighbors. This search
+asks each of this multicast router for a list of neighbors.
+This search
 for unique routers will continue until no new neighboring multicast routers
 are reported.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl d
-Set the debug level. When the debug level is greater than the
-default value of 0, addition debugging messages are printed. Regardless of
+Set the debug level.
+When the debug level is greater than the
+default value of 0, addition debugging messages are printed.
+Regardless of
 the debug level, an error condition, will always write an error message and will
 cause 
 .Nm
@@ -58,7 +64,8 @@
 timeouts are printed to stderr.
 .El
 .It Fl f
-Set flooding option. Flooding allows the recursive search
+Set flooding option.
+Flooding allows the recursive search
 of neighboring multicast routers and is enable by default when starting_router
 is not used.
 .It Fl g
@@ -66,10 +73,12 @@
 .It Fl n
 Disable the DNS lookup for the multicast routers names.
 .It Fl r Ar retry_count
-Set the neighbor query retry limit. Default is 1 retry.
+Set the neighbor query retry limit.
+Default is 1 retry.
 .It Fl t Ar timeout_count
 Set the number of seconds to wait for a neighbor query
-reply before retrying. Default timeout is 2 seconds.
+reply before retrying.
+Default timeout is 2 seconds.
 .El
 .Sh IMPORTANT NOTE
 .Nm Map-mbone
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/memcontrol.8 man8/memcontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/memcontrol.8	Thu Jan 27 23:37:29 2000
+++ man8/memcontrol.8	Tue Mar 21 06:32:06 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/memcontrol/memcontrol.8,v 1.2 1999/10/09 16:37:37 chris Exp $
+.\" $FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.3 2000/03/01 14:08:00 sheldonh Exp $
 .\" 
 .Dd September 28, 1999
 .Dt MEMCONTROL 8
@@ -89,7 +89,8 @@
 .Ar write-protect
 .El
 .It Ar clear
-Clear memory range attributes. Ranges may be cleared by owner or by
+Clear memory range attributes.
+Ranges may be cleared by owner or by
 base/length combination.
 .Pp
 To clear based on ownership:
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mergemaster.8 man8/mergemaster.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mergemaster.8	Thu Jan 27 23:37:29 2000
+++ man8/mergemaster.8	Tue Mar 21 06:32:06 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/mergemaster/mergemaster.8,v 1.4 1999/10/26 19:06:31 billf Exp $
+.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.5 2000/03/01 14:08:02 sheldonh Exp $
 .\"
 .Dd September 10, 1999
 .Dt MERGEMASTER 8
@@ -54,15 +54,18 @@
 to build a temporary root environment from
 .Pa /
 down, populating that environment with the various
-files. You can specify a different source directory
+files.
+You can specify a different source directory
 with the
 .Op Fl m
 command line option.
 It then compares each file in that environment
-to its installed counterpart. When the script finds a
+to its installed counterpart.
+When the script finds a
 change in the new file, or there is no installed
 version of the new file it gives you four options to
-deal with it. You can install the new file as is,
+deal with it.
+You can install the new file as is,
 delete the new file, merge the old and new
 files (as appropriate) using
 .Xr sdiff 1
@@ -74,9 +77,11 @@
 and compares the
 .Xr cvs 1
 version $Id/$FreeBSD strings for files that have them, deleting
-the temporary file if the strings match. If there is
+the temporary file if the strings match.
+If there is
 no $Id string, or if the strings are different it
-compares the files themselves. You can
+compares the files themselves.
+You can
 also specify that the script ignore the $Id strings and
 compare every file.
 .Pp
@@ -84,13 +89,16 @@
 checks your umask and issues a warning for anything
 other than 022. While it is not mandatory to grant
 world read permissions for most configuration files, you
-may run into problems without them. If you choose a
+may run into problems without them.
+If you choose a
 umask other than 022 and experience trouble later this
 could be the cause.
 .Pa /etc/master.passwd
-is treated as a special case. If you choose to install
+is treated as a special case.
+If you choose to install
 this file or a merged version of it the file permissions
-are always 600 (rw-------) for security reasons. After
+are always 600 (rw-------) for security reasons.
+After
 installing an updated version of this file you should
 probably run
 .Xr pwd_mkdb 8
@@ -115,23 +123,29 @@
 Re-run
 .Nm
 on a previously cleaned directory, skipping the creation of
-the temporary root environment. This option is compatible
+the temporary root environment.
+This option is compatible
 with all other options.
 .It Fl v
-Be more verbose about the process. You should probably use
+Be more verbose about the process.
+You should probably use
 this option the first time you run
 .Nm mergemaster .
 This option also gives you a list of files that exist
 only in the installed version of
 .Pa /etc .
 .It Fl a
-Run automatically. This option will leave all the files that
+Run automatically.
+This option will leave all the files that
 differ from the installed versions in the temporary directory
-to be dealt with by hand. If the
+to be dealt with by hand.
+If the
 .Pa temproot
 directory exists, it creates a new one in a previously
-non-existent directory. This option unsets the verbose flag,
-but is compatible with all other options. Setting -a makes
+non-existent directory.
+This option unsets the verbose flag,
+but is compatible with all other options.
+Setting -a makes
 -w superfluous.
 .It Fl h
 Display usage and help information.
@@ -147,21 +161,25 @@
 .Pa /var/tmp/temproot .
 .It Fl d
 Add the date and time to the name of the temporary
-root directory. If -t is specified, this option must
+root directory.
+If -t is specified, this option must
 follow it if you want the date added too.
 .It Fl u Ar N
-Specify a numeric umask. The default is 022.
+Specify a numeric umask.
+The default is 022.
 .It Fl w Ar N
 Supply an alternate screen width to the
 .Xr sdiff 1
-command in numbers of columns. The default is 80.
+command in numbers of columns.
+The default is 80.
 .El
 .Sh ENVIRONMENT
 The
 .Nm
 script uses the
 .Ev PAGER
-environment variable if set. Otherwise it uses
+environment variable if set.
+Otherwise it uses
 .Xr more 1 .
 If
 .Ev PAGER
@@ -200,8 +218,10 @@
 .Pa $HOME/.mergemasterrc
 .Pp
 .Nm
-will . (source) this file if it exists. Command line options
-will override rc file options. Here is an example
+will . (source) this file if it exists.
+Command line options
+will override rc file options.
+Here is an example
 with all values commented out:
 .Pp
 .Bd -literal
@@ -273,7 +293,10 @@
 This manual page and the script itself were written by
 .An Douglas Barton Aq Doug@gorean.org .
 .Sh BUGS
-There are no known bugs. Please report any problems,
-comments or suggestions to the author. Several of the
+There are no known bugs.
+Please report any problems,
+comments or suggestions to the author.
+Several of the
 improvements to this program have come from user
-suggestions. Thank you.
+suggestions.
+Thank you.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mixer.8 man8/mixer.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mixer.8	Thu Jan 27 23:37:30 2000
+++ man8/mixer.8	Tue Mar 21 06:32:06 2000
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.8 1999/11/27 16:55:50 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.10 2000/03/01 14:08:04 sheldonh Exp $
 .\"
 .Dd January 9, 1997
 .Dt MIXER 8
@@ -47,7 +47,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command is used to set and display soundcard mixer device levels. It may
+command is used to set and display soundcard mixer device levels.
+It may
 also be used to start and stop recording from the soundcard.  The list
 of mixer devices that may be modified are:  
 .Pp
@@ -121,8 +122,7 @@
 the default mixer device
 .El
 .Sh SEE ALSO
-.Xr cdcontrol 1 ,
-.Xr cdplay 1
+.Xr cdcontrol 1
 .Sh HISTORY
 The
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mknod.8 man8/mknod.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mknod.8	Thu Jan 27 23:34:10 2000
+++ man8/mknod.8	Tue Mar 21 06:30:12 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.10 2000/01/06 17:51:45 obrien Exp $
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.11 2000/03/01 11:27:10 sheldonh Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
@@ -65,7 +65,8 @@
 .Dq pty
 for pseudo-devices.
 .It Cm b | Cm c
-Type of device. If the
+Type of device.
+If the
 device is a block type device such as a tape or disk drive which needs
 both cooked and raw special files,
 the type is
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount.8 man8/mount.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount.8	Thu Jan 27 23:34:10 2000
+++ man8/mount.8	Tue Mar 21 06:30:12 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.29 1999/09/28 15:49:47 obrien Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.31 2000/03/01 11:27:12 sheldonh Exp $
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
@@ -94,7 +94,8 @@
 command is trying to do.
 .It Fl f
 Forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only. Also
+a filesystem mount status from read-write to read-only.
+Also
 forces the R/W mount of an unclean filesystem (dangerous; use with
 caution).
 .It Fl o
@@ -123,7 +124,8 @@
 The same as
 .Fl f ;
 forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only. Also
+a filesystem mount status from read-write to read-only.
+Also
 forces the R/W mount of an unclean filesystem (dangerous; use with caution).
 .It fstab
 When used with the
@@ -135,7 +137,8 @@
 Metadata I/O should be done synchronously, while data I/O should be done
 asynchronously.  This is the default.
 .It noatime
-Do not update the file access time when reading from a file. This option
+Do not update the file access time when reading from a file.
+This option
 is useful on filesystems where there are large numbers of files and
 performance is more critical than updating the file access time (which is
 rarely ever important). This option is currently only supported on local
@@ -182,10 +185,12 @@
 the file, and it will not be given to root.
 .Pp
 This feature is designed for use on fileservers serving PC users via
-ftp, SAMBA, or netatalk. It provides security holes for shell users and as
+ftp, SAMBA, or netatalk.
+It provides security holes for shell users and as
 such should not be used on shell machines, especially on home directories.
 This option requires the SUIDDIR
-option in the kernel to work. Only UFS filesystems support this option.
+option in the kernel to work.
+Only UFS filesystems support this option.
 See
 .Xr chmod 2
 for more information.
@@ -224,7 +229,8 @@
 /sbin/mount_mfs -o nosuid -N -s 4000 /dev/dk0b /tmp
 .Ed
 .It Fl p
-Print mount information in fstab format. Implies also the
+Print mount information in fstab format.
+Implies also the
 .Fl v
 option.
 .It Fl r
@@ -361,10 +367,6 @@
 .Xr umount 8
 .Sh BUGS
 It is possible for a corrupted file system to cause a crash.
-.Pp
-Switching a filesystem back and forth between asynchronous and normal
-operation or between read/write and read/only access using ``mount
--u'' may gradually bring about severe filesystem corruption.
 .Sh CAVEATS
 After a successful mount, the permissions on the original mount point 
 determine if 
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_msdos.8 man8/mount_msdos.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_msdos.8	Thu Jan 27 23:34:11 2000
+++ man8/mount_msdos.8	Tue Mar 21 06:30:12 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/sbin/mount_msdos/mount_msdos.8,v 1.18 2000/01/08 16:47:55 ache Exp $
+.\" $FreeBSD: src/sbin/mount_msdos/mount_msdos.8,v 1.19 2000/03/01 11:27:14 sheldonh Exp $
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
@@ -128,12 +128,14 @@
 be mounted for any existing Win'95 long filenames.
 If no such entries are found, but short DOS filenames are found,
 .Fl s
-is the default. Otherwise
+is the default.
+Otherwise
 .Fl l
 is assumed.
 .It Fl 9
 Ignore the special Win'95 directory entries even
-if deleting or renaming a file. This forces
+if deleting or renaming a file.
+This forces
 .Fl s .
 .\".It Fl G
 .\"This option causes the filesystem to be interpreted as an Atari-Gemdos
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_nfs.8 man8/mount_nfs.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_nfs.8	Thu Jan 27 23:34:13 2000
+++ man8/mount_nfs.8	Tue Mar 21 06:30:13 2000
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.16 2000/01/13 21:47:18 dillon Exp $
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.18 2000/03/02 14:53:25 sheldonh Exp $
 .\""
 .Dd March 29, 1995
 .Dt MOUNT_NFS 8
@@ -92,7 +92,8 @@
 This option is not generally recommended and is really an experimental
 feature.
 .It Fl I
-Set the readdir read size to the specified value. The value should normally
+Set the readdir read size to the specified value.
+The value should normally
 be a multiple of DIRBLKSIZ that is <= the read size for the mount.
 .It Fl K
 Pass Kerberos authenticators to the server for client-to-server
@@ -115,7 +116,8 @@
 Reserved port numbers are used by default now.
 This is useful for mounting servers that require clients to use a
 reserved port number on the mistaken belief that this makes NFS
-more secure. (For the rare case where the client has a trusted root account
+more secure.
+(For the rare case where the client has a trusted root account
 but untrustworthy users and the network cables are in secure areas this does
 help, but for normal desktop clients this does not apply.)
 .It Fl R
@@ -167,7 +169,8 @@
 This option reduces RPC traffic for cases such as
 .Dq "ls -l" ,
 but tends to flood the attribute and name caches with prefetched entries.
-Try this option and see whether performance improves or degrades. Probably
+Try this option and see whether performance improves or degrades.
+Probably
 most useful for client to server network interconnects with a large bandwidth
 times delay product.
 .It Fl m
@@ -255,7 +258,8 @@
 This protocol Version 2, referred to as Not Quite Nfs (NQNFS),
 is only supported by this updated release of NFS code.
 (It is not backwards compatible with the release of NQNFS that went out on
-4.4BSD-Lite. To interoperate with a 4.4BSD-Lite NFS system you will have to
+4.4BSD-Lite.
+To interoperate with a 4.4BSD-Lite NFS system you will have to
 avoid this option until you have had an opportunity to upgrade the NFS code
 on all your 4.4BSD-Lite based systems.)
 .It Fl r
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_ntfs.8 man8/mount_ntfs.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_ntfs.8	Thu Jan 27 23:34:14 2000
+++ man8/mount_ntfs.8	Tue Mar 21 06:30:13 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/sbin/mount_ntfs/mount_ntfs.8,v 1.5 1999/08/28 00:13:32 peter Exp $
+.\" $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.6 2000/03/01 11:27:17 sheldonh Exp $
 .\"
 .Dd Jan 3, 1999
 .Dt MOUNT_NTFS 8
@@ -89,9 +89,11 @@
 .Pp
 .Sq ATTRTYPE
 is one of identifier listed in $AttrDef file of
-volume. Default is $DATA.
+volume.
+Default is $DATA.
 .Sq ATTRNAME
-is an attribute name. Default is none.
+is an attribute name.
+Default is none.
 .Sh EXAMPLES
 To mount an ntfs volume located in 
 .Pa /dev/wd1s1 :
@@ -110,7 +112,8 @@
 .Ed
 .Pp
 .Sh WRITING
-There is limited writing ability. Limitations: file must be nonresident
+There is limited writing ability.
+Limitations: file must be nonresident
 and must not contain any sparces (uninitialized areas), compressed
 files are not supported either.
 .Sh SEE ALSO
@@ -119,7 +122,8 @@
 .Xr fstab 5 ,
 .Xr mount 8
 .Sh CAVEATS
-This utility gives almost only read-only access to NTFS volume. See
+This utility gives almost only read-only access to NTFS volume.
+See
 .Sx WRITING
 section.
 .Sh HISTORY
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_nwfs.8 man8/mount_nwfs.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_nwfs.8	Thu Jan 27 23:34:27 2000
+++ man8/mount_nwfs.8	Tue Mar 21 06:30:22 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/sbin/mount_nwfs/mount_nwfs.8,v 1.5 2000/01/23 01:30:03 mpp Exp $
+.\" $FreeBSD: src/sbin/mount_nwfs/mount_nwfs.8,v 1.7 2000/03/02 13:14:16 sheldonh Exp $
 .Dd Oct 14, 1999
 .Dt MOUNT_NWFS 8
 .Os FreeBSD 4.0
@@ -29,19 +29,24 @@
 .Sh DESCRIPTION
 The
 .Nm
-command allows to mount volume from a NetWare server. It may use either
+command allows to mount volume from a NetWare server.
+It may use either
 existing connection or create new: if no usable connection was found
-it will try to establish a new one. Connection has count of references to it,
-so when last mount will be dismounted connection will be closed. It is
+it will try to establish a new one.
+Connection has count of references to it,
+so when last mount will be dismounted connection will be closed.
+It is
 possible to create connection without any mounts (but use it for them) with
 .Xr ncplogin 1 .
 .Pp
-Note two forms of command line. In the first form, server and user specified
+Note two forms of command line.
+In the first form, server and user specified
 via 
 .Fl S
 and
 .Fl U
-options respectively. In the second form server and user specified in
+options respectively.
+In the second form server and user specified in
 .Ar special
 part of 
 .Xr mount 8
@@ -59,7 +64,8 @@
 The options are:
 .Bl -tag -width indent
 .It Fl S Ar server
-Name of NetWare server to connect. For native IP you will need also
+Name of NetWare server to connect.
+For native IP you will need also
 .Fl A
 option.
 .It Fl U Ar user
@@ -69,7 +75,8 @@
 .Xr ncplogin 1
 for details.
 .It Fl V Ar volume
-Volume name to mount. Volume name can also be specified after all options and
+Volume name to mount.
+Volume name can also be specified after all options and
 before
 .Ar mount-point .
 .It Ar node
@@ -80,29 +87,34 @@
 option which affects on name representation.
 .Ar Case 
 can be one of the following:
-.Bd -literal -offset indent
-Value   Meaning
-l	All existing file names converted to lower case. 
-	Newly created file gets a lower case under OS2 name
-	space. This is default when mounting volumes with DOS
-	name space.
-L	Same as 'l' but file system tries to be case
-	insensitive. May not work well.
-n	No case conversion is performed. 
-	Warning! Warning!: use this option with DOS name
-	space only as a last resort, because creating a lower
-	case name in the DOS name space can lead to an
-	unpredictable results. This is default when mounting
-	volume with OS2 name space.
-u	All existing file names converted to upper case.
-	Newly created file gets an upper case under OS2 name
-	space.
-U	Same as 'u' but file system tries to be case
-	insensitive. May not work well.
-.Ed
+.Bl -tag -width "ValueXX"
+.It Em Value
+.Em Meaning
+.It l
+All existing file names converted to lower case. 
+Newly created file gets a lower case under OS2 name space.
+This is the default when mounting volumes with DOS name space.
+.It L
+Same as 'l' but file system tries to be case insensitive.
+May not work well.
+.It n
+No case conversion is performed. 
+.Em Warning!
+Use this option with DOS name space only as a last resort,
+because creating a lower case name in the DOS name space
+can lead to unpredictable results.
+This is the default when mounting volumes with OS2 name space.
+.It u
+All existing file names converted to upper case.
+Newly created file gets an upper case under OS2 name space.
+.It U
+Same as 'u' but file system tries to be case insensitive.
+May not work well.
+.El
 .It Fl f Ar mode , Fl d Ar mode
 Specify permissions that should be assigned to files and directories.
-The values must be specified as octal numbers. Default value for the file mode
+The values must be specified as octal numbers.
+Default value for the file mode
 is taken from mount point, default value for the dir mode adds execute
 permission where the file mode gives read permission.
 
@@ -117,10 +129,12 @@
 .It Fl v
 Print version number.
 .It Fl u Ar uid , Fl g Ar gid
-User id and group id assigned to files. The default is owner and group id from
+User id and group id assigned to files.
+The default is owner and group id from
 directory where volume is mounted.
 .It Fl l Ar locale
-Set the locale for case conversion. By default
+Set the locale for case conversion.
+By default
 .Nm
 tries to use an environment variable
 .Ev LC_* .
@@ -133,21 +147,24 @@
 .Ar koi2cp866 
 and 
 .Ar asis 
-can be here. Please note, that scheme should be enabled at compile 
+can be here.
+Please note, that scheme should be enabled at compile 
 time in
 .Pa config.mk
 file.
 .It Fl M Ar mode
 See 
 .Xr ncplogin 1 
-for details. If this option is omitted, connection permissions
+for details.
+If this option is omitted, connection permissions
 assumed the same as directory mode
 .Pf ( Fl d Ns ) option.
 .El
 .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.
 .El
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_portal.8 man8/mount_portal.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mount_portal.8	Thu Jan 27 23:34:15 2000
+++ man8/mount_portal.8	Tue Mar 21 06:30:13 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" $FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.7 1999/08/28 00:13:36 peter Exp $
+.\" $FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.8 2000/03/01 11:27:20 sheldonh Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
@@ -97,12 +97,15 @@
 The
 .Pa tcplisten
 namespace takes a slash separated hostname and port and creates a TCP/IP
-socket bound to the given hostname-port pair. The hostname may be
-specified as "ANY" to allow any other host to connect to the socket. A
+socket bound to the given hostname-port pair.
+The hostname may be
+specified as "ANY" to allow any other host to connect to the socket.
+A
 port number of 0 will dynamically allocate a port, this can be
 discovered by calling
 .Xr getsockname 2
-with the returned file descriptor. Privileged ports can only be bound to
+with the returned file descriptor.
+Privileged ports can only be bound to
 by the super-user.
 The
 .Pa tcp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/moused.8 man8/moused.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/moused.8	Thu Jan 27 23:37:30 2000
+++ man8/moused.8	Tue Mar 21 06:32:07 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/moused/moused.8,v 1.26 1999/12/17 10:05:36 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.27 2000/03/01 14:08:06 sheldonh Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSED 8
@@ -81,19 +81,22 @@
 .Pp
 If the mouse daemon receives the signal 
 .Dv SIGHUP ,
-it will reopen the mouse port and reinitializes itself. Useful if
+it will reopen the mouse port and reinitializes itself.
+Useful if
 the mouse is attached/detached while the system is suspended.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl 3
-Emulate the third (middle) button for 2-button mice. It is emulated
+Emulate the third (middle) button for 2-button mice.
+It is emulated
 by pressing the left and right physical buttons simultaneously.
 .It Fl C Ar threshold
 Set double click speed as the maximum interval in msec between button clicks.
 Without this option, the default value of 500 msec will be assumed.
 This option will have effect only on the cut and paste operations 
-in the text mode console. The user program which is reading mouse data
+in the text mode console.
+The user program which is reading mouse data
 via 
 .Xr sysmouse 4
 won't be affected.
@@ -128,9 +131,11 @@
 .Ar mousesystems
 is selected as the protocol type by the
 .Fl t
-option below. It is often used with the 
+option below.
+It is often used with the 
 .Fl D
-option above. Both RTS and DTR lines may need to be dropped for 
+option above.
+Both RTS and DTR lines may need to be dropped for 
 a 3-button mouse to operate in the
 .Ar mousesystems
 mode.
@@ -139,7 +144,8 @@
 Not all serial mice support this option.
 .It Fl c
 Some mice report middle button down events
-as if the left and right buttons are pressed. This option handles this.
+as if the left and right buttons are pressed.
+This option handles this.
 .It Fl d
 Enable debugging messages.
 .It Fl f
@@ -159,7 +165,8 @@
 .It Ar if
 Interface type: serial, bus, inport or ps/2.
 .It Ar type
-Protocol type. It is one of the types listed under the 
+Protocol type.
+It is one of the types listed under the 
 .Fl t
 option below or 
 .Ar sysmouse
@@ -186,7 +193,8 @@
 .Ar N.
 You may specify as many instances of this option as you like.
 More than one physical button may be assigned to a logical button at the
-same time. In this case the logical button will be down, 
+same time.
+In this case the logical button will be down, 
 if either of the assigned physical buttons is held down.
 Do not put space around `='.
 .It Fl p Ar port
@@ -325,7 +333,8 @@
 and 
 .Ar N+1 
 down events respectively when negative and positive Z axis movement 
-is detected. There doesn't need to be physical buttons 
+is detected.
+There doesn't need to be physical buttons 
 .Ar N
 and 
 .Ar N+1 .
@@ -401,7 +410,8 @@
 .Nm
 command by the
 .Fl t
-option. You have to make a guess and try.
+option.
+You have to make a guess and try.
 There is rule of thumb:
 .Pp
 .Bl -tag -compact -width 1.X
@@ -425,7 +435,8 @@
 .It 5.
 3-button serial mice may work with the
 .Ar mousesystems
-protocol. If it doesn't, it may work with the 
+protocol.
+If it doesn't, it may work with the 
 .Ar microsoft
 protocol although 
 the third (middle) button won't function.
@@ -457,8 +468,10 @@
 .Dl moused -f -p Ar _selected_port_ -t Ar _selected_protocol_
 .Pp
 and see if the mouse pointer travels correctly
-according to the mouse movement. Then try cut & paste features by
-clicking the left, right and middle buttons. Type ^C to stop
+according to the mouse movement.
+Then try cut & paste features by
+clicking the left, right and middle buttons.
+Type ^C to stop
 the command.
 .Ss Multiple Mice
 As many instances of the mouse daemon as the number of mice attached to
@@ -475,7 +488,8 @@
 When the serial mouse is not attached, the corresponding mouse daemon
 won't detect any movement or button state change and the application
 program will only see mouse data coming from the daemon for the
-PS/2 mouse. In contrast when both mice are attached and both of them
+PS/2 mouse.
+In contrast when both mice are attached and both of them
 are moved at the same time in this configuration,
 the mouse pointer will travel across the screen just as if movement of 
 the mice is combined all together.
@@ -553,7 +567,8 @@
 the user `taps' the surface of the pad.
 In contrast, some ALPS GlidePoint and Interlink VersaPad models 
 treat the tapping action 
-as fourth button events. Use the option ``-m 1=4'' for these models
+as fourth button events.
+Use the option ``-m 1=4'' for these models
 to obtain the same effect as the other pad devices.
 .Pp
 Cut and paste functions in the virtual console assume that there
@@ -589,7 +604,8 @@
 in order to support PnP serial mice.
 However, due to various degrees of conformance to the specification by 
 existing serial mice, it does not strictly follow the version 1.0 of the
-standard. Even with this less strict approach, 
+standard.
+Even with this less strict approach, 
 it may not always determine an appropriate protocol type 
 for the given serial mouse.
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mrinfo.8 man8/mrinfo.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mrinfo.8	Thu Jan 27 23:37:31 2000
+++ man8/mrinfo.8	Tue Mar 21 06:32:07 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.8 1999/08/28 23:20:48 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.9 2000/03/01 14:08:08 sheldonh Exp $
 .\"
 .Dd May 8, 1995
 .Dt MRINFO 8
@@ -18,20 +18,25 @@
 .Ar multicast_router .
 .Pp
 .Nm Mrinfo
-uses the ASK_NEIGHBORS IGMP message to the specified multicast router. If this
+uses the ASK_NEIGHBORS IGMP message to the specified multicast router.
+If this
 multicast router responds, the version number and a list of their neighboring
-multicast router addresses is part of that response. If the responding router
+multicast router addresses is part of that response.
+If the responding router
 has a recent multicast version number, then 
 .Nm
 requests additional information such as metrics, thresholds, and flags from the
-multicast router. Once the specified multicast router responds, the
+multicast router.
+Once the specified multicast router responds, the
 configuration is displayed to the standard output.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar debug_level
-Set the debug level. When the debug level is greater than the
-default value of 0, addition debugging messages are printed. Regardless of
+Set the debug level.
+When the debug level is greater than the
+default value of 0, addition debugging messages are printed.
+Regardless of
 the debug level, an error condition, will always write an error message and will
 cause 
 .Nm
@@ -47,10 +52,12 @@
 timeouts are printed to stderr.
 .El
 .It Fl r Ar retry_count
-Set the neighbor query retry limit. Default is 3 retries.
+Set the neighbor query retry limit.
+Default is 3 retries.
 .It Fl t Ar timeout_count
 Set the number of seconds to wait for a neighbor query
-reply. Default timeout is 4 seconds.
+reply.
+Default timeout is 4 seconds.
 .El
 .Sh SAMPLE OUTPUT
 .nf
@@ -63,8 +70,10 @@
 .fi
 .Pp
 For each neighbor of the queried multicast router, the IP of the queried router
-is displayed, followed by the IP and name of the neighbor. In square brackets
-the metric (cost of connection), the treashold (multicast ttl) is displayed. If
+is displayed, followed by the IP and name of the neighbor.
+In square brackets
+the metric (cost of connection), the treashold (multicast ttl) is displayed.
+If
 the queried multicast router has a newer version number, the type (tunnel,
 srcrt) and status (disabled, down) of the connection is displayed.
 .Sh IMPORTANT NOTE
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mrouted.8 man8/mrouted.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/mrouted.8	Thu Jan 27 23:37:31 2000
+++ man8/mrouted.8	Tue Mar 21 06:32:07 2000
@@ -1,6 +1,6 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
 .\"
-.\" $FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.15 1999/08/28 23:20:48 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.16 2000/03/01 14:08:08 sheldonh Exp $
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
@@ -23,12 +23,15 @@
 .Pp
 .Nm Mrouted 
 forwards a multicast datagram along a shortest (reverse) path tree
-rooted at the subnet on which the datagram originates. The multicast
+rooted at the subnet on which the datagram originates.
+The multicast
 delivery tree may be thought of as a broadcast delivery tree that has
 been pruned back so that it does not extend beyond those subnetworks
-that have members of the destination group. Hence, datagrams
+that have members of the destination group.
+Hence, datagrams
 are not forwarded along those branches which have no listeners of the
-multicast group. The IP time-to-live of a multicast datagram can be
+multicast group.
+The IP time-to-live of a multicast datagram can be
 used to limit the range of multicast datagrams.
 .Pp
 In order to support multicasting among subnets that are separated by (unicast)
@@ -74,7 +77,8 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl c Ar config_file
-Specify an alternative file for configuration commands. Default is
+Specify an alternative file for configuration commands.
+Default is
 .Pa /etc/mrouted.conf .
 .It Fl d Op Ar debug_level
 If no
@@ -291,7 +295,8 @@
 .It boundary Ar "boundary-name|scoped-addr/mask-len"
 The boundary option allows an interface
 to be configured as an administrative boundary for the specified
-scoped address. Packets belonging to this address will not
+scoped address.
+Packets belonging to this address will not
 be forwarded on a scoped interface.  The boundary option accepts either
 a name or a boundary spec.  This command may be specified several times
 on an interface in order to describe multiple boundaries.
@@ -493,8 +498,10 @@
 .Nm
 is the one responsible for sending periodic group
 membership queries on the vif 0 and vif 1 subnets, as indicated by the
-"querier" flags. The list of boundaries indicate the scoped addresses on that
-interface. A count of the no. of incoming and outgoing packets is also
+"querier" flags.
+The list of boundaries indicate the scoped addresses on that
+interface.
+A count of the no. of incoming and outgoing packets is also
 shown at each interface.
 .Pp
 Associated with each subnet from which a multicast datagram can originate
@@ -507,7 +514,8 @@
 outgoing vif only if there are members of the destination group on that leaf.
 .Pp
 .Nm Mrouted 
-also maintains a copy of the kernel forwarding cache table. Entries
+also maintains a copy of the kernel forwarding cache table.
+Entries
 are created and deleted by 
 .Nm mrouted .
 .Pp
@@ -545,16 +553,21 @@
 The 'Ivif' field indicates the
 incoming vif for multicast packets from that origin.  Each router also
 maintains a record of the number of prunes received from neighboring
-routers for a particular source and group. If there are no members of
+routers for a particular source and group.
+If there are no members of
 a multicast group on any downward link of the multicast tree for a
-subnet, a prune message is sent to the upstream router. They are
+subnet, a prune message is sent to the upstream router.
+They are
 indicated by a "P" after the vif number.
 .Pp
 The Forwvifs field shows the
 interfaces along which datagrams belonging to the source-group are
-forwarded. A "p" indicates that no datagrams are being forwarded along
-that interface. An unlisted interface is a leaf subnet with no
-members of the particular group on that subnet. A "b" on an interface
+forwarded.
+A "p" indicates that no datagrams are being forwarded along
+that interface.
+An unlisted interface is a leaf subnet with no
+members of the particular group on that subnet.
+A "b" on an interface
 indicates that it is a boundary interface, i.e. traffic will not be
 forwarded on the scoped address on that interface.
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/natd.8 man8/natd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/natd.8	Thu Jan 27 23:34:16 2000
+++ man8/natd.8	Tue Mar 21 06:30:14 2000
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" $FreeBSD: src/sbin/natd/natd.8,v 1.25 1999/10/30 19:33:41 mpp Exp $
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.27 2000/03/01 11:27:22 sheldonh Exp $
 .Dd 15 April 1997
 .Os FreeBSD
 .Dt NATD 8
@@ -46,7 +46,7 @@
 with
 .Xr divert 4
 sockets under FreeBSD.  It is intended for use with NICs - if you want
-to do NAT on a PPP link, use the -alias switch to
+to do NAT on a PPP link, use the -nat switch to
 .Xr ppp 8 .
 
 .Pp
@@ -142,7 +142,8 @@
 
 .It Fl redirect_address Ar localIP publicIP
 Redirect traffic for public IP address to a machine on the local
-network. This function is known as "static NAT". Normally static NAT
+network.
+This function is known as "static NAT". Normally static NAT
 is useful if your ISP has allocated a small block of IP addresses to you,
 but it can even be used in the case of single address:
 
@@ -277,32 +278,42 @@
 sign will mark the rest of the line as a comment.
 
 .It Fl reverse
-Reverse operation of natd. This can be useful in some 
+Reverse operation of natd.
+This can be useful in some 
 transparent proxying situations when outgoing traffic
 is redirected to the local machine and natd is running on the
 incoming interface (it usually runs on the outgoing interface).
 
 .It Fl proxy_only
 Force natd to perform transparent proxying
-only. Normal address translation is not performed.
+only.
+Normal address translation is not performed.
 
 .It Fl proxy_rule Ar [type encode_ip_hdr|encode_tcp_stream] port xxxx server a.b.c.d:yyyy
-Enable transparent proxying. Packets with the given port going through this
+Enable transparent proxying.
+Packets with the given port going through this
 host to any other host are redirected to the given server and port.
-Optionally, the original target address can be encoded into the packet. Use 
+Optionally, the original target address can be encoded into the packet.
+Use 
 .Dq encode_ip_hdr
 to put this information into the IP option field or
 .Dq encode_tcp_stream
 to inject the data into the beginning of the TCP stream.
 
 .It Fl pptpalias Ar localIP
-Allow PPTP packets to go to the defined localIP address. PPTP is a VPN or secure
-IP tunneling technology being developed primarily by Microsoft. For its encrypted traffic,
-it uses an old IP encapsulation protocol called GRE (47). This
-natd option will translate any traffic of this protocol to a
-single, specified IP address. This would allow either one client or one server 
-to be serviced with natd. If you are setting up a server, don't forget to allow the TCP traffic
-for the PPTP setup. For a client or server, you must allow GRE (protocol 47) if you have firewall lists active.
+Allow PPTP packets to go to the defined localIP address.
+PPTP is a VPN or secure
+IP tunneling technology being developed primarily by Microsoft.
+For its encrypted traffic,
+it uses an old IP encapsulation protocol called GRE (47).
+This natd option will translate any traffic of this protocol to a
+single, specified IP address.
+This would allow either one client or one server 
+to be serviced with natd.
+If you are setting up a server, don't forget to allow the TCP traffic
+for the PPTP setup.
+For a client or server,
+you must allow GRE (protocol 47) if you have firewall lists active.
 
 .El
 
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/newfs.8 man8/newfs.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/newfs.8	Thu Jan 27 23:34:17 2000
+++ man8/newfs.8	Tue Mar 21 06:30:14 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.24 2000/01/23 01:30:05 mpp Exp $
+.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.26 2000/03/01 11:27:24 sheldonh Exp $
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
@@ -346,12 +346,14 @@
 The boot code of
 .Fx
 assumes that the file system that carries the
-kernel has blocks of 8 kilobytes and fragments of 1 kilobyte. You will
+kernel has blocks of 8 kilobytes and fragments of 1 kilobyte.
+You will
 not be able to boot from a file system that uses another size.
 .Sh SEE ALSO
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
+.Xr camcontrol 8 ,
 .Xr disklabel 8 ,
 .Xr diskpart 8 ,
 .Xr dumpfs 8 ,
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/newfs_msdos.8 man8/newfs_msdos.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/newfs_msdos.8	Thu Jan 27 23:34:17 2000
+++ man8/newfs_msdos.8	Tue Mar 21 06:30:14 2000
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.6 1999/08/28 00:13:52 peter Exp $
+.\" $FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.7 2000/03/01 11:27:25 sheldonh Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
@@ -111,7 +111,8 @@
 .It Fl m Ar media
 Media descriptor (acceptable range 0xf0 to 0xff).
 .It Fl n Ar FATs
-Number of FATs.  Acceptable values are 1 to 16 inclusive. The default
+Number of FATs.  Acceptable values are 1 to 16 inclusive.
+The default
 is 2.
 .It Fl o Ar hidden
 Number of hidden sectors.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/newsyslog.8 man8/newsyslog.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/newsyslog.8	Thu Jan 27 23:37:34 2000
+++ man8/newsyslog.8	Tue Mar 21 06:32:08 2000
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.22 1999/11/27 16:57:27 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.23 2000/03/01 14:08:09 sheldonh Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
@@ -224,7 +224,8 @@
 properly.
 .It Ar signal_number
 This optional field specifies
-the signal number will be sent to the daemon process. By default
+the signal number will be sent to the daemon process.
+By default
 a SIGHUP will be sent.
 .El
 .Sh OPTIONS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/nextboot.8 man8/nextboot.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/nextboot.8	Thu Jan 27 23:34:28 2000
+++ man8/nextboot.8	Tue Mar 21 06:30:22 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.10 1999/08/28 00:13:06 peter Exp $
+.\" $FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.11 2000/03/01 11:27:47 sheldonh Exp $
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
@@ -21,9 +21,11 @@
 controls the actions of the boot blocks at the time of the next boot.
 If compiled with the correct option,
 the boot blocks will check the nameblock for a magic number and a 
-default name to use for booting. If compiled to do so they will also 
+default name to use for booting.
+If compiled to do so they will also 
 delete the name from the block, ensuring that if the boot should fail,
-then it will not be tried again. It is the job of
+then it will not be tried again.
+It is the job of
 .Pa /etc/rc
 to use 
 .Nm
@@ -36,7 +38,8 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl b
-Is used for bootstrapping (initially configuring) the nameblock. Without
+Is used for bootstrapping (initially configuring) the nameblock.
+Without
 this, 
 .Nm
 will refuse to write to a block that does not already contain the magic
@@ -57,15 +60,19 @@
 .Sh DESCRIPTION
 .Nm Nextboot
 first checks that the disk has an fdisk table and checks that none of the 
-partitions defined in that table include the nameblock. If the name block is 
+partitions defined in that table include the nameblock.
+If the name block is 
 shown to be unused, it will install the bootstrings given as arguments,
 one after the other, each preceded by a small magic number, and NULL
-terminated. The end of the list of strings is delimited by a sequence of 
-0xff bytes. If the boot blocks are compiled to write back the nameblock
+terminated.
+The end of the list of strings is delimited by a sequence of 
+0xff bytes.
+If the boot blocks are compiled to write back the nameblock
 after each boot, it will zero out the supplied names as it uses them,
 one per boot,
 until it reaches the 0xff, at which time it will revert to the compiled in
-boot string. At this time the nameblock will contain only zeroed out names.
+boot string.
+At this time the nameblock will contain only zeroed out names.
 .Pp
 An example of usage might be:
 .Bd -literal
@@ -78,12 +85,15 @@
 boot the kernel
 .Pa /kernel.old
 off the IDE drive.  (Assuming the write-back option were enabled) If this
-in turn failed. The compiled in default would be used.
+in turn failed.
+The compiled in default would be used.
 .Pp
 If the write-back feature is disabled, the nextboot program is a convenient way
-to change the default boot string. Note, that should the file specified in
+to change the default boot string.
+Note, that should the file specified in
 the nameblock be non-existent, then the name compiled into the boot blocks
-will be used for the boot rather than the next name in the nameblock. The 
+will be used for the boot rather than the next name in the nameblock.
+The 
 nameblock is only consulted
 .Em once
 per boot.
@@ -96,7 +106,8 @@
 .Pp
 The entire program should be made more user-friendly.
 The option of whether to write back or not should be stored on the
-disk and not a compile time option. I want to rethink this at some 
+disk and not a compile time option.
+I want to rethink this at some 
 later stage to make it co-exist with disks that do not have
 a fdisk partitioning table (i.e. purely disklabel'd systems).
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/nfsd.8 man8/nfsd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/nfsd.8	Thu Jan 27 23:34:18 2000
+++ man8/nfsd.8	Tue Mar 21 06:30:15 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\" $FreeBSD: src/sbin/nfsd/nfsd.8,v 1.11 2000/01/13 21:47:20 dillon Exp $
+.\" $FreeBSD: src/sbin/nfsd/nfsd.8,v 1.12 2000/03/01 11:27:27 sheldonh Exp $
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
@@ -75,7 +75,8 @@
 Specifies how many servers to create.
 .It Fl h Ar bindip
 Specifies which IP address or hostname to bind to on the local host.
-This option is recommended when a host has multiple interfaces. Multiple
+This option is recommended when a host has multiple interfaces.
+Multiple
 .Fl h
 options may be specified.
 .It Fl a
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ng_pptpgre.8 man8/ng_pptpgre.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ng_pptpgre.8	Thu Jan 27 23:35:25 2000
+++ man8/ng_pptpgre.8	Tue Mar 21 06:31:02 2000
@@ -32,7 +32,7 @@
 .\" 
 .\" Author: Archie Cobbs <archie@whistle.com>
 .\"
-.\" $FreeBSD: src/sys/modules/netgraph/pptpgre/ng_pptpgre.8,v 1.3 1999/12/21 01:25:17 julian Exp $
+.\" $FreeBSD: src/sys/modules/netgraph/pptpgre/ng_pptpgre.8,v 1.4 2000/03/10 20:38:24 archie Exp $
 .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $
 .\"
 .Dd November 29, 1999
@@ -40,7 +40,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm ng_pptpgre
-.Nd PPP protocol netgraph node type
+.Nd PPTP GRE protocol netgraph node type
 .Sh SYNOPSIS
 .Fd #include <netgraph/ng_pptpgre.h>
 .Sh DESCRIPTION
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ngctl.8 man8/ngctl.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ngctl.8	Thu Jan 27 23:37:35 2000
+++ man8/ngctl.8	Tue Mar 21 06:32:08 2000
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.4 1999/12/21 01:25:01 julian Exp $
+.\" $FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.5 2000/03/01 14:08:10 sheldonh Exp $
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -56,7 +56,8 @@
 flag is given, no
 command is supplied on the command line, and standard input is a tty,
 .Nm
-will enter interactive mode. Otherwise
+will enter interactive mode.
+Otherwise
 .Nm
 will execute the supplied command(s) and exit immediately.
 .Pp
@@ -83,7 +84,8 @@
 .It Fl n Ar nodename
 Assign
 .Em nodename
-to the newly created netgraph node. The default name is
+to the newly created netgraph node.
+The default name is
 .Em ngctlXXX
 where XXX is the process ID number.
 .It Fl d
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/nos-tun.8 man8/nos-tun.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/nos-tun.8	Thu Jan 27 23:34:18 2000
+++ man8/nos-tun.8	Tue Mar 21 06:30:15 2000
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\" 
-.\" $FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.5 2000/01/23 01:30:05 mpp Exp $
+.\" $FreeBSD: src/sbin/nos-tun/nos-tun.8,v 1.6 2000/03/01 11:27:29 sheldonh Exp $
 .\" 
 .Dd April 11, 1998
 .Dt NOS-TUN 8
@@ -54,7 +54,8 @@
 end, a concept cisco doesn't really implement.
 .Pp
 .Ar Protocol number
-sets tunnel mode. Original KA9Q NOS uses 94 but many peoples use 4
+sets tunnel mode.
+Original KA9Q NOS uses 94 but many peoples use 4
 in worldwide backbone of ampr.org.
 .Pp
 .Ar Target
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ntpd.8 man8/ntpd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ntpd.8	Thu Jan 27 23:37:36 2000
+++ man8/ntpd.8	Tue Mar 21 06:32:09 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.3 2000/01/13 10:03:53 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpd.8,v 1.4 2000/02/10 13:15:47 sheldonh Exp $
 .\"
 .Dd January 10, 2000
 .Dt NTPD 8
@@ -9,7 +9,7 @@
 .Nd Network Time Protocol (NTP) daemon
 .Sh SYNOPSIS
 .Nm ntpd
-.Op Fl aAbdm
+.Op Fl aAbdgmx
 .Op Fl c Ar conffile
 .Op Fl f Ar driftfile
 .Op Fl k Ar keyfile
@@ -118,7 +118,10 @@
 Normally, the daemon exits
 if the offset exceeds a 1000 s sanity limit.
 This option overrides this limit
-and allows the time to be set to any value without restriction.
+and allows the time to be set to any value without restriction;
+however, this can happen only once.
+After that,
+the daemon will exit if the limit is exceeded.
 .It Fl k Ar keyfile
 Specify the name and path of the file
 containing the NTP authentication keys.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ntpq.8 man8/ntpq.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ntpq.8	Thu Jan 27 23:37:36 2000
+++ man8/ntpq.8	Tue Mar 21 06:32:09 2000
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.2 2000/01/13 09:59:55 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/ntp/doc/ntpq.8,v 1.3 2000/03/01 14:09:17 sheldonh Exp $
 .\"
 .Dd January 7, 2000
 .Dt NTPQ 8
@@ -54,7 +54,8 @@
 makes one attempt to retransmit requests, and will time requests out if
 the remote host is not heard from within a suitable timeout time.
 .Pp
-Command line options are described following. Specifying a command line
+Command line options are described following.
+Specifying a command line
 option other than
 .Fl i
 or
@@ -151,7 +152,8 @@
 .Ic readlist
 and
 .Ic writelist
-commands described below. The
+commands described below.
+The
 .Ic addvars
 command allows variables and their optional values to be added to the
 list.
@@ -249,7 +251,8 @@
 transform non-ASCII data into a printable (but barely understandable)
 form.
 .It Ic timeout Ar milliseconds
-Specify a timeout period for responses to server queries. The default
+Specify a timeout period for responses to server queries.
+The default
 is about 5000 milliseconds.
 Note that since
 .Nm
@@ -382,7 +385,8 @@
 Like the
 .Ic readvar
 command except the query is done for each of a range of (nonzero)
-association IDs. This range is determined from the association list
+association IDs.
+This range is determined from the association list
 cached by the most recent
 .Ic associations
 command.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pam_radius.8 man8/pam_radius.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pam_radius.8	Thu Jan 27 23:30:15 2000
+++ man8/pam_radius.8	Tue Mar 21 06:28:10 2000
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.2 1999/08/28 00:05:20 peter Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.3 2000/03/02 09:14:21 sheldonh Exp $
 .\"
 .Dd August 2, 1999
 .Dt pam_radius 8
@@ -85,7 +85,8 @@
 specifies a user whose
 .Xr passwd 5
 entry will be used as a template to create the session environment
-if the supplied username doesn't exist in local password database. The user
+if the supplied username doesn't exist in local password database.
+The user
 will be authenticated with the supplied username and password, but his
 credentials to the system will be presented as the ones for
 .Ar username ,
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pccardc.8 man8/pccardc.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pccardc.8	Thu Jan 27 23:37:40 2000
+++ man8/pccardc.8	Tue Mar 21 06:32:11 2000
@@ -26,7 +26,7 @@
 .\"
 .\" Translated to English by Hiroki Sato <hrs@geocities.co.jp>
 .\"
-.\" $FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.6 1999/12/02 19:31:28 imp Exp $
+.\" $FreeBSD: src/usr.sbin/pccard/pccardc/pccardc.8,v 1.7 2000/03/01 14:09:18 sheldonh Exp $
 .\"
 .Dd November 14, 1998
 .Dt PCCARDC 8
@@ -171,7 +171,8 @@
 .Pp
 .Bl -tag -width Ds
 .It Ar 0
-turn OFF a power supply. If a card becomes unstable when it is removed at
+turn OFF a power supply.
+If a card becomes unstable when it is removed at
 activate state,
 this can force it to turn into inactive state first and remove it safely.
 .It Ar 1
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pccardd.8 man8/pccardd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pccardd.8	Thu Jan 27 23:37:41 2000
+++ man8/pccardd.8	Tue Mar 21 06:32:11 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/pccard/pccardd/pccardd.8,v 1.16 1999/08/28 01:17:36 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.17 2000/03/01 14:09:19 sheldonh Exp $
 .\"
 .Dd November 1, 1994
 .Dt PCCARDD 8
@@ -82,7 +82,8 @@
 If the attach succeeds, then specific shell commands
 may be executed to configure the device, such as
 .Xr ifconfig 8
-to set up a network interface. Separate commands may be specified
+to set up a network interface.
+Separate commands may be specified
 for each card, driver or device, and are executed in that order.
 .El
 .Pp
@@ -91,7 +92,8 @@
 detects that a card has been removed, the following sequence occurs:
 .Bl -enum
 .It
-The shell commands associated with card removal are executed. These
+The shell commands associated with card removal are executed.
+These
 are intended to reset any device associated with the removed card.
 Separate commands may exist for card, driver and device instances.
 .It
@@ -100,15 +102,18 @@
 .Pp
 Once a card/driver instance is configured, the resources
 bound to that instance are remembered, and if the card is removed
-and reinserted, the same driver is allocated. The primary reason
+and reinserted, the same driver is allocated.
+The primary reason
 is that once a driver is associated with a card, the
 driver's
 .Fn probe
 routine has been called, and this usually causes driver specific
 data areas to be initialized with the I/O ports or memory resources
-allocated to the card. Most drivers are not designed to be
+allocated to the card.
+Most drivers are not designed to be
 disassociated from the hardware and then reassociated with different
-parameters. This will change significantly when loadable kernel
+parameters.
+This will change significantly when loadable kernel
 modules are supported.
 .Pp
 The start options understood by
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pciconf.8 man8/pciconf.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pciconf.8	Thu Jan 27 23:37:41 2000
+++ man8/pciconf.8	Tue Mar 21 06:32:11 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.7 1999/11/27 16:59:06 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.8 2000/03/01 14:08:12 sheldonh Exp $
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
@@ -71,16 +71,19 @@
 The third column gives the contents of the subvendorid register, introduced 
 in revision 2.1 of the 
 .Tn PCI
-standard. It is 0 for most current (2.0)
+standard.
+It is 0 for most current (2.0)
 .Tn PCI
 cards, but is supposed to be loaded with a unique card identification code
 in newly developed 
 .Tn PCI 
-cards. The field consists of the card ID in the upper
+cards.
+The field consists of the card ID in the upper
 half and the card vendor ID in the lower half of the value.
 .Pp
 The fourth column contains the chip device ID, which identifies the chip 
-this card is based on. It consists of two fields, identifying the chip and 
+this card is based on.
+It consists of two fields, identifying the chip and 
 its vendor, as above.
 The fifth column prints the chip's revision.
 The sixth column describes the header type. 
@@ -88,7 +91,8 @@
 .Tn PCI
 to
 .Tn PCI
-bridges, and 1 for such bridge chips. If the most significant bit
+bridges, and 1 for such bridge chips.
+If the most significant bit
 of the header type register is set for 
 function 0 of a 
 .Tn PCI 
@@ -185,7 +189,8 @@
 .Fl a
 and
 .Fl r
-options. But only root will be able to execute a 
+options.
+But only root will be able to execute a 
 .Nm kldload
 to provide the device with a driver KLD, and reading of configuration space
 registers may cause a failure in badly designed 
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ping.8 man8/ping.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ping.8	Thu Jan 27 23:34:19 2000
+++ man8/ping.8	Tue Mar 21 06:30:15 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/ping/ping.8,v 1.24 2000/01/20 20:48:48 billf Exp $
+.\" $FreeBSD: src/sbin/ping/ping.8,v 1.25 2000/03/01 11:27:30 sheldonh Exp $
 .\"
 .Dd March 1, 1997
 .Dt PING 8
@@ -79,9 +79,11 @@
 bytes used to fill out the packet.  The options are as follows:
 .Bl -tag -width indent
 .It Fl a
-Audible. Include a bell
+Audible.
+Include a bell
 .Pq ASCII 0x07
-character in the output when any packet is received. This option is ignored
+character in the output when any packet is received.
+This option is ignored
 if other format options are present.
 .It Fl c Ar count
 Stop after sending
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ping6.8 man8/ping6.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ping6.8	Thu Jan 27 23:34:19 2000
+++ man8/ping6.8	Tue Mar 21 06:30:15 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: ping6.8,v 1.4 1999/10/07 05:29:03 itojun Exp $
-.\"	$FreeBSD: src/sbin/ping6/ping6.8,v 1.1 1999/12/28 02:36:59 shin Exp $
+.\"	$FreeBSD: src/sbin/ping6/ping6.8,v 1.3 2000/03/02 14:53:26 sheldonh Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
@@ -52,14 +52,16 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Fl A
-Enables transport-mode IPsec authentication header. (experimental)
+Enables transport-mode IPsec authentication header.
+(experimental)
 .It Fl a Ar addrtype
 Generate ICMPv6 Node Information Node Addresses query, rather than echo-request.
 .Ar addrtype
 must be a string constructed of the following charaters.
 .Bl -tag -width Ds -compact
 .It Ic a
-requires all the responder's unicast addresses. If the charater is ommited,
+requires all the responder's unicast addresses.
+If the charater is ommited,
 only those addresses which belong to the interface which has the
 responder's address are required.
 .It Ic g
@@ -69,11 +71,14 @@
 .It Ic l
 requires responder's link-local addresses.
 .It Ic A
-requires responder's anycast addresses. Without this character, the responder
-will return unicast addresses only. With this character, the responder
+requires responder's anycast addresses.
+Without this character, the responder
+will return unicast addresses only.
+With this character, the responder
 will return anycast addresses only.
 Note that the specification does not specify how to get responder's
-anycast addresses. This is an experimental option.
+anycast addresses.
+This is an experimental option.
 .El
 .It Fl b Ar bufsiz
 Set socket buffer size.
@@ -88,7 +93,8 @@
 .Dv SO_DEBUG
 option on the socket being used.
 .It Fl E
-Enables transport-mode IPsec encapsulated security payload. (experimental)
+Enables transport-mode IPsec encapsulated security payload.
+(experimental)
 .It Fl f
 Flood ping.
 Outputs packets as fast as they come back or one hundred times per second,
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/portmap.8 man8/portmap.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/portmap.8	Thu Jan 27 23:37:43 2000
+++ man8/portmap.8	Tue Mar 21 06:32:13 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)portmap.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.6 1999/08/28 01:18:10 peter Exp $
+.\" $FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.7 2000/03/02 18:15:46 cwt Exp $
 .\"
 .Dd June 6, 1993
 .Dt PORTMAP 8
@@ -81,6 +81,12 @@
 .Tn RPC
 servers are invoked.
 .Pp
+.Nm Portmap
+uses
+.Xr hosts_access 5 
+access control by default.  
+Access control patterns may only reference IP addresses.
+.Pp
 Normally
 .Nm
 forks and dissociates itself from the terminal
@@ -98,9 +104,10 @@
 and causes errors and debugging information
 to be printed to the standard error output.
 .It Fl v
-Enable verbose logging access control checks.
+Enable verbose logging of access control checks.
 .El
 .Sh SEE ALSO
+.Xr hosts_access 5 ,
 .Xr inetd.conf 5 ,
 .Xr inetd 8 ,
 .Xr rpcinfo 8
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ppp.8 man8/ppp.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ppp.8	Fri Jan 28 00:25:07 2000
+++ man8/ppp.8	Tue Mar 21 07:54:32 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.207 2000/01/07 03:11:56 brian Exp $
+.\" $FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.209 2000/03/02 14:53:35 sheldonh Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
@@ -853,7 +853,8 @@
 .Pa /etc/ppp/ppp.conf
 to use.  It must contain the
 .Dq set ifaddr
-command to define the remote peers IP address. (refer to
+command to define the remote peers IP address.
+(refer to
 .Pa /usr/share/examples/ppp/ppp.conf.sample )
 .Bd -literal -offset indent
 # ppp -auto pmdemand
@@ -911,7 +912,8 @@
 .Bl -tag -width attempts -compact
 .It Ar secs
 is the number of seconds to wait before attempting
-to connect again. If the argument is the literal string
+to connect again.
+If the argument is the literal string
 .Sq Li random ,
 the delay period is a random value between 1 and 30 seconds inclusive.
 .It Ar inc
@@ -980,7 +982,8 @@
 .Nm
 in
 .Fl auto
-mode on both ends of the link. If each end has the same timeout,
+mode on both ends of the link.
+If each end has the same timeout,
 both ends wind up calling each other at the same time if the link
 drops and both ends have packets queued.
 At some locations, the serial link may not be reliable, and carrier
@@ -1421,7 +1424,8 @@
 .Nm
 host as the gateway for the LAN.
 .Sh PACKET FILTERING
-This implementation supports packet filtering. There are four kinds of
+This implementation supports packet filtering.
+There are four kinds of
 filters; the
 .Em in
 filter, the
@@ -1635,13 +1639,15 @@
 version 2.3.*.
 .Sh CONTROLLING IP ADDRESS
 .Nm
-uses IPCP to negotiate IP addresses. Each side of the connection
+uses IPCP to negotiate IP addresses.
+Each side of the connection
 specifies the IP address that it's willing to use, and if the requested
 IP address is acceptable then
 .Nm
 returns ACK to the requester.  Otherwise,
 .Nm
-returns NAK to suggest that the peer use a different IP address. When
+returns NAK to suggest that the peer use a different IP address.
+When
 both sides of the connection agree to accept the received request (and
 send ACK), IPCP is set to the open state and a network level connection
 is established.
@@ -2704,7 +2710,7 @@
 With this option enabled,
 .Nm
 will pass traffic for old interface addresses through the NAT engine
-.Pq see Xr libalias 5 ,
+.Pq see Xr libalias 3 ,
 resulting in the ability (in
 .Fl auto
 mode) to properly connect the process that caused the PPP link to
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pppd.8 man8/pppd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pppd.8	Fri Jan 28 00:25:28 2000
+++ man8/pppd.8	Tue Mar 21 07:54:40 2000
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" $FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.19 1999/08/28 01:19:07 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.20 2000/03/03 09:11:26 sheldonh Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -58,7 +58,8 @@
 except that qualifiers which are inappropriate for a PPP link, such as
 \fBether\fR and \fBarp\fR, are not permitted.  Generally the filter
 expression should be enclosed in single-quotes to prevent whitespace
-in the expression from being interpreted by the shell. This option
+in the expression from being interpreted by the shell.
+This option
 only available
 if both the kernel and pppd were compiled with PPP_FILTER defined.
 .TP
@@ -136,7 +137,8 @@
 serial device to ensure exclusive access to the device.
 .TP
 .B mru \fIn
-Set the MRU [Maximum Receive Unit] value to \fIn\fR. Pppd
+Set the MRU [Maximum Receive Unit] value to \fIn\fR.
+Pppd
 will ask the peer to send packets of no more than \fIn\fR bytes.  The
 minimum MRU value is 128.  The default MRU value is 1500.  A value of
 296 is recommended for slow links (40 bytes for TCP/IP header + 256
@@ -305,55 +307,74 @@
 the IPX protocol will not be started.
 .TP
 .B ipx-node \fIn\fB:\fIm
-Set the IPX node numbers. The two node numbers are separated from each
-other with a colon character. The first number \fIn\fR is the local
-node number. The second number \fIm\fR is the peer's node number. Each
-node number is a hexadecimal number, at most 10 digits long. The node
-numbers on the ipx-network must be unique. There is no valid
-default. If this option is not specified then the node numbers are
+Set the IPX node numbers.
+The two node numbers are separated from each
+other with a colon character.
+The first number \fIn\fR is the local
+node number.
+The second number \fIm\fR is the peer's node number.
+Each
+node number is a hexadecimal number, at most 10 digits long.
+The node
+numbers on the ipx-network must be unique.
+There is no valid
+default.
+If this option is not specified then the node numbers are
 obtained from the peer.
 .TP
 .B ipx-router-name \fI<string>
-Set the name of the router. This is a string and is sent to the peer
+Set the name of the router.
+This is a string and is sent to the peer
 as information data.
 .TP
 .B ipx-routing \fIn
-Set the routing protocol to be received by this option. More than one
-instance of \fIipx-routing\fR may be specified. The '\fInone\fR'
-option (0) may be specified as the only instance of ipx-routing. The
+Set the routing protocol to be received by this option.
+More than one
+instance of \fIipx-routing\fR may be specified.
+The '\fInone\fR'
+option (0) may be specified as the only instance of ipx-routing.
+The
 values may be \fI0\fR for \fINONE\fR, \fI2\fR for \fIRIP/SAP\fR, and
 \fI4\fR for \fINLSP\fR.
 .TP
 .B ipxcp-accept-local
 Accept the peer's NAK for the node number specified in the ipx-node
-option. If a node number was specified, and non-zero, the default is
-to insist that the value be used. If you include this option then you
+option.
+If a node number was specified, and non-zero, the default is
+to insist that the value be used.
+If you include this option then you
 will permit the peer to override the entry of the node number.
 .TP
 .B ipxcp-accept-network
 Accept the peer's NAK for the network number specified in the
-ipx-network option. If a network number was specified, and non-zero, the
-default is to insist that the value be used. If you include this
+ipx-network option.
+If a network number was specified, and non-zero, the
+default is to insist that the value be used.
+If you include this
 option then you will permit the peer to override the entry of the node
 number.
 .TP
 .B ipxcp-accept-remote
 Use the peer's network number specified in the configure request
-frame. If a node number was specified for the peer and this option was
+frame.
+If a node number was specified for the peer and this option was
 not specified, the peer will be forced to use the value which you have
 specified.
 .TP
 .B ipxcp-max-configure \fIn
 Set the maximum number of IPXCP configure request frames which the
-system will send to \fIn\fR. The default is 10.
+system will send to \fIn\fR.
+The default is 10.
 .TP
 .B ipxcp-max-failure \fIn
 Set the maximum number of IPXCP NAK frames which the local system will
-send before it rejects the options. The default value is 3.
+send before it rejects the options.
+The default value is 3.
 .TP
 .B ipxcp-max-terminate \fIn
 Set the maximum nuber of IPXCP terminate request frames before the
-local system considers that the peer is not listening to them. The
+local system considers that the peer is not listening to them.
+The
 default value is 3.
 .TP
 .B kdebug \fIn
@@ -574,7 +595,8 @@
 expression should be enclosed in single-quotes to prevent whitespace
 in the expression from being interpreted by the shell.  Note that it
 is possible to apply different constraints to incoming and outgoing
-packets using the \fBinbound\fR and \fBoutbound\fR qualifiers. This
+packets using the \fBinbound\fR and \fBoutbound\fR qualifiers.
+This
 option is currently only available under NetBSD, and then only if both
 the kernel and pppd were compiled with PPP_FILTER defined.
 .TP
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pppstats.8 man8/pppstats.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pppstats.8	Thu Jan 27 23:37:46 2000
+++ man8/pppstats.8	Tue Mar 21 06:32:14 2000
@@ -1,4 +1,4 @@
-.\"	@(#) $FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.9 1999/08/28 01:19:11 peter Exp $
+.\"	@(#) $FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.10 2000/03/03 09:11:28 sheldonh Exp $
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
@@ -99,7 +99,8 @@
 option is specified.
 .TP
 .B NON-VJ
-The total number of non-TCP packets received by this interface. Only
+The total number of non-TCP packets received by this interface.
+Only
 reported when the
 .B -v
 option is specified.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/prefix.8 man8/prefix.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/prefix.8	Thu Jan 27 23:37:46 2000
+++ man8/prefix.8	Tue Mar 21 06:32:14 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: prefix.8,v 1.1.1.1 1999/08/08 23:31:13 itojun Exp $
-.\"	$FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.1 1999/12/28 02:37:06 shin Exp $
+.\"	$FreeBSD: src/usr.sbin/prefix/prefix.8,v 1.2 2000/03/12 19:50:11 shin Exp $
 .\"
 .Dd October 10, 1998
 .Dt PREFIX 8
@@ -102,7 +102,7 @@
 Specify that
 .Ar len
 bits are reserved as identifier for IPv6 sub-networks in
-.Ar prefix.
+.Ar prefix .
 The
 .Ar len
 must be integer, and for syntactical reason it must be between 0 to 128.
@@ -145,11 +145,11 @@
 .Cm add|change|setglobal
 command, as decimal bit number.
 .It Cm up_keeplen Ar use_prefix_keeplen
-Specify the midium part of
+Specify the medium part of
 .Ar use_prefix
 just next to the starting part specified by
-.Ar use_prefix_uselen
-, as decimal bit number.
+.Ar use_prefix_uselen ,
+as decimal bit number.
 Contiguous bits part in the same bit position of an existent prefix
 matched with
 .Ar match_prefix
@@ -171,7 +171,7 @@
 Valid value for
 .Ar time
 is same as for
-.Cm pltime.
+.Cm pltime .
 .It Cm raf_auto
 Enable the autonomous address auto configuration for the prefix to be
 added.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/procctl.8 man8/procctl.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/procctl.8	Thu Jan 27 23:37:46 2000
+++ man8/procctl.8	Tue Mar 21 06:32:14 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.6 2000/01/23 02:09:52 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.7 2000/02/21 11:05:56 ru Exp $
 .Dd Nov 23, 1997
 .Dt PROCCTL 8
 .Os FreeBSD
@@ -6,12 +6,12 @@
 .Nm procctl
 .Nd clear procfs event flags
 .Sh SYNOPSIS
-.Nm procctl
-.Ar command
-.Op Ar ...
+.Nm
+.Ar pid ...
 .Sh DESCRIPTION
-.Nm Procctl
-clears the
+The
+.Nm
+command clears the
 .Xr procfs 5
 event mask used by
 .Xr truss 1 .
@@ -19,7 +19,7 @@
 the
 .Xr procfs 5
 events result in a non-killable process.
-The options are a list of process ID's;
+The arguments are a list of process IDs;
 .Nm
 goes through the list and clears the event masks for each specified process.
 .Sh SEE ALSO
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pw.8 man8/pw.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pw.8	Thu Jan 27 23:37:47 2000
+++ man8/pw.8	Tue Mar 21 06:32:15 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/pw/pw.8,v 1.17 1999/08/28 01:19:18 peter Exp $
+.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.19 2000/03/02 14:53:37 sheldonh Exp $
 .\"
 .Dd December 9, 1996
 .Dt PW 8
@@ -203,7 +203,8 @@
 .Ar show ,
 or
 .Ar next
-in any order. (For example,
+in any order.
+(For example,
 .Ar showuser , 
 .Ar usershow , 
 .Ar show user , and
@@ -450,7 +451,8 @@
 field in the user's passwd record.
 This field is not currently used, but will be used in the future to specify a
 .Em termcap
-entry like tag. See
+entry like tag.
+See
 .Xr passwd 5
 for details.
 .It Fl h Ar fd
@@ -628,7 +630,8 @@
 .Pp
 The
 .Ar userdel
-command has only three valid options. The
+command has only three valid options.
+The
 .Ql Fl n Ar name
 and
 .Ql Fl u Ar uid
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pwd_mkdb.8 man8/pwd_mkdb.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/pwd_mkdb.8	Thu Jan 27 23:37:47 2000
+++ man8/pwd_mkdb.8	Tue Mar 21 06:32:15 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.14 1999/12/02 16:39:13 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.15 2000/03/01 14:08:18 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt PWD_MKDB 8
@@ -67,7 +67,8 @@
 The options are as follows:
 .Bl -tag -width flag
 .It Fl C
-Check if the password file is in the correct format. Do not
+Check if the password file is in the correct format.
+Do not
 change, add, or remove any files.
 .It Fl N
 Tell
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/quotacheck.8 man8/quotacheck.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/quotacheck.8	Thu Jan 27 23:34:20 2000
+++ man8/quotacheck.8	Tue Mar 21 06:30:16 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.5 1999/09/06 20:55:28 mph Exp $
+.\" $FreeBSD: src/sbin/quotacheck/quotacheck.8,v 1.6 2000/03/01 11:27:33 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
@@ -121,7 +121,8 @@
 .Nm Quotacheck
 is normally run at boot time from the
 .Pa /etc/rc
-file. The rc startup procedure is controlled by the 
+file.
+The rc startup procedure is controlled by the 
 .Pa /etc/rc.conf
 variable 
 .Ar check_quotas .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rc.8 man8/rc.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rc.8	Thu Jan 27 23:34:56 2000
+++ man8/rc.8	Tue Mar 21 06:30:42 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/share/man/man8/rc.8,v 1.8 1999/08/28 00:21:01 peter Exp $
+.\" $FreeBSD: src/share/man/man8/rc.8,v 1.9 2000/03/03 14:05:02 sheldonh Exp $
 .\"
 .Dd December 11, 1993
 .Dt RC 8
@@ -115,7 +115,8 @@
 .Pp
 .Nm Rc.firewall
 is used to configure rules for the kernel based firewall
-service. It has several possible options:
+service.
+It has several possible options:
 .Pp
 .Bl -tag -width "fBfilename" -compact -offset indent
 .It open
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/reboot.8 man8/reboot.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/reboot.8	Thu Jan 27 23:34:20 2000
+++ man8/reboot.8	Tue Mar 21 06:30:16 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/sbin/reboot/reboot.8,v 1.9 2000/01/10 12:24:47 phantom Exp $
+.\" $FreeBSD: src/sbin/reboot/reboot.8,v 1.10 2000/03/01 11:27:35 sheldonh Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
@@ -83,7 +83,8 @@
 This option should probably not be used.
 .It Fl p
 The system will turn off the power
-if it can. This is of course likely to make 
+if it can.
+This is of course likely to make 
 .Nm
 rather similar to 
 .Nm halt .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/restore.8 man8/restore.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/restore.8	Thu Jan 27 23:34:21 2000
+++ man8/restore.8	Tue Mar 21 06:30:16 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: src/sbin/restore/restore.8,v 1.17 2000/01/10 12:27:33 phantom Exp $
+.\" $FreeBSD: src/sbin/restore/restore.8,v 1.20 2000/03/01 11:27:37 sheldonh Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
@@ -42,32 +42,32 @@
 .Sh SYNOPSIS
 .Nm restore
 .Fl i
-.Op Fl chkmuvy
+.Op Fl chkmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm restore
 .Fl R
-.Op Fl ckuvy
+.Op Fl ckNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm restore
 .Fl r
-.Op Fl ckuvy
+.Op Fl ckNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm restore
 .Fl t
-.Op Fl chkuvy
+.Op Fl chkNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Op file ...
 .Nm restore
 .Fl x
-.Op Fl chkmuvy
+.Op Fl chkmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
@@ -188,7 +188,8 @@
 mounted and the user
 .Xr cd Ns 'd
 into the pristine file system
-before starting the restoration of the initial level 0 backup. If the
+before starting the restoration of the initial level 0 backup.
+If the
 level 0 restores successfully, the
 .Fl r
 flag may be used to restore
@@ -312,6 +313,11 @@
 This is useful if only a few files are being extracted,
 and one wants to avoid regenerating the complete pathname
 to the file.
+.It Fl N
+Do the extraction normally, but do not actually write any changes 
+to disk.
+This can be used to check the integrity of dump media 
+or other test purposes.
 .It Fl s Ar fileno
 Read from the specified
 .Ar fileno
@@ -419,7 +425,6 @@
 .El
 .Sh SEE ALSO
 .Xr dump 8 ,
-.Xr ft 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr rmt 8
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rndcontrol.8 man8/rndcontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rndcontrol.8	Thu Jan 27 23:38:21 2000
+++ man8/rndcontrol.8	Tue Mar 21 06:32:35 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.12 2000/01/23 02:09:58 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.13 2000/03/01 14:08:20 sheldonh Exp $
 .\"
 .Dd October 20, 1995
 .Dt RNDCONTROL 8
@@ -40,7 +40,8 @@
 The
 .Nm
 command is used to set which interrupts are used to help randomise
-the ``pool of entropy'' maintained by the kernel. The 
+the ``pool of entropy'' maintained by the kernel.
+The 
 .Pa /dev/random
 and
 .Pa /dev/urandom
@@ -54,12 +55,14 @@
 .It Fl s  Ar n
 Allow IRQ
 .Ar n
-to be used as a source of randomness. This option may be repeated for
+to be used as a source of randomness.
+This option may be repeated for
 more than one IRQ.
 .It Fl c  Ar n
 Stop IRQ
 .Ar n
-from being used as a source of randomness. This option may be repeated for
+from being used as a source of randomness.
+This option may be repeated for
 more than one IRQ.
 .El
 .Pp
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rpc.umntall.8 man8/rpc.umntall.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rpc.umntall.8	Thu Jan 27 23:37:51 2000
+++ man8/rpc.umntall.8	Tue Mar 21 06:32:16 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.8,v 1.4 2000/01/15 14:28:14 green Exp $
+.\" $FreeBSD: src/usr.sbin/rpc.umntall/rpc.umntall.8,v 1.6 2000/03/06 09:45:35 sheldonh Exp $
 .\"
 .Dd November 17, 1999
 .Dt RPC.UMNTALL 8
@@ -49,11 +49,14 @@
 .Re
 It uses remote procedure calls to remove mount entries from
 .Pa /var/db/mountdtab
-on the remote NFS server. It is called automatically
+on the remote NFS server.
+It is called automatically
 without any parameters during startup and shutdown of
-the system. This ensures that
+the system.
+This ensures that
 .Xr showmount 8
-does not display old and expired entries. The
+does not display old and expired entries.
+The
 .Nm
 command
 is only needed on client side, where
@@ -62,7 +65,8 @@
 .Pa /var/db/mounttab ,
 and
 .Xr umount 8
-removes the entry again. The
+removes the entry again.
+The
 .Nm
 command
 cares about all remaining entries in this table which result from crashes
@@ -76,19 +80,26 @@
 (seconds) are removed from
 .Pa /var/db/mounttab .
 This may be the case
-for DNS changes or long out of service periods. Default expire time
+for DNS changes or long out of service periods.
+Default expire time
 is 86400 seconds (one day).
 .It Fl h Ar host
-Only remove the specific hostname. Send a UMNTALL RPC to the NFS server.
+Only remove the specific hostname.
+Send a UMNTALL RPC to the NFS server.
 .It Fl k
-Keep entries for existing NFS filesystems. Compare the NFS filesystems from
+Keep entries for existing NFS filesystems.
+Compare the NFS filesystems from
 the mounttab against the kernel mountlist and do not send the RPC to
-existing mount entries. Useful during startup of the system. It may be
+existing mount entries.
+Useful during startup of the system.
+It may be
 possible that there are already mounted NFS filesystems, so calling
-RPC UMOUNT isn't a good idea. This is the case if the user has rebooted
+RPC UMOUNT isn't a good idea.
+This is the case if the user has rebooted
 to 'single user mode' and starts up the system again.
 .It Fl p Ar path
-Only remove the specific mount-path. Send a UMOUNT RPC to the NFS server.
+Only remove the specific mount-path.
+Send a UMOUNT RPC to the NFS server.
 This option implies the
 .Fl host
 option.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rpc.yppasswdd.8 man8/rpc.yppasswdd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rpc.yppasswdd.8	Thu Jan 27 23:37:51 2000
+++ man8/rpc.yppasswdd.8	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/rpc.yppasswdd/rpc.yppasswdd.8,v 1.10 1999/08/28 01:19:40 peter Exp $
+.\" $FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.12 2000/03/02 14:53:37 sheldonh Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
@@ -72,16 +72,19 @@
 .Nm
 server allows a normal NIS user to change
 his or her NIS password, full name (also
-known as 'GECOS' field) or shell. These updates are typically done using
+known as 'GECOS' field) or shell.
+These updates are typically done using
 the
 .Xr yppasswd 1 ,
 .Xr ypchfn 1 ,
 .Xr ypchsh 1 ,
 or
 .Xr ypchpass 1
-commands. (Some administrators don't want users to be able to change their
+commands.
+(Some administrators don't want users to be able to change their
 full name information or shells; the server can be invoked with option flags
-that disallow such changes.) When the server receives an update request,
+that disallow such changes.)
+When the server receives an update request,
 it compares the address of the client making the request against the
 .Pa securenets
 rules outlined in
@@ -102,9 +105,11 @@
 .Pa /var/yp/master.passwd )
 and then runs the
 .Pa /usr/libexec/yppwupdate
-script to rebuild the NIS maps. (This script has two arguments passed
+script to rebuild the NIS maps.
+(This script has two arguments passed
 to it: the absolute pathname of the password template that was modified
-and the name of the domain that is to be updated. These in turn are
+and the name of the domain that is to be updated.
+These in turn are
 passed to
 .Pa /var/yp/Makefile ) .
 .Pp
@@ -113,7 +118,8 @@
 version of
 .Nm
 also allows the super-user on the NIS master server to perform more
-sophisticated updates on the NIS passwd maps. The super-user can modify
+sophisticated updates on the NIS passwd maps.
+The super-user can modify
 any field in any user's master.passwd entry in any domain, and can
 do so without knowing the user's existing NIS password (when the server
 receives a request from the super-user, the password authentication
@@ -159,39 +165,46 @@
 choose one domain as a default.
 It will try to use the system default domain name as set by the
 .Xr domainname 1
-command for this default. However,
+command for this default.
+However,
 if the system domain name is not
 set, a default domain must be specified on
-the command line. If the system default domain is set,
+the command line.
+If the system default domain is set,
 then this option can be used to override it.
 .It Fl p Ar path
 This option can be used to override the default path to
 the location of the NIS
-map databases. The compiled-in default path is
+map databases.
+The compiled-in default path is
 .Pa /var/yp .
 .It Fl s
 Disallow changing of shell information.
 .It Fl f
 Disallow changing of full name ('GECOS') information.
 .It Fl a
-Allow additions to be made to the NIS passwd databases. The super-user on the
+Allow additions to be made to the NIS passwd databases.
+The super-user on the
 NIS master server is permitted to use the
 .Xr ypchpass 1
 command to perform unrestricted modifications to any field in a user's
 .Pa master.passwd
-map entry. When
+map entry.
+When
 .Nm
 is started with this flag, it will also allow the super-user to add new
 records to the NIS passwd maps, just as is possible when using
 .Xr chpass 1
 to modify the local password database.
 .It Fl m
-Turn on multi-domain mode. Even though
+Turn on multi-domain mode.
+Even though
 .Xr ypserv 8
 can handle several simultaneous domains, most implementations of
 .Nm
 can only operate on a single NIS domain, which is generally the same as
-the system default domain of the NIS master server. The
+the system default domain of the NIS master server.
+The
 .Bx Free
 .Nm
 attempts to overcome this problem in spite of the inherent limitations
@@ -199,18 +212,22 @@
 .Pa yppasswd
 protocol, which does not allow for a
 .Pa domain
-argument in client requests. In multi-domain mode,
+argument in client requests.
+In multi-domain mode,
 .Nm
 will search through all the passwd maps of all the domains it
 can find under
 .Pa /var/yp
 until it finds an entry that matches the user information specified in
-a given update request. (Matches are determined by checking the username,
-UID and GID fields.) The matched entry and corresponding domain are then
+a given update request.
+(Matches are determined by checking the username,
+UID and GID fields.)
+The matched entry and corresponding domain are then
 used for the update.
 .Pp
 Note that in order for multi-domain mode to work, there have to be
-seperate template files for each domain. For example, if a server
+seperate template files for each domain.
+For example, if a server
 supports three domains,
 .Pa foo ,
 .Pa bar ,
@@ -232,26 +249,33 @@
 if it can't find it.
 .Pp
 Multi-domain mode is off by default since it can fail if there are
-duplicate or near-duplicate user entries in different domains. The server
+duplicate or near-duplicate user entries in different domains.
+The server
 will abort an update request if it finds more than one user entry that
-matches its search criteria. Even so, paranoid administrators
+matches its search criteria.
+Even so, paranoid administrators
 may wish to leave multi-domain mode disabled.
 .It Fl i
 If
 .Nm
-is invoked with this flag, it will perform map updates in place. This
+is invoked with this flag, it will perform map updates in place.
+This
 means that instead of just modifying the password template file and
 starting a map update, the server will modify the map databases
-directly. This is useful when the password maps are large: if, for
+directly.
+This is useful when the password maps are large: if, for
 example, the password database has tens of thousands of entries, it
-can take several minutes for a map update to complete. Updating the
+can take several minutes for a map update to complete.
+Updating the
 maps in place reduces this time to a few seconds.
 .It Fl v
-Turn on verbose logging mode. The server normally only logs messages
+Turn on verbose logging mode.
+The server normally only logs messages
 using the
 .Xr syslog 3
 facility when it encounters an error condition, or when processing
-updates for the super-user on the NIS master server. Running the server
+updates for the super-user on the NIS master server.
+Running the server
 with the
 .Fl v
 flag will cause it to log informational messages for all updates.
@@ -268,16 +292,19 @@
 By default,
 .Nm
 expects to receive requests from clients using reserved ports; requests
-received from non-privileged ports are rejected. Unfortunately, this
+received from non-privileged ports are rejected.
+Unfortunately, this
 behavior prevents any client systems that to not use privileged
-ports from sucessfully submitting password updates. Specifying
+ports from sucessfully submitting password updates.
+Specifying
 the
 .Fl u
 flag to
 .Nm
 disables the privileged port check so that it will work with
 .Xr yppasswd 1
-clients that don't use privileged ports. This reduces security to
+clients that don't use privileged ports.
+This reduces security to
 a certain small degree, but it might be necessary in cases where it
 is not possible to change the client behavior.
 .It Fl h
@@ -308,7 +335,8 @@
 As listed in the yppasswd.x protocol definition, the YPPASSWDPROC_UPDATE
 procedure takes two arguments: a V7-style passwd structure containing
 updated user information and the user's existing unencrypted (cleartext)
-password. Since
+password.
+Since
 .Nm
 is supposed to handle update requests from remote NIS client machines,
 this means that
@@ -320,7 +348,8 @@
 sent with the update will no longer be valid once the new encrypted password
 is put into place, but if the user is only updating his or her 'GECOS'
 information or shell, then the cleartext password sent with the update
-will still be valid once the update is completed. If the network is
+will still be valid once the update is completed.
+If the network is
 insecure, this cleartext password could be intercepted and used to
 gain unauthorized access to the user's account.
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rpc.ypxfrd.8 man8/rpc.ypxfrd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rpc.ypxfrd.8	Thu Jan 27 23:37:52 2000
+++ man8/rpc.ypxfrd.8	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/rpc.ypxfrd/rpc.ypxfrd.8,v 1.8 1999/08/28 01:19:46 peter Exp $
+.\" $FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.9 2000/03/01 14:08:25 sheldonh Exp $
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
@@ -43,7 +43,8 @@
 The
 .Nm
 daemon is used to speed up the distribtion of very large NIS maps
-from NIS master to NIS slave servers. The normal method for transfering
+from NIS master to NIS slave servers.
+The normal method for transfering
 maps involves several steps:
 .Bl -bullet -offset indent
 .It
@@ -71,12 +72,14 @@
 .El
 .Pp
 This process can take several minutes when there are very large
-maps involved. For example: a passwd database with several tens of
+maps involved.
+For example: a passwd database with several tens of
 thousands of entries can consume several megabytes of disk space,
 and it can take the
 .Xr db 3
 library package a long time to sort and store all the records
-in a hash database. Consider also that there are two sets of map
+in a hash database.
+Consider also that there are two sets of map
 files:
 .Pa master.passwd.by{name,uid}
 and
@@ -86,9 +89,11 @@
 .Nm
 server speeds up the transfer process by allowing NIS slave servers to
 simply copy the master server's map files rather than building their
-own from scratch. Simply put,
+own from scratch.
+Simply put,
 .Nm
-implements an RPC-based file transfer protocol. Transfering even
+implements an RPC-based file transfer protocol.
+Transfering even
 a multi-megabyte file in this fashion takes only a few seconds compared
 to the several minutes it would take even a reasonably fast slave server
 to build a new map from scratch.
@@ -100,7 +105,8 @@
 This means that slave servers will only be permitted to transfer
 files if the rules in the
 .Xr securenets 5
-database permit it. Furthermore, only slave servers using reserved
+database permit it.
+Furthermore, only slave servers using reserved
 ports will be allowed to transfer the
 .Pa master.passwd
 maps.
@@ -110,7 +116,8 @@
 .It Fl p Ar path
 This option can be used to override the default path to
 the location of the NIS
-map databases. The compiled-in default path is
+map databases.
+The compiled-in default path is
 .Pa /var/yp .
 .El
 .Sh FILES
@@ -127,13 +134,16 @@
 The
 .Bx Free
 .Nm ypxfrd
-protocol is not compatible with that used by SunOS. This is unfortunate
+protocol is not compatible with that used by SunOS.
+This is unfortunate
 but unavoidable: Sun's protocol is not freely available, and even if it
 were it would probably not be useful since the SunOS NIS v2 implementation
 uses the original ndbm package for its map databases whereas the
 .Bx Free
-implementation uses Berkeley DB. These two packages use vastly different
-file formats. Furthermore, ndbm is byte-order sensitive and not very
+implementation uses Berkeley DB.
+These two packages use vastly different
+file formats.
+Furthermore, ndbm is byte-order sensitive and not very
 smart about it, meaning that am ndbm database created on a big endian
 system can't be read on a little endian system.
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rrenumd.8 man8/rrenumd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rrenumd.8	Thu Jan 27 23:37:52 2000
+++ man8/rrenumd.8	Tue Mar 21 06:32:17 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: rrenumd.8,v 1.1.1.1 1999/08/08 23:31:38 itojun Exp $
-.\"     $FreeBSD: src/usr.sbin/rrenumd/rrenumd.8,v 1.1 2000/01/06 12:40:43 shin Exp $
+.\"     $FreeBSD: src/usr.sbin/rrenumd/rrenumd.8,v 1.2 2000/03/12 19:50:12 shin Exp $
 .\"
 .Dd Sep 7, 1998
 .Dt RRENUMD 8
@@ -85,8 +85,8 @@
 The program exits with 0 on success, and non-zero on failures.
 .El
 .Sh SEE ALSO
-.Xr daemon 3
-.Xr rrenumd.conf 5 ,
+.Xr daemon 3 ,
+.Xr rrenumd.conf 5
 .Sh HISTORY
 The
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rtadvd.8 man8/rtadvd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rtadvd.8	Thu Jan 27 23:37:52 2000
+++ man8/rtadvd.8	Tue Mar 21 06:32:17 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: rtadvd.8,v 1.1.1.1 1999/08/08 23:31:42 itojun Exp $
-.\"     $FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.1 2000/01/06 12:40:48 shin Exp $
+.\"     $FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.3 2000/03/01 14:08:26 sheldonh Exp $
 .\"
 .Dd May 17, 1998
 .Dt RTADVD 8
@@ -85,14 +85,17 @@
 .Ar configfile ,
 for the configuration file.
 By default,
-.Pa /usr/local/v6/etc/rtadvd.conf
+.Pa /etc/rtadvd.conf
 is used.
 .It Fl P
 Specifies that
 .Nm
-receives router renumbering messages. Also, specifies IPsec policy for
-rrenumd sessions. Because router renumbering can change the system's
-IPv6 prefix, its messages must be protected by IPsec. For details about
+receives router renumbering messages.
+Also, specifies IPsec policy for
+rrenumd sessions.
+Because router renumbering can change the system's
+IPv6 prefix, its messages must be protected by IPsec.
+For details about
 .Ar policy ,
 please refer to
 .Xr ipsec 4
@@ -112,8 +115,8 @@
 .Sh RETURN VALUES
 The program exits with 0 on success, and non-zero on failures.
 .Sh FILES
-.Bl -tag -width /usr/local/v6/etc/rtadvd.conf -compact
-.It Pa /usr/local/v6/etc/rtadvd.conf
+.Bl -tag -width /etc/rtadvd.conf -compact
+.It Pa /etc/rtadvd.conf
 The default configuration file.
 .El
 .Sh SEE ALSO
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rwhod.8 man8/rwhod.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/rwhod.8	Thu Jan 27 23:37:54 2000
+++ man8/rwhod.8	Tue Mar 21 06:32:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwhod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.12 1999/08/28 01:19:50 peter Exp $
+.\" $FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.13 2000/01/29 01:54:58 chris Exp $
 .\"
 .Dd December 11, 1993
 .Dt RWHOD 8
@@ -121,7 +121,7 @@
 must be between 0 and
 32 (or MAX_MULTICAST_SCOPE).  Note that
 .Fl m Ar 1
-is different than
+is different from
 .Fl m ,
 in that
 .Fl m Ar 1
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sa.8 man8/sa.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sa.8	Thu Jan 27 23:37:54 2000
+++ man8/sa.8	Tue Mar 21 06:32:18 2000
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/sa/sa.8,v 1.10 1999/08/28 01:19:53 peter Exp $
+.\" $FreeBSD: src/usr.sbin/sa/sa.8,v 1.11 2000/01/29 01:54:59 chris Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
@@ -231,7 +231,7 @@
 .Pp
 The formats of the summary files created by this version of
 .Nm
-are very different than the those used by the original version.
+are very different from the those used by the original version.
 This is not considered a problem, however, because the accounting record
 format has changed as well (since user ids are now 32 bits).
 .Sh AUTHORS
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/setkey.8 man8/setkey.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/setkey.8	Thu Jan 27 23:37:54 2000
+++ man8/setkey.8	Tue Mar 21 06:32:18 2000
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: setkey.8,v 1.14 1999/10/27 17:08:58 sakane Exp $
-.\"     $FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.1 2000/01/06 12:40:52 shin Exp $
+.\"     $FreeBSD: src/usr.sbin/setkey/setkey.8,v 1.4 2000/03/13 01:38:46 shin Exp $
 .\"
 .Dd May 17, 1998
 .Dt SETKEY 8
@@ -99,7 +99,8 @@
 .It Fl h
 Add hexadecimal dump on
 .Fl x
-mode. The order is significant.
+mode.
+The order is significant.
 .It Fl l
 Loop forever with short output on
 .Fl D .
@@ -112,7 +113,8 @@
 .Pc .
 .El
 .Pp
-Operation has the following grammar. Note that lines, that start with a
+Operation has the following grammar.
+Note that lines, that start with a
 hashmark ('#') are treated as comment lines.
 Description of meta-arguments follows.
 .Bl -tag -width Ds
@@ -179,7 +181,7 @@
 .Li spddump
 .Li ;
 .Xc
-Dumps all SAD entries.
+Dumps all SPD entries.
 .El
 .\"
 .Pp
@@ -514,7 +516,7 @@
 .Sh EXAMPLES
 .Bd -literal -offset
 add	3ffe:501:4819::1 3ffe:501:481d::1 esp 123457
-		-E des-cbc "ESP SA!!"
+		-E des-cbc "ESP SA!!" ;
 
 add	3ffe:501:4819::1 3ffe:501:481d::1 ah 123456
 		-A hmac-sha1 "AH SA configuration!" ;
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/showmount.8 man8/showmount.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/showmount.8	Thu Jan 27 23:36:32 2000
+++ man8/showmount.8	Tue Mar 21 06:31:36 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD: src/usr.bin/showmount/showmount.8,v 1.7 1999/08/28 01:05:42 peter Exp $
+.\" $FreeBSD: src/usr.bin/showmount/showmount.8,v 1.8 2000/03/01 12:20:18 sheldonh Exp $
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
@@ -54,7 +54,8 @@
 By default it prints the names of all hosts that have
 .Tn NFS
 file systems mounted
-on the host. See
+on the host.
+See
 .%T "NFS: Network File System Protocol Specification" ,
 RFC 1094,
 Appendix A,
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sicontrol.8 man8/sicontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sicontrol.8	Thu Jan 27 23:38:22 2000
+++ man8/sicontrol.8	Tue Mar 21 06:32:35 2000
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.10 1999/10/30 15:38:19 phantom Exp $
+.\" $FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.11 2000/03/01 14:08:29 sheldonh Exp $
 .\"
 .Dd September 26,1995
 .Dt SICONTROL 8
@@ -60,7 +60,8 @@
 .It Cm mstate
 Show the current incoming modem control signals.
 .It Cm ccbstat
-Show the current "ccb" structure for the specified port. This is not of
+Show the current "ccb" structure for the specified port.
+This is not of
 much use outside of debugging the driver and determining why a port is
 wedged.
 .It Cm ttystat
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/slattach.8 man8/slattach.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/slattach.8	Thu Jan 27 23:34:24 2000
+++ man8/slattach.8	Tue Mar 21 06:30:20 2000
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\" $FreeBSD: src/sbin/slattach/slattach.8,v 1.15 1999/08/28 00:14:25 peter Exp $
+.\" $FreeBSD: src/sbin/slattach/slattach.8,v 1.16 2000/03/01 11:27:39 sheldonh Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
@@ -107,7 +107,8 @@
 cause connection reestablishing on leased line
 without any external command invoked.
 .It Fl s Ar baudrate
-Specify the speed of the connection. If not specified, the
+Specify the speed of the connection.
+If not specified, the
 default of 9600 is used.
 .It Fl u Ar unit-command
 When the line is switched to slip discipline, run
@@ -140,12 +141,14 @@
 .Ar redial-command
 upon startup irrespective of carrier.
 .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.
 .It Fl K Ar keepalive
-Set SLIP "keep alive" timeout in seconds. If FRAME_END is not received in
+Set SLIP "keep alive" timeout in seconds.
+If FRAME_END is not received in
 this amount of time, re-connect occurs.
 The default value is no timeout.
 .It Fl O Ar outfill
@@ -154,7 +157,8 @@
 timeout on the remote side.
 The default value is no timeout.
 .It Fl S Ar unit
-Set the SLIP unit number directly. Use with caution, because no check is made
+Set the SLIP unit number directly.
+Use with caution, because no check is made
 for two interfaces with same number.
 By default sliplogin dynamically assigns the unit number.
 .It Ar ttyname
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sliplogin.8 man8/sliplogin.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sliplogin.8	Thu Jan 27 23:37:54 2000
+++ man8/sliplogin.8	Tue Mar 21 06:32:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.11 1999/08/28 01:19:59 peter Exp $
+.\" $FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.12 2000/03/01 14:08:32 sheldonh Exp $
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
@@ -160,18 +160,21 @@
 .Ar slunit .
 .Bl -tag -width keepalive
 .It Ar keepalive
-Set SLIP "keep alive" timeout in seconds. If FRAME_END is not received in
+Set SLIP "keep alive" timeout in seconds.
+If FRAME_END is not received in
 this amount of time,
 .Nm
 closes the line and exits.
 The default value is no timeout (zero).
 .It Ar outfill
-Set SLIP "out fill" timeout in seconds. It forces at least one FRAME_END
+Set SLIP "out fill" timeout in seconds.
+It forces at least one FRAME_END
 to be sent during this time period, which is necessary for the "keep alive"
 timeout on the remote side.
 The default value is no timeout (zero).
 .It Ar slunit
-Set the SLIP unit number directly. Use with caution, because no check is made
+Set the SLIP unit number directly.
+Use with caution, because no check is made
 for two interfaces with same number.
 By default sliplogin dynamically assigns the unit number.
 .El
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/slstat.8 man8/slstat.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/slstat.8	Thu Jan 27 23:37:55 2000
+++ man8/slstat.8	Tue Mar 21 06:32:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" $FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.13 1999/08/28 01:20:00 peter Exp $
+.\" $FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.14 2000/03/01 14:08:34 sheldonh Exp $
 .\"
 .Dd October 11, 1996
 .Dt SLSTAT 8
@@ -68,7 +68,8 @@
 .Tn SLIP
 interface, or a
 .Tn SLIP
-interface name. The default unit is
+interface name.
+The default unit is
 .Sy 0
 for interface
 .Sy sl0 .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/spppcontrol.8 man8/spppcontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/spppcontrol.8	Thu Jan 27 23:34:24 2000
+++ man8/spppcontrol.8	Tue Mar 21 06:30:20 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/sbin/spppcontrol/spppcontrol.8,v 1.5 1999/08/28 00:14:26 peter Exp $
+.\" $FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.6 2000/03/01 11:27:41 sheldonh Exp $
 .\"
 .Dd October 11, 1997
 .Os
@@ -113,7 +113,8 @@
 interface as well (i.e. system name and authentication secret will
 be forgotten).
 .It Ar myauthproto Ns \&= Ns Em protoname
-Same as above, but only for my end of the link. I.e. this is the
+Same as above, but only for my end of the link.
+I.e. this is the
 protocol when remote is authenticator, and I am the peer required to
 authenticate.
 .It Ar hisauthproto Ns \&= Ns Em protoname
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sticky.8 man8/sticky.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sticky.8	Thu Jan 27 23:34:56 2000
+++ man8/sticky.8	Tue Mar 21 06:30:42 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man8/sticky.8,v 1.6 1999/08/28 00:21:01 peter Exp $
+.\" $FreeBSD: src/share/man/man8/sticky.8,v 1.7 2000/03/03 14:05:03 sheldonh Exp $
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
@@ -43,7 +43,8 @@
 .Em sticky bit
 (mode S_ISVTX),
 is used to indicate special treatment
-for directories. It is ignored for regular files.
+for directories.
+It is ignored for regular files.
 See
 .Xr chmod 2
 or
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/swapon.8 man8/swapon.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/swapon.8	Thu Jan 27 23:34:25 2000
+++ man8/swapon.8	Tue Mar 21 06:30:21 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.14 1999/09/26 00:05:45 nik Exp $
+.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.15 2000/02/28 21:29:37 gsutter Exp $
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
@@ -88,8 +88,8 @@
 .El
 .Sh BUGS
 There is no way to stop paging and swapping on a device.
-It is therefore not possible to make use of devices which may be
-dismounted during system operation.
+It is therefore not possible to dismount swap devices which are
+mounted during system operation.
 .Sh HISTORY
 The
 .Nm
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sysctl.8 man8/sysctl.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/sysctl.8	Thu Jan 27 23:34:24 2000
+++ man8/sysctl.8	Tue Mar 21 06:30:21 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.22 1999/11/22 08:42:59 des Exp $
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.23 2000/02/26 16:55:21 steve Exp $
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
@@ -178,13 +178,13 @@
 .El
 .Sh EXAMPLES
 For example, to retrieve the maximum number of processes allowed
-in the system, one would use the follow request:
+in the system, one would use the following request:
 .Bd -literal -offset indent -compact
 sysctl kern.maxproc
 .Ed
 .Pp
 To set the maximum number of processes allowed
-per uid to 1000, one would use the follow request:
+per uid to 1000, one would use the following request:
 .Bd -literal -offset indent -compact
 sysctl -w kern.maxprocperuid=1000
 .Ed
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/syslogd.8 man8/syslogd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/syslogd.8	Thu Jan 27 23:37:55 2000
+++ man8/syslogd.8	Tue Mar 21 06:32:19 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.20 2000/01/23 20:22:22 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.22 2000/03/01 14:08:36 sheldonh Exp $
 .\"
 .Dd October 12, 1995
 .Dt SYSLOGD 8
@@ -126,7 +126,7 @@
 should place an additional log socket.
 Up to 19 additional logging sockets can be specified.
 The primary use for this is to place additional log sockets in
-.Pa /dev/log
+.Pa /var/run/log
 of various chroot filespaces.
 .It Fl s
 Operate in secure mode.  Do not log messages from remote machines.  If
@@ -239,6 +239,7 @@
 .Pp
 The log socket was moved from
 .Pa /dev
-to ease the use of a read-only root filesystem. This may confuse
+to ease the use of a read-only root filesystem.
+This may confuse
 some old binaries so that a symbolic link might be used for a
 transitional period.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/tunefs.8 man8/tunefs.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/tunefs.8	Thu Jan 27 23:34:25 2000
+++ man8/tunefs.8	Tue Mar 21 06:30:21 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.10 2000/01/07 13:05:04 phantom Exp $
+.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.11 2000/03/01 11:27:43 sheldonh Exp $
 .\"
 .Dd December 11, 1993
 .Dt TUNEFS 8
@@ -98,18 +98,21 @@
 The default value used is 8%.
 This value can be set to zero, however up to a factor of three
 in throughput will be lost over the performance obtained at a 10%
-threshold. Settings of 5% and less force space optimization to
+threshold.
+Settings of 5% and less force space optimization to
 always be used which will greatly increase the overhead for file
 writes.
 Note that if the value is raised above the current usage level,
 users will be unable to allocate files until enough files have
 been deleted to get under the higher threshold.
 .It Fl n Ar enable | disable
-Turn on/off soft updates. An unmounted filesystem is required.
+Turn on/off soft updates.
+An unmounted filesystem is required.
 .It Fl o Ar optimize_preference
 The file system can either try to minimize the time spent
 allocating blocks, or it can attempt to minimize the space
-fragmentation on the disk. Optimization for space has much
+fragmentation on the disk.
+Optimization for space has much
 higher overhead for file writes.
 The kernel normally changes the preference automatically as
 the percent fragmentation changes on the file system.
@@ -131,11 +134,13 @@
 .Pp
 reload\&: Invalid argument
 .Pp
-preceded by the raw device name. This occurs because the filesystem
+preceded by the raw device name.
+This occurs because the filesystem
 is not currently mounted read-only.
 .Nm
 is trying to reload the incore (r*) device, but it was never loaded
-to begin with. When you boot single user, only
+to begin with.
+When you boot single user, only
 .Dq /
 is mounted, so all other filesystems will give you that warning.
 It is completely harmless.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/usbd.8 man8/usbd.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/usbd.8	Thu Jan 27 23:37:59 2000
+++ man8/usbd.8	Tue Mar 21 06:32:21 2000
@@ -32,7 +32,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.8 1999/12/30 10:46:08 kuriyama Exp $
+.\" $FreeBSD: src/usr.sbin/usbd/usbd.8,v 1.9 2000/03/01 14:08:37 sheldonh Exp $
 .\"
 .Dd July 12, 1998
 .Dt USBD 8
@@ -51,30 +51,37 @@
 .Op Fl v
 .Sh DESCRIPTION
 .Nm
-handles the USB device attachment and detachment. It does two things.
+handles the USB device attachment and detachment.
+It does two things.
 Through opening the
 .Pa /dev/usb0 ,
 .Pa /dev/usb1 ,
 etc. devices, it enables the kernel to do handle change requests from
-attached hubs. This functionality will be removed when the kernel has
-kernel threads. The (multiple)
+attached hubs.
+This functionality will be removed when the kernel has
+kernel threads.
+The (multiple)
 .Fl f Ar device
 command line options specify which controllers it should handle.
 Normally this option is not needed.
 .Pp
 The second part is the handling of the attachment and detachment of USB
-devices. The device
+devices.
+The device
 .Pa /dev/usb
-is opened and events are read from it. Whenever a device is attached or
+is opened and events are read from it.
+Whenever a device is attached or
 detached the list of actions read from
 .Pa /etc/usbd.conf
-are searched for a matching entry. If found, the corresponding action is
+are searched for a matching entry.
+If found, the corresponding action is
 executed.
 .Pp
 The command line options are as follows:
 .Bl -tag -width Ds
 .It Fl c Ar filename
-Name of configuration file. The default is
+Name of configuration file.
+The default is
 .Pa /etc/usbd.conf.
 .It Fl d
 Enable debugging to the standard output,
@@ -90,7 +97,8 @@
 .Pa /dev/usb3 .
 Do not specify the device
 .Pa /dev/usb
-here. It is used for events only.
+here.
+It is used for events only.
 .It Fl n
 Do not handle the event queue on /dev/usb.
 .It Fl t Ar timeout
@@ -98,7 +106,8 @@
 without being triggered by a connect or disconnect.
 A timeout of 0 means that there is no timeout.  The default is 30.
 .It Fl v
-Be verbose. Repeating the flag makes
+Be verbose.
+Repeating the flag makes
 .Nm usbd
 more verbose.
 .El
@@ -124,7 +133,8 @@
 .An Lennart Augustsson Aq augustss@carlstedt.se
 for the
 .Nx
-project. The event queue handling in
+project.
+The event queue handling in
 .Nm usbd
 was added by
 .An Nick Hibma Aq n_hibma@freebsd.org .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/vinum.8 man8/vinum.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/vinum.8	Thu Jan 27 23:34:26 2000
+++ man8/vinum.8	Tue Mar 21 06:30:21 2000
@@ -35,7 +35,7 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $Id: vinum.8,v 1.13 2000/01/03 03:12:56 grog Exp grog $
-.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.32 2000/01/05 05:59:08 grog Exp $
+.\" $FreeBSD: src/sbin/vinum/vinum.8,v 1.33 2000/03/01 07:22:10 grog Exp $
 .\"
 .Dd 13 October 1999
 .Dt vinum 8
@@ -563,10 +563,12 @@
 .It DEBUG_ADDRESSES (1)
 .br
 Show buffer information during requests
+.ig
 .It DEBUG_NUMOUTPUT (2)
 .br
 Show the value of
 .Dv vp->v_numoutput.
+..
 .It DEBUG_RESID (4)
 .br
 Go into debugger in
@@ -1280,9 +1282,21 @@
 .Nm
 kld and stops
 .Xr vinum 8 .
-This can only be done if no objects are active, In particular, the
+This can only be done if no objects are active.  In particular, the
 .Fl f
-flag does not override this requirement.  This command can only work if
+flag does not override this requirement.  Normally, the
+.Nm stop
+command writes the current configuration back to the drives before terminating.
+This will not be possible if configuration updates are disabled, so
+.Nm
+will not stop if configuration updates are disabled.  You can override this by
+specifying the
+.Fl f
+flag.
+.Pp
+The
+.Nm stop
+command can only work if
 .Nm
 has been loaded as a kld, since it is not possible to unload a statically
 configured driver.
@@ -2406,12 +2420,31 @@
 .Bl -enum
 .It
 .Nm
-will not create a device on UFS partitions.  Instead, it will return an error
-message 
-.if t ``wrong partition type''.  
-.if n "wrong partition type".  
-The partition type must be
+drives are UNIX disk partitions and must have the partition type
 .Ar vinum .
+This is different from
+.Nm ccd ,
+which expects partitions of type
+.Ar 4.2BSD .
+This behaviour of ccd is an invitation to shoot yourself in the foot: with
+.Nm ccd 
+you can easily overwrite a file system.  
+.Nm
+will not permit this.
+.Pp
+For similar reasons, the
+.Nm vinum Ar start
+command will not accept a drive on partition
+.Ar c .
+Partition
+.Ar c
+is used by the system to represent the whole disk, and must be of type
+.Ar unused .
+Clearly there is a conflict here, which
+.Nm
+resolves by not using the
+.Ar c
+partition.
 .It
 When you create a volume with multiple plexes,
 .Nm
@@ -2491,33 +2524,6 @@
 .Ed
 .Pp
 This error may also occur if you use old versions of kld or userland program.
-.It
-.Nm
-drives are UNIX disk partitions and should have the partition type
-.Ar vinum .
-This is different from
-.Nm ccd ,
-which expects partitions of type
-.Ar 4.2BSD .
-This behaviour of ccd is an invitation to shoot yourself in the foot: with
-.Nm ccd 
-you can easily overwrite a file system.  
-.Nm
-will not permit this.
-.Pp
-For similar reasons, the
-.Nm vinum Ar start
-command will not accept a drive on partition
-.Ar c .
-Partition
-.Ar c
-is used by the system to represent the whole disk, and must be of type
-.Ar unused .
-Clearly there is a conflict here, which
-.Nm
-resolves by not using the
-.Ar c
-partition.
 .It
 The
 .Nm vinum Ar read
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/vipw.8 man8/vipw.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/vipw.8	Thu Jan 27 23:38:00 2000
+++ man8/vipw.8	Tue Mar 21 06:32:22 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.6 1999/12/02 16:39:14 sheldonh Exp $
+.\" $FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.7 2000/03/01 14:08:38 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
@@ -48,7 +48,8 @@
 If the password file is already locked for editing by another user,
 .Nm
 will ask you
-to try again later. The default editor for
+to try again later.
+The default editor for
 .Nm
 is
 .Xr vi 1 .
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/vnconfig.8 man8/vnconfig.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/vnconfig.8	Thu Jan 27 23:38:02 2000
+++ man8/vnconfig.8	Tue Mar 21 06:32:23 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vnconfig.8	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.13 2000/01/23 20:26:20 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/vnconfig/vnconfig.8,v 1.14 2000/02/17 02:54:36 gsutter Exp $
 .\"
 .Dd July 8, 1993
 .Dt VNCONFIG 8
@@ -141,7 +141,7 @@
 .It Fl S Ar value{k,m,g,t}
 If no regular file is specified, VN will use swap for backing store.
 This option specifies the size of the device.  For example, '23m' for
-23 megabytes.  The VN device will round the size up to a machine page boundry.
+23 megabytes.  The VN device will round the size up to a machine page boundary.
 Filesystems up to 7.9 terrabytes are supported.  When specified along with
 a regular file, this option overrides the regular file's size insofar as
 VN is concerned.
@@ -193,7 +193,7 @@
 	special_file	regular_file	[ feature ]
 .Ed
 .Pp
-where fields are seperated by white space.
+where fields are separated by white space.
 The previously described action options serve to configure, enable,
 disable or unconfigure all devices in the configuration file.
 .Sh FILES
@@ -239,7 +239,7 @@
 relabeling and recreating the filesystem.  It is even possible to fsck the
 VN partitions that previously contained filesystems.
 .Pp
-.Dl vnconfig -e -s labels,reserve -S 400m vn0
+.Dl vnconfig -e -s labels,reserve -S 400m vn1
 .Dl disklabel -r -w vn1 auto
 .Dl newfs /dev/rvn1c
 .Dl mount /dev/vn1c /usr/obj
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/wicontrol.8 man8/wicontrol.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/wicontrol.8	Thu Jan 27 23:38:23 2000
+++ man8/wicontrol.8	Tue Mar 21 06:32:36 2000
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.11 1999/11/25 20:45:49 wpaul Exp $
+.\" $FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.14 2000/03/02 14:53:39 sheldonh Exp $
 .\"
 .Dd April 21, 1999
 .Dt WICONTROL 8
@@ -58,6 +58,13 @@
 .Nm wicontrol
 .Fl i Ar iface Fl d Ar max data length
 .Nm wicontrol
+.Fl i Ar iface Fl e Ar 0|1
+.Nm wicontrol
+.Fl i Ar iface Fl k Ar key
+.Op Fl v Ar 1|2|3|4
+.Nm wicontrol
+.Fl i Ar iface Fl T Ar 1|2|3|4
+.Nm wicontrol
 .Fl i Ar iface Fl r Ar RTS threshold
 .Nm wicontrol
 .Fl i Ar iface Fl f Ar frequency
@@ -66,20 +73,25 @@
 .Nm wicontrol
 .Fl i Ar iface Fl S Ar max_sleep_duration
 .Nm wicontrol
-.Fl i Ar iface Fl Z (zero signal cache)
+.Fl i Ar iface Fl Z
+(zero signal cache)
 .Nm wicontrol
-.Fl i Ar iface Fl C (display signal cache)
+.Fl i Ar iface Fl C
+(display signal cache)
 .Sh DESCRIPTION
 The
 .Nm
 command controls the operation of WaveLAN/IEEE wireless networking
 devices via the
 .Xr wi 4
-driver. Most of the parameters that can be changed relate to the
-IEEE 802.11 protocol which the WaveLAN implements. This includes
+driver.
+Most of the parameters that can be changed relate to the
+IEEE 802.11 protocol which the WaveLAN implements.
+This includes
 the station name, whether the station is operating in ad-hoc (point
 to point) or BSS (service set) mode, and the network name of a service
-set to join (IBSS) if BSS mode is enabled. The
+set to join (IBSS) if BSS mode is enabled.
+The
 .Nm
 command can also be used to view the current settings of these parameters
 and to dump out the values of the card's statistics counters.
@@ -96,17 +108,21 @@
 .It Fl i Ar iface Op Fl o
 Display the current settings of the specified WaveLAN/IEEE interface.
 This retrieves the current card settings from the driver and prints them
-out. Using the additional
+out.
+Using the additional
 .Fl o
 flag will cause
 .Nm
 to print out the statistics counters instead of the card settings.
 .It Fl i Ar iface Fl t Ar tx rate
-Set the transmit rate of the specified interface. The legal values
+Set the transmit rate of the specified interface.
+The legal values
 for the transmit rate vary depending on whether the interface is a
-standard WaveLAN/IEEE or a WaveLAN/IEEE Turbo adapter. The standard
+standard WaveLAN/IEEE or a WaveLAN/IEEE Turbo adapter.
+The standard
 NICs support a maximum transmit rate of 2Mbps while the turbo NICs
-support a maximum speed of 6Mbps. The following table shows the
+support a maximum speed of 6Mbps.
+The following table shows the
 legal transmit rate settings and the corresponding transmit speeds:
 .Bd -filled -offset indent
 .Bl -column "TX rate " "NIC speed "
@@ -126,11 +142,14 @@
 The default driver setting is 3 (auto rate select).
 .It Fl i Ar iface Fl n Ar network name
 Set the name of the service set (IBSS) that this station wishes to
-join. The
+join.
+The
 .Ar network name
-can be any text string up to 30 characters in length. The default name
+can be any text string up to 30 characters in length.
+The default name
 is the string "ANY" which should allow the station to connect to the first
-available access point. The interface should be set for BSS mode using
+available access point.
+The interface should be set for BSS mode using
 the
 .Fl p
 flag in order for this to work.
@@ -141,9 +160,11 @@
 .It Fl i Ar iface Fl s Ar station name
 Sets the
 .Ar station name
-for the specified interface. The
+for the specified interface.
+The
 .Ar station name
-is used for diagnostic purposes. The Lucent WaveMANAGER software can
+is used for diagnostic purposes.
+The Lucent WaveMANAGER software can
 poll the names of remote hosts.
 .It Fl i Ar iface Fl c Ar 0|1
 Allow the station to create a service set (IBSS). Permitted values
@@ -163,42 +184,90 @@
 .It Fl i Ar iface Fl p Ar port type
 Set the
 .Ar port type
-for a specified interface. The legal values for
+for a specified interface.
+The legal values for
 .Ar port type
-are 1 (BSS mode) and 3 (ad-hoc) mode. In ad-hoc mode, the station can
+are 1 (BSS mode) and 3 (ad-hoc) mode.
+In ad-hoc mode, the station can
 communicate directly with any other stations within direct radio range
 (provided that they are also operating in ad-hoc mode). In BSS mode,
 hosts must associate with a service set controlled by an access point,
-which relays traffic between end stations. The default setting is 3
+which relays traffic between end stations.
+The default setting is 3
 (ad-hoc mode).
 .It Fl i Ar iface Fl a Ar access_point_density
 Specify the
 .Ar access point density
-for a given interface. Legal values are 1 (low), 2 (medium) and 3 (high).
+for a given interface.
+Legal values are 1 (low), 2 (medium) and 3 (high).
 This setting influences some of the radio modem threshold settings.
 .It Fl i Ar iface Fl m Ar mac address
-Set the station address for the specified interface. The
+Set the station address for the specified interface.
+The
 .Ar mac address
 is specified as a series of six hexadecimal values separated by colons,
-e.g.: 00:60:1d:12:34:56. This programs the new address into the card
+e.g.: 00:60:1d:12:34:56.
+This programs the new address into the card
 and updates the interface as well.
 .It Fl i Ar iface Fl d Ar max_data_length
 Set the maximum receive and transmit frame size for a specified interface.
 The
 .Ar max data length
-can be any number from 350 to 2304. The default is 2304.
+can be any number from 350 to 2304.
+The default is 2304.
+.It Fl i Ar iface Fl e Ar 0|1
+Enable or disable WEP encryption.
+Permitted values are
+.Ar 0
+(encryption disabled) or
+.Ar 1
+(encryption enabled). Encryption is off by default.
+.It Fl i Ar iface Fl k Ar key "[-v 1|2|3|4]"
+Set WEP encryption keys.
+There are four default encryption keys
+that can be programmed.
+A specific key can be set using
+the
+.Fl v
+flag.
+If the
+.Fl v
+flag is not specified, the first key will be set.
+Encryption keys
+can either be normal text (i.e. "hello") or a series of hexadecimal
+digits (i.e. "0x1234512345"). For
+WaveLAN Turbo Silver cards, the key is restricted to 40 bits, hence
+the key can be either a 5 character text string or 10 hex digits.
+For WaveLAN Turbo Gold cards, the key can be up to 128 bits,
+which means the key can be specified as either a 16 character text
+string or 32 hex digits.
+.Pp
+Note: currently, the field in the structure used to program the key
+into the NIC is only 14 bytes long, not 16.
+I'm not sure how this is
+supposed to allow 128 bits of key info for the gold cards.
+.It Fl i Ar iface Fl T Ar 1|2|3|4
+Specify which of the four WEP encryption keys will be used to
+encrypt transmitted packets.
 .It Fl i Ar iface Fl r Ar RTS threshold
-Set the RTS/CTS threshold for a given interface. This controls the
-number of bytes used for the RTS/CTS handshake boundary. The
+Set the RTS/CTS threshold for a given interface.
+This controls the
+number of bytes used for the RTS/CTS handshake boundary.
+The
 .Ar RTS threshold
-can be any value between 0 and 2047. The default is 2347.
+can be any value between 0 and 2047.
+The default is 2347.
 .It Fl i Ar iface Fl f Ar frequency
-Set the radio frequency of a given interface. The
+Set the radio frequency of a given interface.
+The
 .Ar frequency
-should be specified as a channel ID as shown in the table below. The
+should be specified as a channel ID as shown in the table below.
+The
 list of available frequencies is dependent on radio regulations specified
-by regional authorities. Recognized regulatory authorities include
-the FCC (United States), ETSI (Europe), France and Japan. Frequencies
+by regional authorities.
+Recognized regulatory authorities include
+the FCC (United States), ETSI (Europe), France and Japan.
+Frequencies
 in the table are specified in Mhz.
 .Bd -filled -offset indent
 .Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan "
@@ -221,27 +290,36 @@
 .Ed
 .Pp
 If an illegal channel is specified, the
-NIC will revert to its default channel. For NICs sold in the United States
+NIC will revert to its default channel.
+For NICs sold in the United States
 and Europe, the default channel is 3. For NICs sold in France, the default
-channel is 11. For NICs sold in Japan, the only available channel is 14.
+channel is 11.
+For NICs sold in Japan, the only available channel is 14.
 Note that two stations must be set to the same channel in order to
 communicate.
 .It Fl i Ar iface Fl P Ar 0|1
-Enable or disable power management on a given interface. Enabling
+Enable or disable power management on a given interface.
+Enabling
 power management uses an alternating sleep/wake protocol to help
 conserve power on mobile stations, at the cost of some increased
-receive latency. Power management is off by default. Note that power
+receive latency.
+Power management is off by default.
+Note that power
 management requires the cooperation of an access point in order to
-function; it is not functional in ad-hoc mode. Also, power management
+function; it is not functional in ad-hoc mode.
+Also, power management
 is only implemented in Lucent WavePOINT firmware version 2.03 or
-later, and in WaveLAN PCMCIA adapter firmware 2.00 or later. Older
-revisions will silently ignore the power management setting. Legal
+later, and in WaveLAN PCMCIA adapter firmware 2.00 or later.
+Older
+revisions will silently ignore the power management setting.
+Legal
 values for this parameter are 0 (off) and 1 (on).
 .It Fl i Ar iface Fl S Ar max_sleep_interval
 Specify the sleep interval to use when power management is enabled.
 The
 .Are max sleep interval
-is specified in milliseconds. The default is 100.
+is specified in milliseconds.
+The default is 100.
 .It Fl i Ar iface Fl Z
 Clear the signal strength cache maintained internally by the
 .Nm wi
@@ -249,8 +327,10 @@
 .It Fl i Ar iface Fl C
 Display the cached signal strength information maintained by the
 .Nm wi
-driver. The driver retains information about signal strength and
-noise level for packets received from different hosts. The signal
+driver.
+The driver retains information about signal strength and
+noise level for packets received from different hosts.
+The signal
 strength and noise level values are displayed in units of dBms.
 The signal quality values is produced by subtracting the noise level
 from the signal strength (i.e. less noise and better signal yields
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/yp_mkdb.8 man8/yp_mkdb.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/yp_mkdb.8	Thu Jan 27 23:38:03 2000
+++ man8/yp_mkdb.8	Tue Mar 21 06:32:23 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/yp_mkdb/yp_mkdb.8,v 1.11 2000/01/23 20:31:22 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.12 2000/03/01 14:08:41 sheldonh Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
@@ -68,7 +68,8 @@
 The input should be in 'key data' format, which is to say
 two fields of
 .Tn ASCII
-data separated by white space. The first field
+data separated by white space.
+The first field
 is assumed to be the key, and everything else is assumed to be
 the data.
 These databases are typically stored in
@@ -81,7 +82,8 @@
 .Pa /var/yp/Makefile .
 .Nm Yp_mkdb
 can also be used to dump an NIS database file so that its
-contents can be examined. For security reasons, all databases that
+contents can be examined.
+For security reasons, all databases that
 .Nm
 creates are readable and writable by owner only (and usually the
 owner is root).
@@ -93,9 +95,12 @@
 .Nm
 to send a YPPROC_CLEAR request to
 .Xr ypserv 8
-on the local host. This signal tells the server to close any open
-database descriptors and flush out its database cache. If used alone,
-this flag signals the server and does nothing else. If used as part
+on the local host.
+This signal tells the server to close any open
+database descriptors and flush out its database cache.
+If used alone,
+this flag signals the server and does nothing else.
+If used as part
 of a database creation command,
 .Nm
 will send the signal only after the new database has been successfully
@@ -105,39 +110,47 @@
 .Nm
 to add a special entry to the database with a key of
 .Em YP_INTERDOMAIN
-and an empty data field. If this key is present in a map, it alters the
+and an empty data field.
+If this key is present in a map, it alters the
 behavior of the 'match' procedure in
 .Xr ypserv 8
-slightly. If a match query fails (because the server couldn't find
+slightly.
+If a match query fails (because the server couldn't find
 a record that matched the supplied key), and the
 .Em YP_INTERDOMAIN
 key exists within the queried map,
 .Xr ypserv 8
-will try to match the entry again using a DNS lookup. Note that this
+will try to match the entry again using a DNS lookup.
+Note that this
 special behavior only applies to the
 .Em hosts
-maps. Using the
+maps.
+Using the
 .Fl b
 flag for other maps has no effect.
 .It Fl s
 This flag is used to add a special entry to the database with a key of
 .Em YP_SECURE
-and an empty data field. If this key is present in a map,
+and an empty data field.
+If this key is present in a map,
 .Xr ypserv 8
 will deny access to the map to any client that is not using a
-reserved port for its query. This is used mainly for the
+reserved port for its query.
+This is used mainly for the
 .Em master.passwd
 maps, which should be restricted to privileged access only.
 .It Fl f
 This flag is used to turn on filtering of lines in the source file
-input that start with ``+'' or ``-'' characters. These characters
+input that start with ``+'' or ``-'' characters.
+These characters
 have special meaning for the
 .Pa group ,
 .Pa passwd
 and
 .Pa master.passwd
 maps and hence should not be allowed to appear in them as the first
-character of a key or datum. If the
+character of a key or datum.
+If the
 .Fl f
 flag is used,
 .Nm
@@ -145,7 +158,8 @@
 character and issue a warning message displaying the line that
 was dropped.
 .It Fl u Ar dbname
-Dump (or 'unwind') an NIS database. This option can be used to
+Dump (or 'unwind') an NIS database.
+This option can be used to
 inspect the contents of an existing NIS database.
 .It Fl i Ar inputfile
 When generating an NIS map, encode
@@ -168,7 +182,8 @@
 as a special entry in the database with a key of
 .Em YP_MASTER_NAME .
 This entry in the database is frequently used by various NIS utilities
-to determine the name of an NIS master server for a domain. By default,
+to determine the name of an NIS master server for a domain.
+By default,
 .Nm
 assumes that the local host is the NIS master; the
 .Fl m
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ypbind.8 man8/ypbind.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ypbind.8	Thu Jan 27 23:38:03 2000
+++ man8/ypbind.8	Tue Mar 21 06:32:23 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.14 2000/01/23 20:32:24 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.15 2000/03/01 14:08:43 sheldonh Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
@@ -46,7 +46,8 @@
 .Op Fl S Ar domainname,server1,server2,...
 .Sh DESCRIPTION
 .Nm Ypbind
-is the process that maintains NIS binding information. At startup,
+is the process that maintains NIS binding information.
+At startup,
 it searches for an NIS server responsible for serving the system's
 default domain (as set by the
 .Xr domainname 1
@@ -56,14 +57,16 @@
 information in a special file located in
 .Pa /var/yp/binding .
 The NIS routines in the standard C library can then use this file
-when processing NIS requests. There may be several such files
+when processing NIS requests.
+There may be several such files
 since it is possible for an NIS client to be bound to more than
 one domain.
 .Pp
 After a binding has been established,
 .Nm
 will send DOMAIN_NONACK requests to the NIS server at one minute
-intervals. If it fails to receive a reply to one of these requests,
+intervals.
+If it fails to receive a reply to one of these requests,
 .Nm
 assumes that the server is no longer running and resumes its network
 broadcasts until another binding is established.
@@ -80,14 +83,17 @@
 .Nm
 to bind to a particular NIS server host for a given domain by using the
 .Xr ypset 8
-command. However,
+command.
+However,
 .Nm
 refuses YPBINDPROC_SETDOM requests by default since it has no way of
-knowing exactly who is sending them. Using the
+knowing exactly who is sending them.
+Using the
 .Fl ypset
 flag causes
 .Nm
-to accept YPBINDPROC_SETDOM requests from any host. This option should only
+to accept YPBINDPROC_SETDOM requests from any host.
+This option should only
 be used for diagnostic purposes and only for limited periods since allowing
 arbitrary users to reset the binding of an NIS client poses a severe
 security risk.
@@ -106,9 +112,11 @@
 Allow the system administrator to lock
 .Nm
 to a particular
-domain and group of NIS servers. Up to ten servers can be specified.
+domain and group of NIS servers.
+Up to ten servers can be specified.
 There must not be any spaces between the commas in the domain/server
-specification. This option is used to insure that the system binds
+specification.
+This option is used to insure that the system binds
 only to one domain and only to one of the specified servers, which 
 is useful for systems that are both NIS servers and NIS
 clients: it provides a way to restrict what machines the system can
@@ -116,10 +124,12 @@
 .Fl ypset
 or
 .Fl ypsetme
-options, which are often considered to be security holes. The specified
+options, which are often considered to be security holes.
+The specified
 servers must have valid entries in the local
 .Pa /etc/hosts
-file. IP addresses may be specified in place of hostnames. If
+file. IP addresses may be specified in place of hostnames.
+If
 .Nm
 can't make sense ouf of the arguments, it will ignore
 the
@@ -135,13 +145,15 @@
 Cause
 .Nm
 to use a 'many-cast' rather than a broadcast for choosing a server
-from the restricted mode server list. In many-cast mode,
+from the restricted mode server list.
+In many-cast mode,
 .Nm
 will transmit directly to the YPPROC_DOMAIN_NONACK procedure of the
 servers specified in the restricted list and bind to the server that
 responds the fastest.
 This mode of operation is useful for NIS clients on remote subnets
-where no local NIS servers are available. The
+where no local NIS servers are available.
+The
 .Fl m
 flag can only be used in conjunction with the
 .Fl S
@@ -155,10 +167,12 @@
 program will not make continuous attempts to keep secondary domains bound.
 If a server for a secondary domain fails to respond to a ping,
 .Nm
-will broadcast for a new server only once before giving up. If a
+will broadcast for a new server only once before giving up.
+If a
 client program attempts to reference the unbound domain,
 .Nm
-will try broadcasting again. By contrast,
+will try broadcasting again.
+By contrast,
 .Nm
 will automatically maintain a binding for the default domain whether
 client programs reference it ot not.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ypinit.8 man8/ypinit.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ypinit.8	Thu Jan 27 23:38:04 2000
+++ man8/ypinit.8	Tue Mar 21 06:32:24 2000
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.6 2000/01/23 02:10:00 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.7 2000/03/01 14:08:45 sheldonh Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
@@ -61,10 +61,12 @@
 .Pa /var/yp/ypservers
 file, and calls
 .Pa /var/yp/Makefile
-to create and populate an initial set of NIS maps. The maps are
+to create and populate an initial set of NIS maps.
+The maps are
 created from local source files using the
 .Xr yp_mkdb 8
-command. The script will prompt the user for a list of servers
+command.
+The script will prompt the user for a list of servers
 that support the specified domain; this list is used to populate
 the ypservers map.
 .Pp
@@ -72,10 +74,12 @@
 .Nm
 creates the
 .Pa /var/yp/$DOMAINNAME ,
-populates it with copies of the NIS maps from the master. The maps
+populates it with copies of the NIS maps from the master.
+The maps
 are obtained from the master using the
 .Xr ypxfr 8
-command. The
+command.
+The
 .Nm
 script obtains the list of maps to transfer in one of two ways: if
 the system is configured as an NIS client and is bound to the master
@@ -87,8 +91,10 @@
 If the system is not configured as a client of the NIS master,
 .Nm
 uses a hardcoded list of maps, some of which may or may not actually
-exist on the master. The system administrator can edit the script and
-modify the map list if necessary. Otherwise, indivudual maps can
+exist on the master.
+The system administrator can edit the script and
+modify the map list if necessary.
+Otherwise, indivudual maps can
 be transfered manually from the master using
 .Xr ypxfr 8 .
 .Sh OPTIONS
@@ -96,8 +102,10 @@
 supports the following options:
 .Bl -tag -width indent
 .It Fl m Op Ar domainname
-Set up a master server. By default, the script sets up a server for
-the system default domain. The user can override this default by specifying
+Set up a master server.
+By default, the script sets up a server for
+the system default domain.
+The user can override this default by specifying
 .Ar domainname
 explicitly.
 Maps are constructed from scratch using local files as templates using
@@ -107,16 +115,19 @@
 .It Fl s Ar master_server Op Ar domainname
 Set up a slave server using
 .Ar master_name
-as the master. Maps are copied from
+as the master.
+Maps are copied from
 .Ar master_server
 to the slave using
 .Xr ypxfr 8 .
 By default, the script sets up a server for
-the system default domain. The user can override this default by specifying
+the system default domain.
+The user can override this default by specifying
 .Ar domainname
 explicitly.
 .It Fl u Op Ar domainname
-Update the ypservers map on the master server. When a new slave
+Update the ypservers map on the master server.
+When a new slave
 server is added to a domain, its hostname must be added to the
 ypservers map so that
 .Xr yppush 8
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/yppush.8 man8/yppush.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/yppush.8	Thu Jan 27 23:38:04 2000
+++ man8/yppush.8	Tue Mar 21 06:32:24 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.11 2000/01/23 20:33:38 charnier Exp $
+.\" $FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.12 2000/03/01 14:08:44 sheldonh Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
@@ -51,9 +51,11 @@
 distributes updated NIS databases (or
 .Pa maps )
 from an NIS master server to NIS slave servers within an NIS
-domain. It is normally only run on the NIS master by
+domain.
+It is normally only run on the NIS master by
 .Pa /var/yp/Makefile
-whenever any of the NIS maps are updated. Note that
+whenever any of the NIS maps are updated.
+Note that
 .Pa /var/yp/Makefile
 does not invoke
 .Nm
@@ -82,7 +84,8 @@
 .Xr ypxfr 8
 to successfully 'callback' to
 .Nm
-and carry out the transfer. Any error messages
+and carry out the transfer.
+Any error messages
 .Nm
 receives from
 .Xr ypxfr 8
@@ -91,11 +94,14 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar domain
-Specify a particular domain. The NIS domain of
-the local host system is used by default. If the local host's domain
+Specify a particular domain.
+The NIS domain of
+the local host system is used by default.
+If the local host's domain
 name is not set, the domain name must be specified with this flag.
 .It Fl t Ar timeout
-Specify a timeout value in seconds. This timeout
+Specify a timeout value in seconds.
+This timeout
 controls how long
 .Nm
 will wait for a response from a slave server before sending a
@@ -104,14 +110,17 @@
 .Nm Yppush
 normally performs transfers serially, meaning that it will
 send a map transfer request to one slave server and then wait for
-it to respond before moving on to the next slave server. In environments
+it to respond before moving on to the next slave server.
+In environments
 with many slaves, it is more efficient to initiate several map transfers
-at once so that the transfers can take place in parallel. The
+at once so that the transfers can take place in parallel.
+The
 .Fl j
 flag is used to specify the desired number of parallel jobs:
 .Nm
 will initiate the specified number of transfers immediately and
-listen for responses. If the number of specified parallel jobs is
+listen for responses.
+If the number of specified parallel jobs is
 less than the number of slave servers,
 .Nm
 will initiate only the number of specified jobs and then wait
@@ -145,7 +154,8 @@
 .It Fl v
 Verbose mode: causes
 .Nm
-to print debugging messages as it runs. Specifying this flag twice
+to print debugging messages as it runs.
+Specifying this flag twice
 makes
 .Nm
 even more verbose.
diff -urNP /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ypserv.8 man8/ypserv.8
--- /home/horikawa/man-jp/work/fbsd-4.0-20000127-CURRENT/man/man8/ypserv.8	Thu Jan 27 23:38:04 2000
+++ man8/ypserv.8	Tue Mar 21 06:32:24 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/ypserv/ypserv.8,v 1.20 2000/01/23 02:10:01 mpp Exp $
+.\" $FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.22 2000/03/02 14:53:40 sheldonh Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -44,7 +44,8 @@
 .Sh DESCRIPTION
 .Tn NIS
 is an RPC-based service designed to allow a number of UNIX-based
-machines to share a common set of configuration files. Rather than
+machines to share a common set of configuration files.
+Rather than
 requiring a system administrator to update several copies of files
 such as
 .Pa /etc/hosts ,
@@ -70,7 +71,8 @@
 .Nm
 using the
 .Xr domainname 1
-command. The clients must also run
+command.
+The clients must also run
 .Xr ypbind 8
 in order to attach to a particular server, since it is possible to
 have several servers within a single
@@ -83,7 +85,8 @@
 .Pa /var/yp/[domainname]
 where
 .Pa domainname
-is the name of the domain being served. There can be several
+is the name of the domain being served.
+There can be several
 such directories with different domainnames, and you need only one
 .Nm
 daemon to handle them all.
@@ -93,13 +96,15 @@
 as they are often called,
 are created by
 .Pa /var/yp/Makefile
-using several system files as source. The database files are in
+using several system files as source.
+The database files are in
 .Xr db 3
 format to help speed retrieval when there are many records involved.
 In
 .Fx ,
 the maps are always readable and writable only by root for security
-reasons. Technically this is only necessary for the password
+reasons.
+Technically this is only necessary for the password
 maps, but since the data in the other maps can be found in
 other world-readable files anyway, it doesn't hurt and it's considered
 good general practice.
@@ -120,7 +125,8 @@
 normally only stores encrypted passwords
 in
 .Pa /etc/master.passwd ,
-which is readable and writable only by root. By turning this file
+which is readable and writable only by root.
+By turning this file
 into an
 .Tn NIS
 map, this security feature would be completely defeated.
@@ -133,10 +139,12 @@
 .Pa master.passwd.byname
 and
 .Pa master.basswd.byuid
-maps in a special way. When the server receives a request to access
+maps in a special way.
+When the server receives a request to access
 either of these two maps, it will check the TCP port from which the
 request originated and return an error if the port number is greater
-than 1023. Since only the superuser is allowed to bind to TCP ports
+than 1023.
+Since only the superuser is allowed to bind to TCP ports
 with values less than 1024, the server can use this test to determine
 whether or not the access request came from a privileged user.
 Any requests made by non-privileged users are therefore rejected.
@@ -155,12 +163,14 @@
 .Pa passwd.byname
 and
 .Pa passwd.byuid
-maps will be accessed instead. The latter two maps are constructed by
+maps will be accessed instead.
+The latter two maps are constructed by
 .Pa /var/yp/Makefile
 by parsing the
 .Pa master.passwd
 file and stripping out the password fields, and are therefore
-safe to pass on to unprivileged users. In this way, the shadow password
+safe to pass on to unprivileged users.
+In this way, the shadow password
 aspect of the protected
 .Pa master.passwd
 database is maintained through
@@ -213,7 +223,8 @@
 and retrieve the contents of your
 .Tn NIS
 maps, provided the remote user
-knows your domain name. To prevent such unauthorized transactions,
+knows your domain name.
+To prevent such unauthorized transactions,
 .Nm
 supports a feature called
 .Pa securenets
@@ -226,12 +237,14 @@
 (Note that this path varies depending on the path specified with
 the
 .Fl p
-option, which is explained below.) This file contains entries
+option, which is explained below.)
+This file contains entries
 that consist of a network specification and a network mask separated
 by white space.
 Lines starting with
 .Dq \&#
-are considered to be comments. A
+are considered to be comments.
+A
 sample securenets file might look like this:
 .Bd -unfilled -offset indent
 # allow connections from local host -- mandatory
@@ -247,9 +260,11 @@
 If
 .Nm
 receives a request from an address that matches one of these rules,
-it will process the request normally. If the address fails to match
+it will process the request normally.
+If the address fails to match
 a rule, the request will be ignored and a warning message will be
-logged. If the
+logged.
+If the
 .Pa /var/yp/securenets
 file does not exist,
 .Nm
@@ -270,7 +285,8 @@
 .Pa tcpd.h ,
 you can easily recompile
 .Nm
-with them. This allows the administrator to use the tcpwrapper
+with them.
+This allows the administrator to use the tcpwrapper
 configuration files (
 .Pa /etc/hosts.allow
 and
@@ -297,7 +313,8 @@
 .Tn NIS
 v2 protocol, however other implementations
 include support for the v1 protocol for backwards compatibility
-with older systems. The
+with older systems.
+The
 .Xr ypbind 8
 daemons supplied with these systems will try to establish a binding
 to an
@@ -311,18 +328,21 @@
 be used as a master or slave in conjunction with older
 .Tn NIS
 servers that
-only support the v1 protocol. Fortunately, there probably aren't any
+only support the v1 protocol.
+Fortunately, there probably aren't any
 such servers still in use today.
 .Ss NIS servers that are also NIS clients
 Care must be taken when running
 .Nm
 in a multi-server domain where the server machines are also
 .Tn NIS
-clients. It is generally a good idea to force the servers to
+clients.
+It is generally a good idea to force the servers to
 bind to themselves rather than allowing them to broadcast bind
 requests and possibly become bound to each other: strange failure
 modes can result if one server goes down and
-others are dependent upon on it. (Eventually all the clients will
+others are dependent upon on it.
+(Eventually all the clients will
 time out and attempt to bind to other servers, but the delay
 involved can be considerable and the failure mode is still present
 since the servers might bind to each other all over again).
@@ -342,16 +362,19 @@
 .Pa hosts.byname
 and
 .Pa hosts.byaddress
-maps. By default, if
+maps.
+By default, if
 .Nm
 can't find an entry for a given host in its hosts maps, it will
-return an error and perform no further processing. With the
+return an error and perform no further processing.
+With the
 .Fl n
 flag,
 .Nm
 will go one step further: rather than giving up immediately, it
 will try to resolve the hostname or address using a DNS nameserver
-query. If the query is successful,
+query.
+If the query is successful,
 .Nm
 will construct a fake database record and return it to the client,
 thereby making it seem as though the client's yp_match request
@@ -371,20 +394,25 @@
 .Tn NIS
 clients.
 .It Fl d
-Cause the server to run in debugging mode. Normally,
+Cause the server to run in debugging mode.
+Normally,
 .Nm
 reports only unusual errors (access violations, file access failures)
 using the
 .Xr syslog 3
-facility. In debug mode, the server does not background
+facility.
+In debug mode, the server does not background
 itself and prints extra status messages to stderr for each
-request that it receives. Also, while running in debug mode,
+request that it receives.
+Also, while running in debug mode,
 .Nm
 will not spawn any additional subprocesses as it normally does
-when handling yp_all requests or doing DNS lookups. (These actions
+when handling yp_all requests or doing DNS lookups.
+(These actions
 often take a fair amount of time to complete and are therefore handled
 in subprocesses, allowing the parent server process to go on handling
-other requests.) This makes it easier to trace the server with
+other requests.)
+This makes it easier to trace the server with
 a debugging tool.
 .It Fl p Ar path
 Normally,

----Next_Part(Mon_May_29_23:30:11_2000_601)----
