From 236167f4c3c218cda5d5483de23ba111619941c7 Mon Sep 17 00:00:00 2001
From: Hideyuki KURASHINA <rushani@FreeBSD.org>
Date: Mon, 11 Aug 2003 06:09:06 +0000
Subject: [PATCH] Merge the following from the English version:

	1.86  -> 1.87	search/search.sgml
	1.135 -> 1.139	security/security.sgml
	1.28  -> 1.30	send-pr.sgml
	1.57  -> 1.58	where.sgml
---
 ja/search/search.sgml     |  5 +++--
 ja/security/security.sgml | 15 +++++++++++----
 ja/send-pr.sgml           | 14 ++++++++++++--
 ja/where.sgml             | 40 ++++++++++++++++++++++++++++++---------
 4 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/ja/search/search.sgml b/ja/search/search.sgml
index 0bd4f1719e..008dec1e24 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.37 2003/06/10 15:32:57 rushani Exp $">
+<!ENTITY date "$FreeBSD: www/ja/search/search.sgml,v 1.38 2003/07/05 06:03:16 hrs Exp $">
 <!ENTITY title "Search">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.86 -->
+<!-- Original revision: 1.87 -->
 
 <html>
 &header;
@@ -24,6 +24,7 @@
 <li><a href="http://www.google.com/bsd">Google Search BSD</a>
 <li><a href="http://www.greasydaemon.com/">GreasyDaemon</a>��
 ���٤Ƥ� BSD UNIX �򥵥ݡ��Ȥ������������󥸥�
+<li><a href="http://freebsd.rambler.ru/">FreeBSD �᡼�륢�������ָ���</a>
 </ul>
 
 <hr noshade>
diff --git a/ja/security/security.sgml b/ja/security/security.sgml
index 8382ea9298..b964f909bd 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.76 2003/07/05 06:03:16 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.77 2003/07/19 08:45:42 hrs Exp $">
 <!ENTITY title "FreeBSD Security Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/ja/security/security.sgml,v 1.76 2003/07/05 06:03:16 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/security/security.sgml,v 1.77 2003/07/19 08:45:42 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project --> 
-<!-- Original revision: 1.135 -->
+<!-- Original revision: 1.139 -->
 
 <html>
     &header;
@@ -320,6 +320,13 @@ Ports Collection 
       �Υ����å���Ԥʤ����ˤϡ���ʸ�򻲾Ȥ���褦�ˤ��ꤤ���ޤ���
     </p>
 
+<UL>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:10.ibcs2.asc">FreeBSD-SA-03:10.ibcs2.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:09.signal.asc">FreeBSD-SA-03:09.signal.asc</A></LI>
+<LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:08.realpath.asc">FreeBSD-SA-03:08.realpath.asc</A>
+(<a href="http://home.jp.freebsd.org/cgi-bin/showmail/announce-jp/1158">���ܸ���</a>)</LI>
+</UL>
+FreeBSD 5.1-RELEASE �����
 <UL>
 <LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SN-03:02.asc">FreeBSD-SN-03:02.asc</A></LI>
 <LI><A HREF="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SN-03:01.asc">FreeBSD-SN-03:01.asc</A></LI>
@@ -1085,7 +1092,7 @@ The COAST archive</A>
 �Τ褦���͡���CERT������</LI>
 
 <LI><A HREF="http://www.geek-girl.com/bugtraq/">Bugtraq</A>��
-<A HREF="http://www.nfr.net/forum/firewall-wizards.html">
+<A HREF="http://list.nfr.com/forum/firewall-wizards.html">
 Firewall Wizards</A>�Τ褦�ʥ᡼��󥰥ꥹ��</LI>
 </UL>
 
diff --git a/ja/send-pr.sgml b/ja/send-pr.sgml
index a381adea2e..66e339a842 100644
--- a/ja/send-pr.sgml
+++ b/ja/send-pr.sgml
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/ja/send-pr.sgml,v 1.19 2002/05/13 20:09:03 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/send-pr.sgml,v 1.20 2002/08/17 20:31:10 hrs Exp $">
 <!ENTITY title "Submit a FreeBSD problem report">
 <!ENTITY copyright "This gnats pr-submission mechanism Copyright &copy; 1996
  The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED.">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.28 -->
+<!-- Original revision: 1.30 -->
 
 <html>
     &header;
@@ -15,6 +15,7 @@
     
     <img src="../gifs/bug.jpg" alt="Bugs" align="right" border="0" width="200" height="233">
 
+  <!-- The web interface is disabled for the time being.
     <p>FreeBSD �˴ؤ��������������˻��֤�䤤�Ƥ���������
 	�ɤ��⤢�꤬�Ȥ��������ޤ����ʲ��Υե������Ǥ���¤�
 	��������褦�ˤ��Ʋ�������
@@ -104,6 +105,15 @@
       ���� Web �Υե������ץ졼��ƥ����ȤΥ����ɤ���Ф���Τ�
       �Ȥ�ʤ��Ǥ���������</p>
       
+  end comment for disabled PR interface -->
+
+  <!-- When re-enabling the web PR interface, delete the next 2 paragraphs -->
+    <p>���ߡ��㳲���� Web ���󥿥ե������ϵٻ���Ǥ���</p>
+
+    <p>FreeBSD �����ƥ�˥��������Ǥ���Ķ��򤪻����ʤ顢
+      <a href="http://www.FreeBSD.org/cgi/man.cgi?send-pr">send-pr(1)</a>
+      �����Ѥ��ƾ㳲������Ф��뤳�Ȥ��Ǥ��ޤ���</p>
+
       &footer;
   </body>
 </html>
diff --git a/ja/where.sgml b/ja/where.sgml
index 27d30fbc46..3922342752 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.30 2003/04/02 06:26:38 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/where.sgml,v 1.31 2003/07/05 06:03:15 hrs Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.57 -->
+<!-- Original revision: 1.58 -->
 
 <html>
     &header;
@@ -42,9 +42,17 @@
 	
 	<ul>
 	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/alpha/&rel.current;-RELEASE">FreeBSD &rel.current;-RELEASE/alpha</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/alpha/ISO-IMAGES/">FreeBSD ISO-IMAGES/alpha</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/amd64/&rel.current;-RELEASE">FreeBSD &rel.current;-RELEASE/amd64</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/amd64/ISO-IMAGES/">FreeBSD ISO-IMAGES/amd64</a></li>
 	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE">FreeBSD &rel.current;-RELEASE/i386</a></li>
 	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/ISO-IMAGES/">FreeBSD ISO-IMAGES/i386</a></li>
-	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/alpha/ISO-IMAGES/">FreeBSD ISO-IMAGES/alpha</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/ia64/&rel.current;-RELEASE">FreeBSD &rel.current;-RELEASE/ia64</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/ia64/ISO-IMAGES/">FreeBSD ISO-IMAGES/ia64</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/&rel.current;-RELEASE">FreeBSD &rel.current;-RELEASE/pc98</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/ISO-IMAGES/">FreeBSD ISO-IMAGES/pc98</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/sparc64/&rel.current;-RELEASE">FreeBSD &rel.current;-RELEASE/sparc64</a></li>
+	<li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/sparc64/ISO-IMAGES/">FreeBSD ISO-IMAGES/sparc64</a></li>
 	</ul>
       </li>
       
@@ -79,12 +87,26 @@
       ����ѥ���ѤߤΥХ��ʥ�Ǥ���</p>
 
     <ul>
-      <li><a
-	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/-current/packages">FreeBSD-current �Ѥ� packages</a></li>
-      
-      <li><a
-	  href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable">FreeBSD 4-stable �Ѥ� packages</a></li>
-	  
+      <li>FreeBSD-current �Ѥ� packages
+	<ul>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/alpha/packages-current">alpha</a></li>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/amd64/packages-current">amd64</a></li>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-current">i386</a></li>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ia64/packages-current">ia64</a></li>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/sparc64/packages-current">sparc64</a></li>
+	</ul>
+      <li>FreeBSD 4-stable �Ѥ� packages
+	<ul>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/alpha/packages-stable">alpha</a></li>
+	  <li><a
+	     href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-stable">i386</a></li>
+	</ul>
     </ul>
 
     <h3>Ports Collection</h3>