PERFORCE change 29829 for review

Marcel Moolenaar marcel at FreeBSD.org
Sat Apr 26 15:45:24 PDT 2003


http://perforce.freebsd.org/chv.cgi?CH=29829

Change 29829 by marcel at marcel_pluto1 on 2003/04/26 15:45:19

	IFia64

Affected files ...

.. //depot/projects/ia64_epc/bin/ls/ls.c#2 integrate
.. //depot/projects/ia64_epc/contrib/gcc/config/i386/freebsd.h#3 integrate
.. //depot/projects/ia64_epc/contrib/gcc/config/i386/freebsd64.h#2 integrate
.. //depot/projects/ia64_epc/contrib/gcc/config/i386/i386.h#2 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/amd64-freebsd/config.h#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/amd64-freebsd/itbl-cpu.h#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/amd64-freebsd/targ-cpu.h#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/x86-64-freebsd/Makefile#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/x86-64-freebsd/itbl-cpu.h#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/as/x86-64-freebsd/targ-cpu.h#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/ld/Makefile.amd64#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/ld/Makefile.x86-64#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/Makefile#2 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/Makefile.amd64#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/Makefile.x86-64#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/amd64/bfd.h#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/elf-fbsd-brand.c#1 branch
.. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/x86-64/bfd.h#2 delete
.. //depot/projects/ia64_epc/gnu/usr.bin/cc/Makefile.tgt#2 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate
.. //depot/projects/ia64_epc/gnu/usr.bin/cc/include/Makefile#3 integrate
.. //depot/projects/ia64_epc/lib/libc/posix1e/mac.conf.5#2 integrate
.. //depot/projects/ia64_epc/lib/libkvm/kvm_getprocs.3#3 integrate
.. //depot/projects/ia64_epc/lib/libutil/login_class.3#3 integrate
.. //depot/projects/ia64_epc/release/Makefile.inc.docports#2 integrate
.. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate
.. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate
.. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate
.. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#2 integrate
.. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#4 integrate
.. //depot/projects/ia64_epc/sbin/devd/devd.cc#4 integrate
.. //depot/projects/ia64_epc/sbin/devd/devd.h#2 integrate
.. //depot/projects/ia64_epc/sbin/devd/devd.hh#1 branch
.. //depot/projects/ia64_epc/sbin/growfs/growfs.c#2 integrate
.. //depot/projects/ia64_epc/share/man/man7/firewall.7#2 integrate
.. //depot/projects/ia64_epc/share/man/man9/style.9#3 integrate
.. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/ia64_epc/sys/dev/drm/drm_os_freebsd.h#4 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/firewire.c#8 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/firewirereg.h#6 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/fwcrom.c#3 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/iec13213.h#3 integrate
.. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#10 integrate
.. //depot/projects/ia64_epc/sys/geom/bde/g_bde.c#5 integrate
.. //depot/projects/ia64_epc/sys/geom/bde/g_bde_work.c#4 integrate
.. //depot/projects/ia64_epc/sys/ia64/conf/HP_RX2600#3 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_bio.c#10 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#9 integrate
.. //depot/projects/ia64_epc/sys/sparc64/include/asm.h#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/include/asmacros.h#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/include/ktr.h#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/exception.S#4 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/interrupt.S#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/locore.S#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_exception.S#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_locore.S#2 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/support.S#3 integrate
.. //depot/projects/ia64_epc/sys/sparc64/sparc64/swtch.S#4 integrate
.. //depot/projects/ia64_epc/sys/sys/vnode.h#4 integrate
.. //depot/projects/ia64_epc/sys/vm/swap_pager.c#5 integrate
.. //depot/projects/ia64_epc/sys/vm/uma_core.c#7 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_map.c#10 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_object.c#11 integrate
.. //depot/projects/ia64_epc/sys/vm/vm_object.h#7 integrate
.. //depot/projects/ia64_epc/sys/vm/vnode_pager.c#5 integrate
.. //depot/projects/ia64_epc/usr.bin/login/login.c#4 integrate
.. //depot/projects/ia64_epc/usr.sbin/fwcontrol/Makefile#2 integrate
.. //depot/projects/ia64_epc/usr.sbin/fwcontrol/fwcrom.c#3 delete

Differences ...

==== //depot/projects/ia64_epc/bin/ls/ls.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.72 2002/12/18 21:05:15 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -732,7 +732,7 @@
 					mac_free(label);
 label_out:
 					if (labelstr == NULL)
-						labelstr = strdup("");
+						labelstr = strdup("-");
 					labelstrlen = strlen(labelstr);
 					if (labelstrlen > maxlabelstr)
 						maxlabelstr = labelstrlen;

==== //depot/projects/ia64_epc/contrib/gcc/config/i386/freebsd.h#3 (text+ko) ====

@@ -22,12 +22,10 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.60 2003/04/13 01:04:01 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */
 
 #undef  CC1_SPEC
-#define CC1_SPEC "%(cc1_cpu) %{profile:-p} \
-  %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-  "
+#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
 
 #undef  ASM_SPEC
 #define ASM_SPEC	"%{v*: -v}"

==== //depot/projects/ia64_epc/contrib/gcc/config/i386/freebsd64.h#2 (text+ko) ====

@@ -19,7 +19,7 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.2 2002/06/21 22:54:24 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.4 2003/04/26 19:20:25 obrien Exp $ */
 
 
 #undef TARGET_VERSION
@@ -29,20 +29,9 @@
    This is a copy of LINK_SPEC from <i386/freebsd.h> tweaked for
    the x86-64 target.  */
 
-#undef  CC1_SPEC
-#define CC1_SPEC "%(cc1_cpu) %{profile:-p} \
-  %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-  %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}"
-
-#undef  ASM_SPEC
-#define ASM_SPEC	"%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}} \
-			%{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
-			%{Wa,*:%*} %{m32:--32}"
-
 #undef	LINK_SPEC
 #define LINK_SPEC "\
-  %{!m32:-m elf_x86_64} \
-  %{m32:-m elf_i386} \
+  %{m32:-m elf_i386_fbsd -Y P,/usr/lib/i386} \
   %{Wl,*:%*} \
   %{v:-V} \
   %{assert*} %{R*} %{rpath*} %{defsym*} \

==== //depot/projects/ia64_epc/contrib/gcc/config/i386/i386.h#2 (text+ko) ====

@@ -35,7 +35,7 @@
    that start with ASM_ or end in ASM_OP.  */
 
 
-/* $FreeBSD: src/contrib/gcc/config/i386/i386.h,v 1.15 2003/02/10 06:05:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/i386.h,v 1.16 2003/04/26 20:04:37 obrien Exp $ */
 
 
 /* Stubs for half-pic support if not OSF/1 reference platform.  */
@@ -585,7 +585,7 @@
 -D__i386__ %(cpp_cpu32sizet)"
 
 #define CPP_CPU64_SPEC \
-  "-Acpu=x86_64 -Amachine=x86_64 -D__x86_64 -D__x86_64__ %(cpp_cpu64sizet)"
+  "-Acpu=x86_64 -Amachine=x86_64 -D__x86_64 -D__x86_64__ %(cpp_cpu64sizet) -D__amd64__ -D__AMD64__"
 
 #define CPP_CPUCOMMON_SPEC "\
 %{march=i386:%{!mcpu*:-D__tune_i386__ }}\

==== //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.23 2002/12/02 09:53:59 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.24 2003/04/26 03:28:21 obrien Exp $
 
 .include "../Makefile.inc0"
 
@@ -20,7 +20,9 @@
 CLEANFILES+=	config.h targmatch.h
 
 SELARCH=
-.if ${TARGET_ARCH} == "sparc64"
+.if ${TARGET_ARCH} == "amd64"
+SELARCH= &bfd_i386_arch
+.elif ${TARGET_ARCH} == "sparc64"
 SELARCH= &bfd_sparc_arch
 .else
 .for _a in ${ARCHS}

==== //depot/projects/ia64_epc/gnu/usr.bin/cc/Makefile.tgt#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.6 2002/11/06 07:00:59 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.7 2003/04/26 20:04:37 obrien Exp $
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
@@ -6,7 +6,7 @@
 GCC_CPU=	alpha
 .elif ${TARGET_ARCH} == "arm"
 GCC_CPU=	arm
-.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
+.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
 .elif ${TARGET_ARCH} == "ia64"
 GCC_CPU=	ia64

==== //depot/projects/ia64_epc/gnu/usr.bin/cc/cc_tools/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.66 2002/10/10 04:56:35 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.67 2003/04/26 20:04:37 obrien Exp $
 
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
@@ -148,7 +148,7 @@
 .endif
 	echo '#include "ansidecl.h"'			>> ${.TARGET}
 	echo '#include "${GCC_CPU}/${GCC_CPU}.h"'	>> ${.TARGET}
-.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 	echo '#include "${GCC_CPU}/att.h"'		>> ${.TARGET}
 .endif
 .if ${TARGET_ARCH} != "alpha"
@@ -161,14 +161,14 @@
 .if ${TARGET_ARCH} == "alpha"
 	echo '#include "${GCC_CPU}/elf.h"'		>> ${.TARGET}
 .endif
-.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "x86_64"
+.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
 	echo '#include "${GCC_CPU}/sysv4.h"'		>> ${.TARGET}
 .endif
 .endif
 	echo '#include "${GCC_CPU}/freebsd.h"'		>> ${.TARGET}
-.if ${TARGET_ARCH} == "x86_64"
-	echo '#include "${GCC_CPU}/${TARGET_ARCH:S/_/-/}.h"' >> ${.TARGET}
+.if ${TARGET_ARCH} == "amd64"
+	echo '#include "${GCC_CPU}/x86-64.h"' 		>> ${.TARGET}
 	echo '#include "${GCC_CPU}/freebsd64.h"'	>> ${.TARGET}
 .endif
 	echo '#include "defaults.h"'			>> ${.TARGET}

==== //depot/projects/ia64_epc/gnu/usr.bin/cc/cc_tools/auto-host.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.12 2002/11/26 18:25:18 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.13 2003/04/26 20:04:37 obrien Exp $ */
 
 #include <sys/param.h>
 
@@ -338,7 +338,7 @@
 /* #define SIZEOF_LONG 4 */
 #if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
 #define SIZEOF_LONG SIZEOF_INT
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__x86_64__)
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
 #define SIZEOF_LONG SIZEOF_LONG_LONG
 #else
 #error "I don't know what arch this is."

==== //depot/projects/ia64_epc/gnu/usr.bin/cc/include/Makefile#3 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.4 2003/04/01 12:37:54 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.5 2003/04/26 20:04:38 obrien Exp $
 
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
-.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 INCS=	mmintrin.h xmmintrin.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h

==== //depot/projects/ia64_epc/lib/libc/posix1e/mac.conf.5#2 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.2 2003/04/20 04:43:56 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.3 2003/04/26 03:32:18 rwatson Exp $
 .\"
 .Dd April 19, 2003
 .Dt MAC.CONF 5
@@ -74,6 +74,7 @@
 default_ifnet_labels ?biba,?mls,?sebsd
 default_process_labels ?biba,?mls,partition,?sebsd
 .Ed
+.Pp
 In this example, userland applications will attempt to retrieve Biba,
 MLS, and SEBSD labels for all object classes; for processes, they will
 additionally attempt to retrieve a Partition identifier.

==== //depot/projects/ia64_epc/lib/libkvm/kvm_getprocs.3#3 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.13 2003/03/24 15:58:53 charnier Exp $
+.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.14 2003/04/26 15:00:57 trhodes Exp $
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETPROCS 3
@@ -50,6 +50,7 @@
 .In kvm.h
 .In sys/param.h
 .In sys/sysctl.h
+.In sys/user.h
 .\" .Fa kvm_t *kd
 .Ft struct kinfo_proc *
 .Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt"

==== //depot/projects/ia64_epc/lib/libutil/login_class.3#3 (text+ko) ====

@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.14 2003/03/24 15:55:03 charnier Exp $
+.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.16 2003/04/26 15:18:27 trhodes Exp $
 .\"
 .Dd December 28, 1996
 .Os
@@ -112,6 +112,7 @@
 maxproc       RLIMIT_NPROC
 openfiles     RLIMIT_NOFILE
 sbsize        RLIMIT_SBSIZE
+vmemoryuse    RLIMIT_VMEM
 .Ed
 .It LOGIN_SETPRIORITY
 Set the scheduling priority for the current process based on the

==== //depot/projects/ia64_epc/release/Makefile.inc.docports#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile.inc.docports,v 1.16 2002/11/10 14:38:27 tmm Exp $
+# $FreeBSD: src/release/Makefile.inc.docports,v 1.17 2003/04/26 07:31:43 murray Exp $
 #
 # List of (dependent) ports that are minimally required to be
 # checked out from CVS in order to get ${DOCPORTS} built and
@@ -35,7 +35,6 @@
 	ports/graphics/peps \
 	ports/graphics/png \
 	ports/graphics/scr2png \
-	ports/textproc/scr2txt \
 	ports/graphics/tiff \
 	ports/lang/perl5 \
 	ports/print/freetype2 \
@@ -46,6 +45,8 @@
 	ports/textproc/docbook-310 \
 	ports/textproc/docbook-400 \
 	ports/textproc/docbook-410 \
+	ports/textproc/docbook-xml \
+	ports/textproc/docbook-xsl \
 	ports/textproc/docproj \
 	ports/textproc/dsssl-docbook-modular \
 	ports/textproc/expat2 \
@@ -55,6 +56,8 @@
 	ports/textproc/libxslt \
 	ports/textproc/linuxdoc \
 	ports/textproc/mkcatalog \
+	ports/textproc/scr2txt \
+	ports/textproc/sdocbook-xml \
 	ports/textproc/sgmlformat \
 	ports/textproc/xhtml \
 	ports/www/links1 \

==== //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.552 2003/04/25 14:42:53 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.553 2003/04/26 19:07:33 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -858,7 +858,7 @@
 
     <para>The following new articles have been added to the
       documentation set: <quote>FreeBSD From Scratch</quote>,
-      <quote>The Roadmap for 5-STABLE</quote>.
+      <quote>The Roadmap for 5-STABLE</quote>.</para>
 
     <para>A new Danish (<filename>da_DK.ISO8859-1</filename>)
       translation project has been started.</para>

==== //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/errata/article.sgml#4 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.16 2003/03/22 11:13:31 rushani Exp $
-    Original revision: 1.33
+    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.17 2003/04/26 19:20:59 hrs Exp $
+    Original revision: 1.36
 -->
 
 <!-- 
@@ -44,7 +44,7 @@
 
     <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.16 2003/03/22 11:13:31 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.17 2003/04/26 19:20:59 hrs Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -64,7 +64,8 @@
 <![ %release.type.release [
        &release.current;
 ]]>
-      ¤Î¸ø³«¸å¤ËȽÌÀ¤·¤¿½ÅÍפʾðÊ󤬽ñ¤«¤ì¤Æ¤¤¤ë errata ¥ê¥¹¥È (Àµ¸íɽ) ¤Ç¤¹.
+      ¤Î¸ø³«¸å¤ËȽÌÀ¤·¤¿½ÅÍפʾðÊ󡢤¢¤ë¤¤¤Ï¥ê¥ê¡¼¥¹¹©Äø¤Î½ªÈפÇȽÌÀ¤·¡¢
+      ¥ê¥ê¡¼¥¹Ê¸½ñ¤Ë¼ýÏ¿¤Ç¤­¤Ê¤«¤Ã¤¿½ÅÍפʾðÊ󤬽ñ¤«¤ì¤Æ¤¤¤ë errata ¥ê¥¹¥È (Àµ¸íɽ) ¤Ç¤¹.
       ¤³¤ì¤Ë¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ª¤è¤Ó,
       ¥·¥¹¥Æ¥à¤Î±¿ÍÑ¡¦ÍøÍѤ˱ƶÁ¤òÍ¿¤¨¤ë¤è¤¦¤Ê´ØÏ¢¥½¥Õ¥È¥¦¥§¥¢,
       ´ØϢʸ½ñ¤Î¹¹¿·¾ðÊó¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹.
@@ -164,6 +165,8 @@
       Æüì¤ÊºÙ¹©¤ò»Ü¤·¤¿¥á¥Ã¥»¡¼¥¸¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
       ½¤Àµ¥Ñ¥Ã¥Á¤Î¾ì½ê¤ò´Þ¤à¾ÜºÙ¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:04.sendmail.asc">FreeBSD-SA-03:04</ulink>
+      ¤ª¤è¤Ó <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:07.sendmail.asc">FreeBSD-SA-03:07</ulink>
       ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>XDR ¥¨¥ó¥³¡¼¥À / ¥Ç¥³¡¼¥À¤Î¼ÂÁõ¤Ë¡¢
@@ -366,5 +369,12 @@
       ¤ò»È¤Ã¤Æ¥Þ¥¦¥ó¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤È¤¤¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
       ¤³¤Î¥Ð¥°¤Ï &release.current; ¤Ç½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£</para>
 
+    <bridgehead renderas="sect3">nsswitch</bridgehead>
+
+    <para><application>nsswitch</application>
+      ¤ËÂбþ¤·¤¿¤³¤È¤òµ­ºÜ¤·¤¿¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë¤Ï¡¢
+      ½¾Íè¤Î¥ê¥¾¥ë¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ë̾¤Ë¸í¤ê¤¬¤¢¤ê¤Þ¤·¤¿¡£
+      Àµ¤·¤¯¤Ï <filename>/etc/host.conf</filename> ¤Ç¤¹¡£</para>
+
   </sect1>
 </article>

==== //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 (text+ko) ====

@@ -28,13 +28,13 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 
-        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.11 2003/03/16 12:41:12 rushani Exp $
-        Original revision: 1.136
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.12 2003/04/26 19:48:15 hrs Exp $
+        Original revision: 1.143
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.11 2003/03/16 12:41:12 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.12 2003/04/26 19:48:15 hrs Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
@@ -1700,6 +1700,23 @@
       </itemizedlist>
     </para>
 
+    <para arch="i386,pc98">ASIX Electronics AX88172 ¥Ù¡¼¥¹¤Î USB Ethernet NIC
+      (&man.axe.4; ¥É¥é¥¤¥Ð)
+
+      <itemizedlist>
+        <listitem>
+	  <para>D-Link DUBE100</para>
+        </listitem>
+        <listitem>
+	  <para>Linksys USB200M</para>
+        </listitem>
+        <listitem>
+	  <para>Netgear FA120</para>
+        </listitem>
+      </itemizedlist>
+
+      </para>
+
     <para arch="i386,pc98,alpha">ASIX Electronics AX88140A PCI NIC
       (&man.dc.4; ¥É¥é¥¤¥Ð)
       <itemizedlist>
@@ -1839,7 +1856,7 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386,pc98,alpha,ia64">Intel 82557, 82258, 82559, 82550,
+    <para arch="i386,pc98,alpha,ia64,sparc64">Intel 82557, 82258, 82559, 82550,
       82562 ¥Ù¡¼¥¹¤Î Fast Ethernet NIC (&man.fxp.4; ¥É¥é¥¤¥Ð)
       <itemizedlist>
         <listitem>
@@ -2453,7 +2470,7 @@
   <sect2>
     <title>¤½¤Î¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯µ¡´ï</title>
 
-    <para arch="i386">Granch SBNI12 point-to-point ÄÌ¿®¥¢¥À¥×¥¿ (sbni ¥É¥é¥¤¥Ð)
+    <para arch="i386">Granch SBNI12 point-to-point ÄÌ¿®¥¢¥À¥×¥¿ (&man.sbni.4; ¥É¥é¥¤¥Ð)
       <itemizedlist>
         <listitem>
 	  <para>SBNI12-XX ¤ª¤è¤Ó SBNI12D-XX ISA ÈÇ/PCI ÈÇ</para>
@@ -2461,6 +2478,9 @@
       </itemizedlist>
     </para>
 
+    <para arch="i386">Granch SBNI16 SHDSL ¥â¥Ç¥à (&man.sbsh.4;
+      ¥É¥é¥¤¥Ð)</para>
+
     <para arch="i386">SMC COM90cx6 ARCNET ¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥À¥×¥¿ (cm ¥É¥é¥¤¥Ð)
       <itemizedlist>
         <listitem>
@@ -2627,24 +2647,72 @@
     <para arch="i386">PCI ¥Ù¡¼¥¹¤Î¥Þ¥ë¥Á¥Ý¡¼¥È¥·¥ê¥¢¥ë¥Ü¡¼¥É (&man.puc.4;
       ¥É¥é¥¤¥Ð)
       <itemizedlist>
+	<listitem>
+	  <para>Actiontech 56K PCI</para>
+	</listitem>
         <listitem>
-	  <para>Avlab Technology, PCI IO 2S</para>
+	  <para>Avlab Technology, PCI IO 2S ¤ª¤è¤Ó PCI IO 4S</para>
+	</listitem>
+	<listitem>
+	  <para>Comtrol RocketPort 550</para>
+	</listitem>
+	<listitem>
+	  <para>Decision Computers PCCOM 4-port ¥·¥ê¥¢¥ë¤ª¤è¤Ó¥Ç¥å¥¢¥ë¥Ý¡¼¥È RS232/422/485</para>
+	</listitem>
+	<listitem>
+	  <para>Dolphin Peripherals 4025/4035/4036</para>
+	</listitem>
+	<listitem>
+	  <para>IC Book Labs Dreadnought 16x Lite ¤ª¤è¤Ó Pro</para>
 	</listitem>
-        <listitem>
-	  <para>Moxa Industio CP-114</para>
+	<listitem>
+	  <para>Lava Computers 2SP-PCI/DSerial-PCI/Quattro-PCI/Octopus-550</para>
 	</listitem>
+	<listitem>
+	  <para>Middle Digital, Weasle ¥·¥ê¥¢¥ë¥Ý¡¼¥È</para>
+ 	</listitem>
         <listitem>
-	  <para>Syba Tech Ltd. PCI-4S2P-550-ECP</para>
+	  <para>Moxa Industio CP-114, Smartio C104H-PCI ¤ª¤è¤Ó C168H/PCI</para>
 	</listitem>
+	<listitem>
+	  <para>NEC PK-UG-X001 ¤ª¤è¤Ó PK-UG-X008</para>
+ 	</listitem>
         <listitem>
 	  <para>Netmos NM9835 PCI-2S-550</para>
 	</listitem>
+	<listitem>
+	  <para>Oxford Semiconductor OX16PCI954 PCI UART</para>
+	</listitem>
+	<listitem>
+	  <para>Syba Tech SD-LAB PCI-4S2P-550-ECP</para>
+	</listitem>
+	<listitem>
+	  <para>SIIG Cyber I/O PCI 16C550/16C650/16C850</para>
+	</listitem>
+	<listitem>
+	  <para>SIIG Cyber 2P1S PCI 16C550/16C650/16C850</para>
+	</listitem>
+	<listitem>
+	  <para>SIIG Cyber 2S1P PCI 16C550/16C650/16C850</para>
+	</listitem>
+	<listitem>
+	  <para>SIIG Cyber 4S PCI 16C550/16C650/16C850</para>
+	</listitem>
+	<listitem>
+	  <para>SIIG Cyber Serial (¥·¥ó¥°¥ë¤ª¤è¤Ó¥Ç¥å¥¢¥ë) PCI 16C550/16C650/16C850</para>
+	</listitem>
+        <listitem>
+	  <para>Syba Tech Ltd. PCI-4S2P-550-ECP</para>
+ 	</listitem>
         <listitem>
-	  <para>PCCOM dual port RS232/422/485</para>
+	  <para>Titan PCI-200H ¤ª¤è¤Ó PCI-800H</para>
+	</listitem>
+	<listitem>
+	  <para>US Robotics (3Com) 3CP5609 ¥â¥Ç¥à</para>
 	</listitem>
-        <listitem>
-          <para>SIIG Cyber Serial Dual PCI 16C550</para>
-        </listitem>
+	<listitem>
+	  <para>VScom PCI-400 ¤ª¤è¤Ó PCI-800</para>
+ 	</listitem>
       </itemizedlist>
     </para>
 
@@ -3021,6 +3089,10 @@
         </listitem>
       </itemizedlist>
     </para>
+
+    <para arch="i386,ia64,pc98">EHCI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»È¤Ã¤¿
+      USB 2.0 ¥³¥ó¥È¥í¡¼¥é (ehci ¥É¥é¥¤¥Ð)</para>
+
     <para arch="i386,pc98,alpha">¥Ï¥Ö
       <itemizedlist>
         <listitem>
@@ -3218,7 +3290,7 @@
   <sect2 id="firewire">
     <title>IEEE 1394 (FireWire) ¥Ç¥Ð¥¤¥¹</title>
 
-    <para arch="i386,pc98,powerpc">¥Û¥¹¥È¥³¥ó¥È¥í¡¼¥é (&man.fwohci.4;
+    <para arch="i386,sparc64">¥Û¥¹¥È¥³¥ó¥È¥í¡¼¥é (&man.fwohci.4;
       ¥É¥é¥¤¥Ð)
 
       <itemizedlist>
@@ -3241,7 +3313,7 @@
 
       </para>
 
-    <para arch="i386,pc98,powerpc">¥¹¥È¥ì¡¼¥¸ (&man.sbp.4; ¥É¥é¥¤¥Ð)
+    <para arch="i386,sparc64">¥¹¥È¥ì¡¼¥¸ (&man.sbp.4; ¥É¥é¥¤¥Ð)
 
       <itemizedlist>
 	<listitem>
@@ -3337,7 +3409,7 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386,pc98,alpha">¥Õ¥í¥Ã¥Ô¥É¥é¥¤¥Ö (&man.fd.4; ¥É¥é¥¤¥Ð)</para>
+    <para arch="i386,pc98,alpha">¥Õ¥í¥Ã¥Ô¥É¥é¥¤¥Ö (&man.fdc.4; ¥É¥é¥¤¥Ð)</para>
     <para arch="i386">Genius ¤ª¤è¤Ó Mustek ¥Ï¥ó¥É¥¹¥­¥ã¥Ê</para>
     <para arch="i386">GPB ¤ª¤è¤Ó Transputer ¥É¥é¥¤¥Ð</para>
     <para arch="i386,pc98,alpha,ia64">¥­¡¼¥Ü¡¼¥É

==== //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
-    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml,v 1.3 2003/01/12 22:33:39 hrs Exp $
-    Original revision: 1.5
+    $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml,v 1.4 2003/04/26 19:48:15 hrs Exp $
+    Original revision: 1.9
 -->
 <sect1 id="proc">
   <title>Âбþ¥×¥í¥»¥Ã¥µ¤ª¤è¤Ó¥Þ¥¶¡¼¥Ü¡¼¥É</title>
@@ -32,6 +32,30 @@
     BIOS ¤ä¥Þ¥¶¡¼¥Ü¡¼¥É¤Î¥Ð¥°¤Ë¤è¤ê¡¢ÌäÂ꤬½Ð¤ë¥±¡¼¥¹¤¬¤¢¤ê¤Þ¤¹¡£
     ÂнèÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï &a.smp; ¤ò½ÏÆɤ¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
+  <para>&os; ¤Ï¡¢Intel ¤Î CPU ¤ËÅëºÜ¤µ¤ì¤Æ¤¤¤ë
+    HyperThreading (HTT) µ¡Ç½¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+    <literal>options&nbsp;SMP</literal> µ¡Ç½¤òÍ­¸ú¤Ë¤·¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤Ï
+    ÏÀÍý¥×¥í¥»¥Ã¥µ¤ò¼«Æ°Åª¤Ë¸¡½Ð¤·¡¢Í­¸ú¤Ë¤·¤Þ¤¹¡£
+    &os; ¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥¹¥±¥¸¥å¡¼¥é¤Ï¡¢¤³¤ÎÏÀÍý CPU
+    ¤òÄɲ䵤줿ʪÍý CPU ¤ÈƱÅù¤Ë°·¤¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢
+    Ʊ¤¸ CPU Æâ¤ÎÏÀÍý¥×¥í¥»¥Ã¥µ´Ö¤Ç¶¦Í­¤µ¤ì¤Æ¤¤¤ë»ñ¸»¤ËÂФ·¤Æ¡¢
+    ¥¹¥±¥¸¥å¡¼¥ê¥ó¥°·èÄê¤òºÇŬ²½¤·¤Þ¤»¤ó¡£
+    ¤³¤Î¥¹¥±¥¸¥å¡¼¥ê¥ó¥°ÊýË¡¤Ç¤ÏºÇŬ¤ÊÀ­Ç½¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢
+    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢µ¯Æ°»þ¤ËÏÀÍý CPU ¤òÄä»ß¤µ¤»¤Æ¤¤¤Þ¤¹¡£
+    ÏÀÍý CPU ¤Ï <varname>machdep.hlt_logical_cpus</varname>
+    sysctl ÊÑ¿ô¤ÇÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢
+    <varname>machdep.hlt_cpus</varname> sysctl ÊÑ¿ô¤ò»È¤Ã¤Æ¡¢
+    CPU ¤ò¥¢¥¤¥É¥ë¥ë¡¼¥×¤Ë¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+    ¾Ü¤·¤¯¤Ï¡¢&man.smp.4; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+  <para>&os; ¤Ï¡¢Physical Address Extensions (PAE) µ¡Ç½¤òÅëºÜ¤·¤¿
+    CPU ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+    <literal>PAE</literal> µ¡Ç½¤òÍ­¸ú¤Ë¤·¤¿¥«¡¼¥Í¥ë¤Ï¡¢4GB
+    °Ê¾å¤Î¥á¥â¥ê¤ò¸¡½Ð¤·¡¢¥·¥¹¥Æ¥à¤«¤éÍøÍѤǤ­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
+    ¤³¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢ÍøÍѤǤ­¤ë¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤ä¾¤Î &os;
+    ¤Îµ¡Ç½¤¬À©¸Â¤µ¤ì¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¡¢&man.pae.4;
+    ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
   <para>&os; ¤Ï i386 ¥Ù¡¼¥¹¤Î¥é¥Ã¥×¥È¥Ã¥×¤Ç¤âÆ°ºî¤·¤Þ¤¹¤¬¡¢
     ¥µ¥¦¥ó¥É¡¢¥°¥é¥Õ¥£¥Ã¥¯¥¹¡¢ÅŸ»´ÉÍý¡¢PCCARD
     ³ÈÄ¥¥¹¥í¥Ã¥ÈÅù¤Î¥Ï¡¼¥É¥¦¥§¥¢µ¡Ç½¤ÎÂбþ¤Ë¤ÏÊФ꤬¤¢¤ê¤Þ¤¹¡£

==== //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#4 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.83 2003/03/24 21:42:53 hrs Exp $
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.84 2003/04/26 19:13:00 hrs Exp $
 
-    Original revision: 1.524
+    Original revision: 1.553
 -->
 
 <articleinfo>
@@ -11,7 +11,7 @@
 
   <corpauthor>FreeBSD ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.83 2003/03/24 21:42:53 hrs Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.84 2003/04/26 19:13:00 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -133,11 +133,12 @@
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
-    <para><application>sendmail</application> ¤¬¥Ð¡¼¥¸¥ç¥ó 8.12.8
-      ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤·¤¿¡£¤³¤ì¤Ë¤Ï¡¢
-      ¥ê¥â¡¼¥È¤«¤é°­ÍѲÄǽ¤Ê¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¥Õ¥í¡¼ÌäÂê¤Î½¤Àµ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+    <para><application>sendmail</application> ¤Ë¤¢¤Ã¤¿
+      ¥ê¥â¡¼¥È¤«¤é°­ÍѲÄǽ¤Ê¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¥Õ¥í¡¼ÌäÂ꤬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ÌäÂê¤Î¾ÜºÙ¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:04.sendmail.asc">FreeBSD-SA-03:04</ulink>
+      ¤ª¤è¤Ó <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:07.sendmail.asc">FreeBSD-SA-03:07</ulink>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
@@ -171,6 +172,10 @@
       ¤³¤ì¤Ï XFree86 4.3.0 ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤Û¤ÜƱ°ì¤Î¤â¤Î¤Ç¤¹¤¬¡¢
       ¤¤¤¯¤Ä¤«¤Î¥Ð¥°½¤Àµ¤âÄɲäǴޤޤì¤Æ¤¤¤Þ¤¹¡£</para>
 
+    <para arch="i386,ia64,pc98">ehci ¥É¥é¥¤¥Ð¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï USB 2.0 ¥³¥ó¥È¥í¡¼¥é¤Ç»È¤ï¤ì¤Æ¤¤¤ë
+      USB Enhanced Host Controller Interface ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
     <para><filename>/dev/tty</filename>
       ¤Îµö²Ä°À­¤Î¼è¤ê°·¤¤¤Ë¤¢¤Ã¤¿¡¢¾®¤µ¤Ê¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¤³¤ì¤Ë¤è¤ê¡¢&man.su.1; ¤Î¼Â¹Ô¸å¤â &man.ssh.1;
@@ -186,6 +191,13 @@
 
     <para>Linux ¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¥â¡¼¥É¤¬ IPv6 ¤ËÂбþ¤·¤Þ¤·¤¿¡£</para>
 
+    <para>&man.madvise.2; ¤¬¡¢¿·¤·¤¯
+      <literal>MADV_PROTECT</literal> ¤È¤¤¤¦Æ°ºî¤ËÂбþ¤·¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï¡¢¤½¤Î¥×¥í¥»¥¹¤ÏÈó¾ï¤Ë½ÅÍפʤâ¤Î¤Ç¡¢
+      ¥¹¥ï¥Ã¥×¶õ´Ö¤¬¸Ï³é¤·¤Æ¤·¤Þ¤Ã¤¿»þ¤Ç¤â kill
+      ¤·¤Æ¤Ï¤¤¤±¤Ê¤¤¡¢¤È¤¤¤¦¤³¤È¤ò²¾ÁÛ¥á¥â¥ê¥·¥¹¥Æ¥à¤ËÅÁ¤¨¤ë¤â¤Î¤Ç¤¹¡£
+      ¤½¤Î»þ¤Î¥×¥í¥»¥¹¤Ï¡¢¥¹¡¼¥Ñ¥æ¡¼¥¶¤¬½êÍ­¤¹¤ë¤â¤Î¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+
     <!-- Above this line, sort kernel changes by manpage/keyword-->
 
     <para>SMP ¤Ë¤ª¤±¤ëÀ­Ç½¸þ¾å¤¬´üÂԤǤ­¤ë¡¢
@@ -202,21 +214,52 @@
       (¸ß´¹À­¤òÊݤĤ¿¤á¡¢½¾Íè¤ÎÀÅŪ¤Ê¥á¥¸¥ã¡¼ÈÖ¹æ¤Î¤Þ¤Þ¤Ê¤Ã¤Æ¤¤¤ë¥É¥é¥¤¥Ð¤âÆ󡦻°»Ä¤Ã¤Æ¤¤¤Þ¤¹)
       ¤Ê¤¯¤Ê¤ê¡¢¥Ç¥Ð¥¤¥¹¤Î¥á¥¸¥ã¡¼Èֹ椬­¤ê¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤âÄ㤯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
 
+    <para arch="i386,pc98">¥«¡¼¥Í¥ë¥¹¥ì¥Ã¥ÉÍѤδʰ×Ū¤ÊÃٱ䥹¥¤¥Ã¥Áµ¡¹½¤¬¼ÂÁõ¤µ¤ì¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï¡¢(³ä¤ê¹þ¤ß¥Ï¥ó¥É¥é¤Ê¤É) ¾¤Î¥×¥í¥»¥¹¤È´Ø·¸¤¬¤Ê¤¤¡¢
+      ºÙ¤«¤¤¥³¥ó¥Æ¥­¥¹¥È¥¹¥¤¥Ã¥Á¤Ë¤è¤ë¥ª¡¼¥Ð¥Ø¥Ã¥É¤òºï¸º¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
+      ¤³¤Îµ¡Ç½¤Ï <literal>options&nbsp;LAZY_SWITCH</literal>
+      ¤ò»ØÄꤹ¤ë¤ÈÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£<para>
+
     <sect3>
       <title>¥×¥í¥»¥Ã¥µ¡¦¥Þ¥¶¡¼¥Ü¡¼¥É¤ÎÂбþ¾õ¶·</title>
 
-      <para arch="i386">&os; ¤Ë¡¢HyperThreading (HTT)
+      <para arch="i386"><literal>SMP</literal> ¥«¡¼¥Í¥ë¤Ë HyperThreading (HTT)
         Âбþ¤Î´ðÁÃÉôʬ¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
-        <literal>HTT</literal> ¥«¡¼¥Í¥ë¥ª¥×¥·¥ç¥ó¤òÄɲä·¤¿
-        SMP ¥«¡¼¥Í¥ë¤Ï¡¢HTT
-        ¤ËÂбþ¤·¤¿¥Þ¥·¥ó¾å¤ÇÏÀÍý¥×¥í¥»¥Ã¥µ¤Î¸¡½Ð¤È½é´ü²½¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-        ¤³¤ÎÏÀÍý¥×¥í¥»¥Ã¥µ¤Ï¡¢ÊªÍý¥×¥í¥»¥Ã¥µ¤òÄɲä·¤¿¾ì¹ç¤ÈƱ¤¸¤è¤¦¤Ë¡¢
-        ¥×¥í¥»¥¹¤ò¥¹¥±¥¸¥å¡¼¥ê¥ó¥°¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-        &merged;</para>
+        ¥¹¥±¥¸¥å¡¼¥é¤ÏÏÀÍý CPU ¤ò¡¢ÊªÍý CPU ¤òÄɲä·¤¿¾ì¹ç¤ÈƱ¤¸¤è¤¦¤Ë
+        ¥×¥í¥»¥¹¥¹¥±¥¸¥å¡¼¥ê¥ó¥°¤Ë»È¤¤¤Þ¤¹¡£
+        HTT ¤Ï¡¢»ñ¸»¤¬Â­¤ê¤Ê¤¯¤Ê¤ë¤¤¤¯¤Ä¤«¤Î¥±¡¼¥¹¤ÇºÇÁ±¤ÎÀ­Ç½¤Ë¤Ê¤é¤Ê¤¤¤³¤È¤¬
+        ¤¢¤ë¤¿¤á¡¢µ¯Æ°»þ¤Ë¤ÏÏÀÍý CPU ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÄä»ß¾õÂ֤ˤʤäƤ¤¤Þ¤¹¡£
+        Í­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢<varname>machdep.hlt_logical_cpus</varname> sysctl
+        ÊÑ¿ô¤ò»È¤¤¤Þ¤¹¡£¤Þ¤¿¡¢<varname>machdep.hlt_cpus</varname> sysctl
+        ÊÑ¿ô¤ò»È¤¦¤È¡¢¥¢¥¤¥É¥ë¥ë¡¼¥×¤ò»È¤Ã¤Æ CPU ¤òÄä»ß¾õÂ֤ˤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+        ¾Ü¤·¤¯¤Ï &man.smp.4; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+
+	<note>
+	  <para>½é´ü¤Î 5.0-CURRENT ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ä 4.8-RELEASE ¤Ê¤É¤Î
+            ¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ï¡¢HyperThreading µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤¿¤á¤Ë
+            ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°»þ¤Ë <literal>options&nbsp;HTT</literal>
+            ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤·¤¿¡£¸½ºß¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ëɬÍפÏ
+            ¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+	</note>
+
+      </para>
+
+      <para arch="i386">Intel Pentium Pro °Ê¹ß¤ËÅëºÜ¤µ¤ì¤Æ¤¤¤ë
+        Physical Address Extensions (PAE) µ¡Ç½¤ËÂбþ¤·¤Þ¤·¤¿¡£
+        ¤³¤ì¤Ï¡¢°ì¤Ä¤Î¥Þ¥·¥ó¾å¤ÇºÇÂç 64GB ¤Î RAM ¤ò»ÈÍѤ¹¤ë¤³¤È¤¬
+        ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ëµ¡Ç½¤Ç¤¹¤¬¡¢°ì¤Ä¤Î¥×¥í¥»¥¹ (¤È &os; ¥«¡¼¥Í¥ë)
+        ¤¬»È¤¨¤ë¥á¥â¥êÎ̤Ͻ¾Íè¤Î¤Þ¤Þ¤Ç¤¹¡£
+        ¾Ü¤·¤¯¤Ï¡¢&man.pae.4; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+        ¤³¤Îµ¡Ç½¤Îºî¶È¤Ï¡¢DARPA ¤ª¤è¤Ó Network Associates Laboratories
+        ¤Î»Ù±ç¤ò¼õ¤±¤Æ¹Ô¤Ê¤ï¤ì¤Þ¤·¤¿¡£</para>
+
+      <para arch="i386">&man.vpd.4; ¥É¥é¥¤¥Ð¤¬¿·¤·¤¯Äɲ䵤ì¤Þ¤·¤¿¡£
+        ¤³¤ì¤Ï IBM ThinkPad ¥·¥ê¡¼¥º¤Î Vital Product Data
+        ¹½Â¤ÂΤ«¤é¥Ï¡¼¥É¥¦¥§¥¢¾ðÊó¤òÆɤ߽Ф¹¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£</para>
 
     </sect3>
 
-    <sect3>
+    <sect3 id="boot">
       <title>¥Ö¡¼¥È¥í¡¼¥À¤ÎÊѹ¹</title>
 
       <para arch="alpha">alpha ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΥ֡¼¥È¥í¡¼¥À
@@ -248,18 +291,32 @@
 	</note>
       </para>
 
+      <para arch="i386">¥³¡¼¥É¥µ¥¤¥º¤ÎÀ©¸Â¤«¤é¡¢
+        i386 ¥Ö¡¼¥È¥í¡¼¥À¤«¤éÆɤळ¤È¤Î¤Ç¤­¤ë¥«¡¼¥Í¥ë¤Ï
+        1.5TB °Ê²¼¤Î¥ë¡¼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¤¢¤ë¤â¤Î¤À¤±¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
+
        <!-- Above this line, order bootloader changes by keyword-->
 
     </sect3>
 
-    <sect3>
+    <sect3 id="net-if">
       <title>¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤ÎÂбþ¾õ¶·</title>
 
+      <para arch="i386,pc98">&man.axe.4;
+        ¥Í¥Ã¥È¥ï¡¼¥¯¥É¥é¥¤¥Ð¤¬¿·¤·¤¯Äɲ䵤ì¤Þ¤·¤¿¡£
+        ¤³¤ì¤Ï ASIX Electronics AX88172 USB 2.0
+        ¥Á¥Ã¥×¥»¥Ã¥È¤ò¥Ù¡¼¥¹¤Ë¤·¤¿
+        USB Ethernet ¥¢¥À¥×¥¿¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
       <para>cm ¥É¥é¥¤¥Ð¤¬ IPX ¤ËÂбþ¤·¤Þ¤·¤¿¡£
         &merged;</para>
 
+      <para arch="i386">&man.sbsh.4; ¥É¥é¥¤¥Ð¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+        ¤³¤ì¤Ï Granch SBNI16 SHDSL ¥â¥Ç¥à¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+        &merged;</para>
+
       <para>802.11 ¥ê¥ó¥¯ÁؤËÂбþ¤·¤¿ wlan ¥â¥¸¥å¡¼¥ë¤¬¿·¤·¤¯Äɲ䵤ì¤Þ¤·¤¿¡£
-        ¤³¤Îµ¡Ç½¤Ï¸½ºß¡¢&man.wi.4; ¥É¥é¥¤¥Ð¤ÇÍøÍѤǤ­¤Þ¤¹¡£</para>
+        ¸½ºß¡¢&man.wi.4; ¥É¥é¥¤¥Ð¤¬¤³¤Îµ¡Ç½¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para arch="i386,alpha,pc98,sparc64">¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÀßÄê»þ¤Ë¥«¡¼¥Í¥ë¥Ñ¥Ë¥Ã¥¯
         (¤ä¾¤ÎÌäÂê)
@@ -267,7 +324,7 @@
         ¥É¥é¥¤¥Ð¤Î¥¿¥¤¥ß¥ó¥°¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£</para>
     </sect3>
 
-    <sect3>
+    <sect3 id="net-proto">
       <title>¥Í¥Ã¥È¥ï¡¼¥¯¥×¥í¥È¥³¥ë</title>
 
       <para>&man.ipfw.4; ¤Î <literal>skipto</literal> ¥ë¡¼¥ë¤È
@@ -335,7 +392,7 @@
 
    </sect3>
 
-    <sect3>
+    <sect3 id="disks">
       <title>¥Ç¥£¥¹¥¯¡¦µ­²±ÁõÃÖ</title>
 
       <para>&man.aac.4; ¥É¥é¥¤¥Ð¤¬¡¢¥¸¥ã¥¤¥¢¥ó¥È¥«¡¼¥Í¥ë¥í¥Ã¥¯¤Ê¤·¤Ë
@@ -376,9 +433,19 @@
         wfd ¥É¥é¥¤¥Ð¤È wst ¥É¥é¥¤¥Ð¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿¡£</para>
     </sect3>
 
-    <sect3>
+    <sect3 id="fs">
       <title>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</title>
 
+      <para>¿·¤·¤¯ <literal>DIRECTIO</literal>
+        ¥«¡¼¥Í¥ë¥ª¥×¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+        ¤³¤ì¤Ï¥Ð¥Ã¥Õ¥¡¥­¥ã¥Ã¥·¥å¤ò·Ðͳ¤»¤º¤ËľÀܥǡ¼¥¿¤òÆɤ߹þ¤ó¤À¤ê¡¢
+        ¥æ¡¼¥¶¶õ´Ö¤Î¥Ð¥Ã¥Õ¥¡¤ËľÀܥǡ¼¥¿¤ò½ñ¤­¹þ¤à¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£
+        ¤³¤Îµ¡Ç½¤ò»È¤¦¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë
+        <literal>O_DIRECT</literal> ¥Õ¥é¥°¤ò¥»¥Ã¥È¤¹¤ë¤³¤È¤È¡¢
+        Æɤ߽Ф·Áàºî»þ¤Î¥ª¥Õ¥»¥Ã¥È¡¦¥Ç¡¼¥¿Ä¹¤ÎξÊý¤Ë¡¢
+        ʪÍý¥á¥Ç¥£¥¢¥»¥¯¥¿Ä¹¤ÎÀ°¿ôÇܤò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+        &merged;</para>
+
       <para>NETNCP ¤ª¤è¤Ó Netware Filesystem Âбþ (nwfs)
         ¤¬¡¢Àµ¤·¤¯Æ°ºî¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</para>
 
@@ -387,24 +454,22 @@
         ½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£</para>
     </sect3>
 
-     <sect3>
+    <sect3 id="pccard">
       <title>PCCARD Âбþ</title>
 
       <para></para>
     </sect3>
 
-    <sect3>
+    <sect3 id="mm">
       <title>¥Þ¥ë¥Á¥á¥Ç¥£¥¢¤Ø¤ÎÂбþ¾õ¶·</title>
 
-      <para></para>
-    </sect3>
-
-    <sect3>
-      <title>´ó£¥½¥Õ¥È¥¦¥§¥¢</title>
-
-      <para><application>IPFilter</application> ¤¬¥Ð¡¼¥¸¥ç¥ó
-	3.4.31 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿¡£
-        &merged;</para>
+      <para arch="i386,pc98">&man.speaker.4; ¥Ç¥Ð¥¤¥¹ÍѤÎ
+        <filename>atspeaker.ko</filename>
+        ¥â¥¸¥å¡¼¥ë¤È
+        <filename>pcspeaker.ko</filename>
+        ¥â¥¸¥å¡¼¥ë¤Ï¡¢
+        <filename>speaker.ko</filename>
+        ¤È¤¤¤¦Ì¾Á°¤ËÊѤï¤ê¤Þ¤·¤¿¡£</para>
     </sect3>
   </sect2>
 
@@ -414,20 +479,32 @@
     <para>&man.adduser.8; ¤¬¡¢¥·¥§¥ë¤ÎÆüìʸ»ú¤ò´Þ¤à¥Ñ¥¹¥ï¡¼¥É¤ò
       Àµ¤·¤¯½èÍý¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</para>
 
+    <para>&man.adduser.8; ¤Ë¡¢¥æ¡¼¥¶¤Î¥Ç¥Õ¥©¥ë¥È¥í¥°¥¤¥ó¥°¥ë¡¼¥×¤òÀßÄꤹ¤ë
+      <option>-g</option> ¥ª¥×¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
+
     <para arch="alpha,i386"><filename>compat4x</filename>
       ÇÛÉÛʪ¤Ë¡¢&os; 4.7-RELEASE ¤Ë´Þ¤Þ¤ì¤ë
       <filename>libcrypto.so.2</filename>,
       <filename>libgmp.so.3</filename>,
       <filename>libssl.so.2</filename> ¥é¥¤¥Ö¥é¥ê¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
 
+    <para>&man.chgrp.1 ¤ª¤è¤Ó &man.chown.8 ¤Ï¡¢
+      <option>-v</option> ¥ª¥×¥·¥ç¥ó¤¬Ê£¿ô¸Ä»ØÄꤵ¤ì¤¿¾ì¹ç¡¢
+      ½êÍ­¼Ô/½êÍ­¥°¥ë¡¼¥×¤òÊѹ¹¤¹¤ë»þ¤Ë¿·µì¤Î uid/gid
+      ¤òɽ¼¨¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</para>
+
     <para>&man.config.8; ¤Ë¡¢
       ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥Õ¥¡¥¤¥ë¤Î <literal>device</literal>
       »Ø¼¨»Ò¤Î»ØÄê¤ò̵¸ú¤Ë¤¹¤ë <literal>nodevice</literal>
       »Ø¼¨»Ò¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
       ¤Þ¤¿¡¢<literal>nooption</literal> ¤È
       <literal>nomakeoption</literal> »Ø¼¨»Ò¤âÄɲ䵤ì¤Æ¤ª¤ê¡¢
-      ¤½¤ì¤è¤êÁ°¤Ë¤¢¤ë <literal>option</literal> ¤ª¤è¤Ó
-      <literal>makeoption</literal> »Ø¼¨»Ò¤ò¤½¤ì¤¾¤ì̵¸ú¤Ë¤·¤Þ¤¹¡£</para>
+      ¤½¤ì¤è¤êÁ°¤Ë¤¢¤ë <literal>options</literal> ¤ª¤è¤Ó
+      <literal>makeoptions</literal> »Ø¼¨»Ò¤ò¤½¤ì¤¾¤ì̵¸ú¤Ë¤·¤Þ¤¹¡£</para>
+
+    <para>&man.diskinfo.8; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï¡¢¥Ç¥£¥¹¥¯¥Ç¥Ð¥¤¥¹¤Î¾ðÊó¤Îɽ¼¨¤È¡¢
+      ¥Í¥¤¥Æ¥£¥Ö¤ÊÀ­Ç½»î¸³¤ò¹Ô¤Ê¤¦¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£</para>
 
     <para>&man.disklabel.8; ¤«¤é¡¢
       <option>-N</option> ¥Õ¥é¥°¤È <option>-W</option>
@@ -488,6 +565,10 @@
       <option>-R</option> ¤ª¤è¤Ó <option>-S</option> ¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
       &merged;</para>
 
+    <para>&man.gstat.8; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï¡¢&man.geom.4;
+      ¥µ¥Ö¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¥Ç¥£¥¹¥¯¤Î²ÔƯ¾õÂÖ¤òɽ¼¨¤¹¤ë¤â¤Î¤Ç¤¹¡£</para>
+
     <para>&man.ipfw.8; ¤Ë¡¢(¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ëµ¡Ç½¤½¤Î¤â¤Î¤ÎÍ­¸ú²½¡¦Ìµ¸ú²½¤ò´Þ¤à)
       &man.ipfw.4; ¤Ë¤ª¤±¤ë¤µ¤Þ¤¶¤Þ¤ÊÀ©¸æ¤ò¼Â¸½¤¹¤ë¤¿¤á¡¢
       <literal>enable</literal> ¥³¥Þ¥ó¥É¡¢
@@ -495,13 +576,21 @@
       ¤³¤ì¤é¤Ï¡¢½¾Íè¤Î sysctl ÊÑ¿ô¤è¤ê¤â¤ï¤«¤ê¤ä¤¹¤¯¡¢
       ÊØÍø¤ÊÁàºî¼êÃʤòÄ󶡤·¤Þ¤¹¡£&merged;</para>
 
+    <para>&man.jail.8; ¤Ë¡¢¿·¤·¤¯ <option>-i</option> ¥Õ¥é¥°¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï¡¢¿·¤·¤¯ºîÀ®¤·¤¿ jail ¤Î¼±Ê̻Ҥò½ÐÎϤ·¤Þ¤¹¡£</para>
+
+    <para>´û¸¤Î jail ¤ÎÃæ¤Ç¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¡¢&man.jexec.8;
+      ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
+
+    <para>´û¸¤Î jail ¤ò°ìÍ÷ɽ¼¨¤¹¤ë &man.jls.8; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
+
     <para>&man.kenv.1; ¤¬¡¢¥ë¡¼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¤ß¤¬¥Þ¥¦¥ó¥È¤µ¤ì¤¿¾õÂÖ¤Ç
       ¥·¥¹¥Æ¥à¤¬µ¯Æ°¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤âÍøÍѤǤ­¤ë¤è¤¦¡¢
       <filename>/usr/bin</filename> ¤«¤é
       <filename>/bin</filename> ¤Ë°Ü¤µ¤ì¤Þ¤·¤¿¡£</para>
 
-    <para>&man.devfs.5; ¤ÎÍøÍѤ¬É¬¿Ü¤È¤Ê¤Ã¤¿¤¿¤á¡¢
-       ɬÍפ¬¤Ê¤¯¤Ê¤Ã¤¿ MAKEDEV ¥¹¥¯¥ê¥×¥È¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£</para>
+    <para>&man.killall.1; ¤Ë¿·¤·¤¯ <option>-j</option> ¥ª¥×¥·¥ç¥ó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+      ¤³¤ì¤Ï¡¢¤Ò¤È¤Ä¤Î jail ¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥»¥¹¤ò kill ¤·¤Þ¤¹¡£</para>
 
     <para>¥æ¡¼¥¶¥é¥ó¥É¤«¤é &man.geom.4; ¥µ¥Ö¥·¥¹¥Æ¥à¤Î°ìÉô¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤¹¤ë
       &man.libgeom.3; ¥é¥¤¥Ö¥é¥ê¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
@@ -513,12 +602,21 @@
       <varname>net.inet.ip.portrange.reservedhigh</varname>
       sysctl ÊÑ¿ô¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤¦¤³¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£</para>
 
+    <para>&man.devfs.5; ¤¬É¬¿Ü¤È¤Ê¤Ã¤¿¤¿¤á¡¢
+       ɬÍפ¬¤Ê¤¯¤Ê¤Ã¤¿ MAKEDEV ¥¹¥¯¥ê¥×¥È¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£</para>
+
+    <para>&man.mixer.8; ¤Ë¡¢ÁêÂÐÃͤò»È¤Ã¤¿¥Ü¥ê¥å¡¼¥àÄ´À°¤¬¼ÂÁõ¤µ¤ì¤Þ¤·¤¿¡£</para>
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list