From 0b8db2605eacf32b44131b1cfed7a6a8dfe48d95 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 24 Nov 2001 23:04:00 +0000
Subject: [PATCH] Merge the following from the English version:

	1.3   -> 1.7  	diskless-x/article.sgml
	1.16  -> 1.19 	fonts/article.sgml
	1.8   -> 1.9  	ipsec-must/article.sgml
	1.13  -> 1.20 	multi-os/article.sgml
	1.2   -> 1.5  	zip-drive/article.sgml
---
 ja_JP.eucJP/articles/diskless-x/article.sgml | 40 +++++++++++---------
 ja_JP.eucJP/articles/fonts/article.sgml      | 34 ++++++++---------
 ja_JP.eucJP/articles/ipsec-must/article.sgml |  2 +-
 ja_JP.eucJP/articles/multi-os/article.sgml   | 26 ++++++++-----
 ja_JP.eucJP/articles/zip-drive/article.sgml  | 17 +++++----
 5 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/ja_JP.eucJP/articles/diskless-x/article.sgml b/ja_JP.eucJP/articles/diskless-x/article.sgml
index 56a60d3dca..bcb2066ba9 100644
--- a/ja_JP.eucJP/articles/diskless-x/article.sgml
+++ b/ja_JP.eucJP/articles/diskless-x/article.sgml
@@ -1,13 +1,15 @@
+<!--
+    The FreeBSD Documentation Project
+    The FreeBSD Japanese Documentation Project
+
+    Original revision: 1.7
+    $FreeBSD$
+-->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
 
-<!-- The FreeBSD Documentation Project -->
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.3 -->
-<!-- $FreeBSD: doc/ja_JP.eucJP/articles/diskless-x/article.sgml,v 1.1 2000/03/22 06:31:45 kuriyama Exp $ -->
-
 <!--
 ��:
 ��� μ ryo@azusa.shinshu-u.ac.jp
@@ -20,14 +22,17 @@
     
     <authorgroup>
       <author>
-	<firstname> Jerry</firstname>
+	<firstname>Jerry</firstname>
+
 	<surname>Kendall</surname>
+
 	<affiliation>
 	  <address>
 	    <email>jerry@kcis.com</email>
 	  </address>
 	</affiliation>
-      </author></authorgroup>
+      </author>
+    </authorgroup>
     
     <pubdate>1996/12/28</pubdate>
     
@@ -42,9 +47,9 @@
 	X ü���κ����ˤ�, NFS �ˤ�äƥޥ���Ȥ��줿�Ǿ��Υ桼�ƥ���ƥ������
 	�ǥ�����̵���Υ����ƥ����ʤ��ƤϤʤ�ޤ���Ǥ���.
 	Ʊ����ˡ��Ȥä� 2 �Ĥ��̡��ʥǥ�����̵���Υ����ƥ����ޤ���.
-	����ܤ� <hostid role="fqdn">altair.kcis.com</hostid> �Ǥ�.
+	����ܤ� <hostid role="fqdn">altair.example.com</hostid> �Ǥ�.
 	����� 340M �Υϡ��ɥǥ��������դ��Ƥ��ޤ���, �򴹤���������ޤ���Ǥ���.
-	���Τ���, ���Υޥ���� <hostid role="fqdn">antares.kcis.com</hostid>
+	���Τ���, ���Υޥ���� <hostid role="fqdn">antares.example.com</hostid>
 	���饤�����ͥåȤ��̤��ƥ֡��Ȥ���褦�ˤʤäƤ��ޤ�.
 	2 ���ܤΥ����ƥ�� 486DX2-66 �Ǥ�.
 	�錄����������������ǥ������Τʤ��ǥ�����̵���� FreeBSD �� (������)
@@ -271,17 +276,18 @@ bootps  dgram  udp  wait  root  /usr/libexec/bootpd bootpd /etc/bootptab</progra
 	�錄�������Τ�ΤǤ�.</para>
     </note>
 
-    <para>'/tftpboot' �ǥ��쥯�ȥ�򥵡��Ф˺�������, �����Ф������ӥ���Ԥ�
+    <para><filename>/tftpboot</filename> �ǥ��쥯�ȥ�򥵡��Ф˺�������, �����Ф������ӥ���Ԥ�
       �ǥ�����̵���Υ����ƥ�Τ��������ե�����򤳤Υǥ��쥯�ȥ������Ƥ����ޤ�.
-      �����Υե������ 'cfg.&lt;ip&gt;' �Ȥ���̾���ˤʤäƤ���,
-      &lt;ip&gt; �ϥǥ�����̵�������ƥ�� IP ���ɥ쥹��ɽ���Ƥ��ޤ�.
-      'altair' ������ե������ /tftpbot/cfg.199.246.76.2 �Ȥʤ�ޤ�.
-      ������Ȥϼ��Τ褦�ˤʤäƤ��ޤ�:</para>
+      �����Υե������ <filename>cfg.<replaceable>ip</replaceable></filename>
+      �Ȥ���̾���ˤʤäƤ���, <replaceable>ip</replaceable> 
+      �ϥǥ�����̵�������ƥ�� IP ���ɥ쥹��ɽ���Ƥ��ޤ�.
+      <hostid>altair</hostid> ������ե������ <filename>/tftpboot/cfg.199.246.76.2</filename>
+      �Ȥʤ�ޤ�.  ������Ȥϼ��Τ褦�ˤʤäƤ��ޤ�:</para>
 
     <programlisting>rootfs 199.246.76.1:/DiskLess/rootfs/altair
-hostname altair.kcis.com</programlisting>
+hostname altair.example.com</programlisting>
 
-    <para><literal>hostname altair.kcis.com</literal> �ιԤ�ñ��
+    <para><literal>hostname altair.example.com</literal> �ιԤ�ñ��
       �ǥ�����̵���Υ����ƥब�ɤΤ褦�ʴ����ʥɥᥤ��̾����äƤ���Τ���
       ɽ���Ƥ��ޤ�.</para>
 
@@ -299,7 +305,7 @@ hostname altair.kcis.com</programlisting>
 
     <para>�錄����ͽ���� 386DX-40 �����Ѥ� X ü���Ȥ��ƻ��Ѥ��Ƥ��ޤ�.</para>
 
-    <para>'altair' �γ��ؤϼ����̤�Ǥ�.</para>
+    <para><hostid>altair</hostid> �γ��ؤϼ����̤�Ǥ�.</para>
 
     <literallayout>/
 /bin
diff --git a/ja_JP.eucJP/articles/fonts/article.sgml b/ja_JP.eucJP/articles/fonts/article.sgml
index 25d1401483..3975765769 100644
--- a/ja_JP.eucJP/articles/fonts/article.sgml
+++ b/ja_JP.eucJP/articles/fonts/article.sgml
@@ -3,7 +3,7 @@
     The FreeBSD Japanese Documentation Project
 
     $FreeBSD$
-    Original revision: 1.16
+    Original revision: 1.19
 -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
@@ -29,7 +29,7 @@
 
 <!-- The section "Setting a virtual console to 80x60 line mode" was
      updated to reflect changes in FreeBSD system configuration
-     files by Mark Ovens <mark@ukug.uk.freebsd.org> 27/5/00
+     files by Mark Ovens <mark@ukug.uk.FreeBSD.org> 27/5/00
  -->
 
 <article>
@@ -55,11 +55,11 @@
     <pubdate>1996 ǯ 8 �� 7 �� (��)</pubdate>
 
     <abstract>
-      <para>�����Ǥ� FreeBSD �ˤ����� syscons �ɥ饤��, X11,
-        Ghostscript ������ Groff
-	�����Ѥ��뤳�Ȥ��Ǥ����͡��ʥե���ȥե�����˴ؤ���������Ԥ��ޤ�.
+      <para>�����Ǥ� FreeBSD �� syscons �ɥ饤�Ф� X11,
+        Ghostscript, Groff
+        �����Ѥ��뤳�Ȥ��Ǥ��뤵�ޤ��ޤʥե���ȥե�����ˤĤ����������Ƥ��ޤ�.
 	�ޤ�, syscons �ǥ����ץ쥤�� 80x60 �ԥ⡼�ɤ��ڤ��ؤ�����ˡ��,
-	��ҤΥ��ץꥱ�������ǥ�����1�ե���Ȥ����Ѥ�����ˡ���㼨���ޤ�.</para>
+	��ҤΥ��ץꥱ�������ǥ����� 1 �ե���Ȥ����Ѥ�����ˡ���㼨���ޤ�.</para>
     </abstract>
   </articleinfo>
 
@@ -247,7 +247,7 @@
       <screen>&prompt.user; <userinput>vidcontrol VGA_80x60</userinput></screen>
     </informalexample>
 
-    <para>&man.vi.1; �Ȥ��ä��͡��ʥ����꡼��ظ����͡��ʥץ��������Ф���,
+    <para>&man.vi.1; �Τ褦��, ���ޤ��ޤʥ����꡼��ظ��Υץ��������Ф���,
       ���ߤβ��̥�������ʬ����褦�ˤ��Ƥ����ʤ��ƤϤʤ�ޤ���. ����� 
       <command>ioctl</command> ���̤��� (&man.syscons.4; �ʤɤ�)
       ���󥽡���ɥ饤�Ф˸Ƥӳݤ��뤳�ȤǹԤ��,</para>
@@ -273,7 +273,7 @@
       <filename>.pfb</filename> �����Υե���ȤΤ���������Ѥ��뤳�Ȥ��Ǥ��ޤ�.
       X11 �Ǥ�, �ե���Ȥ� 
       <filename>/usr/X11R6/lib/X11/fonts</filename>
-      �ʲ����͡��ʥ��֥ǥ��쥯�ȥ���֤���Ƥ��ޤ�.
+      �ʲ��Τ��ޤ��ޤʥ��֥ǥ��쥯�ȥ���֤���Ƥ��ޤ�.
       ���줾��Υǥ��쥯�ȥ�ˤ���
       <filename>fonts.dir</filename> �ե���������Ƥˤ�ä�,
       ���줾��Υե���ȤΥե������ X11 
@@ -594,7 +594,7 @@ GS&gt;<userinput>quit</userinput></screen>
       �⤷���ϥץ�󥿤��饢�����������ե���ȥǥ�������������äƤ�����Ϥ��θ¤�ǤϤ���ޤ���).
       �ե�������Ѥκǽ��ʳ��Ȥ���,
       ����������ɲ�ǽ�ʷ����Υե���Ȥ��������ޤ�.
-      �ġ��� <command>pfbtops</> �� (���� : <filename>.pfb</filename> ��������)
+      �ġ��� <command>pfbtops</command> �� (���� : <filename>.pfb</filename> ��������)
       <filename>.pfa</filename> �����Υե���Ȥ��������뤿���, ������,  
       <filename>download</filename> �Ȥ����ե�������Խ���,
       �ե���Ȥ�����̾�򻲾Ȥ���褦���ѹ����ʤ��ƤϤʤ�ޤ���.
@@ -684,7 +684,7 @@ EOF</userinput>
 	    (<filename>.afm</filename>) �ե�����ؤ��Ѵ���Ԥ��ޤ�.</para>
 
 	  <para>�������Ǥ� <ulink
-	      url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf</ulink>
+	      url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/</ulink>.
 	    ��������Ǥ��ޤ�.
 	    ����: �����Υե�����ϥݥ��ȥ�����ץȤˤ��ץ������ʤΤ�,
 	    <keycap>Shift</keycap> �����򲡤��ʤ����󥯤򥯥�å�����
@@ -875,7 +875,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
       <listitem>
         <para>XFree86 4.x �˴ޤޤ�Ƥ��� freetype �⥸�塼��.
 	�ܺ٤� <ulink
-        url="http://www.freebsd.org/ja/handbook/x-fonts.html">FreeBSD
+        url="../../books/handbook/x-fonts.html">FreeBSD
         �ϥ�ɥ֥å�</ulink>�� <ulink
         url="http://www.xfree86.org/4.0.2/fonts.html">XFree86 4.0.2
         Fonts</ulink> �ڡ����򸫤Ƥ�������.</para>
@@ -896,8 +896,8 @@ Converting 3of9.ttf to A.pfa and B.afm.
       <listitem>
 	<para><command>xfstt</command> �� X11 �ѤΤ⤦�ҤȤĤ�
 	  �ե���ȥ����Ф�,
-	  <ulink url=" ftp://sunsite.unc.edu/pub/Linux/X11/fonts">
-	  ftp://sunsite.unc.edu/pub/Linux/X11/fonts</ulink>
+	  <ulink url=" ftp://sunsite.unc.edu/pub/Linux/X11/fonts/">
+	  ftp://sunsite.unc.edu/pub/Linux/X11/fonts/</ulink>
 	  ��������Ǥ��ޤ�.</para>
       </listitem>
 
@@ -906,7 +906,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
 	X �δĶ����� TrueType �ե���ȤΥ��åȤ��� BDF
 	�����Υե���������ΤǤ�.
 	Linux �ѤΥХ��ʥ꤬
-	<ulink url="ftp://crl.nmsu.edu/CLR/multiling/General">
+	<ulink url="ftp://crl.nmsu.edu/CLR/multiling/General/">
 	ftp://crl.nmsu.edu/CLR/multiling /General/</ulink> ����
 	����Ǥ��ޤ�.</para>
       </listitem>
@@ -943,7 +943,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
     <itemizedlist>
       <listitem>
 	<para><ulink
-	    url="ftp://ftp.winsite.com">ftp://ftp.winsite.com</ulink>
+	    url="ftp://ftp.winsite.com/">ftp://ftp.winsite.com/</ulink>
 	  (������ CICA)</para>
       </listitem>
 
@@ -959,12 +959,12 @@ Converting 3of9.ttf to A.pfa and B.afm.
 
       <listitem>
 	<para><ulink
-	    url="http://af-pc-plloyd.ecel.uwa.edu.au/fonts/index.html">http://af-pc-plloyd.ecel.uwa.edu.au/fonts/index.html</ulink></para>
+	    url="http://af-pc-plloyd.ecel.uwa.edu.au/fonts/">http://af-pc-plloyd.ecel.uwa.edu.au/fonts/</ulink></para>
       </listitem>
 
       <listitem>
 	<para><ulink
-	    url="http://www.esselte.com/letraset/index.html">http://www.esselte.com/letraset/index.html</ulink></para>
+	    url="http://www.esselte.com/letraset/">http://www.esselte.com/letraset/</ulink></para>
       </listitem>
 
       <listitem>
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.sgml b/ja_JP.eucJP/articles/ipsec-must/article.sgml
index d382c34527..917944c7ca 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.sgml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.sgml
@@ -3,7 +3,7 @@
     The FreeBSD Japanese Documentation Project
 
     $FreeBSD$
-    Original revision: 1.8
+    Original revision: 1.9
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
diff --git a/ja_JP.eucJP/articles/multi-os/article.sgml b/ja_JP.eucJP/articles/multi-os/article.sgml
index 0f92d4ccf5..4b3bcd4e7c 100644
--- a/ja_JP.eucJP/articles/multi-os/article.sgml
+++ b/ja_JP.eucJP/articles/multi-os/article.sgml
@@ -1,6 +1,10 @@
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.13 -->
-<!-- $FreeBSD: doc/ja_JP.eucJP/articles/multi-os/article.sgml,v 1.2 2000/09/27 18:26:13 hrs Exp $ -->
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD Japanese Documentation Project
+
+     Original revision: 1.20
+     $FreeBSD$
+-->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
 <article>
   <articleinfo>
@@ -52,8 +56,8 @@
       �ϡ��ɥǥ������Υѡ��ƥ�����������ڤ�ľ����,
       ��¸�Υѡ��ƥ������ˤ���ǡ�����������Ȥˤʤ꤫�ͤޤ���.
       ������, �ϡ��ɥǥ������������� DOS �������Ƥ���褦�Ǥ����,
-      (FreeBSD CD-ROM ����� <filename>\TOOLS</filename> �ǥ��쥯�ȥ�,
-      ���뤤�� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp
+      (FreeBSD CDROM ����� <filename>\TOOLS</filename> �ǥ��쥯�ȥ�,
+      ���뤤�� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp
       </ulink> ��������Ǥ���) FIPS �桼�ƥ���ƥ������Ω�Ĥ��ȤǤ��礦.
       ���Υġ����Ȥ���, �ǡ������˲����뤳�Ȥʤ��ϡ��ɥǥ�������
       �ѡ��ƥ��������ڤ�ľ�����Ȥ��Ǥ��ޤ�.
@@ -114,7 +118,7 @@
 	    ���Υץ������Υ١����ǤǤ�,
             �������륭�����Ѥ��Ƶ�ư���� OS �����򤹤뤳�Ȥ��Ǥ��ޤ�.
 	    �����, FreeBSD CD-ROM �� <filename>\TOOLS</filename> �ǥ��쥯�ȥ�,
-	    ���뤤�� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">
+	    ���뤤�� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">
 	      ftp</ulink> �˼�Ͽ����Ƥ��ޤ�.</para>
 	</listitem>
       </varlistentry>
@@ -222,8 +226,7 @@
           �桼�ƥ���ƥ��Ǹ������,
 	  �ϡ��ɥɥ饤�֤ϼ��Τ褦�˸����Ƥ���Ϥ��Ǥ�.
 
-	  <screen>
----------------------------------------------------------------------
+	  <screen>---------------------------------------------------------------------
 
                   �ΰ�����ɽ��
 
@@ -302,8 +305,8 @@ D: 1         A    PRI DOS                    420     FAT**    60%
     <para>BSD �����ƥब¸�ߤ��Ƥ���Ȥ�����
       Windows 95 ��ܤ����, MBR ��<quote>�˲�</quote>����Ƥ��ޤ��ޤ�.
       ���Τ���, �֡��ȥޥ͡�����κƥ��󥹥ȡ��뤬ɬ�פˤʤ�ޤ�.
-      Boot Easy ��, CD-ROM �� \TOOLS �ǥ��쥯�ȥꤢ�뤤��
-      <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools">ftp</ulink>
+      Boot Easy ��, CDROM �� \TOOLS �ǥ��쥯�ȥꤢ�뤤��
+      <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/">ftp</ulink>
       �����Ȥ˴ޤޤ�� BOOTINST.EXE �桼�ƥ���ƥ����Ѥ���,
       �ƥ��󥹥ȡ��뤹�뤳�Ȥ���ǽ�Ǥ�.
       �ޤ�, ���󥹥ȡ���Υѡ��ƥ�����󥨥ǥ�����Ȥä�
@@ -387,10 +390,13 @@ D: 1         A    PRI DOS                    420     FAT**    60%
       �����, <ulink URL="http://www.in.net/~jkatz/win95/Linux-HOWTO.html">Linux-HOWTO</ulink>
       �Ȥ��������Ȥ⤢��ޤ�.</para>
 
+<![ IGNORE [
+<!-- dead link -->
     <para><ulink URL="http://www.dorsai.org/~dcl/publications/NTLDR_Hacking">NT
 	Loader Hacking Guide</ulink> �ˤ�,
       Windows NT, Windows 95, DOS ��, ¾�� OS
       �ȥޥ���֡��Ȥ�����ˡ�ˤĤ��Ƥξ��󤬽񤫤�Ƥ��ޤ�.</para>
+]]>
 
     <para>Hale Landis �� "How It Works(ư��λ��Ȥ�)" �ɥ�����Ƚ��ˤ�,
       ���������Υǥ�����������ȥ�����, ��ư�˴ؤ�����󤬴ޤޤ�Ƥ��ޤ�.
diff --git a/ja_JP.eucJP/articles/zip-drive/article.sgml b/ja_JP.eucJP/articles/zip-drive/article.sgml
index fe36840d84..52f6870539 100644
--- a/ja_JP.eucJP/articles/zip-drive/article.sgml
+++ b/ja_JP.eucJP/articles/zip-drive/article.sgml
@@ -1,17 +1,18 @@
-<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.2 -->
-<!-- $FreeBSD: doc/ja_JP.eucJP/articles/zip-drive/article.sgml,v 1.1 2000/08/28 21:35:36 hrs Exp $ -->
-
 <!--
-��:
-���� �μ� otemachi@osaka.interq.or.jp
--->
+    The FreeBSD Documentation Project
+    The FreeBSD Japanese Documentation Project
 
+    Original revision: 1.5
+    $FreeBSD$
+-->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 ]>
-
+<!--
+��:
+���� �μ� otemachi@osaka.interq.or.jp
+-->
 <article>
   <articleinfo>
     <title>ZIP�ɥ饤��</title>