From owner-p4-projects@FreeBSD.ORG  Sat Jul  9 06:06:12 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 758A816A420; Sat,  9 Jul 2005 06:06:11 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4E8F416A41C
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 06:06:11 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EC32543D46
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 06:06:10 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6966A9F030683
	for <perforce@freebsd.org>; Sat, 9 Jul 2005 06:06:10 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6966AVf030680
	for perforce@freebsd.org; Sat, 9 Jul 2005 06:06:10 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Sat, 9 Jul 2005 06:06:10 GMT
Message-Id: <200507090606.j6966AVf030680@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79801 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jul 2005 06:06:12 -0000

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

Change 79801 by soc-andrew@soc-andrew_serv on 2005/07/09 06:05:30

	Intergrate from vender

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/Makefile#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/early-adopter/Makefile#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml#2 delete
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/readme/article.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/man2hwnotes.pl#2 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.879 2005/06/30 04:55:46 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.880 2005/06/30 18:17:09 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -217,6 +217,29 @@
       For more information, see security advisory
       <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:12.bind9.asc">FreeBSD-SA-05:12.bind9</ulink>.
       &merged;</para>
+
+    <para>A bug has been fixed in &man.ipfw.4; that could cause
+      packets to be matched incorrectly against a lookup table.  This
+      bug only affects SMP machines or UP machines that have the
+      <literal>PREEMPTION</literal> kernel option enabled.  More
+      information is contained in security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:13.ipfw.asc">FreeBSD-SA-05:13.ipfw</ulink>.
+      &merged;</para>
+
+    <para>Two security-related problems have been fixed in
+      &man.bzip2.1;.  These include a potential denial of service and
+      unauthorized manipulation of file permissions.  For more
+      information, see security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:14.bzip2.asc">FreeBSD-SA-05:14.bzip2</ulink>.
+      &merged;</para>
+
+    <para>Two problems in &os;'s TCP stack have been fixed.  They
+      could allow attackers to stall existing TCP connections,
+      creating a denial-of-service situation.  More information is
+      contained in security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:15.tcp.asc">FreeBSD-SA-05:15.tcp</ulink>.
+      &merged;</para>
+
   </sect2>
 
   <sect2 id="kernel">

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/release/doc/ja_JP.eucJP/Makefile,v 1.4 2002/11/17 19:45:00 hrs Exp $
-# Original revision: 1.3
+# $FreeBSD: src/release/doc/ja_JP.eucJP/Makefile,v 1.5 2005/06/30 12:54:30 rushani Exp $
+# Original revision: 1.7
 
 RELN_ROOT?= ${.CURDIR}/..
 
@@ -8,7 +8,6 @@
 #SUBDIR+= readme
 SUBDIR+= errata
 #SUBDIR+= installation
-SUBDIR+= early-adopter
 
 COMPAT_SYMLINK = ja
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/errata/article.sgml#2 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.31 2004/08/22 09:53:23 hrs Exp $
-    Original revision: 1.65
+    $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.32 2005/06/30 12:54:30 rushani Exp $
+    Original revision: 1.73
 -->
 
 <!--
@@ -18,22 +18,17 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
 <!ENTITY % ja-authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
 %ja-authors;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
 <!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
 %ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%misc;
 
 <!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
@@ -42,6 +37,9 @@
   <articleinfo>
 
     <title>&os;
+<![ %release.type.current [
+    &release.current;
+]]>
 <![ %release.type.snapshot [
     &release.prev;
 ]]>
@@ -52,7 +50,7 @@
 
     <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.31 2004/08/22 09:53:23 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.32 2005/06/30 12:54:30 rushani Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -60,7 +58,8 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
-      <holder role="mailto:doc@FreeBSD.org">FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</holder>
+      <year>2005</year>
+      <holder role="mailto:doc@FreeBSD.org">&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</holder>
     </copyright>
 
     <legalnotice id="trademarks" role="trademarks">
@@ -75,7 +74,7 @@
 
     <para>¤³¤Îʸ½ñ¤Ï &os;
 <![ %release.type.current [
-      &release.prev;
+      &release.current;
 ]]>
 <![ %release.type.snapshot [
       &release.prev;
@@ -93,7 +92,7 @@
 
     <para>¤³¤ì¤Ï &os; 
 <![ %release.type.current [
-      &release.prev;
+      &release.current;
 ]]>
 <![ %release.type.snapshot [
       &release.prev;
@@ -103,13 +102,6 @@
 ]]>
       ÍѤΠerrata ʸ½ñ¤Ç¤¹¡£&os; &release.next; ¤Î¸ø³«¤Þ¤Ç¤Î´Ö¡¢Êݼ餵¤ì¤Þ¤¹¡£</para>
 
-    <para>¤Þ¤¿¡¢¤³¤Îʸ½ñ¤Ë¤Ï
-      &os; &release.prev; ¤ÎÌó°ì¥«·î¸å¤Ë¸ø³«¤µ¤ì¤¿
-      <quote>¥Ý¥¤¥ó¥È¥ê¥ê¡¼¥¹</quote> ¤Ç¤¢¤ë
-      &os; &release.bugfix; ¤Î errata ¥ê¥¹¥È¤âµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ÆäËÃíµ­¤¬¤Ê¤¤¸Â¤ê¡¢¤¹¤Ù¤Æ¤Î¹àÌܤÏ
-      &release.prev; ¤È &release.bugfix; ¤ÎξÊý¤Ë³ºÅö¤·¤Þ¤¹¡£</para>
-
     <para>&release.branch;
       ¥Ö¥é¥ó¥Á¤ÏºÇ¿·¤Î¥Ö¥é¥ó¥Á¥Ý¥¤¥ó¥È¤Ç¤¢¤ê¡¢
       ¤³¤³¤«¤é¤Ï¤Þ¤À¥ê¥ê¡¼¥¹ÈǤ¬¸ø³«¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
@@ -129,7 +121,7 @@
       &release.prev;
 ]]>
 <![ %release.type.current [
-      &release.prev;
+      &release.current;
 ]]>
 <![ %release.type.release [
       &release.current;
@@ -174,51 +166,7 @@
 ]]>
 
 <![ %release.type.snapshot [
-
-    <para>(2004 ǯ 1 ·î 30 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      &man.mksnap.ffs.8; ¤Î¥Ð¥°¤¬¸¶°ø¤Ç¡¢
-      ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤òºîÀ®¤¹¤ë¤È¡¢
-      Âоݥե¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Õ¥é¥°¤¬½é´üÃͤËÌá¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤è¤ë±Æ¶Á¤ÎÂç¾®¤Ï¥·¥¹¥Æ¥à¤ÎÍøÍÑ·ÁÂ֤ˤè¤ê¤Þ¤¹¤¬¡¢
-      ³ÈÄ¥¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È¤ò̵¸ú¤Ë¤·¤¿¤ê¡¢¿®Íê¤Ç¤­¤Ê¤¤¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë
-      ÃÖ¤«¤ì¤Æ¤¤¤ë setuid ¼Â¹Ô¥Õ¥¡¥¤¥ë¤Î¼Â¹Ô¤¬²Äǽ¤Ë¤Ê¤ë¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹¡£
-      &man.dump.8; ¤Î <option>-L</option> ¥ª¥×¥·¥ç¥ó¤â¡¢
-      &man.mksnap.ffs.8; ¤òÍøÍѤ¹¤ë¤¿¤á¡¢¤³¤Î¥Ð¥°¤Ë¤è¤ë±Æ¶Á¤ò¼õ¤±¤Þ¤¹¡£
-      ¤¿¤À¤·Ä̾&man.mksnap.ffs.8; ¤ò¼Â¹Ô²Äǽ¤Ê¤Î¤Ï
-      ¥¹¡¼¥Ñ¥æ¡¼¥¶¤È <groupname>operator</groupname> ¤Î¥á¥ó¥Ð¤Î¤ß¤Ç¤¹¡£
-      ¤³¤Î¥Ð¥°¤Ï &os; &release.prev; ¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ç½¤Àµ¤µ¤ì¡¢
-      &os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
-      ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:01.mksnap_ffs.asc">FreeBSD-SA-04:01</ulink>
-      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-    <para>(2004 ǯ 2 ·î 8Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      System V ¶¦Í­¥á¥â¥ê¥¤¥ó¥¿¥Õ¥§¡¼¥¹
-      (¤Î¤¦¤Á &man.shmat.2; ¥·¥¹¥Æ¥à¥³¡¼¥ë) ¤Ë¥Ð¥°¤¬¤¢¤ê¡¢
-      ̤³äÅö¤Î¥«¡¼¥Í¥ë¥á¥â¥ê¤ò»²¾È¤¹¤ë¶¦Í­¥á¥â¥ê¥»¥°¥á¥ó¥È¤ò¤Ä¤¯¤ë¤³¤È¤¬
-      ¤Ç¤­¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-      ¥í¡¼¥«¥ë¤Î¹¶·â¼Ô¤¬¤³¤ì¤ò°­ÍѤ¹¤ë¤È¡¢¥«¡¼¥Í¥ë¥á¥â¥ê¤Î°ìÉô¤ËÉÔÀµ¤Ë
-      ¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ë¤¿¤á¡¢·ë²Ì¤È¤·¤Æ¥»¥­¥å¥ê¥Æ¥£¾å½ÅÍפÊ
-      ¾ðÊó¤Îϳ±Ì¡¢¥¢¥¯¥»¥¹À©¸æµ¡¹½¤Î±ª²ó¤ä
-      ¹â¤¤¸¢¸Â¤ÎÉÔÀµ¤Ê³ÍÆÀ¤Ê¤É¤ËÍøÍѤµ¤ì¤ë¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹¡£
-      ¤³¤Î¥Ð¥°¤Ï &os; &release.prev; ¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ç½¤Àµ¤µ¤ì¡¢
-      &os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
-      ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:02.shmat.asc">FreeBSD-SA-04:02</ulink>
-      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-    <para>(2004 ǯ 2 ·î 28 Æü)
-      ÆÃÄê¤Î¾ò·ï²¼¤Ç¤Ï¡¢&man.jail.8; ´Ä¶­¤ÎÆ⦤Ç
-      ¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤ò»ý¤Ä¥×¥í¥»¥¹¤ò°­ÍѤ·¤Æ
-      ¼«¿È¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò°Û¤Ê¤ë jail ¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤è¤ê¡¢ËÜÍèÆÈΩ¤·¤Æ¤¤¤ë¤Ù¤­³Æ jail ´Ö¤Ç¡¢
-      ¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆɤ߽ñ¤­¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤ª¤½¤ì¤¬¤¢¤ê¤Þ¤¹¡£
-      ¤³¤Î¤¼¤¤¼åÀ­¤Ï &os; &release.prev; ¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ç½¤Àµ¤µ¤ì¡¢
-      &os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
-      ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:03.mail.asc">FreeBSD-SA-04:03</ulink>
-      ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
+    <para>¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Ïȯ¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
 ]]>
 
   </sect1>
@@ -235,137 +183,7 @@
 ]]>
 
 <![ %release.type.snapshot [
-    <para>(2004 ǯ 1 ·î 9 Æü)
-      &man.cpp.1; ¤ÎÆ°ºî¤¬Êѹ¹¤µ¤ì¤¿¤³¤È¤¬¸¶°ø¤Ç¡¢
-      ¥«¥é¡¼¥Ç¥£¥¹¥×¥ì¥¤¤¬Àܳ¤µ¤ì¤Æ¤¤¤Æ¤â¡¢
-      &man.xdm.1; ¤Î¥í¥°¥¤¥ó²èÌ̤¬Çò¹õ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-      ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î
-      <filename role="package">x11/XFree86-4-clients</filename>
-      ¤Î port/package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ç¡¢¤³¤ÎÌäÂê¤Ï²óÈò²Äǽ¤Ç¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 9 Æü)
-      ACPI ¤Ë´Ø¤¹¤ëÌäÂ꤬»Ä¤Ã¤Æ¤¤¤Þ¤¹¡£¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¤Ïµ¯Æ°»þ¤Ë
-      Æ°ºî¤¬¤ª¤«¤·¤¯¤Ê¤Ã¤¿¤ê¡¢¥Ï¥ó¥°¥¢¥Ã¥×¤·¤Æ¤·¤Þ¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-      ¤³¤ÎÌäÂê¤Ï¡¢µ¯Æ°¥í¡¼¥À¤Î <quote>¥»¡¼¥Õ¥â¡¼¥É</quote> ¥ª¥×¥·¥ç¥ó¤«¡¢
-      ¥«¡¼¥Í¥ë´Ä¶­ÊÑ¿ô <varname>hint.acpi.0.disabled</varname>
-      ¤ò»È¤Ã¤Æ ACPI ¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤Ç²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤ì¤é¤ÎÌäÂê¤Ï¡¢¸½ºßÄ´ººÃæ¤Ç¤¹¡£¤Þ¤ÀÊó¹ð¤µ¤ì¤Æ¤¤¤Ê¤¤ÌäÂ꤬
-      ¤¢¤ê¤Þ¤·¤¿¤é¡¢&man.dmesg.8; ¤È &man.acpidump.8; ¤Î·ë²Ì¤ò
-      &a.current; ¤ËÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤ 
-      (<emphasis>Á÷¤ëÁ°</emphasis>¤Ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥¢¡¼¥«¥¤¥Ö¤òÄ´¤Ù¤Þ¤·¤ç¤¦)¡£
-      ¤½¤ÎÊó¹ð¤¬¡¢ÌäÂê¤Î¸¶°øµæÌÀ¤ËÌò¤ËΩ¤Ä¤«¤âÃΤì¤Þ¤»¤ó¡£</para>
-
-    <para>(2004 ǯ 1 ·î 9 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      ATA ¥Ç¥Ð¥¤¥¹¡¢ÆÃ¤Ë SATA ¥Ç¥Ð¥¤¥¹¤Î¾ì¹ç¡¢Àµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
-      Êó¹ð¤µ¤ì¤Æ¤¤¤ë¾É¾õ¤Ï¡¢¥³¥Þ¥ó¥É¤¬¥¿¥¤¥à¥¢¥¦¥È¤¹¤ë¡¢
-      ¤¢¤ë¤¤¤Ï³ä¤ê¹þ¤ß¤¬¤«¤«¤é¤Ê¤¤¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£
-      ¤³¤ì¤é¤ÎÌäÂê¤Ï¥¿¥¤¥ß¥ó¥°¤Ë°Í¸¤·¤Æ¤¤¤ë¤é¤·¤¯¡¢ÆÃÄ꤬º¤Æñ¤Ê¾õ¶·¤Ç¤¹¡£
-      ²óÈòºö¤È¤·¤Æ¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>µ¯Æ°¥í¡¼¥À¤Î<quote>¥»¡¼¥Õ¥â¡¼¥É</quote>¥ª¥×¥·¥ç¥ó¡¢
-          ¤â¤·¤¯¤Ï sysctl ÊÑ¿ô <varname>hw.ata.ata_dma</varname> ¤ò»È¤Ã¤Æ
-          ATA DMA ¤ò̵¸ú¤Ë¤¹¤ë¡£</para>
-      </listitem>
-
-      <listitem>
-	<para>¤â¤·²Äǽ¤Ê¤é¡¢¥Û¥¹¥È¤Î BIOS ÀßÄê¤òÊѹ¹¤·¤Æ
-          ATA ¥³¥ó¥È¥í¡¼¥é¤ò <quote>legacy mode</quote> ¤ËÀÚ¤êÂؤ¨¤ë¡£</para>
-      </listitem>
-
-      <listitem>
-	<para>¤¿¤È¤¨¤Ðµ¯Æ°¥í¡¼¥À¤Î<quote>¥»¡¼¥Õ¥â¡¼¥É</quote>¥ª¥×¥·¥ç¥ó¤ä
-          ¥«¡¼¥Í¥ë´Ä¶­ÊÑ¿ô <varname>hint.acpi.0.disabled</varname>
-          ¤ò»È¤Ã¤Æ¡¢ACPI ¤ò̵¸ú¤Ë¤¹¤ë¡£</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>¾åµ­¤ÎÌäÂê¤Î¤¤¤¯¤Ä¤«¤Ï¡¢
-      &os; &release.bugfix; ¤Ç¤Ï
-      &release.current; ¤«¤é¿·¤·¤¤ &man.ata.4; ¥É¥é¥¤¥Ð¤òÅý¹ç¤·¤Æ
-      ²ò·è¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 9 Æü)
-      ¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥í¥Ã¥Ô¡¼¤ò»È¤Ã¤Æ NFS ·Ðͳ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢
-      3 ËçÌܤΥեí¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤«¤é
-      <filename>nfsclient.ko</filename>
-      ¥â¥¸¥å¡¼¥ë¤ò¼êÆ°¤Ç¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      &man.sysinstall.8; ¤¬ 3 ËçÌܤΥեí¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤Ë¤¢¤ë
-      ¥É¥é¥¤¥Ð¤òÆɤ߹þ¤à»þ¤Ëɽ¼¨¤µ¤ì¤ë¥×¥í¥ó¥×¥È¤Î»Ø¼¨¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <para>(2004 ǯ 1 ·î 9 Æü)
-      &man.pcm.4; ¥É¥é¥¤¥Ð¤ÇÊ£¿ô¤Î vchans (¥½¥Õ¥È¥¦¥§¥¢¤ÇưŪ¤Ë¥ß¥­¥·¥ó¥°¤ò
-      ¹Ô¤Ê¤¦²¾ÁÛ¥ª¡¼¥Ç¥£¥ª¥Á¥ã¥Í¥ë) ¤òÍøÍѤ¹¤ë¤È¡¢
-      ÉÔ°ÂÄê¤Ë¤Ê¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 10 Æü)
-      APIC ³ä¤ê¹þ¤ß¥ë¡¼¥Æ¥£¥ó¥°¤Ï¿¤¯¤Î¥·¥¹¥Æ¥à¤ÇÀµ¾ï¤ËÆ°ºî¤·¤Æ¤¤¤Þ¤¹¤¬¡¢
-      (¥é¥Ã¥×¥È¥Ã¥×¤Î°ìÉô¤Ê¤É) ¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¤Ï¡¢¤¿¤È¤¨¤Ð
-      X11 ¤Îµ¯Æ°¡¦½ªÎ»»þ¤Ë &man.ata.4; ¤Î¥¨¥é¡¼¤ä¥Ï¥ó¥°¥¢¥Ã¥×¤¬È¯À¸¤¹¤ë¤È
-      ¤¤¤Ã¤¿¡¢¤µ¤Þ¤¶¤Þ¤Ê¥¨¥é¡¼¤¬È¯À¸¤¹¤ë¤è¤¦¤Ç¤¹¡£
-      ¤³¤¦¤¤¤Ã¤¿¾É¾õ¤¬¸½¤ì¤ë¾ì¹ç¤Ï¡¢
-      µ¯Æ°¥í¡¼¥À¤Î<quote>¥»¡¼¥Õ¥â¡¼¥É</quote>¥ª¥×¥·¥ç¥ó¤ä
-      ¥í¡¼¥ÀÊÑ¿ô <varname>hint.apic.0.disabled</varname>
-      ¤ò»È¤Ã¤Æ¡¢APIC ¥ë¡¼¥Æ¥£¥ó¥°¤ò̵¸ú¤Ë¤¹¤ë¤È²þÁ±¤¹¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
-      ¤¿¤À¤·¡¢APIC ¤ò̵¸ú¤Ë¤¹¤ë¤È SMP ¥·¥¹¥Æ¥à¤ÎÍøÍѤϤǤ­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 10 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      NFSv4 ¥¯¥é¥¤¥¢¥ó¥È¤¬ NFSv3 ¤Î¤ß¡¢¤¢¤ë¤¤¤Ï NFSv2 ¤Î¤ß¤ËÂбþ¤·¤¿
-      ¥µ¡¼¥Ð¤Ë NFSv4 Áàºî¤ò¤ª¤³¤Ê¤ª¤¦¤È¤·¤¿¾ì¹ç¡¢
-      ¥Ñ¥Ë¥Ã¥¯¤¬È¯À¸¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ÎÌäÂê¤Ï¡¢
-      &os; &release.current; ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë
-      <filename>src/sys/rpc/rpcclnt.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó
-      1.4 ¤Ç½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
-      ¤³¤Î½¤Àµ¤Ï &os; &release.bugfix; ¤Ë¤âÅý¹ç¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 11 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      <filename>nss_ldap</filename> ¤Ê¤É¤Î¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½ NSS
-      ¥â¥¸¥å¡¼¥ë¤ò»È¤¤¡¢ÂçÎ̤Υá¥ó¥Ð¥ê¥¹¥È¤ò´Þ¤à¥°¥ë¡¼¥×¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢
-      ÌäÂ꤬ȯÀ¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ÎÌäÂê¤Ï
-      &os; &release.current; ¤Ë´Þ¤Þ¤ì¤ë
-      <filename>src/include/nss.h</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.2,
-      <filename>src/lib/libc/net/nss_compat.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.2 ¤Ç
-      ½¤Àµ¤µ¤ì¡¢&os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£</para>
-
-    <para>(2004 ǯ 1 ·î 13 Æü)
-      &os; &release.current; ¤Î¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë¤Ï¡¢´Þ¤Þ¤ì¤Æ¤¤¤ë
-      <application>GCC</application> ¤¬ post-release GCC 3.3.3 snapshot
-      ¤Èµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ì¤Ï¡¢<emphasis>pre-release</emphasis> GCC 3.3.3
-      snapshot ¤Î¸í¤ê¤Ç¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 13 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      <filename role="package">sysutils/kdeadmin3</filename> port/package ¤Ë¤Ï¡¢
-      <application>KUser</application> ¤ò»È¤¦¤È¥·¥¹¥Æ¥à¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ë
-      ¤¢¤ë <username>root</username> ¥æ¡¼¥¶¤¬ºï½ü¤µ¤ì¤Æ¤·¤Þ¤¦²ÄǽÀ­¤Î¤¢¤ë
-      ¥Ð¥°¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î port/package ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¤¼¤Ò¥Ð¡¼¥¸¥ç¥ó 3.1.4_1 ¤Ø¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤è¤¦¤ª´ê¤¤¤·¤Þ¤¹¡£
-      &os; &release.bugfix; ¤Ë¤Ï¤³¤Î¥Ð¥°¤¬½¤Àµ¤µ¤ì¤¿ package ¤¬
-      ¼ýÏ¿¤µ¤ì¤Æ¤Þ¤¹¡£</para>
-
-    <para>(2004 ǯ 1 ·î 21 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      KAME ¥×¥í¥¸¥§¥¯¥È¤«¤éÅý¹ç¤µ¤ì¤¿ IPSec ¼ÂÁõ¤Ë¡¢
-      ¤Þ¤À»²¾È¤µ¤ì¤Æ¤¤¤ë¥á¥â¥ê¥ª¥Ö¥¸¥§¥¯¥È¤ò³«Êü¤·¤Æ¤·¤Þ¤¦²ÄǽÀ­¤Î¤¢¤ë¥Ð¥°¤¬
-      ȯ¸«¤µ¤ì¤Þ¤·¤¿¡£º£¤Þ¤Ç¡¢¥»¥­¥å¥ê¥Æ¥£¥Ý¥ê¥·¥Ç¡¼¥¿¥Ù¡¼¥¹
-      (SPD; Security Policy Database) ¤ò¥Õ¥é¥Ã¥·¥å¤·¤¿¸å¤Ë°Û¾ï¤ÊÆ°ºî¤ò¤·¤¿¤ê¡¢
-      ¥«¡¼¥Í¥ë¥Ñ¥Ë¥Ã¥¯¤¬È¯À¸¤¹¤ë¤È¤¤¤¦¾É¾õ¤¬Êó¹ð¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ÌäÂê¤Î°ìÉô¤Ï &os; &release.current; ¤Ë´Þ¤Þ¤ì¤ë
-      <filename>src/sys/netinet6/ipsec.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.31,
-      <filename>src/sys/netinet/in_pcb.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.136,
-      <filename>src/sys/netkey/key.c</filename> ¤Î¥ê¥Ó¥¸¥ç¥ó 1.64
-      ¤Ç½¤Àµ¤µ¤ì¡¢&os; &release.bugfix; ¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
-      ¤³¤ÎÌäÂê¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-      &a.current; ¤ÎÅê¹Æ¡¢ÆäË
-      <ulink url="http://lists.FreeBSD.org/pipermail/freebsd-current/2004-January/thread.html#18084">
-	<quote>[PATCH] IPSec fixes</quote></ulink>
-      ¤È¤¤¤¦Âê̾¤Î¤Ä¤¤¤¿¥¹¥ì¥Ã¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-    <para>(2004 ǯ 2 ·î 28 Æü)
-      &os; &release.bugfix; ¤Ë¼ýÏ¿¤µ¤ì¤Æ¤¤¤ë
-      FreeBSD port ºîÀ®¼Ô¤Î¤¿¤á¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ë¡¢&release.bugfix; ¤Î
-      <varname>__FreeBSD_version</varname> ¤ÎÃͤ˸í¤ê¤¬¤¢¤ê¤Þ¤·¤¿¡£
-      Àµ¤·¤¯¤Ï <literal>502010</literal> ¤Ç¤¹¡£</para>
-
+    <para>̤²ò·è¤ÎÌäÂê¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 ]]>
 
   <sect1 id="late-news">
@@ -380,26 +198,8 @@
 ]]>
 
 <![ %release.type.snapshot [
-    <para>(2004 ǯ 1 ·î 10 Æü; 2004 ǯ 2 ·î 28 Æü¹¹¿·)
-      &os; ¤Î TCP ¼ÂÁõ¤Ë TCP ¥»¥°¥á¥ó¥È¤Î¥µ¥¤¥º¤È®ÅÙ¤òÀ©¸Â¤¹¤ë¤È¤¤¤¦·Á¤Ç¡¢
-      ¤¢¤ë¼ï¤Î TCP MSS »ñ¸»¸Ï³é¹¶·â¤ËÂФ¹¤ëÂкö¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
-      ¤Ò¤È¤ÄÌÜ¤Ï TCP ¥»¥°¥á¥ó¥È¥µ¥¤¥º¤ÎºÇÂç¤ÈºÇ¾®¤òÀ©¸Â¤¹¤ë¤â¤Î¤Ç¡¢
-      sysctl ÊÑ¿ô <varname>net.inet.tcp.minmss</varname> (¥Ç¥Õ¥©¥ë¥È¤Ï
-      <literal>216</literal>) ¤ÇÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤Õ¤¿¤ÄÌܤϡ¢¥»¥°¥á¥ó¥È¤ÎÊ¿¶Ñ¥µ¥¤¥º¤¬
-      <varname>net.inet.tcp.minmss</varname> ¤è¤ê¾®¤µ¤¤Àܳ¤Î
-      ºÇÂçÄÌ¿®Â®ÅÙ¤òÀ©¸Â¤¹¤ë¤â¤Î¤Ç¡¢
-      <varname>net.inet.tcp.minmssoverload</varname>
-      ÊÑ¿ô¤ÇÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ÀßÄꤵ¤ì¤¿¥Ñ¥±¥Ã¥È®ÅÙ¤òĶ¤¨¤ëÀܳ¤Ï¡¢reset ¤µ¤ì¤ÆÀÚÃǤµ¤ì¤Þ¤¹¡£
-      ¤³¤Îµ¡Ç½¤Ï &release.prev; ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤Î½ª¤ê¤´¤í¤ËÄɲ䵤줿¤¿¤á¡¢
-      ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤³¤ÎÀܳ®ÅÙ¤ÎÀ©¸Â¤Ï̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢
-      <varname>net.inet.tcp.minmssoverload</varname> ¤Ë 0 ¤Ç¤Ê¤¤
-      ÃͤòÀßÄꤹ¤ë¤³¤È¤Ç¡¢¼êÆ°¤ÇÍ­¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤Îµ¡Ç½¤Ï &os; &release.prev; ¤Î¥ê¥ê¡¼¥¹¹©Äø¤Î½ªÈפÇÄɲ䵤줿¤¿¤á¡¢
-      ¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£</para>
+    <para>¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 ]]>
-
   </sect1>
 
 </article>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 (text+ko) ====

@@ -26,13 +26,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.28 2005/06/27 17:48:19 rushani Exp $
+        $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.29 2005/06/30 12:54:57 rushani Exp $
         Original revision: 1.282
 -->
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.28 2005/06/27 17:48:19 rushani Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.29 2005/06/30 12:54:57 rushani Exp $</pubdate>
   </sect1info>
 
   <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
@@ -308,7 +308,7 @@
   </sect2>
 
   <sect2 id="tokenring">
-    <title>¥È¡¼¥¯¥ó¥ê¥ó¥°¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹</title>
+    <title>¥È¡¼¥¯¥ó¥ê¥ó¥°¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
 
     &hwlist.oltr;
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent#2 (text+ko) ====

@@ -3,7 +3,7 @@
 <!--
     FreeBSD Japanese Documentation Project
 
-    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent,v 1.4 2002/06/25 18:54:38 hrs Exp $
+    $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent,v 1.5 2005/06/30 16:26:24 rushani Exp $
 
     Original revision: 1.3
 -->
@@ -17,11 +17,4 @@
 <!ENTITY % no.include.historic "IGNORE">
 
 <!-- Files to be included -->
-
-<!-- XXX: 4 entities will be removed. -->
-<!ENTITY artheader SYSTEM "../common/artheader.sgml">
-<!ENTITY sect.intro SYSTEM "../common/intro.sgml">
-<!ENTITY sect.new SYSTEM "../common/new.sgml">
-<!ENTITY sect.upgrading SYSTEM "../common/upgrading.sgml">
-<!-- XXX: -->
 <!ENTITY art SYSTEM "../common/new.sgml">

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.13 2005/04/25 12:22:25 den Exp $
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.17 2005/04/25 12:23:24 den Exp $
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.14 2005/06/30 11:35:03 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $
 
-     Original revision: 1.278
+     Original revision: 1.282
 -->
 
 <!--
@@ -37,7 +37,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.13 2005/04/25 12:22:25 den Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.14 2005/06/30 11:35:03 den Exp $</pubdate>
   </sect1info>
 
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
@@ -88,65 +88,6 @@
 
     &hwlist.ct;
 
-    <para arch="pc98">NEC PC-9801-55, 92 É ÓÏ×ÍÅÓÔÉÍÙÅ Ó ÎÉÍÉ C-Bus SCSI
-      ÉÎÔÅÒÆÅÊÓÙ (ÄÒÁÊ×ÅÒ bs)
-      <itemizedlist>
-	<listitem>
-	  <para>NEC PC-9801-55, 92 É ÓÏ×ÍÅÓÔÉÍÙÅ Ó ÎÉÍÉ</para>
-	  <para>ICM IF-2660</para>
-	  <para>Midori-Denshi MDC-554NA</para>
-	  <para>Logitec LHA-N151</para>
-	  <note>
-	    <para>ÐÁÒÁÍÅÔÒ <literal>flags 0x00000</literal> ÄÏÌÖÅÎ
-	      ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ ÄÌÑ ÒÅÖÉÍÁ ÐÅÒÅÄÁÞÉ
-	      DMA.</para>
-	  </note>
-	</listitem>
-	<listitem>
-	  <para>I-O DATA SC-98II</para>
-	  <note>
-	    <para>ÐÁÒÁÍÅÔÒ <literal>flags 0x10000</literal> ÄÏÌÖÅÎ
-	      ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ ÄÌÑ ÒÅÖÉÍÁ ÐÅÒÅÄÁÞÉ
-	      DMA.</para>
-	  </note>
-	</listitem>
-	<listitem>
-	  <para>TEXA HA-55BS2 É ÂÏÌÅÅ ÐÏÚÄÎÉÅ</para>
-	  <para>Midori-Denshi MDC-926Rs</para>
-	  <note>
-	    <para>ÐÁÒÁÍÅÔÒ <literal>flags 0x20000</literal> ÄÏÌÖÅÎ
-	      ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ ÄÌÑ ÒÅÖÉÍÁ ÐÅÒÅÄÁÞÉ
-	      Bus-master.</para>
-	  </note>
-	</listitem>
-	<listitem>
-	  <para>ELECOM Bus-master SCSI ÉÎÔÅÒÆÅÊÓÙ</para>
-	  <note>
-	    <para>ÐÁÒÁÍÅÔÒ <literal>flags 0x30000</literal> ÄÏÌÖÅÎ
-	      ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ ÄÌÑ ÒÅÖÉÍÁ ÐÅÒÅÄÁÞÉ
-	      Bus-master.</para>
-	  </note>
-	</listitem>
-	<listitem>
-	  <para>÷ÓÅ SMIT transfer type SCSI ÉÎÔÅÒÆÅÊÓÙ</para>
-	  <note>
-	    <para>ÐÁÒÁÍÅÔÒ <literal>flags 0x40000</literal> ÄÏÌÖÅÎ
-	      ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ ÄÌÑ ÒÅÖÉÍÁ ÐÅÒÅÄÁÞÉ
-	      SMIT.</para>
-	  </note>
-	</listitem>
-	<listitem>
-	  <para>Logitec LHA-20x series</para>
-	  <para>ICM IF-2766, IF-2766ET, IF-2767 É IF-2769</para>
-	  <note>
-	    <para>ÐÁÒÁÍÅÔÒ <literal>flags 0x50000</literal> ÄÏÌÖÅÎ
-	      ÐÒÉÓÕÔÓÔ×Ï×ÁÔØ × ÆÁÊÌÅ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ ÄÌÑ ÒÅÖÉÍÁ ÐÅÒÅÄÁÞÉ
-	      Bus-master.</para>
-	  </note>
-	</listitem>
-      </itemizedlist>
-    </para>
-
     &hwlist.adv;
 
     &hwlist.adw;
@@ -367,6 +308,8 @@
 
     &hwlist.vge;
 
+    &hwlist.nve;
+
   </sect2>
 
   <sect2 id="tokenring">
@@ -739,57 +682,52 @@
       </note>
 
   </sect2>
-  <sect2 id="audio">
-    <title>áÕÄÉÏ ÕÓÔÒÏÊÓÔ×Á</title>
+  <sect2 id="sound">
+    <title>ú×ÕËÏ×ÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
+
+    &hwlist.sound;
 
     &hwlist.snd.ad1816;
-    &hwlist.snd.cs4281;
-    &hwlist.snd.solo;
+
+    &hwlist.snd.als4000;
 
-    &hwlist.snd.sbc;
+    &hwlist.snd.audiocs;
 
     &hwlist.snd.cmi;
 
+    &hwlist.snd.cs4281;
+
     &hwlist.snd.csa;
 
+    &hwlist.snd.ds1;
+
+    &hwlist.snd.emu10k1;
+
     &hwlist.snd.es137x;
 
     &hwlist.snd.ess;
 
-    &hwlist.snd.maestro;
-
-    &hwlist.snd.maestro3;
-
-    &hwlist.snd.als4000;
-
     &hwlist.snd.fm801;
 
     &hwlist.snd.gusc;
 
-    <para arch="i386,amd64">Intel 443MX, 810, 815, É 815E ×ÓÔÒÏÅÎÎÙÅ Ú×ÕËÏ×ÙÅ
-      ÕÓÔÒÏÊÓÔ×Á (ÄÒÁÊ×ÅÒ &man.pcm.4;)</para>
+    &hwlist.snd.ich;
+
+    &hwlist.snd.maestro;
 
-    <para arch="i386,alpha,amd64">MSS/WSS Compatible DSPs (ÄÒÁÊ×ÅÒ &man.pcm.4;)</para>
+    &hwlist.snd.maestro3;
 
     &hwlist.snd.neomagic;
 
-    <para arch="i386,amd64">OPTi 931/82C931 (ÄÒÁÊ×ÅÒ &man.pcm.4;)</para>
+    &hwlist.snd.sbc;
 
-    &hwlist.snd.vibes;
-
-    &hwlist.snd.emu10k1;
-
-    <para arch="i386,amd64">Trident 4DWave DX/NX (ÄÒÁÊ×ÅÒ &man.pcm.4;)</para>
+    &hwlist.snd.solo;
 
     &hwlist.snd.via8233;
 
     &hwlist.snd.via82c686;
 
-    &hwlist.snd.ds1;
-
-    &hwlist.snd.ich;
-
-    &hwlist.snd.audiocs;
+    &hwlist.snd.vibes;
 
     <para arch="pc98">NEC PC-9801-73, 86 É ÓÏ×ÍÅÓÔÉÍÙÅ (ÄÒÁÊ×ÅÒ nss)
       <itemizedlist>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.2 2004/09/10 13:56:41 den Exp $
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.2 2004/09/06 14:05:03 den Exp $
+     $FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:35:03 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:12:32 den Exp $
 
-     Original revision: 1.6
+     Original revision: 1.7
 -->
 
 <articleinfo>
@@ -20,6 +20,7 @@
     <year>2002</year>
     <year>2003</year>
     <year>2004</year>
+    <year>2005</year>
     <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
   </copyright>
 </articleinfo>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
 The FreeBSD Russian Documentation Project
 
-$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.7 2005/04/14 13:29:07 den Exp $
-$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.7 2005/04/14 13:30:11 den Exp $
+$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:35:03 den Exp $
+$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:12:32 den Exp $
 
-Original revision: 1.31
+Original revision: 1.32
 
 install.sgml
 
@@ -220,7 +220,7 @@
       É ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ (ÒÁÚÌÉÞÎÙÅ ×ÅÒÓÉÉ UNIX ÐÏ-ÒÁÚÎÏÍÕ ÉÍÅÎÕÀÔ
       ÕÓÔÒÏÊÓÔ×Á ÇÉÂËÉÈ ÄÉÓËÏ×).</para>
 
-    <para arch="amd64">õÓÔÁÎÏ×ËÁ Ó ÄÉÓËÅÔÙ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ×
+    <para arch="amd64,sparc64">õÓÔÁÎÏ×ËÁ Ó ÄÉÓËÅÔÙ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ×
       &os;/&arch;.</para>
   </sect2>
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#2 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
 	The FreeBSD Russian Documentation Project
 
-	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.4 2005/04/14 13:29:07 den Exp $
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.4 2005/04/14 13:30:11 den Exp $
+	$FreeBSD: src/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:35:03 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:12:32 den Exp $
 
-	Original revision: 1.17
+	Original revision: 1.19
 
 	This file contains the comments of the old TROUBLE.TXT file.
 -->
@@ -77,7 +77,7 @@
 	</question>
 	<answer>
 	  <para>&os; 5.0 É ×ÙÛÅ ÉÓÐÏÌØÚÕÅÔ ÓÉÓÔÅÍÎÙÊ ÓÅÒ×ÉÓ ACPI ÐÌÁÔÆÏÒÍÙ
-	    i386 ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÉÓÔÅÍÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ, ÅÓÌÉ ÜÔÏÔ ÓÅÒ×ÉÓ
+	    i386, amd64 É ia64 ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÉÓÔÅÍÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ, ÅÓÌÉ ÜÔÏÔ ÓÅÒ×ÉÓ
 	    ÏÂÎÁÒÕÖÅÎ ×Ï ×ÒÅÍÑ ÚÁÇÒÕÚËÉ.  ë ÓÏÖÁÌÅÎÉÀ, × ÄÒÁÊ×ÅÒÅ ACPI,
 	    ÍÁÔÅÒÉÎÓËÉÈ ÐÌÁÔÁÈ É BIOS ×ÓÅ ÅÝÅ ÐÒÉÓÕÔÓÔ×ÕÀÔ ÎÅËÏÔÏÒÙÅ ÏÛÉÂËÉ.
 	    éÓÐÏÌØÚÏ×ÁÎÉÅ ACPI ÍÏÖÅÔ ÂÙÔØ ×ÙËÌÀÞÅÎÏ ÕÓÔÁÎÏ×ËÏÊ
@@ -92,7 +92,7 @@
 	    ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÚÁÇÒÕÚÞÉËÕ ÎÁÈÏÄÉÔÓÑ × òÕËÏ×ÏÄÓÔ×Å &os;.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386,pc98,alpha,sparc64">
 	<question>
 	  <para>ISA ÕÓÔÒÏÊÓÔ×Ï, ÏÐÒÅÄÅÌÑ×ÛÅÅÓÑ × ÐÒÅÄÙÄÕÝÉÈ ×ÅÒÓÉÑÈ
 	    &os;, ÔÅÐÅÒØ ÎÅ ÏÐÒÅÄÅÌÑÅÔÓÑ.  þÔÏ ÓÌÕÞÉÌÏÓØ?</para>
@@ -215,7 +215,7 @@
 	  </blockquote>
  	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>äÒÁÊ×ÅÒ &man.mcd.4; ÓÞÉÔÁÅÔ, ÞÔÏ ÎÁÛÅÌ ÕÓÔÒÏÊÓÔ×Ï É
 	    ÍÅÛÁÅÔ ÒÁÂÏÔÅ ËÁÒÔÙ Intel EtherExpress.</para>
@@ -256,7 +256,7 @@
 	    IRQ 2 ÉÌÉ 9 ÅÓÌÉ ÜÔÏ ×ÏÚÍÏÖÎÏ.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>ñ ÚÁÇÒÕÚÉÌ Ó ÕÓÔÁÎÏ×ÏÞÎÏÊ ÄÉÓËÅÔÙ ÌÜÐÔÏÐ IBM ThinkPad (tm)
 	    É ËÌÁ×ÉÁÔÕÒÁ ÒÁÂÏÔÁÅÔ ÎÅÐÒÁ×ÉÌØÎÏ.</para>
@@ -269,7 +269,7 @@
 	    É ×ÓÅ ÄÏÌÖÎÏ ÚÁÒÁÂÏÔÁÔØ ÏÔÌÉÞÎÏ.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386,pc98,alpha,sparc64">
 	<question>
 	  <para>íÏÑ ÓÉÓÔÅÍÁ ÎÅ ÍÏÖÅÔ ÎÁÊÔÉ ËÁÒÔÕ Intel EtherExpress 16.</para>
 	</question>
@@ -280,7 +280,7 @@
 	    <filename>softset.exe</filename>.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ÎÁ EISA HP Netserver, ×ÓÔÒÏÅÎÎÙÊ SCSI
 	    ËÏÎÔÒÏÌÌÅÒ AIC-7xxx ÎÅ ÏÂÎÁÒÕÖÉ×ÁÅÔÓÑ.</para>
@@ -292,7 +292,7 @@
 	    ÔÒÅÔØÅÊ ÓÔÁÄÉÉ ÚÁÇÒÕÚÞÉËÁ.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>õ ÍÅÎÑ ËÏÍÐØÀÔÅÒ Panasonic AL-N1 ÉÌÉ Rios Chandler Pentium
 	    É ÓÉÓÔÅÍÁ ÐÏÄ×ÉÓÁÅÔ ÎÅ ÎÁÞÁ× ÕÓÔÁÎÏ×ËÕ.</para>
@@ -312,7 +312,7 @@
 	  <para>&os; ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÜÔÏÔ ËÏÎÔÒÏÌÌÅÒ.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ Ó ÄÉÓËÅÔ ÎÁ ÎÏÕÔÂÕËÅ Compaq Aero, Ñ ÐÏÌÕÞÁÀ
 	    ÓÏÏÂÝÅÎÉÅ <quote>No floppy devices found!  Please check
@@ -328,7 +328,7 @@
 	    ÄÉÓËÏ×ÏÄÁ (ËÁË 1.44 MB ÄÉÓË) ÂÅÚ ÚÁÐÒÏÓÁ Ë CMOS.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ÎÁ Dell Poweredge XE,
 	    RAID ËÏÎÔÒÏÌÌÅÒ Dell DSA (Dell SCSI Array) ÎÅ
@@ -358,7 +358,7 @@
 	    ÒÅÛÅÎÉÅÍ Ñ×ÌÑÅÔÓÑ ÕÓÔÁÎÏ×ËÁ ÄÒÕÇÏÇÏ Ethernet ÁÄÁÐÔÅÒÁ.</para>
 	</answer>
       </qandaentry>
-      <qandaentry>
+      <qandaentry arch="i386">
 	<question>
 	  <para>ëÏÇÄÁ Ñ ÎÁÓÔÒÁÉ×ÁÀ ÓÅÔØ ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÎÁ IBM Netfinity
 	    3500, ÓÉÓÔÅÍÁ ÐÏÄ×ÉÓÁÅÔ.</para>

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/readme/article.sgml#2 (text+ko) ====

@@ -1,10 +1,10 @@
 <!--
    The FreeBSD Russian Documentation Project
 
-   $FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.10 2004/09/20 11:17:56 den Exp $
-   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.9 2004/09/13 09:24:01 den Exp $
+   $FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:35:03 den Exp $
+   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:12:33 den Exp $
 
-   Original revision: 1.36
+   Original revision: 1.37
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -21,7 +21,7 @@
 
     <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.10 2004/09/20 11:17:56 den Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:35:03 den Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -29,6 +29,7 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
+      <year>2005</year>
       <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
     </copyright>
 

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.27 2005/04/15 13:13:30 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.29 2005/07/08 10:19:47 den Exp $
 
-     Original revision: 1.845
+     Original revision: 1.880
 -->
 
 <articleinfo>
@@ -11,7 +11,7 @@
 
   <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.19 2005/04/18 09:30:41 den Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.21 2005/07/08 14:34:10 den Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -34,7 +34,7 @@
 
   <abstract>
     <para>úÁÍÅÔËÉ Ï ÒÅÌÉÚÅ ÄÌÑ &os; &release.current; ÓÏÄÅÒÖÁÔ ÏÂÝÕÀ
-      ÉÎÆÏÒÍÁÃÉÀ ÐÏ ÉÚÍÅÎÅÎÉÑÍ, ×ÎÅÓÅÎÎÙÍ × ÓÉÓÔÅÍÕ Ó ÍÏÍÅÎÔÁ ÓÏÚÄÁÎÉÑ
+      ÉÎÆÏÒÍÁÃÉÀ ÐÏ ÉÚÍÅÎÅÎÉÑÍ ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÅ &os; × ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ
       &release.branch;.
       üÔÏÔ ÄÏËÕÍÅÎÔ ÓÏÄÅÒÖÉÔ ÓÐÉÓÏË ÓÏÏÂÝÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ, ×ÙÐÕÝÅÎÎÙÈ ÐÏÓÌÅ
       ÐÏÓÌÅÄÎÅÇÏ ÒÅÌÉÚÁ, Á ÔÁËÖÅ ÓÐÉÓÏË ÚÎÁÞÉÔÅÌØÎÙÈ ÉÚÍÅÎÅÎÉÊ, ×ÎÅÓÅÎÎÙÈ
@@ -165,7 +165,93 @@
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
       <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:04.ifconf.asc">FreeBSD-SA-05:04.ifconf</ulink>.
       &merged;</para>
+ 
+    <para>âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ ÎÅÓËÏÌØËÏ ÐÒÏÇÒÁÍÍÎÙÈ ÏÛÉÂÏË × &man.cvs.1;,
+      ËÏÔÏÒÙÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÇÌÉ ÐÒÉ×ÏÄÉÔØ Ë ×ÙÐÏÌÎÅÎÉÀ ÐÒÏÉÚ×ÏÌØÎÏÇÏ
+      ËÏÄÁ ÎÁ ÓÅÒ×ÅÒÁÈ CVS.  äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ ×
+      ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:05.cvs.asc">FreeBSD-SA-05:05.cvs</ulink>.
+      &merged;</para>
+
+    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÐÒÁ× ÎÁ ÆÁÊÌ ÕÓÔÒÏÊÓÔ×Á <filename
+	class="devicefile">/dev/iir</filename>, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÌÁ
+      ÎÅÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÍ ÌÏËÁÌØÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÏÔÐÒÁ×ÌÑÔØ ËÏÍÁÎÄÙ
+      ÏÂÏÒÕÄÏ×ÁÎÉÀ, ÐÏÄÄÅÒÖÉ×ÁÅÍÏÍÕ ÄÒÁÊ×ÅÒÏÍ &man.iir.4;.
+      úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:06.iir.asc">FreeBSD-SA-05:06.iir</ulink>.
+      &merged;</para>
+
+   <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÐÒÏ×ÅÒËÅ ÁÒÇÕÍÅÎÔÏ× ÓÉÓÔÅÍÎÏÇÏ ×ÙÚÏ×Á
+     &man.i386.get.ldt.2;, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÌÁ ÒÁÓËÒÙÔÉÅ ÉÎÆÏÒÍÁÃÉÉ × ÐÁÍÑÔÉ
+     ÑÄÒÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÍ ÐÒÏÃÅÓÓÁÍ.  úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ
+     Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+     <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:07.ldt.asc">FreeBSD-SA-05:07.ldt</ulink>.
+     &merged;</para>
+
+    <para>âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ ÎÅÓËÏÌØËÏ ÏÛÉÂÏË, ÐÏÚ×ÏÌÑ×ÛÉÈ ÒÁÓËÒÙÔÉÅ ÉÎÆÏÒÍÁÃÉÉ
+      × ÒÁÚÌÉÞÎÙÈ ÏÂÌÁÓÔÑÈ ÐÁÍÑÔÉ ÑÄÒÁ.  úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ
+      Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:08.kmem.asc">FreeBSD-SA-05:08.kmem</ulink>.
+      &merged;</para>
 
+    <para arch="i386,amd64">÷ÓÌÅÄÓÔ×ÉÅ ÏÂÎÁÒÕÖÅÎÉÑ × ÐÒÏÃÅÓÓÏÒÁÈ Ó
+      Hyper-Threading Technology (HTT) ÕÑÚ×ÉÍÏÓÔÉ, ÐÒÉ×ÏÄÑÝÅÊ Ë ÒÁÓËÒÙÔÉÀ
+      ÉÎÆÏÒÍÁÃÉÉ, ÂÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÐÅÒÅÍÅÎÎÁÑ sysctl
+      <varname>machdep.hyperthreading_allowed</varname>.
+      ðÏ ÕÍÏÌÞÁÎÉÀ ÏÎÁ ÕÓÔÁÎÏ×ÌÅÎÁ × <literal>1</literal> (HTT ×ËÌÀÞÅÎÁ)
+      × &os; CURRENT, É × <literal>0</literal> (HTT ×ÙËÌÀÞÅÎÁ) ×
+      × ×ÅÔ×ÑÈ ÒÁÚÒÁÂÏÔËÉ 4-STABLE É 5-STABLE É × ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ
+      ×ÅÔ×ÑÈ Ó ÉÓÐÒÁ×ÌÅÎÉÑÍÉ ÂÅÚÏÐÁÓÎÏÓÔÉ.  äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+      ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:09.htt.asc">FreeBSD-SA-05:09.htt</ulink>.
+      &merged;</para>
+
+    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÕÔÉÌÉÔÅ &man.tcpdump.1;, ÐÏÚ×ÏÌÑ×ÛÁÑ
+      ÚÌÏÎÁÍÅÒÅÎÎÏÍÕ ÕÄÁÌÅÎÎÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ ×ÙÐÏÌÎÅÎÉÅ DoS ÁÔÁËÉ
+      ÐÕÔÅÍ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÓÆÏÒÍÉÒÏ×ÁÎÎÙÈ ÓÐÅÃÉÁÌØÎÏ ÄÌÑ ÜÔÏÇÏ ÐÁËÅÔÏ×.
+      úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:10.tcpdump.asc">FreeBSD-SA-05:10.tcpdump</ulink>.
+      &merged;</para>
+
+    <para>âÙÌÏ ÉÓÐÒÁ×ÌÅÎÏ Ä×Å ÐÒÏÂÌÅÍÙ × ÕÔÉÌÉÔÅ &man.gzip.1;.
+      ÷ÓÌÅÄÓÔ×ÉÅ ÜÔÉÈ ÐÒÏÂÌÅÍ ÌÏËÁÌØÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ ÍÏÇ ÉÚÍÅÎÉÔØ ÐÒÁ×Á
+      ÐÒÏÉÚ×ÏÌØÎÙÈ ÆÁÊÌÏ× É ÐÅÒÅÚÁÐÉÓÁÔØ ÐÒÏÉÚ×ÏÌØÎÙÅ ÌÏËÁÌØÎÙÅ ÆÁÊÌÙ
+      ÐÒÉ ÒÁÓÐÁËÏ×ËÅ ÆÁÊÌÁ.
+      úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:11.gzip.asc">FreeBSD-SA-05:11.gzip</ulink>.
+      &merged;</para>
+
+    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × <application>BIND 9</application> DNSSEC.
+      åÓÌÉ DNSSEC ×ËÌÀÞÅÎ, ÜÔÁ ÏÛÉÂËÁ ÍÏÖÅÔ ÐÏÚ×ÏÌÉÔØ ÕÄÁÌÅÎÎÏ ×ÙÚ×ÁÔØ
+      ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ &man.named.8; ÐÕÔÅÍ ÏÔÐÒÁ×ËÉ ÅÍÕ ÓÐÅÃÉÁÌØÎÏ
+      ÓÆÏÒÍÉÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×.
+      úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:12.bind9.asc">FreeBSD-SA-05:12.bind9</ulink>.
+      &merged;</para>
+
+    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × &man.ipfw.4;, ËÏÔÏÒÁÑ ÍÏÇÌÁ
+      ÐÒÉ×ÏÄÉÔØ Ë ÎÅÐÒÁ×ÉÌØÎÏÍÕ ÓÏÐÏÓÔÁ×ÌÅÎÉÀ ÐÁËÅÔÁ Ó lookup table.
+      üÔÁ ÏÛÉÂËÁ ÐÒÏÑ×ÌÑÌÁÓØ ÔÏÌØËÏ ÎÁ SMP ËÏÍÐØÀÔÅÒÁÈ, ÉÌÉ ÎÁ
+      ÏÄÎÏÐÒÏÃÅÓÓÏÒÎÙÈ ËÏÍÐØÀÔÅÒÁÈ Ó ×ËÌÀÞÅÎÎÙÍ ÐÁÒÁÍÅÔÒÏÍ ÑÄÒÁ
+      <literal>PREEMPTION</literal>.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+      ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:13.ipfw.asc">FreeBSD-SA-05:13.ipfw</ulink>.
+      &merged;</para>
+
+    <para>÷ &man.bzip2.1; ÂÙÌÉ ÒÅÛÅÎÙ Ä×Å ÐÒÏÂÌÅÍÙ, Ó×ÑÚÁÎÎÙÅ Ó
+      ÂÅÚÏÐÁÓÎÏÓÔØÀ.  ïÎÉ ×ËÌÀÞÁÌÉ ÐÏÔÅÎÃÉÁÌØÎÕÀ ×ÏÚÍÏÖÎÏÓÔØ DoS
+      É ÎÅÁ×ÔÏÒÉÚÏ×ÁÎÎÏÅ ÉÚÍÅÎÅÎÉÅ ÐÒÁ× ÎÁ ÆÁÊÌÙ.
+      úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:14.bzip2.asc">FreeBSD-SA-05:14.bzip2</ulink>.
+      &merged;</para>
+
+    <para>âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ Ä×Å ÐÒÏÂÌÅÍÙ × TCP ÓÔÅËÅ &os;.  ïÎÉ ÍÏÇÕÔ
+      ÐÏÚ×ÏÌÑÔØ ÁÔÁËÕÀÝÅÍÕ ÚÁÄÅÒÖÉ×ÁÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ TCP ÓÏÅÄÉÎÅÎÉÑ,
+      ÞÔÏ ÐÒÉ×ÏÄÉÔ Ë ÓÏÚÄÁÎÉÀ DoS.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+      ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:15.tcp.asc">FreeBSD-SA-05:15.tcp</ulink>.
+      &merged;</para>
+
   </sect2>
 
   <sect2 id="kernel">
@@ -181,6 +267,9 @@
       ÐÏÔÏËÏ×, ÕÄÅÒÖÉ×ÁÀÝÉÈ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ sleep ÍØÀÔÅËÓÙ (É spin ÍØÀÔÅËÓÙ
       ÄÌÑ ÔÅËÕÝÅÇÏ ÐÏÔÏËÁ).  &merged;</para>
 
+    <para>äÒÁÊ×ÅÒ &man.ichsmb.4; ÔÅÐÅÒØ ÄÏÓÔÕÐÅÎ × ×ÉÄÅ ÚÁÇÒÕÖÁÅÍÏÇÏ ÍÏÄÕÌÑ
+      ÑÄÒÁ.</para>
+
     <para>&man.jail.8; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÎÏ×ÕÀ ÐÅÒÅÍÅÎÎÕÀ sysctl
       <varname>security.jail.chflags_allowed</varname>, ËÏÔÏÒÁÑ ËÏÎÔÒÏÌÉÒÕÅÔ
       ÐÏ×ÅÄÅÎÉÅ &man.chflags.1; ×ÎÕÔÒÉ jail.
@@ -191,6 +280,47 @@
       <username>root</username> ×ÎÕÔÒÉ jail É ×ÎÅ jail ÎÅ ÄÅÌÁÅÔÓÑ.
       &merged;</para>
 
+    <para>ðÅÒÅÍÅÎÎÁÑ sysctl
+      <varname>security.jail.getfsstatroot_only</varname> ÂÙÌÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÁ
+      × <varname>security.jail.enforce_statfs</varname> É ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ
+      ÓÌÅÄÕÀÝÉÅ ÐÏÌÉÔÉËÉ:</para>
+
+    <informaltable frame="none">
+      <tgroup cols="2">
+	<colspec colwidth="1*">
+	<colspec colwidth="3*">
+	<thead>
+	  <row>
+	    <entry>úÎÁÞÅÎÉÅ</entry>
+	    <entry>ðÏÌÉÔÉËÁ</entry>
+	  </row>
+	</thead>
+
+	<tbody>
+	  <row>

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