From owner-man-jp-reviewer@jp.freebsd.org  Sun Aug 29 23:03:54 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id XAA02177;
	Sun, 29 Aug 1999 23:03:54 +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 XAA02172
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 29 Aug 1999 23:03:53 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (ppp875.yk.rim.or.jp [202.247.185.126])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id XAA24533
	for <man-jp-reviewer@jp.freebsd.org>; Sun, 29 Aug 1999 23:03:48 +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(Sun_Aug_29_22:38:21_1999_756)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990829230316K.k-horik@yk.rim.or.jp>
Date: Sun, 29 Aug 1999 23:03:16 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 1072
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 1539
Subject: [man-jp-reviewer 1539] diff to 3.2-19990827-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(Sun_Aug_29_22:38:21_1999_756)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

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

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

 apmd.8 $B$H(B pam_radius.8 $B$bF~$l$F$$$?$@$1$k$h$&!"$/$j$d$^$5$s$K$*4j$$$7(B
$B$F$"$j$^$9(B ($B8e$GDI2C$9$k$H$-$K%O%^$k$H$3$^$k$N$G(B)$B!#(B




----Next_Part(Sun_Aug_29_22:38:21_1999_756)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.2-19990827-STABLE Japanese
Content-Disposition: attachment; filename=diff_3.2-19990827-STABLE

diff -ur man/man1/chmod.1 man/man1/chmod.1
--- man/man1/chmod.1	Sun Aug 29 22:15:43 1999
+++ man/man1/chmod.1	Sun Aug 29 22:13:02 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	%Id: chmod.1,v 1.10.2.3 1999/08/14 06:28:00 chris Exp %
+.\"	%Id: chmod.1,v 1.10.2.4 1999/08/25 08:46:56 chris Exp %
 .\"
 .\" jpman %Id: chmod.1,v 1.2 1997/04/01 01:37:14 mutoh Stab %
 .Dd March 31, 1994
@@ -299,7 +299,6 @@
 .Sh $B4XO"9`L\(B
 .Xr chflags 1 ,
 .Xr install 1 ,
-.Xr mount 8 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
@@ -307,6 +306,7 @@
 .Xr setmode 3 ,
 .Xr symlink 7 ,
 .Xr chown 8 ,
+.Xr mount 8 ,
 .Xr sticky 8
 .Sh $B5,3J(B
 .Nm
diff -ur man/man1/df.1 man/man1/df.1
--- man/man1/df.1	Sat May  8 10:44:41 1999
+++ man/man1/df.1	Sun Aug 29 22:13:03 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\"	%Id: df.1,v 1.13.2.1 1999/05/02 12:06:53 kris Exp %
+.\"	%Id: df.1,v 1.13.2.2 1999/08/26 16:55:10 sheldonh Exp %
 .\"
 .\" jpman %Id: df.1,v 1.2 1997/04/07 05:31:08 mutoh Stab %
 .Dd May 8, 1995
@@ -109,12 +109,8 @@
 .Tn MFS
 $B0J30$NA4%U%!%$%k%7%9%F%`$rI=<($7$^$9!#(B
 $B%7%9%F%`>e$GMxMQ2DG=$J%U%!%$%k%7%9%F%`%?%$%W$O(B
-.Xr sysctl 8
-$B%3%^%s%I$r;HMQ$7$FD4$Y$i$l$^$9(B:
-.Bd -literal -offset indent
-sysctl vfs
-.Ed
-.El
+.Xr lsvfs 1
+$B%3%^%s%I$r;HMQ$7$FD4$Y$i$l$^$9!#(B
 .Sh $B4D6-JQ?t(B
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
@@ -133,6 +129,7 @@
 $B%*%W%7%g%s$O(B
 $BL58z$K$J$j$^$9!#(B
 .Sh $B4XO"9`L\(B
+.Xr lsvfs 1 ,
 .Xr quota 1 ,
 .Xr fstatfs 2 ,
 .Xr getfsstat 2 ,
@@ -140,8 +137,7 @@
 .Xr getmntinfo 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8 ,
-.Xr sysctl 8
+.Xr quot 8
 .Sh $BNr;K(B
 .Nm
 $B%f!<%F%#%j%F%#$O(B
Only in man: man1aout
diff -ur man/man5/rc.conf.5 man/man5/rc.conf.5
--- man/man5/rc.conf.5	Sun Aug 29 22:15:43 1999
+++ man/man5/rc.conf.5	Sun Aug 29 22:13:14 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.9 1999/08/23 23:25:00 brian Exp %
+.\"     %Id: rc.conf.5,v 1.27.2.10 1999/08/25 18:10:31 iwasaki Exp %
 .\"
 .\" jpman %Id: rc.conf.5,v 1.3 1998/06/26 09:39:58 jsakai Stab %
 .\"
@@ -89,6 +89,19 @@
 .Xr apm 8
 $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 apmd_enable
+($B%V!<%kCM(B)
+.Xr apmd 8
+$B$r<B9T$7!"%f!<%6%i%s%I$+$i(B APM $B%$%Y%s%H$r07$$$^$9!#(B
+APM $B%5%]!<%H$bM-8z$K$7$^$9!#(B
+.It Ar apmd_flags
+($BJ8;zNs(B)
+.Ar apmd_enable
+$B$,(B
+.Ar YES
+$B$N>l9g!"$3$l$i$O(B
+.Xr apmd 8
+$B%G!<%b%s$KEO$9%U%i%0$K$J$j$^$9!#(B
 .It Ar pccard_enable
 ($B%V!<%kCM(B)
 .Ar YES
diff -ur man/man8/Makefile man/man8/Makefile
--- man/man8/Makefile	Sun Aug 29 22:15:43 1999
+++ man/man8/Makefile	Sun Aug 29 22:25:43 1999
@@ -9,6 +9,7 @@
 	amq.8\
 	apm.8\
 	apmconf.8\
+	apmd.8\
 	arp.8\
 	atm.8\
 	atmarpd.8\
@@ -152,6 +153,7 @@
 	ntptrace.8\
 	pac.8\
 	pam.8\
+	pam_radius.8\
 	pccardc.8\
 	pccardd.8\
 	pciconf.8\
Only in man/man8: apmd.8
Only in man/man8: pam_radius.8
diff -ur man/man8/ppp.8 man/man8/ppp.8
--- man/man8/ppp.8	Sun Aug 29 22:15:44 1999
+++ man/man8/ppp.8	Sun Aug 29 22:13:28 1999
@@ -1,4 +1,4 @@
-.\" %Id: ppp.8,v 1.142.2.9 1999/08/23 21:59:46 brian Exp %
+.\" %Id: ppp.8,v 1.142.2.10 1999/08/25 21:40:21 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)
@@ -4932,11 +4932,22 @@
 .Xr traceroute 8 ,
 .Xr vipw 8
 .Sh $BNr;K(B
-$B85$N%W%m%0%i%`$O(B Toshiharu OHNO (tony-o@iij.ad.jp) $B$,:n@.$7!"(B
-FreeBSD-2.0.5 $B$K(B Atsushi Murai (amurai@spec.co.jp) $B$,Ds=P$7$^$7$?!#(B
+$B85$N%W%m%0%i%`$O(B
+.An Toshiharu OHNO Aq tony-o@iij.ad.jp
+$B$,:n@.$7!"(B
+.Fx 2.0.5
+$B$K(B
+.An Atsushi Murai Aq amurai@spec.co.jp
+$B$,Ds=P$7$^$7$?!#(B
 .Pp
-1997 $BG/Cf$K(B Brian Somers (brian@Awfulhak.org) $B$,K\3JE*$J=$@5$r$7!"(B
-11 $B7n$K(B OpenBSD $B$K0\?"$5$l$^$7$?(B (2.2-RELEASE $B$ND>8e$G$9(B)$B!#(B
+1997 $BG/Cf$K(B
+.An Brian Somers Aq brian@Awfulhak.org
+$B$,K\3JE*$J=$@5$r$7!"(B
+11 $B7n$K(B
+.Ox
+$B$K0\?"$5$l$^$7$?(B (2.2-RELEASE $B$ND>8e$G$9(B)$B!#(B
 .Pp
 1998 $BG/=iF,$K%^%k%A%j%s%/(B ppp $B%5%]!<%H$,DI2C$5$l$?$H$-$K!"(B
-$B$[$H$s$I$N%3!<%I$r(B Brian Somers $B$,=q$-D>$7$^$7$?!#(B
+$B$[$H$s$I$N%3!<%I$r(B
+.An Brian Somers
+$B$,=q$-D>$7$^$7$?!#(B
diff -ur man/man8/vinum.8 man/man8/vinum.8
--- man/man8/vinum.8	Sun Aug 29 22:15:44 1999
+++ man/man8/vinum.8	Sun Aug 29 22:13:31 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.8 1999/08/24 04:06:51 grog Exp %
+.\" %Id: vinum.8,v 1.5.2.9 1999/08/26 03:32:07 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)
@@ -264,6 +264,7 @@
 $BA4(B vinum $B%I%i%$%V$+$i@_Dj$rFI$_9~$_$^$9!#(B
 .in
 .Cd start
+.Op Fl w
 .Op volume | plex | subdisk
 .in +1i
 $B%7%9%F%`$,%*%V%8%'%/%H$X%"%/%;%9$G$-$k$h$&$K$7$^$9!#(B
@@ -364,14 +365,13 @@
 .if t (``verbose: $B>iD9(B'')
 .if n ("verbose: $B>iD9(B")
 $B%*%W%7%g%s$O!"(B
-$BG$0U$N%3%^%s%I$K$*$$$F!"$5$i$K>\:Y$J>pJs$rMW5a$9$k$?$a$K;HMQ$7$^$9!#(B
+$B$5$i$K>\:Y$J>pJs$rMW5a$9$k$?$a$K;HMQ$7$^$9!#(B
 .It Fl V
 The
 .Fl V
 .if t (``Very verbose: $B$H$F$b>iD9(B'')
 .if n ("Very verbose: $B$H$F$b>iD9(B")
 $B%*%W%7%g%s$O!"(B
-$BG$0U$N%3%^%s%I$K$*$$$F!"(B
 .Fl v
 $B%*%W%7%g%s$,Ds6!$9$k$b$N$h$j$b$5$i$K>\:Y$J>pJs$rMW5a$9$k$?$a$K;HMQ$7$^$9!#(B
 .It Fl w
@@ -651,6 +651,10 @@
 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
+11:11:14.975184 Lock      0xc2374210    2      0x1f8001
+11:11:15.018400 7VS Write 0xc2374210           0x7c0           32768   10
+11:11:15.018456 8LR Write 0xc2374210    13.39  0xcc0c9         32768
+11:11:15.046229 Unlock    0xc2374210    2      0x1f8001
 .Ed
 .Pp
 .Ar Buf
@@ -661,7 +665,11 @@
 $B$3$l$O0lHLE*$G$O$"$j$^$;$s!#(B
 $B%j%/%(%9%H$N@hF,$O!"%$%Y%s%H(B
 .Ar 1VS
+$B$^$?$O(B
+.Ar 7VS
 $B$G<1JL2DG=$G$9!#(B
+$BA0=R$N(B 1 $BHVL\$NNc$O!"%f!<%6MW5a$K4XO"$9$k%j%/%(%9%H$r<($7$F$$$^$9!#(B
+2 $BHVL\$O!"%m%C%/$rH<$&%5%V%G%#%9%/(B I/O $B%j%/%(%9%H$G$9!#(B
 $BA05-$NNc$G$O!"J#?t$N%j%/%(%9%H$,C10l$N%f!<%6%j%/%(%9%H$K4^$^$l$F$$$^$9!#(B
 .Pp
 .Ar Event
@@ -675,7 +683,7 @@
 .Bl -hang
 .It 1VS
 (vinum $B$N(B strategy)
-.Fd vinumstrategy
+.Fn vinumstrategy
 $B$NF~8}$K$"$k!"%f!<%6%j%/%(%9%H$K4X$9$k>pJs$rI=<($7$^$9!#(B
 $B%G%P%$%9HV9f$O(B
 .Nm
@@ -683,7 +691,7 @@
 $BK\%K!<%b%K%C%/$O!">o$K%j%/%(%9%H%7!<%1%s%9$N@hF,$K$J$j$^$9!#(B
 .It 2LR
 ($B%j%/%(%9%HH/9T(B) $B4X?t(B
-.Fd launch_requests
+.Fn launch_requests
 $B$K$*$$$FDc%l%Y%k(B
 .Nm
 $B%j%/%(%9%H$rH/9T$9$kD>A0$N!"%f!<%6%j%/%(%9%H$rI=<($7$^$9!#(B
@@ -712,33 +720,52 @@
 .Nm
 $B%j%/%(%9%H$N$&$A$N$R$H$D$rI=<($7$^$9!#(B
 $B$3$N>pJs$O!"(B
-.Fd launch_requests
+.Fn launch_requests
 $B$K$*$$$F$b5-O?$5$l$^$9!#(B
 .It 4DN
 ($B40N;(B)
-.Fd complete_rqe
+.Fn complete_rqe
 $B$+$i8F$P$l!"%j%/%(%9%H$N40N;$rI=<($7$^$9!#(B
 $B$3$N40N;$O!"%9%F!<%8(B
 .Ar 4DN
 $B$K$*$$$F(B
-.Fd launch_requests
+.Fn launch_requests
 $B$+$iH/9T$5$l$?%j%/%(%9%H$+!"$^$?$O%9%F!<%8(B
 .Ar 5RD
 $B$+(B
 .Ar 6RP
 $B$N(B
-.Fd complete_raid5_write
+.Fn complete_raid5_write
 $B$+$iH/9T$5$l$?%j%/%(%9%H$K%^%C%A$9$k$O$:$G$9!#(B
 .It 5RD
 (RAID-5 $B%G!<%?(B) 
-.Fd complete_raid5_write
+.Fn complete_raid5_write
 $B$+$i8F$P$l!"(B
 $B%Q%j%F%#7W;;8e$K(B RAID-5 $B%G!<%?%9%H%i%$%W$X=q$-9~$^$l$?%G!<%?$rI=8=$7$^$9!#(B
 .It 6RP
 (RAID-5 $B%Q%j%F%#(B)
-.Fd complete_raid5_write
+.Fn complete_raid5_write
 $B$+$i8F$P$l!"(B
 $B%Q%j%F%#7W;;8e$K(B RAID-5 $B%Q%j%F%#%9%H%i%$%W$X=q$-9~$^$l$?%G!<%?$rI=8=$7$^$9!#(B
+.It 7VS
+$B%5%V%G%#%9%/(B I/O $B%j%/%(%9%H$rI=<($7$^$9!#(B
+$BDL>o!"$3$l$i$N%j%/%(%9%H$O(B
+.Nm
+$BFbIt$N$b$N$G$"$j!"%W%l%C%/%9$N=i4|2=$d:F9=C[$H$$$C$?A`:n$K;HMQ$7$^$9!#(B
+.It 8LR
+$B%5%V%G%#%9%/(B I/O $B%j%/%(%9%H$N$?$a$K@8@.$7$?!"Dc%l%Y%kA`:n$rI=<($7$^$9!#(B
+.It Lockwait
+$B%W%m%;%9$,%l%s%8%m%C%/$rBT$C$F$$$k$3$H$r<($7$^$9!#(B
+$B%Q%i%a!<%?$O!"%j%/%(%9%H$K4XO"IU$1$i$l$?%P%C%U%!%X%C%@$H!"(B
+$B%W%l%C%/%9HV9f$H!"%V%m%C%/HV9f$G$9!#(B
+$BFbItE*$JM}M3$G!"%V%m%C%/HV9f$O!"(B
+$B%9%H%i%$%W3+;O%"%I%l%9$h$j$b(B 1 $B8DBg$-$/$J$C$F$$$^$9!#(B
+.It Lock
+$B%l%s%8%m%C%/$r<hF@:Q$_$G$"$k$3$H$r<($7$^$9!#(B
+$B%Q%i%a!<%?$O%l%s%8%m%C%/$HF1$8$G$9!#(B
+.It Unlock
+$B%l%s%8%m%C%/$r2rJ|:Q$_$G$"$k$3$H$r<($7$^$9!#(B
+$B%Q%i%a!<%?$O%l%s%8%m%C%/$HF1$8$G$9!#(B
 .El
 .\" XXX
 .It Nm init Op Fl w
@@ -1031,7 +1058,7 @@
 .Nm
 $B$O3F%*%V%8%'%/%H$K$D$$$FB??t$NE}7W%+%&%s%?$rJ];}$7$F$$$^$9!#>\:Y$O(B
 $B%X%C%@%U%!%$%k(B
-.Fi vinumvar.h
+.Pa vinumvar.h
 $B$r;2>H$7$F2<$5$$!#(B
 .\" XXX $B;E>e$,$C$?$i$3$3$KF~$l$k(B
 $B$3$l$i$N%+%&%s%?$r%j%;%C%H$9$k$?$a$K$O(B
@@ -1121,6 +1148,7 @@
 $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 Fl w
 .Op volume | plex | subdisk
 .Pp
 .Nm start
@@ -1229,6 +1257,10 @@
 $B%^%k%A%W%l%C%/%9%\%j%e!<%`$NCf$N(B 1 $B$D$N%W%l%C%/%9$r5/F0$9$k$K$O!"(B
 $B%\%j%e!<%`Cf$NB>$N%W%l%C%/%9$+$i%G!<%?$r%3%T!<$9$kI,MW$,$"$j$^$9!#(B
 $B$3$l$K$O$7$P$7$PD9$$;~4V$,$+$+$k$?$a!"%P%C%/%0%i%&%s%I$G<B9T$5$l$^$9!#(B
+$B$3$NA`:n$,40N;$9$k$3$H$rBT$A$?$$>l9g(B
+($BNc$($P!"$3$NA`:n$r%9%/%j%W%HCf$G<B9T$7$F$$$k>l9g(B)$B!"(B
+.Fl w
+$B%U%i%0$r;HMQ$7$F$/$@$5$$!#(B
 .It Nm stop
 .Op Fl f
 .Op volume | plex | subdisk
@@ -1449,17 +1481,31 @@
 $B@_Dj%U%!%$%k$N%(%s%H%j$O!"%\%j%e!<%`$d%W%l%C%/%9$d%5%V%G%#%9%/$rDj5A$7$^$9!#(B
 $B%(%s%H%j$O(B 1 $B9T$K(B 1 $B$D$H$$$&$3$H0J30$K$O7h$^$C$?=q<0$O$"$j$^$;$s!#(B
 .Pp
-$B@_Dj%U%!%$%k$N$$$/$D$+$N0z?t$G$O!"Bg$-$5(B ($BD9$5!"%9%H%i%$%WD9(B) $B$r;XDj$7$^$9!#(B
-$B$3$l$i$ND9$5$O!"%P%$%HC10L$G$b!"(B512$B%P%$%H$N%;%/%??t(B (\f(CWs\fR$B$r8e$m$K$D$1$k(B)
-$B$G$b!"%-%m%P%$%HC10L(B (\f(CWk\fR$B$r$D$1$k(B) $B$G$b!"%a%,%P%$%HC10L(B(\f(CWm\fR$B$r(B
-$B$D$1$k(B)$B$G$b!"$^$?$O%.%,%P%$%HC10L(B (\f(CWg\fR$B$r$D$1$k(B) $B$G$b;XDj$9$k$3$H$,(B
-$B$G$-$^$9!#$3$l$i$N?t$O$=$l$>$l(B 2**10$B!"(B2**20$B!"(B2**30$B$rI=$7$F$$$^$9!#Nc$($P!"(B
-\f(CW16777216\fR $B%P%$%H$H$$$&CM$O(B \f(CW16m\fR $B$H$b(B \f(CW16384k\fR $B$H$b(B
-\f(CW32768b\fR $B$H$b5-=R$9$k$3$H$,$G$-$^$9!#(B
-.Pp
-$B8_49@-$N$?$a$K!"(B
-$BJ8;z(B \f(CWb\fP ($B%V%m%C%/(B) $B$r(B \f(CWs\fP ($B%;%/%?(B) $B$HF1$8$b$N$H$7$F<u$1IU$1$^$9!#(B
-$B%V%m%C%/%5%$%:$OJ8L.$K6/$/0MB8$7$^$9$N$G!"$3$NC;=L7A$N2ACM$ODc2<$7$F$$$^$9!#(B
+.Ss $B%9%1!<%k%U%!%/%?(B
+$B$3$l$i$NCM$O!"%P%$%H$G;XDj$7$F$bNI$$$G$9$7!"(B
+$B<!$N%9%1!<%k%U%!%/%?$N$$$:$l$+(B 1 $B$D$r8e$KIU$1$F$bNI$$$G$9(B:
+.Bl -hang
+.It s
+$BCM$,(B 512 $B%P%$%H$N%;%/%??t$G$"$k$3$H$r<($7$^$9!#(B
+.It k
+$BCM$,%-%m%P%$%H?t$G$"$k$3$H$r<($7$^$9(B (1024 $B%P%$%H(B)$B!#(B
+.It m
+$BCM$,%a%,%P%$%H?t$G$"$k$3$H$r<($7$^$9(B (1048576 $B%P%$%H(B)$B!#(B
+.It g
+$BCM$,%.%,%P%$%H?t$G$"$k$3$H$r<($7$^$9(B (1073741824 $B%P%$%H(B)$B!#(B
+.It b
+VERITAS $B$H$N8_49@-$N$?$a$K;HMQ$7$^$9!#(B
+$B$3$l$O!"(B512 $B%P%$%H$N%V%m%C%/?t$r0UL#$7$^$9!#(B
+``$B%V%m%C%/(B'' $B$H$$$&8l$rJL$N0UL#$G;HMQ$7$F$$$^$9$N$G!"(B
+$B$3$NC;=L7A$O:.Mp$5$;$k$b$N$G$9!#(B
+$B$3$NC;=L7A$N2ACM$ODc2<$7$F$$$^$9!#(B
+.El
+.Pp
+$BNc$($P!"(B16777216 $B%P%$%H$H$$$&CM$O!"(B
+.Nm 16m ,
+.Nm 16384k ,
+.Nm 32768s
+$B$N$$$:$l$NI=5-$b2DG=$G$9!#(B
 .Pp
 $B@_Dj%U%!%$%k$K$O0J2<$N%(%s%H%j$r5-=R$9$k$3$H$,$G$-$^$9!#(B
 .Pp

----Next_Part(Sun_Aug_29_22:38:21_1999_756)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.2-19990827-STABLE English
Content-Disposition: attachment; filename=ediff_3.2-19990827-STABLE

diff -urNP fbsd-3.2-19990824-STABLE/man/man1/chmod.1 man1/chmod.1
--- fbsd-3.2-19990824-STABLE/man/man1/chmod.1	Tue Aug 24 18:33:17 1999
+++ man1/chmod.1	Fri Aug 27 18:47:16 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.10.2.3 1999/08/14 06:28:00 chris Exp $
+.\"	$Id: chmod.1,v 1.10.2.4 1999/08/25 08:46:56 chris Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -310,7 +310,6 @@
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr install 1 ,
-.Xr mount 8 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
@@ -318,6 +317,7 @@
 .Xr setmode 3 ,
 .Xr symlink 7 ,
 .Xr chown 8 ,
+.Xr mount 8 ,
 .Xr sticky 8
 .Sh STANDARDS
 The
diff -urNP fbsd-3.2-19990824-STABLE/man/man1/df.1 man1/df.1
--- fbsd-3.2-19990824-STABLE/man/man1/df.1	Tue Aug 24 18:33:18 1999
+++ man1/df.1	Fri Aug 27 18:47:17 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\"	$Id: df.1,v 1.13.2.1 1999/05/02 12:06:53 kris Exp $
+.\"	$Id: df.1,v 1.13.2.2 1999/08/26 16:55:10 sheldonh Exp $
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -95,12 +95,9 @@
 and
 .Tn MFS .
 The
-.Xr sysctl 8
+.Xr lsvfs 1
 command can be used to find out the types of filesystems
-that are available on the system:
-.Bd -literal -offset indent
-sysctl vfs
-.Ed
+that are available on the system.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
@@ -116,6 +113,7 @@
 .Fl t
 flags are ignored if a file or filesystem is specified.
 .Sh SEE ALSO
+.Xr lsvfs 1 ,
 .Xr quota 1 ,
 .Xr fstatfs 2 ,
 .Xr getfsstat 2 ,
@@ -123,8 +121,7 @@
 .Xr getmntinfo 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8 ,
-.Xr sysctl 8
+.Xr quot 8
 .Sh HISTORY
 A
 .Nm
diff -urNP fbsd-3.2-19990824-STABLE/man/man5/rc.conf.5 man5/rc.conf.5
--- fbsd-3.2-19990824-STABLE/man/man5/rc.conf.5	Tue Aug 24 18:35:49 1999
+++ man5/rc.conf.5	Fri Aug 27 18:49:53 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.9 1999/08/23 23:25:00 brian Exp $
+.\"     $Id: rc.conf.5,v 1.27.2.10 1999/08/25 18:10:31 iwasaki Exp $
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
@@ -81,6 +81,19 @@
 the
 .Xr apm 8
 command.
+.It Ar apmd_enable
+(bool) Run
+.Xr apmd 8
+to handle APM event from userland.
+This also enable support for APM.
+.It Ar apmd_flags
+(str) If
+.Ar apmd_enable
+is set to
+.Ar YES ,
+these are the flags to pass to the
+.Xr apmd 8
+daemon.
 .It Ar pccard_enable
 (bool) If set to
 .Ar YES ,
diff -urNP fbsd-3.2-19990824-STABLE/man/man8/apmd.8 man8/apmd.8
--- fbsd-3.2-19990824-STABLE/man/man8/apmd.8	Thu Jan  1 09:00:00 1970
+++ man8/apmd.8	Fri Aug 27 18:51:24 1999
@@ -0,0 +1,300 @@
+.\" Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
+.\" Copyright (c) 1999 KOIE Hidetaka <koie@suri.co.jp>
+.\" Copyright (c) 1999 Yoshihiko SARUMARU Aq <mistral@imasy.or.jp>
+.\" Copyright (c) 1999 Norihiro Kumagai <kuma@nk.rim.or.jp>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE 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.
+.\"
+.\"     @(#)apmd.8	1.1 (FreeBSD) 6/28/99
+.\"	$Id: apmd.8,v 1.2.2.1 1999/08/25 18:11:03 iwasaki Exp $
+.\"
+.Dd June 28, 1999
+.Dt APMD 8
+.Os
+.Sh NAME
+.Nm apmd
+.Nd Advanced Power Management monitor daemon
+.Sh SYNOPSIS
+.Nm apmd 
+.Op Fl d
+.Op Fl f file
+.Op Fl v
+.Sh DESCRIPTION
+.Nm Apmd
+monitors the occurrence of the specified Advanced Power Management
+.Pq APM
+events and, if one of the events occurs, it executes the sequence of
+commands corresponding to the event.  Only the events specified in the
+configuration file are notified to
+.Nm apmd ;
+all other events are ignored.  For each event posted by the APM BIOS,
+.Nm apmd
+invokes the sequence of commands specified in the configuration file.
+When
+.Nm apmd
+is running with monitoring suspend/standby requests, 
+the kernel will not process those requests.  
+Therefore, if you wish action to be taken when these events
+occur, you need to explicitly configure the appropriate commands or 
+built-in functions in the configuration file.
+.Pp
+.Nm Apmd
+recognizes the following runtime options:
+.Bl -tag -width -f_file
+.It Fl d
+Starts in debug mode.  This causes 
+.Nm apmd
+to execute in the foreground instead of in daemon mode.
+.It Fl f Ar file
+Specifies a different configuration file
+.Ar file
+to be used in place of the default
+.Pa /etc/apmd.conf .
+.It Fl v
+Verbose mode.
+.El
+.Pp
+When
+.Nm apmd
+starts, it reads the configuration file
+.Po
+.Pa /etc/apmd.conf
+as default
+.Pc
+and notifies the set of events to be monitored to the APM device driver.
+When it terminates, the APM device driver automatically cancels
+monitored events.
+.Pp
+If the 
+.Nm apmd
+process receives a SIGHUP, it will reread its configuration file and
+notify the APM device driver of any changes to its configuration.
+.Pp
+.Nm Apmd
+uses the device
+.Pa /dev/apmctl
+to issue
+.Xr ioctl 2
+requests for monitoring events and for controlling the APM system.
+This device file is opened exclusively, so only a single
+.Nm apmd
+process can be running at any time.
+.Pp
+When 
+.Nm apmd
+receives an APM event, it forks a child process to execute the
+commands specified in the configuration file and then continues
+listening for more events.  The child process executes the commands
+specified, one at a time and in the order that they are listed.
+.Pp
+While 
+.Nm apmd
+is processing the command list for SUSPEND/STANDBY requests, the APM kernel
+device driver issues notifications to APM BIOS once per second so that the
+BIOS knows that there are still some commands pending, and that it should not
+complete the request just yet.
+.Pp
+The
+.Nm apmd
+daemon creates the file
+.Pa /var/run/apmd.pid ,
+and stores its process
+id there.
+This can be used to kill or reconfigure
+.Nm apmd .
+.Sh CONFIGURATION FILE
+The structure of the
+.Nm apmd
+configuration file is quite simple.  For example:
+.Pp
+.Bd -literal
+apm_event SUSPENDREQ {
+       exec "sync && sync && sync";
+       exec "sleep 1";
+       exec "zzz";
+}
+.Ed
+.Pp
+will cause
+.Nm apmd
+to recieve the APM event
+.Ql SUSPENDREQ 
+(which may be posted by an LCD close), run the
+.Ql sync
+command 3 times and wait for a while, then execute
+.Nm zzz 
+(
+.Nm apm
+.Fl z
+)
+to put the system in the suspend state.
+.Pp
+.Bl -bullet
+.It
+The  apm_event keyword
+.Bd -ragged -offset indent
+.Ql apm_event
+is the keyword which indicates the start of configuration for
+each events.
+.Ed
+.It
+APM events
+.Bd -ragged -offset indent
+If you wish to execute the same commands for different events, the
+event names should be delimited by a comma.  The following are
+valid event names:
+.Bl -item
+.It
+- Events ignored by the kernel if
+.Nm apmd
+is running:
+.Pp
+.Bl -tag -hang -width USERSUSPENDREQ -compact -offset indent
+.It STANDBYREQ
+.It SUSPENDREQ
+should include sync in the command list,
+.It USERSUSPENDREQ
+should include sync in the command list,
+.It BATTERYLOW
+only zzz should be specified in the command list.
+.El
+.It
+- Events passed to
+.Nm apmd
+after kernel handling:
+.Pp
+.Bl -tag -hang -width USERSUSPENDREQ -compact -offset indent
+.It NORMRESUME
+.It CRITRESUME
+.It STANDBYRESUME
+.It POWERSTATECHANGE
+.It UPDATETIME
+.El
+.Pp
+Other events will not be sent to 
+.Nm apmd .
+.El
+.Ed
+.It
+command line syntax
+.Bd -ragged -offset indent
+In the example above, the three lines begining with
+.Ql exec
+are commands for the event.
+Each line should be terminated with a semicolon. 
+The command list for the event should be enclosed by
+.Ql {
+and
+.Ql } .
+.Nm apmd
+uses
+.Pa /bin/sh
+for double-quotation enclosed command execution, just as with
+.Xr system 3 .
+Each command is executed in order until the end of
+the list is reached or a command finishes with a non-zero status code. 
+.Nm apmd
+will report any failed command's status code via
+.Xr syslog 3 
+and will then reject the request event posted by the APM BIOS.
+.Ed
+.It
+Built-in functions
+.Bd -ragged -offset indent
+You can also specify
+.Nm apmd
+built-in functions instead of command lines.
+A built-in function name should be terminated with a semicolon,
+just as with a command line.
+The following built-in functions are currently supported:
+.Bl -item
+.It
+- reject:
+.Bd -ragged -offset indent
+Reject last request posted by APM BIOS.  This can be used to reject
+a SUSPEND request when the LCD is closed and put the system in a
+STANDBY state instead.
+.Ed
+.El
+.El
+.Sh EXAMPLES
+Sample configuration commands include:
+.Bd -literal
+apm_event SUSPENDREQ {
+        exec "/etc/rc.suspend";
+}
+
+apm_event USERSUSPENDREQ {
+        exec "sync && sync && sync";
+        exec "sleep 1";
+        exec "apm -z";
+}
+
+apm_event NORMRESUME, STANDBYRESUME {
+        exec "/etc/rc.resume";
+}
+
+# resume event configuration for serial mouse users by
+# reinitializing a moused(8) connected to a serial port.
+#
+#apm_event NORMRESUME {
+#       exec "kill -HUP `cat /var/run/moused.pid`";
+#}
+#
+# suspend request event configuration for ATA HDD users:
+# execute standby instead of suspend.
+#
+#apm_event SUSPENDREQ {
+#       reject;
+#       exec "sync && sync && sync";
+#       exec "sleep 1";
+#       exec "apm -Z";
+#}
+.Ed
+.Sh FILES
+.Bl -tag -width /etc/apmd.conf -compact
+.It Pa /etc/apmd.conf
+.It Pa /dev/apmctl
+.It Pa /var/run/apmd.pid
+.El
+.Sh SEE ALSO
+.Xr apm 4 ,
+.Xr apm 8 ,
+.Xr apmconf 8
+.Sh AUTHORS
+.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
+.An KOIE Hidetaka Aq koie@suri.co.jp
+.Pp
+Some contributions made by
+.An Warner Losh Aq imp@FreeBSD.org ,
+.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp ,
+.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
+.An Norihiro Kumagai Aq kuma@nk.rim.or.jp ,
+.An NAKAGAWA Yoshihisa Aq nakagawa@jp.FreeBSD.org ,
+and
+.An Nick Hilliard Aq nick@foobar.org .
+.Sh HISTORY
+The
+.Nm apmd
+command appeared in
+.Fx 4.0 .
diff -urNP fbsd-3.2-19990824-STABLE/man/man8/ppp.8 man8/ppp.8
--- fbsd-3.2-19990824-STABLE/man/man8/ppp.8	Tue Aug 24 18:54:09 1999
+++ man8/ppp.8	Fri Aug 27 19:08:05 1999
@@ -1,4 +1,4 @@
-.\" $Id: ppp.8,v 1.142.2.9 1999/08/23 21:59:46 brian Exp $
+.\" $Id: ppp.8,v 1.142.2.10 1999/08/25 21:40:21 brian Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
@@ -4723,12 +4723,20 @@
 .Xr traceroute 8 ,
 .Xr vipw 8
 .Sh HISTORY
-This program was originally written by Toshiharu OHNO (tony-o@iij.ad.jp),
-and was submitted to FreeBSD-2.0.5 by Atsushi Murai (amurai@spec.co.jp).
-.Pp
-It was substantially modified during 1997 by Brian Somers
-(brian@Awfulhak.org), and was ported to OpenBSD in November that year
+This program was originally written by
+.An Toshiharu OHNO Aq tony-o@iij.ad.jp ,
+and was submitted to
+.Fx 2.0.5
+by
+.An Atsushi Murai Aq amurai@spec.co.jp .
+.Pp
+It was substantially modified during 1997 by
+.An Brian Somers Aq brian@Awfulhak.org ,
+and was ported to
+.Ox
+in November that year
 (just after the 2.2 release).
 .Pp
-Most of the code was rewritten by Brian Somers in early 1998 when
-multi-link ppp support was added.
+Most of the code was rewritten by
+.An Brian Somers
+in early 1998 when multi-link ppp support was added.
diff -urNP fbsd-3.2-19990824-STABLE/man/man8/vinum.8 man8/vinum.8
--- fbsd-3.2-19990824-STABLE/man/man8/vinum.8	Tue Aug 24 18:35:31 1999
+++ man8/vinum.8	Fri Aug 27 18:49:34 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.8 1999/08/24 04:06:51 grog Exp $
+.\" $Id: vinum.8,v 1.5.2.9 1999/08/26 03:32:07 grog Exp $
 .\"
 .Dd 28 March 1999
 .Dt vinum 8
@@ -263,6 +263,7 @@
 Read configuration from all vinum drives.
 .in
 .Cd start
+.Op Fl w
 .Op volume | plex | subdisk
 .in +1i
 Allow the system to access the objects
@@ -356,14 +357,13 @@
 .Fl v
 .if t (``verbose'')
 .if n ("verbose")
-option can be used with any command to request more detailed information.
+option can be used to request more detailed information.
 .It Fl V
 The
 .Fl V
 .if t (``Very verbose'')
 .if n ("Very verbose")
-option can be used with any command to request more detailed information than
-the
+option can be used to request more detailed information than the
 .Fl v
 option provides.
 .It Fl w
@@ -630,6 +630,10 @@
 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
+11:11:14.975184 Lock      0xc2374210    2      0x1f8001
+11:11:15.018400 7VS Write 0xc2374210           0x7c0           32768   10
+11:11:15.018456 8LR Write 0xc2374210    13.39  0xcc0c9         32768
+11:11:15.046229 Unlock    0xc2374210    2      0x1f8001
 .Ed
 .Pp
 The
@@ -639,8 +643,11 @@
 reliable: theoretically two requests in sequence could use the same buffer
 header, though this is not common.  The beginning of a request can be identified
 by the event
-.Ar 1VS .
-The example above shows the requests involved in a single user request.
+.Ar 1VS 
+or
+.Ar 7VS .
+The first example above shows the requests involved in a user request.  The
+second is a subdisk I/O request with locking.
 .Pp
 The
 .Ar Event
@@ -654,7 +661,7 @@
 .Bl -hang
 .It 1VS
 (vinumstrategy) shows information about the user request on entry to
-.Fd vinumstrategy .
+.Fn vinumstrategy .
 The device number is the
 .Nm
 device, and offset and length are the user parameters.  This is always the
@@ -663,7 +670,7 @@
 (launch_requests) shows the user request just prior to launching the low-level
 .Nm
 requests in the function
-.Fd launch_requests.
+.Fn launch_requests .
 The parameters should be the same as in the
 .Ar 1VS
 information.
@@ -687,31 +694,48 @@
 .Nm
 requests which are launched to satisfy the high-level request.  This information
 is also logged in
-.Fd launch_requests.
+.Fn launch_requests .
 .It 4DN
 (done) is called from
-.Fd complete_rqe,
+.Fn complete_rqe ,
 showing the completion of a request.  This completion should match a request
 launched either at stage
 .Ar 4DN
 from
-.Fd launch_requests,
+.Fn launch_requests ,
 or from
-.Fd complete_raid5_write
+.Fn complete_raid5_write
 at stage
 .Ar 5RD
 or
 .Ar 6RP .
 .It 5RD
 (RAID-5 data) is called from
-.Fd complete_raid5_write
+.Fn complete_raid5_write
 and represents the data written to a RAID-5 data stripe after calculating
 parity.
 .It 6RP
 (RAID-5 parity) is called from
-.Fd complete_raid5_write
+.Fn complete_raid5_write
 and represents the data written to a RAID-5 parity stripe after calculating
 parity.
+.It 7VS
+shows a subdisk I/O request.  These requests are usually internal to
+.Nm
+for operations like initialization or rebuilding plexes.
+.It 8LR
+shows the low--level operation generated for a subdisk I/O request.
+.It Lockwait
+specifies that the process is waiting for a range lock.  The parameters are the
+buffer header associated with the request, the plex number and the block number.
+For internal reasons the block number is one higher than the address of the
+beginning of the stripe.
+.It Lock
+specifies that a range lock has been obtained.  The parameters are the same as
+for the range lock.
+.It Unlock
+specifies that a range lock has been released.  The parameters are the same as
+for the range lock.
 .El
 .\" XXX
 .It Nm init Op Fl w
@@ -993,7 +1017,7 @@
 .Pp
 .Nm
 maintains a number of statistical counters for each object.  See the header file
-.Fi vinumvar.h
+.Pa vinumvar.h
 for more information.
 .\" XXX put it in here when it's finalized
 Use the
@@ -1080,6 +1104,7 @@
 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 Fl w
 .Op volume | plex | subdisk
 .Pp
 .Nm start
@@ -1179,8 +1204,11 @@
 In a later version, this operation will cause the subdisks
 .Pp
 To start a plex in a multi-plex volume, the data must be copied from another
-plex in the volume.  Since this frequently takes a long time, it is done in the
-background.
+plex in the volume.  Since this frequently takes a long time, it is normally
+done in the background.  If you want to wait for this operation to complete (for
+example, if you are performing this operation in a script), use the
+.Fl w
+flag.
 .It Nm stop
 .Op Fl f
 .Op volume | plex | subdisk
@@ -1414,19 +1442,30 @@
 define volumes, plexes and subdisks, and may be in free format, except that each
 entry must be on a single line.
 .Pp
+.Ss Scale factors
 Some configuration file parameters specify a size (lengths, stripe sizes).
-These lengths can be specified as bytes, as sectors of 512 bytes (by appending
-the letter \f(CWs\fR), as kilobytes (by appending the letter \f(CWk\fR), as
-megabytes (by appending the letter \f(CWm\fR) or as gigabytes (by appending the
-letter \f(CWg\fR).  These quantities represent the values 2**10, 2**20 and 2**30
-respectively.  For example, the value \f(CW16777216\fR bytes can also be written
-as \f(CW16m\fR, \f(CW16384k\fR or \f(CW32768b\fR.
-.Pp
-For reasons of compatibility, 
-.Nm
-takes the letter \f(CWb\fP (block) to be equivalent to \f(CWs\fP (sector).  The
-use of this abbreviation is deprecated, since the size of a block is very
-dependent on the context.
+These values can be specified as bytes, or one of the following scale factors
+may be appended:
+.Bl -hang
+.It s
+specifies that the value is a number of sectors of 512 bytes.
+.It k
+specifies that the value is a number of kilobytes (1024 bytes).
+.It m
+specifies that the value is a number of megabytes (1048576 bytes).
+.It g
+specifies that the value is a number of gigabytes (1073741824 bytes).
+.It b
+is used for compatibility with VERITAS.  It stands for blocks of 512 bytes.
+This abbreviation is confusing, since the word ``block'' is used in different
+meanings, and its use is deprecated.
+.El
+.Pp
+For example, the value 16777216 bytes can also be written as
+.Nm 16m ,
+.Nm 16384k
+or
+.Nm 32768s .
 .Pp
 The configuration file can contain the following entries:
 .Pp
@@ -2410,7 +2449,7 @@
 - directory containing device nodes for
 .Nm
 subdisks.
-.Sh ENVIRONMENT VARIABLES
+.Sh ENVIRONMENT
 .Bl -hang
 .It VINUM_HISTORY
 The name of the log file, by default /var/log/vinum_history.
@@ -2436,6 +2475,6 @@
 .Fx 3.0.
 The RAID-5 component of
 .Nm
-was developed by Cybernet Inc. 
+was developed for Cybernet Inc. 
 .Pa www.cybernet.com
 for its NetMAX product.

----Next_Part(Sun_Aug_29_22:38:21_1999_756)----
