From owner-man-jp-reviewer@jp.freebsd.org  Sat Aug 28 23:14:06 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id XAA32868;
	Sat, 28 Aug 1999 23:14:06 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.yk.rim.or.jp (root@mail.yk.rim.or.jp [202.247.130.37])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id XAA32861
	for <man-jp-reviewer@jp.freebsd.org>; Sat, 28 Aug 1999 23:14:04 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (ppp883.yk.rim.or.jp [202.247.185.134])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id XAA04725
	for <man-jp-reviewer@jp.freebsd.org>; Sat, 28 Aug 1999 23:13:35 +0900 (JST)
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(Sat_Aug_28_23:03:34_1999_41)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990828231310M.k-horik@yk.rim.or.jp>
Date: Sat, 28 Aug 1999 23:13:10 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 6397
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: man-jp-reviewer 1534
Subject: [man-jp-reviewer 1534] diff to 3.2-19990824-STABLE
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: k-horik@yk.rim.or.jp

----Next_Part(Sat_Aug_28_23:03:34_1999_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 $BKY@n$G$9!#(B

 3.2-19990824-STABLE $B$X$N:9J,$G$9!#(B

 vinum.8 $B$O8+D>$7$,B-$j$J$$$+$b$7$l$^$;$s!#(B

----Next_Part(Sat_Aug_28_23:03:34_1999_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: English diff
Content-Disposition: attachment; filename=diff_3.2-19990824-STABLE

diff -urNP fbsd-3.2-19990816-STABLE/man/man1/chfn.1 man1/chfn.1
--- fbsd-3.2-19990816-STABLE/man/man1/chfn.1	Mon Aug 16 18:33:10 1999
+++ man1/chfn.1	Tue Aug 24 18:36:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp $
+.\"     $Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/chpass.1 man1/chpass.1
--- fbsd-3.2-19990816-STABLE/man/man1/chpass.1	Mon Aug 16 18:33:10 1999
+++ man1/chpass.1	Tue Aug 24 18:36:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp $
+.\"     $Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/chsh.1 man1/chsh.1
--- fbsd-3.2-19990816-STABLE/man/man1/chsh.1	Mon Aug 16 18:33:10 1999
+++ man1/chsh.1	Tue Aug 24 18:36:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp $
+.\"     $Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/idprio.1 man1/idprio.1
--- fbsd-3.2-19990816-STABLE/man/man1/idprio.1	Mon Aug 16 18:34:12 1999
+++ man1/idprio.1	Tue Aug 24 18:37:11 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rtprio.1,v 1.15 1998/03/23 08:28:58 charnier Exp $
+.\"	$Id: rtprio.1,v 1.15.2.1 1999/08/18 07:41:13 chris Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -144,7 +144,7 @@
 .Ed
 .Pp
 To run
-.Xr tcpdump 8
+.Xr tcpdump 1
 without realtime priority:
 .Bd -literal -offset indent -compact
 .Sy "rtprio -t tcpdump"
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/kbdcontrol.1 man1/kbdcontrol.1
--- fbsd-3.2-19990816-STABLE/man/man1/kbdcontrol.1	Mon Aug 16 18:34:00 1999
+++ man1/kbdcontrol.1	Tue Aug 24 18:37:00 1999
@@ -20,12 +20,13 @@
 .Nd a utility for manipulating the syscons console driver
 .Sh SYNOPSIS
 .Nm
-.Op Fl dFx
+.Op Fl dFKix
 .Op Fl b Ar duration.pitch | Ar belltype
 .Op Fl r Ar delay.repeat | Ar speed
 .Op Fl l Ar keymap_file
 .Op Fl f Ar # Ar string
 .Op Fl h Ar size
+.Op Fl k Ar keyboard_device
 .Op Fl L Ar keymap_file
 .Sh DESCRIPTION
 The
@@ -51,9 +52,11 @@
 .Ar belltype
 argument is specified, it may be one of 
 .Cm normal
-which set sound parameters back to normal values, or 
+which sets sound parameters back to normal values,
+.Cm off
+which disables the bell entirely, or
 .Cm visual
-which set the bell to visual mode, i.e. flashes the screen instead.
+which sets the bell to visual mode, i.e. flashes the screen instead.
 If 
 .Ar belltype
 is preceded by the word
@@ -104,6 +107,15 @@
 Set history buffer size to
 .Ar size
 lines.
+.It Fl i
+Print brief information about the keyboard.
+.It Fl K
+Disconnect the keyboard from the console.
+You need to use the
+.Fl k
+option below to associate a keyboard with the console again.
+.It Fl k Ar keyboard_device
+Use the specified device as the console keyboard.
 .It Fl L Ar keymap_file
 Load keyboard map file from
 .Ar keymap_file
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/manpath.1 man1/manpath.1
--- fbsd-3.2-19990816-STABLE/man/man1/manpath.1	Mon Aug 16 18:31:15 1999
+++ man1/manpath.1	Tue Aug 24 18:34:16 1999
@@ -4,7 +4,7 @@
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the README file that comes with the man 1.0
-.\" distribution.  
+.\" distribution.
 .\"
 .\" John W. Eaton
 .\" jwe@che.utexas.edu
@@ -12,7 +12,8 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.Dd Jan 5, 1991
+.\" $Id: manpath.man,v 1.3.2.1 1999/08/21 07:23:40 ru Exp $
+.Dd Aug 16, 1999
 .Dt MANPATH 1
 .Os
 .Sh NAME
@@ -22,27 +23,34 @@
 .Nm
 .Op Fl q
 .Sh DESCRIPTION
-.Nm manpath
+.Nm Manpath
 tries to determine the user's manpath from a set of system
 defaults and the user's
 .Ev PATH ,
-echoing the result to the standard output.  Warnings and errors are
-written to the standard error.
-If a directory in the user's path is not listed in the manpath.config
-file, manpath looks for the subdirectories man or MAN.  If they exist,
-they are added to the search path.
-.Pp
+echoing the result to the standard output.
+Warnings and errors are written to the standard error.
+If a directory in the user's path is not listed in the
+.Pa /etc/manpath.config
+file,
 .Nm
+looks for the subdirectories
+.Pa man
+or
+.Pa MAN .
+If they exist, they are added to the search path.
+.Pp
+.Nm Manpath
 is used by
-.Nm man
-to determine the search path, so user's normally don't need to set the
+.Xr man 1
+to determine the search path, so users normally don't need to set the
 .Ev MANPATH
 environment variable directly.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width Fl
 .It Fl q
-Operate quietly.  Only echo the final manpath.
+Operate quietly.
+Only echo the final manpath.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width MANPATH -compact
@@ -50,7 +58,7 @@
 If
 .Ev MANPATH
 is set,
-.Nm manpath
+.Nm
 echoes its value on the standard output and issues a warning on the
 standard error.
 .El
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/pkg_add.1 man1/pkg_add.1
--- fbsd-3.2-19990816-STABLE/man/man1/pkg_add.1	Mon Aug 16 18:34:08 1999
+++ man1/pkg_add.1	Tue Aug 24 18:37:07 1999
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\"     $Id: pkg_add.1,v 1.29.2.2 1999/08/15 12:51:09 mpp Exp $
+.\"     $Id: pkg_add.1,v 1.29.2.3 1999/08/23 03:59:43 mharo Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_ADD 1
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/pkg_create.1 man1/pkg_create.1
--- fbsd-3.2-19990816-STABLE/man/man1/pkg_create.1	Mon Aug 16 18:34:08 1999
+++ man1/pkg_create.1	Tue Aug 24 18:37:07 1999
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\"	$Id: pkg_create.1,v 1.27.2.1 1999/08/15 12:51:10 mpp Exp $	
+.\"	$Id: pkg_create.1,v 1.27.2.2 1999/08/23 03:59:45 mharo Exp $	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/pkg_delete.1 man1/pkg_delete.1
--- fbsd-3.2-19990816-STABLE/man/man1/pkg_delete.1	Mon Aug 16 18:34:08 1999
+++ man1/pkg_delete.1	Tue Aug 24 18:37:07 1999
@@ -15,6 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
+.\"     $Id: pkg_delete.1,v 1.11.2.2 1999/08/23 03:59:47 mharo Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_DELETE 1
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/pkg_info.1 man1/pkg_info.1
--- fbsd-3.2-19990816-STABLE/man/man1/pkg_info.1	Mon Aug 16 18:34:08 1999
+++ man1/pkg_info.1	Tue Aug 24 18:37:07 1999
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\"     $Id: pkg_info.1,v 1.19.2.1 1999/08/15 12:51:12 mpp Exp $
+.\"     $Id: pkg_info.1,v 1.19.2.2 1999/08/23 03:59:50 mharo Exp $
 .\"
 .Dd November 25, 1994
 .Dt PKG_INFO 1
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/rtprio.1 man1/rtprio.1
--- fbsd-3.2-19990816-STABLE/man/man1/rtprio.1	Mon Aug 16 18:34:12 1999
+++ man1/rtprio.1	Tue Aug 24 18:37:11 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rtprio.1,v 1.15 1998/03/23 08:28:58 charnier Exp $
+.\"	$Id: rtprio.1,v 1.15.2.1 1999/08/18 07:41:13 chris Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -144,7 +144,7 @@
 .Ed
 .Pp
 To run
-.Xr tcpdump 8
+.Xr tcpdump 1
 without realtime priority:
 .Bd -literal -offset indent -compact
 .Sy "rtprio -t tcpdump"
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/ypchfn.1 man1/ypchfn.1
--- fbsd-3.2-19990816-STABLE/man/man1/ypchfn.1	Mon Aug 16 18:33:10 1999
+++ man1/ypchfn.1	Tue Aug 24 18:36:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp $
+.\"     $Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/ypchpass.1 man1/ypchpass.1
--- fbsd-3.2-19990816-STABLE/man/man1/ypchpass.1	Mon Aug 16 18:33:10 1999
+++ man1/ypchpass.1	Tue Aug 24 18:36:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp $
+.\"     $Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/ypchsh.1 man1/ypchsh.1
--- fbsd-3.2-19990816-STABLE/man/man1/ypchsh.1	Mon Aug 16 18:33:10 1999
+++ man1/ypchsh.1	Tue Aug 24 18:36:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp $
+.\"     $Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -407,7 +407,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man1/zforce.1 man1/zforce.1
--- fbsd-3.2-19990816-STABLE/man/man1/zforce.1	Mon Aug 16 18:31:15 1999
+++ man1/zforce.1	Tue Aug 24 18:34:15 1999
@@ -3,7 +3,7 @@
 zforce \- force a '.gz' extension on all gzip files
 .SH SYNOPSIS
 .B zforce
-[ name ...  ]
+name ...
 .SH DESCRIPTION
 .I  zforce
 forces a .gz extension on all
@@ -12,9 +12,7 @@
 .I gzip
 will not compress them twice.
 This can be useful for files with names truncated after a file transfer.
-On systems with a 14 char limitation on file names, the original name
-is truncated to make room for the .gz suffix. For example,
-12345678901234 is renamed to 12345678901.gz. A file name such as foo.tgz
-is left intact.
+For example, 12345678901 is renamed to 12345678901.gz.
+A file name such as foo.tgz is left intact.
 .SH "SEE ALSO"
 gzip(1), znew(1), zmore(1), zgrep(1), zdiff(1), gzexe(1)
diff -urNP fbsd-3.2-19990816-STABLE/man/man5/amd.conf.5 man5/amd.conf.5
--- fbsd-3.2-19990816-STABLE/man/man5/amd.conf.5	Mon Aug 16 18:33:53 1999
+++ man5/amd.conf.5	Tue Aug 24 18:36:53 1999
@@ -38,7 +38,7 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: amd.conf.5,v 1.6.2.1 1999/08/14 22:17:11 chris Exp $
+.\" $Id: amd.conf.5,v 1.6.2.2 1999/08/18 07:40:52 chris Exp $
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
@@ -342,7 +342,7 @@
 is given,
 .Nm amd
 will record its events with the system logger
-.Xr syslog 8 .
+.Xr syslogd 8 .
 The default syslog facility used is
 .Ev LOG_DAEMON .
 If you wish to change it, append its name to the log file name, delimited by a
diff -urNP fbsd-3.2-19990816-STABLE/man/man5/loader.conf.5 man5/loader.conf.5
--- fbsd-3.2-19990816-STABLE/man/man5/loader.conf.5	Mon Aug 16 18:33:01 1999
+++ man5/loader.conf.5	Tue Aug 24 18:36:00 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.conf.5,v 1.1.2.1 1999/04/24 17:44:35 dcs Exp $
+.\"	$Id: loader.conf.5,v 1.1.2.2 1999/08/18 07:41:07 chris Exp $
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
@@ -57,7 +57,7 @@
 Though
 .Nm loader.conf Ns No 's
 format was defined explicitly to resemble
-.Xr rc.conf 8 ,
+.Xr rc.conf 5 ,
 and can be sourced by
 .Xr sh 1 ,
 some settings are treated in a special fashion. Also, the
diff -urNP fbsd-3.2-19990816-STABLE/man/man5/rc.conf.5 man5/rc.conf.5
--- fbsd-3.2-19990816-STABLE/man/man5/rc.conf.5	Mon Aug 16 18:32:51 1999
+++ man5/rc.conf.5	Tue Aug 24 18:35:49 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: rc.conf.5,v 1.27.2.5 1999/08/15 13:51:02 mpp Exp $
+.\"     $Id: rc.conf.5,v 1.27.2.9 1999/08/23 23:25:00 brian Exp $
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
@@ -93,6 +93,12 @@
 (str) List of ethernet devices (e.g.
 .Ar "ed0 ed1 ep0 ..." )
 which should be dynamically ifconfig'd on insertion or boot.
+.It Ar pccardd_flags
+(str) If 
+.Ar pccard_enable 
+is set to 
+.Ar YES , 
+these are the flags to pass to the pccardd(8) daemon.
 .It Ar local_startup
 (str) List of directories to search for startup script files.
 .It Ar local_periodic
@@ -214,7 +220,7 @@
 and
 .Ar dedicated .
 See the manual for a full description.
-.It Ar ppp_alias
+.It Ar ppp_nat
 (bool) If set to
 .Ar YES ,
 enables packet aliasing. Used in conjunction with
@@ -611,7 +617,7 @@
 (bool) If set to
 .Ar YES
 then run the
-.Xr ipxrouted 8
+.Xr IPXrouted 8
 daemon at system boot time.
 .It Ar ipxrouted_flags
 (str) If
@@ -619,7 +625,7 @@
 is set to
 .Ar YES ,
 these are the flags to pass to the
-.Xr ipxrouted 8
+.Xr IPXrouted 8
 daemon.
 .It Ar arpproxy_all
 If set to
@@ -828,19 +834,33 @@
 .Ar auto
 to let the daemon detect it, or
 select one from the following list if the automatic detection fails.
+.Pp
+If your mouse is attached to the PS/2 mouse port, you should
+always choose
+.Ar auto
+or
+.Ar ps/2 ,
+regardless of the brand and model of the mouse.  Likewise, if your
+mouse is attached to the bus mouse port, choose
+.Ar auto
+or
+.Ar busmouse .
+All other protocols are for serial mice and will not work with 
+the PS/2 and bus mice.
 .Bd -literal
-microsoft        Microsoft mouse
-intellimouse     Microsoft IntelliMouse
-mousesystems     Mouse systems Corp mouse
-mmseries         MM Series mouse
-logitech         Logitech mouse
+microsoft        Microsoft mouse (serial)
+intellimouse     Microsoft IntelliMouse (serial)
+mousesystems     Mouse systems Corp mouse (serial)
+mmseries         MM Series mouse (serial)
+logitech         Logitech mouse (serial)
 busmouse         A bus mouse
-mouseman         Logitech MouseMan and TrackMan
-glidepoint       ALPS GlidePoint
-thinkingmouse    Kensignton ThinkingMouse
+mouseman         Logitech MouseMan and TrackMan (serial)
+glidepoint       ALPS GlidePoint (serial)
+thinkingmouse    Kensignton ThinkingMouse (serial)
 ps/2             PS/2 mouse
-mmhittab         MM HitTablet
-x10mouseremote   X10 MouseRemote
+mmhittab         MM HitTablet (serial)
+x10mouseremote   X10 MouseRemote (serial)
+versapad         Interlink VersaPad (serial)
 
 .Ed
 Even if your mouse is not in the above list, it may be compatible
diff -urNP fbsd-3.2-19990816-STABLE/man/man7/environ.7 man7/environ.7
--- fbsd-3.2-19990816-STABLE/man/man7/environ.7	Mon Aug 16 18:32:52 1999
+++ man7/environ.7	Tue Aug 24 18:35:50 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)environ.7	8.3 (Berkeley) 4/19/94
-.\"	$Id: environ.7,v 1.10.2.1 1999/04/29 09:33:39 jkoshy Exp $
+.\"	$Id: environ.7,v 1.10.2.2 1999/08/18 19:55:04 mpp Exp $
 .\"
 .Dd April 19, 1994
 .Dt ENVIRON 7
@@ -62,6 +62,8 @@
 or ``m'' and in units of a gigabyte by specifying a number followed
 by ``G'' or ``g''.
 Sizes less than 512 bytes or greater than a gigabyte are ignored.
+.It Ev EDITOR
+Default editor name.
 .It Ev EXINIT
 A startup list of commands read by
 .Xr ex  1
@@ -83,6 +85,12 @@
 .Xr mail  1 ,
 .Xr sh 1 ,
 and many other mailclients.
+.It Ev PAGER
+Default paginator program.  The program specified by this variable is used by
+.Xr mail 1 ,
+.Xr man 1 ,
+.Xr ftp 1 ,
+etc, to display information which is longer than the current display.
 .It Ev PATH
 The sequence of directories, separated by colons, searched by
 .Xr csh  1  ,
@@ -99,6 +107,8 @@
 .Xr lpq  1 ,
 and
 .Xr lprm  1  .
+.It Ev PWD
+The current directory pathname.
 .It Ev SHELL
 The full pathname of the user's login shell.
 .It Ev TERM
diff -urNP fbsd-3.2-19990816-STABLE/man/man7/hier.7 man7/hier.7
--- fbsd-3.2-19990816-STABLE/man/man7/hier.7	Mon Aug 16 18:32:52 1999
+++ man7/hier.7	Tue Aug 24 18:35:50 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\"	$Id: hier.7,v 1.16.2.1 1999/02/18 00:58:20 jkh Exp $
+.\"	$Id: hier.7,v 1.16.2.2 1999/08/21 04:46:23 chris Exp $
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -545,8 +545,6 @@
 .Xr msgs 1
 .It Li quotas/ 
 filesystem quota information files
-.It preserve
-???
 .It Li run/
 system information files describing various info about
 system since it was booted
diff -urNP fbsd-3.2-19990816-STABLE/man/man7/ports.7 man7/ports.7
--- fbsd-3.2-19990816-STABLE/man/man7/ports.7	Mon Aug 16 18:32:52 1999
+++ man7/ports.7	Tue Aug 24 18:35:50 1999
@@ -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.
 .\"
-.\" $Id: ports.7,v 1.9.2.5 1999/08/15 13:51:03 mpp Exp $
+.\" $Id: ports.7,v 1.9.2.6 1999/08/21 17:25:52 hoek Exp $
 .\"
 .Dd January 25, 1998
 .Dt PORTS 7
@@ -137,7 +137,7 @@
 .Bl -tag -width fetch-list
 .It Ar fetch-list
 Show list of files needed to be fetched in order to build the port.
-.It Ar depends-list package-depends
+.It Ar pretty-print-run-depends-list pretty-print-build-depends-list
 Print a list of all the compile and run dependencies, and dependencies
 of those dependencies.
 .It Ar clean
diff -urNP fbsd-3.2-19990816-STABLE/man/man7/security.7 man7/security.7
--- fbsd-3.2-19990816-STABLE/man/man7/security.7	Mon Aug 16 18:32:52 1999
+++ man7/security.7	Tue Aug 24 18:35:50 1999
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\"	$Id: security.7,v 1.4.2.1 1999/04/01 02:10:38 ghelmer Exp $
+.\"	$Id: security.7,v 1.4.2.2 1999/08/18 07:41:03 chris Exp $
 .\"
 .Dd December 20, 1998
 .Dt SECURITY 7
@@ -392,7 +392,7 @@
 Process accounting
 .Po
 see
-.Xr accton 1
+.Xr accton 8
 .Pc
 is a relatively low-overhead feature of
 the operating system which I recommend using as a post-break-in evaluation
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/ccdconfig.8 man8/ccdconfig.8
--- fbsd-3.2-19990816-STABLE/man/man8/ccdconfig.8	Mon Aug 16 18:32:16 1999
+++ man8/ccdconfig.8	Tue Aug 24 18:35:16 1999
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ccdconfig.8,v 1.6 1998/11/19 20:22:10 asami Exp $
+.\"	$Id: ccdconfig.8,v 1.6.2.1 1999/08/17 07:05:13 jkoshy Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
@@ -138,6 +138,12 @@
 ccd0            16      none    /dev/da2e /dev/da3e
 .Ed
 .Pp
+The component devices need to name partitions of type 
+.Li FS_BSDFFS
+(or
+.Dq 4.2BSD
+as shown by
+.Xr disklabel 8 ).
 .Sh EXAMPLE
 The following command, executed from the command line, would configure ccd0
 with 4 components (/dev/da2e, /dev/da3e, /dev/da4e, /dev/da5e), and an
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/edquota.8 man8/edquota.8
--- fbsd-3.2-19990816-STABLE/man/man8/edquota.8	Mon Aug 16 18:33:58 1999
+++ man8/edquota.8	Tue Aug 24 18:36:58 1999
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
+.\"	$Id: edquota.8,v 1.6.2.1 1999/08/16 21:47:55 chris Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
@@ -165,8 +166,8 @@
 .El
 .Sh SEE ALSO
 .Xr quota 1 ,
-.Xr fstab 2 ,
 .Xr quotactl 2 ,
+.Xr fstab 5 ,
 .Xr quotacheck 8 ,
 .Xr quotaon 8 ,
 .Xr repquota 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/fdisk.8 man8/fdisk.8
--- fbsd-3.2-19990816-STABLE/man/man8/fdisk.8	Mon Aug 16 18:32:32 1999
+++ man8/fdisk.8	Tue Aug 24 18:35:32 1999
@@ -1,4 +1,4 @@
-.\"	$Id: fdisk.8,v 1.11.2.3 1999/07/28 09:51:18 rnordier Exp $
+.\"	$Id: fdisk.8,v 1.11.2.4 1999/08/23 11:06:59 phk Exp $
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
@@ -8,7 +8,7 @@
 .Nd PC partition table maintenance program
 .Sh SYNOPSIS
 .Nm fdisk
-.Op Fl Baitu
+.Op Fl Baeitu
 .Op Fl b Ar bootcode
 .Op Fl 1234
 .Op Ar disk
@@ -50,11 +50,6 @@
 and is designed to be used by other scripts/programs.
 .Pp
 Options are:
-.It Fl B
-Reinitialize the boot code contained in sector 0 of the disk.  Ignored
-if
-.Fl f
-is given.
 .It Fl a
 Change the active partition only.  Ignored if
 .Fl f
@@ -62,6 +57,13 @@
 .It Fl b Ar bootcode
 Get the boot code from the file
 .Ar bootcode .
+.It Fl B
+Reinitialize the boot code contained in sector 0 of the disk.  Ignored
+if
+.Fl f
+is given.
+.It Fl e
+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
 .Ar configfile .
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/hlfsd.8 man8/hlfsd.8
--- fbsd-3.2-19990816-STABLE/man/man8/hlfsd.8	Mon Aug 16 18:33:53 1999
+++ man8/hlfsd.8	Tue Aug 24 18:36:53 1999
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: hlfsd.8,v 1.3 1998/09/12 04:04:58 obrien Exp $
+.\" $Id: hlfsd.8,v 1.3.2.1 1999/08/18 07:40:47 chris Exp $
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
@@ -265,7 +265,7 @@
 must be compliant with 
 .Ux 
 System 7 colon-delimited format
-.Xr passwd 4 .
+.Xr passwd 5 .
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /hlfs
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/ipfw.8 man8/ipfw.8
--- fbsd-3.2-19990816-STABLE/man/man8/ipfw.8	Mon Aug 16 18:32:21 1999
+++ man8/ipfw.8	Tue Aug 24 18:35:21 1999
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: ipfw.8,v 1.47.2.5 1999/06/17 13:03:37 ru Exp $
+.\" $Id: ipfw.8,v 1.47.2.6 1999/08/16 17:29:52 luigi Exp $
 .\"
 .Dd July 20, 1996
 .Dt IPFW 8
@@ -48,6 +48,7 @@
 .Oc
 add
 .Op Ar number
+.Op prob match_probability
 .Ar action 
 .Op log
 .Ar proto
@@ -203,6 +204,16 @@
 a byte count.
 These counters are updated when a packet matches the rule.
 .Pp
+If a rule has the optional
+.Dq prob match_probability
+specifier, where the match_probability is a floating point number
+between 0 and 1, a match is only declared with the specified
+probability. This can be useful for a number of applications
+such as random packet drop or (in conjunction with
+.Xr dummynet 4
+) to simulate the effect of multiple paths leading to out-of-order
+packet delivery.
+.Pp
 The rules are ordered by a 
 .Dq line-number
 from 1 to 65534 that is used
@@ -378,6 +389,15 @@
 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
+Pass packet to a
+.Xr dummynet 4
+``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
 Skip all subsequent rules numbered less than
 .Ar number .
@@ -694,6 +714,7 @@
 .Xr cpp 1 ,
 .Xr m4 1 ,
 .Xr divert 4 ,
+.Xr dummynet 4 ,
 .Xr ip 4 ,
 .Xr ipfirewall 4 ,
 .Xr protocols 5 ,
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/linux.8 man8/linux.8
--- fbsd-3.2-19990816-STABLE/man/man8/linux.8	Mon Aug 16 18:33:06 1999
+++ man8/linux.8	Tue Aug 24 18:36:05 1999
@@ -22,7 +22,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.
 .\"
-.\" $Id: linux.8,v 1.3.2.2 1999/04/23 16:15:50 ghelmer Exp $
+.\" $Id: linux.8,v 1.3.2.3 1999/08/19 00:14:15 mpp Exp $
 .\"
 .Dd January 9, 1997
 .Dt LINUX 8
@@ -43,5 +43,5 @@
 .Sh SEE ALSO
 .Xr kld 4 ,
 .Xr kldload 8 ,
-.Xr kldunload 8 ,
-.Xr kldstat 8
+.Xr kldstat 8 ,
+.Xr kldunload 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/mount.8 man8/mount.8
--- fbsd-3.2-19990816-STABLE/man/man8/mount.8	Mon Aug 16 18:32:23 1999
+++ man8/mount.8	Tue Aug 24 18:35:23 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\"	$Id: mount.8,v 1.24.2.1 1999/04/08 14:00:59 ghelmer Exp $
+.\"	$Id: mount.8,v 1.24.2.2 1999/08/19 10:14:48 jkoshy Exp $
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
@@ -101,6 +101,8 @@
 Options are specified with a
 .Fl o
 flag followed by a comma separated string of options.
+In case of conflicting options being specified, the rightmost option
+takes effect.
 The following options are available:
 .Bl -tag -width indent
 .It async
@@ -112,12 +114,23 @@
 flag to set,
 and should not be used unless you are prepared to recreate the file
 system should your system crash.
+.It current
+When used with the
+.Fl u
+flag, this is the same as specifying the options currently in effect for
+the mounted filesystem.
 .It force
 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
 forces the R/W mount of an unclean filesystem (dangerous; use with caution).
+.It fstab
+When used with the
+.Fl u
+flag, this is the same as specifying all the options listed in the
+.Xr fstab 5
+file for the filesystem.
 .It noatime
 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
@@ -287,13 +300,9 @@
 files on the filesystem are currently open for writing unless the
 .Fl f
 flag is also specified.
-The set of options is determined by first extracting the options
-for the file system from the
-.Xr fstab 5
-table,
-then applying any options specified by the
-.Fl o
-argument,
+The set of options is determined by applying the options specified 
+in the argument to 
+.Fl o 
 and finally applying the
 .Fl r
 or
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/mount_cd9660.8 man8/mount_cd9660.8
--- fbsd-3.2-19990816-STABLE/man/man8/mount_cd9660.8	Mon Aug 16 18:32:23 1999
+++ man8/mount_cd9660.8	Tue Aug 24 18:35:23 1999
@@ -34,6 +34,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
+.\"     $Id: mount_cd9660.8,v 1.6.2.3 1999/08/16 21:47:49 chris Exp $
+.\"
 .Dd March 27, 1994
 .Dt MOUNT_CD9660 8
 .Os BSD 4
@@ -108,16 +110,16 @@
 as for example the
 .Cm info
 command of
-.Xr cdcontrol 8
+.Xr cdcontrol 1
 is printing.
 .It Fl v
 Be verbose about the starting sector decisions made.
 .El
 .Sh SEE ALSO
+.Xr cdcontrol 1 ,
 .Xr mount 2 ,
 .Xr unmount 2 ,
 .Xr fstab 5 ,
-.Xr cdcontrol 8 ,
 .Xr mount 8
 .Sh BUGS
 POSIX device node mapping is currently not supported.
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/moused.8 man8/moused.8
--- fbsd-3.2-19990816-STABLE/man/man8/moused.8	Mon Aug 16 18:34:03 1999
+++ man8/moused.8	Tue Aug 24 18:37:03 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: moused.8,v 1.18.2.2 1999/08/14 22:30:18 chris Exp $
+.\"	$Id: moused.8,v 1.18.2.3 1999/08/21 11:46:41 yokota Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSED 8
@@ -274,6 +274,8 @@
 X10 MouseRemote.
 .It Ar kidspad
 Genius Kidspad and Easypad protocol.
+.It Ar versapad
+Interlink VersaPad protocol.
 .El
 .Pp
 For the bus and InPort mouse:
@@ -528,7 +530,8 @@
 .Pp
 Many pad devices behave as if the first (left) button were pressed if
 the user `taps' the surface of the pad.
-In contrast, some ALPS GlidePoint pad models treat the tapping action 
+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
 to obtain the same effect as the other pad devices.
 .Pp
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/natd.8 man8/natd.8
--- fbsd-3.2-19990816-STABLE/man/man8/natd.8	Mon Aug 16 18:32:25 1999
+++ man8/natd.8	Tue Aug 24 18:35:25 1999
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\"	$Id: natd.8,v 1.16.2.3 1999/05/16 11:59:49 brian Exp $
+.\"	$Id: natd.8,v 1.16.2.4 1999/08/18 01:21:49 chris Exp $
 .Dd 15 April 1997
 .Os FreeBSD
 .Dt NATD 8
@@ -414,8 +414,8 @@
 .El
 
 .Sh SEE ALSO
-.Xr getservbyname 2 ,
 .Xr socket 2 ,
+.Xr getservbyname 3 ,
 .Xr divert 4 ,
 .Xr services 5 ,
 .Xr ipfw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/pam_radius.8 man8/pam_radius.8
--- fbsd-3.2-19990816-STABLE/man/man8/pam_radius.8	Thu Jan  1 09:00:00 1970
+++ man8/pam_radius.8	Tue Aug 24 18:33:12 1999
@@ -0,0 +1,128 @@
+.\" Copyright (c) 1999
+.\"	Andrzej Bialecki <abial@FreeBSD.org>.  All rights reserved.
+.\"
+.\" Copyright (c) 1992, 1993, 1994
+.\"	The Regents of the University of California.  All rights reserved.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software donated to Berkeley by
+.\" Jan-Simon Pendry.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"	$Id: pam_radius.8,v 1.1.2.1 1999/08/18 19:12:30 abial Exp $
+.\"
+.Dd August 2, 1999
+.Dt pam_radius 8
+.Os FreeBSD 3.3
+.Sh NAME
+.Nm pam_radius
+.Nd RADIUS authentication PAM module
+.Sh SYNOPSIS
+.Nm pam_radius.so
+.Op Cm use_first_pass
+.Op Cm try_first_pass
+.Op Cm echo_pass
+.Op Cm conf Ns No = Ns Ar pathname
+.Op Cm template_user Ns No = Ns Ar username
+.Sh DESCRIPTION
+The
+.Nm
+module provides authentication services based
+upon the RADIUS (Remote Authentication Dial In User Service) protocol
+for the PAM (Pluggable Authentication Module) framework.
+.Pp
+The
+.Nm
+module accepts these optional parameters:
+.Bl -tag -width Fl
+.It Cm use_first_pass
+causes
+.Nm
+to use a previously entered password instead of prompting for a new one.
+If no password has been entered then authentication fails.
+.It Cm try_first_pass
+causes
+.Nm
+to use a previously entered password, if one is available.  If no
+password has been entered,
+.Nm
+prompts for one as usual.
+.It Cm echo_pass
+causes echoing to be left on if
+.Nm
+prompts for a password.
+.It Cm conf Ns No = Ns Ar pathname
+specifies a non-standard location for the RADIUS client configuration file
+(normally located in /etc/radius.conf).
+.It Cm template_user Ns No = Ns Ar username
+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
+will be authenticated with the supplied username and password, but his
+credentials to the system will be presented as the ones for
+.Ar username ,
+i.e., his login class, home directory, resource limits, etc. will be set to ones
+defined for
+.Ar username .
+.Pp
+If this option is omitted, and there is no username
+in the system databases equal to the supplied one (as determined by call to
+.Xr getpwnam 3 Ns ),
+the authentication will fail.
+.Sh FILES
+.Bl -tag -width /etc/radius.conf -compact
+.It Pa /etc/radius.conf
+The standard RADIUS client configuration file for
+.Nm
+.El
+.Sh SEE ALSO
+.Xr pam 8 ,
+.Xr passwd 5 ,
+.Xr radius.conf 5
+.Sh HISTORY
+The
+.Nm
+module first appeared in
+.Fx 3.1 .
+The
+.Nm
+manual page first appeared in
+.Fx 3.3 .
+.Sh AUTHORS
+The
+.Nm
+manual page was written by
+.An Andrzej Bialecki Aq abial@FreeBSD.org .
+.Pp
+The
+.Nm
+module was written by
+.An John D. Polstra Aq jdp@FreeBSD.org .
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/ppp.8 man8/ppp.8
--- fbsd-3.2-19990816-STABLE/man/man8/ppp.8	Mon Aug 16 18:50:48 1999
+++ man8/ppp.8	Tue Aug 24 18:54:09 1999
@@ -1,4 +1,4 @@
-.\" $Id: ppp.8,v 1.142.2.8 1999/08/09 23:35:07 brian Exp $
+.\" $Id: ppp.8,v 1.142.2.9 1999/08/23 21:59:46 brian Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
@@ -8,14 +8,9 @@
 .Nd Point to Point Protocol (a.k.a. user-ppp) 
 .Sh SYNOPSIS
 .Nm
-.Oo
-.Fl auto |
-.Fl background |
-.Fl ddial |
-.Fl direct |
-.Fl dedicated
-.Oc
-.Op Fl alias
+.Op Fl nat
+.Op Fl quiet
+.Op Fl Va mode
 .Op Ar system Ns
 .No ...
 .Sh DESCRIPTION
@@ -30,6 +25,121 @@
 .Em PPP
 is done as a user process with the help of the
 tunnel device driver (tun).
+.Pp
+The
+.Fl nat
+flag (or
+.Fl alias
+flag for backwards compatability) does the equivalent of a
+.Dq nat enable yes ,
+enabling
+.Nm ppp Ns No s
+network address translation features.  This allows
+.Nm ppp
+to act as a NAT or masquerading engine for all machines on an internal 
+LAN.  Refer to
+.Xr libalias 3
+for details.
+.Pp
+The
+.Fl quiet
+flag tells
+.Nm
+to be silent at startup rather than displaying the mode and interface
+to standard output.
+.Pp
+The following
+.Va mode Ns No s
+are understood by
+.Nm ppp :
+.Bl -tag -width XXX -offset XXX
+.It Fl auto
+.Nm
+opens the tun interface, configures it then goes into the background.
+The link isn't brought up until outgoing data is detected on the tun
+interface at which point
+.Nm
+attempts to bring up the link.  Packets received (including the first one)
+while
+.Nm
+is trying to bring the link up will remain queued for a default of
+2 minutes.  See the
+.Dq set choked
+command below.
+.Pp
+In
+.Fl auto
+mode, at least one
+.Dq system
+must be given on the command line (see below) and a
+.Dq set ifaddr
+must be done in the system profile that specifies a peer IP address to
+use when configuring the interface.  Something like
+.Dq 10.0.0.1/0
+is usually appropriate.  See the
+.Dq pmdemand
+system in
+.Pa /usr/share/examples/ppp/ppp.conf.sample
+for an example.
+.It Fl background
+Here,
+.Nm
+attempts to establish a connection with the peer immediately.  If it
+succeeds,
+.Nm
+goes into the background and the parent process returns an exit code
+of 0.  If it fails,
+.Nm
+exits with a non-zero result.
+.It Fl foreground
+In foreground mode,
+.Nm
+attempts to establish a connection with the peer immediately, but never
+becomes a daemon.  The link is created in background mode.  This is useful
+if you wish to control
+.Nm ppp Ns No s
+invocation from another process.
+.It Fl direct
+This is used for receiving incoming connections.
+.Nm
+ignores the
+.Dq set device
+line and uses descriptor 0 as the link.
+.Pp
+If callback is configured,
+.Nm
+will use the
+.Dq set device
+information when dialing back.
+.It Fl dedicated
+This option is designed for machines connected with a dedicated
+wire.
+.Nm
+will always keep the device open and will never use any configured
+chat scripts.
+.It Fl ddial
+This mode is equivalent to
+.Fl auto
+mode except that
+.Nm
+will bring the link back up any time it's dropped for any reason.
+.It Fl interactive
+This is a no-op, and gives the same behaviour as if none of the above
+modes have been specified.
+.Nm
+loads any sections specified on the command line then provides an
+interactive prompt.
+.El
+.Pp
+One or more configuration entries or systems
+.Pq as specified in Pa /etc/ppp/ppp.conf
+may also be specified on the command line.
+.Nm
+will read the
+.Dq default
+system from
+.Pa /etc/ppp/ppp.conf
+at startup, followed by each of the systems specified on the command line.
 .Sh Major Features
 .Bl -diag
 .It Provides an interactive user interface.
@@ -40,8 +150,8 @@
 .It Supports both manual and automatic dialing.
 Interactive mode has a
 .Dq term
-command which enables you to talk to your modem directly.  When your
-modem is connected to the remote peer and it starts to talk
+command which enables you to talk to the device directly.  When you
+are connected to the remote peer and it starts to talk
 .Em PPP ,
 .Nm
 detects it and switches to packet mode automatically.  Once you have
@@ -148,12 +258,22 @@
 to check the packet flow over the
 .Em PPP
 link.
-.It Supports PPP over TCP capability.
+.It Supports PPP over TCP and PPP over UDP.
 If a device name is specified as
-.Em host Ns No : Ns Em port ,
+.Em host Ns No : Ns Em port Ns
+.Op / Ns Em tcp Ns No | Ns Em udp ,
+.Nm
+will open a TCP or UDP connection for transporting data rather than using a
+conventional serial device.  UDP connections force
 .Nm
-will open a TCP connection for transporting data rather than using a
-conventional serial device.
+into synchronous mode.
+.It Supports PPP over ISDN
+If
+.Nm
+is given a raw B-channel i4b device to open as a link, it's able to talk
+to the
+.Xr isdnd 8
+daemon to establish an ISDN connection.
 .It "Supports IETF draft Predictor-1 (rfc 1978) and DEFLATE (rfc 1979) compression."
 .Nm
 supports not only VJ-compression but also Predictor-1 and DEFLATE compression.
@@ -167,7 +287,7 @@
 .Em all
 network traffic flowing through the link, thus reducing overheads to a
 minimum.
-.It Supports Microsoft's IPCP extensions.
+.It Supports Microsoft's IPCP extensions (rfc 1877).
 Name Server Addresses and NetBIOS Name Server Addresses can be negotiated
 with clients using the Microsoft
 .Em PPP
@@ -205,122 +325,6 @@
 logging facility if you're interested in what exactly is done as user id
 zero.
 .Sh GETTING STARTED
-The following command line switches are understood by
-.Nm ppp :
-.Bl -tag -width XXX -offset XXX
-.It Fl auto
-.Nm
-opens the tun interface, configures it then goes into the background.
-The link isn't brought up until outgoing data is detected on the tun
-interface at which point
-.Nm
-attempts to bring up the link.  Packets received (including the first one)
-while
-.Nm
-is trying to bring the link up will remain queued for a default of
-2 minutes.  See the
-.Dq set choked
-command below.
-.Pp
-At least one
-.Dq system
-must be given on the command line (see below) and a
-.Dq set ifaddr
-must be done in the system profile that specifies a peer IP address to
-use when configuring the interface.  Something like
-.Dq 10.0.0.1/0
-is usually appropriate.  See the
-.Dq pmdemand
-system in
-.Pa /usr/share/examples/ppp/ppp.conf.sample
-for an example.
-.It Fl background
-Here,
-.Nm
-attempts to establish a connection with the peer immediately.  If it
-succeeds,
-.Nm
-goes into the background and the parent process returns an exit code
-of 0.  If it fails,
-.Nm
-exits with a non-zero result.
-.It Fl direct
-This is used for receiving incoming connections.
-.Nm
-ignores the
-.Dq set device
-line and uses descriptor 0 as the link.
-.Pp
-If callback is configured,
-.Nm
-will use the
-.Dq set device
-information when dialing back.
-.It Fl dedicated
-This option is designed for machines connected with a dedicated
-wire.
-.Nm
-will always keep the device open and will never use any configured
-chat scripts.
-.It Fl ddial
-This mode is equivalent to
-.Fl auto
-mode except that
-.Nm
-will bring the link back up any time it's dropped for any reason.
-.It Fl interactive
-This is a no-op, and gives the same behaviour as if none of the above
-flags have been specified.
-.Nm
-loads any sections specified on the command line then provides an
-interactive prompt.
-.It Fl alias
-This flag doesn't control
-.Nm ppp Ns No 's
-mode.  It does the equivalent of an
-.Dq enable alias yes .
-Additionally, if the
-.Fl auto
-flag is also specified, an implicit
-.Dq enable iface-alias
-is done.
-See below for details.
-.Pp
-Enabling IP aliasing allows
-.Nm ppp
-to act as a NAT or masquerading engine for all machines on an internal 
-LAN.  Refer to
-.Xr libalias 3
-for details.
-.El
-.Pp
-Additionally, one or more configuration entries
-.Pq as specified in Pa /etc/ppp/ppp.conf
-may be specified on the command line.
-.Nm
-will read the
-.Dq default
-system from
-.Pa /etc/ppp/ppp.conf
-at startup, followed by each of the systems specifed on the command line.
-.Pp
-Only one of the
-.Fl auto ,
-.Fl background ,
-.Fl ddial ,
-.Fl direct ,
-.Fl dedicated
-and
-.Fl interactive
-switches may be specified.
-.Nm ppp Ns No 's
-.Sq mode
-may subsequently be changed with the
-.Dq set mode
-command (see below).
-.Pp
-For now, we'll stick to using interactive mode.
-.Pp
 When you first run
 .Nm
 you may need to deal with some initial configuration details.
@@ -488,9 +492,9 @@
 ppp ON awfulhak> set parity even
 .Ed
 .Pp
-You can now see what your current modem settings look like:
+You can now see what your current device settings look like:
 .Bd -literal -offset indent
-ppp ON awfulhak> show modem
+ppp ON awfulhak> show physical
 Name: deflink
  State:           closed
  Device:          N/A
@@ -509,7 +513,7 @@
 ppp ON awfulhak> 
 .Ed
 .Pp
-The term command can now be used to talk directly to your modem:
+The term command can now be used to talk directly to the device:
 .Bd -literal -offset indent
 ppp ON awfulhak> term
 at
@@ -588,7 +592,7 @@
 When the link is established, the show command can be used to see how
 things are going:
 .Bd -literal -offset indent
-PPP ON awfulhak> show modem
+PPP ON awfulhak> show physical
 * Modem related information is shown here *
 PPP ON awfulhak> show ccp
 * CCP (compression) related information is shown here *
@@ -755,7 +759,7 @@
 .Dq shell
 and
 .Dq bg
-commands below for a description of possible substition strings).  Similarly,
+commands below for a description of possible substitution strings).  Similarly,
 when a connection is closed, the contents of the
 .Pa /etc/ppp/ppp.linkdown
 file are executed.  Both of these files have the same format as
@@ -883,13 +887,13 @@
 only after a successful connection is established.  The default value for
 .Ar inc
 is zero.
-.It Ar maxinc
-is the maximun number of times
+.It Ar max
+is the maximum number of times
 .Nm
 should increment
 .Ar secs .
 The default value for
-.Ar maxinc
+.Ar max
 is 10.
 .It Ar next
 is the number of seconds to wait before attempting
@@ -1219,14 +1223,14 @@
 command.  The value will be used in
 .Nm ppp Ns No s
 subsequent CBCP phase.
-.Sh PPP OVER TCP (a.k.a Tunnelling)
+.Sh PPP OVER TCP and UDP (a.k.a Tunnelling)
 Instead of running
 .Nm
 over a serial link, it is possible to
-use a TCP connection instead by specifying a host and port as the
+use a TCP connection instead by specifying the host, port and protocol as the
 device:
 .Pp
-.Dl set device ui-gate:6669
+.Dl set device ui-gate:6669/tcp
 .Pp
 Instead of opening a serial device,
 .Nm
@@ -1295,7 +1299,7 @@
 .Bd -literal -offset indent
 ui-gate:
  set escape 0xff
- set device ui-gate:ppp-in
+ set device ui-gate:ppp-in/tcp
  set dial
  set timeout 30
  set log Phase Chat Connect hdlc LCP IPCP CCP tun
@@ -1325,6 +1329,7 @@
 traffic is conceptually encapsulated
 (although not packet by packet) inside the TCP stream between
 the two gateways.
+.Pp
 The major disadvantage of this mechanism is that there are two
 "guaranteed delivery" mechanisms in place - the underlying TCP
 stream and whatever protocol is used over the
@@ -1332,10 +1337,20 @@
 link - probably TCP again.  If packets are lost, both levels will
 get in each others way trying to negotiate sending of the missing
 packet.
-.Sh PACKET ALIASING
+.Pp
+To avoid this overhead, it is also possible to do all this using
+UDP instead of TCP as the transport by simply changing the protocol
+from "tcp" to "udp".  When using UDP as a transport,
+.Nm
+will operate in synchronous mode.  This is another gain as the incoming
+data does not have to be rearranged into packets.
+.Pp
+.Sh NETWORK ADDRESS TRANSLATION (PACKET ALIASING)
 The
-.Fl alias
-command line option enables packet aliasing.  This allows the
+.Fl nat
+.Pq \&or Fl alias
+command line option enables network address translation (a.k.a. packet
+aliasing).  This allows the
 .Nm
 host to act as a masquerading gateway for other computers over
 a local area network.  Outgoing IP packets are aliased so that
@@ -1348,9 +1363,9 @@
 from the outside world.
 In general, correct
 .Nm
-operation should first be verified with packet aliasing disabled.
+operation should first be verified with network address translation disabled.
 Then, the 
-.Fl alias
+.Fl nat
 option should be switched on, and network applications (web browser,
 .Xr telnet 1 ,
 .Xr ftp 1 ,
@@ -1388,7 +1403,9 @@
 .Ar name
 .Ar rule-no
 .Ar action
+.Op \&!
 .Oo
+.Op host
 .Ar src_addr Ns Op / Ns Ar width
 .Op Ar dst_addr Ns Op / Ns Ar width
 .Oc
@@ -1420,12 +1437,27 @@
 is defined.
 .It
 .Ar Action
-is either
+may be specified as
 .Sq permit
 or
-.Sq deny .
-If a given packet
-matches the rule, the associated action is taken immediately.
+.Sq deny ,
+in which case, if a given packet matches the rule, the associated action
+is taken immediately.
+.Ar Action
+can also be specified as
+.Sq clear
+to clear the action associated with that particular rule, or as a new
+rule number greater than the current rule.  In this case, if a given
+packet matches the current rule, the packet will next be matched against
+the new rule number (rather than the next rule number).
+.Pp
+The
+.Ar action
+may optionally be followed with an exclamation mark
+.Pq Dq ! ,
+telling
+.Nm
+to reverse the sense of the following match.
 .It
 .Op Ar src_addr Ns Op / Ns Ar width
 and
@@ -1434,10 +1466,28 @@
 .Op / Ns Ar width
 is specified, it gives the number of relevant netmask bits,
 allowing the specification of an address range.
+.Pp
+Either
+.Ar src_addr
+or
+.Ar dst_addr
+may be given the values
+.Dv MYADDR
+or
+.Dv HISADDR
+(refer to the description of the
+.Dq bg
+command for a description of these values).  When these values are used,
+the filters will be updated any time the values change.  This is similar
+to the behaviour of the
+.Dq add
+command below.
 .It
 .Ar Proto
 must be one of
 .Sq icmp ,
+.Sq igmp ,
+.Sq ospf ,
 .Sq udp
 or
 .Sq tcp .
@@ -1939,6 +1989,10 @@
 Generate LQR reports.
 .It Li Phase
 Phase transition log output.
+.It Li Physical
+Dump physical level packet in hex.
+.It Li Sync
+Dump sync level packet in hex.
 .It Li TCP/IP
 Dump all TCP/IP packets.
 .It Li Timer
@@ -2323,6 +2377,15 @@
 unless the
 .Dq set dns
 command is used as an override.
+.It enddisc
+Default: Enabled and Accepted.  This option allows control over whether we
+negotiate an endpoint discriminator.  We only send our discriminator if
+.Dq set enddisc
+is used and
+.Ar enddisc
+is enabled.  We reject the peers discriminator if
+.Ar enddisc
+is denied.
 .It LANMan|chap80lm
 Default: Disabled and Accepted.  The use of this authentication protocol
 is discouraged as it partially violates the authentication protocol by
@@ -2458,6 +2521,41 @@
 is disabled,
 .Nm
 will ignore the identifier field.
+.It keep-session
+Default: Disabled.  When
+.Nm
+runs as a Multi-link server, a different
+.Nm
+instance initially receives each connection.  After determining that
+the link belongs to an already existing bundle (controlled by another
+.Nm
+invocation),
+.Nm
+will transfer the link to that process.
+.Pp
+If the link is a tty device or if this option is enabled,
+.Nm
+will not exit, but will change its process name to
+.Dq session owner
+and wait for the controlling
+.Nm
+to finish with the link and deliver a signal back to the idle process.
+This prevents the confusion that results from
+.Nm ppp Ns No 's
+parent considering the link resource available again.
+.Pp
+For tty devices that have entries in
+.Pa /etc/ttys ,
+this is necessary to prevent another
+.Xr getty 8
+from being started, and for program links such as
+.Xr sshd 8 ,
+it prevents
+.Xr sshd 8
+from exiting due to the death of its child.  As
+.Nm
+cannot determine its parents requirements (except for the tty case), this
+option must be enabled manually depending on the circumstances.
 .It loopback
 Default: Enabled.  When
 .Ar loopback
@@ -2544,7 +2642,7 @@
 command.  Throughput statistics are available at the
 .Dq IPCP
 and 
-.Dq modem
+.Dq physical
 levels.
 .It utmp
 Default: Enabled.  Normally, when a user is authenticated using PAP or
@@ -2559,24 +2657,24 @@
 you require the user to both login and authenticate themselves.
 .It iface-alias
 Default: Enabled if
-.Fl alias
+.Fl nat
 is specified.  This option simply tells
 .Nm
 to add new interface addresses to the interface rather than replacing them.
-The option can only be enabled if IP aliasing is enabled
-.Pq Dq alias enable yes .
+The option can only be enabled if network address translation is enabled
+.Pq Dq nat enable yes .
 .Pp
 With this option enabled,
 .Nm
-will pass traffic for old interface addresses through the IP alias engine
+will pass traffic for old interface addresses through the NAT engine
 .Pq see Xr libalias 5 ,
 resulting in the ability (in
 .Fl auto
 mode) to properly connect the process that caused the PPP link to
 come up in the first place.
 .Pp
-Disabling IP aliasing with
-.Dq alias enable off
+Disabling NAT with
+.Dq nat enable no
 will also disable
 .Sq iface-alias .
 .El
@@ -2718,53 +2816,67 @@
 of the currently existing line modes.
 .El
 .Pp
-.It alias Ar command Op Ar args
-This command allows the control of the aliasing (or masquerading)
-facilities that are built into
+.It nat Ar command Op Ar args
+This command allows the control of the network address translation (also
+known as masquerading or IP aliasing) facilities that are built into
 .Nm ppp .
-If aliasing is enabled on your system (it may be omitted at compile time),
+NAT is done on the external interface only, and is unlikely to make sense
+if used with the
+.Fl direct
+flag.
+.Pp
+For backwards compatibility, the word
+.Dq alias
+may be used in place of
+.Dq nat .
+If nat is enabled on your system (it may be omitted at compile time),
 the following commands are possible:
 .Bl -tag -width XX
-.It alias enable Op yes|no
-This command either switches aliasing on or turns it off.
+.It nat enable yes|no
+This command either switches network address translation on or turns it off.
 The
-.Fl alias
+.Fl nat
 command line flag is synonymous with
-.Dq alias enable yes .
-.It alias addr Op Ar addr_local addr_alias
+.Dq nat enable yes .
+.It nat addr Op Ar addr_local addr_alias
 This command allows data for
 .Ar addr_alias
 to be redirected to
 .Ar addr_local .
 It is useful if you own a small number of real IP numbers that
 you wish to map to specific machines behind your gateway.
-.It alias deny_incoming Op yes|no
+.It nat deny_incoming yes|no
 If set to yes, this command will refuse all incoming connections
 by dropping the packets in much the same way as a firewall would.
-.It alias help|?
-This command gives a summary of available alias commands.
-.It alias log Op yes|no
-This option causes various aliasing statistics and information to
+.It nat help|?
+This command gives a summary of available nat commands.
+.It nat log yes|no
+This option causes various NAT statistics and information to
 be logged to the file
 .Pa /var/log/alias.log .
-.It alias port Ar proto Ar targetIP Ns Xo
-.No : Ns Ar port Ns
+This file name is likely to change in the near future.
+.It nat port Ar proto Ar targetIP Ns Xo
+.No : Ns Ar targetPort Ns
 .Oo
-.No - Ns Ar port
-.Oc Ar aliasport Ns
+.No - Ns Ar targetPort
+.Oc Ar aliasPort Ns
 .Oo
-.No - Ns Ar aliasport Ns
-.Oc
+.No - Ns Ar aliasPort
+.Oc Oo Ar remoteIP : Ns
+.Ar remotePort Ns
+.Oo
+.No - Ns Ar remotePort
+.Oc Oc
 .Xc
 This command causes incoming
 .Ar proto
-connections to port
-.Ar aliasport
-to be redirected to port
-.Ar port
+connections to
+.Ar aliasPort
+to be redirected to
+.Ar targetPort
 on
 .Ar targetIP .
-.Ar Proto
+.Ar proto
 is either
 .Dq tcp
 or
@@ -2773,13 +2885,22 @@
 A range of port numbers may be specified as shown above.  The ranges
 must be of the same size.
 .Pp
+If
+.Ar remoteIP
+is specified, only data coming from that IP number is redirected.
+.Ar remotePort
+must either be
+.Dq 0
+.Pq indicating any source port
+or a range of ports the same size as the other ranges.
+.Pp
 This option is useful if you wish to run things like Internet phone on
 machines behind your gateway, but is limited in that connections to only
-one interior machine per port are possible.
-.It alias pptp Op Ar addr
+one interior machine per source machine and target port are possible.
+.It nat pptp Op Ar addr
 This tells
 .Nm
-to alias any
+to translate any
 .Em G Ns No eneral
 .Em R Ns No outing
 .Em E Ns No encapsulated
@@ -2798,8 +2919,8 @@
 .Ar addr
 is not specified,
 .Dv PPTP
-aliasing is disabled.
-.It "alias proxy cmd" Ar arg Ns No ...
+address translation is disabled.
+.It "nat proxy cmd" Ar arg Ns No ...
 This command tells
 .Nm
 to proxy certain connections, redirecting them to a given server.  Refer
@@ -2808,16 +2929,16 @@
 in
 .Xr libalias 3
 for details of the available commands.
-.It alias same_ports Op yes|no
-When enabled, this command will tell the alias library attempt to
-avoid changing the port number on outgoing packets.  This is useful
+.It nat same_ports yes|no
+When enabled, this command will tell the network address translation engine to
+ attempt to avoid changing the port number on outgoing packets.  This is useful
 if you want to support protocols such as RPC and LPD which require
 connections to come from a well known port.
-.It alias use_sockets Op yes|no
-When enabled, this option tells the alias library to create a
-socket so that it can guarantee a correct incoming ftp data or
+.It nat use_sockets yes|no
+When enabled, this option tells the network address translation engine to
+create a socket so that it can guarantee a correct incoming ftp data or
 IRC connection.
-.It alias unregistered_only Op yes|no
+.It nat unregistered_only yes|no
 Only alter outgoing packets with an unregistered source ad-
 dress.  According to RFC 1918, unregistered source addresses
 are 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16.
@@ -2880,13 +3001,13 @@
 while the command executes, use the
 .Dq shell
 command instead.
-.It clear modem|ipcp Op current|overall|peak...
+.It clear physical|ipcp Op current|overall|peak...
 Clear the specified throughput values at either the
-.Dq modem
+.Dq physical
 or
 .Dq ipcp
 level.  If
-.Dq modem
+.Dq physical
 is specified, context must be given (see the
 .Dq link
 command below).  If no second argument is given, all values are
@@ -2973,7 +3094,7 @@
 .Sq lcp
 is specified, the
 .Em LCP
-layer is terminated but the modem is not brought offline and the link
+layer is terminated but the device is not brought offline and the link
 is not closed.  If
 .Sq ccp
 is specified, only the relevant compression layer(s) are terminated.
@@ -3053,7 +3174,7 @@
 .It iface help Op Ar sub-command
 This command, when invoked without
 .Ar sub-command ,
-will show a list of possbile
+will show a list of possible
 .Dq iface
 sub-commands and a brief synopsis for each.  When invoked with
 .Ar sub-command ,
@@ -3108,10 +3229,12 @@
 .It open Op lcp|ccp|ipcp
 This is the opposite of the
 .Dq close
-command.  All closed links are immediately brought up (although some auto
-links may not come up depending on what
+command.  All closed links are immediately brought up apart from second
+and subsequent
+.Ar demand-dial
+links - these will come up based on the
 .Dq set autoload
-command has been used).
+command that has been used.
 .Pp
 If the
 .Dq lcp
@@ -3280,9 +3403,10 @@
 is used in the initial authentication challenge and should normally be set to
 the local machine name.
 .It set autoload Xo
-.Ar max-duration max-load Op Ar min-duration min-load
+.Ar min-percent max-percent period
 .Xc
-These settings apply only in multi-link mode and all default to zero.
+These settings apply only in multi-link mode and default to zero, zero and
+five respectively.
 When more than one
 .Ar demand-dial
 .Pq also known as Fl auto
@@ -3290,27 +3414,36 @@
 .Nm
 first reads data from the tun device.  The next
 .Ar demand-dial
-link will be opened only when at least
-.Ar max-load
-packets have been in the send queue for
-.Ar max-duration
-seconds.  Because both values default to zero,
-.Ar demand-dial
-links will simply come up one at a time by default.
-.Pp
-If two or more links are open, at least one of which is a
+link will be opened only when the current bundle throughput is at least
+.Ar max-percent
+percent of the total bundle bandwidth for
+.Ar period
+seconds.  When the current bundle throughput decreases to
+.Ar min-percent
+percent or less of the total bundle bandwidth for
+.Ar period
+seconds, a
 .Ar demand-dial
-link, a
+link will be brought down as long as it's not the last active
 .Ar demand-dial
-link will be closed when there is less than
-.Ar min-packets
-in the queue for more than
-.Ar min-duration .
-If
-.Ar min-duration
-is zero, this timer is disabled.  Because both values default to zero,
+link.
+.Pp
+The default values cause
 .Ar demand-dial
-links will stay active until the bundle idle timer expires.
+links to simply come up one at a time.
+.Pp
+Certain devices cannot determine their physical bandwidth, so it
+is sometimes necessary to use the
+.Dq set bandwidth
+command (described below) to make
+.Dq set autoload
+work correctly.
+.It set bandwidth Ar value
+This command sets the connection bandwidth in bits per second.
+.Ar value
+must be greater than zero.  It is currently only used by the
+.Dq set autoload
+command above.
 .It set callback Ar option Ns No ...
 If no arguments are given, callback is disabled, otherwise,
 .Nm
@@ -3354,6 +3487,15 @@
 Microsofts callback control protocol is used.  See
 .Dq set cbcp
 below.
+.Pp
+If you wish to negotiate
+.Ar cbcp
+in client mode but also wish to allow the server to request no callback at
+CBCP negotiation time, you must specify both
+.Ar cbcp
+and
+.Ar none
+as callback options.
 .It E.164 *| Ns Xo
 .Ar number Ns Op , Ns Ar number Ns
 .No ...
@@ -3380,7 +3522,8 @@
 If the peer does not wish to do callback at all,
 .Nm
 will accept the fact and continue without callback rather than terminating
-the connection.  This is required if you wish callback to be optional.
+the connection.  This is required (in addition to one or more other callback
+options) if you wish callback to be optional.
 .El
 .Pp
 .It set cbcp Oo Xo
@@ -3425,16 +3568,24 @@
 complete.  If it's not set,
 .Nm
 assumes that this is because the device doesn't support carrier (which
-is true for most NULL-modem cables), logs the fact and stops checking
+is true for most
+.Dq laplink
+NULL-modem cables), logs the fact and stops checking
 for carrier.  However, some modems take some time to assert the carrier
 signal, resulting in
 .Nm ppp Ns No s
 inability to detect when the link is dropped.
-.Ar Seconds
+.Ar seconds
 specifies the number of seconds that
 .Nm
-should wait after the login script has finished before first checking for
-carrier.
+should wait after the dial script has finished before deciding if
+carrier is available or not.
+.Pp
+.Nm
+will not proceed to the login script until either carrier is detected
+or until
+.Ar seconds
+has elapsed.
 .Pp
 If
 .Ar seconds
@@ -3443,12 +3594,21 @@
 .Nm
 will
 .Em require
-carrier.  If carrier is not detected at the first check, the link will
-be considered disconnected.
+carrier.  If carrier is not detected after
+.Ar seconds
+seconds, the link will be disconnected.
+.Pp
+For ISDN devices,
+.Nm
+will always insist on carrier.  Carrier is raised by the i4brbchX device
+driver only after the call has connected.  It is therefore wise to set
+a reasonable value such as
+.Ar 6
+seconds.
 .Pp
 Carrier
 .Em require Ns No ment
-is ignored when the link is not a tty device.
+is ignored for all other device types.
 .It set choked Op Ar timeout
 This sets the number of seconds that
 .Nm
@@ -3514,8 +3674,14 @@
 .Nm
 will talk to the given
 .Dq value .
-All serial device names are expected to begin with
+.Pp
+All ISDN and serial device names are expected to begin with
 .Pa /dev/ .
+ISDN devices are usually called
+.Pa i4brbchX
+and serial devices are usually called
+.Pa cuaaX .
+.Pp
 If
 .Dq value
 does not begin with
@@ -3523,7 +3689,7 @@
 it must either begin with an exclamation mark
 .Pq Dq \&!
 or be of the format
-.Dq host:port .
+.Dq host:port Ns Op Ns /proto .
 .Pp
 If it begins with an exclamation mark, the rest of the device name is
 treated as a program name, and that program is executed when the device
@@ -3532,15 +3698,16 @@
 and are read and written as if they were a regular device.
 .Pp
 If a
-.Dq host:port
-pair is given,
+.Dq host:port Ns Op /tcp|/udp
+specification is given,
 .Nm
 will attempt to connect to the given
 .Dq host
 on the given
 .Dq port .
-Refer to the section on
-.Em PPP OVER TCP
+If a tcp or udp specification is not given, the default is tcp.  Refer to
+the section on
+.Em PPP OVER TCP and UDP
 above for further details.
 .Pp
 If multiple
@@ -3611,7 +3778,7 @@
 exclamation mark
 .Pq Dq \&! .
 When the command is executed, standard input and standard output are
-directed to the modem device (see the
+directed to the open device (see the
 .Dq set device
 command), and standard error is read by
 .Nm
@@ -3683,7 +3850,9 @@
 command.
 .It set enddisc Op label|IP|MAC|magic|psn value
 This command sets our local endpoint discriminator.  If set prior to
-LCP negotiation,
+LCP negotiation, and if no
+.Dq disable enddisc
+command has been used,
 .Nm
 will send the information to the peer using the LCP endpoint discriminator
 option.  The following discriminators may be set:
@@ -3708,7 +3877,16 @@
 .Dq set ifaddr
 commands.
 .It Li magic
-A 20 digit random number is used.
+A 20 digit random number is used.  Care should be taken when using magic
+numbers as restarting
+.Nm
+or creating a link using a different
+.Nm
+invocation will also use a different magic number and will therefore not
+be recognised by the peer as belonging to the same bundle.  This makes it
+unsuitable for
+.Fl direct
+connections.
 .It Li psn Ar value
 The given
 .Ar value
@@ -3727,10 +3905,12 @@
 .Sq escaped
 as they travel across the link.
 .It set filter dial|alive|in|out Ar rule-no Xo
-.No permit|deny
-.Oo Ar src_addr Ns Op / Ns Ar width
+.No permit|deny|clear| Ns Ar rule-no
+.Op \&!
+.Oo Op host
+.Ar src_addr Ns Op / Ns Ar width
 .Op Ar dst_addr Ns Op / Ns Ar width
-.Oc Oo tcp|udp|icmp Op src lt|eq|gt Ar port
+.Oc Oo tcp|udp|ospf|igmp|icmp Op src lt|eq|gt Ar port
 .Op dst lt|eq|gt Ar port
 .Op estab
 .Op syn
@@ -3755,9 +3935,12 @@
 filter specifies packets that are allowed out of the machine.
 .Pp
 Filtering is done prior to any IP alterations that might be done by the
-alias engine.  By default all filter sets allow all packets to pass.
-Rules are processed in order according to
-.Ar rule-no .
+NAT engine on outgoing packets and after any IP alterations that might
+be done by the NAT engine on incoming packets.  By default all filter
+sets allow all packets to pass.  Rules are processed in order according to
+.Ar rule-no
+(unless skipped by specifying a rule number as the
+.Ar action ) .
 Up to 40 rules may be given for each set.  If a packet doesn't match
 any of the rules in a given set, it is discarded.  In the case of
 .Em in
@@ -3774,7 +3957,7 @@
 .Sx PACKET FILTERING
 above for further details.
 .It set hangup Ar chat-script
-This specifies the chat script that will be used to reset the modem
+This specifies the chat script that will be used to reset the device
 before it is closed.  It should not normally be necessary, but can
 be used for devices that fail to reset themselves properly on close.
 .It set help|? Op Ar command
@@ -3804,7 +3987,8 @@
 unless the IP address is 0.0.0.0 in which case it defaults to
 .Dq /0 .
 .Pp
-.Ar Hisaddr
+If you wish to assign a dynamic IP number to the peer,
+.Ar hisaddr
 may also be specified as a range of IP numbers in the format
 .Bd -literal -offset indent
 .Ar \&IP Ns Oo \&- Ns Ar \&IP Ns Xo
@@ -3826,7 +4010,7 @@
 .Nm
 will grant the peers request.  This is useful if the peer wants
 to re-establish a link using the same IP number as was previously
-allocated (thus maintaining any existing tcp connections).
+allocated (thus maintaining any existing tcp or udp connections).
 .Pp
 If the peer requests an IP number that's either outside
 of this range or is already in use,
@@ -3909,7 +4093,7 @@
 .Ar trmtries
 for PAP or CHAP.
 .Pp
-In order to avoid netogiations with the peer that will never converge,
+In order to avoid negotiations with the peer that will never converge,
 .Nm
 will only send at most 3 times the configured number of
 .Ar reqtries
@@ -3950,7 +4134,7 @@
 .Pp
 Note: If you issue the command
 .Dq set mode auto ,
-and have IP aliasing enabled, it may be useful to
+and have network address translation enabled, it may be useful to
 .Dq enable iface-alias
 afterwards.  This will allow
 .Nm
@@ -4196,9 +4380,9 @@
 tries a new number.
 .Ar secs
 will only be incremented at most
-.Ar maxinc
+.Ar max
 times.
-.Ar maxinc
+.Ar max
 defaults to 10.
 .Pp
 Note, the
@@ -4271,7 +4455,14 @@
 .Xr telnet 1
 should not be relied upon.
 .It set speed Ar value
-This sets the speed of the serial device.
+This sets the speed of the serial device.  If speed is specified as
+.Dq sync ,
+.Nm
+treats the device as a synchronous device.
+.Pp
+Certain device types will know whether they should be specified as
+synchronous or asynchronous.  These devices will override incorrect
+settings and log a warning to this effect.
 .It set stopped Op Ar LCPseconds Op Ar CCPseconds
 If this option is set,
 .Nm
@@ -4296,11 +4487,18 @@
 This value should not be set to less than the openmode delay (see
 .Dq set openmode
 above).
-.It set timeout Ar idleseconds
+.It set timeout Ar idleseconds Op Ar mintimeout
 This command allows the setting of the idle timer.  Refer to the
 section titled
 .Sx SETTING THE IDLE TIMER
 for further details.
+.Pp
+If
+.Ar mintimeout
+is specified,
+.Nm
+will never idle out before the link has been up for at least that number
+of seconds.
 .It set vj slotcomp on|off
 This command tells
 .Nm
@@ -4330,7 +4528,7 @@
 .Ar command
 is executed.  Word replacement is done in the same way as for the
 .Dq !bg
-commanad as described above.
+command as described above.
 .Pp
 Use of the ! character
 requires a following space as with any of the other commands.  You should
@@ -4363,6 +4561,8 @@
 .Pq the same \&as Dq iface show .
 .It show ipcp
 Show the current IPCP statistics.
+.It show layers
+Show the protocol layers currently in use.
 .It show lcp
 Show the current LCP statistics.
 .It show Op data Ns Xo
@@ -4375,7 +4575,7 @@
 Show the current log values.
 .It show mem
 Show current memory statistics.
-.It show modem
+.It show physical
 Show low level link information.
 .It show mp
 Show Multi-link information.
@@ -4394,10 +4594,10 @@
 .Pp
 .It term
 Go into terminal mode.  Characters typed at the keyboard are sent to
-the modem.  Characters read from the modem are displayed on the
-screen.  When a
-.Nm
-peer is detected on the other side of the modem,
+the device.  Characters read from the device are displayed on the
+screen.  When a remote
+.Em PPP
+peer is detected,
 .Nm
 automatically enables Packet Mode and goes back into command mode.
 .El
@@ -4409,14 +4609,14 @@
 .It
 Use
 .Dq help ,
-.Dq alias ? ,
+.Dq nat ? ,
 .Dq enable ? ,
 .Dq set ?
 and
 .Dq show ?
 to get online information about what's available.
 .It
-The following urls contain useful information:
+The following URLs contain useful information:
 .Bl -bullet -compact
 .It
 http://www.FreeBSD.org/FAQ/userppp.html
@@ -4512,11 +4712,13 @@
 .Xr getty 8 ,
 .Xr inetd 8 ,
 .Xr init 8 ,
+.Xr isdn 8 ,
 .Xr named 8 ,
 .Xr ping 8 ,
 .Xr pppctl 8 ,
 .Xr pppd 8 ,
 .Xr route 8 ,
+.Xr sshd 8 ,
 .Xr syslogd 8 ,
 .Xr traceroute 8 ,
 .Xr vipw 8
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/swapon.8 man8/swapon.8
--- fbsd-3.2-19990816-STABLE/man/man8/swapon.8	Mon Aug 16 18:32:31 1999
+++ man8/swapon.8	Tue Aug 24 18:35:30 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: swapon.8,v 1.10 1998/08/03 06:35:01 charnier Exp $
+.\"	$Id: swapon.8,v 1.10.2.1 1999/08/19 06:18:15 jkoshy Exp $
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
@@ -76,8 +76,8 @@
 .Xr rc 8 ,
 .Xr vnconfig 8
 .Sh FILES
-.Bl -tag -width /dev/[ru][pk]?b -compact
-.It Pa /dev/[ru][pk]?b
+.Bl -tag -width "/dev/{wd,da}?s?b" -compact
+.It Pa /dev/{wd,da}?s?b
 standard paging devices
 .It Pa /etc/fstab
 ascii filesystem description table
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/traceroute.8 man8/traceroute.8
--- fbsd-3.2-19990816-STABLE/man/man8/traceroute.8	Mon Aug 16 18:34:15 1999
+++ man8/traceroute.8	Tue Aug 24 18:37:14 1999
@@ -13,14 +13,14 @@
 .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\"	$Header: /home/ncvs/src/contrib/traceroute/traceroute.8,v 1.3 1998/01/09 18:46:53 steve Exp $
+.\"	$Header: /home/ncvs/src/contrib/traceroute/traceroute.8,v 1.3.2.1 1999/08/16 19:35:27 archie Exp $
 .\"
 .TH TRACEROUTE 8 "27 September 1996"
 .UC 6
 .SH NAME
 traceroute \- print the route packets take to network host
 .SH SYNOPSIS
-.. while ((op = getopt(argc, argv, "dnrvg:m:p:q:s:t:w:")) != EOF)
+.. while ((op = getopt(argc, argv, "dnrvg:M:m:P:p:q:s:t:w:")) != EOF)
 .na
 .B traceroute
 [
@@ -29,27 +29,36 @@
 .B \-g
 .I gw_host
 ] [
-.B \-m
-max_ttl
-.I ]
+.B \-M
+.I min_ttl
+] 
 .br
 .ti +8
 [
+.B \-m
+.I max_ttl
+] [
+.B \-P
+.I proto
+] [
 .B \-p
 .I port
-] [
+]
+.br
+.ti +8
+[
 .B \-q
 .I nqueries
 ] [
 .B \-s
 .I src_addr
+] [
+.B \-t
+.I tos
 ]
 .br
 .ti +8
 [
-.B \-t
-.I tos
-] [
 .B \-w
 .I waittime
 ]
@@ -81,6 +90,10 @@
 .B \-g
 Specify a loose source route gateway (8 maximum).
 .TP
+.B \-M
+Set the initial time-to-live value used in outgoing probe packets.
+The default is 1, i.e., start with the first hop.
+.TP
 .B \-m
 Set the max time-to-live (max number of hops) used in outgoing probe
 packets.  The default is 30 hops (the same default used for TCP
@@ -91,8 +104,18 @@
 (saves a nameserver address-to-name lookup for each gateway found on the
 path).
 .TP
+.B \-P
+Send packets of specified IP protocol. The currently supported protocols
+are: UDP, TCP and GRE. Other protocols may also be specified (either by
+name or by number), though
+.I traceroute
+does not implement any special knowledge of their packet formats. This
+option is useful for determining which router along a path may be
+blocking packets based on IP protocol number. But see BUGS below.
+.TP
 .B \-p
-Set the base UDP port number used in probes (default is 33434).
+Protocol specific. For UDP and TCP, sets
+the base port number used in probes (default is 33434).
 Traceroute hopes that nothing is listening on UDP ports
 .I base
 to
@@ -298,4 +321,13 @@
 .I ftp://ftp.ee.lbl.gov/traceroute.tar.Z
 .RE
 .SH BUGS
+When using protocols other than UDP, functionality is reduced.
+In particular, the last packet will often appear to be lost, because
+even though it reaches the destination host, there's no way to know
+that because no ICMP message is sent back.
+In the TCP case,
+.I traceroute
+should listen for a RST from the destination host (or an intermediate
+router that's filtering packets), but this is not implemented yet.
+.PP
 Please send bug reports to traceroute@ee.lbl.gov.
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/vinum.8 man8/vinum.8
--- fbsd-3.2-19990816-STABLE/man/man8/vinum.8	Mon Aug 16 18:32:32 1999
+++ man8/vinum.8	Tue Aug 24 18:35:31 1999
@@ -34,10 +34,10 @@
 .\" otherwise) arising in any way out of the use of this software, even if
 .\" advised of the possibility of such damage.
 .\"
-.\" $Id: vinum.8,v 1.5.2.7 1999/08/15 12:19:51 mpp Exp $
+.\" $Id: vinum.8,v 1.5.2.8 1999/08/24 04:06:51 grog Exp $
 .\"
 .Dd 28 March 1999
-.Dt VINUM 8
+.Dt vinum 8
 .Os
 .Sh NAME
 .Nm vinum
@@ -47,12 +47,6 @@
 .Op command
 .Op Fl options
 .Sh COMMANDS
-.Cd create Op Fl f Ar description-file
-.in +1i
-Create a volume as described in
-.Ar description-file
-.in
-.\" XXX remove this
 .Cd attach Ar plex Ar volume
 .Op Nm rename
 .Cd attach Ar subdisk Ar plex Ar [offset]
@@ -61,6 +55,22 @@
 Attach a plex to a volume, or a subdisk to a plex.
 .in
 .\" XXX remove this
+.Nm concat
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.in +1i
+Create a concatenated volume from the specified drives.
+.in
+.Cd create
+.Op Fl f
+.Ar description-file
+.in +1i
+Create a volume as described in
+.Ar description-file
+.in
+.\" XXX remove this
 .Cd debug
 .in +1i
 Cause the volume manager to enter the kernel debugger.
@@ -71,6 +81,7 @@
 Set debugging flags.
 .in
 .Cd detach
+.Op Fl f
 .Op Ar plex | subdisk
 .in +1i
 Detach a plex or subdisk from the volume or plex to which it is attached.
@@ -149,17 +160,26 @@
 .in +1i
 List information about volumes
 .in
+.Cd makedev
+.in +1i
+Remake the device nodes in
+.Ar /dev/vinum .
+.in
+.Nm mirror
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl s
+.Op Fl v
+.Ar drives
+.in +1i
+Create a mirrored volume from the specified drives.
+.in
 .Cd printconfig
 .Op Pa file
 .in +1i
 Write a copy of the current configuration to
 .Pa file .
 .in
-.Cd makedev
-.in +1i
-Remake the device nodes in
-.Ar /dev/vinum .
-.in
 .Cd quit
 .in +1i
 Exit the
@@ -232,6 +252,12 @@
 .in +1i
 Set d$BkN(Bon configuration.
 .in
+.Cd setstate
+.Ar state
+.Op Ar volume | plex | subdisk | drive
+.in +1i
+Set state without influencing other objects, for diagnostic purposes only.
+.in
 .Cd start
 .in +1i
 Read configuration from all vinum drives.
@@ -249,6 +275,14 @@
 .Nm
 if no parameters are specified.
 .in
+.Nm stripe
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.in +1i
+Create a striped volume from the specified drives.
+.in
 .Sh DESCRIPTION
 .Nm
 is a utility program to communicate with the \fBVinum\fP\| logical volume
@@ -256,10 +290,9 @@
 .Xr vinum 4
 for more information about the volume manager.
 .Xr vinum 8
-is designed either for interactive use, when started without a command, or to
-execute a single command if the command is supplied as arguments to
-.Nm vinum .
-In interactive mode,
+is designed either for interactive use, when started without command line
+arguments, or to execute a single command if the command is supplied on the
+command line.  In interactive mode,
 .Nm
 maintains a command line history.
 .Ss OPTIONS
@@ -289,6 +322,14 @@
 .Ar myvolume
 even if it is open.  Any subsequent access to the volume will almost certainly
 cause a panic.
+.It Fl n Ar name
+Use the
+.Fl n
+option to specify a volume name to the simplified configuration commands
+.Nm concat ,
+.Nm mirror
+and
+.Nm stripe .
 .It Fl r
 The
 .Fl r
@@ -307,7 +348,9 @@
 .Fl s
 .if t (``statistics'')
 .if n ("statistics")
-option is used by the list commands to display statistical information.
+option is used by the list commands to display statistical information.  The
+.Nm mirror
+command also uses this flag to specify that it should create striped plexes.
 .It Fl v
 The
 .Fl v
@@ -370,8 +413,13 @@
 Subdisks can normally only be attached to concatenated plexes.
 .It
 If a striped or RAID-5 plex is missing a subdisk (for example after drive
-failure), it may be replaced by a subdisk of the same size only.  No other
-attachment of subdisks is currently allowed.
+failure), it should be replaced by a subdisk of the same size only.  
+.It
+In order to add further subdisks to a striped or RAID-5 plex, use the
+.Fl f
+(force) option.  This will corrupt the data in the plex.  
+.\"No other attachment of
+.\"subdisks is currently allowed for striped and RAID-5 plexes.
 .It
 For concatenated plexes, the
 .Ar offset
@@ -382,6 +430,50 @@
 first subdisk will have offset 0, the second offset 256k, the third 512k, etc.
 This calculation ignores parity blocks in RAID-5 plexes.
 .El
+.It Nm concat
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.br
+The
+.Nm concat
+command provides a simplified alternative to the
+.Nm create
+command for creating volumes with a single concatenated plex.  The largest
+contiguous space available on each drive is used to create the subdisks for the
+plexes.
+.Pp
+Normally, the
+.Nm concat
+command creates an arbitrary name for the volume and its components.  The name
+is composed of the text
+.Ar vinum
+and a small integer, for example
+.Ar vinum3 .
+You can override this with the
+.Fl n Ar name
+option, which assigns the name specified to the volume.  The plexes and subdisks
+are named after the volume in the default manner.
+.Pp
+There is no choice of name for the drives.  If the drives have already been
+initialized as
+.Nm
+drives, the name remains.  Otherwise the drives are given names starting with
+the text
+.Ar vinumdrive
+and a small integer, for example
+.Ar vinumdrive7 .
+As with the
+.Nm create
+command, the
+.Fl f
+option can be used to specify that a previous name should be overwritten.  The
+.Fl v
+is used to specify verbose output.
+.Pp
+See the section SIMPLIFIED CONFIGURATION below for some examples of this
+command.
 .It Nm create Op Fl f Ar description-file
 .sp
 .Nm
@@ -528,16 +620,16 @@
 
 Time             Event       Buf        Dev     Offset          Bytes   SD      SDoff   Doffset Goffset
 
-14:40:00.637758 1VS Write 0xf2361f40    0x5b03  0x10            16384
-14:40:00.639280 2LR Write 0xf2361f40    0x5b03  0x10            16384
-14:40:00.639294 3RQ Read  0xf2361f40    0x427   0x104109        8192    19      0       0       0
-14:40:00.639455 3RQ Read  0xf2361f40    0x417   0xd2109         8192    17      0       0       0
-14:40:00.639529 3RQ Read  0xf2361f40    0x40f   0x6e109         8192    16      0       0       0
-14:40:00.652978 4DN Read  0xf2361f40    0x427   0x104109        8192    19      0       0       0
-14:40:00.667040 4DN Read  0xf2361f40    0x40f   0x6e109         8192    16      0       0       0
-14:40:00.668556 4DN Read  0xf2361f40    0x417   0xd2109         8192    17      0       0       0
-14:40:00.669777 6RP Write 0xf2361f40    0x427   0x104109        8192    19      0       0       0
-14:40:00.685547 4DN Write 0xf2361f40    0x427   0x104109        8192    19      0       0       0
+14:40:00.637758 1VS Write 0xf2361f40    91.3  0x10            16384
+14:40:00.639280 2LR Write 0xf2361f40    91.3  0x10            16384
+14:40:00.639294 3RQ Read  0xf2361f40    4.39   0x104109        8192    19      0       0       0
+14:40:00.639455 3RQ Read  0xf2361f40    4.23   0xd2109         8192    17      0       0       0
+14:40:00.639529 3RQ Read  0xf2361f40    4.15   0x6e109         8192    16      0       0       0
+14:40:00.652978 4DN Read  0xf2361f40    4.39   0x104109        8192    19      0       0       0
+14:40:00.667040 4DN Read  0xf2361f40    4.15   0x6e109         8192    16      0       0       0
+14:40:00.668556 4DN Read  0xf2361f40    4.23   0xd2109         8192    17      0       0       0
+14:40:00.669777 6RP Write 0xf2361f40    4.39   0x104109        8192    19      0       0       0
+14:40:00.685547 4DN Write 0xf2361f40    4.39   0x104109        8192    19      0       0       0
 .Ed
 .Pp
 The
@@ -741,13 +833,62 @@
 which reflect the current configuration.  This command is not intended for
 general use, and is provided for emergency use only.
 .Pp
-.It Nm quit
-Exit the
-.Nm
-program when running in interactive mode.  Normally this would be done by
-entering the
-.Ar EOF
-character.
+.It Nm mirror
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl s
+.Op Fl v
+.Ar drives
+.br
+The
+.Nm mirror
+command provides a simplified alternative to the
+.Nm create
+command for creating mirrored volumes.  Without any options, it creates a RAID-1
+(mirrored) volume with two concatenated plexes.  The largest contiguous space
+available on each drive is used to create the subdisks for the plexes.  The
+first plex is built from the odd-numbered drives in the list, and the second
+plex is built from the even-numbered drives.  If the drives are of different
+sizes, the plexes will be of different sizes.
+.Pp
+If the
+.Fl s
+option is provided,
+.Nm mirror
+builds striped plexes with a stripe size of 256 kB.  The size of the subdisks in
+each plex is the size of the smallest contiguous storage available on any of the
+drives which form the plex.  Again, the plexes may differ in size.
+.Pp
+Normally, the
+.Nm mirror
+command creates an arbitrary name for the volume and its components.  The name
+is composed of the text
+.Ar vinum
+and a small integer, for example
+.Ar vinum3 .
+You can override this with the
+.Fl n Ar name
+option, which assigns the name specified to the volume.  The plexes and subdisks
+are named after the volume in the default manner.
+.Pp
+There is no choice of name for the drives.  If the drives have already been
+initialized as
+.Nm
+drives, the name remains.  Otherwise the drives are given names starting with
+the text
+.Ar vinumdrive
+and a small integer, for example
+.Ar vinumdrive7 .
+As with the
+.Nm create
+command, the
+.Fl f
+option can be used to specify that a previous name should be overwritten.  The
+.Fl v
+is used to specify verbose output.
+.Pp
+See the section SIMPLIFIED CONFIGURATION below for some examples of this
+command.
 .It Nm printconfig Op Pa file
 Write a copy of the current configuration to
 .Pa file
@@ -759,6 +900,13 @@
 .Nm
 writes the list to
 .Pa stdout .
+.It Nm quit
+Exit the
+.Nm
+program when running in interactive mode.  Normally this would be done by
+entering the
+.Ar EOF
+character.
 .It Nm read
 .Ar disk Op disk...
 .Pp
@@ -921,6 +1069,16 @@
 d$BkN(Bon.  This command is temporary and will be replaced.  Currently, the bit mask
 may contain the bits 1 (log every action to syslog) and 4 (don't update
 configuration).  Option bit 4 can be useful for error recovery.
+.It Nm setstate
+.Ar state
+.Op Ar volume | plex | subdisk | drive
+.Pp
+.Nm setstate
+sets the state of the specified objects to the specified state.  This bypasses
+the usual consistency mechanism of
+.Nm
+and should be used only for recovery purposes.  It is possible to crash the
+system by incorrect use of this command.
 .It Nm start
 .Op volume | plex | subdisk
 .Pp
@@ -1068,7 +1226,186 @@
 to omit this checking and remove the object anyway.  Use this option with great
 care and understanding: used incorrectly, it can result in serious data
 corruption.
+.It Nm stripe
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.br
+The
+.Nm stripe
+command provides a simplified alternative to the
+.Nm create
+command for creating volumes with a single striped plex.  The size of the
+subdisks is the size of the largest contiguous space available on all the
+specified drives.  The stripe size is fixed at 256 kB.
+.Pp
+Normally, the
+.Nm stripe
+command creates an arbitrary name for the volume and its components.  The name
+is composed of the text
+.Ar vinum
+and a small integer, for example
+.Ar vinum3 .
+You can override this with the
+.Fl n Ar name
+option, which assigns the name specified to the volume.  The plexes and subdisks
+are named after the volume in the default manner.
+.Pp
+There is no choice of name for the drives.  If the drives have already been
+initialized as
+.Nm
+drives, the name remains.  Otherwise the drives are given names starting with
+the text
+.Ar vinumdrive
+and a small integer, for example
+.Ar vinumdrive7 .
+As with the
+.Nm create
+command, the
+.Fl f
+option can be used to specify that a previous name should be overwritten.  The
+.Fl v
+is used to specify verbose output.
+.Pp
+See the section SIMPLIFIED CONFIGURATION below for some examples of this
+command.
 .El
+.Sh SIMPLIFIED CONFIGURATION
+This section describes a simplified interface to
+.Nm
+configuration using the
+.Nm concat ,
+.Nm mirror
+and
+.Nm stripe
+commands.  These commands create convenient configurations for some more normal
+situations, but they are not as flexible as the
+.Nm create
+command.
+.Pp
+See above for the description of the commands.  Here are some examples, all
+performed with the same collection of disks.  Note that the first drive,
+.Pa /dev/da1h ,
+is smaller than the others.  This has an effect on the sizes chosen for each
+kind of subdisk.
+.Pp
+The following examples all use the
+.Fl v
+option to show the commands passed to the system, and also to list the structure
+of the volume.  Without the
+.Fl v
+option, these commands produce no output.
+.Ss Volume with a single concatenated plex
+Use a volume with a single concatenated plex for the largest possible storage
+without resilience to drive failures:
+.Bd -literal
+vinum ->  concat -v /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+volume vinum0
+  plex name vinum0.p0 org concat
+drive vinumdrive0 device /dev/da1h
+    sd name vinum0.p0.s0 drive vinumdrive0 size 0
+drive vinumdrive1 device /dev/da2h
+    sd name vinum0.p0.s1 drive vinumdrive1 size 0
+drive vinumdrive2 device /dev/da3h
+    sd name vinum0.p0.s2 drive vinumdrive2 size 0
+drive vinumdrive3 device /dev/da4h
+    sd name vinum0.p0.s3 drive vinumdrive3 size 0
+V vinum0                State: up       Plexes:       1 Size:       2134 MB
+P vinum0.p0           C State: up       Subdisks:     4 Size:       2134 MB
+S vinum0.p0.s0          State: up       PO:        0  B Size:        414 MB
+S vinum0.p0.s1          State: up       PO:      414 MB Size:        573 MB
+S vinum0.p0.s2          State: up       PO:      988 MB Size:        573 MB
+S vinum0.p0.s3          State: up       PO:     1561 MB Size:        573 MB
+.Ed
+.Pp
+In this case, the complete space on all four disks was used, giving a volume
+2134 MB in size.
+.Ss Volume with a single striped plex
+A volume with a single striped plex may give better performance than a
+concatenated plex, but restrictions on striped plexes can mean that the volume
+is smaller.  It will also not be resilient to a drive failure:
+.Bd -literal
+vinum -> stripe -v /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+drive vinumdrive0 device /dev/da1h
+drive vinumdrive1 device /dev/da2h
+drive vinumdrive2 device /dev/da3h
+drive vinumdrive3 device /dev/da4h
+volume vinum0
+  plex name vinum0.p0 org striped 256k
+    sd name vinum0.p0.s0 drive vinumdrive0 size 849825b
+    sd name vinum0.p0.s1 drive vinumdrive1 size 849825b
+    sd name vinum0.p0.s2 drive vinumdrive2 size 849825b
+    sd name vinum0.p0.s3 drive vinumdrive3 size 849825b
+V vinum0                State: up       Plexes:       1 Size:       1659 MB
+P vinum0.p0           S State: up       Subdisks:     4 Size:       1659 MB
+S vinum0.p0.s0          State: up       PO:        0  B Size:        414 MB
+S vinum0.p0.s1          State: up       PO:      256 kB Size:        414 MB
+S vinum0.p0.s2          State: up       PO:      512 kB Size:        414 MB
+S vinum0.p0.s3          State: up       PO:      768 kB Size:        414 MB
+.Ed
+.Pp
+In this case, the size of the subdisks has been limited to the smallest
+available disk, so the resulting volume is only 1659 MB in size.
+.Ss Mirrored volume with two concatenated plexes
+For more reliability, use a mirrored, concatenated volume:
+.Bd -literal
+vinum -> mirror -v -n mirror /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+drive vinumdrive0 device /dev/da1h
+drive vinumdrive1 device /dev/da2h
+drive vinumdrive2 device /dev/da3h
+drive vinumdrive3 device /dev/da4h
+volume mirror setupstate
+  plex name mirror.p0 org concat
+    sd name mirror.p0.s0 drive vinumdrive0 size 0b
+    sd name mirror.p0.s1 drive vinumdrive2 size 0b
+  plex name mirror.p1 org concat
+    sd name mirror.p1.s0 drive vinumdrive1 size 0b
+    sd name mirror.p1.s1 drive vinumdrive3 size 0b
+V mirror                State: up       Plexes:       2 Size:       1146 MB
+P mirror.p0           C State: up       Subdisks:     2 Size:        988 MB
+P mirror.p1           C State: up       Subdisks:     2 Size:       1146 MB
+S mirror.p0.s0          State: up       PO:        0  B Size:        414 MB
+S mirror.p0.s1          State: up       PO:      414 MB Size:        573 MB
+S mirror.p1.s0          State: up       PO:        0  B Size:        573 MB
+S mirror.p1.s1          State: up       PO:      573 MB Size:        573 MB
+.Ed
+.Pp
+This example specifies the name of the volume:
+.Ar mirror .
+Since one drive is smaller than the others, the two plexes are of different
+size, and the last 158 MB of the volume is non-resilient.  To ensure complete
+reliability in such a situation, use the
+.Nm create
+command to create a volume with 988 MB.
+.Ss Mirrored volume with two striped plexes
+Alternatively, use the
+.Fl s
+option to create a mirrored volume with two striped plexes:
+.Bd -literal
+vinum -> mirror -v -n raid10 -s /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+drive vinumdrive0 device /dev/da1h
+drive vinumdrive1 device /dev/da2h
+drive vinumdrive2 device /dev/da3h
+drive vinumdrive3 device /dev/da4h
+volume raid10 setupstate
+  plex name raid10.p0 org striped 256k
+    sd name raid10.p0.s0 drive vinumdrive0 size 849825b
+    sd name raid10.p0.s1 drive vinumdrive2 size 849825b
+  plex name raid10.p1 org striped 256k
+    sd name raid10.p1.s0 drive vinumdrive1 size 1173665b
+    sd name raid10.p1.s1 drive vinumdrive3 size 1173665b
+V raid10                State: up       Plexes:       2 Size:       1146 MB
+P raid10.p0           S State: up       Subdisks:     2 Size:        829 MB
+P raid10.p1           S State: up       Subdisks:     2 Size:       1146 MB
+S raid10.p0.s0          State: up       PO:        0  B Size:        414 MB
+S raid10.p0.s1          State: up       PO:      256 kB Size:        414 MB
+S raid10.p1.s0          State: up       PO:        0  B Size:        573 MB
+S raid10.p1.s1          State: up       PO:      256 kB Size:        573 MB
+.Ed
+.Pp
+In this case, the usable part of the volume is even smaller, since the first
+plex has shrunken to match the smallest drive.
 .Ss CONFIGURATION FILE
 .Nm
 requires that all parameters to the
@@ -1094,29 +1431,34 @@
 The configuration file can contain the following entries:
 .Pp
 .Bl -hang -width 4n
-.It Nm drive Ar name option
+.It Nm drive Ar name devicename
+.Op options
 .Pp
-Define a drive.  The option must be:
+Define a drive.  The options are:
 .Pp
 .Bl -hang -width 18n
 .It Nm device Ar devicename
 Specify the device on which the drive resides.  
 .Ar devicename
-must be the name of a disk compatibility partition, for example
+must be the name of a disk partition, for example
 .Pa /dev/da1e
 or
-.Pa /dev/wd3h ,
-and it should be of type
+.Pa /dev/wd3s2h ,
+and it must be of type
 .Nm vinum .
 Do not use the
 .Nm c
-partition, which is reserved for the complete disk, and should be of type
-.Nm unused .
-It is currently possible to create drives on other disk devices, for example
-.Pa /dev/da0s1
-or 
-.Pa /dev/da0s1e ,
-but it will not be possible to start these drives after a reboot.
+partition, which is reserved for the complete disk.
+.It Nm hotspare
+Define the drive to be a
+.Do
+hot spare
+.Dc
+drive, which is maintained to automatically replace a failed drive.
+.Nm
+does not allow this drive to be used for any other purpose.  In particular, it
+is not possible to create subdisks on it.  This functionality has not been
+completely implemented.
 .El
 .It Nm volume
 .Ar name
@@ -1333,15 +1675,7 @@
 .Nm
 drives are currently BSD disk partitions.  They must be of type
 .Ar vinum
-in order to avoid overwriting file systems.  For compatibility reasons,
-.Nm
-currently accepts partitions of type
-.Ar unused ,
-but the next release will not allow this kind of partition.
-.Nm
-prints a warning message when reading a configuration from a partition of type
-.Ar unused .
-Use
+in order to avoid overwriting data used for other purposes.  Use
 .Nm disklabel
 .Ar -e
 to edit a partition type definition.  The following display shows a typical
@@ -1383,7 +1717,7 @@
 .Sh LOG FILE
 .Nm
 maintains a log file, by default
-.Pa /var/tmp/vinum.history ,
+.Pa /var/tmp/vinum_history ,
 in which it keeps track of the commands issued to
 .Nm vinum .
 You can override the name of this file by setting the environment variable
@@ -1405,12 +1739,12 @@
 The first choice you need to make is where to put the data.  You need dedicated
 disk partitions for
 .Nm vinum .
-They should be compatibility partitions, not devices or partition
-.Nm c
-of a slice.  For example, good names are
+They should be partitions, not devices, and they should not be partition
+.Nm c .
+For example, good names are
 .Pa /dev/da0e
 or
-.Pa /dev/wd3a .
+.Pa /dev/wd3s4a .
 Bad names are 
 .Pa /dev/da0
 and
@@ -1418,15 +1752,8 @@
 both of which represent a device, not a partition,
 .Pa /dev/wd1c ,
 which represents a complete disk and should be of type
-.Nm unused ,
-and
-.Pa /dev/da3s0e ,
-which is not a compatibility partition.
-.Nm
-currently allows you to create drives with these names, but the
-.Nm start
-command will not find them.  See the example under DRIVE LAYOUT CONSIDERATIONS
-above.
+.Nm unused .
+See the example under DRIVE LAYOUT CONSIDERATIONS above.
 .Ss Designing volumes
 The way you set up
 .Nm
@@ -1941,11 +2268,8 @@
 message 
 .if t ``wrong partition type''.  
 .if n "wrong partition type".  
-The partition type should be
-.Ar vinum ,
-though currently partitions of type
-.Ar unused
-are also accepted.
+The partition type must be
+.Ar vinum .
 .It
 When you create a volume with multiple plexes,
 .Nm
@@ -2086,7 +2410,7 @@
 - directory containing device nodes for
 .Nm
 subdisks.
-.Sh ENVIRONMENT
+.Sh ENVIRONMENT VARIABLES
 .Bl -hang
 .It VINUM_HISTORY
 The name of the log file, by default /var/log/vinum_history.
@@ -2100,7 +2424,7 @@
 .Xr strftime 3 ,
 .Xr vinum 4 ,
 .Xr disklabel 8 ,
-.Xr newfs 8
+.Xr newfs 8 ,
 .Pa http://www.lemis.com/vinum.html ,
 .Pa http://www.lemis.com/vinum-debugging.html .
 .Sh AUTHOR
@@ -2109,4 +2433,9 @@
 The
 .Nm
 command first appeared in
-.Fx 3.0 .
+.Fx 3.0.
+The RAID-5 component of
+.Nm
+was developed by Cybernet Inc. 
+.Pa www.cybernet.com
+for its NetMAX product.
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/xntpd.8 man8/xntpd.8
--- fbsd-3.2-19990816-STABLE/man/man8/xntpd.8	Mon Aug 16 18:34:17 1999
+++ man8/xntpd.8	Tue Aug 24 18:37:16 1999
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: xntpd.8,v 1.5 1998/02/19 08:05:43 charnier Exp $
+.\"	$Id: xntpd.8,v 1.5.2.1 1999/08/18 07:41:16 chris Exp $
 .\"
 .Dd December 21, 1993
 .Dt XNTPD 8
@@ -235,7 +235,7 @@
 file contains a single floating point value equal to the offset in
 parts-per-million (ppm). Note that the file is updated by first writing
 the current drift value into a temporary file and then using
-.Xr rename 3
+.Xr rename 2
 to replace the old version. This implies that
 .Nm
 must have write permission for the directory the drift file is located
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/yp_mkdb.8 man8/yp_mkdb.8
--- fbsd-3.2-19990816-STABLE/man/man8/yp_mkdb.8	Mon Aug 16 18:34:18 1999
+++ man8/yp_mkdb.8	Tue Aug 24 18:37:17 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: yp_mkdb.8,v 1.8 1998/03/23 08:30:19 charnier Exp $
+.\"	$Id: yp_mkdb.8,v 1.8.2.1 1999/08/22 15:37:19 wpaul Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
@@ -45,6 +45,7 @@
 .Op Fl c
 .Op Fl b
 .Op Fl s
+.Op Fl f
 .Op Fl i Ar inputfile
 .Op Fl o Ar outputfile
 .Op Fl d Ar domainname
@@ -129,6 +130,22 @@
 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
+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
+.Fl f
+flag is used,
+.Nm
+will reject any source line that starts with a ``+'' or ``-''
+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
 inspect the contents of an existing NIS database.
diff -urNP fbsd-3.2-19990816-STABLE/man/man8/zic.8 man8/zic.8
--- fbsd-3.2-19990816-STABLE/man/man8/zic.8	Mon Aug 16 18:34:19 1999
+++ man8/zic.8	Tue Aug 24 18:37:18 1999
@@ -55,7 +55,7 @@
 .It Fl v
 Complain if a year that appears in a data file is outside the range
 of years representable by
-.Xr time 2
+.Xr time 3
 values.
 .It Fl s
 Limit time values stored in output files to values that are the same

----Next_Part(Sat_Aug_28_23:03:34_1999_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: Japanese diff
Content-Disposition: attachment; filename=jdiff_3.2-19990824-STABLE

diff -ur man/man1/chmod.1 man/man1/chmod.1
--- man/man1/chmod.1	Sat Aug 28 21:48:58 1999
+++ man/man1/chmod.1	Tue Aug 17 01:08:43 1999
@@ -121,7 +121,7 @@
 $B$3$N5!G=$r%5%]!<%H$7$F$$$k>l9g$K8B$i$l$^$9(B:
 .Xr chmod 2
 $B$H(B
-.Xr mount 1
+.Xr mount 8
 $B$N(B
 .Ar suiddir
 $B%*%W%7%g%s$r;2>H$7$F$/$@$5$$!#(B
@@ -299,7 +299,7 @@
 .Sh $B4XO"9`L\(B
 .Xr chflags 1 ,
 .Xr install 1 ,
-.Xr mount 1 ,
+.Xr mount 8 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
diff -ur man/man1/chpass.1 man/man1/chpass.1
--- man/man1/chpass.1	Sat May  8 10:44:40 1999
+++ man/man1/chpass.1	Sat Aug 28 21:46:10 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     %Id: chpass.1,v 1.14.2.1 1999/05/02 15:03:16 ghelmer Exp %
+.\"     %Id: chpass.1,v 1.14.2.2 1999/08/18 07:41:10 chris Exp %
 .\"
 .\" jpman %Id: chpass.1,v 1.2 1997/03/31 14:06:36 horikawa Stab %
 .Dd December 30, 1993
@@ -398,7 +398,7 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr getusershell 3 ,
-.Xr login.conf 5,
+.Xr login.conf 5 ,
 .Xr passwd 5 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff -ur man/man1/kbdcontrol.1 man/man1/kbdcontrol.1
--- man/man1/kbdcontrol.1	Sun Jul 11 12:49:33 1999
+++ man/man1/kbdcontrol.1	Sat Aug 28 21:46:11 1999
@@ -21,12 +21,13 @@
 .Nd syscons $B%3%s%=!<%k%I%i%$%P$rA`:n$9$k%f!<%F%#%j%F%#(B
 .Sh $B=q<0(B
 .Nm
-.Op Fl dFx
+.Op Fl dFKix
 .Op Fl b Ar duration.pitch | Ar belltype
 .Op Fl r Ar delay.repeat | Ar speed
 .Op Fl l Ar keymap_file
 .Op Fl f Ar # Ar string
 .Op Fl h Ar size
+.Op Fl k Ar keyboard_device
 .Op Fl L Ar keymap_file
 .Sh $B2r@b(B
 .Nm
@@ -52,7 +53,9 @@
 .Ar belltype
 $B0z?t$,;XDj$5$l$?>l9g!"$3$N0z?t$O(B
 .Cm normal
-($B%5%&%s%I%Q%i%a!<%?$rI8=`CM$KLa$7$^$9(B)$B$+(B
+($B%5%&%s%I%Q%i%a!<%?$rI8=`CM$KLa$7$^$9(B) $B$+(B
+.Cm off
+($B40A4$K%Y%k$r%*%U$K$7$^$9(B) $B$+(B
 .Cm visual
 ($B%Y%k$r%S%8%e%"%k%b!<%I$K$7$^$9!"(B
 $B$9$J$o$A2;$rLD$i$9Be$o$j$K2hLL$r%U%i%C%7%e$5$;$^$9(B)
@@ -114,6 +117,15 @@
 $B%R%9%H%j%P%C%U%!$NBg$-$5$r(B
 .Ar size
 $B9T$K@_Dj$7$^$9!#(B
+.It Fl i
+$B%-!<%\!<%I$K4X$9$kC;$+$$>pJs$rI=<($7$^$9!#(B
+.It Fl K
+$B%3%s%=!<%k$+$i%-!<%\!<%I$r@Z$jN%$7$^$9!#(B
+$B%-!<%\!<%I$H%3%s%=!<%k$r:F@\B3$9$k$?$a$K$O!"8e=R$N(B
+.Fl k
+$B%*%W%7%g%s$r;HMQ$9$kI,MW$,$"$j$^$9!#(B
+.It Fl k Ar keyboard_device
+$B;XDj$7$?%G%P%$%9$r%3%s%=!<%k%-!<%\!<%I$H$7$F;HMQ$7$^$9!#(B
 .It Fl L Ar keymap_file
 $B%-!<%\!<%I%^%C%W$r%U%!%$%k(B
 .Ar keymap_file
diff -ur man/man1/manpath.1 man/man1/manpath.1
--- man/man1/manpath.1	Mon May 18 10:05:35 1998
+++ man/man1/manpath.1	Sat Aug 28 21:46:11 1999
@@ -4,7 +4,7 @@
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the README file that comes with the man 1.0
-.\" distribution.  
+.\" distribution.
 .\"
 .\" John W. Eaton
 .\" jwe@che.utexas.edu
@@ -12,8 +12,10 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %Id: manpath.man,v 1.3.2.1 1999/08/21 07:23:40 ru Exp %
+.\"
 .\" jpman %Id: manpath.1,v 1.4 1997/08/20 20:58:18 horikawa Stab %
-.Dd Jan 5, 1991
+.Dd Aug 16, 1999
 .Dt MANPATH 1
 .Os
 .Sh $BL>>N(B
@@ -29,20 +31,28 @@
 $B$+$i%f!<%6$N%^%K%e%"%k%Z!<%8$N%5!<%A%Q%9$r7h$a!"7k2L$rI8=`=PNO$XI=<((B
 $B$7$^$9!#$^$?7Y9p$*$h$S%(%i!<$OI8=`%(%i!<=PNO$X=PNO$7$^$9!#%f!<%6$N(B
 .Ev PATH
-$BCf$N%G%#%l%/%H%j$,(B manpath.config $B%U%!%$%k$KL5$$$H$-$K$O!"(Bmanpath $B$O(B
-$B$=$N%G%#%l%/%H%j$G(B man $B$^$?$O(B MAN $B$H$$$&L>A0$N%5%V%G%#%l%/%H%j$rC5$7!"(B
+$BCf$N%G%#%l%/%H%j$,(B
+.Pa manpath.config
+$B%U%!%$%k$KL5$$$H$-$K$O!"(B
+.Nm
+$B$O(B
+$B$=$N%G%#%l%/%H%j$G(B
+.Pa man
+$B$^$?$O(B
+.Pa MAN
+$B$H$$$&L>A0$N%5%V%G%#%l%/%H%j$rC5$7!"(B
 $B8+IU$+$l$P$=$l$r%5!<%A%Q%9$KDI2C$7$^$9!#(B
 .Pp
 .Nm
 $B$O(B
-.Nm man
+.Xr man 1
 $B$,%5!<%A%Q%9$r7h$a$k$N$K$b;HMQ$7$^$9!#$7$?$,$C$F!"IaDL$O%f!<%6$,4D6-(B
 $BJQ?t(B
 .Ev MANPATH
 $B$rD>@\@_Dj$9$kI,MW$O$"$j$^$;$s!#(B
 .Pp
 $B%*%W%7%g%s$r0J2<$K<($7$^$9(B:
-.Bl -tag -width Ds
+.Bl -tag -width Fl
 .It Fl q
 $B!V@E$+$K!W<B9T$7$^$9!#:G=*E*$J%^%K%e%"%k%Z!<%8$N%5!<%A%Q%9$@$1$rI=<($7$^$9!#(B
 .El
@@ -51,7 +61,7 @@
 .It Ev MANPATH
 .Ev MANPATH
 $B$r@_Dj$9$k$H(B
-.Nm manpath
+.Nm
 $B$O$=$N@_Dj$rI8=`=PNO$KI=<($7!"I8=`%(%i!<=PNO$K7Y9p$r=PNO$7$^$9!#(B
 .El
 .Sh $B4XO"%U%!%$%k(B
diff -ur man/man1/pkg_add.1 man/man1/pkg_add.1
--- man/man1/pkg_add.1	Sat Aug 28 21:48:58 1999
+++ man/man1/pkg_add.1	Sat Aug 28 21:46:12 1999
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\"     %Id: pkg_add.1,v 1.29.2.2 1999/08/15 12:51:09 mpp Exp %
+.\"     %Id: pkg_add.1,v 1.29.2.3 1999/08/23 03:59:43 mharo Exp %
 .\"
 .\" jpman %Id: pkg_add.1,v 1.3 1997/06/09 04:19:05 jsakai Stab %
 .Dd November 25, 1994
diff -ur man/man1/pkg_create.1 man/man1/pkg_create.1
--- man/man1/pkg_create.1	Sat Aug 28 21:48:58 1999
+++ man/man1/pkg_create.1	Sat Aug 28 21:46:13 1999
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\"	%Id: pkg_create.1,v 1.27.2.1 1999/08/15 12:51:10 mpp Exp %
+.\"	%Id: pkg_create.1,v 1.27.2.2 1999/08/23 03:59:45 mharo Exp %
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
diff -ur man/man1/pkg_delete.1 man/man1/pkg_delete.1
--- man/man1/pkg_delete.1	Sat Aug 28 21:48:58 1999
+++ man/man1/pkg_delete.1	Sat Aug 28 21:46:14 1999
@@ -15,6 +15,8 @@
 .\"
 .\"
 .\"     @(#)pkg_delete.1
+.\"     %Id: pkg_delete.1,v 1.11.2.2 1999/08/23 03:59:47 mharo Exp %
+.\"
 .\" jpman %Id: pkg_delete.1,v 1.3 1997/06/09 08:35:00 jsakai Stab %
 .\"
 .Dd November 25, 1994
diff -ur man/man1/pkg_info.1 man/man1/pkg_info.1
--- man/man1/pkg_info.1	Sat Aug 28 21:48:58 1999
+++ man/man1/pkg_info.1	Sat Aug 28 21:46:14 1999
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_info.1
-.\"     %Id: pkg_info.1,v 1.19.2.1 1999/08/15 12:51:12 mpp Exp %
+.\"     %Id: pkg_info.1,v 1.19.2.2 1999/08/23 03:59:50 mharo Exp %
 .\"
 .\" jpman %Id: pkg_info.1,v 1.3 1997/06/08 14:11:48 jsakai Stab %
 .\"
diff -ur man/man1/rtprio.1 man/man1/rtprio.1
--- man/man1/rtprio.1	Sat Sep 26 15:19:58 1998
+++ man/man1/rtprio.1	Sat Aug 28 21:46:15 1999
@@ -28,7 +28,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: rtprio.1,v 1.15 1998/03/23 08:28:58 charnier Exp %
+.\"	%Id: rtprio.1,v 1.15.2.1 1999/08/18 07:41:13 chris Exp %
+.\"
 .\" jpman %Id: rtprio.1,v 1.3 1997/09/23 16:41:42 horikawa Stab %
 .\"
 .Dd July 23, 1994
@@ -87,7 +88,7 @@
 $B$r;XDj$9$k$H!"%W%m%;%9$^$?$O%W%m%0%i%`$r%j%"%k%?%$%`M%@hEY$K$F<B9T$7$^$9!#(B
 .Fl t
 $B$r;XDj$9$k$H!"%W%m%;%9$^$?$O%W%m%0%i%`$rDL>o$N%W%m%;%9(B
-($BHs%j%"%k%?%$%`%W%m%;%9(B)$B$H$7$F<B9T$7$^$9!#(B
+($BHs%j%"%k%?%$%`%W%m%;%9(B) $B$H$7$F<B9T$7$^$9!#(B
 .Pp
 .Ar -pid
 $B$r;XDj$9$k$H!"(B
@@ -139,7 +140,7 @@
 .Sy "rtprio 16 -1423"
 .Ed
 .Pp
-.Xr tcpdump 8
+.Xr tcpdump 1
 $B$rHs%j%"%k%?%$%`M%@hEY$K$F<B9T$7$^$9(B:
 .Bd -literal -offset indent -compact
 .Sy "rtprio -t tcpdump"
@@ -149,7 +150,7 @@
 .Em 1423
 $B$r(B
 .Dv RTP_PRIO_NORMAL
-($BHs%j%"%k%?%$%`(B/$BDL>o$NM%@hEY(B)$B$KJQ99$7$^$9(B:
+($BHs%j%"%k%?%$%`(B/$BDL>o$NM%@hEY(B) $B$KJQ99$7$^$9(B:
 .Bd -literal -offset indent -compact
 .Sy "rtprio -t -1423"
 .Ed
@@ -174,13 +175,13 @@
 CPU $B$rBgNL>CHq$9$k%W%m%;%9$r%j%"%k%?%$%`M%@hEY$G<B9T$9$k$H(B
 $B%7%9%F%`$rA`:n$G$-$J$/$J$j$^$9!#(B
 .Sh $B%P%0(B
-$B%W%m%;%9(B 0 (swapper) $B$N%j%"%k%?%$%`M%@hEY$r@_Dj5Z$S3NG'$9$kJ}K!$OM-$j$^$;$s(B(
+$B%W%m%;%9(B 0 (swapper) $B$N%j%"%k%?%$%`M%@hEY$r@_Dj5Z$S3NG'$9$kJ}K!$OM-$j$^$;$s(B (
 .Xr ps 1
 $B$r;2>H(B)$B!#(B
 .Pp
 .Bx Free
 $B$G$O%W%m%;%9$N%Z!<%8$,%a%b%jCf$KB8:_$9$k$3$H$rJ]>Z$G$-$J$$$?$a!"(B
-$B%W%m%;%9$,%Z!<%8%$%s$N$?$a$KDd;_$9$k$3$H$,M-$j$^$9(B(
+$B%W%m%;%9$,%Z!<%8%$%s$N$?$a$KDd;_$9$k$3$H$,M-$j$^$9(B (
 .Xr mprotect 2 ,
 .Xr madvise 2
 $B;2>H(B)$B!#(B
diff -ur man/man1/zforce.1 man/man1/zforce.1
--- man/man1/zforce.1	Wed Feb 25 13:54:20 1998
+++ man/man1/zforce.1	Sat Aug 28 21:46:15 1999
@@ -9,7 +9,7 @@
 $B6/@)E*$KIU2C$9$k(B
 .SH $B=q<0(B
 .B zforce
-[ name ...  ]
+name ...
 .SH $B2r@b(B
 .I zforce
 $B$O!"(B
@@ -20,8 +20,6 @@
 .I gzip
 $B$G05=L$5$l$?$9$Y$F$N%U%!%$%kL>$NKvHx$K(B .gz $B$r6/@)E*$KIU2C$7$^$9!#(B
 $BE>AwEy$G%U%!%$%kL>$,JQ$o$C$F$7$^$C$?%U%!%$%k$KM-MQ$G$9!#(B
-$B%U%!%$%kL>$ND9$5$,(B 14 $BJ8;z$^$G$K@)8B$5$l$F$$$k%7%9%F%`$G$O!"(B
-$B$b$H$N%U%!%$%kL>$r(B .gz $B3HD%;R$,F~$kD9$5$^$G=L$a$^$9!#(B
 $BNc$($P!"(B12345678901234 $B$O(B 12345678901.gz $B$K%U%!%$%kL>$,JQ99$5$l$^$9!#(Bfoo.tgz $B$N(B
 $B$h$&$J%U%!%$%kL>$O$=$N$^$^;D$5$l$^$9!#(B
 .SH $B4XO"9`L\(B
diff -ur man/man5/amd.conf.5 man/man5/amd.conf.5
--- man/man5/amd.conf.5	Sat Aug 28 21:48:59 1999
+++ man/man5/amd.conf.5	Sat Aug 28 21:46:26 1999
@@ -38,7 +38,7 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" %Id: amd.conf.5,v 1.6.2.1 1999/08/14 22:17:11 chris Exp %
+.\" %Id: amd.conf.5,v 1.6.2.2 1999/08/18 07:40:52 chris Exp %
 .\"
 .\" jpman %Id: amd.conf.5,v 1.3 1998/11/28 13:23:35 horikawa Stab %
 .\"
@@ -372,7 +372,7 @@
 $B$r;XDj$9$k$H!"(B
 .Nm amd
 $B$O%7%9%F%`%m%05-O?5!9=(B
-.Xr syslog 8
+.Xr syslogd 8
 $B$rMQ$$$F%$%Y%s%H$r5-O?$7$^$9!#(B
 $B%G%U%)%k%H$GMQ$$$i$l$k(B syslog $B%U%!%7%j%F%#$O(B
 .Ev LOG_DAEMON
diff -ur man/man5/loader.conf.5 man/man5/loader.conf.5
--- man/man5/loader.conf.5	Fri May 14 07:24:37 1999
+++ man/man5/loader.conf.5	Sat Aug 28 21:46:27 1999
@@ -22,7 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: loader.conf.5,v 1.1.2.1 1999/04/24 17:44:35 dcs Exp %
+.\"	%Id: loader.conf.5,v 1.1.2.2 1999/08/18 07:41:07 chris Exp %
+.\"
 .\" jpman %Id: loader.conf.5,v 1.4 1999/05/13 05:58:04 horikawa Stab %
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
@@ -57,7 +58,7 @@
 .Sh $BJ8K!(B
 .Nm loader.conf
 $B$N=q<0$O!"L@$i$+$K(B
-.Xr rc.conf 8
+.Xr rc.conf 5
 $B$N=q<0$r<u$17Q$$$@$b$N$G$"$j!"(B
 .Xr sh 1
 $B$r5/8;$H$9$k$b$N$G$9$,!"FCJL$JJ}K!$G07$o$l$k@_Dj$,$"$j$^$9!#(B
diff -ur man/man5/rc.conf.5 man/man5/rc.conf.5
--- man/man5/rc.conf.5	Sat Aug 28 21:48:59 1999
+++ man/man5/rc.conf.5	Sat Aug 28 21:46:28 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     %Id: rc.conf.5,v 1.27.2.5 1999/08/15 13:51:02 mpp Exp %
+.\"     %Id: rc.conf.5,v 1.27.2.9 1999/08/23 23:25:00 brian Exp %
 .\"
 .\" jpman %Id: rc.conf.5,v 1.3 1998/06/26 09:39:58 jsakai Stab %
 .\"
@@ -87,21 +87,29 @@
 .Ar YES
 $B$K%;%C%H$9$k$H(B
 .Xr apm 8
-$B%3%^%s%I$G$N<+F0EE8;4IM}(B(Automatic Power Management)$B$N%5%]!<%H$rM-8z$K(B
+$B%3%^%s%I$G$N<+F0EE8;4IM}(B (Automatic Power Management) $B$N%5%]!<%H$rM-8z$K(B
 $B$7$^$9!#(B
 .It Ar pccard_enable
 ($B%V!<%kCM(B)
 .Ar YES
-$B$K%;%C%H$9$k$H5/F0;~$K(BPCCARD$B$N%5%]!<%H$rM-8z$K$7$^$9!#(B
+$B$K%;%C%H$9$k$H5/F0;~$K(B PCCARD $B$N%5%]!<%H$rM-8z$K$7$^$9!#(B
 .It Ar pccard_mem
-($BJ8;zNs(B) PCCARD$B%3%s%H%m!<%i%a%b%j%"%I%l%9$r%;%C%H$7$^$9!#(B
+($BJ8;zNs(B) PCCARD $B%3%s%H%m!<%i%a%b%j%"%I%l%9$r%;%C%H$7$^$9!#(B
 .Ar DEFAULT
 $B$H$9$k$H%G%U%)%k%HCM$K$J$j$^$9!#(B
 .It Ar pccard_ifconfig
-($BJ8;zNs(B) $BA^F~$^$?$O5/F0;~$KF0E*$K(Bifconfig$B$5$l$k$Y$-%$!<%5%M%C%H%G%P%$%9(B
+($BJ8;zNs(B) $BA^F~$^$?$O5/F0;~$KF0E*$K(B ifconfig $B$5$l$k$Y$-%$!<%5%M%C%H%G%P%$%9(B
 $B$N%j%9%H$G$9!#(B
 ($BNc(B
 .Ar "ed0 ed1 ep0 ..." )
+.It Ar pccardd_flags
+($BJ8;zNs(B)
+.Ar pccard_enable 
+$B$,(B
+.Ar YES
+$B$N>l9g!"$3$l$i$O(B
+.Xr pccardd 8
+$B%G!<%b%s$KEO$9%U%i%0$K$J$j$^$9!#(B
 .It Ar local_startup
 ($BJ8;zNs(B) $B5/F0%9%/%j%W%H%U%!%$%k$r8!:w$9$k$?$a$N%G%#%l%/%H%j$N%j%9%H$G$9!#(B
 .It Ar local_periodic
@@ -226,7 +234,7 @@
 .Ar dedicated
 $B$N$$$:$l$+$G$9!#(B
 $B40A4$J2r@b$O%^%K%e%"%k$r;2>H$7$F$/$@$5$$!#(B
-.It Ar ppp_alias
+.It Ar ppp_nat
 ($B%V!<%kCM(B)
 .Ar YES
 $B$K%;%C%H$9$k$H!"%Q%1%C%H%(%$%j%"%9$rM-8z$K$7$^$9!#(B
@@ -257,7 +265,9 @@
 .Xr syslogd 8
 $B%G!<%b%s$r5/F0$7$^$9!#(B
 .It Ar syslogd_flags
-($BJ8;zNs(B) syslogd_enable $B$,(B
+($BJ8;zNs(B)
+.Ar syslogd_enable
+$B$,(B
 .Ar YES
 $B$N>l9g!"$3$l$i$O(B
 .Xr syslogd 8
@@ -269,7 +279,9 @@
 .Xr inetd 8
 $B%G!<%b%s$r5/F0$7$^$9!#(B
 .It Ar inetd_flags
-($BJ8;zNs(B)inetd_enable $B$,(B
+($BJ8;zNs(B)
+.Ar inetd_enable
+$B$,(B
 .Ar YES
 $B$N>l9g!"$3$l$i$O(B
 .Xr inetd 8
@@ -640,7 +652,7 @@
 ($B%V!<%kCM(B)
 .Ar YES
 $B$K%;%C%H$9$k$H!"%V!<%H;~$K(B
-.Xr ipxrouted 8
+.Xr IPXrouted 8
 $B%G!<%b%s$r5/F0$7$^$9!#(B
 .It Ar ipxrouted_flags
 ($BJ8;zNs(B)
@@ -648,7 +660,7 @@
 $B$,(B
 .Ar YES
 $B$N>l9g!"$3$l$i$O(B
-.Xr ipxrouted 8
+.Xr IPXrouted 8
 $B%G!<%b%s$XEO$9%U%i%0$H$J$j$^$9!#(B
 .It Ar arpproxy_all
 .Ar YES
@@ -681,7 +693,7 @@
 .Xr rarpd 8
 $B%G!<%b%s$XEO$9%U%i%0$H$J$j$^$9!#(B
 .It Ar atm_enable
-(bool) Set to
+($B%V!<%kCM(B)
 .Ar YES 
 $B%7%9%F%`%V!<%H;~$K(B ATM $B%$%s%?%U%'!<%9$N@_Dj$rM-8z$K$7$^$9!#(B
 $B<!$K@bL@$9$k(B ATM $B4XO"$NJQ?t$K4X$7!"(B
@@ -744,7 +756,7 @@
 .Dq atm set arpserver Va <netif>
 $B$N%Q%i%a!<%?$H$7$FEO$5$l$^$9!#(B
 .It Ar atm_scsparp_<netif>
-(bool)
+($B%V!<%kCM(B)
 .Em YES
 $B$K@_Dj$9$k$H!"%M%C%H%o!<%/%$%s%?%U%'!<%9(B
 .Va <netif> 
@@ -871,19 +883,33 @@
 .Ar auto
 $B$K%;%C%H$7$^$9!#(B
 $B<+F08!=P$,<:GT$9$k>l9g!"0J2<$N%j%9%H$+$i(B 1 $B$D$rA*$S$^$9!#(B
+.Pp
+$B%^%&%9$,(B PS/2 $B%^%&%9%]!<%H$K@\B3$5$l$F$$$k>l9g!"(B
+.Ar auto
+$B$+(B
+.Ar ps/2
+$B$r>o$K;XDj$9$kI,MW$,$"$j$^$9!#%^%&%9$N%V%i%s%I$d%b%G%k$K$OL54X78$G$9!#(B
+$BF1MM$K!"%^%&%9$,%P%9%^%&%9%]!<%H$K@\B3$5$l$F$$$k>l9g!"(B
+.Ar auto
+$B$+(B
+.Ar busmouse
+$B$rA*Br$7$F$/$@$5$$!#(B
+$BB>$N%W%m%H%3%k$O%7%j%"%k%^%&%9MQ$G$"$j!"(B
+PS/2 $B%^%&%9$*$h$S%P%9%^%&%9$G$OF0:n$7$^$;$s!#(B
 .Bd -literal
-microsoft        Microsoft $B%^%&%9(B
-intellimouse     Microsoft IntelliMouse
-mousesystems     Mouse system $B<R@=$N%^%&%9(B
-mmseries         MM $B%7%j!<%:$N%^%&%9(B
-logitech         Logitech $B@=$N%^%&%9(B
+microsoft        Microsoft $B%^%&%9(B ($B%7%j%"%k(B)
+intellimouse     Microsoft IntelliMouse ($B%7%j%"%k(B)
+mousesystems     Mouse system $B<R@=$N%^%&%9(B ($B%7%j%"%k(B)
+mmseries         MM $B%7%j!<%:$N%^%&%9(B ($B%7%j%"%k(B)
+logitech         Logitech $B@=$N%^%&%9(B ($B%7%j%"%k(B)
 busmouse         $B%P%9%^%&%9(B
-mouseman         Logitech $B$N(B MouseMan $B$*$h$S(B TrackMan
-glidepoint       ALPS $B@=$N(B GlidePoint
-thinkingmouse    Kensignton $B@=$N(B ThinkingMouse
+mouseman         Logitech $B$N(B MouseMan $B$*$h$S(B TrackMan ($B%7%j%"%k(B)
+glidepoint       ALPS $B@=$N(B GlidePoint ($B%7%j%"%k(B)
+thinkingmouse    Kensignton $B@=$N(B ThinkingMouse ($B%7%j%"%k(B)
 ps/2             PS/2 $B%^%&%9(B
-mmhittab         MM $B$N(B HitTablet
-x10mouseremote   X10 MouseRemote
+mmhittab         MM $B$N(B HitTablet ($B%7%j%"%k(B)
+x10mouseremote   X10 MouseRemote ($B%7%j%"%k(B)
+versapad         Interlink VersaPad ($B%7%j%"%k(B)
 
 .Ed
 $B$*;H$$$N%^%&%9$,>e5-$N%j%9%H$K$J$$>l9g$G$b!"(B
diff -ur man/man7/Makefile man/man7/Makefile
--- man/man7/Makefile	Sun Feb  7 20:20:41 1999
+++ man/man7/Makefile	Sat Aug 28 21:53:49 1999
@@ -6,6 +6,7 @@
 	groff_mm.7\
 	groff_mmse.7\
 	groff_ms.7\
+	groff_msafer.7\
 	hier.7\
 	hostname.7\
 	intro.7\
@@ -23,6 +24,7 @@
 MLINKS+=groff_mm.7 mm.7
 MLINKS+=groff_mmse.7 mmse.7
 MLINKS+=groff_ms.7 ms.7
+MLINKS+=groff_msafer.7 msafer.7
 MLINKS+=intro.7 miscellaneous.7
 
 .include "bsd.prog.mk"
diff -ur man/man7/environ.7 man/man7/environ.7
--- man/man7/environ.7	Tue May  4 13:44:23 1999
+++ man/man7/environ.7	Sat Aug 28 21:47:04 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)environ.7	8.3 (Berkeley) 4/19/94
-.\"	%Id: environ.7,v 1.10.2.1 1999/04/29 09:33:39 jkoshy Exp %
+.\"	%Id: environ.7,v 1.10.2.2 1999/08/18 19:55:04 mpp Exp %
 .\"
 .\" jpman %Id: environ.7,v 1.4 1999/01/21 17:56:13 kuma Stab %
 .Dd April 19, 1994
@@ -65,6 +65,8 @@
 $B?t;z$N8e$K(B ``G'' $B$+(B ``g'' $B$r;XDj$9$k$3$H$K$h$C$F%.%,%P%$%HC10L$NCM$r!"(B
 $B;XDj$9$k$3$H$,$G$-$^$9!#(B
 512 $B%P%$%H$h$j>.$5$$CM$d(B 1 $B%.%,%P%$%H$h$jBg$-$$CM$r;XDj$7$F$bL5;k$5$l$^$9!#(B
+.It Ev EDITOR
+$B%G%U%)%k%H$N%(%G%#%?$NL>A0!#(B
 .It Ev EXINIT
 .Xr ex  1  ,
 .Xr vi  1
@@ -84,6 +86,13 @@
 .Xr sh 1 , 
 $B$=$NB>B?$/$N%a!<%k%/%i%$%"%s%H$,!"%G%U%)%k%H$N(B /var/mail $B$N(B
 $BBe$o$j$KMQ$$$^$9!#(B
+.It Ev PAGER
+$B%G%U%)%k%H$N%Z!<%8%c%W%m%0%i%`!#(B
+.Xr mail 1 ,
+.Xr man 1 ,
+.Xr ftp 1
+$B$J$I$,!";HMQCf$N%G%#%9%W%l%$$h$j$bD9$$>pJs$rI=<($9$k$H$-$K!"(B
+$B$3$NJQ?t$G;XDj$5$l$?%W%m%0%i%`$r;HMQ$7$^$9!#(B
 .It Ev PATH
 $B%3%m%s$G6h@Z$i$l$?%G%#%l%/%H%j$NNs$G$9!#(B
 .Xr csh  1  ,
@@ -100,6 +109,8 @@
 .Xr lpq  1 ,
 .Xr lprm  1
 $B$K$h$C$FMQ$$$i$l$k%G%U%)%k%H$N%W%j%s%?$NL>A0!#(B
+.It Ev PWD
+$B%+%l%s%H%G%#%l%/%H%j$N%Q%9L>!#(B
 .It Ev SHELL
 $B%f!<%6$N%m%0%$%s%7%'%k$N%U%k%Q%9L>!#(B
 .It Ev TERM
diff -ur man/man7/hier.7 man/man7/hier.7
--- man/man7/hier.7	Fri Mar 19 23:07:17 1999
+++ man/man7/hier.7	Sat Aug 28 21:47:05 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\"	%Id: hier.7,v 1.16.2.1 1999/02/18 00:58:20 jkh Exp %
+.\"	%Id: hier.7,v 1.16.2.2 1999/08/21 04:46:23 chris Exp %
 .\"
 .\" jpman %Id: hier.7,v 1.3 1999/01/04 08:08:08 kuma Stab %
 .Dd June 5, 1993
diff -ur man/man7/ports.7 man/man7/ports.7
--- man/man7/ports.7	Sat Aug 28 21:48:59 1999
+++ man/man7/ports.7	Sat Aug 28 21:47:06 1999
@@ -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.
 .\"
-.\" %Id: ports.7,v 1.9.2.5 1999/08/15 13:51:03 mpp Exp %
+.\" %Id: ports.7,v 1.9.2.6 1999/08/21 17:25:52 hoek Exp %
 .\"
 .\" jpman %Id: ports.7,v 1.3 1999/01/24 06:53:11 horikawa Stab %
 .Dd January 25, 1998
@@ -153,7 +153,7 @@
 .Bl -tag -width fetch-list
 .It Ar fetch-list
 $B$3$N(B port $B$r9=C[$9$k$?$a$K<hF@$,I,MW$J%U%!%$%k$N%j%9%H$rI=<($7$^$9!#(B
-.It Ar depends-list package-depends
+.It Ar pretty-print-run-depends-list pretty-print-build-depends-list
 $B%3%s%Q%$%k0MB8(B port $B%j%9%H$H<B9T0MB8(B port $B%j%9%H$rI=<($7$^$9!#(B
 $B$^$?!"$3$l$i$N0MB8(B port $B%j%9%H$,0MB8$9$k(B port $B$K$D$$$F$bI=<($7$^$9!#(B
 .It Ar clean
diff -ur man/man7/security.7 man/man7/security.7
--- man/man7/security.7	Sun May  2 08:59:02 1999
+++ man/man7/security.7	Sat Aug 28 21:47:08 1999
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\"	%Id: security.7,v 1.4.2.1 1999/04/01 02:10:38 ghelmer Exp %
+.\"	%Id: security.7,v 1.4.2.2 1999/08/18 07:41:03 chris Exp %
 .\"
 .\" jpman %Id: security.7,v 1.3 1999/02/11 11:18:48 vanitas Stab %
 .Dd December 20, 1998
@@ -448,7 +448,7 @@
 .Pp
 $B%W%m%;%9%"%+%&%s%F%#%s%0(B
 .Po
-.Xr accton 1
+.Xr accton 8
 $B;2>H(B
 .Pc
 $B$O!"Hf3SE*%*!<%P%X%C%I$NDc$$%*%Z%l!<%F%#%s%0%7%9%F%`$N5!G=$G!"(B
@@ -647,7 +647,6 @@
 
 .Sh $B4XO"9`L\(B
 .Pp
-.Xr accton 1 ,
 .Xr chflags 1 ,
 .Xr find 1 ,
 .Xr kerberos 1 ,
@@ -656,6 +655,7 @@
 .Xr sshd 1 ,
 .Xr syslogd 1 ,
 .Xr xdm 1 ,
+.Xr accton 8 ,
 .Xr sysctl 8
 .Sh $BNr;K(B
 .Nm
diff -ur man/man8/Makefile man/man8/Makefile
--- man/man8/Makefile	Mon Jun  7 07:01:56 1999
+++ man/man8/Makefile	Sat Aug 28 22:20:56 1999
@@ -85,6 +85,7 @@
 	keyserv.8\
 	kget.8\
 	kgmon.8\
+	kgzip.8\
 	kldload.8\
 	kldstat.8\
 	kldunload.8\
diff -ur man/man8/ccdconfig.8 man/man8/ccdconfig.8
--- man/man8/ccdconfig.8	Sun Jan 31 00:44:16 1999
+++ man/man8/ccdconfig.8	Sat Aug 28 21:47:15 1999
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: ccdconfig.8,v 1.6 1998/11/19 20:22:10 asami Exp %
+.\"	%Id: ccdconfig.8,v 1.6.2.1 1999/08/17 07:05:13 jkoshy Exp %
 .\"
 .\" jpman %Id: ccdconfig.8,v 1.3 1997/07/28 10:00:39 konuma Stab %
 .Dd July 17, 1995
@@ -157,6 +157,12 @@
 ccd0            16      none    /dev/da2e /dev/da3e
 .Ed
 .Pp
+$B9=@.MWAG$N%G%P%$%9$O!"%Q!<%F%#%7%g%s%?%$%W$,(B
+.Li FS_BSDFFS
+.Pf ( Xr disklabel 8
+$B$G$O(B
+.Dq 4.2BSD
+$B$HI=<($5$l$^$9(B) $B$G$"$k$3$H$,I,MW$G$9!#(B
 .Sh $B;HMQNc(B
 $B%3%^%s%I9T$+$i0J2<$N%3%^%s%I$r<B9T$7$?>l9g!"(Bccd0 $B$r(B
 (/dev/da2e, /dev/da3e, /dev/da4e, /dev/da5e $B$N(B) $B;M$D$NMWAG$+$i(B
diff -ur man/man8/edquota.8 man/man8/edquota.8
--- man/man8/edquota.8	Sat Jul 31 20:16:04 1999
+++ man/man8/edquota.8	Sat Aug 28 21:47:15 1999
@@ -33,8 +33,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
+.\"	%Id: edquota.8,v 1.6.2.1 1999/08/16 21:47:55 chris Exp %
 .\"
-.\" Original Revision: 1.6
 .\" jpman %Id: edquota.8,v 1.2 1997/05/15 08:54:02 mitchy Stab %
 .\"
 .Dd June 6, 1993
@@ -176,8 +176,8 @@
 .El
 .Sh $B4XO"9`L\(B
 .Xr quota 1 ,
-.Xr fstab 2 ,
 .Xr quotactl 2 ,
+.Xr fstab 5 ,
 .Xr quotacheck 8 ,
 .Xr quotaon 8 ,
 .Xr repquota 8
diff -ur man/man8/fdisk.8 man/man8/fdisk.8
--- man/man8/fdisk.8	Sat Jul 31 20:16:05 1999
+++ man/man8/fdisk.8	Sat Aug 28 21:47:16 1999
@@ -1,4 +1,4 @@
-.\"	%Id: fdisk.8,v 1.11.2.3 1999/07/28 09:51:18 rnordier Exp %
+.\"	%Id: fdisk.8,v 1.11.2.4 1999/08/23 11:06:59 phk 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 Baitu
+.Op Fl Baeitu
 .Op Fl b Ar bootcode
 .Op Fl 1234
 .Op Ar disk
@@ -54,11 +54,6 @@
 $BB>$N%9%/%j%W%H(B/$B%W%m%0%i%`$+$iMxMQ$9$k$h$&@_7W$5$l$F$$$^$9!#(B
 .Pp
 $B%*%W%7%g%s(B:
-.It Fl B
-$B%G%#%9%/$N%;%/%?(B 0 $B$K4^$^$l$k%V!<%H%3!<%I$r:F=i4|2=$7$^$9!#(B
-$B$b$7(B
-.Fl f
-$B$,$J$1$l$P!"L5;k$5$l$^$9!#(B
 .It Fl a
 $B%"%/%F%#%V%Q!<%F%#%7%g%s$NJQ99$N$_$r9T$J$$$^$9!#(B
 .Fl f
@@ -67,6 +62,14 @@
 $B%V!<%H%3!<%I$r%U%!%$%k(B
 .Ar bootcode
 $B$+$i<hF@$7$^$9!#(B
+.It Fl B
+$B%G%#%9%/$N%;%/%?(B 0 $B$K4^$^$l$k%V!<%H%3!<%I$r:F=i4|2=$7$^$9!#(B
+$B$b$7(B
+.Fl f
+$B$,$J$1$l$P!"L5;k$5$l$^$9!#(B
+.It Fl e
+$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
 $B%Q!<%F%#%7%g%s$NCM$r%U%!%$%k(B
 .Ar configfile
diff -ur man/man8/hlfsd.8 man/man8/hlfsd.8
--- man/man8/hlfsd.8	Tue Jan 12 23:25:46 1999
+++ man/man8/hlfsd.8	Sat Aug 28 21:47:17 1999
@@ -36,13 +36,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %Id: hlfsd.8,v 1.3 1998/09/12 04:04:58 obrien Exp %
-.\" jpman %Id: hlfsd.8,v 1.3 1999/01/01 14:22:00 vanitas Stab %
+.\" %Id: hlfsd.8,v 1.3.2.1 1999/08/18 07:40:47 chris Exp %
 .\"
 .\" HLFSD was written at Columbia University Computer Science Department, by
 .\" Erez Zadok <ezk@cs.columbia.edu> and Alexander Dupuy <dupuy@smarts.com>
 .\" It is distributed under the same terms and conditions as AMD.
 .\"
+.\" jpman %Id: hlfsd.8,v 1.3 1999/01/01 14:22:00 vanitas Stab %
+.\"
 .Dd September 14, 1993
 .Dt HLFSD 8
 .Os
@@ -78,9 +79,9 @@
 .Nm
 $B$O(B
 .Ar linkname
-$B$r4^$`%G%#%l%/%H%j(B($B%G%U%)%k%H$O(B
+$B$r4^$`%G%#%l%/%H%j(B ($B%G%U%)%k%H$O(B
 .Pa /hlfs/home
-)$B$KBP$9$k(B
+) $B$KBP$9$k(B
 .Tn NFS
 $B%5!<%P$H$7$F<+J,<+?H$r%^%&%s%H$7$FF0:n$7$^$9!#(B
 $B$3$N%G%#%l%/%H%j$KBP$9$k8!:w(B (lookup) $B$O(B
@@ -120,7 +121,7 @@
 .It Fl c Ar cache-interval
 $B%-%c%C%7%e$9$k4V3V$G$9!#(B
 .Nm
-$B$O$3$N4V3V(B($BICC10L(B)$B$G%[!<%`%G%#%l%/%H%j$NM-8z@-$r%-%c%C%7%e$7$^$9!#(B
+$B$O$3$N4V3V(B ($BICC10L(B) $B$G%[!<%`%G%#%l%/%H%j$NM-8z@-$r%-%c%C%7%e$7$^$9!#(B
 .Ar cache-interval
 $BIC0JFb$K3NG'$5$l$?$3$H$N$"$k%(%s%H%j$O:F3NG'$5$l$^$;$s!#(B
 $B$=$l$O!"$=$NA`:n$N%3%9%H$,9b$/!"(B
@@ -274,7 +275,7 @@
 $B$O(B
 .Ux 
 System 7 $B$N%3%m%s6h@Z$j$N%U%)!<%^%C%H(B
-.Xr passwd 4
+.Xr passwd 5
 $B$K=>$o$J$1$l$P$J$j$^$;$s!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /axx
diff -ur man/man8/init.8 man/man8/init.8
--- man/man8/init.8	Mon Aug  9 01:10:21 1999
+++ man/man8/init.8	Wed Aug 25 20:19:58 1999
@@ -347,7 +347,7 @@
 .Xr ipfw 8 ,
 .Xr rc 8 ,
 .Xr reboot 8 ,
-.Xr shutdown 8,
+.Xr shutdown 8 ,
 .Xr sysctl 8
 .Sh $BNr;K(B
 .Nm
diff -ur man/man8/ipfw.8 man/man8/ipfw.8
--- man/man8/ipfw.8	Sun Jun 20 21:44:52 1999
+++ man/man8/ipfw.8	Sat Aug 28 21:47:18 1999
@@ -1,5 +1,5 @@
 .\"
-.\" %Id: ipfw.8,v 1.47.2.5 1999/06/17 13:03:37 ru Exp %
+.\" %Id: ipfw.8,v 1.47.2.6 1999/08/16 17:29:52 luigi Exp %
 .\"
 .\" jpman %Id: ipfw.8,v 1.4 1997/05/19 17:19:51 horikawa Stab %
 .Dd July 20, 1996
@@ -49,6 +49,7 @@
 .Oc
 add
 .Op Ar number
+.Op prob match_probability
 .Ar action 
 .Op log
 .Ar proto
@@ -95,7 +96,18 @@
 $B3F%k!<%k$K$O%Q%1%C%H?t$H%Q%1%C%H%5%$%:$N(B 2 $B$D$N%+%&%s%?$,MQ0U$5$l$F$$$F!"(B
 $B%Q%1%C%H$,%^%C%A$9$k$H%+%&%s%?CM$O99?7$5$l$^$9!#(B
 .Pp
-$BA4%k!<%k$O(B 1 $B$+$i(B 65534 $B$NHO0O$N9THV9f$G=g=xIU$1$i$l$^$9!#$3$NHV9f$K$h$C$F(B
+$B%k!<%k$K!">JN,2DG=$J(B
+.Dq prob match_probability
+$B;XDj;R$,IU$$$F$$$k>l9g!";XDj$7$?3NN($G$N$_%^%C%A$,@k8@$5$l$^$9!#(B
+match_probability $B$O!"(B0 $B$+$i(B 1 $B$^$G$NIbF0>.?tE@?t$G$9!#(B
+$B%i%s%@%`$K%Q%1%C%H$rMn$H$9MQES$d!"(B
+.Pf ( Xr dummynet 4
+$B$H6&$K;HMQ$7$F(B)
+$BJ#?t%Q%9$r%7%_%e%l!<%H$7$F%Q%1%C%HG[Aw=g=x$rMp$l$5$;$kMQES$J$I$KM-MQ$G$9!#(B
+.Pp
+$BA4%k!<%k$O(B 1 $B$+$i(B 65534 $B$NHO0O$N(B
+.Dq $B9THV9f(B
+$B$G=g=xIU$1$i$l$^$9!#$3$NHV9f$K$h$C$F(B
 $B%k!<%k$NJB$YJQ$($H:o=|$r9T$J$$$^$9!#(B
 $B%k!<%k$N%^%C%A%s%0$O>:=g$G9T$J$o$l!":G=i$K%^%C%A$7$?$b$N$,E,MQ$5$l$^$9!#(B
 $BJ#?t$N%k!<%k$,F1$8HV9f$r6&M-$9$k$3$H$b2DG=$G$9!#$3$N>l9g$O%k!<%k$,DI2C$5$l$?(B
@@ -263,6 +275,17 @@
 $B30It%^%7%s$N%]!<%H(B Y $B$X$N%Q%1%C%H$O(B $B%m!<%+%k%]!<%H(B Y $B$XE>Aw$5$l$^$9!#(B
 $B%+!<%M%k$O!"(B
 $B%*%W%7%g%s(B IPFIREWALL_FORWARD $BIU$-$G%3%s%Q%$%k$5$l$F$$$kI,MW$,$"$j$^$9!#(B
+.It Ar pipe pipe_nr
+$B%Q%1%C%H$r(B
+.Xr dummynet 4
+``$B%Q%$%W(B'' $B$XEO$7$^$9(B ($B%P%s%II}@)8B!"CY1dEy$N$?$a(B)$B!#(B
+$B99$J$k>pJs$K$D$$$F$O(B
+.Xr dummynet 4
+$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
+$B8!:w$O=*N;$7$^$9!#(B
+$B$7$+$7!"%Q%$%W$+$iH4$1$?$H$-$K(B sysctl $BJQ?t(B
+net.inet.ip.fw.one_pass $B$,%;%C%H$5$l$F$$$J$$>l9g!"(B
+$B%Q%1%C%H$O%U%!%$%"%&%)!<%k%3!<%I$X:FEYEO$5$l$F<!$N%k!<%k$+$i3+;O$7$^$9!#(B
 .It Ar skipto number
 .Ar number
 $B$h$j>.$5$JHV9f$N%k!<%k$rHt$S1[$7$F!"(B
@@ -565,6 +588,7 @@
 .Xr cpp 1 ,
 .Xr m4 1 ,
 .Xr divert 4 ,
+.Xr dummynet 4 ,
 .Xr ip 4 ,
 .Xr ipfirewall 4 ,
 .Xr protocols 5 ,
diff -ur man/man8/linux.8 man/man8/linux.8
--- man/man8/linux.8	Tue May  4 13:44:27 1999
+++ man/man8/linux.8	Sat Aug 28 21:47:18 1999
@@ -22,7 +22,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.
 .\"
-.\" %Id: linux.8,v 1.3.2.2 1999/04/23 16:15:50 ghelmer Exp %
+.\" %Id: linux.8,v 1.3.2.3 1999/08/19 00:14:15 mpp Exp %
 .\"
 .\" jpman %Id: linux.8,v 1.3 1997/07/22 16:50:43 horikawa Stab %
 .Dd January 9, 1997
@@ -43,5 +43,5 @@
 .Sh $B4XO"9`L\(B
 .Xr kld 4 ,
 .Xr kldload 8 ,
-.Xr kldunload 8 ,
-.Xr kldstat 8
+.Xr kldstat 8 ,
+.Xr kldunload 8
diff -ur man/man8/mount.8 man/man8/mount.8
--- man/man8/mount.8	Mon Apr 26 23:34:51 1999
+++ man/man8/mount.8	Sat Aug 28 21:47:19 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\"	%Id: mount.8,v 1.24.2.1 1999/04/08 14:00:59 ghelmer Exp %
+.\"	%Id: mount.8,v 1.24.2.2 1999/08/19 10:14:48 jkoshy Exp %
 .\"
 .\" jpman %Id: mount.8,v 1.2 1997/05/03 11:26:50 horikawa Stab %
 .\"
@@ -104,6 +104,7 @@
 $B%*%W%7%g%s$O(B
 .Fl o
 $B$N8e$K%3%s%^$G6h@Z$C$F;XDj$7$^$9!#(B
+$B>WFM$9$k%*%W%7%g%s$,;XDj$5$l$?>l9g!":G$b1&B&$N%*%W%7%g%s$,8z2L$,$"$j$^$9!#(B
 $B0J2<$N%*%W%7%g%s$,;XDj$G$-$^$9(B:
 .Bl -tag -width indent
 .It async
@@ -115,6 +116,10 @@
 $B$G$9$N$G!"(B
 $B%7%9%F%`%/%i%C%7%e;~$K%U%!%$%k%7%9%F%`$r(B
 $B:n$jD>$9MQ0U$,$G$-$F$$$J$$$+$.$j$O;H$&$Y$-$G$O$"$j$^$;$s!#(B
+.It current
+.Fl u
+$B%U%i%0$H$H$b$K;HMQ$5$l$?>l9g!"(B
+$B%^%&%s%H$5$l$F$$$k%U%!%$%k%7%9%F%`$KBP$9$k8=:_$N8z2L$r;XDj$9$k$3$H$HF1$8$G$9!#(B
 .It force
 .Fl f
 $B%*%W%7%g%s$HF1$8$G$9!#(B
@@ -123,6 +128,12 @@
 $B$9$G$K%*!<%W%s$5$l$F$$$k%U%!%$%k$X$N=q$-9~$_5v2D$r6/@)E*$K<h$j>C$7$^$9!#(B
 $B$^$?!"@5>o$+$I$&$+ITL@$J%U%!%$%k%7%9%F%`$b6/@)E*$KFI$_=q$-2DG=$K(B
 $B%^%&%s%H$7$^$9(B ($B4m81$J$?$aCm0U$7$F;H$C$F2<$5$$(B)$B!#(B
+.It fstab
+.Fl u
+$B%U%i%0$H$H$b$K;HMQ$5$l$?>l9g!"(B
+$B%U%!%$%k%7%9%F%`$KBP$7$F(B
+.Xr fstab 5
+$B$KNs5s$5$l$F$$$kA4%*%W%7%g%s$r;XDj$9$k$3$H$HF1$8$G$9!#(B
 .It noatime
 $B%U%!%$%kFI$_<h$j;~$K!"%U%!%$%k%"%/%;%9;~9o$r99?7$7$^$;$s!#(B
 $B$3$N%*%W%7%g%s$,JXMx$J$N$O!"(B
@@ -302,13 +313,9 @@
 .Fl f
 $B%*%W%7%g%s$r;XDj$7$J$1$l$PJQ99$K<:GT$7$^$9!#(B
 $B$I$N%*%W%7%g%s$rE,MQ$9$k$+$r7hDj$9$k:]!":G=i$K(B
-.Xr fstab 5
-$B$N%F!<%V%k(B
-$B$r;2>H$7!"E,MQ$7$^$9!#$=$N<!$K(B 
 .Fl o
 $B%*%W%7%g%s$N0z?t$rE,MQ$7!":G8e$K(B
-.Fl r
-$B!"(B
+.Fl r ,
 .Fl w
 $B%*%W%7%g%s$,E,MQ$5$l$^$9!#(B
 .It Fl v
diff -ur man/man8/mount_cd9660.8 man/man8/mount_cd9660.8
--- man/man8/mount_cd9660.8	Sat Jul 31 20:16:07 1999
+++ man/man8/mount_cd9660.8	Sat Aug 28 21:47:20 1999
@@ -34,8 +34,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
+.\"     %Id: mount_cd9660.8,v 1.6.2.3 1999/08/16 21:47:49 chris Exp %
 .\"
-.\" Original Revision: 1.6.2.2
 .\" jpman %Id: mount_cd9660.8,v 1.2 1997/04/12 15:50:31 horikawa Stab %
 .Dd March 27, 1994
 .Dt MOUNT_CD9660 8
@@ -111,7 +111,7 @@
 .Ar startsector
 $B$O(B CD-ROM $B%V%m%C%/!"$9$J$o$A(B 2048 $B%P%$%H$,C10L$G$"$k$3$H$KCm0U$7$F2<$5$$!#(B
 $B$3$l$O(B
-.Xr cdcontrol 8
+.Xr cdcontrol 1
 $B$N(B
 .Cm info
 $B%3%^%s%I%NNc$,<($9DL$j$G$9!#(B
@@ -119,10 +119,10 @@
 $B$I$N%;%/%?$+$i3+;O$9$k$+$K$D$$$F$N7hDj$K$D$$$F>iD9$KJs9p$7$^$9!#(B
 .El
 .Sh $B4XO"9`L\(B
+.Xr cdcontrol 1 ,
 .Xr mount 2 ,
 .Xr unmount 2 ,
 .Xr fstab 5 ,
-.Xr cdcontrol 8 ,
 .Xr mount 8
 .Sh $B%P%0(B
 POSIX $B%G%P%$%9%N!<%I%^%C%T%s%0$O!"8=:_%5%]!<%H$7$F$$$^$;$s!#(B
diff -ur man/man8/moused.8 man/man8/moused.8
--- man/man8/moused.8	Sat Aug 28 21:48:59 1999
+++ man/man8/moused.8	Sat Aug 28 21:47:21 1999
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: moused.8,v 1.18.2.2 1999/08/14 22:30:18 chris Exp %
+.\"	%Id: moused.8,v 1.18.2.3 1999/08/21 11:46:41 yokota Exp %
 .\"
 .\" jpman %Id: moused.8,v 1.3 1997/07/22 16:52:17 horikawa Stab %
 .Dd December 3, 1997
@@ -281,6 +281,8 @@
 X10 MouseRemote$B!#(B
 .It Ar kidspad
 Genius $B$N(B Kidspad $B$H(B Easypad $B$N%W%m%H%3%k!#(B
+.It Ar versapad
+Interlink VersaPad $B%W%m%H%3%k!#(B
 .El
 .Pp
 $B%P%9$*$h$S(B InPort $B%^%&%9(B:
@@ -535,7 +537,7 @@
 $B%P%C%I%G%P%$%9$NB?$/$O!"(B
 $B%f!<%6$,%Q%C%II=LL$r(B ``$B%?%C%W(B'' $B$7$?>l9g$K:G=i$N(B($B:8(B) $B%\%?%s$,(B
 $B2!$5$l$?$b$N$H$7$^$9!#(B
-$B$^$?!"(BALPS GlidePoint $B%b%G%k$K$h$C$F$O!"(B
+$B$^$?!"(BALPS GlidePoint $B$*$h$S(B Interlink VersaPad $B$N%b%G%k$K$h$C$F$O!"(B
 $B%?%C%WF0:n$r(B 4 $BHVL\$N%\%?%s$N%$%Y%s%H$H$7$F07$$$^$9!#(B
 $B$3$N$h$&$J%b%G%k$G$O!"%*%W%7%g%s(B ``-m 1=4'' $B$r;HMQ$7$F!"(B
 $BB>$N%Q%C%I%G%P%$%9$HF1MM$N8z2L$rF@$i$l$^$9!#(B
diff -ur man/man8/natd.8 man/man8/natd.8
--- man/man8/natd.8	Mon Jun  7 07:02:12 1999
+++ man/man8/natd.8	Sat Aug 28 21:47:22 1999
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\"	%Id: natd.8,v 1.16.2.3 1999/05/16 11:59:49 brian Exp %
+.\"	%Id: natd.8,v 1.16.2.4 1999/08/18 01:21:49 chris Exp %
 .\" jpman %Id%
 .Dd 15 April 1997
 .Os FreeBSD
@@ -450,8 +450,8 @@
 .El
 
 .Sh $B4XO"9`L\(B
-.Xr getservbyname 2 ,
 .Xr socket 2 ,
+.Xr getservbyname 3 ,
 .Xr divert 4 ,
 .Xr services 5 ,
 .Xr ipfw 8
diff -ur man/man8/newfs.8 man/man8/newfs.8
--- man/man8/newfs.8	Sat May  8 10:44:47 1999
+++ man/man8/newfs.8	Sat Aug 21 19:22:13 1999
@@ -38,7 +38,7 @@
 .Os BSD 4.2
 .Sh $BL>>N(B
 .Nm newfs ,
-.Nm mfs
+.Nm mount_mfs
 .Nd $B?7$7$$%U%!%$%k%7%9%F%`$r:n@.$9$k(B
 .Sh $B=q<0(B
 .Nm newfs
diff -ur man/man8/ppp.8 man/man8/ppp.8
--- man/man8/ppp.8	Sat Aug 28 21:49:00 1999
+++ man/man8/ppp.8	Sat Aug 28 21:47:28 1999
@@ -1,4 +1,4 @@
-.\" %Id: ppp.8,v 1.142.2.8 1999/08/09 23:35:07 brian Exp %
+.\" %Id: ppp.8,v 1.142.2.9 1999/08/23 21:59:46 brian 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)
@@ -12,13 +12,9 @@
 .Nd PPP (Point to Point Protocol) ($BJLL>(B user-ppp)
 .Sh $B=q<0(B
 .Nm
-.Oo
-.Fl auto |
-.Fl background |
-.Fl ddial |
-.Fl direct |
-.Fl dedicated
-.Oc
+.Op Fl nat
+.Op Fl quiet
+.Op Fl Va mode
 .Op Fl alias
 .Op Ar system Ns
 .No ...
@@ -35,6 +31,120 @@
 $B%f!<%6%W%m%;%9$G(B
 .Em PPP
 $B$r<B8=$7$F$$$^$9!#(B
+.Pp
+.Fl nat
+$B%U%i%0(B ($B$^$?$O8eJ}8_49@-$N$?$a$N(B
+.Fl alias
+$B%U%i%0(B) $B$O!"(B
+.Dq nat enable yes
+$B$HEy2A$G$"$j!"(B
+.Nm
+$B$N%M%C%H%o!<%/%"%I%l%9JQ495!G=$rM-8z$K$7$^$9!#(B
+$B$3$l$K$h$j(B
+.Nm
+$B$O!"FbIt(B LAN $B>e$NA4%^%7%s$KBP$9$k(B NAT$B!"(B
+$B$9$J$o$A%^%9%+%l!<%G%#%s%0%(%s%8%s$H$7$FF0:n$7$^$9!#(B
+$B>\:Y$O(B
+.Xr libalias 3
+$B$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+.Fl quiet
+$B%U%i%0$r;XDj$9$k$H!"(B
+.Nm
+$B$O5/F0;~$K@E$+$K$J$j!"(B
+$B%b!<%I$H%$%s%?%U%'!<%9$rI8=`=PNO$XI=<($7$J$/$J$j$^$9!#(B
+.Pp
+.Nm
+$B$O<!$N(B
+.Va mode
+$B$rM}2r$7$^$9(B:
+.Bl -tag -width XXX -offset XXX
+.It Fl auto
+.Nm
+$B$O(B tun $B%$%s%?%U%'!<%9$r%*!<%W%s$7!"(B
+$B$3$l$r@_Dj$7$?8e%P%C%/%0%i%&%s%I$K$J$j$^$9!#(B
+$B=PNO%G!<%?$,(B tun $B%$%s%?%U%'!<%9>e$G8!=P$5$l$k$^$G%j%s%/$O%"%C%W$;$:!"(B
+$B=PNO%G!<%?$,(B tun $B%$%s%?%U%'!<%9>e$G8!=P$5$l$k$H(B
+.Nm
+$B$O%j%s%/$r%"%C%W$7$h$&$H$7$^$9!#(B
+.Nm
+$B$,%j%s%/$r%"%C%W$7$h$&$H$7$F$$$k4V$K<u?.$7$?%Q%1%C%H(B
+($B:G=i$N$b$N$r4^$_$^$9(B) $B$O!"%G%U%)%k%H$G(B 2 $BJ,4V%-%e!<$K$H$I$^$j$^$9!#(B
+$B8e=R$N(B
+.Dq set choked
+$B%3%^%s%I$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+.Fl auto
+$B%b!<%I$G$O!"(B
+$B%3%^%s%I%i%$%s$K$O>/$J$/$H$b(B 1 $B$D$N(B
+.Dq system
+$B$r;XDj$9$kI,MW$,$"$j(B ($B8e=R(B)$B!"(B
+$B%$%s%?%U%'!<%9@_Dj;~$K;HMQ$9$kAj<j$N(B IP $B%"%I%l%9$r;XDj$9$k(B
+.Dq set ifaddr
+$B$r!"%7%9%F%`%W%m%U%!%$%k$G<B9T$9$kI,MW$,$"$j$^$9!#(B
+$BDL>o!"(B
+.Dq 10.0.0.1/0
+$B$N$h$&$J$b$N$,E,@Z$G$9!#Nc$H$7$F$O!"(B
+.Pa /usr/share/examples/ppp/ppp.conf.sample
+$B$N(B
+.Dq pmdemand
+$B%7%9%F%`$r;2>H$7$F$/$@$5$$!#(B
+.It Fl background
+$B$3$N>l9g!"(B
+.Nm
+$B$OAj<j$H$N@\B3$r$9$0$K3NN)$7$h$&$H$7$^$9!#(B
+$B@.8y$9$k$H!"(B
+.Nm
+$B$O%P%C%/%0%i%&%s%I$K$J$j!"?F%W%m%;%9$O=*N;%3!<%I(B 0 $B$rJV$7$^$9!#(B
+$B<:GT$9$k$H!"(B
+.Nm
+$B$OHs(B 0 $B$N7k2L$G=*N;$7$^$9!#(B
+.It Fl foreground
+$B%U%)%"%0%i%&%s%I%b!<%I$G$O!"(B
+.Nm
+$B$OAj<j$H$N@\B3$r$9$0$K3NN)$7$h$&$H$7$^$9$,!"%G!<%b%s$K$O$J$j$^$;$s!#(B
+$B%j%s%/$O%P%C%/%0%i%&%s%I%b!<%I$G:n@.$5$l$^$9!#(B
+.Nm
+$B$N5/F0$rJL$N%W%m%;%9$+$i@)8f$7$?$$>l9g$KM-MQ$G$9!#(B
+.It Fl direct
+$B$3$l$OF~NO@\B3$r<u$1IU$1$k$?$a$K;HMQ$7$^$9!#(B
+.Nm
+$B$O(B
+.Dq set device
+$B9T$rL5;k$7!"%j%s%/$K%G%9%/%j%W%?(B 0 $B$r;HMQ$7$^$9!#(B
+.Pp
+$B%3!<%k%P%C%/$N@_Dj$r9T$&$H!"%@%$%d%k%P%C%/;~$K(B
+.Nm
+$B$O(B
+.Dq set device
+$B>pJs$r;HMQ$7$^$9!#(B
+.It Fl dedicated
+$B$3$N%*%W%7%g%s$O!"@lMQ@~$G@\B3$5$l$?%^%7%s$N$?$a$K%G%6%$%s$5$l$F$$$^$9!#(B
+.Nm
+$B$O%G%P%$%9$r>o$K%*!<%W%s$KJ]$A!"@_Dj%A%c%C%H%9%/%j%W%H$O0l@Z;HMQ$7$^$;$s!#(B
+.It Fl ddial
+.Fl auto
+$B%b!<%I$HEy2A$G$9$,!"$J$s$i$+$NM}M3$G%j%s%/$,Mn$A$?>l9g$K(B
+.Nm
+$B$,:FEY%j%s%/$r%"%C%W$9$k$3$H$,0c$$$^$9!#(B
+.It Fl interactive
+$B$3$l$O(B no-op $B$G$"$j!"(B
+$BA0=R$N%U%i%0$,$I$l$b;XDj$5$l$J$+$C$?>l9g$NF0:n$r9T$$$^$9!#(B
+.Nm
+$B$O%3%^%s%I%i%$%s$G;XDj$5$l$?%;%/%7%g%s$r%m!<%I$7!"BPOC%W%m%s%W%H$rDs6!$7$^$9!#(B
+.El
+.Pp
+.Po Pa /etc/ppp/ppp.conf
+$B$K;XDj$5$l$k(B
+.Pc
+$B@_Dj%(%s%H%j!"$9$J$o$A(B system $B$r!"%3%^%s%I%i%$%s$G(B 1 $B$D0J>e;XDj2DG=$G$9!#(B
+$B5/F0;~$K(B
+.Nm
+$B$O(B
+.Pa /etc/ppp/ppp.conf
+$B$+$i(B
+.Dq default
+$B%7%9%F%`$rFI$_9~$_!"$=$N8e%3%^%s%I%i%$%s$G;XDj$7$?3F(B system $B$rFI$_9~$_$^$9!#(B
 .Sh $B<g$JFCD'(B
 .Bl -diag
 .It $BBPOCE*$J%f!<%6%$%s%?%U%'!<%9$rDs6!(B
@@ -45,10 +155,10 @@
 $B%*%W%7%g%s$H$7$F!"%;%-%e%j%F%#3NJ]$N$?$a$K(B
 $B$9$Y$F$N5!G=$r%Q%9%o!<%I$GJ]8n$9$k$3$H$,$G$-$^$9!#(B
 .It $B<jF0$H<+F0$G$N%@%$%d%k$r%5%]!<%H(B
-$BBPOC%b!<%I$G$O!"D>@\%b%G%`$HDL?.$G$-$k$h$&$K(B
+$BBPOC%b!<%I$G$O!"D>@\%G%P%$%9$HDL?.$G$-$k$h$&$K(B
 .Dq term
 $B%3%^%s%I$,MQ0U$5$l$F$$$^$9!#(B
-$B%b%G%`$,%j%b!<%H%[%9%H$H@\B3$5$l$F!"(B
+$B%j%b!<%H%[%9%H$H@\B3$5$l$F!"(B
 .Em PPP
 $B$G$NDL?.$,;O$^$C$?$i!"(B
 .Nm
@@ -158,13 +268,24 @@
 $B%j%s%/$rN.$l$k%Q%1%C%H$rD4$Y$k$?$a$K!"(B
 .Xr tcpdump 1
 $B$r;H$&$3$H$,$G$-$^$9!#(B
-.It PPP $B%*!<%P(B TCP $B$r%5%]!<%H(B
+.It PPP $B%*!<%P(B TCP $B$*$h$S(B PPP $B%*!<%P(B UDP $B$r%5%]!<%H(B
 $B%G%P%$%9L>$,(B
-.Em host Ns No : Ns Em port
+.Em host Ns No : Ns Em port Ns
+.Op / Ns Em tcp Ns No | Ns Em udp
 $B7A<0$G;XDj$5$l$?>l9g!"(B
 .Nm
-$B$ODL>o$N%7%j%"%k%G%P%$%9$r;H$&$N$G$O$J$/!"%G!<%?E>Aw$N$?$a$N(B TCP 
+$B$ODL>o$N%7%j%"%k%G%P%$%9$r;H$&$N$G$O$J$/!"(B
+$B%G!<%?E>Aw$N$?$a$N(B TCP $B$^$?$O(B UDP $B$N(B
 $B@\B3$r3+$-$^$9!#(B
+UDP $B@\B3$O!"(B
+.Nm
+$B$r6/@)E*$KF14|%b!<%I$K$7$^$9!#(B
+.It PPP $B%*!<%P(B ISDN $B$r%5%]!<%H(B
+.Nm
+$B$,%*!<%W%s$9$Y$-%j%s%/$H$7$F(B
+$B@8$N(B B $B%A%c%M%k(B i4b $B%G%P%$%9$r;XDj$9$k$H!"(B
+.Xr isdnd 8
+$B$HBPOC$7$F(B ISDN $B@\B3$r3NN)$G$-$^$9!#(B
 .It "IETF $B%I%i%U%H$N(B Predictor-1 (rfc 1978) $B$H(B DEFLATE (rfc 1979) $B05=L$r%5%]!<%H(B
 .Nm
 $B$O(B VJ $B05=L$NB>$K(B Predictor-1 $B$H(B DEFLATE $B05=L$b%5%]!<%H$7$F$$$^$9!#(B
@@ -181,7 +302,7 @@
 .Em $B$9$Y$F$N(B
 $B%M%C%H%o!<%/%H%i%U%#%C%/$r$"$i$+$8$a05=L$7$F$*$/$3$H$G!"%*!<%P%X%C%I$r(B
 $B:G>.$K$7$^$9!#(B
-.It Microsoft $B$N(B IPCP $B3HD%$r%5%]!<%H(B
+.It Microsoft $B$N(B IPCP $B3HD%$r%5%]!<%H(B (rfc 1877)
 Microsoft $B$N(B
 .Em PPP
 $B%9%?%C%/$r;HMQ$9$k%/%i%$%"%s%H(B ($B$D$^$j(B Win95, WinNT) $B$H$N4V$G(B
@@ -221,119 +342,6 @@
 .Sq ID0
 $B$r;2>H$7$F$/$@$5$$!#(B
 .Sh $B;O$a$kA0$K(B
-$B<!$N%3%^%s%I%i%$%s%9%$%C%A$r(B
-.Nm ppp
-$B$OM}2r$7$^$9(B:
-.Bl -tag -width XXX -offset XXX
-.It Fl auto
-.Nm
-$B$O(B tun $B%$%s%?%U%'!<%9$r%*!<%W%s$7!"$3$l$r@_Dj$7$?8e%P%C%/%0%i%&%s%I$K$J$j$^$9!#(B
-$B=PNO%G!<%?$,(B tun $B%$%s%?%U%'!<%9>e$G8!=P$5$l$k$^$G%j%s%/$O%"%C%W$;$:!"(B
-$B=PNO%G!<%?$,(B tun $B%$%s%?%U%'!<%9>e$G8!=P$5$l$k$H(B
-.Nm
-$B$O%j%s%/$r%"%C%W$7$h$&$H$7$^$9!#(B
-.Nm
-$B$,%j%s%/$r%"%C%W$7$h$&$H$7$F$$$k4V$K<u?.$7$?%Q%1%C%H(B
-($B:G=i$N$b$N$r4^$_$^$9(B) $B$O!"%G%U%)%k%H$G(B 2 $BJ,4V%-%e!<$K$H$I$^$j$^$9!#(B
-$B8e=R$N(B
-.Dq set choked
-$B%3%^%s%I$r;2>H$7$F$/$@$5$$!#(B
-.Pp
-$B%3%^%s%I%i%$%s$K$O>/$J$/$H$b(B 1 $B$D$N(B
-.Dq system
-$B$r;XDj$9$kI,MW$,$"$j(B ($B8e=R(B)$B!"(B
-$B%$%s%?%U%'!<%9@_Dj;~$K;HMQ$9$kAj<j$N(B IP $B%"%I%l%9$r;XDj$9$k(B
-.Dq set ifaddr
-$B$r!"%7%9%F%`%W%m%U%!%$%k$G<B9T$9$kI,MW$,$"$j$^$9!#(B
-$BDL>o!"(B
-.Dq 10.0.0.1/0
-$B$N$h$&$J$b$N$,E,@Z$G$9!#Nc$H$7$F$O!"(B
-.Pa /usr/share/examples/ppp/ppp.conf.sample
-$B$N(B
-.Dq pmdemand
-$B%7%9%F%`$r;2>H$7$F$/$@$5$$!#(B
-.It Fl background
-$B$3$N>l9g!"(B
-.Nm
-$B$OAj<j$H$N@\B3$r$9$0$K3NN)$7$h$&$H$7$^$9!#(B
-$B@.8y$9$k$H!"(B
-.Nm
-$B$O%P%C%/%0%i%&%s%I$K$J$j!"?F%W%m%;%9$O=*N;%3!<%I(B 0 $B$rJV$7$^$9!#(B
-$B<:GT$9$k$H!"(B
-.Nm
-$B$OHs(B 0 $B$N7k2L$G=*N;$7$^$9!#(B
-.It Fl direct
-$B$3$l$OF~NO@\B3$r<u$1IU$1$k$?$a$K;HMQ$7$^$9!#(B
-.Nm
-$B$O(B
-.Dq set device
-$B9T$rL5;k$7!"%j%s%/$K%G%9%/%j%W%?(B 0 $B$r;HMQ$7$^$9!#(B
-.Pp
-$B%3!<%k%P%C%/$N@_Dj$r9T$&$H!"%@%$%d%k%P%C%/;~$K(B
-.Nm
-$B$O(B
-.Dq set device
-$B>pJs$r;HMQ$7$^$9!#(B
-.It Fl dedicated
-$B$3$N%*%W%7%g%s$O!"@lMQ@~$G@\B3$5$l$?%^%7%s$N$?$a$K%G%6%$%s$5$l$F$$$^$9!#(B
-.Nm
-$B$O%G%P%$%9$r>o$K%*!<%W%s$KJ]$A!"@_Dj%A%c%C%H%9%/%j%W%H$O0l@Z;HMQ$7$^$;$s!#(B
-.It Fl ddial
-.Fl auto
-$B%b!<%I$HEy2A$G$9$,!"$J$s$i$+$NM}M3$G%j%s%/$,Mn$A$?>l9g$K(B
-.Nm
-$B$,:FEY%j%s%/$r%"%C%W$9$k$3$H$,0c$$$^$9!#(B
-.It Fl interactive
-$B$3$l$O(B no-op $B$G$"$j!"A0=R$N%U%i%0$,$I$l$b;XDj$5$l$J$+$C$?>l9g$NF0:n$r9T$$$^$9!#(B
-.Nm
-$B$O%3%^%s%I%i%$%s$G;XDj$5$l$?%;%/%7%g%s$r%m!<%I$7!"BPOC%W%m%s%W%H$rDs6!$7$^$9!#(B
-.It Fl alias
-$B$3$N%U%i%0$O(B
-.Nm
-$B$N%b!<%I$r@)8f$7$^$;$s!#(B
-.Dq enable alias yes
-$B$HEy2A$G$9!#$5$i$K!"(B
-.Fl auto
-$B$b$^$?;XDj$5$l$F$$$k>l9g!"0EL[E*$K(B
-.Dq enable iface-alias
-$B$,<B9T$5$l$^$9!#(B
-$B>\:Y$K$D$$$F$O8e=R$7$F$$$k$b$N$r;2>H$7$F$/$@$5$$!#(B
-.Pp
-IP $B%(%$%j%"%7%s%0$rM-8z$K$9$k$H!"(B
-.Nm
-$B$O!"FbIt(B LAN $B>e$NA4%^%7%s$KBP$9$k(B
-NAT $B$b$7$/$O%^%9%+%l!<%G%#%s%0%(%s%8%s$H$7$FF0:n$7$^$9!#>\:Y$O(B
-.Xr libalias 3
-$B$r;2>H$7$F$/$@$5$$!#(B
-.El
-.Pp
-$B$5$i$K!"(B1 $B$D0J>e$N@_Dj%(%s%H%j(B
-.Pq Pa /etc/ppp/ppp.conf $B$G;XDj$5$l$^$9(B
-$B$r%3%^%s%I%i%$%s>e$K;XDj2DG=$G$9!#(B
-$B5/F0;~$K(B
-.Nm
-$B$O(B
-.Pa /etc/ppp/ppp.conf
-$B$+$i(B
-.Dq default
-$B%7%9%F%`$rFI$_9~$_!"$=$N8e%3%^%s%I%i%$%s$G;XDj$7$?3F(B system $B$rFI$_9~$_$^$9!#(B
-.Pp
-.Fl auto ,
-.Fl background ,
-.Fl ddial ,
-.Fl direct ,
-.Fl dedicated ,
-.Fl interactive
-$B$N$$$:$l$+(B 1 $B$D$N%9%$%C%A$N$_;XDj2DG=$G$9!#(B
-.Nm
-$B$N(B
-.Sq $B%b!<%I(B
-$B$O!"(B
-.Dq set mode
-$B%3%^%s%I(B ($B8e=R(B) $B$r;HMQ$9$k$3$H$G8e$GJQ992DG=$G$9!#(B
-.Pp
-$B0J9_!"BPOC%b!<%I$N;HMQJ}K!$K$D$$$F@bL@$7$^$9!#(B
-.Pp
 $B:G=i$K(B
 .Nm
 $B$r<B9T$9$k;~$K$O!"$$$/$D$+$N=i4|@_Dj$r@0$($kI,MW$,$"$j$^$9!#(B
@@ -501,7 +509,9 @@
 ($B%H%i%U%#%C%/$,(B 12.5% $BA}2C$7$^$9(B)$B!"(B
 .Dv PPP
 $B$,%*!<%W%s$5$l$k$H>o$KL58z2=(B
-.Pq set to Dq none
+.Po Dq none
+$B$K@_Dj(B
+.Pc
 $B$5$l$^$9!#(B
 $B$7$+$7!"(BISP ($B%$%s%?!<%M%C%H%5!<%S%9%W%m%P%$%@(B) $B$K$h$C$F$O!"(B
 $BFCDj$N%Q%j%F%#@_Dj$r@\B3;~(B (
@@ -512,9 +522,9 @@
 ppp ON awfulhak> set parity even
 .Ed
 .Pp
-$B$3$3$G!"8=:_$N%b%G%`@_Dj$,$I$N$h$&$K$J$C$F$$$k$+8+$i$l$^$9(B:
+$B$3$3$G!"8=:_$N%G%P%$%9@_Dj$,$I$N$h$&$K$J$C$F$$$k$+8+$i$l$^$9(B:
 .Bd -literal -offset indent
-ppp ON awfulhak> show modem
+ppp ON awfulhak> show physical
 Name: deflink
  State:           closed
  Device:          N/A
@@ -533,7 +543,7 @@
 ppp ON awfulhak> 
 .Ed
 .Pp
-$B$3$3$G$O!"D>@\%b%G%`$HDL?.$9$k$?$a$K(B term $B%3%^%s%I$r;HMQ2DG=$G$9(B:
+$B$3$3$G$O!"D>@\%G%P%$%9$HDL?.$9$k$?$a$K(B term $B%3%^%s%I$r;HMQ2DG=$G$9(B:
 .Bd -literal -offset indent
 ppp ON awfulhak> term
 at
@@ -614,7 +624,7 @@
 $B%j%s%/$,3NN)$7$?$i!"(Bshow $B%3%^%s%I$r;HMQ$9$k$3$H$G!"(B
 $B$I$N$h$&$K;vBV$,?J9T$7$F$$$k$N$+$,J,$j$^$9(B:
 .Bd -literal -offset indent
-PPP ON awfulhak> show modem
+PPP ON awfulhak> show physical
 * $B%b%G%`4XO"$N>pJs$,$3$3$KI=<($5$l$^$9(B *
 PPP ON awfulhak> show ccp
 * CCP ($B05=L(B) $B4XO"$N>pJs$,$3$3$KI=<($5$l$^$9(B *
@@ -918,13 +928,13 @@
 $B$KLa$k$N$O!"@\B3$,@.8yN"$K3NN)$7$?8e$@$1$G$9!#(B
 .Ar inc
 $B$N%G%U%)%k%HCM$O(B 0 $B$G$9!#(B
-.It Ar maxinc
+.It Ar max
 $B$O!"(B
 .Nm
 $B$,(B
 .Ar secs
 $B$rA}2C$5$;$k:GBg2s?t$G$9!#(B
-.Ar maxinc
+.Ar max
 $B$N%G%U%)%k%HCM$O(B 10 $B$G$9!#(B
 .It Ar next
 $B$OEEOCHV9f%j%9%H$NCf$N<!$NHV9f$r%@%$%d%k$9$kA0$KBT$DIC?t$G$9!#(B(
@@ -1255,14 +1265,14 @@
 $B$3$NCM$O!"(B
 .Nm
 $B$G8eB3$9$k(B CBCP $B%U%'!<%:$G;HMQ$7$^$9!#(B
-.Sh PPP $B%*!<%P(B TCP ($BJLL>(B: $B%H%s%M%j%s%0(B)
+.Sh PPP $B%*!<%P(B TCP $B$H(B PPP $B%*!<%P(B UDP ($BJLL>(B: $B%H%s%M%j%s%0(B)
 $B%7%j%"%k%j%s%/>e0J30$N(B
 .Nm
 $B$N;HMQJ}K!$H$7$F!"(B
 device $B$K%[%9%H$H%]!<%H$r;XDj$9$k$3$H$K$h$j!"(B
 TCP $B@\B3$r;HMQ$9$k$3$H$,2DG=$G$9(B:
 .Pp
-.Dl set device ui-gate:6669
+.Dl set device ui-gate:6669/tcp
 .Pp
 $B%7%j%"%k%G%P%$%9$r%*!<%W%s$9$kBe$j$K!"(B
 .Nm
@@ -1330,7 +1340,7 @@
 .Bd -literal -offset indent
 ui-gate:
  set escape 0xff
- set device ui-gate:ppp-in
+ set device ui-gate:ppp-in/tcp
  set dial
  set timeout 30
  set log Phase Chat Connect hdlc LCP IPCP CCP tun
@@ -1361,6 +1371,7 @@
 $B$^$?(B 2 $B$D$N%2!<%H%&%'%$4V$G$O(B ppp $B%H%i%U%#%C%/$O(B
 $B35G0E*$K(B TCP $B%9%H%j!<%`Cf$G%+%W%;%k2=$5$l$^$9(B
 ($B%Q%1%C%H$,%Q%1%C%H$KBP1~$9$k$o$1$G$O$"$j$^$;$s(B)$B!#(B
+.Pp
 $B$3$N5!9=$NBg$-$J7gE@$O!"F1;~$K(B 2 $B$D$N!VG[AwJ]>Z!W5!9=$,B8:_$9$k$3$H$G$9(B -
 $B$3$N(B 2 $B$D$H$O!"2<0L%l%Y%k$N(B TCP $B%9%H%j!<%`$H(B
 .Em PPP
@@ -1368,10 +1379,20 @@
 $B%Q%1%C%HAS<:$,5/$k$H!"N><T$O$=$l$>$l$NJ}K!$GAS<:$7$?(B
 $B%Q%1%C%H$r:FAw$7$h$&$H(B
 $B$9$k$G$7$g$&!#(B
-.Sh $B%Q%1%C%H%(%$%j%"%7%s%0(B
-.Fl alias
+.Pp
+$B$3$N%*!<%P%X%C%I$rHr$1$k$?$a$K!"(B
+$B%H%i%s%9%]!<%H$H$7$F(B TCP $B$NBe$j$K(B UDP $B$r;HMQ$G$-$^$9!#(B
+$B$3$l$OC1$K%W%m%H%3%k$r(B "tcp" $B$+$i(B "udp" $B$KJQ$($k$@$1$G2DG=$G$9!#(B
+$B%H%i%s%9%]!<%H$H$7$F(B UDP $B$r;HMQ$9$k$H$-!"(B
+.Nm
+$B$OF14|%b!<%I$GF0:n$7$^$9!#(B
+$BF~NO%G!<%?$,%Q%1%C%H$K:F9=@.$5$l$J$$$H$$$&!"JL$NMxE@$b$"$j$^$9!#(B
+.Pp
+.Sh $B%M%C%H%o!<%/%"%I%l%9JQ49(B ($B%Q%1%C%H%(%$%j%"%7%s%0(B)
+.Fl nat
+.Pq $B$^$?$O(B Fl alias
 $B%3%^%s%I%i%$%s%*%W%7%g%s$K$h$j!"(B
-$B%Q%1%C%H%(%$%j%"%7%s%0$,M-8z$K$J$j$^$9!#(B
+$B%M%C%H%o!<%/%"%I%l%9JQ49(B ($BJLL>!"%Q%1%C%H%(%$%j%"%7%s%0(B) $B$,M-8z$K$J$j$^$9!#(B
 $B$3$l$K$h$j!"(B
 .Nm
 $B%[%9%H$,%m!<%+%k%(%j%"%M%C%H%o!<%/$NB>$N%3%s%T%e!<%?$KBP$7$F(B
@@ -1388,9 +1409,9 @@
 $B0lHL$K!"(B
 .Nm
 $B$,@5$7$/F0:n$7$F$$$k$3$H$N3NG'$O!"(B
-$B$^$::G=i$K%Q%1%C%H%(%$%j%"%7%s%0$r6X;_$7$F9T$$$^$9!#(B
+$B$^$::G=i$K%M%C%H%o!<%/%"%I%l%9JQ49$r6X;_$7$F9T$$$^$9!#(B
 $B<!$K(B
-.Fl alias
+.Fl nat
 $B%*%W%7%g%s$rM-8z$K$7$F!"(B
 .Nm
 $B%[%9%H$N>e$G(B ($B%&%'%V%V%i%&%6$d(B
@@ -1431,7 +1452,9 @@
 .Ar name
 .Ar rule-no
 .Ar action
+.Op \&!
 .Oo
+.Op host
 .Ar src_addr Ns Op / Ns Ar width
 .Op Ar dst_addr Ns Op / Ns Ar width
 .Oc
@@ -1468,9 +1491,28 @@
 $B$O(B
 .Sq permit ,
 .Sq deny
-$B$N$$$:$l$+$G$9!#(B
-$B$b$7!"$"$k%Q%1%C%H$,%k!<%k$K0lCW$7$?>l9g!"(B
+$B$r;XDj2DG=$G$"$j!"(B
+$B$"$k%Q%1%C%H$,$3$l$i$N%k!<%k$K0lCW$7$?>l9g!"(B
 $B7k$S$D$1$i$l$?(B action $B$,D>$A$K<B9T$5$l$^$9!#(B
+$B$^$?(B
+.Ar action
+$B$K$O(B
+.Sq clear
+$B$b;XDj2DG=$G$9!#(B
+$B$3$N>l9g!"$3$N%k!<%k$K7k$S$D$1$i$l$?(B action $B$r%/%j%"$7$^$9!#(B
+$B$^$?(B
+.Ar action
+$B$K$O!"8=:_$N%k!<%kHV9f$h$j$bBg$-$J%k!<%kHV9f$r;XDj2DG=$G$9!#(B
+$B$3$N>l9g$K$O!"$"$k%Q%1%C%H$,8=:_$N%k!<%k$K0lCW$7$?>l9g!"(B
+($B<!$N%k!<%kHV9f$NBe$j$K(B)
+$B$3$N?7$7$$%k!<%k$KBP$7$F<!$K%Q%1%C%H$,0lCW$9$k$+$r3NG'$7$^$9!#(B
+.Pp
+.Ar action
+$B$K$O%(%/%9%/%i%a!<%7%g%s%^!<%/(B
+.Pq Dq !
+$B$rB3$1$k$3$H$,2DG=$G$9!#$3$N>l9g!"(B
+.Nm
+$B$O8eB3$9$k0lCW$N0UL#$rH?E>$5$;$^$9!#(B
 .It
 .Op Ar src_addr Ns Op / Ns Ar width
 $B$H(B
@@ -1479,10 +1521,27 @@
 .Op / Ns Ar width
 $B$,;XDj$5$l$?>l9g$K$O!"$=$l$K$h$C$FE,@Z$J%M%C%H%^%9%/$N%S%C%HCM$rM?$(!"(B
 $B%"%I%l%9$NHO0O$r;XDj$9$k$3$H$,$G$-$^$9!#(B
+.Pp
+.Ar src_addr
+$B$H(B
+.Ar dst_addr
+$B$K$O!"(B
+.Dv MYADDR
+$B$H(B
+.Dv HISADDR
+$B$H$$$&CM$r;HMQ2DG=$G$9(B ($B$3$l$i$NCM$N2r@b$O(B
+.Dq bg
+$B$r;2>H$7$F$/$@$5$$(B)$B!#(B
+$B$3$l$i$NCM$r;HMQ$7$?>l9g!"$3$l$i$NCM$,JQ2=$9$k$?$S$K%U%#%k%?$,99?7$5$l$^$9!#(B
+$B$3$l$O!"8e=R$N(B
+.Dq add
+$B%3%^%s%I$NF0:n$H;w$F$$$^$9!#(B
 .It
 .Ar proto
 $B$O(B
 .Sq icmp ,
+.Sq igmp ,
+.Sq ospf ,
 .Sq udp ,
 .Sq tcp
 $B$N$&$A$N$$$:$l$+(B 1 $B$D$G$9!#(B
@@ -1992,6 +2051,10 @@
 LQR $B%l%]!<%H$N@8@.!#(B
 .It Li Phase
 $B%U%'!<%:A+0\%m%0$N=PNO!#(B
+.It Li Physical
+$BJ*M}%l%Y%k%Q%1%C%H$N(B 16 $B?J%@%s%W!#(B
+.It Li Sync
+$BF14|%l%Y%k%Q%1%C%H$N(B 16 $B?J%@%s%W!#(B
 .It Li TCP/IP
 $BA4(B TCP/IP $B%Q%1%C%H$N%@%s%W!#(B
 .It Li Timer
@@ -2401,6 +2464,15 @@
 $B%3%^%s%I$N;HMQ$K$h$C$F>e=q$-$5$l$F$$$J$$>l9g$K$O!"1~Ez$O(B
 .Pa /etc/resolv.conf
 $B$+$i:N$i$l$^$9!#(B
+.It enddisc
+$B%G%U%)%k%H(B: enable $B$+$D(B accept$B!#(B
+$B$3$N%*%W%7%g%s$O!"=*E@A*BrCM$r8r>D$9$k$+H]$+$r@)8f$7$^$9!#(B
+.Dq set enddisc
+$B$,;HMQ$5$l(B
+.Ar enddisc
+$B$,(B enable $B$N>l9g$N$_!"EvJ}$NA*BrCM$rAw$j$^$9!#(B
+.Ar enddisc
+$B$,(B disable $B$N>l9g!"Aj<j$NA*BrCM$r5qH]$7$^$9!#(B
 .It LANMan|chap80lm
 $B%G%U%)%k%H(B: disable $B$+$D(B accept$B!#(B
 $B$3$NG'>Z%W%m%H%3%k$N;HMQ$O4+$a$i$l$^$;$s!#(B
@@ -2551,6 +2623,40 @@
 $B$,(B disable $B$K$J$C$F$$$k>l9g!"(B
 .Nm
 $B$O<1JL;R%U%#!<%k%I$rL5;k$7$^$9!#(B
+.It keep-session
+$B%G%U%)%k%H(B: disable$B!#(B
+.Nm
+$B$,%^%k%A%j%s%/%5!<%P$H$7$FF0:n$9$k$H$-!"JL$N(B
+.Nm
+$B%$%s%9%?%s%9$,:G=i$K3F@\B3$r<u$1IU$1$^$9!#(B
+$B%j%s%/$,(B ($BJL$N(B
+.Nm
+$B$K$h$C$F@)8f$5$l$F$$$k(B) $B4{B8$N%P%s%I%k$KB0$9$HH=Dj$9$k$H!"(B
+.Nm
+$B$O$3$N%j%s%/$rEv3:JL%W%m%;%9$X0\4I$7$^$9!#(B
+.Pp
+$B%j%s%/$,(B tty $B%G%P%$%9$G$"$k>l9g$+$3$N%*%W%7%g%s$,(B enable $B$5$l$F$$$k>l9g!"(B
+.Nm
+$B$O=*N;$;$:!"<+8J$N%W%m%;%9L>$r(B
+.Dq session owner
+$B$KJQ$(!"%j%s%/$r@)8f$9$kJ}$N(B
+.Nm
+$B$,=hM}$r40N;$7$F%"%$%I%k%W%m%;%9$NJ}$X%7%0%J%k$rJV$9$^$GBT$A$^$9!#(B
+$B%j%s%/;q8;$,:FMxMQ2DG=$G$"$k$H(B
+.Nm
+$B$N?F$,$_$J$97k2L$K$h$j@8$8$k:.Mp$r!"$3$l$K$h$jKI$.$^$9!#(B
+.Pp
+.Pa /etc/ttys
+$B$K%(%s%H%j$,$"$k(B tty $B%G%P%$%9$N>l9g!"JL$N(B
+.Xr getty 8
+$B$N3+;O$rKI$0$?$a$K!"$3$l$,I,MW$G$9!#(B
+.Xr sshd 8
+$B$N$h$&$J%W%m%0%i%`%j%s%/$N>l9g!";R6!$N;`$K$h$k(B
+.Xr sshd 8
+$B$N=*N;$rKI$0$?$a$K!"$3$l$,I,MW$G$9!#(B
+.Nm
+$B$O?F$NMW7o$rH=CG$G$-$^$;$s$N$G(B (tty $B$N>l9g$r=|$/(B)$B!"(B
+$B>u67$K1~$8$F<jF0$GK\%*%W%7%g%s$r@_Dj$9$kI,MW$,$"$j$^$9!#(B
 .It loopback
 $B%G%U%)%k%H(B: enable$B!#(B
 .Ar loopback
@@ -2646,7 +2752,7 @@
 $B%3%^%s%I$GI=<($9$k$3$H$GF@$i$l$^$9!#%9%k!<%W%C%HE}7W$O(B
 .Dq IPCP
 $B$H(B
-.Dq modem
+.Dq physical
 $B$N%l%Y%k$GMxMQ2DG=$G$9!#(B
 .It utmp
 $B%G%U%)%k%H(B: enable$B!#(B
@@ -2663,28 +2769,28 @@
 $B%f!<%6$,%m%0%$%s$7$+$DG'>Z$9$k$3$H$rMW5a$9$k>l9g$N$_I,MW$G$9!#(B
 .It iface-alias
 $B%G%U%)%k%H(B:
-.Fl alias
+.Fl nat
 $B$,;XDj$5$l$?>l9g(B enable$B!#(B
 $B$3$N%*%W%7%g%s$O!"(B
 $B%$%s%?%U%'!<%9$N%"%I%l%9$r8r49$9$k$N$G$O$J$/!"(B
 $B%$%s%?%U%'!<%9$K?75,%"%I%l%9$rDI2C$9$k$h$&$K!"(B
 .Nm
 $B$K;X<($7$^$9!#(B
-IP $B%(%$%j%"%7%s%0$,M-8z$J>l9g$N$_(B
-.Pq Dq alias enable yes
+$B%M%C%H%o!<%/%"%I%l%9JQ49$,M-8z$J>l9g$N$_(B
+.Pq Dq nat enable yes
 $B!"K\%*%W%7%g%s$r(B enable $B$K$G$-$^$9!#(B
 .Pp
 $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 IP $B%(%$%j%"%9%(%s%8%s(B
+$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
 $B$rDL$9$h$&$K$J$j!"(B(
 .Fl auto
 $B%b!<%I$G$O(B)
 $B:G=i$K(B PPP $B%j%s%/$rN)$A>e$2$?%W%m%;%9$,@5$7$/@\B3$G$-$k$h$&$K$7$^$9!#(B
 .Pp
-.Dq alias enable off
-$B$H$7$F(B IP $B%(%$%j%"%7%s%0$r(B disable $B$9$k$H!"(B
+.Dq nat enable no
+$B$H$7$F(B NAT $B$r(B disable $B$9$k$H!"(B
 .Sq iface-alias
 $B$b(B disable $B$7$^$9!#(B
 .El
@@ -2836,21 +2942,31 @@
 $B8=:_B8:_$9$k2s@~%b!<%I$r5v2D$9$k%;%/%7%g%s$r%m!<%I2DG=$G$9!#(B
 .El
 .Pp
-.It alias Ar command Op Ar args
+.It nat Ar command Op Ar args
 $B$3$N%3%^%s%I$O(B
 .Nm
-$BAH9~$_$N%(%$%j%"%7%s%0(B ($B%^%9%+%l!<%G%#%s%0(B) $B5!G=$r(B
+$BAH9~$_$N%M%C%H%o!<%/%"%I%l%9JQ495!G=(B
+($B%^%9%+%l!<%G%#%s%0$d(B IP $B%(%$%j%"%7%s%0$H$7$F$bCN$i$l$F$$$^$9(B) $B$r(B
 $B@)8f$9$k$?$a$K;HMQ$7$^$9!#(B
-$B$"$J$?$N%7%9%F%`$G%(%$%j%"%7%s%0$,M-8z$K$J$k$H(B ($B%3%s%Q%$%k;~$K:o=|$G$-$^$9(B)$B!"(B
+NAT $B$O!"30It%$%s%?%U%'!<%9$G$N$_F0:n$7!"(B
+.Fl direct
+$B%U%i%0$H6&$K;HMQ$7$F$b$*$=$i$/0UL#$,$"$j$^$;$s!#(B
+.Pp
+$B8eJ}8_49@-$N$?$a$K!"8l(B
+.Dq alias
+$B$r(B
+.Dq nat
+$B$NBe$j$K;HMQ2DG=$G$9!#(B
+$B$"$J$?$N%7%9%F%`$G(B nat $B$rM-8z$K$9$k$H(B ($B%3%s%Q%$%k;~$K:o=|$G$-$^$9(B)$B!"(B
 $B<!$N%3%^%s%I$,;HMQ2DG=$H$J$j$^$9(B:
 .Bl -tag -width XX
-.It alias enable Op yes|no
-$B%(%$%j%"%7%s%0$rM-8z$b$7$/$OL58z$K$7$^$9!#(B
-.Fl alias
+.It nat enable yes|no
+$B$3$N%3%^%s%I$O!"%M%C%H%o!<%/%"%I%l%9JQ49$rM-8z$b$7$/$OL58z$K$7$^$9!#(B
+.Fl nat
 $B%3%^%s%I%i%$%s%U%i%0$O(B
-.Dq alias enable yes
+.Dq nat enable yes
 $B$HF1$80UL#$G$9!#(B
-.It alias addr Op Ar addr_local addr_alias
+.It nat addr Op Ar addr_local addr_alias
 $B$3$N%3%^%s%I$K$O!"(B
 .Ar addr_alias
 $B$N%G!<%?$r(B
@@ -2858,33 +2974,38 @@
 $B$X%j%@%$%l%/%H$7$^$9!#(B
 $B>/?t$N<B(B IP $B%"%I%l%9$r;}$A!"(B
 $B$=$l$i$r%2!<%H%&%'%$$N8e$NFCDj$N%^%7%s$K%^%C%W$7$?$$>l9g$KM-MQ$G$9!#(B
-.It alias deny_incoming Op yes|no
+.It nat deny_incoming Op yes|no
 yes $B$K@_Dj$9$k$H!"(B
 $B%U%!%$%"%&%)!<%k$H$[$\F1MM$K%Q%1%C%H$rMn$H$9$3$H$K$h$j!"(B
 $B$3$N%3%^%s%I$OA4F~NO@\B3$r5qH]$7$^$9!#(B
-.It alias help|?
-$B$3$N%3%^%s%I$O!";HMQ2DG=$J(B alias $B%3%^%s%I$N$^$H$a$rI=<($7$^$9!#(B
-.It alias log Op yes|no
-$B$3$N%*%W%7%g%s$O!"(Balias $B$NMM!9$JE}7W$H>pJs$,%U%!%$%k(B
+.It nat help|?
+$B$3$N%3%^%s%I$O!";HMQ2DG=$J(B nat $B%3%^%s%I$N$^$H$a$rI=<($7$^$9!#(B
+.It nat log Op yes|no
+$B$3$N%*%W%7%g%s$O!"(BNAT $B$NMM!9$JE}7W$H>pJs$,%U%!%$%k(B
 .Pa /var/log/alias.log
 $B$K5-O?$5$l$k$h$&$K$7$^$9!#(B
-.It alias port Ar proto Ar targetIP Ns Xo
-.No : Ns Ar port Ns
+$B$3$N%U%!%$%kL>$O!"6a$$>-MhJQ$o$k$G$7$g$&!#(B
+.It nat port Ar proto Ar targetIP Ns Xo
+.No : Ns Ar targetPort Ns
 .Oo
-.No - Ns Ar port
-.Oc Ar aliasport Ns
+.No - Ns Ar targetPort
+.Oc Ar aliasPort Ns
 .Oo
-.No - Ns Ar aliasport Ns
-.Oc
+.No - Ns Ar aliasPort
+.Oc Oo Ar remoteIP : Ns
+.Ar remotePort Ns
+.Oo
+.No - Ns Ar remotePort
+.Oc Oc
 .Xc
-$B$3$N%3%^%s%I$O!"%]!<%H(B
-.Ar aliasport
+$B$3$N%3%^%s%I$O!"(B
+.Ar aliasPort
 $B$X$NF~NO$N(B
 .Ar proto
 $B@\B3$r!"(B
 .Ar targetIP
-$B$N%]!<%H(B
-.Ar port
+$B$N(B
+.Ar targetPort
 $B$X%j%@%$%l%/%H$7$^$9!#(B
 .Ar proto
 $B$O!"(B
@@ -2896,10 +3017,19 @@
 $B%]!<%HHV9f$NHO0O$O!"A0=R$N$h$&$K;XDj2DG=$G$9!#(B
 $BHO0O$OF1$8Bg$-$5$G$"$k$3$H$,I,MW$G$9!#(B
 .Pp
+.Ar remoteIP
+$B$,;XDj$5$l$?>l9g!"$3$N(B IP $BHV9f$+$iMh$?%G!<%?$N$_$,%j%@%$%l%/%H$5$l$^$9!#(B
+.Ar remotePort
+$B$O!"(B
+.Dq 0
+.Pq $B$9$Y$F$NAw?.85%]!<%H(B
+$B$+!"$b$&0lJ}$NHO0O$HF1$8Bg$-$5$N%]!<%HHO0O$G$9!#(B
+.Pp
 $B$"$J$?$N%2!<%H%&%'%$$N8e$N%^%7%s$G%$%s%?!<%M%C%HEEOCEy$r<B9T$7$?$$>l9g$K!"(B
 $B$3$N%*%W%7%g%s$OM-MQ$G$9!#(B
-$B$7$+$7!"%]!<%H$"$?$jFbIt%^%7%s(B 1 $BBf$N$_$K@\B32DG=$H$$$&@)8B$,$"$j$^$9!#(B
-.It alias pptp Op Ar addr
+$B$7$+$7!"Aw?.85%[%9%H$H08@h%]!<%H$K$D$-(B
+$BFbIt%^%7%s(B 1 $BBf$N$_$K@\B32DG=$H$$$&@)8B$,$"$j$^$9!#(B
+.It nat pptp Op Ar addr
 $B$9$Y$F$N(B
 .Em G Ns No eneral
 .Em R Ns No outing
@@ -2909,7 +3039,7 @@
 .Ar addr
 $B$r;HMQ$9$k$3$H$K$h$j!"(B
 .Nm
-$B$K%(%$%j%"%9$5$;$^$9!#(B
+$B$KJQ49$5$;$^$9!#(B
 $B$3$l$O!"%^%7%s$NFbIt%M%C%H%o!<%/>e$G(B
 .Em P Ns No oint
 to
@@ -2921,8 +3051,8 @@
 .Ar addr
 $B$r;XDj$7$J$$$H!"(B
 .Dv PPTP
-$B%(%$%j%"%9$OL58z$K$J$j$^$9!#(B
-.It "alias proxy cmd" Ar arg Ns No ...
+$B%"%I%l%9JQ49$OL58z$K$J$j$^$9!#(B
+.It "nat proxy cmd" Ar arg Ns No ...
 $B$3$N%3%^%s%I$O!"(B
 .Nm
 $B$KFCDj$N@\B3$KBP$9$kBeM}$r$5$;!"(B
@@ -2932,18 +3062,19 @@
 $B$N(B
 .Fn PacketAliasProxyRule
 $B$N5-=R$r;2>H$7$F$/$@$5$$!#(B
-.It alias same_ports Op yes|no
+.It nat same_ports yes|no
 $BM-8z$K$J$k$H!"(B
-$B%(%$%j%"%9%i%$%V%i%j$,=PNO%Q%1%C%H$N%]!<%HHV9f$rJQ99$7$h$&$H$9$k$3$H$r(B
+$B%M%C%H%o!<%/%"%I%l%9JQ49%(%s%8%s$,(B
+$B=PNO%Q%1%C%H$N%]!<%HHV9f$rJQ99$7$h$&$H$9$k$3$H$r!"(B
 $B;_$a$5$;$^$9!#(B
 RPC $B$d(B LPD $B$H$$$C$?!"(B
 $B%&%'%k%N%&%s%]!<%H(B (well known port) $B$+$i$N@\B3$rMW5a$9$k(B
 $B%W%m%H%3%k$r%5%]!<%H$9$k$N$KM-MQ$G$9!#(B
-.It alias use_sockets Op yes|no
+.It nat use_sockets yes|no
 $BM-8z$K$J$k$H!"(B
-$B%(%$%j%"%9%i%$%V%i%j$K%=%1%C%H$r:n@.$5$;!"(B
+$B%M%C%H%o!<%/%"%I%l%9JQ49%(%s%8%s$K%=%1%C%H$r:n@.$5$;!"(B
 $B@5$7$$(B ftp $B%G!<%?F~NO$d(B IRC $B@\B3$rJ]>Z$G$-$k$h$&$K$J$j$^$9!#(B
-.It alias unregistered_only Op yes|no
+.It nat unregistered_only yes|no
 $BEPO?$5$l$F$$$J$$Aw?.85%"%I%l%9$N=PNO%Q%1%C%H$N$_$r!"JQ99$7$^$9!#(B
 RFC1918 $B$K$h$k$H!"EPO?$5$l$F$$$J$$Aw?.85%"%I%l%9$O(B
 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16 $B$G$9!#(B
@@ -3007,8 +3138,8 @@
 $B$rDd;_$5$;$?$$>l9g$O!"(B
 .Dq shell
 $B%3%^%s%I$r;HMQ$7$F$/$@$5$$!#(B
-.It clear modem|ipcp Op current|overall|peak...
-.Dq modem
+.It clear physical|ipcp Op current|overall|peak...
+.Dq physical
 $B$b$7$/$O(B
 .Dq ipcp
 $B3,AX$G!";XDj$5$l$?%9%k!<%W%C%HCM$r%/%j%"$7$^$9!#(B
@@ -3107,7 +3238,7 @@
 .Sq lcp
 $B$,;XDj$5$l$?>l9g!"(B
 .Em LCP
-$BAX$O=*N;$5$l$^$9$,!"%b%G%`$O%*%U%i%$%s$K0\9T$;$:!"(B
+$BAX$O=*N;$5$l$^$9$,!"%G%P%$%9$O%*%U%i%$%s$K0\9T$;$:!"(B
 $B%j%s%/$bJD$8$i$l$^$;$s!#(B
 .Sq ccp
 $B$,;XDj$5$l$?>l9g!"(B
@@ -3244,11 +3375,14 @@
 $B$3$l$O(B
 .Dq close
 $B$NH?BP$N%3%^%s%I$G$9!#(B
-$BJD$8$i$l$F$$$kA4%j%s%/$,$9$0$KN)$A>e$,$j$^$9(B
-($B$7$+$7$J$,$i(B auto $B%j%s%/$K$h$C$F$ON)$A>e$,$i$J$$$b$N$,$"$j$^$9!#(B
-$B$3$l$O!"$I$N$h$&$J(B
+$BJD$8$i$l$F$$$k%j%s%/$N$&$A!"(B2 $BHVL\0J9_$N(B
+.Ar demand-dial
+$B%j%s%/0J30!"A4%j%s%/$,$9$0$KN)$A>e$,$j$^$9(B -
+2 $BHVL\0J9_$N(B
+.Ar demand-dial
+$B%j%s%/$O!"$I$N$h$&$J(B
 .Dq set autoload
-$B%3%^%s%I$,;HMQ$5$l$?$+$K0MB8$7$^$9(B)$B!#(B
+$B%3%^%s%I$,;HMQ$5$l$?$+$K0MB8$7$FN)$A>e$j$^$9!#(B
 .Pp
 LCP $BAX$,$9$G$K%*!<%W%s$5$l$F$$$k$H$-$K(B
 .Dq lcp
@@ -3417,10 +3551,10 @@
 .Ar id
 $B$O=i4|G'>Z%A%c%l%s%8$GMQ$$$i$l!"DL>o$O%m!<%+%k%^%7%sL>$K@_Dj$5$l$^$9!#(B
 .It set autoload Xo
-.Ar max-duration max-load Op Ar min-duration min-load
+.Ar min-percent max-percent period
 .Xc
 $B$3$l$i$N@_Dj$O%^%k%A%j%s%/%b!<%I$G$N$_E,MQ$5$l!"(B
-$B%G%U%)%k%HCM$O$9$Y$F(B 0 $B$G$9!#(B
+$B%G%U%)%k%HCM$O$=$l$>$l(B 0, 0, 5 $B$G$9!#(B
 1 $B$D0J>e$N(B
 .Ar demand-dial
 .Po
@@ -3433,28 +3567,37 @@
 $BM-8z$K$J$C$F$$$^$9!#(B
 $B<!$N(B
 .Ar demand-dial
-$B%j%s%/$O!"(B
-.Ar max-duration
-$BIC$N4V!"Aw=P%-%e!<$K(B
-.Ar max-load
-$B0J>e$N%Q%1%C%H$,B8:_$7$?>l9g$K$N$_3+$+$l$^$9!#(B
-$BN>J}$N%G%U%)%k%HCM$,(B 0 $B$G$"$k$?$a!"(B
+$B%j%s%/$,3+$+$l$k$N$O!"8=:_$N%P%s%I%k$N(B
+.Ar period
+$BIC4V$N%9%k!<%W%C%H$,%P%s%I%k$NAm%P%s%II}$N:GDc(B
+.Ar max-percent
+$B%Q!<%;%s%H$G$"$k$H$-$K8B$i$l$^$9!#(B
+$B8=:_$N%P%s%I%k$N(B
+.Ar period
+$BIC4V$N%9%k!<%W%C%H$,%P%s%I%k$NAm%P%s%II}$N(B
+.Ar min-percent
+$B%Q!<%;%s%H0J2<$K8:>/$7$?$H$-!":G8e$N%"%/%F%#%V$J(B
 .Ar demand-dial
-$B%j%s%/$O%G%U%)%k%H$G$O(B 1 $B$D$@$1%*!<%W%s$5$l$^$9!#(B
-.Pp
-$BJ#?t$N%j%s%/$,3+$+$l$F$$$F!">/$J$/$H$b$=$NFb$N(B 1 $B$D$,(B
+$B%j%s%/$G$J$$>l9g!"(B
 .Ar demand-dial
-$B%j%s%/$G$"$k>l9g!"(B
-.Ar min-duration
-$BIC$N4V!"Aw=P%-%e!<$K:GBg(B
-.Ar min-packets
-$BL$K~$N%Q%1%C%H$7$+B8:_$7$J$+$C$?$H$-$KJD$8$i$l$^$9!#(B
-.Ar min-duration
-$B$,(B 0 $B$N>l9g$K$O!"%?%$%^$OL58z$K$J$j$^$9!#(B
-$B%G%U%)%k%H$G$ON>J}$NCM$,(B 0 $B$G$"$k$?$a!"(B
+$B%j%s%/$O%@%&%s$7$^$9!#(B
+.Pp
+$B%G%U%)%k%HCM$G$O(B
 .Ar demand-dial
-$B%j%s%/$O%P%s%I%k$5$l$?%"%$%I%k%?%$%^$,4|8B@Z$l$K$J$k$^$G(B
-$B%"%/%F%#%V$G$"$jB3$1$^$9!#(B
+$B%j%s%/$O(B 1 $B$D$@$1%*!<%W%s$5$l$^$9!#(B
+.Pp
+$B%G%P%$%9$K$h$C$F$OJ*M}%P%s%II}$rH=Dj$G$-$J$$$b$N$,$"$j$^$9$N$G!"(B
+.Dq set autoload
+$B$,@5$7$/F0:n$9$k$?$a$K$O!"(B($B8e=R$N(B)
+.Dq set bandwidth
+$B%3%^%s%I$r;HMQ$9$kI,MW$,$"$k>l9g$,$"$j$^$9!#(B
+.It set bandwidth Ar value
+$BK\%3%^%s%I$O!"@\B3$N%P%s%II}$r!"IC$"$?$j$N%S%C%H?t$G@_Dj$7$^$9!#(B
+.Ar value
+$B$O(B 0 $B$h$jBg$-$$$3$H$,I,MW$G$9!#(B
+$B8=:_!"A0=R$N(B
+.Dq set autoload
+$B%3%^%s%I$N$_$,;HMQ$7$^$9!#(B
 .It set callback Ar option Ns No ...
 $B0z?t$,M?$($i$l$J$$>l9g!"%3!<%k%P%C%/$O(B disable $B$K$J$j$^$9!#(B
 $B$=$&$G$J$$>l9g$K$O!"(B
@@ -3465,7 +3608,7 @@
 ($B$b$7$/$O(B
 .Ar direct
 $B%b!<%I$G$O<u$1IU$1$^$9(B)$B!#(B
-$B%/%i%$%"%s%H%b!<%I$G!"(B
+$B%/%i%$%"%s%H%b!<%I$G$O!"(B
 .Ar option
 $B$NH]Dj1~Ez$,JV$5$l$k$H!"(B
 .Nm
@@ -3500,6 +3643,16 @@
 Microsoft $B%3!<%k%P%C%/@)8f%W%m%H%3%k$,MQ$$$i$l$^$9!#8e=R$N(B
 .Dq set cbcp
 $B$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+$B%/%i%$%"%s%H%b!<%I$G(B
+.Ar cbcp
+$B$r8r>D$7$?$$>l9g$G$"$j$+$D!"(B
+CBCP $B8r>D;~$K%5!<%P$,%3!<%k%P%C%/L5$7$rMW5a$9$k$3$H$r5v$7$?$$>l9g!"(B
+$B%3!<%k%P%C%/%*%W%7%g%s$H$7$F(B
+.Ar cbcp
+$B$H(B
+.Ar none
+$B$NN>J}$r;XDj$9$kI,MW$,$"$j$^$9!#(B
 .It E.164 *| Ns Xo
 .Ar number Ns Op , Ns Ar number Ns
 .No ...
@@ -3528,7 +3681,8 @@
 .Nm
 $B$O$=$N$3$H$r<u$1F~$l!"@\B3$r=*N;$9$k$N$G$O$J$/(B
 $B%3!<%k%P%C%/$;$:$K=hM}$rB3$1$^$9!#(B
-$B%3!<%k%P%C%/$r%*%W%7%g%s$K$7$?$$$N$G$"$l$P!"$3$l$r;XDj$9$kI,MW$,$"$j$^$9!#(B
+$B%3!<%k%P%C%/$r%*%W%7%g%s$K$7$?$$$N$G$"$l$P!"(B
+(1 $B8D0J>e$NB>$N%3!<%k%P%C%/%*%W%7%g%s$K2C$($F(B) $B$3$l$b;XDj$9$kI,MW$,$"$j$^$9!#(B
 .El
 .Pp
 .It set cbcp Oo Xo
@@ -3575,7 +3729,9 @@
 $B$O%-%c%j%"$NB8:_$r%A%'%C%/$7$^$9!#(B
 $B%-%c%j%"$,@_Dj$5$l$F$$$J$$$H!"(B
 $B%G%P%$%9$,%-%c%j%"$r%5%]!<%H$7$F$$$J$$(B
-($B$[$H$s$I$N%L%k%b%G%`%1!<%V%k$N>l9g$,$=$&$G$9(B) $B$H(B
+($B$[$H$s$I$N(B
+.Dq laplink
+$B%L%k%b%G%`%1!<%V%k$N>l9g$,$=$&$G$9(B) $B$H(B
 .Nm
 $B$O2>Dj$7!"$3$N;v<B$r5-O?$7$F!"%-%c%j%"$N%A%'%C%/$r;_$a$^$9!#(B
 $B$7$+$7!"%b%G%`$K$h$C$F$O%-%c%j%"$N%"%5!<%H$K;~4V$,$+$+$k$b$N$,$"$k$N$G!"(B
@@ -3583,10 +3739,16 @@
 .Nm ppp
 $B$O8!CN$G$-$J$/$J$j$^$9!#(B
 .Ar seconds
-$B$O!"%m%0%$%s%9%/%j%W%H$,40N;$7$F$+$i:G=i$N%-%c%j%"%A%'%C%/$r9T$&A0$K!"(B
+$B$O!"%@%$%d%k%9%/%j%W%H$,40N;$7$F$+$i%-%c%j%"$,MxMQ2DG=$+H=CG$9$kA0$K!"(B
 .Nm
 $B$,BT$D$Y$-IC?t$r;XDj$7$^$9!#(B
 .Pp
+$B%-%c%j%"$,8!=P$5$l$k$+(B
+.Ar seconds
+$B$NIC?t$,7P2a$9$k$^$G!"(B
+.Nm
+$B$O%m%0%$%s%9%/%j%W%H$X$O?J$_$^$;$s!#(B
+.Pp
 .Ar seconds
 $B$ND>8e$K%(%/%9%/%i%a!<%7%g%s%^!<%/(B
 .Pq Dq \&!
@@ -3595,9 +3757,18 @@
 $B$O%-%c%j%"$r(B
 .Em $BMW5a(B
 $B$7$^$9!#(B
-$B:G=i$N%A%'%C%/$G%-%c%j%"$r8!CN$7$J$$$H!"%j%s%/$O@ZCG$5$l$F$$$k$H$_$J$5$l$^$9!#(B
+.Ar seconds
+$BIC8e$K%-%c%j%"$,8!CN$5$l$J$$$H!"%j%s%/$O@ZCG$5$l$^$9!#(B
 .Pp
-$B%j%s%/$,(B tty $B$G$J$$>l9g!"%-%c%j%"$N(B
+ISDN $B%G%P%$%9$G$O!"(B
+.Nm
+$B$O>o$K%-%c%j%"$K8G<9$7$^$9!#(B
+$B8F$,@\B3$7$?8e$G$N$_!"(B
+i4brbchX $B%G%P%$%9%I%i%$%P$O%-%c%j%"$rN)$A>e$2$^$9!#$=$l$f$(!"(B
+.Ar 6
+$BIC$J$I$NE,@Z$JCM$K@_Dj$9$k$Y$-$G$9!#(B
+.Pp
+$B%j%s%/$,B>$N%G%P%$%9$N>l9g!"%-%c%j%"$N(B
 .Em $BI,MW@-(B
 $B$OL5;k$5$l$^$9!#(B
 .It set choked Op Ar timeout
@@ -3666,16 +3837,23 @@
 $B$,;HMQ$9$k%G%P%$%9$r!";XDj$5$l$?(B
 .Dq value
 $B$K@_Dj$7$^$9!#(B
-$BA4%7%j%"%k%G%P%$%9L>$O(B
+.Pp
+$B$9$Y$F$N(B ISDN $B%G%P%$%9$H%7%j%"%k%G%P%$%9$NL>A0$O(B
 .Pa /dev/
 $B$+$i;O$^$k$3$H$,2>Dj$5$l$F$$$^$9!#(B
+ISDN $B%G%P%$%9$ODL>o(B
+.Pa i4brbchX
+$B$H$$$&L>A0$G$"$j!"%7%j%"%k%G%P%$%9$ODL>o(B
+.Pa cuaaX
+$B$H$$$&L>A0$G$9!#(B
+.Pp
 .Dq value
 $B$,(B
 .Pa /dev/
 $B$+$i;O$^$i$J$$>l9g!"%(%/%9%/%i%a!<%7%g%s%^!<%/(B
 .Pq Dq \&!
 $B$+$i;O$a$k$+!"(B
-.Dq host:port
+.Dq host:port Ns Op Ns /proto
 $B$N7A<0$G$"$kI,MW$,$"$j$^$9!#(B
 .Pp
 $B%(%/%9%/%i%a!<%7%g%s%^!<%/$G;O$^$k>l9g!"(B
@@ -3685,16 +3863,17 @@
 .Nm
 $B$K%U%#!<%I%P%C%/$5$l!"$=$l$i$,DL>o%G%P%$%9$G$"$k$+$N$h$&$KFI$_=q$-$5$l$^$9!#(B
 .Pp
-.Dq host:port
-$B$NAH$,M?$($i$l$k>l9g!"(B
+.Dq host:port Ns Op /tcp|/udp
+$B;XDj$,M?$($i$l$k>l9g!"(B
 .Nm
 $B$O!";XDj$5$l$?(B
 .Dq host
 $B$N;XDj$5$l$?(B
 .Dq port
 $B$H@\B3$7$h$&$H$7$^$9!#(B
+tcp $B$^$?$O(B udp $B$N;XDj$,$J$$>l9g!"%G%U%)%k%H$O(B tcp $B$H$J$j$^$9!#(B
 $B>\:Y$O>e=R$N(B
-.Em PPP $B%*!<%P(B TCP
+.Em PPP $B%*!<%P(B TCP $B$H(B PPP $B%*!<%P(B UDP
 $B$N@a$r;2>H$7$F$/$@$5$$!#(B
 .Pp
 $BJ#?t$N(B
@@ -3763,7 +3942,7 @@
 $B<u?.BT$AJ8;zNs$^$?$OAw?.J8;zNs$N:G=i$NJ8;z$r%(%/%9%/%i%a!<%7%g%s%^!<%/(B
 .Pq Dq \&!
 $B$K$7$^$9!#(B
-$B%3%^%s%I$,<B9T$5$l$k$H!"I8=`F~NO$HI8=`=PNO$,%b%G%`%G%P%$%9(B (
+$B%3%^%s%I$,<B9T$5$l$k$H!"I8=`F~NO$HI8=`=PNO$,%*!<%W%s%G%P%$%9(B (
 .Dq set device
 $B;2>H(B) $B$K8~$1$i$l!"I8=`%(%i!<=PNO$,(B
 .Nm
@@ -3838,7 +4017,9 @@
 $B%3%^%s%I$HF1MM$K!"FC<l8l$NE83+BP>]$H$J$j$^$9!#(B
 .It set enddisc Op label|IP|MAC|magic|psn value
 $B$3$N%3%^%s%I$O!"%m!<%+%k=*E@$NA*BrCM$r@_Dj$7$^$9!#(B
-LCP $B8r>D$NA0$K@_Dj$5$l$k$H!"(B
+LCP $B8r>D$NA0$K@_Dj$5$l$?>l9g$G$"$j!"(B
+.Dq disable enddisc
+$B%3%^%s%I$r;HMQ$7$F$$$J$$>l9g!"(B
 .Nm
 $B$O(B LCP $B=*E@A*BrCM%*%W%7%g%s$r;HMQ$7$F!"Aj<j$K>pJs$rAw$j$^$9!#(B
 $B<!$NA*BrCM$r@_Dj2DG=$G$9!#(B
@@ -3866,6 +4047,15 @@
 $B%3%^%s%I$h$j$b@h$K<B9T$7$^$9!#(B
 .It Li magic
 20 $B7e$NMp?t$,;HMQ$5$l$^$9!#(B
+$B%^%8%C%/%J%s%P$r;HMQ$9$k$H$-$K$OCm0U$,I,MW$G$9!#(B
+.Nm
+$B$N:F3+$dJL$N(B
+.Nm
+$B$r;H$C$?%j%s%/:n@.$K$*$$$F$O!"JL$N%^%8%C%/%J%s%P$r;HMQ$9$k$?$a!"(B
+$BF1$8%P%s%I%k$KB0$9$H$OAj<j$KG'<1$5$l$J$$$N$G$9!#(B
+$B$3$N$?$a!"(B
+.Fl direct
+$B@\B3$G$O;H$($^$;$s!#(B
 .It Li psn Ar value
 $B;XDj$5$l$?(B
 .Ar value
@@ -3884,10 +4074,12 @@
 .Sq $B%(%9%1!<%W(B
 $B$5$l$kJ8;z$r;XDj$9$k$?$a$K;HMQ$7$^$9!#(B
 .It set filter dial|alive|in|out Ar rule-no Xo
-.No permit|deny
-.Oo Ar src_addr Ns Op / Ns Ar width
+.No permit|deny|clear| Ns Ar rule-no
+.Op \&!
+.Oo Op host
+.Ar src_addr Ns Op / Ns Ar width
 .Op Ar dst_addr Ns Op / Ns Ar width
-.Oc Oo tcp|udp|icmp Op src lt|eq|gt Ar port
+.Oc Oo tcp|udp|ospf|igmp|icmp Op src lt|eq|gt Ar port
 .Op dst lt|eq|gt Ar port
 .Op estab
 .Op syn
@@ -3910,12 +4102,15 @@
 .Em out
 $B%U%#%k%?$O!"%^%7%s$+$i=PNO2DG=$J%Q%1%C%H$r;XDj$7$^$9!#(B
 .Pp
-$B%U%#%k%?%j%s%0$O!"(B
-$B%(%$%j%"%9%(%s%8%s$,9T$&(B IP $BJQ99$NA0$KE,MQ$5$l$^$9!#(B
+$B%U%#%k%?%j%s%0$,9T$o$l$k$N$O!"(B
+$B=PNO%Q%1%C%H$G$O(B NAT $B%(%s%8%s$K$h$k(B IP $BJQ99A0$G$"$j!"(B
+$BF~NO%Q%1%C%H$G$O(B NAT $B%(%s%8%s$K$h$k(B IP $BJQ998e$G$9!#(B
 $B%G%U%)%k%H$G$O!"A4%U%#%k%?%;%C%H$,A4%Q%1%C%H$NDL2a$r5v2D$7$^$9!#(B
 $B%k!<%k$O(B
 .Ar rule-no
-$B$K=>$C$F=gHV$K=hM}$5$l$^$9!#(B
+$B$K=>$C$F=gHV$K=hM}$5$l$^$9(B ($B%k!<%kHV9f$r(B
+.Ar action
+$B$K;XDj$7$F%9%-%C%W$9$k>l9g$r=|$-$^$9(B)$B!#(B
 $B3F%;%C%H$KBP$7(B 40 $B$^$G$N%k!<%k$r;XDj2DG=$G$9!#(B
 $B;XDj$5$l$k%;%C%H$K$*$1$k$I$N%k!<%k$K$b%^%C%A$7$J$$%Q%1%C%H$OGK4~$5$l$^$9!#(B
 .Em in
@@ -3932,7 +4127,7 @@
 .Sx $B%Q%1%C%H$N%U%#%k%?%j%s%0(B
 $B$N@a$r;2>H$7$F$/$@$5$$!#(B
 .It set hangup Ar chat-script
-$B%b%G%`$rJD$8$kA0$K$3$l$r%j%;%C%H$9$k;~$K;HMQ$9$k!"(B
+$B%G%P%$%9$rJD$8$kA0$K$3$l$r%j%;%C%H$9$k;~$K;HMQ$9$k!"(B
 $B%A%c%C%H%9%/%j%W%H$r;XDj$7$^$9!#(B
 $BDL>o$OITMW$G$"$k$Y$-$G$9$,!"(B
 $BJD$8$k;~$K<+8J$r@5$7$/%j%;%C%H$G$-$J$$%G%P%$%9$KBP$7$F;HMQ$G$-$^$9!#(B
@@ -3965,6 +4160,7 @@
 .Dq /0
 $B$G$9!#(B
 .Pp
+$BAj<j$KF0E*$J(B IP $BHV9f$r3d$jEv$F$?$$>l9g!"(B
 .Ar hisaddr
 $B$K(B IP $BHV9f$NHO0O$H$7$F(B
 .Bd -literal -offset indent
@@ -3987,7 +4183,7 @@
 .Nm
 $B$OAj<j$NMW5a$rG'$a$^$9!#(B
 $BAj<j$,%j%s%/$r:F3NN)$7$FA02s3d$jEv$F$F$$$?(B IP $BHV9f$r;HMQ$7$?$$>l9g$KM-MQ$G$9(B
-($B4{B8$N(B TCP $B@\B3$rJ]B8$7$^$9(B)$B!#(B
+($B4{B8$N(B TCP $B$H(B UDP $B$N@\B3$rJ]B8$7$^$9(B)$B!#(B
 .Pp
 $BAj<j$,MW5a$7$?(B IP $BHV9f$,HO0O30$b$7$/$O;HMQCf$N>l9g!"(B
 .Nm
@@ -4115,7 +4311,7 @@
 .Pp
 $BCm<a(B: $B%3%^%s%I(B
 .Dq set mode auto
-$B$rH/9T$7!"(BIP $B%(%$%j%"%7%s%0$,(B enable $B$K$5$l$F$$$?>l9g!"8e$G(B
+$B$rH/9T$7!"%M%C%H%o!<%/%"%I%l%9JQ49$,(B enable $B$K$5$l$F$$$?>l9g!"8e$G(B
 .Dq enable iface-alias
 $B$r9T$&$HJXMx$G$9!#(B
 .Nm
@@ -4380,9 +4576,9 @@
 $B$K2C$($i$l$^$9!#(B
 .Ar secs
 $B$,A}2C$5$l$k$N$O!":GBg(B
-.Ar maxinc
+.Ar max
 $B2s$@$1$G$9!#(B
-.Ar maxinc
+.Ar max
 $B$N%G%U%)%k%HCM$O(B 10 $B$G$9!#(B
 .Ar attempts
 $B$,7P2a$7$?8e$G$b(B
@@ -4457,6 +4653,16 @@
 $B$K0MB8$7$J$$$h$&$K$7$F$/$@$5$$!#(B
 .It set speed Ar value
 $B%7%j%"%k%G%P%$%9$NB.EY$r;XDj$7$^$9!#(B
+$BB.EY;XDj$,(B
+.Dq sync
+$B$N>l9g!"(B
+.Nm
+$B$O%G%P%$%9$rF14|%G%P%$%9$H$7$F07$$$^$9!#(B
+.Pp
+$B%G%P%$%9%?%$%W$K$h$C$F$O!"(B
+$BF14|$^$?$OHsF14|$N$$$:$l$+$G$"$k$3$H$,J,$k$b$N$,$"$j$^$9!#(B
+$B$3$l$i$N%G%P%$%9$G$O!"IT@5$J@_Dj$r>e=q$-$7$F!"(B
+$B$3$N7k2L$KBP$9$k7Y9p$r5-O?$7$^$9!#(B
 .It set stopped Op Ar LCPseconds Op Ar CCPseconds
 $B$3$N%*%W%7%g%s$,;XDj$5$l$k$H!"(B
 $B;XDj$7$?(B FSM ($BM-8B>uBV5!3#(B; Finite State Machine) $B$,Dd;_>uBV$K$J$C$F$+$i(B
@@ -4483,11 +4689,17 @@
 $B$3$NCM$O(B openmode $B$NCY1d(B ($B>e=R$N(B
 .Dq set openmode
 $B;2>H(B) $B$h$j>.$5$/$J$C$F$O$J$j$^$;$s!#(B
-.It set timeout Ar idleseconds
+.It set timeout Ar idleseconds Op Ar mintimeout
 $B$3$N%3%^%s%I$O%"%$%I%k%?%$%^$NCM$r;XDj$7$^$9!#(B
 $B99$J$k>\:Y$K$D$$$F$O(B
 .Sx $B%"%$%I%k%?%$%^$N@_Dj(B
 $B$H$$$&%?%$%H%k$N@a$r;2>H$7$F$/$@$5$$!#(B
+.Pp
+.Ar mintimeout
+$B$,;XDj$5$l$?>l9g!"(B
+$B:GC;$G$b;XDj$5$l$?IC?t$@$1%j%s%/$,%"%C%W$7$F$$$J$$$H!"(B
+.Nm
+$B$O%"%$%I%k%"%&%H$7$^$;$s!#(B
 .It set vj slotcomp on|off
 $B$3$N%3%^%s%I$O(B
 .Nm
@@ -4558,6 +4770,8 @@
 .Pc $B$rI=<($7$^$9!#(B
 .It show ipcp
 $B8=:_$N(B IPCP $BE}7W$rI=<($7$^$9!#(B
+.It show layers
+$B8=:_;HMQCf$N%W%m%H%3%kAX$rI=<($7$^$9!#(B
 .It show lcp
 $B8=:_$N(B LCP $BE}7W$rI=<($7$^$9!#(B
 .It show Op data Ns Xo
@@ -4570,7 +4784,7 @@
 $B8=:_$N%m%0CM$rI=<($7$^$9!#(B
 .It show mem
 $B8=:_$N%a%b%jE}7W$rI=<($7$^$9!#(B
-.It show modem
+.It show physical
 $B8=:_$N2<0L%l%Y%k%j%s%/>pJs$rI=<($7$^$9!#(B
 .It show mp
 $B%^%k%A%j%s%/>pJs$rI=<($7$^$9!#(B
@@ -4589,9 +4803,8 @@
 .Pp
 .It term
 $BC<Kv%b!<%I$K0\9T$7$^$9!#(B
-$B%-!<%\!<%I$+$i%?%$%W$7$?J8;z$O%b%G%`$KAw$i$l$^$9!#(B
-$B%b%G%`$+$iFI$s$@J8;z$O%9%/%j!<%s$KI=<($5$l$^$9!#(B
-$B%b%G%`$NAj<jB&$K(B
+$B%-!<%\!<%I$+$i%?%$%W$7$?J8;z$O%G%P%$%9$KAw$i$l$^$9!#(B
+$B%G%P%$%9$+$iFI$s$@J8;z$O%9%/%j!<%s$KI=<($5$l$^$9!#(B
 .Nm
 $B$NAj<j$,G'<1$5$l$?;~$K$O!"(B
 .Nm
@@ -4605,7 +4818,7 @@
 .It
 $B2?$,MxMQ$G$-$k$+$K$D$$$F$O!"(B
 .Dq help ,
-.Dq alias ? ,
+.Dq nat ? ,
 .Dq enable ? ,
 .Dq set ? ,
 .Dq show ?
@@ -4691,6 +4904,7 @@
 .Xr ftp 1 ,
 .Xr gzip 1 ,
 .Xr hostname 1 ,
+.Xr isdnd 8 ,
 .Xr login 1 ,
 .Xr tcpdump 1 ,
 .Xr telnet 1 ,
@@ -4713,6 +4927,7 @@
 .Xr pppctl 8 ,
 .Xr pppd 8 ,
 .Xr route 8 ,
+.Xr sshd 8 ,
 .Xr syslogd 8 ,
 .Xr traceroute 8 ,
 .Xr vipw 8
diff -ur man/man8/sa.8 man/man8/sa.8
--- man/man8/sa.8	Sat Sep 26 15:20:20 1998
+++ man/man8/sa.8	Tue Aug 24 00:24:00 1999
@@ -100,7 +100,7 @@
 $B%*%W%7%g%s(B:
 .Bl -tag -width Ds
 .It Fl a
-$BA4%3%^%s%IL>$rI=<($7$^$9!#I=<($G$-$J$$J8;z$r4^$s$@%3%^%s%I$J$I$b4^$_$^$9(B
+$BA4%3%^%s%IL>$rI=<($7$^$9!#I=<($G$-$J$$J8;z$r4^$s$@%3%^%s%I$J$I$b4^$_$^$9!#(B
 $B%G%U%)%k%H$G$OI=<($G$-$J$$J8;z$r4^$`%3%^%s%I$O!"(B``***other'' $B$K4^$^$l$^$9!#(B
 .It Fl b
 $B%3%^%s%IE}7W>pJs$rI=<($9$k>l9g!"%f!<%6;~4V$H%7%9%F%`;~4V$N9g7W$r(B
diff -ur man/man8/swapon.8 man/man8/swapon.8
--- man/man8/swapon.8	Sun Dec  6 12:08:52 1998
+++ man/man8/swapon.8	Sat Aug 28 21:47:28 1999
@@ -30,7 +30,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	%Id: swapon.8,v 1.10 1998/08/03 06:35:01 charnier Exp %
+.\"	%Id: swapon.8,v 1.10.2.1 1999/08/19 06:18:15 jkoshy Exp %
+.\"
 .\" jpman %Id: swapon.8,v 1.2 1997/05/03 13:45:14 horikawa Stab %
 .\"
 .Dd June 5, 1993
@@ -76,8 +77,8 @@
 .Xr rc 8 ,
 .Xr vnconfig 8
 .Sh $B4XO"%U%!%$%k(B
-.Bl -tag -width /dev/[ru][pk]?b -compact
-.It Pa /dev/[ru][pk]?b
+.Bl -tag -width "/dev/{wd,da}?s?b" -compact
+.It Pa /dev/{wd,da}?s?b
 $BI8=`$N%Z!<%8%s%0%G%P%$%9(B
 .It Pa /etc/fstab
 ascii $B7A<0$N%U%!%$%k%7%9%F%`5-=R%F!<%V%k(B
diff -ur man/man8/traceroute.8 man/man8/traceroute.8
--- man/man8/traceroute.8	Sat Oct 10 22:09:09 1998
+++ man/man8/traceroute.8	Sat Aug 28 21:47:30 1999
@@ -13,7 +13,7 @@
 .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\"	%Header: /home/ncvs/src/contrib/traceroute/traceroute.8,v 1.3 1998/01/09 18:46:53 steve Exp %
+.\"	%Header: /home/ncvs/src/contrib/traceroute/traceroute.8,v 1.3.2.1 1999/08/16 19:35:27 archie Exp %
 .\"
 .\" jpman %Id: traceroute.8,v 1.2 1997/05/13 00:58:05 mutoh Stab %
 .\"
@@ -22,7 +22,7 @@
 .SH $BL>>N(B
 traceroute \- $B%Q%1%C%H$,%M%C%H%o!<%/>e$N%[%9%H$^$G$K$?$I$k7PO)$rI=<($9$k(B
 .SH $B=q<0(B
-.. while ((op = getopt(argc, argv, "dnrvg:m:p:q:s:t:w:")) != EOF)
+.. while ((op = getopt(argc, argv, "dnrvg:M:m:P:p:q:s:t:w:")) != EOF)
 .na
 .B traceroute
 [
@@ -31,27 +31,36 @@
 .B \-g
 .I gw_host
 ] [
-.B \-m
-max_ttl
-.I ]
+.B \-M
+.I min_ttl
+] 
 .br
 .ti +8
 [
+.B \-m
+.I max_ttl
+] [
+.B \-P
+.I proto
+] [
 .B \-p
 .I port
-] [
+]
+.br
+.ti +8
+[
 .B \-q
 .I nqueries
 ] [
 .B \-s
 .I src_addr
+] [
+.B \-t
+.I tos
 ]
 .br
 .ti +8
 [
-.B \-t
-.I tos
-] [
 .B \-w
 .I waittime
 ]
@@ -86,6 +95,10 @@
 $BAF$/!"%=!<%9%k!<%F%#%s%0$N$?$a$N%2!<%H%&%(%$$r;XDj$7$^$9!#(B
 $B:GBg(B 8 $B$D;XDj$G$-$^$9!#(B
 .TP
+.B \-M
+$BAw=P$5$l$k%W%m!<%V%Q%1%C%H$N(B time-to-live $B$N=i4|CM$r@_Dj$7$^$9!#(B
+$B%G%U%)%k%H$O(B 1 $B$G$"$j!":G=i$N%[%C%W$+$i3+;O$9$k$3$H$r0UL#$7$^$9!#(B
+.TP
 .B \-m
 $BAw=P$5$l$k%W%m!<%V%Q%1%C%H$N:GBg(B time-to-live ($B:GBg%[%C%W?t(B) $B$r%;%C%H$7$^$9!#(B
 $B%G%U%)%k%H$O(B 30 $B%[%C%W(B (TCP $B$HF1$8%G%U%)%k%HCM(B) $B$G$9!#(B
@@ -95,6 +108,16 @@
 IP $B%"%I%l%9$@$1$GI=<($7$^$9(B
 ($B%M!<%`%5!<%P$X$N(B IP $B%"%I%l%9$+$i%[%9%HL>$X$NJQ49Ld$$9g$o$;$r>J$-$^$9(B)$B!#(B
 .TP
+.B \-P
+$B;XDj$7$?(B IP $B%W%m%H%3%k$N%Q%1%C%H$rAw=P$7$^$9!#(B
+$B8=:_%5%]!<%H$5$l$F$$$k%W%m%H%3%k$O(B UPD, TCP, GRE $B$G$9!#(B
+$BB>$N%W%m%H%3%k$b(B ($BL>A0$^$?$O?tCM$G(B) $B;XDj2DG=$G$9$,!"(B
+.I traceroute
+$B$O$3$l$i$N%Q%1%C%H%U%)!<%^%C%H$K4X$9$kFCJL$JCN<1$O<BAu$7$F$$$^$;$s!#(B
+$B7PO)>e$N$I$N%k!<%?$,(B IP $B%W%m%H%3%kHV9f$K=>$C$F%V%m%C%/$7$F$$$k$+$r(B
+$BH=Dj$9$k>l9g!"$3$N%*%W%7%g%s$,M-MQ$G$9!#(B
+$B8e=R$N%P%0$r;2>H$7$F$/$@$5$$!#(B
+.TP
 .B \-p
 $B%W%m!<%V$K;HMQ$9$k(B UDP $B%]!<%HHV9f(B ($B%G%U%)%k%H$O(B 33434) $B$N(B
 $B4p=`CM(B (base) $B$r;XDj$7$^$9!#(B
@@ -318,4 +341,14 @@
 .I ftp://ftp.ee.lbl.gov/traceroute.tar.Z
 .RE
 .SH $B%P%0(B
+UDP $B0J30$N%W%m%H%3%k$r;HMQ$9$k>l9g!"5!G=$,@)8B$5$l$^$9!#(B
+$BFC$K!":G8e$N%Q%1%C%H$,$7$P$7$P<:$o$l$?$h$&$K8+$($^$9!#(B
+$B$J$<$J$i!":G8e$N%Q%1%C%H$,08@h%[%9%H$KE~C#$7$?$H$7$F$b!"(B
+ICMP $B%a%C%;!<%8$OAw$jJV$5$l$J$$$?$a!"(B
+$B$=$l$rCN$kJ}K!$,L5$$$?$a$G$9!#(B
+TCP $B$N>l9g!"(B
+.I traceroute
+$B$O08@h%[%9%H(B ($B$^$?$O%Q%1%C%H$r%U%#%k%?$7$F$$$kCf4V%k!<%?(B)$B$+$i$N(B RST
+$B$r8+$k$Y$-$G$9$,!"$^$@<BAu$5$l$F$$$^$;$s!#(B
+.PP
 $B%P%0%l%]!<%H$O!"(Btraceroute@ee.lbl.gov $B$KAw$C$F$/$@$5$$!#(B
diff -ur man/man8/vinum.8 man/man8/vinum.8
--- man/man8/vinum.8	Sat Aug 28 21:49:00 1999
+++ man/man8/vinum.8	Sat Aug 28 21:47:33 1999
@@ -34,7 +34,7 @@
 .\" otherwise) arising in any way out of the use of this software, even if
 .\" advised of the possibility of such damage.
 .\"
-.\" %Id: vinum.8,v 1.5.2.7 1999/08/15 12:19:51 mpp Exp %
+.\" %Id: vinum.8,v 1.5.2.8 1999/08/24 04:06:51 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)
@@ -48,12 +48,6 @@
 .Op command
 .Op Fl options
 .Sh $B%3%^%s%I(B
-.Cd create Op Fl f Ar description-file
-.in +1i
-.Ar description-file
-$B$N5-=R$K=>$C$F%\%j%e!<%`$r:n@.$7$^$9!#(B
-.in
-.\" XXX remove this
 .Cd attach Ar plex Ar volume
 .Op Nm rename
 .Cd attach Ar subdisk Ar plex Ar [offset]
@@ -62,6 +56,22 @@
 $B%W%l%C%/%9$r%\%j%e!<%`$K!"$^$?$O%5%V%G%#%9%/$r%W%l%C%/%9$K7k9g$7$^$9!#(B
 .in
 .\" XXX remove this
+.Nm concat
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.in +1i
+$B;XDj$7$?%I%i%$%V$+$i%3%s%+%A%M!<%H2=%\%j%e!<%`$r:n@.$7$^$9!#(B
+.in
+.Cd create Op Fl f Ar description-file
+.Op Fl f
+.Ar description-file
+.in +1i
+.Ar description-file
+$B$N5-=R$K=>$C$F%\%j%e!<%`$r:n@.$7$^$9!#(B
+.in
+.\" XXX remove this
 .Cd debug
 .in +1i
 $B%\%j%e!<%`%^%M!<%8%c$r%+!<%M%k%G%P%C%,$K0\9T$5$;$^$9!#(B
@@ -72,6 +82,7 @@
 $B%G%P%C%0%U%i%0$r@_Dj$7$^$9!#(B
 .in
 .Cd detach
+.Op Fl f
 .Op Ar plex | subdisk
 .in +1i
 $B7k9g$5$l$F$$$?%\%j%e!<%`$d%W%l%C%/%9$+$i!"%W%l%C%/%9$d%5%V%G%#%9%/$rJ,N%$7$^$9!#(B
@@ -150,6 +161,20 @@
 .in +1i
 $B%\%j%e!<%`$N>pJs$rI=<($7$^$9!#(B
 .in
+.Cd makedev
+.in +1i
+.Ar /dev/vinum
+$B$K%G%P%$%9%N!<%I$r:F:n@.$7$^$9!#(B
+.in
+.Nm mirror
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl s
+.Op Fl v
+.Ar drives
+.in +1i
+$B;XDj$7$?%I%i%$%V$+$i%_%i!<2=%\%j%e!<%`$r:n@.$7$^$9!#(B
+.in
 .Cd printconfig
 .Op Pa file
 .in +1i
@@ -157,11 +182,6 @@
 .Pa file
 $B$X=q$-9~$_$^$9!#(B
 .in
-.Cd makedev
-.in +1i
-.Ar /dev/vinum
-$B$K%G%P%$%9%N!<%I$r:F:n@.$7$^$9!#(B
-.in
 .Cd quit
 .in +1i
 $BBPOC%b!<%I;~$K!"(B
@@ -232,6 +252,13 @@
 .in +1i
 $B%G!<%b%s$N@_Dj$rM?$($^$9!#(B
 .in
+.Cd setstate
+.Ar state
+.Op Ar volume | plex | subdisk | drive
+.in +1i
+$BB>$N%*%V%8%'%/%H$K1F6A$rM?$($:$K>uBV$r@_Dj$7$^$9!#(B
+$B?GCG$N$?$a$@$1$K;HMQ$7$^$9!#(B
+.in
 .Cd start
 .in +1i
 $BA4(B vinum $B%I%i%$%V$+$i@_Dj$rFI$_9~$_$^$9!#(B
@@ -250,6 +277,14 @@
 .Nm
 $B$rDd;_$5$;$^$9!#(B
 .in
+.Nm stripe
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.in +1i
+$B;XDj$7$?%I%i%$%V$+$i%9%H%i%$%W2=%\%j%e!<%`$r:n@.$7$^$9!#(B
+.in
 .Sh $B2r@b(B
 .Nm
 $B$O(B \fBVinum\fP\| $BO@M}%\%j%e!<%`%^%M!<%8%c$HDL?.$9$k$?$a$N(B
@@ -259,9 +294,10 @@
 $B$r;2>H$7$F$/$@$5$$!#(B
 .Xr vinum 8
 $B$OBPOC7A<0$H!"C1FH$N%3%^%s%I$r<B9T$9$k7A<0$N$$$:$l$b<B9T2DG=$K$J$C$F$$$^$9!#(B
-$B%3%^%s%I$rH<$o$:$K(B
+$B%3%^%s%I%i%$%s0z?t$rH<$o$:$K(B
 .Nm
-$B$r5/F0$9$k$HBPOC7A<0$K$J$k0lJ}!"0z?t$H$7$F%3%^%s%I$r;XDj$9$k$H$=$N%3%^%s%I(B
+$B$r5/F0$9$k$HBPOC7A<0$K$J$k0lJ}!"(B
+$B%3%^%s%I%i%$%s$G%3%^%s%I$r;XDj$9$k$H$=$N%3%^%s%I(B
 $B$@$1$r<B9T$7$^$9!#(B
 $BBPOC%b!<%I$G$O!"(B
 .Nm
@@ -295,7 +331,15 @@
 .Ar myvolume
 $B$,%*!<%W%s$5$l$F$$$?$H$7$F$b:o=|$7$^$9!#0J9_!"$3$N%\%j%e!<%`$K(B
 $B%"%/%;%9$9$k$H!"$[$\3N<B$K%Q%K%C%/$r5/$3$7$^$9!#(B
-.It Fl -r
+.It Fl n Ar name
+$B%\%j%e!<%`L>$r;XDj$9$k$?$a$K(B
+.Fl n
+$B%*%W%7%g%s$r;HMQ$7$^$9!#C1=c$J@_Dj%3%^%s%I(B
+.Nm concat ,
+.Nm mirror ,
+.Nm stripe
+$BMQ$G$9!#(B
+.It Fl r
 .Fl r
 .if t (``recursive: $B:F5"E*(B'')
 .if n ("recursive: $B:F5"E*(B")
@@ -312,6 +356,9 @@
 .if t (``statistics: $BE}7W(B'')
 .if n ("statistics: $BE}7W(B")
 $B%*%W%7%g%s$OI=<(7O$N%3%^%s%I$GE}7W>pJs$rI=<($9$k$?$a$K;H$$$^$9!#(B
+.Nm mirror
+$B%3%^%s%I$b$3$N%U%i%0$r;HMQ$7!"(B
+$B%9%H%i%$%W2=%W%l%C%/%9$r:n@.$9$Y$-$3$H$r<($7$^$9!#(B
 .It Fl v
 .Fl v
 .if t (``verbose: $B>iD9(B'')
@@ -377,7 +424,12 @@
 $B%9%H%i%$%W2=%W%l%C%/%9$*$h$S(B RAID-5 $B%W%l%C%/%9$K$*$$$F(B
 $B%5%V%G%#%9%/$,<:$o$l$?>l9g(B ($BNc$($P%I%i%$%V$N8N>c8e$J$I(B)$B!"(B
 $BEv3:%5%V%G%#%9%/$rCV$-49$($i$l$k$N$OF1$8Bg$-$5$N%5%V%G%#%9%/$@$1$G$9!#(B
-$BJL$N%5%V%G%#%9%/$r7k9g$9$k$3$H$O!"8=:_5v$5$l$F$$$^$;$s!#(B
+.It
+$B%9%H%i%$%W2=$^$?$O(B RAID-5 $B$N%W%l%C%/%9$K99$K%5%V%G%#%9%/$rDI2C$9$k$K$O!"(B
+.Fl f
+($B6/@)(B) $B%*%W%7%g%s$r;HMQ$7$^$9!#%W%l%C%/%9Fb$N%G!<%?$rGK2u$7$^$9!#(B
+.\" $B%9%H%i%$%W2=$*$h$S(B RAID-5 $B$N%W%l%C%/%9$KBP$7$F$O!"(B
+.\" $BJL$N%5%V%G%#%9%/$r7k9g$9$k$3$H$O!"8=:_5v$5$l$F$$$^$;$s!#(B
 .It
 $B%3%s%+%A%M!<%H2=%W%l%C%/%9$KBP$7$F$O!"(B
 .Ar offset
@@ -391,6 +443,49 @@
 3 $BHVL\$O(B 512k $B$K!"$J$I$H$J$j$^$9!#(B
 $B$3$N7W;;$G$O!"(BRAID-5 $B%W%l%C%/%9$N%Q%j%F%#%V%m%C%/$OL5;k$5$l$^$9!#(B
 .El
+.It Nm concat
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.br
+.Nm concat
+$B%3%^%s%I$O!"C10l$N%3%s%+%A%M!<%H2=%W%l%C%/%9$+$i$J$k%\%j%e!<%`$r:n@.$9$k(B
+.Nm create
+$B%3%^%s%I$N!"C1=c$JBeBX<jCJ$G$9!#(B
+$B3F%I%i%$%VCf$N:GBg$NO"B36u4V$,!"(B
+$B%W%l%C%/%9$N%5%V%G%#%9%/:n@.$N$?$a$K;HMQ$5$l$^$9!#(B
+.Pp
+$BDL>o!"(B
+.Nm concat
+$B%3%^%s%I$OG$0U$NL>A0$r%\%j%e!<%`$H9=@.MWAG$KIU$1$^$9!#(B
+$BL>A0$O%F%-%9%H(B
+.Ar vinum
+$B$*$h$S>.$5$J@0?t$+$i$J$j!"Nc$($P(B
+.Ar vinum3
+$B$H$J$j$^$9!#(B
+$B%\%j%e!<%`$KBP$7$F;XDj$7$?L>A0$r3d$jEv$F$k(B
+.Fl n Ar name
+$B%*%W%7%g%s$G!">e=q$-$9$k$3$H$,2DG=$G$9!#(B
+$B%W%l%C%/%9$H%5%V%G%#%9%/$NL>A0$O!"DL>o$N:nK!$G!"%\%j%e!<%`L>$+$i$H$i$l$^$9!#(B
+.Pp
+$B%I%i%$%V$NL>A0$K$OA*Br$NM>CO$O$"$j$^$;$s!#(B
+$B%I%i%$%V$,4{$K(B
+.Nm
+$B%I%i%$%V$H$7$F=i4|2=$5$l$F$$$?>l9g!"L>A0$O$=$N$^$^$K$J$j$^$9!#(B
+$B$=$&$G$J$$>l9g!"%I%i%$%V$K$O%F%-%9%H(B
+.Ar vinumdrive
+$B$H>.$5$J@0?t$+$i;O$^$kL>A0$,M?$($i$l!"Nc$($P(B
+.Ar vinumdrive7
+$B$H$J$j$^$9!#(B
+.Nm create
+$B%3%^%s%I$HF1MM!"(B
+.Fl f
+$B%*%W%7%g%s$r;HMQ$7$F!"0JA0$NL>A0$N>e=q$-$r;XDj2DG=$G$9!#(B
+.Fl v
+$B%*%W%7%g%s$O!">iD9$J=PNO$N$?$a$K;HMQ$7$^$9!#(B
+.Pp
+$B$3$N%3%^%s%I$NNc$O!"8e=R$N!VC1=c$J@_Dj!W$N@a$r;2>H$7$F$/$@$5$$!#(B
 .It Nm create Op Fl f Ar description-file
 .sp
 .Nm
@@ -546,16 +641,16 @@
 
 Time             Event       Buf        Dev     Offset          Bytes   SD      SDoff   Doffset Goffset
 
-14:40:00.637758 1VS Write 0xf2361f40    0x5b03  0x10            16384
-14:40:00.639280 2LR Write 0xf2361f40    0x5b03  0x10            16384
-14:40:00.639294 3RQ Read  0xf2361f40    0x427   0x104109        8192    19      0       0       0
-14:40:00.639455 3RQ Read  0xf2361f40    0x417   0xd2109         8192    17      0       0       0
-14:40:00.639529 3RQ Read  0xf2361f40    0x40f   0x6e109         8192    16      0       0       0
-14:40:00.652978 4DN Read  0xf2361f40    0x427   0x104109        8192    19      0       0       0
-14:40:00.667040 4DN Read  0xf2361f40    0x40f   0x6e109         8192    16      0       0       0
-14:40:00.668556 4DN Read  0xf2361f40    0x417   0xd2109         8192    17      0       0       0
-14:40:00.669777 6RP Write 0xf2361f40    0x427   0x104109        8192    19      0       0       0
-14:40:00.685547 4DN Write 0xf2361f40    0x427   0x104109        8192    19      0       0       0
+14:40:00.637758 1VS Write 0xf2361f40    91.3  0x10            16384
+14:40:00.639280 2LR Write 0xf2361f40    91.3  0x10            16384
+14:40:00.639294 3RQ Read  0xf2361f40    4.39   0x104109        8192    19      0       0       0
+14:40:00.639455 3RQ Read  0xf2361f40    4.23   0xd2109         8192    17      0       0       0
+14:40:00.639529 3RQ Read  0xf2361f40    4.15   0x6e109         8192    16      0       0       0
+14:40:00.652978 4DN Read  0xf2361f40    4.39   0x104109        8192    19      0       0       0
+14:40:00.667040 4DN Read  0xf2361f40    4.15   0x6e109         8192    16      0       0       0
+14:40:00.668556 4DN Read  0xf2361f40    4.23   0xd2109         8192    17      0       0       0
+14:40:00.669777 6RP Write 0xf2361f40    4.39   0x104109        8192    19      0       0       0
+14:40:00.685547 4DN Write 0xf2361f40    4.39   0x104109        8192    19      0       0       0
 .Ed
 .Pp
 .Ar Buf
@@ -765,12 +860,63 @@
 $BK\%3%^%s%I$O!"DL>o$N>l9g$K;HMQ$5$l$k$3$H$r0U?^$7$F$$$^$;$s!#(B
 $BHs>o;~$K$N$_;HMQ$9$k$?$a$KDs6!$7$F$$$^$9!#(B
 .Pp
-.It Nm quit
-$BBPOC%b!<%I$G<B9TCf$N$H$-$K!"(B
-.Nm
-$B%W%m%0%i%`$r=*N;$7$^$9!#DL>o$O!"J8;z(B
-.Ar EOF
-$B$rF~NO$9$k$3$H$G<B8=$G$-$^$9!#(B
+.It Nm mirror
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl s
+.Op Fl v
+.Ar drives
+.br
+.Nm mirror
+$B%3%^%s%I$O!"%_%i!<2=%\%j%e!<%`$r:n@.$9$k(B
+.Nm create
+$B%3%^%s%I$N!"C1=c$JBeBX<jCJ$G$9!#(B
+$B%*%W%7%g%s$r;XDj$7$J$$$H!"(BRAID-1 ($B%_%i!<2=(B) $B%\%j%e!<%`$r!"(B
+2 $B$D$N%3%s%+%A%M!<%H2=%\%j%e!<%`$G:n@.$7$^$9!#(B
+$B3F%I%i%$%VCf$N:GBg$NO"B36u4V$,!"(B
+$B%W%l%C%/%9$N%5%V%G%#%9%/:n@.$N$?$a$K;HMQ$5$l$^$9!#(B
+1 $BHVL\$N%W%l%C%/%9$O!"%j%9%H$N4q?tHV9f$N%I%i%$%V$+$i9=C[$5$l!"(B
+2 $BHVL\$N%W%l%C%/%9$O!"%j%9%H$N6v?tHV9f$N%I%i%$%V$+$i9=C[$5$l$^$9!#(B
+$B%I%i%$%V$NBg$-$5$,0[$J$k>l9g!"%W%l%C%/%9$NBg$-$5$O0[$J$k$G$7$g$&!#(B
+.Pp
+.Fl s
+$B%*%W%7%g%s$r;XDj$9$k$H!"(B
+.Nm mirror
+$B$O%9%H%i%$%W$NBg$-$5$,(B 256 kB $B$N%9%H%i%$%W2=%W%l%C%/%9$r9=C[$7$^$9!#(B
+$B3F%W%l%C%/%9$N%5%V%G%#%9%/$NBg$-$5$O!"(B
+$B%W%l%C%/%9$r9=@.$9$k%I%i%$%V$NCf$G!":G>.$NO"B3%9%H%l!<%8$NBg$-$5$G$9!#(B
+$B$3$3$G$b$^$?!"%W%l%C%/%9$NBg$-$5$O0[$J$k$+$b$7$l$^$;$s!#(B
+.Pp
+$BDL>o!"(B
+.Nm mirror
+$B%3%^%s%I$OG$0U$NL>A0$r%\%j%e!<%`$H9=@.MWAG$KIU$1$^$9!#(B
+$BL>A0$O%F%-%9%H(B
+.Ar vinum
+$B$*$h$S>.$5$J@0?t$+$i$J$j!"Nc$($P(B
+.Ar vinum3
+$B$H$J$j$^$9!#(B
+$B%\%j%e!<%`$KBP$7$F;XDj$7$?L>A0$r3d$jEv$F$k(B
+.Fl n Ar name
+$B%*%W%7%g%s$G!">e=q$-$9$k$3$H$,2DG=$G$9!#(B
+$B%W%l%C%/%9$H%5%V%G%#%9%/$NL>A0$O!"DL>o$N:nK!$G!"%\%j%e!<%`L>$+$i$H$i$l$^$9!#(B
+.Pp
+$B%I%i%$%V$NL>A0$K$OA*Br$NM>CO$O$"$j$^$;$s!#(B
+$B%I%i%$%V$,4{$K(B
+.Nm
+$B%I%i%$%V$H$7$F=i4|2=$5$l$F$$$?>l9g!"L>A0$O$=$N$^$^$K$J$j$^$9!#(B
+$B$=$&$G$J$$>l9g!"%I%i%$%V$K$O%F%-%9%H(B
+.Ar vinumdrive
+$B$H>.$5$J@0?t$+$i;O$^$kL>A0$,M?$($i$l!"Nc$($P(B
+.Ar vinumdrive7
+$B$H$J$j$^$9!#(B
+.Nm create
+$B%3%^%s%I$HF1MM!"(B
+.Fl f
+$B%*%W%7%g%s$r;HMQ$7$F!"0JA0$NL>A0$N>e=q$-$r;XDj2DG=$G$9!#(B
+.Fl v
+$B%*%W%7%g%s$O!">iD9$J=PNO$N$?$a$K;HMQ$7$^$9!#(B
+.Pp
+$B$3$N%3%^%s%I$NNc$O!"8e=R$N!VC1=c$J@_Dj!W$N@a$r;2>H$7$F$/$@$5$$!#(B
 .It Nm printconfig Op Pa file
 $B8=:_$N@_Dj$N%3%T!<$r!"(B
 .Nm
@@ -784,6 +930,12 @@
 $B$O0lMw$r(B
 .Pa stdout
 $B$X=q$-9~$_$^$9!#(B
+.It Nm quit
+$BBPOC%b!<%I$G<B9TCf$N$H$-$K!"(B
+.Nm
+$B%W%m%0%i%`$r=*N;$7$^$9!#DL>o$O!"J8;z(B
+.Ar EOF
+$B$rF~NO$9$k$3$H$G<B8=$G$-$^$9!#(B
 .It Nm read
 .Ar disk Op disk...
 .Pp
@@ -959,6 +1111,15 @@
 $B8=:_!"%S%C%H%^%9%/$K$O%S%C%H(B 1 ($BA4%"%/%7%g%s$r(B syslog $B$X5-O?$9$k(B) $B$H(B
 $B%S%C%H(B 4 ($B@_Dj$r99?7$7$J$$(B) $B$,$"$j$^$9!#(B
 $B%*%W%7%g%s%S%C%H(B 4 $B$O%(%i!<2sI|;~$KM-MQ$+$b$7$l$^$;$s!#(B
+.It Nm setstate
+.Ar state
+.Op Ar volume | plex | subdisk | drive
+.Pp
+.Nm setstate
+$B;XDj$7$?%*%V%8%'%/%H$N>uBV$r;XDj$7$?>uBV$K@_Dj$7$^$9!#(B
+.Nm
+$B$NDL>o$N0l4S@-5!9=$O%P%$%Q%9$5$l$^$9!#2sI|$NL\E*$G$N$_;HMQ$9$Y$-$G$9!#(B
+$B$3$N%3%^%s%I$r8m$C$F;HMQ$9$k$H!"%7%9%F%`$rGK2u$9$k2DG=@-$,$"$j$^$9!#(B
 .It Nm start
 .Op volume | plex | subdisk
 .Pp
@@ -1116,7 +1277,170 @@
 $B$K$3$N3NG'$r>JN,$7$FL5>r7o$K:o=|$9$k$h$&;X<($7$^$9!#$3$N%*%W%7%g%s$O(B
 $BBg$$$KCm0U$7!"$h$/M}2r$7$?>e$G;H$C$F2<$5$$!#$b$74V0c$C$F;H$&$H$R$I$$(B
 $B%G!<%?GK2u$r5/$3$9$3$H$,$"$j$^$9!#(B
+.It Nm stripe
+.Op Fl f
+.Op Fl n Ar name
+.Op Fl v
+.Ar drives
+.br
+.Nm stripe
+$B%3%^%s%I$O!"C10l$N%9%H%i%$%W2=%W%l%C%/%9$+$i$J$k%\%j%e!<%`$r:n@.$9$k(B
+.Nm create
+$B%3%^%s%I$N!"C1=c$JBeBX<jCJ$G$9!#(B
+$B%5%V%G%#%9%/$NBg$-$5$O!"(B
+$BA4%I%i%$%V$GMxMQ2DG=$J:GBg$NO"B36u4V$NBg$-$5$G$9!#(B
+$B%9%H%i%$%W$NBg$-$5$O(B 256 kB $B$K8GDj$5$l$F$$$^$9!#(B
+.Pp
+$BDL>o!"(B
+.Nm stripe
+$B%3%^%s%I$OG$0U$NL>A0$r%\%j%e!<%`$H9=@.MWAG$KIU$1$^$9!#(B
+$BL>A0$O%F%-%9%H(B
+.Ar vinum
+$B$*$h$S>.$5$J@0?t$+$i$J$j!"Nc$($P(B
+.Ar vinum3
+$B$H$J$j$^$9!#(B
+$B%\%j%e!<%`$KBP$7$F;XDj$7$?L>A0$r3d$jEv$F$k(B
+.Fl n Ar name
+$B%*%W%7%g%s$G!">e=q$-$9$k$3$H$,2DG=$G$9!#(B
+$B%W%l%C%/%9$H%5%V%G%#%9%/$NL>A0$O!"DL>o$N:nK!$G!"%\%j%e!<%`L>$+$i$H$i$l$^$9!#(B
+.Pp
+$B%I%i%$%V$NL>A0$K$OA*Br$NM>CO$O$"$j$^$;$s!#(B
+$B%I%i%$%V$,4{$K(B
+.Nm
+$B%I%i%$%V$H$7$F=i4|2=$5$l$F$$$?>l9g!"L>A0$O$=$N$^$^$K$J$j$^$9!#(B
+$B$=$&$G$J$$>l9g!"%I%i%$%V$K$O%F%-%9%H(B
+.Ar vinumdrive
+$B$H>.$5$J@0?t$+$i;O$^$kL>A0$,M?$($i$l!"Nc$($P(B
+.Ar vinumdrive7
+$B$H$J$j$^$9!#(B
+.Nm create
+$B%3%^%s%I$HF1MM!"(B
+.Fl f
+$B%*%W%7%g%s$r;HMQ$7$F!"0JA0$NL>A0$N>e=q$-$r;XDj2DG=$G$9!#(B
+.Fl v
+$B%*%W%7%g%s$O!">iD9$J=PNO$N$?$a$K;HMQ$7$^$9!#(B
+.Pp
+$B$3$N%3%^%s%I$NNc$O!"8e=R$N!VC1=c$J@_Dj!W$N@a$r;2>H$7$F$/$@$5$$!#(B
 .El
+.Sh $BC1=c$J@_Dj(B
+$B$3$N@a$G$O!"(B
+.Nm concat ,
+.Nm mirror ,
+.Nm stripe
+$B%3%^%s%I$r;HMQ$9$k!"(B
+.Nm
+$B@_Dj$NC1=c$J%$%s%?%U%'!<%9$r@bL@$7$^$9!#(B
+$B$3$l$i$N%3%^%s%I$O!"Bg35$NDL>o>u67$G$OJXMx$J@_Dj$r:n@.$7$^$9$,!"(B
+.Nm create
+$B%3%^%s%IDx$N=@Fp@-$O$"$j$^$;$s!#(B
+.Pp
+$B%3%^%s%I$N2r@b$OA0=R$r;2>H$7$F$/$@$5$$!#(B
+$B$3$3$G$ONc$r<($7$^$9!#$I$l$bF1$8%G%#%9%/$r;HMQ$7$F$$$^$9!#(B
+$B:G=i$N%I%i%$%V(B
+.Pa /dev/da1h
+$B$OB>$N%I%i%$%V$h$j$b>.$5$$$3$H$KCm0U$7$F$/$@$5$$!#(B
+$B3F%5%V%G%#%9%/$NBg$-$5$K1F6A$,$"$j$^$9!#(B
+.Pp
+$B<!$K<($9Nc$G$O$9$Y$F(B
+.Fl v
+$B%*%W%7%g%s$r;HMQ$9$k$3$H$K$h$j!"%7%9%F%`$KEO$9%3%^%s%I$r8+$;!"(B
+$B%\%j%e!<%`$N9=B$$rNs5s$7$^$9!#(B
+.Fl v
+$B%*%W%7%g%s$r;HMQ$7$J$$$H!"$3$l$i$N%3%^%s%I$O2?$b=PNO$7$^$;$s!#(B
+.Ss $BC10l%3%s%+%A%M!<%H2=%W%l%C%/%9$N%\%j%e!<%`(B
+$BC10l%3%s%+%A%M!<%H2=%W%l%C%/%9$N%\%j%e!<%`$r;HMQ$7!"(B
+$B:GBg$N%9%H%l!<%8MFNL$rF@$^$9!#(B
+$B$?$@$7!"%I%i%$%V8N>c$X$NBQ@-$O$"$j$^$;$s!#(B
+.Bd -literal
+vinum ->  concat -v /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+volume vinum0
+  plex name vinum0.p0 org concat
+drive vinumdrive0 device /dev/da1h
+    sd name vinum0.p0.s0 drive vinumdrive0 size 0
+drive vinumdrive1 device /dev/da2h
+    sd name vinum0.p0.s1 drive vinumdrive1 size 0
+drive vinumdrive2 device /dev/da3h
+    sd name vinum0.p0.s2 drive vinumdrive2 size 0
+drive vinumdrive3 device /dev/da4h
+    sd name vinum0.p0.s3 drive vinumdrive3 size 0
+V vinum0                State: up       Plexes:       1 Size:       2134 MB
+P vinum0.p0           C State: up       Subdisks:     4 Size:       2134 MB
+S vinum0.p0.s0          State: up       PO:        0  B Size:        414 MB
+S vinum0.p0.s1          State: up       PO:      414 MB Size:        573 MB
+S vinum0.p0.s2          State: up       PO:      988 MB Size:        573 MB
+S vinum0.p0.s3          State: up       PO:     1561 MB Size:        573 MB
+.Ed
+.Pp
+$B$3$N>l9g!"(B4 $B%G%#%9%/$9$Y$F$N6u4V$r;HMQ$7!"(B
+$B%\%j%e!<%`$NBg$-$5$O(B 2134 MB $B$K$J$j$^$9!#(B
+.Ss $BC10l%9%H%i%$%W2=%W%l%C%/%9$N%\%j%e!<%`(B
+$BC10l%9%H%i%$%W2=%W%l%C%/%9$N%\%j%e!<%`$O(B
+$B%3%s%+%A%M!<%H2=%W%l%C%/%9$h$j$b@-G=$,NI$$$+$b$7$l$^$;$s!#(B
+$B$7$+$7!"%9%H%i%$%W2=%W%l%C%/%9$N@)Ls$K$h$j!"(B
+$B%\%j%e!<%`$O>.$5$$$+$b$7$l$^$;$s!#(B
+$B$3$l$b$^$?%I%i%$%V8N>c$NBQ@-$O$"$j$^$;$s!#(B
+.Bd -literal
+vinum -> stripe -v /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+drive vinumdrive0 device /dev/da1h
+drive vinumdrive1 device /dev/da2h
+drive vinumdrive2 device /dev/da3h
+drive vinumdrive3 device /dev/da4h
+volume vinum0
+  plex name vinum0.p0 org striped 256k
+    sd name vinum0.p0.s0 drive vinumdrive0 size 849825b
+    sd name vinum0.p0.s1 drive vinumdrive1 size 849825b
+    sd name vinum0.p0.s2 drive vinumdrive2 size 849825b
+    sd name vinum0.p0.s3 drive vinumdrive3 size 849825b
+V vinum0                State: up       Plexes:       1 Size:       1659 MB
+P vinum0.p0           S State: up       Subdisks:     4 Size:       1659 MB
+S vinum0.p0.s0          State: up       PO:        0  B Size:        414 MB
+S vinum0.p0.s1          State: up       PO:      256 kB Size:        414 MB
+S vinum0.p0.s2          State: up       PO:      512 kB Size:        414 MB
+S vinum0.p0.s3          State: up       PO:      768 kB Size:        414 MB
+.Ed
+.Pp
+$B$3$N>l9g!"%5%V%G%#%9%/$NBg$-$5$OMxMQ$G$-$k%G%#%9%/$N:G>.$K@)8B$5$l!"(B
+$B%\%j%e!<%`$NBg$-$5$O(B 1659 MB $B$K$J$j$^$9!#(B
+.Ss 2 $B$D$N%3%s%+%A%M!<%H2=%W%l%C%/%9$N%_%i!<2=%\%j%e!<%`(B
+$B?.Mj@-$r8~>e$9$k$?$a!"%_%i!<2=$*$h$S%\%j%e!<%`2=$r;HMQ$7$^$9(B:
+$B$3$NNc$G$O%\%j%e!<%`L>$r(B
+.Ar mirror
+$B$H;XDj$7$F$$$^$9!#(B
+1 $B$D$N%I%i%$%V$NBg$-$5$,B>$N%I%i%$%V$h$j$b>.$5$$$?$a!"(B
+2 $B$D$N%W%l%C%/%9$NBg$-$5$O0[$J$j!"(B
+$B%\%j%e!<%`$N:G8e$N(B 158 MB $B$K$OBQ@-$,$"$j$^$;$s!#(B
+$B$3$N$h$&$J>u67$G40A4$J?.Mj@-$rJ]>Z$9$k$?$a$K$O!"(B
+.Nm create
+$B%3%^%s%I$r;HMQ$7$F(B 988 MB $B$N%\%j%e!<%`$r:n@.$7$^$9!#(B
+.Ss 2 $B$D$N%9%H%i%$%W2=%W%l%C%/%9$N%_%i!<2=%\%j%e!<%`(B
+$B:#EY$O!"(B2 $B$D$N%9%H%i%$%W2=%W%l%C%/%9$N%_%i!<2=%\%j%e!<%`$r:n@.$9$k$?$a$K(B
+.Fl s
+$B%*%W%7%g%s$r;HMQ$7$^$9(B:
+.Bd -literal
+vinum -> mirror -v -n raid10 -s /dev/da1h /dev/da2h /dev/da3h /dev/da4h
+drive vinumdrive0 device /dev/da1h
+drive vinumdrive1 device /dev/da2h
+drive vinumdrive2 device /dev/da3h
+drive vinumdrive3 device /dev/da4h
+volume raid10 setupstate
+  plex name raid10.p0 org striped 256k
+    sd name raid10.p0.s0 drive vinumdrive0 size 849825b
+    sd name raid10.p0.s1 drive vinumdrive2 size 849825b
+  plex name raid10.p1 org striped 256k
+    sd name raid10.p1.s0 drive vinumdrive1 size 1173665b
+    sd name raid10.p1.s1 drive vinumdrive3 size 1173665b
+V raid10                State: up       Plexes:       2 Size:       1146 MB
+P raid10.p0           S State: up       Subdisks:     2 Size:        829 MB
+P raid10.p1           S State: up       Subdisks:     2 Size:       1146 MB
+S raid10.p0.s0          State: up       PO:        0  B Size:        414 MB
+S raid10.p0.s1          State: up       PO:      256 kB Size:        414 MB
+S raid10.p1.s0          State: up       PO:        0  B Size:        573 MB
+S raid10.p1.s1          State: up       PO:      256 kB Size:        573 MB
+.Ed
+.Pp
+$B$3$N>l9g!";HMQ2DG=$J%\%j%e!<%`$O$h$j>.$5$/$J$j$^$9!#(B
+$B$J$<$J$i!":G>.$N%I%i%$%V$KE,9g$9$k$h$&$K!"(B
+$BBh(B 1 $B%W%l%C%/%9$,>.$5$/$J$C$?$?$a$G$9!#(B
 .Ss $B@_Dj%U%!%$%k(B
 .Nm
 $B$G$O!"(B
@@ -1140,9 +1464,10 @@
 $B@_Dj%U%!%$%k$K$O0J2<$N%(%s%H%j$r5-=R$9$k$3$H$,$G$-$^$9!#(B
 .Pp
 .Bl -hang -width 4n
-.It Nm drive Ar name option
+.It Nm drive Ar name devicename
+.Op options
 .Pp
-$B%I%i%$%V$rDj5A$7$^$9!#%*%W%7%g%s$O<!$N$h$&$K$J$C$F$$$kI,MW$,$"$j$^$9(B:
+$B%I%i%$%V$rDj5A$7$^$9!#%*%W%7%g%s$O<!$NDL$j$G$9(B:
 .Pp
 .Bl -hang -width 18n
 .It Nm device Ar devicename
@@ -1151,22 +1476,24 @@
 $B$O!"Nc$($P(B
 .Pa /dev/da1e
 $B$d(B
-.Pa /dev/wd3h
-$B$H$$$C$?%G%#%9%/8_49%Q!<%F%#%7%g%s$G$"$kI,MW$,$"$j!"%?%$%W(B
+.Pa /dev/wd3s2h
+$B$H$$$C$?%Q!<%F%#%7%g%s$G$"$kI,MW$,$"$j!"%?%$%W(B
 .Nm vinum
 $B$G$"$kI,MW$,$"$j$^$9!#(B
 .Nm c
 $B%Q!<%F%#%7%g%s$r;HMQ$7$F$O$J$j$^$;$s!#(B
-$B$3$l$O%G%#%9%/A4BN$N$?$a$KM=Ls$5$l$F$*$j!"%?%$%W(B
-.Nm unused
-$B$G$"$k$Y$-$@$+$i$G$9!#(B
-$B8=:_!"(B
-$BNc$($P(B
-.Pa /dev/da0s1
-$B$d(B
-.Pa /dev/da0s1e
-$B$H$$$C$?B>$N%G%#%9%/%G%P%$%9>e$K%I%i%$%V$r:n@.2DG=$G$9$,!"(B
-$B$3$l$i$N%I%i%$%V$O%j%V!<%H8e$K5/F0$G$-$^$;$s!#(B
+$B$3$l$O%G%#%9%/A4BN$N$?$a$KM=Ls$5$l$F$$$k$+$i$G$9!#(B
+.It Nm hotspare
+$B%I%i%$%V$r(B
+.Do
+$B%[%C%H%9%Z%"(B
+.Dc
+$B%I%i%$%V$G$"$k$HDj5A$7$^$9!#(B
+$B$3$l$O!"8N>c$7$?%I%i%$%V$H<+F0E*$K8r49$9$k$?$a$K4IM}$5$l$^$9!#(B
+.Nm
+$B$O$3$N%I%i%$%V$rB>$NMQES$K;HMQ$9$k$3$H$r5v$7$^$;$s!#(B
+$BFC$K!"%5%V%G%#%9%/$r$3$N>e$K:n@.$G$-$^$;$s!#(B
+$B$3$N5!G=$O$^$@40A4$K$O<BAu$5$l$F$$$^$;$s!#(B
 .El
 .It Nm volume
 .Ar name
@@ -1398,19 +1725,9 @@
 $B8=:_!"(B
 .Nm
 $B%I%i%$%V$O(B BSD $B%G%#%9%/%Q!<%F%#%7%g%s$G$9!#$=$l$O(B
-$B%U%!%$%k%7%9%F%`$N>e=q$-$rHr$1$k$?$a$K(B
+$BB>$NMQES$G;HMQ$5$l$F$$$k%G!<%?$N>e=q$-$rHr$1$k$?$a$K(B
 .Ar vinum
 $B%?%$%W$G$"$kI,MW$,$"$j$^$9!#(B
-$B8_49@-$N$?$a$K!"8=:_$N(B
-.Nm
-$B$O%Q!<%F%#%7%g%s%?%$%W(B
-.Ar unused
-$B$r<u$1IU$1$^$9$,!"<!$N%j%j!<%9$G$O$3$N<oN`$N%Q!<%F%#%7%g%s$O5v$7$^$;$s!#(B
-$B%?%$%W(B
-.Ar unused
-$B$G$"$k%Q!<%F%#%7%g%s$+$i@_Dj$rFI$_=P$9$H!"(B
-.Nm
-$B$O7Y9p%a%C%;!<%8$rI=<($7$^$9!#(B
 .Nm disklabel
 .Ar -e
 $B$r;HMQ$7$F!"%Q!<%F%#%7%g%s%?%$%WDj5A$rJT=8$7$F$/$@$5$$!#(B
@@ -1453,7 +1770,7 @@
 .Nm
 $B$O%m%0%U%!%$%k$r4IM}$7$^$9!#(B
 $B%m%0%U%!%$%k$O!"%G%U%)%k%H$G$O(B
-.Pa /var/tmp/vinum.history
+.Pa /var/tmp/vinum_history
 $B$G$"$j!"(B
 .Nm vinum
 $B$KBP$7$FH/9T$7$?%3%^%s%I$NMzNr$rJ];}$7$^$9!#(B
@@ -1481,11 +1798,11 @@
 $B@lMQ$N%G%#%9%/%Q!<%F%#%7%g%s$,I,MW$G$9!#(B
 $B$3$l$i$O!"%G%P%$%9$d%Q!<%F%#%7%g%s(B
 .Nm c
-$B$d%9%i%$%9$G$O$J$/!"8_49%Q!<%F%#%7%g%s$G$"$k$Y$-$G$G$9!#(B
+$B$G$O$J$/!"%Q!<%F%#%7%g%s$G$"$k$Y$-$G$G$9!#(B
 $BNc$($P!"E,@Z$JL>A0$H$O!"(B
 .Pa /dev/da0e
 $B$d(B
-.Pa /dev/wd3a
+.Pa /dev/wd3s4a
 $B$G$9!#(B
 $BITE,@Z$JL>A0$H$O!"%Q!<%F%#%7%g%s$G$O$J$/%G%P%$%9$rI=8=$9$k(B
 .Pa /dev/da0 ,
@@ -1494,14 +1811,8 @@
 .Nm unused
 $B$G$"$k$Y$-(B
 .Pa /dev/wd1c
-$B$d!"8_49%Q!<%F%#%7%g%s$G$O$J$$(B
-.Pa /dev/da3s0e
 $B$G$9!#(B
-.Nm
-$B$O8=:_$3$l$i$NL>A0$N%I%i%$%V$N:n@.$r5v$7$^$9$,!"(B
-.Nm start
-$B%3%^%s%I$O$3$N$h$&$J%I%i%$%V$rH/8+$7$^$;$s!#(B
-$BA0=R$7$?!"%I%i%$%V%l%$%"%&%H>e$N9MN8E@$K$"$k;HMQNc$r;2>H$7$F$/$@$5$$!#(B
+$BA0=R$N!"!V%I%i%$%V%l%$%"%&%H>e$N9M;!E@!W2<$K$"$k;HMQNc$r;2>H$7$F$/$@$5$$!#(B
 .Ss $B%\%j%e!<%`$N%G%6%$%s(B
 .Nm
 $B%\%j%e!<%`$N@_DjJ}K!$O!"$"$J$?$N0U?^$K0MB8$7$^$9!#(B
@@ -2057,8 +2368,10 @@
 .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
-``wrong partition type'' $B$H$$$&%(%i!<%a%C%;!<%8$rJV$7$^$9!#(B
-$B%Q!<%F%#%7%g%s%?%$%W$O!"8=:_$N$H$3$m!"(B``unused'' $B$G$"$kI,MW$,$"$j$^$9!#(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
 .It
 $BJ#?t$N%W%l%C%/%9$+$i$J$k%\%j%e!<%`:n@.;~$K!"(B
 .Nm
@@ -2225,7 +2538,7 @@
 .Xr strftime 3 ,
 .Xr vinum 4 ,
 .Xr disklabel 8 ,
-.Xr newfs 8
+.Xr newfs 8 ,
 .Pa http://www.lemis.com/vinum.html ,
 .Pa http://www.lemis.com/vinum-debugging.html .
 .Sh $B:n<T(B
@@ -2235,3 +2548,9 @@
 $B%3%^%s%I$O(B
 .Fx 3.0
 $B$+$iEP>l$7$^$7$?!#(B
+.Nm
+$B$N(B RAID-5 $B%3%s%]!<%M%s%H$O!"(B
+NetMAX $B@=IJ$N$?$a$K(B
+Cybernet Inc. 
+.Pa www.cybernet.com
+$B$,3+H/$7$^$7$?!#(B
diff -ur man/man8/xntpd.8 man/man8/xntpd.8
--- man/man8/xntpd.8	Tue Jan 12 23:25:48 1999
+++ man/man8/xntpd.8	Sat Aug 28 21:47:35 1999
@@ -1,5 +1,5 @@
 .\"
-.\"	%Id: xntpd.8,v 1.5 1998/02/19 08:05:43 charnier Exp %
+.\"	%Id: xntpd.8,v 1.5.2.1 1999/08/18 07:41:16 chris Exp %
 .\"
 .Dd December 21, 1993
 .Dt XNTPD 8
@@ -233,7 +233,7 @@
 $B%U%!%$%k$K$O!"(B
 100 $BK|J,$N(B 1 (ppm) $BC10L$G$N%*%U%;%C%HCM$rI=$9IbF0>.?tE@?t$,(B 1 $B$D4^$^$l$^$9!#(B
 $B$3$N%U%!%$%k$,!":G=i$K%+%l%s%HJQF0CM$r0l;~%U%!%$%k$K=q9~$_!"(B
-.Xr rename 3
+.Xr rename 2
 $B$K$h$j8E$$%U%!%$%k$HCV49$($k$3$H$G99?7$5$l$k$3$H$KCm0U$7$F2<$5$$!#$3$l$O!"(B
 .Nm
 $B$,!"%I%j%U%H%U%!%$%k$N$"$k%G%#%l%/%H%j$KBP$7=q$-9~$_8"$r;}$C$F$$$kI,MW$,$"$j!"(B
diff -ur man/man8/yp_mkdb.8 man/man8/yp_mkdb.8
--- man/man8/yp_mkdb.8	Sat Sep 26 15:20:21 1998
+++ man/man8/yp_mkdb.8	Sat Aug 28 21:47:36 1999
@@ -28,7 +28,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: yp_mkdb.8,v 1.8 1998/03/23 08:30:19 charnier Exp %
+.\"	%Id: yp_mkdb.8,v 1.8.2.1 1999/08/22 15:37:19 wpaul Exp %
+.\"
 .\" jpman %Id: yp_mkdb.8,v 1.3 1997/05/19 17:09:21 horikawa Stab %
 .\"
 .Dd March 12, 1996
@@ -46,6 +47,7 @@
 .Op Fl c
 .Op Fl b
 .Op Fl s
+.Op Fl f
 .Op Fl i Ar inputfile
 .Op Fl o Ar outputfile
 .Op Fl d Ar domainname
@@ -139,6 +141,20 @@
 $B$3$l$O<g$K!"FC8"%"%/%;%9$N$_$K@)8B$7$J$1$l$P$J$i$J$$(B
 .Em master.passwd
 $B%^%C%W$N$?$a$K;HMQ$7$^$9!#(B
+.It Fl f
+$B$3$N%U%i%0$r;HMQ$9$k$H!"(B
+$B%=!<%9%U%!%$%kF~NO$G(B ``+'' $B$^$?$O(B ``-'' $B$NJ8;z$G3+;O$9$k9T$r%U%#%k%?$7$^$9!#(B
+$B$3$l$i$NJ8;z$O!"(B
+.Pa group ,
+.Pa passwd ,
+.Pa master.passwd
+$B$N%^%C%W$GFC<l$J0UL#$r;}$D$?$a!"(B
+$B$3$l$i$N%^%C%W$N%-!<$^$?$O%G!<%?$N:G=i$NJ8;z$H$7$FEP>l$7$F$O$J$j$^$;$s!#(B
+.Fl f
+$B%U%i%0$r;HMQ$9$k$H!"(B
+``+'' $B$^$?$O(B ``-'' $B$NJ8;z$G3+;O$9$k%=!<%99T$r(B
+.Nm
+$B$O5qH]$7!"<N$F$?9T$rI=<($9$k7Y9p%a%C%;!<%8$rH/9T$7$^$9!#(B
 .It Fl u Ar dbname
 NIS $B%G!<%?%Y!<%9$r%@%s%W$7$^$9(B('$B$[$I$-(B'$B$^$9(B)$B!#(B
 $B4{$KB8:_$9$k(B NIS $B%G!<%?%Y!<%9$NFbMF$r8!::$9$k$?$a$K;HMQ2DG=$G$9!#(B
diff -ur man/man8/zic.8 man/man8/zic.8
--- man/man8/zic.8	Sat Jul 31 20:16:11 1999
+++ man/man8/zic.8	Sat Aug 28 21:47:37 1999
@@ -1,4 +1,4 @@
-.\" Original Revision: 1.7
+.\" Original Revision: 1.7.2.1
 .\" jpman %Id: zic.8,v 1.2 1997/06/16 08:24:17 yugawa Stab %
 .Dd
 .Dt ZIC 8
@@ -53,7 +53,7 @@
 $B=PNO%U%!%$%k$K$O$&$k$&IC$N>pJs$O5-O?$5$l$^$;$s!#(B
 .It Fl v
 $B%G!<%?%U%!%$%kCf$NG/$,(B
-.Xr time 2
+.Xr time 3
 $B$GI=8=$G$-$kG/$NHO0O$rD6$($F$$$?>l9g!"7Y9p$7$^$9!#(B
 .It Fl s
 $B=PNO%U%!%$%k$K5-O?$5$l$k;~9o$NCM$r!"$=$l$,Id9fIU$-$H07$o$l$k$+Id9f$J$7$H(B

----Next_Part(Sat_Aug_28_23:03:34_1999_41)----
