From fcd2cac01bb24dfe281fc8a93096b301e45065a8 Mon Sep 17 00:00:00 2001
From: Hideyuki KURASHINA <rushani@FreeBSD.org>
Date: Mon, 17 Nov 2003 20:23:59 +0000
Subject: [PATCH] Merge the following from the English version:

	1.7   -> 1.9    copyright/trademarks.sgml
	1.176 -> 1.177  docs.sgml
	(new) -> 1.1    freebsd.css
	1.5   -> 1.6    java/dists/14.sgml
	1.9   -> 1.12   java/install.sgml
	1.23  -> 1.24   ports/categories
	1.152 -> 1.153  projects/projects.sgml
	1.1   -> 1.2    releases/4.9R/announce.sgml
	1.91  -> 1.92   search/search.sgml
	1.147 -> 1.148  security/security.sgml
---
 ja/copyright/trademarks.sgml   | 14 +++++-
 ja/docs.sgml                   |  6 +--
 ja/freebsd.css                 | 40 ++++++++++++++++
 ja/java/dists/14.sgml          | 19 ++++++--
 ja/java/install.sgml           | 83 ++++++++++++++++++++++++++++------
 ja/ports/categories            |  7 ++-
 ja/projects/projects.sgml      |  8 ++--
 ja/releases/4.9R/announce.sgml |  6 +--
 ja/search/search.sgml          | 11 ++++-
 ja/security/security.sgml      | 15 ++++--
 10 files changed, 171 insertions(+), 38 deletions(-)
 create mode 100644 ja/freebsd.css

diff --git a/ja/copyright/trademarks.sgml b/ja/copyright/trademarks.sgml
index 4624da0d43..7d867119c1 100644
--- a/ja/copyright/trademarks.sgml
+++ b/ja/copyright/trademarks.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ja/copyright/trademarks.sgml,v 1.1 2003/11/02 07:36:56 rushani Exp $">
 <!ENTITY title "��Ͽ��ɸ">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.7 -->
+<!-- Original revision: 1.9 -->
 
 <html>
 &header;
@@ -21,6 +21,10 @@
   AMD Opteron, AMD-K6, &Eacute;lan ����� PCnet ��
   Advanced Micro Devices, Inc. �ξ�ɸ�Ǥ���</p>
 
+<p>Apple, FireWire, Mac, Macintosh, Mac OS,
+  Quicktime ����� TrueType �� Apple Computer, Inc. �ξ�ɸ�ǡ�
+  ����ꥫ�罰�񤪤�Ӥ���¾�ι����Ͽ����Ƥ��ޤ���</p>
+
 <p>IBM ����� PowerPC �ϥ���ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����
   International Business Machines Corporation �ξ�ɸ�Ǥ���</p>
 
@@ -28,6 +32,12 @@
   Institute of Electrical and Electronics Engineers, Inc.
   ����Ͽ��ɸ�Ǥ���</p>
 
+<p>Intel, Celeron, EtherExpress, i386,
+  i486, Itanium, Pentium ����� Xeon �ϥ���ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����
+  Intel Corporation �ޤ��Ϥ��δ�Ϣ��Ҥξ�ɸ�ޤ�����Ͽ��ɸ�Ǥ���</p>
+
+<p>Linux �ϥ���ꥫ�罰��ˤ����� Linus Torvalds ����Ͽ��ɸ�Ǥ���</p>
+
 <p>Motif, OSF/1 ����� UNIX �ϥ���ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����
   The Open Group ����Ͽ��ɸ�ǡ�
   IT DialTone ����� The Open Group ��Ʊ������ɸ�Ǥ���</p>
diff --git a/ja/docs.sgml b/ja/docs.sgml
index 016e8e869c..a481edd7a8 100644
--- a/ja/docs.sgml
+++ b/ja/docs.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/docs.sgml,v 1.59 2003/10/14 06:14:10 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/docs.sgml,v 1.60 2003/10/21 20:02:44 hrs Exp $">
 <!ENTITY title "Documentation">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.176 -->
+<!-- Original revision: 1.177 -->
 
 <html>
     &header;
@@ -108,7 +108,7 @@
         Committer's Guide</a> (<tt>committers-guide</tt>) (�Ѹ��ǤΤ�)<br>
       <small>FreeBSD committers �Τ���������Ǥ���</small></p>
 
-    <p><a href="../doc/en_US.ISO8859-1/articles/console-server/article.html">Console
+    <p><a href="../doc/en_US.ISO8859-1/articles/console-server/index.html">Console
 	Server Tutorial</a> (<tt>console-server</tt>) (�Ѹ��ǤΤ�)<br>
       <small>�����ʥޥ���ݡ��ȥ��ꥢ�륫���ɤ�Ȥä� FreeBSD
 	�١����Υ��󥽡��륵���Ф��ۤ�����ˡ�Ǥ���</small></p>
diff --git a/ja/freebsd.css b/ja/freebsd.css
new file mode 100644
index 0000000000..b2afb3942e
--- /dev/null
+++ b/ja/freebsd.css
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * The FreeBSD Japanese Documentation Project
+ * Original revision: 1.1
+ */
+
+DIV.EXAMPLE P B {
+        color: #990000;
+}
+
+.FILENAME {
+	color: #007a00;
+}
diff --git a/ja/java/dists/14.sgml b/ja/java/dists/14.sgml
index cba734273e..b87930372d 100644
--- a/ja/java/dists/14.sgml
+++ b/ja/java/dists/14.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/dists/14.sgml,v 1.2 2003/03/19 19:57:51 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/14.sgml,v 1.3 2003/07/05 06:03:15 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: &jdk; 1.4">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/14.sgml,v 1.2 2003/03/19 19:57:51 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/14.sgml,v 1.3 2003/07/05 06:03:15 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.6 -->
 ]>
 <html>
   &header;
@@ -14,6 +14,19 @@
       <tbody>
         <tr>
           <td>
+            <p><b>2003 ǯ 10 �� 10 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
+                Lewis</a> �᤬ &jdk; 1.4 ���եȥ�����������
+              �ͤĤ�Υѥå����å� (�ѥå���٥� 4) ��������ޤ�����
+              ���Υ����ɤˤϡ������Ĥ����꤬�ĤäƤϤ����ΤΡ�
+              ¿���Υ��ץꥱ�������ư��뤿��˰��ꤷ���ʼ��˻ž�äƤ��ޤ���
+              �֥饦���ץ饰����ؤ��б���GCC 3.3 �ؤ��б����Ԥ�졢
+              ��¿���ΥХ�����������Ƥ��ޤ���
+              ���Υѥå����åȤ� BSD Java �ܿ�������ο��Ϥ�
+              FreeBSD ���Ĥˤ���³Ū�ʥ��ݡ��Ȥˤ�����̤Ǥ���
+              �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
+              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
+              �Ǹ�������Ƥ��ޤ���</p>
+
             <p>
               <b>2003 ǯ 3 �� 7 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
                 Lewis</a> �᤬ &jdk; 1.4 ���եȥ�����������
diff --git a/ja/java/install.sgml b/ja/java/install.sgml
index 79b116a62c..cd78e0f0f8 100644
--- a/ja/java/install.sgml
+++ b/ja/java/install.sgml
@@ -1,34 +1,89 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/install.sgml,v 1.5 2003/01/06 03:38:34 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/install.sgml,v 1.6 2003/07/05 06:03:15 hrs Exp $">
 <!ENTITY title "FreeBSD &java; Project: How To Install">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/install.sgml,v 1.5 2003/01/06 03:38:34 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/install.sgml,v 1.6 2003/07/05 06:03:15 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.9 -->
+<!-- Original revision: 1.12 -->
 ]>
 <html>
     &header;
     <table border="0">
       <tr>
           <td>
-            <P>FreeBSD �� &jdk; �Υ��󥹥ȡ���ϼ¤�ľ��Ū�Ǥ�:</P>
-            <P><CODE>cd /usr/ports/java/jdk
-                <BR>make
-                <BR>make install
-                <BR>make clean
-              </CODE></P>
-            
-            <P>JDK �Υ��󥹥ȡ���ˤ��׵ᤵ����¸�ط��Ϥ���ޤ���
-              ����������ե��å�����ǽ��Ȥ��Ĥ��ʤ� X �򥤥󥹥ȡ��뤷
-              �¹Ԥ��Ƥ���ɬ�פ�����ޤ���</p>
+            <p>FreeBSD �� Java �򥤥󥹥ȡ��뤹��ˤ����äơ�
+              �ɤ� Java ��ȯ���åȤ򥤥󥹥ȡ��뤹�뤫����Ǥ���������</p>
+          </td>
+      </tr>
+      <tr>
+          <td>
+            <h3><a name="jdk">FreeBSD �ʥ��ƥ��֤� JDK</a></h3>
+
+            <p>����� Java 2 FreeBSD �ܿ��ץ��������Ȥˤ�����̤Ǥ���
+              ���� port �ϡ�
+              �ץ��������Ȥ����������ѥå����åȤ�
+              Sun Microsystems �Ҥ�ȯɽ���� JDK �Υ����������ɤ���Ѥ��ơ�
+              FreeBSD �ͥ��ƥ��֤� JDK ���ۤ��ޤ���</p>
+
+            <p><code>cd /usr/ports/java/jdk14<br>
+              make install clean</code></p>
+          </td>
+      </tr>
+      <tr>
+          <td>
+            <h3><a name="linux-sun-jdk">Sun Microsystems �Ҥˤ�� Linux �� JDK</a></h3>
+
+            <p>���� port �ϡ�Sun Microsystems �Ҥ�
+              Linux �Ѥ˹��ۤ��� Java 2 ��ȯ���åȤ򥤥󥹥ȡ��뤷�ޤ���
+              FreeBSD �� Linux �ߴ���ǽ����Ѥ���ư��ޤ���</p>
+
+            <p><code>cd /usr/ports/java/linux-sun-jdk14<br>
+              make install clean</code></p>
+          </td>
+      </tr>
+      <tr>
+          <td>
+            <h3><a name="linux-ibm-jdk">IBM �Ҥˤ�� Linux �� JDK</a></h3>
+
+            <p>IBM �Ҥˤ�� Java 2 Standard Edition SDK �С������ 1.4 ��
+              �����ǡ�Linux �Ѥ˹��ۤ��줿��ΤǤ���
+              IBM �Ҥ� JIT (just-in-time) ����ѥ��顢
+              �ȼ��˳�ĥ���줿 Mixed Mode Interpreter��
+              ���߷פ��줿 Java 2 ���ۥޥ��󤬴ޤޤ�Ƥ��ޤ���</p>
+
+            <p><code>cd /usr/ports/java/linux-ibm-jdk14<br>
+              make install clean</code></p>
+          </td>
+      </tr>
+      <tr>
+          <td>
+            <h3><a name="linux-blackdown-jdk">Blackdown �ˤ�� Linux �� JDK</a></h3>
+
+            <p>Blackdown �ˤ�� Java ��ȯ���åȤΥС������ 1.4.1 �Ǥ���
+             HotSpot ���饤����Ȥȥ����ФȤʤ벾�ۥޥ���
+             ��ĥ���줿 Java Web Start 1.2��
+             Mozilla �� Netscape 4.x �Ѥ� Java �ץ饰���󤬴ޤޤ�Ƥ��ޤ���</p>
+
+            <p><code>cd /usr/ports/java/linux-blackdown-jdk14<br>
+              make install clean</code></p>
+          </td>
+      </tr>
+      <tr>
+          <td>
+            <p><b>Note:</b>
+              Sun Microsystems �Ҥˤ��饤���󥹥ݥꥷ�Τ���ˡ�
+              ���������Х��ʥ�����ۤ��뤳�ȤϤǤ��ޤ���
+              �ޤ����Ŀ�Ū�ʻ��ѤΤߤ����Ĥ���Ƥ��뤳�Ȥ����դ��Ƥ���������
+              �����������ɤ� FreeBSD �ѤΥѥå����åȤ�
+              ��ư�Ǽ������ʤ���Фʤ�ʤ��Τ�Ʊ����ͳ�Ǥ���</p>
               
             <P>Java �ǽ񤫤줿���ץꥱ�������Ϥ�������
               �¹Ԥ� JFC (Java ���ܥ��饹: Swing) ��ɬ�פȤ��ޤ���
               JFC �� <CODE>/usr/ports/java/jfc</CODE> �˥��󥹥ȡ���Ǥ��ޤ���</p>
               
             <P>�������ޤ������ʤ����Ȥ����ä���
-              <A HREF="../doc/ja_JP.eucJP/books/handbook/ports.html">FreeBSD Handbook ��
+              <A HREF="../../doc/ja_JP.eucJP/books/handbook/ports.html">FreeBSD Handbook ��
                 &quot;���ץꥱ�������Υ��󥹥ȡ���&quot; �ξ�</A>�򸫤Ƥ���������</p>
           </td>
         </tr>
diff --git a/ja/ports/categories b/ja/ports/categories
index 3dd46d9071..6a0f4d8c66 100755
--- a/ja/ports/categories
+++ b/ja/ports/categories
@@ -1,9 +1,10 @@
-# $FreeBSD: www/ja/ports/categories,v 1.10 2002/03/04 13:07:32 hanai Exp $
+# $FreeBSD: www/ja/ports/categories,v 1.11 2003/10/12 10:52:33 rushani Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.23
+# Original revision: 1.24
 
     "accessibility", "�㳲����ä��桼�������Ω�� ports��",
     "afterstep", "AfterStep ������ɥ��ޥ͡�����򥵥ݡ��Ȥ��� ports��",
+    "arabic", "����ӥ������˰ܿ����줿���եȥ�������",
     "archivers", "���������ӥ󥰤ȥ��󥢡������ӥ󥰤Υ桼�ƥ���ƥ���",
     "astro", "ŷʸ�شط��Υ��ץꥱ�������",
     "audio", "�����ǥ����桼�ƥ���ƥ� - �ۤȤ�ɤ˥��ݡ��Ȥ��륵����ɥ����ɤ�ɬ�ס�",
@@ -38,6 +39,7 @@
     "korean", "�ڹ�����˰ܿ����줿���եȥ�������",
     "lang", "����ԥ塼�����졣",
     "linux", "�Х��ʥ�ߴ����ˤ��ư��� Linux �ץ�����ࡣ",
+    "lisp", "���� Lisp �˴�Ϣ�����Ρ�",
     "mail", "�Żҥ᡼��ѥå������ȥ桼�ƥ���ƥ���",
     "math", "���ͷ׻����եȥ�������",
     "mbone", "MBONE �Υ��ץꥱ�������ȥ桼�ƥ���ƥ���",
@@ -48,6 +50,7 @@
     "offix", "���ե��������ȥ᡼����󥹥����ȡ�",
     "palm", "Palm(tm) ���꡼���򥵥ݡ��Ȥ��륽�եȥ�������",
     "parallel", "����׻���Ԥ����ץꥱ�������",
+    "pear", "PEAR �����ƥ��°����桼�ƥ���ƥ�/�⥸�塼�롣",
     "perl5", "Perl5 ����Τ���Υ桼�ƥ���ƥ�/�⥸�塼�롣",
     "picobsd", "PicoBSD ���ݡ��ȡ�",
     "plan9", "Plan9 ���ڥ졼�ƥ��󥰥����ƥ�ͳ��Υ��եȥ�������",
diff --git a/ja/projects/projects.sgml b/ja/projects/projects.sgml
index af3e09e2d3..6e4d56fdff 100644
--- a/ja/projects/projects.sgml
+++ b/ja/projects/projects.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/projects/projects.sgml,v 1.34 2003/07/09 09:18:15 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/projects/projects.sgml,v 1.35 2003/11/01 16:24:22 rushani Exp $">
 <!ENTITY title "FreeBSD Development Projects">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/projects/projects.sgml,v 1.34 2003/07/09 09:18:15 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/projects/projects.sgml,v 1.35 2003/11/01 16:24:22 rushani Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.152 -->
+<!-- Original revision: 1.153 -->
 
 <html>
 &header;
@@ -210,7 +210,7 @@ FreeBSD 
         <a name="cruptfs" href="http://www.cs.columbia.edu/~ezk/research/software/">cryptfs</a></li>
 
       <li><a name="elephant" href="http://citeseer.nj.nec.com/santry99deciding.html">Elephant</a>:
-        �񤭹������ѥե����륷���ƥ�
+        �񤭹������ѥե����륷���ƥ�</li>
 
       <li><a name="journaling" href="http://www.ece.cmu.edu/~ganger/papers/">
           ���㡼�ʥ�󥰤� Soft Updates �����:
diff --git a/ja/releases/4.9R/announce.sgml b/ja/releases/4.9R/announce.sgml
index aec2e5931e..6c45764622 100644
--- a/ja/releases/4.9R/announce.sgml
+++ b/ja/releases/4.9R/announce.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD$">
+<!ENTITY date "$FreeBSD: www/ja/releases/4.9R/announce.sgml,v 1.1 2003/10/29 10:36:27 hrs Exp $">
 <!ENTITY local.rel "4.9">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.1 -->
+<!-- Original revision: 1.2 -->
 <html>
 &header;
 
@@ -182,7 +182,7 @@ href="http://www.FreeBSD.org/ja/releases/&local.rel;R/errata.html">http://www.Fr
 
     <tr>
       <td>Joe Marcus Clarke &lt;<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>&gt;</td>
-      <td>packabe ���ۡ�GNOME ô��</td>
+      <td>package ���ۡ�GNOME ô��</td>
     </tr>
 
     <tr>
diff --git a/ja/search/search.sgml b/ja/search/search.sgml
index 5de9cddb27..df00f9a108 100644
--- a/ja/search/search.sgml
+++ b/ja/search/search.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/search/search.sgml,v 1.40 2003/10/12 10:52:33 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/search.sgml,v 1.41 2003/11/03 11:41:05 rushani Exp $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.91 -->
+<!-- Original revision: 1.92 -->
 
 <html>
 &header;
@@ -531,6 +531,13 @@ href="http://www.geocrawler.com/">GeoCrawler</a> 
   <td>FreeBSD �ǤΥȡ������󥰤Υ��ݡ���</td>
 </tr>
 
+<tr>
+  <td><input type="checkbox" name="source" 
+	value="freebsd-x11"> <strong>X11</strong></td>
+  <td>FreeBSD �Ǥ� X11 ���ݼ餪��ӥ��ݡ���</td>
+</tr>
+
+
 </table>
 
 <h3>Limited lists</h3>
diff --git a/ja/security/security.sgml b/ja/security/security.sgml
index 90e445fe1a..09a8485aa2 100644
--- a/ja/security/security.sgml
+++ b/ja/security/security.sgml
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.79 2003/09/21 17:18:14 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.80 2003/10/11 07:12:37 hrs Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
-<!-- $FreeBSD: www/ja/security/security.sgml,v 1.79 2003/09/21 17:18:14 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/security/security.sgml,v 1.80 2003/10/11 07:12:37 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project --> 
-<!-- Original revision: 1.147 -->
+<!-- Original revision: 1.148 -->
 
 <html>
     &header;
@@ -203,18 +203,23 @@ FreeBSD 
 <TR>
   <TD>RELENG_4</TD>
   <TD>�ʤ�</TD>
-  <TD>2003 ǯ 12 �� 31 ��</TD>
+  <TD>2004 ǯ 10 �� 31 ��</TD>
 </TR>
 <TR>
   <TD>RELENG_4_7</TD>
   <TD>4.7-RELEASE</TD>
-  <TD>2003 ǯ 10 �� 31 ��</TD>
+  <TD>2003 ǯ 12 �� 31 ��</TD>
 </TR>
 <TR>
   <TD>RELENG_4_8</TD>
   <TD>4.8-RELEASE</TD>
   <TD>2004 ǯ 3 �� 31��</TD>
 </TR>
+<TR>
+  <TD>RELENG_4_9</TD>
+  <TD>4.9-RELEASE</TD>
+  <TD>2004 ǯ 10 �� 31��</TD>
+</TR>
 <TR>
   <TD>RELENG_5_1</TD>
   <TD>5.1-RELEASE</TD>