From owner-man-jp-reviewer@jp.freebsd.org  Thu Feb 24 06:50:24 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id GAA36814;
	Thu, 24 Feb 2000 06:50:24 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from smtp2.interramp.com (smtp2.interramp.com [38.8.200.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id GAA36809
	for <man-jp-reviewer@jp.freebsd.org>; Thu, 24 Feb 2000 06:50:22 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.26.194.186] (helo=localhost)
	by smtp2.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp-reviewer@jp.freebsd.org
	id 12Njfe-0005NH-00; Wed, 23 Feb 2000 16:50:11 -0500
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.28 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000223165211W.horikawa@psinet.com>
Date: Wed, 23 Feb 2000 16:52:11 -0500
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 1255
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 1989
Subject: [man-jp-reviewer 1989] diff to 4.0-20000127-CURRENT (man5)
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: horikawa@psinet.com

4.0-20000127-CURRENT (man5) $B$X$N:9J,$G$9!#(B

Index: man5/a.out.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/a.out.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 a.out.5
--- man5/a.out.5	2000/02/15 14:34:47	1.1.1.1
+++ man5/a.out.5	2000/02/23 01:36:08
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/a.out.5,v 1.8 1999/08/28 00:20:42 peter Exp %
+.\" %FreeBSD: src/share/man/man5/a.out.5,v 1.9 2000/01/17 20:22:37 asmodai Exp %
 .\"
 .\" jpman %Id: a.out.5,v 1.3 1998/08/09 12:51:56 horikawa Stab %
 .\" WORD: byte order	$B%P%$%H=g(B
@@ -459,6 +459,7 @@
 .Xr execve 2 ,
 .Xr nlist 3 ,
 .Xr core 5 ,
+.Xr elf 5 ,
 .Xr link 5 ,
 .Xr stab 5
 .Sh $BNr;K(B
@@ -479,7 +480,3 @@
 .Pp
 .Em bss
 $B$,2?$NN,$J$N$+!"$K4X$9$k9g0U$O$J$$$h$&$G$9!#(B
-.Pp
-$B>-Mh!"?7$7$$%P%$%J%j%U%!%$%k%U%)!<%^%C%H$,%5%]!<%H$5$l$k$+$bCN$l$^$;$s$,!"(B
-$B$=$N?7%U%)!<%^%C%H$O62$i$/!"(B
-$B$"$i$f$k%l%Y%k$G$3$NB@8E$N%U%)!<%^%C%H$H8_49@-$,$J$$$G$7$g$&!#(B
Index: man5/dir.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/dir.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 dir.5
--- man5/dir.5	2000/02/15 14:34:47	1.1.1.1
+++ man5/dir.5	2000/02/23 01:36:11
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dir.5	8.3 (Berkeley) 4/19/94
-.\" %FreeBSD: src/share/man/man5/dir.5,v 1.11 1999/08/28 00:20:43 peter Exp %
+.\" %FreeBSD: src/share/man/man5/dir.5,v 1.12 2000/01/05 17:04:36 bde Exp %
 .\"
 .\" jpman %Id: dir.5,v 1.3 1998/07/19 22:22:07 yohta Stab %
 .\"
@@ -43,7 +43,6 @@
 .Nm dirent
 .Nd $B%G%#%l%/%H%j%U%!%$%k%U%)!<%^%C%H(B
 .Sh $B=q<0(B
-.Fd #include <sys/types.h>
 .Fd #include <dirent.h>
 .Sh $B2r@b(B
 $B%G%#%l%/%H%j$O!"EZBf$H$J$k5-21G^BN$N>\:Y$r1#JC$7!"(B
@@ -94,6 +93,8 @@
 #ifndef	_SYS_DIRENT_H_
 #define	_SYS_DIRENT_H_
 
+#include <machine/ansi.h>
+
 /*
  * dirent $B9=B$BN$O!"(Bgetdirentries(2) $B%7%9%F%`%3!<%k$GJV$5$l$k(B
  * $B%G%#%l%/%H%j%(%s%H%j$N%U%)!<%^%C%H$rDj5A$7$^$9!#(B
@@ -106,10 +107,10 @@
  */
 
 struct dirent {
-	u_int32_t d_fileno;		/* $B%(%s%H%j$N%U%!%$%kHV9f(B */
-	u_int16_t d_reclen;		/* $B$3$N%l%3!<%I$ND9$5(B */
-	u_int8_t  d_type; 		/* $B%U%!%$%k%?%$%W(B, $B0J2<;2>H(B */
-	u_int8_t  d_namlen;		/* d_name $B$NJ8;zNsD9(B */
+	__uint32_t d_fileno;		/* $B%(%s%H%j$N%U%!%$%kHV9f(B */
+	__uint16_t d_reclen;		/* $B$3$N%l%3!<%I$ND9$5(B */
+	__uint8_t  d_type; 		/* $B%U%!%$%k%?%$%W(B, $B0J2<;2>H(B */
+	__uint8_t  d_namlen;		/* d_name $B$NJ8;zNsD9(B */
 #ifdef _POSIX_SOURCE
 	char	d_name[255 + 1];	/* $BL>A0$O$3$ND9$5$r1[$($F$O$J$i$J$$(B */
 #else
@@ -147,7 +148,7 @@
 #define	_GENERIC_DIRSIZ(dp) \
     ((sizeof (struct dirent) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #define	GENERIC_DIRSIZ(dp)	_GENERIC_DIRSIZ(dp)
 #endif
 
Index: man5/disklabel.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/disklabel.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 disklabel.5
--- man5/disklabel.5	2000/02/15 14:34:47	1.1.1.1
+++ man5/disklabel.5	2000/02/23 01:36:17
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/disklabel/disklabel.5,v 1.6 1999/08/28 00:12:34 peter Exp %
+.\" %FreeBSD: src/sbin/disklabel/disklabel.5,v 1.7 2000/01/05 17:34:00 bde Exp %
 .\"
 .\" jpman %Id: disklabel.5,v 1.3 1998/06/12 15:48:23 kumano Stab %
 .\"
@@ -118,18 +118,41 @@
 .Pa <sys/disklabel.h>
 $B$G;XDj$5$l$k$h$&$K%G%#%9%/%i%Y%k$N%U%)!<%^%C%H$O0J2<$N$h$&$K$J$j$^$9!#(B
 .Bd -literal
+#ifndef _SYS_DISKLABEL_H_
+#define	_SYS_DISKLABEL_H_
+
+#ifndef _KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
+
 /*
-* $B%G%#%9%/5-=R%F!<%V%k(B, disktab(5) $B$r;2>H(B
-*/
-#define	DISKTAB		"/etc/disktab"
+ * $B%G%#%9%/5-=R%F!<%V%k(B, disktab(5) $B$r;2>H(B
+ */
+#define	_PATH_DISKTAB	"/etc/disktab"
+#define	DISKTAB		"/etc/disktab"		/* $BHs?d>)(B */
 
 /*
-* $B3F%G%#%9%/$O%O!<%I%&%'%"%G%#%9%/%8%*%a%H%j!"%U%!%$%k%7%9%F%`%Q!<%F%#%7%g%s!"(B
-* $B%I%i%$%V8GM-$N>pJs$K$D$$$F$N>pJs$r4^$`%i%Y%k$r;}$C$F$$$^$9!#(B
-* $B%i%Y%k$O%V%m%C%/(B 0 $B$+(B 1 $B!"$D$^$j%V!<%H%9%H%i%C%WEy$N$?$a$N>l=j$r6u$1$F(B
-* $B$J$k$Y$/@hF,$N%*%U%;%C%H$K$"$j$^$9!#(B
-*/
+ * $B3F%G%#%9%/$O%O!<%I%&%'%"%G%#%9%/%8%*%a%H%j!"%U%!%$%k%7%9%F%`%Q!<%F%#%7%g%s!"(B
+ * $B%I%i%$%V8GM-$N>pJs$K$D$$$F$N>pJs$r4^$`%i%Y%k$r;}$C$F$$$^$9!#(B
+ * $B%i%Y%k$O%V%m%C%/(B 0 $B$+(B 1 $B!"$D$^$j%V!<%H%9%H%i%C%WEy$N$?$a$N>l=j$r6u$1$F(B
+ * $B$J$k$Y$/@hF,$N%*%U%;%C%H$K$"$j$^$9!#(B
+ */
 
+/*
+ * XXX $B$3$l$i$N>pJs$O%3%s%H%m!<%iKh(B ($B$^$?$O%I%i%$%VKh(B) $B$K$I$3$+JL$N$H$3$m$G(B
+ * XXX $BDj5A$5$l$k$Y$-$G$"$j!"$3$3$GDj5A$9$Y$-$G$O$"$j$^$;$s(B!
+ */
+#ifdef __i386__
+#define LABELSECTOR	1			/* sector containing label */
+#define LABELOFFSET	0			/* offset of label in sector */
+#endif
+
+#ifdef __alpha__
+#define LABELSECTOR	0
+#define LABELOFFSET	64
+#endif
+
 #ifndef	LABELSECTOR
 #define LABELSECTOR	0			/* $B%i%Y%k$r4^$`%;%/%?(B */
 #endif
@@ -138,63 +161,64 @@
 #define LABELOFFSET	64			/* $B%;%/%?Fb$N%i%Y%k$N%*%U%;%C%H(B */
 #endif
 
-#define DISKMAGIC	((u_long) 0x82564557)	/* $B%G%#%9%/$N%^%8%C%/%J%s%P(B */
+#define DISKMAGIC	((u_long32_t)0x82564557) /* $B%G%#%9%/$N%^%8%C%/%J%s%P(B */
 #ifndef MAXPARTITIONS
 #define	MAXPARTITIONS	8
 #endif
 
+#define	LABEL_PART	2		/* $B%Q!<%F%#%7%g%s$O%i%Y%k$r4^$`(B */
+#define	RAW_PART	2		/* $B%Q!<%F%#%7%g%s$O%G%#%9%/A4BN$r4^$`(B */
+#define	SWAP_PART	1		/* $B%Q!<%F%#%7%g%s$ODL>o$O%9%o%C%W$r4^$`(B */
+
 #ifndef LOCORE
 struct disklabel {
-	u_long	d_magic;	/* $B%^%8%C%/%J%s%P(B */
-	short	d_type;		/* $B%I%i%$%V%?%$%W(B */
-	short	d_subtype;	/* $B%3%s%H%m!<%i(B/d_type $B$K8GM-(B */
-	char	d_typename[16];	/* $B%?%$%WL>!"$?$H$($P(B "eagle" */
+	u_int32_t d_magic;		/* $B%^%8%C%/%J%s%P(B */
+	u_int16_t d_type;		/* $B%I%i%$%V%?%$%W(B */
+	u_int16_t d_subtype;		/* $B%3%s%H%m!<%i(B/d_type $B$K8GM-(B */
+	char	  d_typename[16];	/* $B%?%$%WL>!"$?$H$($P(B "eagle" */
+
 	/* 
-	* d_packname $B$O!"%Q%C%/<1JL;R$r4^$_!"%G%#%9%/>e$d%a%b%jFb%3%T!<$N(B
-	* $B%G%#%9%/%i%Y%k$rFI$s$@$H$-$KJV$5$l$^$9!#(B
-	* d_boot0 $B$H(B d_boot1 $B$O!"(B/boot $B$K$"$k0l<!(B (block 0) $B$^$?$O(B
-	* $BFs<!(B (block 1-15) $B%V!<%H%9%H%i%C%W$N(B ($B>JN,2DG=$J(B) $BL>A0$G$9!#(B
-	* $B$3$NL>$O!"(B/etc/disktab $B$+$iCM$r<h$j=P$9$?$a$K(B getdiskbyname(3)
-	* $B$r;H$&>l9g$KJV$5$l$^$9!#(B
-	*/
-#if defined(KERNEL) || defined(STANDALONE)
-	char	d_packname[16];		/* $B%Q%C%/<1JL;R(B */ 
-#else
+	 * d_packname $B$O!"%Q%C%/<1JL;R$r4^$_!"%G%#%9%/>e$d%a%b%jFb%3%T!<$N(B
+	 * $B%G%#%9%/%i%Y%k$rFI$s$@$H$-$KJV$5$l$^$9!#(B
+	 * d_boot0 $B$H(B d_boot1 $B$O!"(B/boot $B$K$"$k0l<!(B (block 0) $B$^$?$O(B
+	 * $BFs<!(B (block 1-15) $B%V!<%H%9%H%i%C%W$N(B ($B>JN,2DG=$J(B) $BL>A0$G$9!#(B
+	 * $B$3$NL>$O!"(B/etc/disktab $B$+$iCM$r<h$j=P$9$?$a$K(B getdiskbyname(3)
+	 * $B$r;H$&>l9g$KJV$5$l$^$9!#(B
+	 */
 	union {
-		char	un_d_packname[16];	/* $B%Q%C%/<1JL;R(B */ 
+		char	un_d_packname[16];	/* $B%Q%C%/<1JL;R(B */
 		struct {
 			char *un_d_boot0;	/* $B0l<!%V!<%H%9%H%i%C%WL>(B */
 			char *un_d_boot1;	/* $BFs<!%V!<%H%9%H%i%C%WL>(B */
-		} un_b; 
-	} d_un; 
-
+		} un_b;
+	} d_un;
 #define d_packname	d_un.un_d_packname
 #define d_boot0		d_un.un_b.un_d_boot0
 #define d_boot1		d_un.un_b.un_d_boot1
-#endif	/* ! KERNEL or STANDALONE */
+
+			/* $B%G%#%9%/%8%*%a%H%j(B */
+	u_int32_t d_secsize;	/* $B%;%/%?$"$?$j$N%P%$%H?t(B */
+	u_int32_t d_nsectors;	/* $B%H%i%C%/$"$?$j$N%G!<%?%;%/%??t(B */
+	u_int32_t d_ntracks;	/* $B%7%j%s%@$"$?$j$N%H%i%C%/?t(B */
+	u_int32_t d_ncylinders;	/* $B%f%K%C%H$"$?$j$N%G!<%?%7%j%s%@?t(B */
+	u_int32_t d_secpercyl;	/* $B%7%j%s%@$"$?$j$N%G!<%?%;%/%??t(B */
+	u_int32_t d_secperunit;	/* $B%f%K%C%H$"$?$j$N%G!<%?%;%/%??t(B */
 
-	/* $B%G%#%9%/%8%*%a%H%j(B */
-	u_long	d_secsize;	/* $B%;%/%?$"$?$j$N%P%$%H?t(B */
-	u_long	d_nsectors;	/* $B%H%i%C%/$"$?$j$N%G!<%?%;%/%??t(B */
-	u_long	d_ntracks;	/* $B%7%j%s%@$"$?$j$N%H%i%C%/?t(B */
-	u_long	d_ncylinders;	/* $B%f%K%C%H$"$?$j$N%G!<%?%7%j%s%@?t(B */
-	u_long	d_secpercyl;	/* $B%7%j%s%@$"$?$j$N%G!<%?%;%/%??t(B */
-	u_long	d_secperunit;	/* $B%f%K%C%H$"$?$j$N%G!<%?%;%/%??t(B */
 	/*
-	* $B0J2<$NM=Hw(B ($BITNI%;%/%?CV49(B) $B$O(B in d_nsectors $B$d(B d_secpercyl
-	* $B$K$O?t$($i$l$^$;$s!#(B
-	* $BM=Hw%;%/%?$O!"3F%H%i%C%/$^$?$O%7%j%s%@$NKvHx$N>l=j$r@j$a$k(B
-	* $BJ*M}%;%/%?$K$"$k$3$H$K$7$^$9!#(B
-	*/
-	u_short	d_sparespertrack;	/* $B%H%i%C%/$"$?$j$NM=Hw%;%/%?(B */
-	u_short	d_sparespercyl;	/* $B%7%j%s%@$"$?$j$NM=Hw%;%/%?(B */
+	 * $B0J2<$NM=Hw(B ($BITNI%;%/%?CV49(B) $B$O(B in d_nsectors $B$d(B d_secpercyl
+	 * $B$K$O?t$($i$l$^$;$s!#(B
+	 * $BM=Hw%;%/%?$O!"3F%H%i%C%/$^$?$O%7%j%s%@$NKvHx$N>l=j$r@j$a$k(B
+	 * $BJ*M}%;%/%?$K$"$k$3$H$K$7$^$9!#(B
+	 */
+	u_int16_t d_sparespertrack;	/* $B%H%i%C%/$"$?$j$NM=Hw%;%/%?(B */
+	u_int16_t d_sparespercyl;	/* $B%7%j%s%@$"$?$j$NM=Hw%;%/%?(B */
 	/*
-	* $B%a%$%s%F%J%s%9!"CV49!"%3%s%U%#%.%e%l!<%7%g%s5-=RNN0hEy$r(B
-	* $B4^$`8rBX%7%j%s%@(B
-	*/
-	u_long	d_acylinders;	/* $B%f%K%C%H$"$?$j$N8rBX%7%j%s%@(B */
+	 * $B%a%$%s%F%J%s%9!"CV49!"%3%s%U%#%.%e%l!<%7%g%s5-=RNN0hEy$r(B
+	 * $B4^$`8rBX%7%j%s%@(B
+	 */
+	u_int32_t d_acylinders;		/* $B%f%K%C%H$"$?$j$N8rBX%7%j%s%@(B */
 
-		/* $B%O!<%I%&%'%"FC@-(B */
+			/* $B%O!<%I%&%'%"FC@-(B */
 	/*
 	* d_interleave, d_trackskew, d_cylskew $B$O!"CY$$%3%s%H%m!<%i$N(B
 	* $BKd$a9g$o$;$K;H$&$?$a$N!"%a%G%#%"%U%)!<%^%C%HCf$N(B
@@ -212,51 +236,69 @@
 	* $B:G8e$N(B d_cylskew $B$O!"%7%j%s%@(B N-1 $B>e$N%;%/%?(B 0 $B$+$i%7%j%s%@(B N
 	* $B>e$N%;%/%?(B 0 $B$NAjBPE*$J%*%U%;%C%H$G$9!#(B
 	*/
-	u_short	d_rpm;	/* $B2sE>%9%T!<%I(B */
-	u_short	d_interleave;	/* $B%O!<%I%&%'%"%;%/%?%$%s%?%j!<%V(B */
-	u_short	d_trackskew;	/* $B%H%i%C%/$"$?$j$N%;%/%?(B 0 $B%9%-%e!<(B */
-	u_short	d_cylskew;	/* $B%7%j%s%@$"$?$j$N%;%/%?(B 0 $B%9%-%e!<(B */
-	u_long	d_headswitch;	/* $B%O!<%I%9%$%C%A;~4V(B usec */
-	u_long	d_trkseek;	/* $B%H%i%C%/4V%7!<%/(B usec */
-	u_long	d_flags;	/* $B0lHL%U%i%0(B */
+	u_int16_t d_rpm;		/* $B2sE>%9%T!<%I(B */
+	u_int16_t d_interleave;		/* $B%O!<%I%&%'%"%;%/%?%$%s%?%j!<%V(B */
+	u_int16_t d_trackskew;		/* $B%H%i%C%/$"$?$j$N%;%/%?(B 0 $B%9%-%e!<(B */
+	u_int16_t d_cylskew;		/* $B%7%j%s%@$"$?$j$N%;%/%?(B 0 $B%9%-%e!<(B */
+	u_int32_t d_headswitch;		/* $B%O!<%I%9%$%C%A;~4V(B usec */
+	u_int32_t d_trkseek;		/* $B%H%i%C%/4V%7!<%/(B usec */
+	u_int32_t d_flags;		/* $B0lHL%U%i%0(B */
 #define NDDATA 5
-	u_long	d_drivedata[NDDATA];	/* $B%I%i%$%V$N7?8GM-$N>pJs(B */
+	u_int32_t d_drivedata[NDDATA];	/* $B%I%i%$%V$N7?8GM-$N>pJs(B */
 #define NSPARE 5
-	u_long	d_spare[NSPARE];	/* $B>-Mh;H$&$?$a$NM=Hw(B */
-	u_long	d_magic2;	/* $B%^%8%C%/%J%s%P(B ($B:FEY(B) */
-	u_short	d_checksum;	/* $B%G!<%?$r4^$`%Q!<%F%#%7%g%s$N(B xor */
-
-	/* $B%U%!%$%k%7%9%F%`$H%Q!<%F%#%7%g%s>pJs(B */
-	u_short	d_npartitions;	/* $B8e$KB3$/%Q!<%F%#%7%g%s?t(B */
-	u_long	d_bbsize;	/* sn0 $B$N%V!<%HNN0h$NBg$-$5(B($B%P%$%HC10L(B) */
-	u_long	d_sbsize;	/* fs $B%9!<%Q%V%m%C%/$N:GBg%5%$%:(B($B%P%$%HC10L(B) */
-	struct	partition {	/* $B%Q!<%F%#%7%g%s%F!<%V%k(B */
-		u_long	p_size;	/* $B%Q!<%F%#%7%g%sFb$N%;%/%??t(B */
-		u_long	p_offset;	/* $B3+;O%;%/%?(B */
-		u_long	p_fsize;	/* $B%U%!%$%k%7%9%F%`5,Dj%U%i%0%a%s%H%5%$%:(B */
-		u_char	p_fstype;	/* $B%U%!%$%k%7%9%F%`%?%$%W!"2<5-;2>H(B */
-		u_char	p_frag;	/* $B%V%m%C%/$"$?$j$N%U%!%$%k%7%9%F%`%U%i%0%a%s%H(B */
+	u_int32_t d_spare[NSPARE];	/* $B>-Mh;H$&$?$a$NM=Hw(B */
+	u_int32_t d_magic2;		/* $B%^%8%C%/%J%s%P(B ($B:FEY(B) */
+	u_int16_t d_checksum;		/* $B%G!<%?$r4^$`%Q!<%F%#%7%g%s$N(B xor */
+
+			/* $B%U%!%$%k%7%9%F%`$H%Q!<%F%#%7%g%s>pJs(B */
+	u_int16_t d_npartitions;	/* $B8e$KB3$/%Q!<%F%#%7%g%s?t(B */
+	u_int32_t d_bbsize;		/* sn0 $B$N%V!<%HNN0h$NBg$-$5(B($B%P%$%HC10L(B) */
+	u_int32_t d_sbsize;		/* fs $B%9!<%Q%V%m%C%/$N:GBg%5%$%:(B($B%P%$%HC10L(B) */
+	struct	partition {		/* $B%Q!<%F%#%7%g%s%F!<%V%k(B */
+		u_int32_t p_size;	/* $B%Q!<%F%#%7%g%sFb$N%;%/%??t(B */
+		u_int32_t p_offset;	/* $B3+;O%;%/%?(B */
+		u_int32_t p_fsize;	/* $B%U%!%$%k%7%9%F%`5,Dj%U%i%0%a%s%H%5%$%:(B */
+		u_int8_t p_fstype;	/* $B%U%!%$%k%7%9%F%`%?%$%W!"2<5-;2>H(B */
+		u_int8_t p_frag;	/* $B%V%m%C%/$"$?$j$N%U%!%$%k%7%9%F%`%U%i%0%a%s%H(B */
 		union {
-			u_short	cpg;	/* UFS: FS $B%0%k!<%W$"$?$j$N%7%j%s%@?t(B */
-			u_short	sgs;	/* LFS: FS $B%;%0%a%s%H%7%U%H(B */
+			u_int16_t cpg;	/* UFS: FS $B%0%k!<%W$"$?$j$N%7%j%s%@?t(B */
+			u_int16_t sgs;	/* LFS: FS $B%;%0%a%s%H%7%U%H(B */
 		} __partition_u1;
 #define	p_cpg	__partition_u1.cpg
 #define	p_sgs	__partition_u1.sgs
-		u_short	p_cpg;	/* $B%0%k!<%W$"$?$j$N%U%!%$%k%7%9%F%`%7%j%s%@?t(B */
 	} d_partitions[MAXPARTITIONS];	/* $B<B:]$K$O$b$C$H$"$k(B */
 };
+#else /* LOCORE */
+	/*
+	 * asm $B%V!<%H%U%!%$%kMQ$N%*%U%;%C%H(B
+	 */
+	.set	d_secsize,40
+	.set	d_nsectors,44
+	.set	d_ntracks,48
+	.set	d_ncylinders,52
+	.set	d_secpercyl,56
+	.set	d_secperunit,60
+	.set	d_end_,276		/* $B%G%#%9%/%i%Y%k$NBg$-$5(B */
+#endif /* LOCORE */
 
 /* d_type values: */
-#define	DTYPE_SMD	1	/* SMD, XSMD; VAX hp/up */
-#define	DTYPE_MSCP	2	/* MSCP */
-#define	DTYPE_DEC	3	/* $B$=$NB>$N(B DEC (rk, rl) */
-#define	DTYPE_SCSI	4	/* SCSI */
-#define	DTYPE_ESDI	5	/* ESDI $B%$%s%?%U%'!<%9(B */
-#define	DTYPE_ST506	6	/* ST506 $BB>(B */
-#define	DTYPE_HPIB	7	/* CS/80 on HP-IB */
-#define	DTYPE_HPFL	8	/* HP $B%U%!%$%P%j%s%/(B */
-#define	DTYPE_FLOPPY	10	/* $B%U%m%C%T!<(B */
+#define	DTYPE_SMD		1		/* SMD, XSMD; VAX hp/up */
+#define	DTYPE_MSCP		2		/* MSCP */
+#define	DTYPE_DEC		3		/* $B$=$NB>$N(B DEC (rk, rl) */
+#define	DTYPE_SCSI		4		/* SCSI */
+#define	DTYPE_ESDI		5		/* ESDI $B%$%s%?%U%'!<%9(B */
+#define	DTYPE_ST506		6		/* ST506 $BB>(B */
+#define	DTYPE_HPIB		7		/* HP-IB $B>e$N(B CS/80 */
+#define	DTYPE_HPFL		8		/* HP $B%U%!%$%P%j%s%/(B */
+#define	DTYPE_FLOPPY		10		/* $B%U%m%C%T(B */
+#define	DTYPE_CCD		11		/* $B%3%s%+%A%M!<%H2=%G%#%9%/(B */
+#define	DTYPE_VINUM		12		/* vinum $B%\%j%e!<%`(B */
+#define	DTYPE_DOC2K		13		/* Msys DiskOnChip */
 
+#if defined(PC98) && !defined(PC98_ATCOMPAT)
+#define	DSTYPE_SEC256		0x80		/* $BJ*M}%;%/%?%5%$%:$O(B 256 */
+#endif
+
 #ifdef DKTYPENAMES
 static char *dktypenames[] = {
 	"unknown",
@@ -270,29 +312,33 @@
 	"HP-FL",
 	"type 9",
 	"floppy",
-	0
+	"CCD",
+	"Vinum",
+	"DOC2K",
+	NULL
 };
 #define DKMAXTYPES	(sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
 #endif
 
 /*
-* $B%U%!%$%k%7%9%F%`%?%$%W$H%P!<%8%g%s(B
-* $B%Q!<%F%#%7%g%s$"$?$j$NB>$N%U%!%$%k%7%9%F%`8GM->pJs$K;H$o$l$^$9!#(B
-*/
-#define	FS_UNUSED	0	/* $BL$;HMQ(B */
-#define	FS_SWAP		1	/* $B%9%o%C%W(B */
-#define	FS_V6		2	/* $BBh(B 6 $BHG(B */
-#define	FS_V7		3	/* $BBh(B 7 $BHG(B */
-#define	FS_SYSV		4	/* System V */
-#define	FS_V71K		5	/* 7 $BHG(B 1K $B%V%m%C%/(B (4.1, 2.9) */
-#define	FS_V8		6	/* 8 $BHG(B 4K $B%V%m%C%/(B */
-#define	FS_BSDFFS	7	/* 4.2BSD fast $B%U%!%$%k%7%9%F%`(B */
-#define	FS_MSDOS	8	/* MSDOS $B%U%!%$%k%7%9%F%`(B */
-#define	FS_BSDLFS	9	/* 4.4BSD log-structured $B%U%!%$%k%7%9%F%`(B */
-#define	FS_OTHER	10	/* $B;HMQCf$@$,L$CN(B/$BL$%5%]!<%H(B */
-#define	FS_HPFS		11	/* OS/2 high-performance $B%U%!%$%k%7%9%F%`(B */
-#define	FS_ISO9660	12	/* ISO 9660, $BDL>o$O(B CD-ROM */
-#define	FS_BOOT		13	/* $B%V!<%H%9%H%i%C%W$r4^$`%Q!<%F%#%7%g%s(B */
+ * $B%U%!%$%k%7%9%F%`%?%$%W$H%P!<%8%g%s(B
+ * $B%Q!<%F%#%7%g%s$"$?$j$NB>$N%U%!%$%k%7%9%F%`8GM->pJs$K;H$o$l$^$9!#(B
+ */
+#define	FS_UNUSED	0		/* $BL$;HMQ(B */
+#define	FS_SWAP		1		/* $B%9%o%C%W(B */
+#define	FS_V6		2		/* $BBh(B 6 $BHG(B */
+#define	FS_V7		3		/* $BBh(B 7 $BHG(B */
+#define	FS_SYSV		4		/* System V */
+#define	FS_V71K		5		/* 7 $BHG(B 1K $B%V%m%C%/(B (4.1, 2.9) */
+#define	FS_V8		6		/* 8 $BHG(B 4K $B%V%m%C%/(B */
+#define	FS_BSDFFS	7		/* 4.2BSD $B9bB.%U%!%$%k%7%9%F%`(B */
+#define	FS_MSDOS	8		/* MSDOS $B%U%!%$%k%7%9%F%`(B */
+#define	FS_BSDLFS	9		/* 4.4BSD $B%m%09=B$%U%!%$%k%7%9%F%`(B */
+#define	FS_OTHER	10		/* $B;HMQCf$@$,L$CN(B/$BL$%5%]!<%H(B */
+#define	FS_HPFS		11		/* OS/2 $B9b@-G=%U%!%$%k%7%9%F%`(B */
+#define	FS_ISO9660	12		/* ISO 9660, $BDL>o$O(B CD-ROM */
+#define	FS_BOOT		13		/* $B%V!<%H%9%H%i%C%W$r4^$`%Q!<%F%#%7%g%s(B */
+#define	FS_VINUM	14		/* Vinum $B%I%i%$%V(B */
 
 #ifdef	DKTYPENAMES
 static char *fstypenames[] = {
@@ -310,35 +356,36 @@
 	"HPFS",
 	"ISO9660",
 	"boot",
-	0
+	"vinum",
+	NULL
 };
 #define FSMAXTYPES	(sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
 #endif
 
 /*
-* $BB?MM$J%I%i%$%V$,6&M-$9$k%U%i%0(B
-*/
-#define	D_REMOVABLE	0x01	/* $B%j%`!<%P%V%k%a%G%#%"(B */
-#define	D_ECC		0x02	/* ECC $B%5%]!<%H(B */
-#define	D_BADSECT	0x04	/* $B%P%C%I%;%/%?%U%)%o!<%I$N%5%]!<%H(B */
-#define	D_RAMDISK	0x08	/* $B%G%#%9%/%(%_%e%l!<%?(B */
-#define	D_CHAIN		0x10	/* back-back $BE>Aw$,$G$-$k(B */
+ * $BB?MM$J%I%i%$%V$,6&M-$9$k%U%i%0(B
+ */
+#define		D_REMOVABLE	0x01		/* $B%j%`!<%P%V%k%a%G%#%"(B */
+#define		D_ECC		0x02		/* ECC $B%5%]!<%H(B */
+#define		D_BADSECT	0x04		/* $B%P%C%I%;%/%?%U%)%o!<%I$N%5%]!<%H(B */
+#define		D_RAMDISK	0x08		/* $B%G%#%9%/%(%_%e%l!<%?(B */
+#define		D_CHAIN		0x10		/* $BO"B3E>Aw2DG=(B */
 
 /*
-* SMD $B$N%I%i%$%V%G!<%?(B
-*/
+ * SMD $B$N%I%i%$%V%G!<%?(B
+ */
 
 #define	d_smdflags	d_drivedata[0]
-#define	D_SSE		0x1	/* $B%;%/%?%9%-%C%W$N%5%]!<%H(B */
+#define		D_SSE		0x1		/* $B%;%/%?%9%-%C%W$N%5%]!<%H(B */
 #define	d_mindist	d_drivedata[1]
 #define	d_maxdist	d_drivedata[2]
 #define	d_sdist		d_drivedata[3]
 
 /*
-* ST506 $B$N%I%i%$%V%G!<%?(B
-*/
+ * ST506 $B$N%I%i%$%V%G!<%?(B
+ */
 #define d_precompcyl	d_drivedata[0]
-#define d_gap3		d_drivedata[1]	/* $B%U%)!<%^%C%H;~$K$N$_;H$o$l$k(B */
+#define d_gap3		d_drivedata[1]		/* $B%U%)!<%^%C%H;~$K$N$_;HMQ(B */
 
 /*
  * SCSI $B$N%I%i%$%V%G!<%?(B
@@ -354,40 +401,159 @@
 */
 struct format_op {
 	char	*df_buf;
-	int	df_count;	/* $BCM(B-$B7k2L(B */
-	daddr_t	df_startblk;
-	int	df_reg[8];	/* $B7k2L(B */
+	int	 df_count;		/* $BCM(B-$B7k2L(B */
+	daddr_t	 df_startblk;
+	int	 df_reg[8];		/* $B7k2L(B */
 };
 
 /*
-* $B%G%#%9%/>e$N%Q!<%F%#%7%g%s$K4X$9$k>pJs$r(B
-* $B0z$-=P$9$?$a$KFbIt$G;H$o$l$k9=B$BN(B
-*/
+ * $B%G%#%9%/>e$N%Q!<%F%#%7%g%s$K4X$9$k>pJs$r(B
+ * $B0z$-=P$9$?$a$KFbIt$G;H$o$l$k9=B$BN(B
+ */
 struct partinfo {
-	struct	disklabel *disklab;
-	struct	partition *part;
+	struct disklabel *disklab;
+	struct partition *part;
+};
+
+/* DOS $B%Q!<%F%#%7%g%s%F!<%V%k(B -- $B%V!<%H%V%m%C%/$K$"$j$^$9(B */
+
+#if defined(PC98) && !defined(PC98_ATCOMPAT)
+#define	DOSBBSECTOR	0	/* DOS $B%V!<%H%V%m%C%/$NAjBP%;%/%?HV9f(B */
+#define DOSLABELSECTOR	1	/* 0: 256b/s, 1: 512b/s */
+#define	DOSPARTOFF	0
+#define NDOSPART	16
+#define	DOSPTYP_386BSD	0x94	/* 386BSD $B%Q!<%F%#%7%g%s%?%$%W(B */
+#define	MBR_PTYPE_FreeBSD 0x94	/* FreeBSD $B%Q!<%F%#%7%g%s%?%$%W(B */
+
+struct dos_partition {
+    	unsigned char	dp_mid;
+#define DOSMID_386BSD		(0x14|0x80) /* 386bsd|bootable */
+	unsigned char	dp_sid;
+#define DOSSID_386BSD		(0x44|0x80) /* 386bsd|active */	
+	unsigned char	dp_dum1;
+	unsigned char	dp_dum2;
+	unsigned char	dp_ipl_sct;
+	unsigned char	dp_ipl_head;
+	unsigned short	dp_ipl_cyl;
+	unsigned char	dp_ssect;	/* $B@hF,%;%/%?(B */
+	unsigned char	dp_shd;		/* $B@hF,%X%C%I(B */
+	unsigned short	dp_scyl;	/* $B@hF,%7%j%s%@(B */
+	unsigned char	dp_esect;	/* $B=*C<%;%/%?(B */
+	unsigned char	dp_ehd;		/* $B=*C<%X%C%I(B */
+	unsigned short	dp_ecyl;	/* $B=*C<%7%j%s%@(B */
+	unsigned char	dp_name[16];
 };
 
+#else /* IBMPC */
+#define DOSBBSECTOR	0	/* DOS $B%V!<%H%V%m%C%/$NAjBP%;%/%?HV9f(B */
+#define DOSPARTOFF	446
+#define NDOSPART	4
+#define	DOSPTYP_386BSD	0xa5	/* 386BSD $B%Q!<%F%#%7%g%s%?%$%W(B */
+
+struct dos_partition {
+	unsigned char	dp_flag;	/* $B%V!<%H%9%H%i%C%W%U%i%0(B */
+	unsigned char	dp_shd;		/* $B@hF,%X%C%I(B */
+	unsigned char	dp_ssect;	/* $B@hF,%;%/%?(B */
+	unsigned char	dp_scyl;	/* $B@hF,%7%j%s%@(B */
+	unsigned char	dp_typ;		/* $B%Q!<%F%#%7%g%s%?%$%W(B */
+	unsigned char	dp_ehd;		/* $B=*C<%X%C%I(B */
+	unsigned char	dp_esect;	/* $B=*C<%;%/%?(B */
+	unsigned char	dp_ecyl;	/* $B=*C<%7%j%s%@(B */
+	u_int32_t	dp_start;	/* $B@dBPE*$J@hF,%;%/%?HV9f(B */
+	u_int32_t	dp_size;	/* $B%;%/%??t$G$N%Q!<%F%#%7%g%s%5%$%:(B */
+};
+#endif
+
+#define DPSECT(s) ((s) & 0x3f)		/* $B%;%/%?MQ$N%S%C%H$NJ,N%(B */
+#define DPCYL(c, s) ((c) + (((s) & 0xc0)<<2)) /* $B$3$A$i$O%7%j%s%@MQ(B */
+
 /*
-* $B%G%#%9%/8GM-$N(B ioctl
-*/
-	/* $B%G%#%9%/%i%Y%k$N<hF@$H@_Dj(B; $BFbIt$G$O(B DIOCGPART $B$,;H$o$l$k(B */
-#define DIOCGDINFO   _IOR('d', 101, struct disklabel) /* $B<hF@(B */
-#define DIOCSDINFO   _IOW('d', 102, struct disklabel) /* $B@_Dj(B */
-#define DIOCWDINFO   _IOW('d', 103, struct disklabel) /* $B@_Dj!"%G%#%9%/99?7(B */
-#define DIOCGPART    _IOW('d', 104, struct partinfo)  /* $B%Q!<%F%#%7%g%s<hF@(B */
-
-/* do format operation, read or write */
-#define DIOCRFORMAT	_IOWR('d', 105, struct format_op)
-#define DIOCWFORMAT	_IOWR('d', 106, struct format_op)
-
-#define DIOCSSTEP	_IOW('d', 107, int) /* $B%9%F%C%W%l!<%H@_Dj(B */
-#define DIOCSRETRIES	_IOW('d', 108, int) /* $B%j%H%i%$2s?t$N@_Dj(B */
-#define DIOCWLABEL	_IOW('d', 109, int) /* $B=q$-9~$_2D(B/$BIT2D$N%i%Y%k(B */
+ * $B%G%#%9%/8GM-$N(B ioctl
+ */
+		/* $B%G%#%9%/%i%Y%k$N<hF@$H@_Dj(B; $BFbIt$G$O(B DIOCGPART $B$,;H$o$l$k(B */
+#define DIOCGDINFO	_IOR('d', 101, struct disklabel)/* $B<hF@(B */
+#define DIOCSDINFO	_IOW('d', 102, struct disklabel)/* $B@_Dj(B */
+#define DIOCWDINFO	_IOW('d', 103, struct disklabel)/* $B@_Dj!"%G%#%9%/99?7(B */
+#define DIOCGPART	_IOW('d', 104, struct partinfo) /* $B%Q!<%F%#%7%g%s<hF@(B */
+
+#define DIOCWLABEL	_IOW('d', 109, int)	/* $B%i%Y%k$N=q$-9~$_2D(B/$BIT2D(B */
 
-#define DIOCSBAD	_IOW('d', 110, struct dkbad) /* $B%+!<%M%k(B dkbad $B$N@_Dj(B */
+#ifdef _KERNEL
+
+/*
+ * XXX $B%G%#%9%/%^%$%JHV9f$N%(%s%3!<%G%#%s%0$OJL$N$H$3$m$K$"$k$Y$-$G$9!#(B
+ *
+ * $B$h$jNI$$2DG=@-$N%(%s%3!<%G%#%s%0$K$D$$$F$O(B <sys/reboot.h> $B$r;2>H$/$@$5$$!#(B
+ *
+ * "cpio -H newc" $B$GBg$-$J%^%$%JHV9f$N%G%P%$%9%U%!%$%k(B ($B$7$+$7(B 2^31 $BL$K~(B)
+ * $B$r%P%C%/%"%C%W2DG=$G$9!#8E$$(B cpio $B%U%)!<%^%C%H$HA4(B tar $B%U%)!<%^%C%H$G$O(B
+ * $B%S%C%H?t$,IT==J,$G$"$j!"$^$?(B cpio $B$H(B tar $B$O%S%C%HAS<:$rJs9p$7$^$;$s!#(B
+ * $B$^$?!"Id9f3HD%$K%P%0$,$"$j$^$9!#(B
+ */
+
+/*
+       3                   2                   1                   0
+     1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+    _________________________________________________________________
+    | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
+    -----------------------------------------------------------------
+    |    TYPE     |UNIT_2 | SLICE   |  MAJOR?       |  UNIT   |PART |
+    -----------------------------------------------------------------
+ */
+#define	dkmakeminor(unit, slice, part) \
+				(((slice) << 16) | (((unit) & 0x1e0) << 16) | \
+				(((unit) & 0x1f) << 3) | (part))
+static __inline dev_t
+dkmodpart(dev_t dev, int part)
+{
+	return (makedev(major(dev), (minor(dev) & ~7) | part));
+}
+
+static __inline dev_t
+dkmodslice(dev_t dev, int slice)
+{
+	return (makedev(major(dev), (minor(dev) & ~0x1f0000) | (slice << 16)));
+}
+
+#define	dkpart(dev)		(minor(dev) & 7)
+#define	dkslice(dev)		((minor(dev) >> 16) & 0x1f)
+#define	dktype(dev)       	((minor(dev) >> 25) & 0x7f)
+
+static __inline u_int
+dkunit(dev_t dev)
+{
+	return (((minor(dev) >> 16) & 0x1e0) | ((minor(dev) >> 3) & 0x1f));
+}
+
+struct	buf;
+struct	buf_queue_head;
+
+int	bounds_check_with_label __P((struct buf *bp, struct disklabel *lp,
+				     int wlabel));
+void	diskerr __P((struct buf *bp, char *what, int pri, int blkdone,
+		     struct disklabel *lp));
+void	disksort __P((struct buf *ap, struct buf *bp));
+u_int	dkcksum __P((struct disklabel *lp));
+char	*readdisklabel __P((dev_t dev, struct disklabel *lp));
+void	bufqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
+int	setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
+			  u_long openmask));
+int	writedisklabel __P((dev_t dev, struct disklabel *lp));
+#ifdef __alpha__
+void	alpha_fix_srm_checksum __P((struct buf *bp));
+#endif
+
+#endif /* _KERNEL */
+
+#endif /* LOCORE */
+
+#ifndef _KERNEL
+__BEGIN_DECLS
+struct disklabel *getdiskbyname __P((const char *));
+__END_DECLS
+#endif
 
-#endif LOCORE
+#endif /* !_SYS_DISKLABEL_H_ */
 .Ed
 .Sh $B4XO"9`L\(B
 .Xr disktab 5 ,
Index: man5/elf.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/elf.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf.5
--- man5/elf.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/elf.5	2000/02/23 01:36:31
@@ -22,7 +22,7 @@
 .\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\"SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man5/elf.5,v 1.4 1999/12/07 22:10:35 chris Exp %
+.\"	%FreeBSD: src/share/man/man5/elf.5,v 1.5 2000/01/24 19:36:52 asmodai Exp %
 .\"
 .Dd July 31, 1999
 .\" jpman %Id: elf.5,v 1.3 1999/12/29 10:29:14 horikawa Stab %
@@ -1300,5 +1300,5 @@
 .Xr elf 5
 $B$N%^%K%e%"%k%Z!<%8$K?(H/$5$l$F!"(B
 .An Jeroen Ruigrok van der Werven 
-.Aq asmodai@wxs.nl
+.Aq asmodai@freebsd.org
 $B$,=q$-$^$7$?!#(B
Index: man5/groff_font.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/groff_font.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 groff_font.5
--- man5/groff_font.5	2000/02/15 14:34:47	1.1.1.1
+++ man5/groff_font.5	2000/02/23 01:36:34
@@ -37,7 +37,7 @@
 .\" WORD: font position	$B%U%)%s%H0LCV(B (troff.1 $B$N5-=R$K$"$o$;$?(B)
 .\" WORD: mount		$B%^%&%s%H(B
 .\" 
-.TH GROFF_FONT 5 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_FONT 5 "7 September 1996" "Groff Version 1.15"
 .SH $BL>>N(B
 groff_font \- groff $B$N%G%P%$%9$H%U%)%s%H$r5-=R$9$k%U%!%$%k$N=q<0(B
 .SH $B2r@b(B
Index: man5/groff_out.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/groff_out.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 groff_out.5
--- man5/groff_out.5	2000/02/15 14:34:47	1.1.1.1
+++ man5/groff_out.5	2000/02/23 01:36:37
@@ -1,6 +1,6 @@
 '\" e
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,6 +16,9 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/man/groff_out.man,v 1.3 2000/01/12 10:26:19 asmodai Exp %
+
 ..
 .\" This man page must be preprocessed with eqn.
 .\"
@@ -30,7 +33,7 @@
 .\" WORD: print			$B0u;z(B
 .ie \n(.g .ds ic \/
 .el .ds ic \^
-.TH GROFF_OUT 5 "11 May 1998" "Groff Version 1.11"
+.TH GROFF_OUT 5 "12 January 2000" "Groff Version 1.15"
 .SH $BL>>N(B
 groff_out \- groff $B$NCf4V=PNO%U%)!<%^%C%H(B
 .SH $B2r@b(B
Index: man5/hosts.equiv.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/hosts.equiv.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 hosts.equiv.5
--- man5/hosts.equiv.5	2000/02/15 14:34:47	1.1.1.1
+++ man5/hosts.equiv.5	2000/02/23 01:36:37
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.7 1999/08/28 00:20:45 peter Exp %
+.\" %FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.8 2000/01/07 12:58:57 phantom Exp %
 .\"
 .\" jpman %Id: hosts.equiv.5,v 1.3 1998/06/12 11:02:12 mutoh Stab %
 .Dd Feb 1996
@@ -57,22 +57,30 @@
 [+-][hostname|@netgroup] [[+-][username|@netgroup]]
 .Ed
 .Pp
-``@'' $B$O(B netgroup $B$H$$$&%0%k!<%W$K$h$C$F%[%9%H!"$^$?$O%f!<%6$rI=$7$^$9!#(B
-$BC1FH$N(B ``+'' $B$OA4$F$N%[%9%H!"$^$?$O%f!<%6$H0lCW$7$^$9!#(B
-$BA0$K(B ``-'' $B$rH<$&%[%9%HL>$O!"0lCW$9$kA4$F$N%[%9%H$H$=$N%[%9%H>e$NA4$F$N(B
+.Dq @
+$B$O(B netgroup $B$H$$$&%0%k!<%W$K$h$C$F%[%9%H!"$^$?$O%f!<%6$rI=$7$^$9!#(B
+$BC1FH$N(B
+.Dq +
+$B$OA4$F$N%[%9%H!"$^$?$O%f!<%6$H0lCW$7$^$9!#A0$K(B
+.Dq -
+$B$rH<$&%[%9%HL>$O!"0lCW$9$kA4$F$N%[%9%H$H$=$N%[%9%H>e$NA4$F$N(B
 $B%f!<%6$r5qH]$7$^$9!#(B
-$BA0$K(B ``-'' $B$rH<$&%f!<%6L>$O!";XDj$5$l$?%[%9%H>e$N0lCW$7$?%f!<%6A4$F$r(B
-$B5qH]$7$^$9!#(B
+$BA0$K(B
+.Dq -
+$B$rH<$&%f!<%6L>$O!";XDj$5$l$?%[%9%H>e$N0lCW$7$?%f!<%6A4$F$r5qH]$7$^$9!#(B
 .Pp
 $B3F9`L\$OG$0U$N?t$N6uGr$d%?%VJ8;z$G6h@Z$i$l$^$9!#(B
-``#'' $B$O%3%a%s%H$N3+;O$rI=$7!"$3$l0J9_$N9TKv$^$G$NJ8;z$O$3$N%U%!%$%k$r(B
+.Dq #
+$B$O%3%a%s%H$N3+;O$rI=$7!"$3$l0J9_$N9TKv$^$G$NJ8;z$O$3$N%U%!%$%k$r(B
 $B8!:w$9$k%k!<%A%s$K$h$C$F2r<a$5$l$^$;$s!#(B
 .Pp
 $B%[%9%HL>$O!"%$%s%?!<%M%C%H%"%I%l%9A`:n%i%$%V%i%j(B
 .Xr inet 3
 $B$N(B
 .Xr inet_addr 3
-$B%k!<%A%s$rMQ$$$?EAE}E*$J(B ``.'' ($B%I%C%H(B) $BI=5-$G;XDj$5$l$^$9!#(B
+$B%k!<%A%s$rMQ$$$?EAE}E*$J(B
+.Dq \&.
+($B%I%C%H(B) $BI=5-$G;XDj$5$l$^$9!#(B
 $B%[%9%HL>$O!"%U%#!<%k%I6h@Z$jJ8;z!"2~9T!"$*$h$S%3%a%s%HJ8;z(B
 $B0J30$N$"$i$f$k0u;z2DG=J8;z$r4^$`$3$H$,$G$-$^$9!#(B
 .Pp
@@ -84,16 +92,26 @@
 .Pp
 .Dl bar.com foo
 .Pp
-$B%[%9%H(B ``bar.com'' $B$N(B $B%f!<%6(B ``foo'' $B$r?.Mj$7$^$9!#(B
+$B%[%9%H(B
+.Dq bar.com
+$B$N%f!<%6(B
+.Dq foo
+$B$r?.Mj$7$^$9!#(B
 .Pp
 .Dl +@allclient 
 .Pp
-$B%M%C%H%0%k!<%W(B ``allclient'' $B$NA4$F$N%[%9%H$r?.Mj$7$^$9!#(B
+$B%M%C%H%0%k!<%W(B
+.Dq allclient
+$B$NA4$F$N%[%9%H$r?.Mj$7$^$9!#(B
 .Pp
 .Dl +@allclient -@dau
 .Pp
-$B%M%C%H%0%k!<%W(B  ``allclient'' $B$NA4$F$N%[%9%H$H$=$N%f!<%6$r?.Mj$7$^$9$,!"(B
-$B%M%C%H%0%k!<%W(B  ``dau'' $B$N%f!<%6$ONc30$G$9!#(B
+$B%M%C%H%0%k!<%W(B
+.Dq allclient
+$B$NA4$F$N%[%9%H$H$=$N%f!<%6$r?.Mj$7$^$9$,!"(B
+$B%M%C%H%0%k!<%W(B
+.Dq dau
+$B$N%f!<%6$ONc30$G$9!#(B
 .Sh $B4XO"%U%!%$%k(B
 .Bl -tag -width /etc/hosts.equivxxx -compact
 .It Pa /etc/hosts.equiv
@@ -120,5 +138,6 @@
 .Xr named 8
 .Sh $B%P%0(B
 $B$3$N%^%K%e%"%k%Z!<%8$OIT40A4$G$9!#(B
-$B$h$j>\:Y$K$D$$$F$O!"(B lib/libc/net/rcmd.c $B$N%=!<%9$+!"(B SunOS $B$N(B
-$B%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
+$B$h$j>\:Y$K$D$$$F$O!"(B
+.Pa lib/libc/net/rcmd.c
+$B$N%=!<%9$+!"(B SunOS $B$N%^%K%e%"%k%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
Index: man5/login.conf.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/login.conf.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 login.conf.5
--- man5/login.conf.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/login.conf.5	2000/02/23 01:36:54
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.19 1999/09/21 19:39:27 phantom Exp %
+.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.20 2000/01/19 10:54:43 ru Exp %
 .\"
 .\" jpman %Id: login.conf.5,v 1.3 1998/07/21 23:10:00 jsakai Stab %
 .Dd November 22, 1996
@@ -188,7 +188,7 @@
 .It requirehome 	bool	false	$B%m%0%$%s$N$?$a$KM-8z$J%[!<%`%G%#%l%/%H%j$,I,MW(B
 .It setenv	list		$B%3%s%^$G6h@Z$i$l$?4D6-JQ?t$H$=$N@_DjCM$N%j%9%H(B
 .It shell	prog		$B%Q%9%o!<%I%U%!%$%k$G;XDj$5$l$F$$$k%7%'%k$h$jM%@h$7$F<B9T$5$l$k%;%C%7%g%s%7%'%k!#(BSHELL $B4D6-JQ?t$NCM$O!"%Q%9%o!<%I%U%!%$%k$G;XDj$5$l$F$$$k$b$N$K$J$j$^$9!#(B
-.It term	string	su	$BB>$N<jCJ$K$h$C$F7hDj$G$-$J$$>l9g$N%G%U%)%k%H$NC<Kv%?%$%W(B
+.It term	string		$BB>$N<jCJ$K$h$C$F7hDj$G$-$J$$>l9g$N%G%U%)%k%H$NC<Kv%?%$%W(B
 .It timezone	string		$TZ $B4D6-JQ?t$N%G%U%)%k%HCM(B
 .It umask	number	022	umask $B$N=i4|CM!#B3$/?t;z$,(B 8 $B?J?t$H2r<a$5$l$k$h$&$K!">o$K(B 0 $B$+$i;O$a$^$9(B
 .It welcome	file	/etc/motd	$B%&%'%k%+%`%a%C%;!<%8$,F~$C$F$$$k%U%!%$%k(B
Index: man5/netgroup.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/netgroup.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 netgroup.5
--- man5/netgroup.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/netgroup.5	2000/02/23 01:36:54
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/mountd/netgroup.5,v 1.7 1999/08/28 00:13:44 peter Exp %
+.\" %FreeBSD: src/sbin/mountd/netgroup.5,v 1.8 2000/01/23 01:30:04 mpp Exp %
 .\" jpman %Id: netgroup.5,v 1.3 1998/07/31 00:57:44 moro Stab %
 .\"
 .Dd December 11, 1993
@@ -58,8 +58,7 @@
 .Pp
 $B$3$3$G(B 
 .Sy host ,
-.Sy user 
-$B$*$h$S(B
+.Sy user ,
 .Sy domain
 $B$O!"$=$l$>$l$N9=@.MWAG$KBP1~$9$kJ8;zNsL>$G$9!#(B
 $B%3%s%^$G6h@Z$i$l$?%U%#!<%k%I$O$I$l$b!"6u$K$9$k;v$G(B ``$B%o%$%k%I%+!<%I(B'' $B$r!"(B
@@ -81,7 +80,7 @@
 $B$H0l=o$KMQ$$$i$l!"%m!<%+%k$N(B
 .Pa /etc/netgroup
 $B%U%!%$%k$OL5;k$5$l$^$9!#(B
-.Bx Free
+.Fx
 $B$G$O(B
 .Tn NIS
 $B$+%m!<%+%k%U%!%$%k$N(B
@@ -102,13 +101,12 @@
 .Nm
 $B%G!<%?%Y!<%9$O(B
 .Fn innetgr 3
-$B$,AGAa$/>H2q$r40N;$5$;$k$?$a$N%-!<9`L\$r;}$C$?(B 3$B$D$N%^%C%W(B
-(netgroup, netgroup.byuser $B$=$7$F(B netgroup.byhost)$B$K$h$C$F9=@.$5$l$F$$$^$9!#(B
-.Bx Free
+$B$,AGAa$/>H2q$r40N;$5$;$k$?$a$N%-!<9`L\$r;}$C$?(B 3 $B$D$N%^%C%W(B
+(netgroup $B$H(B netgroup.byuser $B$H(B netgroup.byhost) $B$K$h$C$F9=@.$5$l$F$$$^$9!#(B
+.Fx
 $B$N(B
 .Nm
-$B%7%9%F%`$O!"(B
-$B<!$NJ}K!$G(B
+$B%7%9%F%`$O!"<!$NJ}K!$G(B
 .Tn NIS
 $B$N(B
 .Nm
@@ -117,8 +115,7 @@
 .It
 $B$b$7(B
 .Pa /etc/netgroup
-$B%U%!%$%k$,B8:_$7$J$+$C$?>l9g!"$^$?$OB8:_$7$F$b6u$N>l9g!"$^$?$OB8:_$7$F(B
-$B$b(B
+$B%U%!%$%k$,B8:_$7$J$+$C$?>l9g!"$^$?$OB8:_$7$F$b6u$N>l9g!"$^$?$OB8:_$7$F$b(B
 .Sq +
 $B$7$+=q$+$l$F$$$J$$>l9g$G!"$3$l$i$N$$$:$l$+$N>l9g$K2C$($F(B
 .Tn NIS
Index: man5/pccard.conf.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/pccard.conf.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pccard.conf.5
--- man5/pccard.conf.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/pccard.conf.5	2000/02/23 01:36:55
@@ -23,8 +23,8 @@
 .\" 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.
-.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.10 1999/08/28 01:17:36 peter Exp %
 .\"
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.11 2000/01/26 17:54:00 iwasaki Exp %
 .\"
 .\" WORD: resource	$B%j%=!<%9(B[pccard.conf.5]
 .\"
@@ -138,6 +138,11 @@
 $B$3$N@_Dj$G4XO"$E$1$i$l$?%I%i%$%P$rA*Br$7!"(B
 $B$=$7$F(B ($B$b$7$"$l$P(B) $B3d$jEv$F$i$l$k$Y$-3d$j9~$_%l%Y%k$rA*Br$7$^$9!#(B
 $B%*%W%7%g%s$H$7$F%U%i%0$N=89g$r3d$jEv$F$k$3$H$b$G$-$^$9!#(B
+.Ar index
+$B$G$O!"(B``auto'' $B$^$?$O(B ``default'' $B$+!"(B
+$B%+!<%I$N(B CIS $B$+$i<hF@2DG=$J<hF@2DG=$JHO0O$r;XDj$7$^$9!#(B
+``auto'' $B$K$h$j!"(BCIS $B$+$i<hF@$5$l$k>pJs$H;HMQCf$N(B I/O $B%j%=!<%9$N>uBV$+$i!"(B
+$B<+F0E*$K%j%=!<%9$r3d$jEv$F2DG=$G$9!#(B
 .Pp
 $B%*%W%7%g%s$N(B
 .Em ether
Index: man5/rc.conf.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/rc.conf.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rc.conf.5
--- man5/rc.conf.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/rc.conf.5	2000/02/23 01:37:06
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.59 1999/12/21 11:22:06 sheldonh Exp %
+.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.63 2000/01/13 12:53:54 asmodai Exp %
 .\"
 .\" jpman %Id: rc.conf.5,v 1.3 1998/06/26 09:39:58 jsakai Stab %
 .\"
@@ -151,6 +151,9 @@
 (ISC DHCP $B%/%i%$%"%s%H$N(B /sbin/dhclient $B$,%G%U%)%k%H$G$9(B)$B!#(B
 .It Ar dhcp_flags
 ($BJ8;zNs(B) DHCP $B%/%i%$%"%s%H%W%m%0%i%`$KEO$9DI2C$N%U%i%0$G$9!#(B
+ISC DHCP $B%/%i%$%"%s%HMQ$KMxMQ2DG=$J%3%^%s%I%i%$%s%*%W%7%g%s$K$D$$$F$O!"(B
+.Xr dhclient 8
+$B%Z!<%8$r;2>H$7$F$/$@$5$$!#(B
 .It Ar firewall_enable
 ($B%V!<%kCM(B) $B5/F0;~$K%m!<%I$5$l$k%U%!%$%"%&%)!<%k5,B'$r;}$A$?$/$J$$$H$-$K$O(B
 .Ar NO
@@ -300,8 +303,21 @@
 ifconfig_ed0_alias4="inet 127.0.0.254 netmask 0xffffffff"
 
 .Ed
-$B$N$h$&$K$9$k$H!"(Balias4 $B$ODI2C$5$l(B\fB $B$J$$(B\fR $B$3$H$KCm0U$7$F$/$@$5$$!#$3$l$O(B
+$B$N$h$&$K$9$k$H!"(Balias4 $B$ODI2C$5$l(B
+.Em $B$J$$(B
+$B$3$H$KCm0U$7$F$/$@$5$$!#$3$l$O(B
 alias3 $B%(%s%H%j$rH4$+$7$?$3$H$G8!:w$,Cf;_$5$l$k$+$i$G$9!#(B
+.Pp
+$B%$%s%?%U%'!<%9$N(B DHCP $B$G$NN)$A>e$2$O!"(B
+.No ifconfig_ Ns Em interface
+$BJQ?t$r(B
+.Dq DHCP
+$B$K@_Dj$9$k$3$H$G2DG=$G$9!#(B
+$BNc$($P(B ed0 $B%G%P%$%9$r(B HDCP $B$G=i4|2=$9$k$K$O!"(B
+$B<!$N$h$&$J9T$r;XDj$9$l$P$h$$$G$9(B:
+.Bd -literal
+ifconfig_ed0="DHCP"
+.Ed
 .It Ar ppp_enable
 ($B%V!<%kCM(B)
 .Ar YES
@@ -436,7 +452,11 @@
 $B$,(B
 .Ar YES
 $B$K%;%C%H$5$l$F$$$k>l9g!"$3$l$i$O(B amd $B$KEO$9%U%i%0$H$J$j$^$9!#(B
-$B>\$7$/$O(B\fBinfo amd\fR $B%3%^%s%I$rMxMQ$7$F$/$@$5$$!#(B
+$B>\$7$/$O(B
+.Xr amd 8
+$B$N(B
+.Xr info 1
+$B%Z!<%8$rMxMQ$7$F$/$@$5$$!#(B
 .It Ar update_motd
 ($B%V!<%kCM(B)
 .Ar YES
@@ -496,7 +516,7 @@
 ($B%V!<%kCM(B)
 .Ar YES
 $B$K%;%C%H$9$k$H!"8"8BIU$1$i$l$F$$$J$$%^%&%s%HMW5a$r9T$J$&$?$a$K(B
-\fBPCNFSD\fR $B$N$h$&$J%5!<%S%9$r5v2D$7$^$9!#(B
+PCNFSD $B$N$h$&$J%5!<%S%9$r5v2D$7$^$9!#(B
 .It Ar nfs_reserved_port_only
 ($B%V!<%kCM(B)
 .Ar YES
@@ -1217,6 +1237,7 @@
 .Xr apm 8 ,
 .Xr atm 8 ,
 .Xr cron 8 ,
+.Xr dhclient 8 ,
 .Xr gated 8 ,
 .Xr ifconfig 8 ,
 .Xr inetd 8 ,
Index: man5/syslog.conf.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/syslog.conf.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 syslog.conf.5
--- man5/syslog.conf.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/syslog.conf.5	2000/02/23 01:37:09
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.14 1999/08/28 01:20:10 peter Exp %
+.\" %FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.15 2000/01/23 20:22:22 charnier Exp %
 .\"
 .\" jpman %Id: syslog.conf.5,v 1.3 1998/07/16 01:34:25 yohta Stab %
 .\"
@@ -64,16 +64,16 @@
 $B%U%#!<%k%I$O(B 1 $B$D0J>e$N%?%VJ8;z$^$?$O6uGr$G6h@Z$i$l$F$$$^$9!#(B
 .Pp
 $B6h@Z$j$K6uGr$r;HMQ$9$k$H!"(B
-.Em syslog.conf
+.Pa syslog.conf
 $B$OB>$N(B Unix $B$d(B Unix $BE*%7%9%F%`$H8_49@-$,L5$/$J$C$F$7$^$&$3$H$K(B
 $BCm0U$7$F$/$@$5$$!#(B
 $B$3$N5!G=$O!"@_Dj$rMF0W$K$7(B
 ($BNc$($P(B
-.Em syslog.conf
+.Pa syslog.conf
 $B$K%+%C%H%"%s%I%Z!<%9%H$G$-$k$h$&$K$7(B)$B!"(B
 $B$=$N:]H/@8$7F@$k%_%9$rHr$1$k$?$aDI2C$5$l$^$7$?!#(B
 $B$7$+$7$J$,$i$3$NJQ99$O!"8E$$%9%?%$%k$N(B
-.Em syslog.conf
+.Pa syslog.conf
 ($B$9$J$o$A%?%VJ8;z$N$_(B) $B$X$N%P%C%/%o!<%I%3%s%Q%A%S%j%F%#$rJ]$C$F$$$^$9!#(B
 .Pp
 .Em selector
@@ -131,7 +131,9 @@
 $B$^$?$O(B
 .Em !prog
 ($BA0<T$O0JA0$N(B syslogd $B$H$N8_49@-$N$?$a$N$b$N$G$9!#(B
-$BNc$($P(B syslog.conf $B%U%!%$%k$r6&M-$7$?$$;~$J$I$KJXMx$G$9(B)
+$BNc$($P(B
+.Pa syslog.conf
+$B%U%!%$%k$r6&M-$7$?$$;~$J$I$KJXMx$G$9(B)
 $B$G;O$^$j!"$=$l$>$l$N%V%m%C%/$O(B syslog $B$r8F$S=P$9FCDj$N%W%m%0%i%`$H(B
 $B4XO"IU$1$i$l$F$$$^$9!#(B
 $B$^$?!"%?%0(B ``foo'' $B$O!"(B
@@ -232,7 +234,7 @@
 .Dq @
 $BJ8;z$+$i;O$^$kI,MW$,$"$j$^$9(B)$B!#(B
 $B3:Ev$9$k%a%C%;!<%8$O!";XDj$5$l$?%[%9%H$N(B
-.Xr syslogd
+.Xr syslogd 8
 $B%W%m%0%i%`$KE>Aw$5$l$^$9!#(B
 .It
 $B%3%s%^$G6h@Z$i$l$?%f!<%6$N%j%9%H!#(B
@@ -348,7 +350,9 @@
 $B@_Dj%U%!%$%k(B
 .El
 .Sh $B%P%0(B
-$BJ#?t$N%;%l%/%?;XDj$O!";~!9;W$C$?$h$&$K8z2L$rH/4x$7$J$$;v$,$"$j$^$9!#(B
+$BJ#?t$N(B
+.Em selector
+$B;XDj$O!";~!9;W$C$?$h$&$K8z2L$rH/4x$7$J$$;v$,$"$j$^$9!#(B
 $BNc$($P!"(B
 .Dq mail.crit,*.err
 $B$H@_Dj$9$k$H!"(B
Index: man5/types.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/types.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 types.5
--- man5/types.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/types.5	2000/02/23 01:37:12
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)types.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/types.5,v 1.9 1999/08/28 00:20:51 peter Exp %
+.\" %FreeBSD: src/share/man/man5/types.5,v 1.10 2000/01/05 17:40:25 bde Exp %
 .\" jpman %Id: types.5,v 1.3 1998/07/30 15:28:11 horikawa Stab %
 .\"
 .Dd June 5, 1993
@@ -51,7 +51,7 @@
 #define	_SYS_TYPES_H_
 
 /* $B5!<o$K0MB8$9$k%Q%i%a!<%?!#(B */
-#include <machine/ansi.h>
+#include <sys/inttypes.h> /* <machine/ansi.h> $B$r%$%s%/%k!<%I$7$^$9(B */
 #include <machine/types.h>
 
 #ifndef _POSIX_SOURCE
@@ -63,13 +63,20 @@
 typedef	unsigned int	uint;		/* Sys V $B$H$N8_49@-(B */
 #endif
 
-typedef	u_int64_t	u_quad_t;	/* quads */
+typedef __uint8_t	u_int8_t;
+typedef __uint16_t	u_int16_t;
+typedef __uint32_t	u_int32_t;
+typedef __uint64_t	u_int64_t;
+
+typedef	u_int64_t	u_quad_t;	/* 4 $BG\D98l(B */
 typedef	int64_t		quad_t;
 typedef	quad_t *	qaddr_t;
 
 typedef	char *		caddr_t;	/* $B%3%"%"%I%l%9(B */
+typedef	__const char *	c_caddr_t;	/* $B%3%"%"%I%l%9$N(B const $B$X$N%]%$%s%?(B */
+typedef	__volatile char *v_caddr_t;	/* $B%3%"%"%I%l%9$N(B volatile $B$X$N%]%$%s%?(B */
 typedef	int32_t		daddr_t;	/* $B%G%#%9%/%"%I%l%9(B */
-typedef	u_int32_t	dev_t;		/* $B%G%P%$%9HV9f(B */
+typedef	u_int32_t	u_daddr_t;	/* $BId9fL5$7$N%G%#%9%/HV9f(B */
 typedef	u_int32_t	fixpt_t;	/* $B8GDj>.?tE@?t(B */
 typedef u_int32_t	fixpt_t;	/* $B8GDj>.?tE@?t(B */
 typedef	u_int32_t	gid_t;		/* $B%0%k!<%W(B ID */
@@ -80,25 +87,53 @@
 typedef	_BSD_OFF_T_	off_t;		/* $B%U%!%$%k%*%U%;%C%H(B */
 typedef	_BSD_PID_T_	pid_t;		/* $B%W%m%;%9(B ID */
 typedef	quad_t		rlim_t;		/* $B%j%=!<%9%j%_%C%H(B */
+#ifdef __alpha__		/* XXX should be in <machine/types.h> */
+typedef	int64_t		segsz_t;	/* $B%;%0%a%s%H%5%$%:(B */
+#else
 typedef	int32_t		segsz_t;	/* $B%;%0%a%s%H%5%$%:(B */
+#endif
 typedef	int32_t		swblk_t;	/* $B%9%o%C%W%*%U%;%C%H(B */
+typedef	int32_t		ufs_daddr_t;
 typedef	u_int32_t	uid_t;		/* $B%f!<%6(B id */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 typedef	int		boolean_t;
+typedef	u_int64_t	uoff_t;
 typedef	struct vm_page	*vm_page_t;
 #endif
 
+#ifdef _KERNEL
+
+struct specinfo;
+
+typedef	u_int32_t	udev_t;		/* $B%G%P%$%9HV9f(B */
+typedef struct specinfo	*dev_t;
+
+#else /* !_KERNEL */
+
+typedef	u_int32_t	dev_t;		/* $B%G%P%$%9HV9f(B */
+#define udev_t dev_t
+
 #ifndef _POSIX_SOURCE
+
 /*
- * minor() $B$O%$%s%G%C%/%9$NBe$o$j$K%/%C%-!<$rM?$($^$9!#$3$l$O!"%S%C%H(B0-15
- * $B$N0UL#$rJQ99$7$?$j!"%S%C%H(B 16-31 $B$r%7%U%H$7$F!"$=$l$r;H$o$J$$%G%P%$%9(B
- * $B$K$H$C$F;~4V$H%9%Z!<%9$NL5BL8/$$$K$J$k$3$H$r$7$?$/$J$$$+$i$G$9!#(B
+ * minor() $B$O%$%s%G%C%/%9$NBe$o$j$K%/%C%-!<$rM?$($^$9!#$3$NM}M3$O!"(B
+ * $B%S%C%H(B0-15 $B$N0UL#$NJQ99$rHr$1$k$?$a$H!"%S%C%H(B 16-31 $B$r%7%U%H$9$k(B
+ * $B$3$H$K5/0x$7$F$3$l$r;H$o$J$$%G%P%$%9$K$H$C$F$O;~4V$H6u4V$NL5BL8/$$(B
+ * $B$K$J$k$3$H$rHr$1$k$?$a$G$9!#(B
  */
-#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* $B%a%8%c!<HV9f(B */
-#define	minor(x)	((int)((x)&0xffff00ff))		/* $B%^%$%J!<HV9f(B */
-#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* dev_t $B$r@8@.$9$k(B */
-#endif
+.\" $B!V@N$O(B dev_t $B$O(B 16 $B%S%C%H$G!"(B
+.\" 16 bit $B$N>e0L(B 8 bit $B$,(B major $B$G2<0L(B 8 bit $B$,(B minor $B$@$C$?!W(B
+.\" $B$H$$$&$3$H$r0E$K8@$C$F$$$k!)(B
+.\" $B$@$H$9$k$H86J8$O0J>e$N$h$&$JA0DsCN<1$rMW5a$7$F$*$j!"FI2rFq$@$H;W$&(B
+.\" horikawa@jp.FreeBSD.org 2000/02/19
+#define major(x)        ((int)(((u_int)(x) >> 8)&0xff)) /* $B%a%8%c!<HV9f(B */
+#define minor(x)        ((int)((x)&0xffff00ff))         /* $B%^%$%JHV9f(B */
+#define makedev(x,y)    ((dev_t)(((x) << 8) | (y)))     /* dev_t $B$r@8@.$9$k(B */
+
+#endif /* _POSIX_SOURCE */
+
+#endif /* !_KERNEL */
 
 #include <machine/endian.h>
 
@@ -132,21 +167,6 @@
 #undef	_BSD_TIMER_T_
 #endif
 
-#ifdef	_BSD_UINT8_T_
-typedef	_BSD_UINT8_T_	uint8_t;
-#undef	_BSD_UINT8_T_
-#endif
-
-#ifdef	_BSD_UINT16_T_
-typedef	_BSD_UINT16_T_	uint16_t;
-#undef	_BSD_UINT16_T_
-#endif
-
-#ifdef	_BSD_UINT32_T_
-typedef	_BSD_UINT32_T_	uint32_t;
-#undef	_BSD_UINT32_T_
-#endif
-
 #ifndef _POSIX_SOURCE
 #define	NBBY	8		/* 1 $B%P%$%H$K4^$^$l$k%S%C%H?t(B */
 
@@ -183,7 +203,7 @@
  * $B$$$^$9!#2u$l$?%W%m%0%i%`$,(B 64 $B%S%C%H$N(B off_t $B$GF0:n$9$k$h$&$K$9$k(B
  * $B5!2q$rA}$9$?$a$G$9!#(B
  */
-#ifndef KERNEL
+#ifndef _KERNEL
 __BEGIN_DECLS
 #ifndef _FTRUNCATE_DECLARED
 #define	_FTRUNCATE_DECLARED
@@ -202,7 +222,7 @@
 int	 truncate __P((const char *, off_t));
 #endif
 __END_DECLS
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
 
 #endif /* !_POSIX_SOURCE */
 
Index: man5/tzfile.5
===================================================================
RCS file: /home/cvs/man-jp/man/man5/tzfile.5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tzfile.5
--- man5/tzfile.5	2000/02/15 14:34:48	1.1.1.1
+++ man5/tzfile.5	2000/02/23 01:37:14
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/lib/libc/stdtime/tzfile.5,v 1.7 1999/08/28 00:01:46 peter Exp %
+.\" %FreeBSD: src/lib/libc/stdtime/tzfile.5,v 1.8 2000/01/19 13:27:03 sheldonh Exp %
 .Dd September 13, 1994
 .\" jpman %Id: tzfile.5,v 1.3 1998/06/22 10:44:36 kumano Stab %
 .Dt TZFILE 5
@@ -7,7 +7,7 @@
 .Nm tzfile
 .Nd $B%?%$%`%>!<%s$N>pJs(B
 .Sh $B=q<0(B
-.Fd #include "/usr/src/lib/libc/stdtime/tzfile.h"
+.Fd #include \&"/usr/src/lib/libc/stdtime/tzfile.h\&"
 .Sh $B2r@b(B
 .Xr tzset 3
 $B$,;HMQ$9$k%?%$%`%>!<%s>pJs%U%!%$%k$O!"(B
