diff --git a/ja/applications.sgml b/ja/applications.sgml
index fb67f89a80..d0a6342031 100644
--- a/ja/applications.sgml
+++ b/ja/applications.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/applications.sgml,v 1.18 2002/03/17 05:10:10 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/applications.sgml,v 1.19 2003/03/19 19:57:51 rushani Exp $">
 <!ENTITY title "About Applications for FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.21 -->
+<!-- Original revision: 1.22 -->
 
 <html>
     &header;
@@ -13,7 +13,7 @@
 
     <blockquote>
 	<p>FreeBSD
-	�ϡ����ʤ��� UNIX������ơ������˴��Ԥ���ۤȤ�����ƤλŻ���
+	�ϡ����ʤ��� &unix; ������ơ������˴��Ԥ���ۤȤ�����ƤλŻ���
 	���ʤ�������¿�������Ԥ��Ƥ��ʤ��Ǥ������ۤɾ��˰������Ȥ��Ǥ��ޤ���</p>
     </blockquote>
 
@@ -82,7 +82,7 @@
 	<li><b>���եȥ�������ȯ��</b>
 	FreeBSD �ˤϳ�ȯ�ġ���켰���Ѱդ���Ƥ��ꡢ
 	GNU C/C++����ѥ��顢�ǥХå���Perl ������ץȸ����ޤ�Ǥ��ޤ���
-	  Java �� Tcl/Tk ��ޤ���ȯ��ǽ�ˤʤäƤ��ޤ���
+          &java; �� Tcl/Tk ��ޤ���ȯ��ǽ�ˤʤäƤ��ޤ���
 	XEmacs �Τ褦��ɾȽ�Υ��ǥ����� Icon 
 	�Τ褦�ˤ�꿼��ʥץ�����ߥ󥰸����ޤ���Ŭ��ư���ޤ���
 	�����ơ�FreeBSD �ζ�ͭ�饤�֥��Ͼ�˺����Ȼ��Ѥ��ưפˤ��Ƥ��ޤ���</li>
diff --git a/ja/copyright/copyright.sgml b/ja/copyright/copyright.sgml
index d5d795038e..556348071b 100644
--- a/ja/copyright/copyright.sgml
+++ b/ja/copyright/copyright.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/copyright.sgml,v 1.10 2001/07/14 03:43:17 kuriyama Exp $">
-<!ENTITY title "FreeBSD Copyright Information">
+<!ENTITY date "$FreeBSD: www/ja/copyright/copyright.sgml,v 1.11 2002/03/17 05:10:11 kuriyama Exp $">
+<!ENTITY title "FreeBSD Copyright and Legal Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.6 -->
+<!-- Original revision: 1.8 -->
 
 <html>
 &header;
@@ -13,6 +13,7 @@
 <p></p>
 
 <h2><a href="freebsd-license.html">FreeBSD �����</a></h2>
+<h2><a href="&enbase;/copyright/trademarks.html">��Ͽ��ɸ</a></h2>
 <h2><a href="license.html">BSD �����</a></h2>
 <h2><a href="daemon.html">BSD �ǡ����</a></h2>
 <h2><a href="../../copyright/LEGAL">FreeBSD Ports ������ۤ���ݤ�����</a></h2>
diff --git a/ja/copyright/daemon.sgml b/ja/copyright/daemon.sgml
index a9630af221..3357645a95 100644
--- a/ja/copyright/daemon.sgml
+++ b/ja/copyright/daemon.sgml
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/daemon.sgml,v 1.20 2002/02/28 11:22:52 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/daemon.sgml,v 1.21 2002/03/17 05:10:11 kuriyama Exp $">
 <!ENTITY title "The BSD Daemon">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.21 -->
+<!-- Original revision: 1.23 -->
 
 <html>
 &header;
 
     <p>���μ��դΤ�������Υڡ����ˤ����ɤ��ź���Ƥ�����ä����
-      �֤���Ĥ����Τ� BSD �ǡ���� (Daemon) ���Ǥ���UNIX �����ƥ�������Ǥϡ�
+      �֤���Ĥ����Τ� BSD �ǡ���� (Daemon) ���Ǥ���&unix; �����ƥ�������Ǥϡ�
       �ǡ����Ȥ����ΤϥХå����饦��ɤǿͤμ��ڤꤺ�ˤ���������
       �������򤳤ʤ��ץ��������̣���ޤ�������Ū�ˤϡ��ǡ����ϰ��� (demon)
       �Ȥ���ñ��θŤ��ĤŤ����Τ��ȤǤ���<em>Unix System Administration
@@ -65,7 +65,7 @@
 	href="mailto:mckusick@mckusick.com">mckusick@mckusick.com</a>
     �������Ƥ���������</p>
 
-<p></p><A HREF="copyright.html">Copyright �ۡ���</a>
+<p></p><A HREF="copyright.html">��Ū�⻺���Υۡ�������</a>
 &footer;
 
 </body>
diff --git a/ja/copyright/freebsd-license.sgml b/ja/copyright/freebsd-license.sgml
index 883a9696a4..87286ef653 100644
--- a/ja/copyright/freebsd-license.sgml
+++ b/ja/copyright/freebsd-license.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/freebsd-license.sgml,v 1.11 2002/03/17 05:10:11 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/freebsd-license.sgml,v 1.12 2003/04/27 19:59:57 hrs Exp $">
 <!ENTITY title "The FreeBSD Copyright">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.11 -->
+<!-- Original revision: 1.12 -->
 
 <html>
 &header;
@@ -91,7 +91,7 @@
       ���������ˤ������ۼ�����鷺������路�Ƥ����Τ�
       �ȤäƤϤʤ�ʤ���
 
-<p></p><A HREF="copyright.html">Copyright Home</a>
+<p></p><A HREF="copyright.html">��Ū�⻺���Υۡ�������</a>
 &footer;
 </body>
 </html>
diff --git a/ja/copyright/license.sgml b/ja/copyright/license.sgml
index 2d4084ac8a..cc6eae10f3 100644
--- a/ja/copyright/license.sgml
+++ b/ja/copyright/license.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/copyright/license.sgml,v 1.12 2002/02/28 11:22:52 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/copyright/license.sgml,v 1.13 2002/03/17 05:10:11 kuriyama Exp $">
 <!ENTITY title "The 4.4BSD Copyright">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.8 -->
+<!-- Original revision: 1.9 -->
 
 <html>
 &header;
@@ -181,7 +181,7 @@
       ���������ˤ������ۼ�����鷺������路�Ƥ����Τ�
       �ȤäƤϤʤ�ʤ���
 
-<p></p><A HREF="copyright.html">Copyright �ۡ���</a>
+<p></p><A HREF="copyright.html">��Ū�⻺���Υۡ�������</a>
 &footer;
 </body>
 </html>
diff --git a/ja/includes.sgml b/ja/includes.sgml
index 7791905ad6..85e847ee6a 100644
--- a/ja/includes.sgml
+++ b/ja/includes.sgml
@@ -1,6 +1,6 @@
-<!-- $FreeBSD: www/ja/includes.sgml,v 1.43 2003/04/06 04:54:26 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/includes.sgml,v 1.44 2003/06/10 20:45:06 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.57 -->
+<!-- Original revision: 1.59 -->
 <!--  
   Base is the absolute URL for the given page, minus the actual page
   part.  It should either be specified as a fully qualified URL, or
@@ -24,11 +24,10 @@
 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                      -->
-<!ENTITY copyright 'Copyright (c) 1995-2003 The FreeBSD Inc.  
+<!ENTITY copyright '&copy; 1995-2003 The FreeBSD Inc.  
   All rights reserved.'>
 <!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base;/mailto.html">&email@FreeBSD.ORG</a><br>
-  &copyright;'>
+<!ENTITY author '<a href="&base;/index.html">�ۡ���</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">Ϣ����</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">��Ū�⻺���ˤĤ���</a> &nbsp; | &nbsp; &copyright;'>
 <!ENTITY date ''>
 <!ENTITY home '<a href="&base;/"><img src="&enbase;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
@@ -129,6 +128,11 @@ src="&enbase;/gifs/bar.gif" alt="
 <!ENTITY raquo SDATA "[raquo ]">
 <!ENTITY laquo SDATA "[laquo ]">
 
+<!-- Often used trademarks -->
+<!ENTITY unix 'UNIX&reg;'>
+<!ENTITY java 'Java&trade;'>
+<!ENTITY jdk 'JDK&trade;'>
+
 <!-- 
      Local Variables:
      mode: sgml
diff --git a/ja/java/advocacy.sgml b/ja/java/advocacy.sgml
index 589236b962..a513728c79 100644
--- a/ja/java/advocacy.sgml
+++ b/ja/java/advocacy.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/advocacy.sgml,v 1.2 2002/03/02 06:34:57 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: Advocacy">
+<!ENTITY date "$FreeBSD: www/ja/java/advocacy.sgml,v 1.3 2002/05/15 18:21:59 hrs Exp $">
+<!ENTITY title "FreeBSD &java; Project: Advocacy">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/advocacy.sgml,v 1.2 2002/03/02 06:34:57 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/advocacy.sgml,v 1.3 2002/05/15 18:21:59 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.6 -->
 ]>
 <html>
 &header; 
@@ -13,7 +13,7 @@
       <tr>
 	<td>
             <P>�錄��������˾��Ǥ���Τϡ�
-              ���ꤷ�� Java �ץ�åȥե�����Ȥ��� FreeBSD
+              ���ꤷ�� &java; �ץ�åȥե�����Ȥ��� FreeBSD
               ��ͭ̾�ˤʤ뤳�ȤǤ���</p>
 
             <P><B>Sun ���Ф�������Τ��ꤤ</B>:<BR>
diff --git a/ja/java/dists/10.sgml b/ja/java/dists/10.sgml
index fd02671b2e..86e7fe03de 100644
--- a/ja/java/dists/10.sgml
+++ b/ja/java/dists/10.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/10.sgml,v 1.2 2000/10/31 19:32:45 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/10.sgml,v 1.3 2002/03/02 06:34:57 kuriyama Exp $">
 <!ENTITY title "FreeBSD Java Project: JDK 1.0 - ���ݡ����оݳ�">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/10.sgml,v 1.2 2000/10/31 19:32:45 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/10.sgml,v 1.3 2002/03/02 06:34:57 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: 1.5 -->
 ]>
 <html>
 &header;
@@ -13,7 +13,7 @@
     <table width="600" border="0">
         <tr>
           <td>
-            <H2>JDK 1.0.x</H2>
+            <H2>&jdk; 1.0.x</H2>
 
             <P>���˽񤫤�Ƥ������ۤǤ������⤦ freefall.FreeBSD.org �ˤ�¸�ߤ��ޤ���
               �⤷���ΰܿ��Ǥ����ꤷ���顢��ͳ�˻ȤäƤ������� :-)</p>
diff --git a/ja/java/dists/11.sgml b/ja/java/dists/11.sgml
index cf4431dfcf..3e6e9b8923 100644
--- a/ja/java/dists/11.sgml
+++ b/ja/java/dists/11.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/11.sgml,v 1.5 2001/07/14 05:55:06 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: JDK 1.1">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/11.sgml,v 1.6 2002/03/02 06:34:57 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: &jdk; 1.1">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/11.sgml,v 1.5 2001/07/14 05:55:06 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/11.sgml,v 1.6 2002/03/02 06:34:57 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.7 -->
+<!-- Original revision: 1.8 -->
 ]>
 <html>
     &header;
@@ -20,7 +20,7 @@
               <A HREF="http://www.freebsd.org/~patrick/patches.tar.gz">����</A>�ˤ���ޤ���
               ����ϼºݤ� Java �����������ɤ򤪻��������ˤȤäƤΤ�ͭ�ѤǤ���</p>
 
-            <P>�ޤ�������Ǥ� JRE �Υ�꡼���⤢��ޤ���</p>
+            <P>�ޤ�������Ǥ� JRE&trade; �Υ�꡼���⤢��ޤ���</p>
 
             <UL>
               <LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/nate/JDK1.1/jre1.1.8i_AOUT.V1999-11-9.tar.gz">jre1.1.8i_AOUT.V1999-11-9.tar.gz</A></li>
diff --git a/ja/java/dists/12.sgml b/ja/java/dists/12.sgml
index 07a1357df7..dfcc8543a5 100644
--- a/ja/java/dists/12.sgml
+++ b/ja/java/dists/12.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/12.sgml,v 1.9 2002/03/02 06:34:57 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: JDK 2 (aka JDK 1.2)">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/12.sgml,v 1.10 2003/01/06 03:38:35 hrs Exp $">
+<!ENTITY title "FreeBSD &java; Project: &jdk; 2 (aka JDK 1.2)">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/12.sgml,v 1.9 2002/03/02 06:34:57 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/12.sgml,v 1.10 2003/01/06 03:38:35 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.16 -->
+<!-- Original revision: 1.17 -->
 ]>
 <html>
     &header;
@@ -14,7 +14,7 @@
           <td>
             
             <p><b>2002 ǯ 9 �� 18 ��:</b> Greg Lewis �᤬
-              JDK&nbsp;1.2.2 �ο������ѥå����åȤ������
+              &jdk;&nbsp;1.2.2 �ο������ѥå����åȤ������
 
             <p>FreeBSD �桼���ˤȤäƺǤ�ؿ��ι⤤��Τϡ�JPDA �б�������Ǥ��礦��
               �ޤ���<a href="http://www.netbsd.org/">NetBSD</a> ��
diff --git a/ja/java/dists/13.sgml b/ja/java/dists/13.sgml
index 7ade849c52..31556fce35 100644
--- a/ja/java/dists/13.sgml
+++ b/ja/java/dists/13.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/13.sgml,v 1.10 2003/01/06 03:38:35 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: JDK 1.3">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/13.sgml,v 1.11 2003/03/19 19:57:51 rushani Exp $">
+<!ENTITY title "FreeBSD &java; Project: &jdk; 1.3">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/13.sgml,v 1.10 2003/01/06 03:38:35 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/13.sgml,v 1.11 2003/03/19 19:57:51 rushani Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.12 -->
+<!-- Original revision: 1.13 -->
 ]>
 
 <html>
@@ -14,7 +14,7 @@
         <tr>
           <td>
 	    <p><b>2003 ǯ 2 �� 12 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
-	      Lewis</a> �᤬ JDK 1.3.1 ���եȥ����������κǿ��Υѥå����å�
+	      Lewis</a> �᤬ &jdk; 1.3.1 ���եȥ����������κǿ��Υѥå����å�
 	      (�ѥå���٥� 7) �ȡ�������б����� ports/java/jdk13 port
 	      ��������ޤ������ǿ��Υѥå��ϡ����Ĥ�ɤ���
 	      <a href="http://www.eyesbeyond.com/freebsddom/java/jdk13.html">http://www.eyesbeyond.com/freebsddom/java/jdk13.html</a>
diff --git a/ja/java/dists/14.sgml b/ja/java/dists/14.sgml
index d3613b8a3c..cba734273e 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.1 2003/01/06 03:38:35 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: JDK 1.4">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/14.sgml,v 1.2 2003/03/19 19:57:51 rushani Exp $">
+<!ENTITY title "FreeBSD &java; Project: &jdk; 1.4">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/14.sgml,v 1.1 2003/01/06 03:38:35 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/14.sgml,v 1.2 2003/03/19 19:57:51 rushani Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.3 -->
+<!-- Original revision: 1.5 -->
 ]>
 <html>
   &header;
@@ -14,6 +14,19 @@
       <tbody>
         <tr>
           <td>
+            <p>
+              <b>2003 ǯ 3 �� 7 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
+                Lewis</a> �᤬ &jdk; 1.4 ���եȥ�����������
+              ���Ĥ�Υѥå����å� (�ѥå���٥� 3) ��������ޤ�����
+              ���Υ����ɤϰ��̥桼��������Ȥ��Ǥ�����Τ�ΤǤ�����
+              ���٤Ƥε�ǽ (���Ȥ��Хץ饰����� NIO) ����������Ƥ���櫓�ǤϤ���ޤ���
+              ���Υѥå����åȤ�
+              <a href="mailto:phantom@FreeBSD.org">Alexey Zelkin</a>
+              ��ο��Ϥˤ�äƺ�������ޤ�����
+              �ѥå����åȤΥ���������ɤˤĤ��Ƥξ����
+              <a href="http://www.eyesbeyond.com/freebsddom/java/jdk14.html">http://www.eyesbeyond.com/freebsddom/java/jdk14.html</a>
+	    �Ǹ�������Ƥ��ޤ���</p>
+
             <p><b>2003 ǯ 2 �� 4 ��:</b> <a href="mailto:glewis@FreeBSD.org">Greg
 		Lewis</a> �᤬ JDK 1.4 ���եȥ�����������
 	    ��Ĥ�Υѥå����å� (�ѥå���٥� 2) ��������ޤ�����
diff --git a/ja/java/dists/index.sgml b/ja/java/dists/index.sgml
index 2a683b3fde..47e76952b7 100644
--- a/ja/java/dists/index.sgml
+++ b/ja/java/dists/index.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/index.sgml,v 1.7 2002/03/02 06:34:57 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: Distributions">
+<!ENTITY date "$FreeBSD: www/ja/java/dists/index.sgml,v 1.8 2003/01/06 03:38:35 hrs Exp $">
+<!ENTITY title "FreeBSD &java; Project: Distributions">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/dists/index.sgml,v 1.7 2002/03/02 06:34:57 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/dists/index.sgml,v 1.8 2003/01/06 03:38:35 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.6 -->
+<!-- Original revision: 1.7 -->
 ]>
 <html>
     &header;
@@ -15,7 +15,7 @@
             <table width="100%" border="0">
                 <tr>
                   <td>
-                    ����ϡ�Sun �� Java ��ȯ���åȤΡ�FreeBSD �ؤθ����ʰܿ��Ǥ���
+                    ����ϡ�Sun �� &java; ��ȯ���åȤΡ�FreeBSD �ؤθ����ʰܿ��Ǥ���
                     �ä˸������ǥХ����Τ��Ƥ��ޤ��󤬡����Ѥ��ݾڤ򤷤Ƥ����ΤǤϤ���ޤ���
                     ��������¿���δ�Ȥ����ΰܿ��Ǥ��ꤷ�Ƥ��ޤ��Τǡ�
                     �����˻Ȥ����Ȥ��Ǥ���Ȥ�����Ǥ��礦��
@@ -29,7 +29,7 @@
             
             <H2>���ݡ��Ȥ���Ƥ�����</H2>
             
-            <H3>JDK 1.1.x</H3>
+            <H3>&jdk; 1.1.x</H3>
             
             <P>�錄�������ϸ��ߡ�
               �С������ 2.2.x, 3.x, 4-CURRENT �� FreeBSD �����ƥ�Ǥ�
diff --git a/ja/java/index.sgml b/ja/java/index.sgml
index 6415cf65f5..ec28de9ad9 100644
--- a/ja/java/index.sgml
+++ b/ja/java/index.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/index.sgml,v 1.12 2003/03/19 19:57:52 rushani Exp $">
-<!ENTITY title "FreeBSD Java Project">
+<!ENTITY date "$FreeBSD: www/ja/java/index.sgml,v 1.13 2003/04/27 19:59:57 hrs Exp $">
+<!ENTITY title "FreeBSD &java; Project">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/index.sgml,v 1.12 2003/03/19 19:57:52 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/java/index.sgml,v 1.13 2003/04/27 19:59:57 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.16 -->
+<!-- Original revision: 1.17 -->
 ]>
 
 <html>
@@ -88,7 +88,7 @@
 	  <table border="0" width="100%">
 	    <tr>
 	      <td>
-		<p>����ϡ�Sun �� Java ��ȯ���åȤΡ�
+		<p>����ϡ�Sun �� &java; ��ȯ���åȤΡ�
 		      FreeBSD �ؤθ����ʰܿ��Ǥ���
                       �ä˸������ǥХ����Τ��Ƥ��ޤ��󤬡�
 		      ���Ѥ��ݾڤ򤷤Ƥ����ΤǤϤ���ޤ���
@@ -102,13 +102,13 @@
 
 	  <p>�錄�������ϸ��ߡ�
               FreeBSD �����ƥ�С������ 2.2.x, 3.x, 4.x, 5-CURRENT ��
-              JDK 1.1.8 �򥵥ݡ��Ȥ��Ƥ��ޤ���
+              &jdk; 1.1.8 �򥵥ݡ��Ȥ��Ƥ��ޤ���
               �С������ 2.2 ������ FreeBSD (���Ȥ��� FreeBSD 2.1.7.1)
 	      �ϥ��ݡ��Ȥ���Ƥ��ޤ���</p>
 
 	  <p><b>�ǿ�����!</b> FreeBSD Foundation �ϡ�Sun
 	      Microsystems ���� FreeBSD �ͥ��ƥ����Ǥ� Java Development
-	      Kit (JDK) �� Java Runtime Environment (JRE) �����ۤ���
+	      Kit (JDK) �� Java Runtime Environment (JRE&trade;) �����ۤ���
 	      �饤���󥹤�������ޤ�����
 	      FreeBSD Java �������¿������Ϥ˴��դ��ޤ���
 	      �����Ͼ���� FreeBSD �Υ�꡼���˴ޤޤ��Ǥ��礦��
diff --git a/ja/java/install.sgml b/ja/java/install.sgml
index e4749ee277..79b116a62c 100644
--- a/ja/java/install.sgml
+++ b/ja/java/install.sgml
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/install.sgml,v 1.4 2002/03/02 06:34:57 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: How To Install">
+<!ENTITY date "$FreeBSD: www/ja/java/install.sgml,v 1.5 2003/01/06 03:38:34 hrs Exp $">
+<!ENTITY title "FreeBSD &java; Project: How To Install">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/install.sgml,v 1.4 2002/03/02 06:34:57 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/install.sgml,v 1.5 2003/01/06 03:38:34 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.8 -->
+<!-- Original revision: 1.9 -->
 ]>
 <html>
     &header;
     <table border="0">
       <tr>
           <td>
-            <P>FreeBSD �� JDK �Υ��󥹥ȡ���ϼ¤�ľ��Ū�Ǥ�:</P>
+            <P>FreeBSD �� &jdk; �Υ��󥹥ȡ���ϼ¤�ľ��Ū�Ǥ�:</P>
             <P><CODE>cd /usr/ports/java/jdk
                 <BR>make
                 <BR>make install
diff --git a/ja/java/links/api.sgml b/ja/java/links/api.sgml
index 3fea276818..8652d2deea 100644
--- a/ja/java/links/api.sgml
+++ b/ja/java/links/api.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/api.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: API">
+<!ENTITY date "$FreeBSD: www/ja/java/links/api.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: API">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/api.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/api.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.6 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/development.sgml b/ja/java/links/development.sgml
index aa038b649e..d4a7cf92fb 100644
--- a/ja/java/links/development.sgml
+++ b/ja/java/links/development.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/development.sgml,v 1.3 2002/01/14 13:38:55 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: Development Tools">
+<!ENTITY date "$FreeBSD: www/ja/java/links/development.sgml,v 1.4 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Development Tools">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/development.sgml,v 1.3 2002/01/14 13:38:55 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/development.sgml,v 1.4 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.7 -->
+<!-- Original revision: 1.8 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/documentation.sgml b/ja/java/links/documentation.sgml
index 49fbde2a38..f5b72cb146 100644
--- a/ja/java/links/documentation.sgml
+++ b/ja/java/links/documentation.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/documentation.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: Documentation">
+<!ENTITY date "$FreeBSD: www/ja/java/links/documentation.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Documentation">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/documentation.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/documentation.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: 1.5 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/freebsd.sgml b/ja/java/links/freebsd.sgml
index 223af6fbf0..c1875359a2 100644
--- a/ja/java/links/freebsd.sgml
+++ b/ja/java/links/freebsd.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/freebsd.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: FreeBSD Related Java Stuff">
+<!ENTITY date "$FreeBSD: www/ja/java/links/freebsd.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: FreeBSD Related Java Stuff">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/freebsd.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/freebsd.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.6 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/index.sgml b/ja/java/links/index.sgml
index 505f1340fa..ff3acb8d20 100644
--- a/ja/java/links/index.sgml
+++ b/ja/java/links/index.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/index.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: Java Links">
+<!ENTITY date "$FreeBSD: www/ja/java/links/index.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Java Links">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/index.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/index.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.6 -->
 ]>
 
 <html>
diff --git a/ja/java/links/resources.sgml b/ja/java/links/resources.sgml
index 0b48976fd5..7013551fa1 100644
--- a/ja/java/links/resources.sgml
+++ b/ja/java/links/resources.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/resources.sgml,v 1.2 2001/07/14 05:55:06 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: Other Resources">
+<!ENTITY date "$FreeBSD: www/ja/java/links/resources.sgml,v 1.3 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Other Resources">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/resources.sgml,v 1.2 2001/07/14 05:55:06 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/resources.sgml,v 1.3 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.6 -->
+<!-- Original revision: 1.7 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/servlets.sgml b/ja/java/links/servlets.sgml
index 695405424b..aece877ebd 100644
--- a/ja/java/links/servlets.sgml
+++ b/ja/java/links/servlets.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/servlets.sgml,v 1.2 2001/07/14 05:55:06 kuriyama Exp $">
-<!ENTITY title "FreeBSD Java Project: Servlets">
+<!ENTITY date "$FreeBSD: www/ja/java/links/servlets.sgml,v 1.3 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Servlets">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/servlets.sgml,v 1.2 2001/07/14 05:55:06 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/servlets.sgml,v 1.3 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.6 -->
 ]>
 <html>
     &header;
@@ -13,7 +13,7 @@
       <tr>
           <td>
             <P>�����֥�åȤϥ����֥����Ф�ǽ�Ϥ��ĥ����
-              Perl �� CGI ������ץȤ����äƻȤ����Ȥ��Ǥ��� Java �� API �Ǥ���</p>
+              Perl �� CGI ������ץȤ����äƻȤ����Ȥ��Ǥ��� &java; �� API �Ǥ���</p>
 
             <P>�����֥�åȤϡ�XML �� XSL �ȤȤ�˻Ȥ����Ȥ��ǽ�Ǥ���</p>
 
diff --git a/ja/java/links/tools.sgml b/ja/java/links/tools.sgml
index fd26dc1203..63c5654929 100644
--- a/ja/java/links/tools.sgml
+++ b/ja/java/links/tools.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/tools.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: Tools">
+<!ENTITY date "$FreeBSD: www/ja/java/links/tools.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Tools">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/tools.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/tools.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: 1.5 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/tutorials.sgml b/ja/java/links/tutorials.sgml
index 5c09ed9d4e..cd487c6a5c 100644
--- a/ja/java/links/tutorials.sgml
+++ b/ja/java/links/tutorials.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/tutorials.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: Tutorials">
+<!ENTITY date "$FreeBSD: www/ja/java/links/tutorials.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Tutorials">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/tutorials.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/tutorials.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: 1.5 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/links/vendor.sgml b/ja/java/links/vendor.sgml
index d0639a6afa..492410808f 100644
--- a/ja/java/links/vendor.sgml
+++ b/ja/java/links/vendor.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/ja/java/links/vendor.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: Vendor Links"> 
+<!ENTITY date "$FreeBSD: www/ja/java/links/vendor.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: Vendor Links"> 
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/links/vendor.sgml,v 1.1 2001/04/03 19:13:11 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/links/vendor.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: 1.5 -->
 ]>
 <html>
     &header;
diff --git a/ja/java/newsflash.sgml b/ja/java/newsflash.sgml
index 2bbfad97b6..7bab283a2f 100644
--- a/ja/java/newsflash.sgml
+++ b/ja/java/newsflash.sgml
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/newsflash.sgml,v 1.13 2003/03/19 19:57:52 rushani Exp $">
-<!ENTITY title "FreeBSD Java Project: Newsflash">
+<!ENTITY date "$FreeBSD: www/ja/java/newsflash.sgml,v 1.14 2003/04/27 19:59:57 hrs Exp $">
+<!ENTITY title "FreeBSD &java; Project: Newsflash">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
-<!-- $FreeBSD: www/ja/java/newsflash.sgml,v 1.13 2003/03/19 19:57:52 rushani Exp $ -->
+<!-- $FreeBSD: www/ja/java/newsflash.sgml,v 1.14 2003/04/27 19:59:57 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.33 -->
+<!-- Original revision: 1.34 -->
 ]>
 <html>
     &header;
@@ -16,7 +16,7 @@
             <UL>
               <li><b>2003 ǯ 3 �� 7 ��:</b>
                 <br><a href="mailto:glewis@FreeBSD.org">Greg Lewis</a>
-                ��ϡ�JDK 1.4 ���꡼�������Υѥå����å��� 3 ��
+                ��ϡ�&jdk; 1.4 ���꡼�������Υѥå����å��� 3 ��
                 (patchset 3) ���꡼�����ޤ������ܤ�����
                 <a href="dists/14.html">JDK 1.4.x �Υڡ���</a>
                 ��������������
diff --git a/ja/java/press.sgml b/ja/java/press.sgml
index d34c6c42b3..862a2cd9bb 100644
--- a/ja/java/press.sgml
+++ b/ja/java/press.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/java/press.sgml,v 1.1 2000/11/29 15:49:57 hrs Exp $">
-<!ENTITY title "FreeBSD Java Project: In The Press...">
+<!ENTITY date "$FreeBSD: www/ja/java/press.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $">
+<!ENTITY title "FreeBSD &java; Project: In The Press...">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/java/press.sgml,v 1.1 2000/11/29 15:49:57 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/java/press.sgml,v 1.2 2002/03/04 00:34:19 kuriyama Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.4 -->
+<!-- Original revision: 1.5 -->
 
 <html>
 &header;
diff --git a/ja/platforms/index.sgml b/ja/platforms/index.sgml
index d20120f127..448fe869c7 100644
--- a/ja/platforms/index.sgml
+++ b/ja/platforms/index.sgml
@@ -2,11 +2,11 @@
 <!ENTITY base CDATA "..">
 <!ENTITY email 'freebsd-www'>
 <!ENTITY title "�б����Ƥ���ץ�åȥե�����">
-<!ENTITY date "$FreeBSD: www/ja/platforms/index.sgml,v 1.3 2002/01/02 15:33:03 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/platforms/index.sgml,v 1.4 2002/03/04 13:07:32 hanai Exp $">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;]>
-<!-- $FreeBSD: www/ja/platforms/index.sgml,v 1.3 2002/01/02 15:33:03 kuriyama Exp $ -->
+<!-- $FreeBSD: www/ja/platforms/index.sgml,v 1.4 2002/03/04 13:07:32 hanai Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.5 -->
+<!-- Original revision: 1.8 -->
 
 <html>
   &header;
@@ -23,10 +23,11 @@
 
   <ul>
     <li><a href="alpha.html">FreeBSD/alpha �ץ���������</a></li>
-    <li><a href="ia64.html">FreeBSD/ia64 �ץ���������</a></li>
+    <li><a href="&enbase;/platforms/ia64/index.html">FreeBSD/ia64 �ץ���������</a></li>
+    <li><a href="&enbase;/platforms/mips.html">FreeBSD/MIPS �ץ���������</a></li>
     <li><a href="ppc.html">FreeBSD/ppc �ץ���������</a></li>
     <li><a href="&enbase;/platforms/sparc.html">FreeBSD/sparc64 �ץ���������</a></li>
-    <li><a href="x86-64.html">FreeBSD/x86-64 �ץ���������</a></li>
+    <li><a href="x86-64.html">FreeBSD/amd64 �ץ���������</a></li>
   </ul>
 
   <h2>�����Ȥȥե����ɥХå�</h2>
@@ -43,14 +44,17 @@
     <li>FreeBSD/ia64: <a
       href="mailto:freebsd-ia64@FreeBSD.org">freebsd-ia64@FreeBSD.org</a></li>
 
+    <li>FreeBSD/MIPS: <a
+      href="mailto:freebsd-mips@FreeBSD.org">freebsd-mips@FreeBSD.org</a></li>
+
     <li>FreeBSD/ppc: <a
       href="mailto:freebsd-ppc@FreeBSD.org">freebsd-ppc@FreeBSD.org</a></li>
 
     <li>FreeBSD/sparc64: <a
       href="mailto:freebsd-sparc@FreeBSD.org">freebsd-sparc@FreeBSD.org</a></li>
 
-    <li>FreeBSD/x86-64: <a
-      href="mailto:freebsd-hackers@FreeBSD.org">freebsd-hackers@FreeBSD.org</a></li>
+    <li>FreeBSD/amd64: <a
+      href="mailto:freebsd-amd64@FreeBSD.org">freebsd-amd64@FreeBSD.org</a></li>
 
     <li>�������ƥ�����˴ؤ������Ū�ʼ����: <a
       href="mailto:freebsd-arch@FreeBSD.org">freebsd-arch@FreeBSD.org</a></li>
diff --git a/ja/platforms/x86-64.sgml b/ja/platforms/x86-64.sgml
index 974134732b..80bf0cb724 100644
--- a/ja/platforms/x86-64.sgml
+++ b/ja/platforms/x86-64.sgml
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/platforms/x86-64.sgml,v 1.4 2003/06/11 21:24:47 hrs Exp $">
-<!ENTITY title "FreeBSD/x86-64 Project">
-<!ENTITY email 'freebsd-hackers'>
+<!ENTITY date "$FreeBSD: www/ja/platforms/x86-64.sgml,v 1.5 2003/06/22 13:08:27 hrs Exp $">
+<!ENTITY title "FreeBSD/amd64 Project">
+<!ENTITY email 'freebsd-amd64'>
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.12 -->
-<!-- $FreeBSD: www/ja/platforms/x86-64.sgml,v 1.4 2003/06/11 21:24:47 hrs Exp $ -->
+<!-- Original revision: 1.13 -->
+<!-- $FreeBSD: www/ja/platforms/x86-64.sgml,v 1.5 2003/06/22 13:08:27 hrs Exp $ -->
  
 <html>
 &header;
@@ -25,9 +25,9 @@ FreeBSD 
 ���ߥ�졼��</a> ������ư��٤�����������
 FreeBSD �γ�ȯ�˲�Ŭ�˻Ȥ���褦�ʤ�ΤǤϤ���ޤ���</p>
 
-<H3>FreeBSD/x86-64 ��Ϣ���</H3>
+<H3>FreeBSD/amd64 ��Ϣ���</H3>
 <UL>
-<LI><A HREF="mailto:hackers@FreeBSD.org">FreeBSD/x86-64 �᡼��󥰥ꥹ��</A></LI>
+<LI><A HREF="mailto:freebsd-amd64@FreeBSD.org">FreeBSD/amd64 �᡼��󥰥ꥹ��</A></LI>
 </UL>
 
 <H3>����¾��ͭ�Ѥʥ��</H3>
@@ -50,7 +50,7 @@ Simulator and Tools</a></li>
 <H4>��Ϣ�ץ���������</H4>
 <UL>
 <LI><A HREF="http://www.x86-64.org/kernel_folder/kernel">Linux / x86-64</A></LI>
-<LI><A HREF="http://www.NetBSD.org/Ports/x86_64/">NetBSD/x86_64</A></LI>
+<LI><A HREF="http://www.NetBSD.org/Ports/amd64/">NetBSD/amd64</A></LI>
 </UL>
 
 &footer;
diff --git a/ja/search/search.sgml b/ja/search/search.sgml
index 99ab76c0c2..0bd4f1719e 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.36 2003/03/19 20:05:53 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/search.sgml,v 1.37 2003/06/10 15:32:57 rushani Exp $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.85 -->
+<!-- Original revision: 1.86 -->
 
 <html>
 &header;
@@ -388,7 +388,7 @@ href="http://www.geocrawler.com/">GeoCrawler</a> 
 
 <tr>
   <td><input type="checkbox" name="source" 
-	value="freebsd-java"> <strong>Java</strong></td>
+	value="freebsd-java"> <strong>&java;</strong></td>
   <td>JDK �ΰܿ��ȥ��ץꥱ�������γ�ȯ</td>
 </tr>
 
diff --git a/ja/security/security.sgml b/ja/security/security.sgml
index 18c5bce849..6bb821bff0 100644
--- a/ja/security/security.sgml
+++ b/ja/security/security.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.74 2003/04/26 20:05:19 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.75 2003/06/10 15:32:57 rushani Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/security/security.sgml,v 1.74 2003/04/26 20:05:19 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/security/security.sgml,v 1.75 2003/06/10 15:32:57 rushani Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project --> 
-<!-- Original revision: 1.133 -->
+<!-- Original revision: 1.134 -->
 
 <html>
     &header;
@@ -971,7 +971,7 @@ GOOD:
 
 <A NAME=tat></A>
 <H2>FreeBSD �������ƥ� Tips and Tricks</H2>
-<P>FreeBSD �����ƥ� (�ºݤˤϤɤ� Unix �����ƥ�Ǥ�) ��
+<P>FreeBSD �����ƥ� (�ºݤˤϤɤ� &unix; �����ƥ�Ǥ�) ��
 �����奢�ˤ���ˤϤ����Ĥ��Υ��ƥåפ�����ޤ�:</P>
 <UL>
 
diff --git a/ja/where.sgml b/ja/where.sgml
index 401c78cbe9..27d30fbc46 100644
--- a/ja/where.sgml
+++ b/ja/where.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/where.sgml,v 1.29 2002/08/17 20:31:10 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/where.sgml,v 1.30 2003/04/02 06:26:38 hrs Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.56 -->
+<!-- Original revision: 1.57 -->
 
 <html>
     &header;
@@ -83,13 +83,7 @@
 	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/-current/packages">FreeBSD-current �Ѥ� packages</a></li>
       
       <li><a
-	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/2.2-stable/packages">FreeBSD 2.2-stable �Ѥ� packages</a></li>
-      
-      <li><a
-	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/3.0-stable/packages">FreeBSD 3-stable �Ѥ� packages</a></li>
-	  
-      <li><a
-	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/4.0-stable/packages">FreeBSD 4-stable �Ѥ� packages</a></li>
+	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable">FreeBSD 4-stable �Ѥ� packages</a></li>
 	  
     </ul>
 
diff --git a/ja/y2kbug.sgml b/ja/y2kbug.sgml
index 9264d027a1..b25c046342 100644
--- a/ja/y2kbug.sgml
+++ b/ja/y2kbug.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/y2kbug.sgml,v 1.21 2002/02/28 05:18:46 kuriyama Exp $">
+<!ENTITY date "$FreeBSD: www/ja/y2kbug.sgml,v 1.22 2002/05/13 20:09:03 hrs Exp $">
 <!ENTITY title 'Year 2000 bug (aka "Millennium bug")'>
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.43 -->
+<!-- Original revision: 1.44 -->
 
 <html>
     &header;
@@ -15,7 +15,7 @@
       �������ʤ� 2000 ǯ�ˤ�����žʤ�ˤɤΤ褦���н褹��Τ���
       ��Ū�ʽ꿮ɽ�����׵᤹�������ФƤ��Ƥ��ޤ���</p>
 
-    <p>Unix �� FreeBSD �Τ褦�� Unix �饤���� OS ����Ѥ��Ƥ������Τϡ�
+    <p>&unix; �� FreeBSD �Τ褦�� Unix �饤���� OS ����Ѥ��Ƥ������Τϡ�
       ���ˤ�������ΰ���������Ǥ��ޤ���FreeBSD �� 2000
       ǯ���᤮�Ƥ����֤��ä���Ǥ⡢���������֤�ݻ����뤳�Ȥ��Ǥ���Ǥ��礦��