diff --git a/ja/Makefile b/ja/Makefile
index 6bd588ec70..8170b02475 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/Makefile,v 1.46 2000/12/30 14:25:12 hrs Exp $
+# $FreeBSD: www/ja/Makefile,v 1.47 2001/08/08 02:08:09 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.58
 
@@ -17,7 +17,6 @@ DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
-DOCS+= index.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
@@ -31,7 +30,8 @@ DOCS+= jabout.sgml
 
 # These will be directly installed.
 
-#DATA=	robots.txt
+#DATA=	favicon.ico
+#DATA+=	robots.txt
 
 # Subdirectories
 # SGML
@@ -40,6 +40,7 @@ SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= alpha
+
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
@@ -52,6 +53,16 @@ SUBDIR+= smp
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
+# SUBDIR+= doc
+# .endif
+# .if defined(BUILD_RELNOTES)
+# SUBDIR+= relnotes
+# .endif
+#
+# # These *must* be listed after the "doc" subdir, as they create symlinks
+# # in to it.
+# .if !defined(WEB_ONLY) || empty(WEB_ONLY)
+# SUBDIR+= tutorials
 .endif
 
 # Non-SGML
@@ -68,6 +79,10 @@ SGMLOPTS=	-links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -e EUC-JP
 
 WEBDIR=		data/ja
 
+index.html: index.xsl news/news.xml includes.xsl news/includes.xsl
+	xsltproc -nonet -o index.html index.xsl news/news.xml
+#	-tidy -i -m -f /dev/null index.html
+
 ### Revision checking
 REVCHECK=	yes
 
diff --git a/ja/includes.xsl b/ja/includes.xsl
index 4f541add01..799c7cbc5f 100644
--- a/ja/includes.xsl
+++ b/ja/includes.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.1 -->
+<!-- $FreeBSD: www/ja/includes.xsl,v 1.1 2001/08/07 03:58:32 kuriyama Exp $ -->
+<!-- Original revision: 1.2 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
@@ -92,4 +92,4 @@
   <xsl:variable name="u.rel.errata">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
   
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ja/index.xsl b/ja/index.xsl
index 178e51e63d..ebf098ab92 100644
--- a/ja/index.xsl
+++ b/ja/index.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
 <!-- $FreeBSD$ -->
-<!-- Original revision: 1.1 -->
+<!-- Original revision: 1.3 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   
@@ -9,7 +9,7 @@
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.3 2001/08/07 21:30:28 jim Exp $'"/>
   <xsl:variable name="title" select="'The FreeBSD Project'"/>
 
   <xsl:output type="html" encoding="EUC-JP"/>
@@ -111,7 +111,8 @@
 		<input type="submit" value=" Go "/>
 		
 		<br/>
-		<font color="#990000"><b>����:</b></font> 
+		
+		<font color="#990000"><b>����: </b></font> 
 		<a href="../">�Ѹ�</a>, 
 		<a href="../es/index.html">���ڥ����</a>, 
 		<a href="../ru/index.html">��������</a>, 
@@ -123,40 +124,12 @@
 	
 	<br/>
 	
-	<!-- Security alert -->
-	<table width="100%" bgcolor="#990000"
-	       cellpadding="4" cellspacing="0" border="0">
-	  <tr>
-	    <td>
-	      <h2 align="center">
-		<font color="#FFFFFF">����</font></h2>
-	      <p><font color="#FFFFFF">
-		2001 ǯ 7 �� 23 �������� FreeBSD �ˤ�,
-		��⡼�Ȥ���αƶ�������륻�����ƥ���������
-		�ޤ� telnet �ǡ���󤬴ޤޤ�Ƥ��ޤ�.
-		�ܺ٤�
-		<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-01:49.telnetd.v1.1.asc">�������ƥ�����</a>
-		����������.</font></p>
-	    </td>
-	  </tr>
-	</table>
-
 	<hr size="1" noshade="noshade"/>
 
 	<!-- Main layout table -->
 	<table border="0" cellspacing="0" cellpadding="2">
 	  <tr>
-	    <!-- Red strip down left hand of sidebar -->
-	    <td bgcolor="#990000">&#xa0;</td>
-	    
-	    <td bgcolor="#ffcc66">&#xa0;</td>
-	    
-	    <td></td>
-	    
-	    <!-- Main body column -->
-
-	    <td rowspan="2" align="left" valign="top">
-	      <!-- News / release info table -->
+	    <td valign="top">
 	      <table border="0" cellspacing="0" cellpadding="1"
 		     bgcolor="#000000" width="100%">
 		<tr>
@@ -164,41 +137,113 @@
 		    <table cellpadding="4" cellspacing="0" border="0"
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
-			<td valign="top"><b>�ǿ��˥塼��</b><br/>
-			  <font size="-1">
-			    <!-- Code to pull in the most recent four news
-			         items -->
-			    <xsl:for-each select="descendant::event[position() &lt;= 4]">
-			      >> <a>
-				<xsl:attribute name="href">
-				  news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
-				</xsl:attribute>
-				<xsl:choose>
-				  <xsl:when test="count(child::title)">
-				    <xsl:value-of select="title"/><br/>
-				  </xsl:when>
-				  <xsl:otherwise>
-				    <xsl:value-of select="p"/><br/>
-				  </xsl:otherwise>
-				</xsl:choose>
-			      </a>
-			    </xsl:for-each>
-			  </font>
-			</td>
+			<td>
+			  <p><font size="+1" color="#990000"><b>�˥塼��</b></font>
 
-			<td valign="top"><b>�ǿ���꡼��:
-			    <xsl:value-of select="$rel.current"/></b><br/>
-			
-			  <small>>> <a href="{$u.rel.announce}">���ʥ���</a><br/>
-			    >> <a href="{$base}/doc/ja_JP.eucJP/books/handbook/install.html">���󥹥ȡ��륬����</a><br/>
-			  >> <a href="{$u.rel.notes}">��꡼���Ρ���</a><br/>
-			    >> <a href="{$u.rel.errata}">Errata</a></small></td>
+	      
+			    <small><br/>
+			      ��<a href="news/newsflash.html">���ʥ���</a><br/>
+			      ��<a href="news/press.html">��ƻ</a><br/>
+			      ��<a href="news/index.html">����� ...</a>
+			    </small></p>
+	    
+			  <p><font size="+1" color="#990000"><b>���եȥ�����</b></font>
+			    <small><br/>
+			      ��<a href="{$base}/handbook/mirrors.html">FreeBSD ���������</a><br/>
+			      ��<a href="releases/index.html">��꡼������</a><br/>
+			      ��<a href="{$base}/ports/index.html">Ports Collection</a><br/>
+			    </small></p>
+	    
+			  <p><font size="+1" color="#990000"><b>�ɥ������</b></font>
+		
+			    <small><br/>
+			      ��<a href="projects/newbies.html">�鿴�ԤΤ����</a><br/>
+			      ��<a href="{$base}/handbook/index.html">�ϥ�ɥ֥å�</a><br/>
+			      ��<a href="{$base}/FAQ/index.html">FAQ</a><br/>
+			      ��<a href="{$base}/docproj/index.html">Doc. Project</a><br/>
+			      ��<a href="docs.html">�����...</a><br/>
+			    </small></p>
+			  
+			  <p><font size="+1" color="#990000"><b>���ݡ���</b></font>
+	      
+			    <small><br/>
+			      ��<a href="{$base}/support.html#mailing-list">�᡼��󥰥ꥹ��</a><br/>
+			      ��<a href="{$base}/support.html#newsgroups">�˥塼�����롼��</a><br/>
+			      ��<a href="{$base}/support.html#user">�桼�����롼��</a><br/>
+			      ��<a href="{$base}/support.html#web">Web ����</a><br/>
+			      ��<a href="security/index.html">�������ƥ�</a><br/>
+			      ��<a href="{$base}/support.html">�����...</a>
+			    </small></p>
+	      
+			  <p><font size="+1" color="#990000"><b>��ȯ</b></font>
+		
+			    <small><br/>
+			      ��<a href="projects/index.html">�ץ���������</a><br/>
+			      ��<a href="{$base}/support.html#gnats">�Х���ݡ���</a><br/>
+			      ��<a href="{$base}/support.html#cvs">CVS ��ݥ��ȥ�</a><br/>
+			    </small></p>
+	      
+			  <p><font size="+1" color="#990000"><b>�٥��Vendors</b></font>
+			    
+			    <small><br/>
+			      ��<a href="{$base}/commercial/software_bycat.html">���եȥ�����</a><br/>
+			      ��<a href="{$base}/commercial/hardware.html">�ϡ��ɥ�����</a><br/>
+			      ��<a href="{$base}/commercial/consulting_bycat.html">���󥵥�ƥ���</a><br/>
+			      ��<a href="{$base}/commercial/misc.html">����¾</a><br/>
+			    </small></p>
+	      
+			  <p><font size="+1" color="#990000"><b>���Υ����ȤˤĤ���</b></font>
+		
+			    <small><br/>
+			      ��<a href="{$base}/search/index-site.html">�����ȥޥå�</a><br/>
+			      ��<a href="{$base}/search/search.html">����</a><br/>
+			      ��<a href="internal/index.html">�����...</a><br/>
+			    </small></p>
+	      
+			  <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
+			    <small>����:<br/>
+			      <input type="text" name="words" size="10"/>
+			      <input type="hidden" name="max" value="25"/>
+			      <input type="hidden" name="source" value="www"/>
+			      <input type="submit" value="�¹�"/></small>
+			  </form></td>
 		      </tr>
 		    </table>
 		  </td>
 		</tr>
 	      </table>
+	    </td>
+	    
+	    <td></td>
+	    
+	    <!-- Main body column -->
 
+	    <td align="left" valign="top" rowspan="2">
+	      <!-- Security alert -->
+	      <table border="0" cellspacing="1" cellpadding="4"
+		     bgcolor="#990000" width="100%">
+		<tr>
+		  <td>
+		    <table bgcolor="#FFFFFF" width="100%"
+			   cellpadding="4" cellspacing="0" border="0">
+		      <tr>
+			<td>
+			  <h2 align="center">����</h2>
+			  
+			  <p>
+			    2001 ǯ 7 �� 23 �������� FreeBSD �ˤ�,
+			    ��⡼�Ȥ���αƶ�������륻�����ƥ���������
+			    �ޤ� telnet �ǡ���󤬴ޤޤ�Ƥ��ޤ�.
+			    �ܺ٤�
+			    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-01:49.telnetd.v1.1.asc">�������ƥ�����</a>
+			    ����������.</p>
+			</td>
+		      </tr>
+		    </table>
+		  </td>
+		</tr>
+	      </table>
+	      
 	      <h2><font color="#990000">FreeBSD �Ȥ�?</font></h2>
 	
 	      <p>FreeBSD �� Intel �ߴ��� (x86), DEC Alpha, PC-98
@@ -261,10 +306,10 @@
 		�� <a href="{$base}/copyright/index.html">̵��</a> ������Ǥ�,
 		���٤ƤΥ����������ɤ���°���Ƥ��ޤ�.
 		��Ƥߤ褦����, �Ȥ�������
-		<a href="{$base}/doc/ja_JP.eucJP/books/handbook/mirrors.html">
+		<a href="{$base}/handbook/mirrors.html">
 		  ���ܤ�������</a> ��
 		������������.</p>
-	      
+
 	      <h2><font color="#990000">FreeBSD �ؤι׸�</font></h2>
 
 	      <p>FreeBSD �˹׸�����Τϴ�ñ�Ǥ�.
@@ -280,107 +325,81 @@
 		  FreeBSD �ؤι׸�</a>
 		(<a href="http://www.FreeBSD.org/handbook/contrib.html">��ʸ</a>)
 		�Ȥ�����������������������.</p>
-	      
-	      <br/>
-	      
-	      <table border="3" cellspacing="0" cellpadding="5">
+	    </td>
+
+	    <td></td>
+
+	    <!-- Right-most column -->
+	    <td valign="top">
+	      <!-- News / release info table -->
+	      <table border="0" cellspacing="0" cellpadding="1"
+		     bgcolor="#000000" width="100%">
 		<tr>
-		  <td>FreeBSD �ˤĤ��Ƥ�äȤ褯�Τꤿ���ʤä���,
-		    FreeBSD �˴�Ϣ����
-		    <a href="{$base}/publish.html">����ʪ</a> ��
-		    <a href="news/press.html">FreeBSD �ط�����ƻ</a> ��
-		    �����꡼��ˬ�ͤ���, ���Υ����֥����Ȥ�
-		    ���ƤߤƤ�������!</td>
+		  <td>
+		    <table cellpadding="4" cellspacing="0" border="0"
+			   bgcolor="#ffcc66" width="100%">
+		      <tr>
+			<td valign="top"><p><font size="+1" color="#990000"><b>�ǿ���꡼��:
+			    <xsl:value-of select="$rel.current"/></b></font><br/>
+			
+			    <small>��<a href="{$u.rel.announce}">���ʥ���</a><br/>
+			      ��<a href="{$base}/handbook/install.html">���󥹥ȡ��륬����</a><br/>
+			      ��<a href="{$u.rel.notes}">��꡼���Ρ���</a><br/>
+			      ��<a href="{$u.rel.errata}">Errata</a></small></p>
+
+			  <p><font size="+1" color="#990000"><b>�ǿ��˥塼��</b></font><br/>
+			  <font size="-1">
+			    <!-- Code to pull in the most recent four news
+			         items -->
+			    <xsl:for-each select="descendant::event[position() &lt;= 20]">
+			      �� <a>
+				<xsl:attribute name="href">
+				  news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
+				</xsl:attribute>
+				<xsl:choose>
+				  <xsl:when test="count(child::title)">
+				    <xsl:value-of select="title"/><br/>
+				  </xsl:when>
+				  <xsl:otherwise>
+				    <xsl:value-of select="p"/><br/>
+				  </xsl:otherwise>
+				</xsl:choose>
+			      </a>
+			    </xsl:for-each>
+			  </font></p>
+			</td>
+		      </tr>
+		    </table>
+		  </td>
+		</tr>
+	      </table>
+
+	      <p>&#xa0;</p>
+
+	      <table border="0" cellspacing="0" cellpadding="1"
+		     bgcolor="#000000" width="100%">
+		<tr>
+		  <td>
+		    <table cellpadding="4" cellspacing="0" border="0"
+			   bgcolor="#FFFFFF" width="100%"><tr>
+			<td>FreeBSD �ˤĤ��Ƥ�äȤ褯�Τꤿ���ʤä���,
+			  FreeBSD �˴�Ϣ����
+			  <a href="{$base}/publish.html">����ʪ</a> ��
+			  <a href="news/press.html">FreeBSD �ط�����ƻ</a> ��
+			  �����꡼��ˬ�ͤ���, ���Υ����֥����Ȥ�
+			  ���ƤߤƤ�������!</td>
+		      </tr>
+		    </table>
+		  </td>
 		</tr>
 	      </table>
 	    </td>
 	  </tr>
-	
-	  <!-- New row for the strip of links that normally runs down the
-	       left hand side.  This is set up this way so that if you are
-	       viewing the site in a browser that does not support tables
-	       the main body copy will appear first, with the list of links
-	       at the end.  It's not perfect, but it works. -->
-	  <tr>
-	    <td bgcolor="#990000">&#xa0;</td>
-	    
-	    <td align="left" valign="top" bgcolor="#ffcc66">
-	      <p><big><font color="#990000"><b>�˥塼��</b></font></big>
-	      
-		<small><br/>
-		  &#xa0;&#xa0;<a href="news/newsflash.html">���ʥ���</a><br/>
-		  &#xa0;&#xa0;<a href="news/press.html">��ƻ</a><br/>
-		  &#xa0;&#xa0;<a href="news/index.html">����� ...</a>
-		</small></p>
-	    
-	      <p><big><font color="#990000"><b>���եȥ�����</b></font></big>
-	      
-		<small><br/>
-		  &#xa0;&#xa0;<a href="{$base}/doc/ja_JP.eucjP/books/handbook/mirrors.html">FreeBSD ���������</a><br/>
-		  &#xa0;&#xa0;<a href="releases/index.html">��꡼������</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/ports/index.html">Ports Collection</a><br/>
-		</small></p>
-	    
-	      <p><big><font color="#990000"><b>�ɥ������</b></font></big>
-		
-		<small><br/>
-		  &#xa0;&#xa0;<a href="projects/newbies.html">�鿴�ԤΤ����</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/handbook/index.html">�ϥ�ɥ֥å�</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/FAQ/index.html">FAQ</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/docproj/index.html">Doc. Project</a><br/>
-		  &#xa0;&#xa0;<a href="docs.html">�����...</a><br/>
-		</small></p>
-	    
-	      <p><big><font color="#990000"><b>���ݡ���</b></font></big>
-	      
-		<small><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html#mailing-list">�᡼��󥰥ꥹ��</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html#newsgroups">�˥塼�����롼��</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html#user">�桼�����롼��</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html#web">Web ����</a><br/>
-		  &#xa0;&#xa0;<a href="security/index.html">�������ƥ�</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html">�����...</a>
-		</small></p>
-	      
-	      <p><big><font color="#990000"><b>��ȯ</b></font></big>
-		
-		<small><br/>
-		  &#xa0;&#xa0;<a href="projects/index.html">�ץ���������</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html#gnats">�Х���ݡ���</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/support.html#cvs">CVS ��ݥ��ȥ�</a><br/>
-		</small></p>
-	      
-	      <p><big><font color="#990000"><b>�٥��</b></font></big>
-		
-		<small><br/>
-		  &#xa0;&#xa0;<a href="{$base}/commercial/software_bycat.html">���եȥ�����</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/commercial/hardware.html">�ϡ��ɥ�����</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/commercial/consulting_bycat.html">���󥵥�ƥ���</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/commercial/misc.html">����¾</a><br/>
-		</small></p>
-	      
-	      <p><big><font color="#990000"><b>���Υ����ȤˤĤ���</b></font></big>
-		
-		<small><br/>
-		  &#xa0;&#xa0;<a href="{$base}/search/index-site.html">�����ȥޥå�</a><br/>
-		  &#xa0;&#xa0;<a href="{$base}/search/search.html">����</a><br/>
-		  &#xa0;&#xa0;<a href="internal/index.html">�����...</a><br/>
-		</small></p>
-	      
-	      <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
-		<small>&#xa0;&#xa0;����:<br/>
-		  <input type="text" name="words" size="10"/>
-		  <input type="hidden" name="max" value="25"/>
-		  <input type="hidden" name="source" value="www"/>
-		  <input type="submit" value="�¹�"/></small>
-	      </form>
-	    </td>
-	  </tr>
 	</table>
 
-	<hr/>
-	
-	<table border="0" cellspacing="0" cellpadding="3">
+	<hr noshade="noshade" size="1" />
+
+	<table width="100%" border="0" cellspacing="0" cellpadding="3">
 	  <tr>
 	    <td><a href="http://www.freebsdmall.com/"><img
 							   src="../gifs/mall_title_medium.gif" alt="[FreeBSD Mall]"
@@ -407,13 +426,10 @@
 	<p><small>���Υ����֥����Ȥ����� 8:00 UTC �� 20:00 UTC �˹������Ƥ��ޤ�.
 	  </small></p>
     
-	<hr/>
-
 	<table width="100%" cellpadding="0" border="0" cellspacing="0">
 	  <tr>
 	    <td align="left" 
-		valign="top"><small><a href="{$base}/mailto.html">���䤤��碌��
-		</a> : <a href="jabout.html">���ܸ첽�ˤĤ���</a><br/>
+		valign="top"><small><a href="{$base}/mailto.html">���䤤��碌��</a> : <a href="jabout.html">���ܸ첽�ˤĤ���</a><br/>
 		<xsl:value-of select="$date"/></small></td>
 
 	    <td align="right" 
diff --git a/ja/news/Makefile b/ja/news/Makefile
index 0648e211b4..cad87f5b24 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.25 2001/08/01 14:36:54 hrs Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.26 2001/08/08 02:11:16 kuriyama Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.23
 
@@ -10,7 +10,6 @@
 .endif
 
 DOCS= press.sgml
-DOCS+= newsflash.sgml
 DOCS+= news.sgml
 #DOCS+= webchanges.sgml
 
@@ -29,6 +28,20 @@ INDEXLINK= news.html
 
 SUBDIR= 	1996
 SUBDIR+= 	1997
+#SUBDIR+= 	1998
+#SUBDIR+= 	1999
+#SUBDIR+= 	2000
+#SUBDIR+=	status
+
+DATA=		newsflash.html
+#+= news.rdf
+
+newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
+	xsltproc -nonet -o newsflash.html newsflash.xsl news.xml
+#	-tidy -i -m -f /dev/null newsflash.html
+
+news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
+	xsltproc -nonet -o news.rdf news-rdf.xsl news.xml
 
 ### Revision checking
 REVCHECK=	YES
diff --git a/ja/news/includes.xsl b/ja/news/includes.xsl
index 422c31d13f..603dbe853b 100644
--- a/ja/news/includes.xsl
+++ b/ja/news/includes.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.1 -->
+<!-- $FreeBSD: www/ja/news/includes.xsl,v 1.1 2001/08/07 03:58:32 kuriyama Exp $ -->
+<!-- Original revision: 1.2 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
diff --git a/ja/news/news.xml b/ja/news/news.xml
index 60248366dc..18c9259b1a 100644
--- a/ja/news/news.xml
+++ b/ja/news/news.xml
@@ -16,7 +16,7 @@
      synopses of this information (e.g., for syndication using RDF files), 
      the contents of <title> will be preferred over <p>.
 
-     $FreeBSD: www/en/news/news.xml,v 1.2 2001/08/07 00:03:25 logo Exp $
+     $FreeBSD: www/ja/news/news.xml,v 1.1 2001/08/07 03:58:32 kuriyama Exp $
      Original revision: 1.2
 -->
 
@@ -28,11 +28,24 @@
       <name>8</name>
 
       <day>
-        <name>06</name>
+	<name>7</name>
+
+	<event>
+	  <title>Pandaemonium �桼�����롼��</title>
+
+	  <p>�����������ȥ�ꥢ�� BSD �桼�����롼�פǤ���
+<a href="http://pandaemonium.newmillennium.net.au/">Pandaemoium</a>, 
+	    �� <a href="$base/support.html">���ݡ���</a> �ڡ�����
+	    �ɲä���ޤ���.</p>
+        </event>
+      </day>
+
+      <day>
+        <name>6</name>
 
         <event>
-          <p>�����ߥå�����Ǥ: <a href="mailto:logo@FreeBSD.org">Valentino
-            Vaschetto</a>(ʸ��ô��)</p>
+          <p>�����ߥå���: <a href="mailto:logo@FreeBSD.org">Valentino
+            Vaschetto</a> (ʸ��)</p>
         </event>
       </day>
     </month>
@@ -58,7 +71,7 @@
 	<name>26</name>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:mp@FreeBSD.org">Mark Peek</a></p>
+	  <p>�����ߥå���: <a href="mailto:mp@FreeBSD.org">Mark Peek</a></p>
 	</event>
       </day>
 
@@ -66,17 +79,17 @@
 	<name>16</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:bbraun@FreeBSD.org">Rob
+	  <p>�����ߥå���: <a href="mailto:bbraun@FreeBSD.org">Rob
 	      Braun</a></p>
 	</event>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="zarzycki@FreeBSD.org">Dave
+	  <p>�����ߥå���: <a href="zarzycki@FreeBSD.org">Dave
 	      Zarzycki</a></p>
 	</event>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mike@FreeBSD.org">Mike Barcroft</a></p>
+	  <p>�����ߥå���: <a href="mike@FreeBSD.org">Mike Barcroft</a></p>
 	</event>
       </day>
       
@@ -84,8 +97,8 @@
 	<name>13</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:chern@FreeBSD.org">Chern Lee</a>
-	    (ʸ��ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:chern@FreeBSD.org">Chern Lee</a>
+	    (ʸ��)</p>
 	</event>
       </day>
     </month>
@@ -97,8 +110,8 @@
 	<name>21</name>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:brooks@FreeBSD.org">Brooks
-	      Davis</a> (�ͥåȥ��, ��Х���ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:brooks@FreeBSD.org">Brooks
+	      Davis</a> (�ͥåȥ��, ��Х���)</p>
 	</event>
       </day>
 
@@ -134,8 +147,8 @@
 	<name>15</name>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:silby@FreeBSD.org">Mike
-	  Silbersack</a> (�ͥåȥ��ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:silby@FreeBSD.org">Mike
+	  Silbersack</a> (�ͥåȥ��)</p>
 	</event>
       </day>
 
@@ -143,8 +156,8 @@
 	<name>14</name>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:wjv@FreeBSD.org">Johann Visagie</a>
-	    (Portsô��)</p>
+	  <p>�����ߥå���: <a href="mailto:wjv@FreeBSD.org">Johann Visagie</a>
+	    (Ports)</p>
 	</event>
       </day>
       
@@ -152,6 +165,8 @@
 	<name>13</name>
 
 	<event>
+          <title>FreeBSD ��Ľ��ݡ����о�</title>
+
 	  <p><a href="mailto:rwatson@FreeBSD.org">Robert Watson</a> ��
 	    FreeBSD �ץ��������Ȥ�
 	    <a href="http://docs.freebsd.org/cgi/getmsg.cgi?fetch=481962+0+archive/2001/freebsd-hackers/20010617.freebsd-hackers">��Ľ��ݡ���</a>
@@ -164,8 +179,8 @@
 	<name>11</name>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:tobez@FreeBSD.org">Anton
-	  Berezin</a> (Perl����ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:tobez@FreeBSD.org">Anton
+	  Berezin</a> (Perl����)</p>
 	</event>
       </day>
 
@@ -173,13 +188,13 @@
 	<name>6</name>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:dwcjr@FreeBSD.org">David
-	  W. Chapman Jr.</a>(Portsô��)</p>
+	  <p>�����ߥå���: <a href="mailto:dwcjr@FreeBSD.org">David
+	  W. Chapman Jr.</a>(Ports)</p>
 	</event>
 
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:markp@FreeBSD.org">Mark Pulford</a>
-	    (Portsô��)</p>
+	  <p>�����ߥå���: <a href="mailto:markp@FreeBSD.org">Mark Pulford</a>
+	    (Ports)</p>
 	</event>
       </day>
 
@@ -187,8 +202,8 @@
 	<name>1</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:cjc@FreeBSD.org">Crist J. Clark</a>
-	    (�ͥåȥ��, �������ƥ�ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:cjc@FreeBSD.org">Crist J. Clark</a>
+	    (�ͥåȥ��, �������ƥ�)</p>
 	</event>
       </day>
     </month>
@@ -200,6 +215,8 @@
 	<name>24</name>
       
 	<event>
+	  <title>ftp.FreeBSD.org ����</title>
+
 	  <p>��̾�� ftp ������
 	    <a href="ftp://ftp.FreeBSD.org/">ftp.FreeBSD.org</a>
 	    ��, �̾ﱿ�Ѥ��������ޤ���.
@@ -213,7 +230,7 @@
 	<name>16</name>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:pirzyk@FreeBSD.org">Jim
+	  <p>�����ߥå���: <a href="mailto:pirzyk@FreeBSD.org">Jim
 	  Pirzyk</a></p>
 	</event>
       </day>
@@ -222,6 +239,8 @@
 	<name>2</name>
       
 	<event>
+          <title>New FreeBSD 'zine ȯ��</title>
+
 	  <p><a href="http://www.freebsdzine.org/">FreeBSD 'zine</a>
             �� 2001 ǯ 5 ���� 1 �椬ȯ�Ԥ���ޤ���.
             �����ȯ�ԤϷ�� 2 ��, 1 ���� 15 ���˹Ԥʤ���ͽ��Ǥ�.</p>
@@ -236,6 +255,8 @@
 	<name>27</name>
       
 	<event>
+	  <title>SMP Alpha ��ư��ޤ���</title>
+
 	  <p><a href="mailto:jhb@FreeBSD.org">John Baldwin</a> ��,
 	    <a href="mailto:gallatin@FreeBSD.org">Andrew Gallatin</a> ��,
 	    <a href="mailto:dfr@FreeBSD.org">Doug Rabson</a> �������Ϥˤ��,
@@ -248,13 +269,13 @@
 	<name>25</name>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:tshiozak@FreeBSD.org">���� ����
-	    </a> (��ݲ�ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:tshiozak@FreeBSD.org">���� ����
+	    </a> (��ݲ�)</p>
 	</event>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:ue@FreeBSD.org">Udo Erdelhoff</a> 
-	    (ʸ��ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:ue@FreeBSD.org">Udo Erdelhoff</a> 
+	    (ʸ��)</p>
 	</event>
       </day>
 
@@ -291,9 +312,9 @@
 	<name>16</name>
 	
 	<event>
-	  <p>�ޤ����, �����ߥå�����Ǥ: 
+	  <p>�ޤ����, �����ߥå���: 
 	    <a href="mailto:schweikh@FreeBSD.org">Jens Schweikhardt</a>
-	    (����Ŭ���� (Standards compliance) ô��)</p>
+	    (����Ŭ���� (Standards compliance) )</p>
 	</event>
       </day>
 
@@ -319,8 +340,8 @@
 	<name>5</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:greid@FreeBSD.org">George Reid</a>
-	    (������ɵ�ǽ, ports ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:greid@FreeBSD.org">George Reid</a>
+	    (������ɵ�ǽ, ports )</p>
 	</event>
       </day>
 
@@ -345,8 +366,8 @@
 	<name>25</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:yar@FreeBSD.org">Yar Tikhiy</a>
-	    (�ͥåȥ����ǽô��)</p>
+	  <p>�����ߥå���: <a href="mailto:yar@FreeBSD.org">Yar Tikhiy</a>
+	    (�ͥåȥ����ǽ)</p>
 	</event>
       </day>
 
@@ -354,8 +375,8 @@
 	<name>24</name>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:eric@FreeBSD.org">Eric Melville</a>
-	    (�����ƥ�ġ���ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:eric@FreeBSD.org">Eric Melville</a>
+	    (�����ƥ�ġ���)</p>
 	</event>
       </day>
 
@@ -372,8 +393,8 @@
 	<name>9</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:dd@FreeBSD.org">Dima Dorfman</a>
-	    (ʸ��ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:dd@FreeBSD.org">Dima Dorfman</a>
+	    (ʸ��)</p>
 	</event>
       </day>
 
@@ -381,8 +402,8 @@
 	<name>7</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:keichii@FreeBSD.org">Michael
-	      C. Wu</a> (��ݲ�, ports ô��)</p>
+	  <p>�����ߥå���: <a href="mailto:keichii@FreeBSD.org">Michael
+	      C. Wu</a> (��ݲ�, ports )</p>
 	</event>
       </day>
 
@@ -390,13 +411,13 @@
 	<name>6</name>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:tmm@FreeBSD.org">Thomas 
-	      M&amp;ouml;stl</a> (POSIX1.e ��ĥ��ǽô��)</p>
+	  <p>�����ߥå���: <a href="mailto:tmm@FreeBSD.org">Thomas 
+	      M&amp;ouml;stl</a> (POSIX1.e ��ĥ��ǽ)</p>
 	</event> 
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:orion@FreeBSD.org">Orion Hodson</a>
-	    (������ɵ�ǽô��)</p>
+	  <p>�����ߥå���: <a href="mailto:orion@FreeBSD.org">Orion Hodson</a>
+	    (������ɵ�ǽ)</p>
 	</event>
       </day>
     </month>
@@ -408,7 +429,7 @@
 	<name>20</name>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:jesper@FreeBSD.org">Jesper
+	  <p>�����ߥå���: <a href="mailto:jesper@FreeBSD.org">Jesper
 	      Skriver</a></p>
 	</event>
       </day>
@@ -426,7 +447,7 @@
 	<name>5</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:mikeh@FreeBSD.org">Mike Heffner</a>
+	  <p>�����ߥå���: <a href="mailto:mikeh@FreeBSD.org">Mike Heffner</a>
 	    (�ƺ��ץ���������)</p>
 	</event>
       </day>
@@ -439,8 +460,8 @@
 	<name>24</name>
       
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:olgeni@FreeBSD.org">Jimmy 
-	      Olgeni</a> (Portsô��)</p>
+	  <p>�����ߥå���: <a href="mailto:olgeni@FreeBSD.org">Jimmy 
+	      Olgeni</a> (Ports)</p>
 	</event>
       </day>
 
@@ -448,8 +469,8 @@
 	<name>23</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:dinoex@FreeBSD.org">Dirk Meyer</a>
-	    (Portsô��)</p>
+	  <p>�����ߥå���: <a href="mailto:dinoex@FreeBSD.org">Dirk Meyer</a>
+	    (Ports)</p>
 	</event>
       </day>
 
@@ -457,8 +478,8 @@
 	<name>20</name>
 	
 	<event>
-	  <p>�����ߥå�����Ǥ: <a href="mailto:ijliao@FreeBSD.org">Ying-chieh 
-	      Liao</a> (Portsô��)</p>
+	  <p>�����ߥå���: <a href="mailto:ijliao@FreeBSD.org">Ying-chieh 
+	      Liao</a> (Ports)</p>
 	</event>
       </day>
     </month>
diff --git a/ja/news/newsflash.xsl b/ja/news/newsflash.xsl
index 7d8db2f90e..dc476db190 100644
--- a/ja/news/newsflash.xsl
+++ b/ja/news/newsflash.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD: www/en/news/newsflash.xsl,v 1.1 2001/08/06 06:59:11 nik Exp $ -->
+<!-- $FreeBSD: www/ja/news/newsflash.xsl,v 1.1 2001/08/07 03:58:32 kuriyama Exp $ -->
 <!-- Original revision: 1.1 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -11,9 +11,9 @@
 
   <xsl:variable name="base" select="'..'"/>
   <xsl:variable name="title" select="'FreeBSD News Flash'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/news/newsflash.xsl,v 1.1 2001/08/06 06:59:11 nik Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ja/news/newsflash.xsl,v 1.1 2001/08/07 03:58:32 kuriyama Exp $'"/>
   
-  <xsl:output type="html" encoding="iso-8859-1"/>
+  <xsl:output type="html" encoding="EUC-JP"/>
 
   <xsl:template match="news">
     <html>