From ba154e84e9fa98baf615f982df9bd17f73ef4782 Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Wed, 16 Jan 2002 05:24:33 +0000
Subject: [PATCH] Merge the changes in the English version.

---
 ja/news/press.xml         | 17 +++++++++++++++--
 ja/projects/newbies.sgml  | 29 ++++++++++++++---------------
 ja/releases/index.sgml    | 13 ++++++++-----
 ja/security/security.sgml | 11 ++++++++---
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/ja/news/press.xml b/ja/news/press.xml
index 41f698216b..ea576ff4ab 100644
--- a/ja/news/press.xml
+++ b/ja/news/press.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
-<!-- Original revision: 1.18 -->
+<!-- Original revision: 1.19 -->
 
 <press>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: /c/ncvs/www/en/news/press.xml,v 1.18 2002/01/04 10:47:01 jkoshy Exp $
+      $FreeBSD: www/ja/news/press.xml,v 1.3 2002/01/14 13:38:56 kuriyama Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -14,6 +14,19 @@
     <month>
       <name>1</name>
       
+      <story>
+        <name>FreeBSD �θ����ܹ�</name>
+        <url>http://dailynews.yahoo.com/h/cn/20020114/tc/freebsd_to_change_hands_1.html</url>
+        <site-name>Yahoo News</site-name>
+        <site-url>http://dailynews.yahoo.com/</site-url>
+        <date>14 January 2002</date>
+        <author>Stephen Shankland CNET</author>
+        <p><a href="http://www.windriver.com/">Wind River Systems</a>
+	  �� FreeBSD �˴ؤ���񻺤�
+          <a href="http://www.freebsdmall.com/">FreeBSD Mall</a>
+	  �˰�ž���뤳�Ȥ�ȯɽ���ޤ���.</p>
+      </story>
+
       <story>
         <name>Kerneltrap �� Matt Dillon ���󥿥ӥ塼</name>
         <url>http://kerneltrap.com/article.php?sid=459</url>
diff --git a/ja/projects/newbies.sgml b/ja/projects/newbies.sgml
index 027e7679cc..4c1aaa0a68 100644
--- a/ja/projects/newbies.sgml
+++ b/ja/projects/newbies.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/projects/newbies.sgml,v 1.20 2001/05/10 02:03:07 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/projects/newbies.sgml,v 1.21 2001/07/28 06:27:50 kuriyama Exp $">
 <!ENTITY title 'Resources for Newbies'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.22 -->
+<!-- Original revision: 1.23 -->
 
 <html>
     &header;
@@ -72,16 +72,14 @@
           ���Υե�����ˤ�ä�,
           ���٤Ƥ����ȤƤ�狼��䤹���ʤ�Ǥ��礦.</p></li>
 
-      <li><p>��¿����<a href="../../tutorials/index.html">���塼�ȥꥢ��</a>�����ѤǤ��ޤ�.
-	  �������
-          <a href="../tutorials/new-users/index.html">FreeBSD �� Unix
+      <li><p>��¿����<a href="../docs.html#articles">û������</a>
+	  �����ѤǤ��ޤ�.
+	  û�����塼�ȥꥢ��
+          <a href="http://andrsn.stanford.edu/FreeBSD/"">FreeBSD �� Unix
           ξ���ν鿴�Ԥ�</a>
           �ϴ����ʽ鿴�Ԥ˿͵�������ޤ�.
           ξ���ˤĤ��Ƥ��ޤ��Τ�ʤ��Ƥ⤳��ʸ���ڤ�����ɤळ�Ȥ��Ǥ��ޤ�.
-          �ޤ�����ʸ���
-          <a href="http://andrsn.stanford.edu/FreeBSD/newuser.html">
-          ���ԤΥ�����</a>
-          �Ǥ⸫�뤳�Ȥ��Ǥ�, �������뤿��ˤ�
+          �ޤ�����ʸ��ϰ����Ѥ�
           <a href="ftp://andrsn.stanford.edu/pub/">�ݥ��ȥ�����ץ�
           �ޤ��� RTF ����</a>
           �ǥ���������ɤ��뤳�Ȥ��ǽ�Ǥ�.</p></li>
@@ -89,7 +87,8 @@
       <li><p>¿���οͤ��ǽ�����ꤷ�����Ȼפ��Τ� ppp �Ǥ���, ����ˤ�
           ������������Ω��ʸ��¸�ߤ��ޤ�.
           �ޤ��ǽ��
-          <a href="../../tutorials/ppp/index.html">�Τä����֤� PPP ����</a>
+          <a href="../../doc/ja_JP.eucJP/books/ppp-primer/index.html">
+	    �Τä����֤� PPP ����</a>
           �����, ��ʬ����˾���Ф���Ŭ�ڤ���ʬ�����ɤ߻Ϥ�,
           ����¾�����Ω�ľ����ǿ��ξ���ؤΥ�󥯤�õ����
           <a href="http://www.awfulhak.org/ppp.html">ppp �ڡ���</a>
@@ -220,17 +219,17 @@
     <p>X Window System �� FreeBSD ��ޤ�¿���� OS ��ǻȤ��Ƥ��ޤ�.
       X �˴ؤ���ʸ���
       <a href="http://www.xfree86.org/">The XFree86 Project, Inc.</a>
-      �ˤ���, ����ˤ�
-      <a href="http://www.xfree86.org/FAQ/index.html">XFree86 FAQ</a>
-      ���ޤޤ�Ƥ��ޤ�.
+      �ˤ���ޤ�.
       ������, ����ʸ�������ʬ�ϻ��ȤΤ���Τ�ΤǤ���,
       �鿴�Ԥ����򤹤�ˤϾ����񤷤��Ȥ������Ȥ˵����դ��Ʋ�����.</p>
 
     <ul>
     <li><p>X Window System �Υ��󥹥ȡ��������,
       ���ѤˤĤ��Ƥδ���Ū�ʾ���ˤĤ��Ƥ�,
-      �ʲ��� 2 �����ܤ���˽鿴�ԥ�٥�ε��Ҥ�����ޤ�:
-      <a href="#cfbsd">The Complete FreeBSD</a> ��
+      �ʲ��� 3 �����ܤ���˽鿴�ԥ�٥�ε��Ҥ�����ޤ�:
+      <a href="../../doc/ja_JP.eucJP/books/handbook/index.html">
+	    FreeBSD �ϥ�ɥ֥å�<a>, 
+      <a href="#cfbsd">The Complete FreeBSD</a>,
       <a href="#ufti">UNIX for the Impatient</a>.</p></li>
 
     <li><p>Linux
diff --git a/ja/releases/index.sgml b/ja/releases/index.sgml
index a72194cce4..b486149861 100644
--- a/ja/releases/index.sgml
+++ b/ja/releases/index.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/releases/index.sgml,v 1.47 2001/11/16 17:14:12 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/releases/index.sgml,v 1.48 2002/01/04 07:37:36 kuriyama Exp $">
 <!ENTITY title "Release Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/releases/index.sgml,v 1.47 2001/11/16 17:14:12 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/releases/index.sgml,v 1.48 2002/01/04 07:37:36 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.66 -->
+<!-- Original revision: 1.69 -->
 
 <html>
 &header;
@@ -39,8 +39,11 @@
     <A HREF="&base;/handbook/cutting-edge.html#CURRENT">FreeBSD-current</A>
     ξ���Υ֥��������³����,
     ��ȯ�Ը����Υ��ʥåץ���åȤ����Ū�ʥե��꡼���Ǥ��������ͽ��Ǥ��ޤ�.
-    <b>-stable</b> �֥����ˤ����뼡��Υ�꡼����, 2002 ǯ 1 �� 20 ����
-    <b>FreeBSD 4.5</b> �Ȥ��Ƹ�������, FreeBSD 4.6, 4.7 �Ϥ��θ�
+    <b>-stable</b> �֥����ˤ����뼡��Υ�꡼����, 2002 ǯ 1 �� 26 ����
+    <b>FreeBSD 4.5</b> �Ȥ��Ƹ��������ͽ��Ǥ�.
+      ����꡼�����ʼ��ݾڤΰ����ô�������Ȥ�����������,
+      <a href="4.5R/qa.html">�ƥ��ȥ�����</a> ����������Ƥ��ޤ�.
+      FreeBSD 4.6, 4.7 �Ϥ��θ�
       4 ����Ȥ˸��������ͽ��Ǥ�.  �ޤ�,
     <b>-current</b> �֥����ˤ�����ǽ�Υ�꡼����,
     2002 ǯ��ͻ�Ⱦ����, <b>FreeBSD 5.0</b> �Ȥ��Ƹ��������ͽ��ˤʤäƤ��ޤ�.</p>
diff --git a/ja/security/security.sgml b/ja/security/security.sgml
index 07616d6263..14c75db79a 100644
--- a/ja/security/security.sgml
+++ b/ja/security/security.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.43 2001/11/17 17:21:09 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.44 2002/01/04 04:59:21 kuriyama Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/security/security.sgml,v 1.43 2001/11/17 17:21:09 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/security/security.sgml,v 1.44 2002/01/04 04:59:21 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project --> 
-<!-- Original revision: 1.74 -->
+<!-- Original revision: 1.75 -->
 
 <html>
     &header;
@@ -151,6 +151,11 @@ ports 
     </p>
 
 <UL>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:05.pine.asc">FreeBSD-SA-02:05.pine.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:04.mutt.asc">FreeBSD-SA-02:04.mutt.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:03.mod_auth_pgsql.asc">FreeBSD-SA-02:03.mod_auth_pgsql.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:02.pw.asc">FreeBSD-SA-02:02.pw.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:01.pkg_add.asc">FreeBSD-SA-02:01.pkg_add.asc</A></LI>
 <LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-01:64.wu-ftpd.asc">FreeBSD-SA-01:64.wu-ftpd.asc</A></LI>
 <LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-01:63.openssh.asc">FreeBSD-SA-01:63.openssh.asc</A></LI>
 <LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-01:62.uucp.asc">FreeBSD-SA-01:62.uucp.asc</A></LI>