diff --git a/ja_JP.eucJP/articles/contributing/article.sgml b/ja_JP.eucJP/articles/contributing/article.sgml
index 914499e59c..2cfd57c6f1 100644
--- a/ja_JP.eucJP/articles/contributing/article.sgml
+++ b/ja_JP.eucJP/articles/contributing/article.sgml
@@ -1,3 +1,11 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+<!ENTITY % not.published "IGNORE">
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -5,18 +13,11 @@
      Original revision: 1.510
      $FreeBSD$
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY % not.published "IGNORE">
-]>
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD �ؤι׸�</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <para>����ʸ��ϡ��Ŀͤ����Τ� FreeBSD
 	�ץ��������Ȥ˹׸����뤿��Τ����Ĥ�����ˡ�ˤĤ����������Ƥ��ޤ���</para>
@@ -36,6 +37,9 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <!-- <para><emphasis>��: &a.jp.iwasaki;,
@@ -194,7 +198,7 @@
 	  <para>&posix; �Τ褦�ʸ���ɸ��μ̤������ꤷ�Ƥ���������
 	    <ulink
 	      url="&url.base;/projects/c99/index.html">FreeBSD
-	      C99 & POSIX ɸ��Ŭ��ץ���������</ulink>�Υ����֥����Ȥˡ�
+	      C99 &amp; POSIX ɸ��Ŭ��ץ���������</ulink>�Υ����֥����Ȥˡ�
 	    �������ä�ɸ��ؤΥ�󥯤������Ĥ�����ޤ���
 	    FreeBSD �ε�ư��ɸ�ब�׵᤹���Τ���Ӥ��Ƥ�����������ư���ۤʤ��硢
 	    �äˤ��줬���ͤμ���­��ʤ��ä���ʬ����ˤ����٤�����ʬ�ʤ顢
@@ -294,7 +298,7 @@
 	ï�����˥Х��������դ��Ƥ�餦�褦�����ͤƤ���������</para>
 
       <para>�ɤ��㳲�������ˡ�ˤĤ��Ƥ�<ulink
-	URL="&url.articles.problem-reports;/article.html">����ʸ��</ulink
+	url="&url.articles.problem-reports;/article.html">����ʸ��</ulink
 	>��������������</para>
     </sect2>
 
@@ -431,9 +435,11 @@
 	    ����񤹤뵤�ˤʤä����ȴط��Ԥˤ�뻲�ä��Ѷ�Ū�˾��夷�ޤ���</para>
 	</listitem>
 
-  <indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm>
-  <indexterm><primary>GNU General Public License</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm>
+
+	  <indexterm><primary>GNU General Public License</primary></indexterm>
+
 	  <para>GNU���̸�ͭ���ѵ������ޤ��� <quote>GPL</quote>��
 	    ���Υ饤���󥹤ϥ����ɤ�����Ū�˻��Ѥ������;ʬ�����Ϥ������뤿�ᡢ
 	    �䤿���ˤ��ޤ�ɾȽ���ɤ��Ȥ����櫓�ǤϤ���ޤ��󡣤�������
diff --git a/ja_JP.eucJP/articles/contributors/article.sgml b/ja_JP.eucJP/articles/contributors/article.sgml
index 6a38833981..f3d5344dd1 100644
--- a/ja_JP.eucJP/articles/contributors/article.sgml
+++ b/ja_JP.eucJP/articles/contributors/article.sgml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+<!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
+%contrib.ent;
+<!ENTITY % not.published "IGNORE">
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -5,26 +15,21 @@
      Original revision: 1.446
      $FreeBSD$
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
-%contrib.ent;
-<!ENTITY % not.published "IGNORE">
-]>
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD �ؤι׸���</title>
     
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.cvsup;
       &tm-attrib.sun;
       &tm-attrib.general;
     </legalnotice>
+ 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
     <abstract>
       <para>����ʸ��� FreeBSD �˹׸������Ŀͤ��ȿ����󵭤�����ΤǤ���</para>
@@ -50,7 +55,7 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para>&a.mbarkah
+	    <para>&a.mbarkah;
 	      ���������
               <ulink url="http://www.hemi.com/">Hemisphere Online</ulink>
 	      �ϡ�<emphasis>Pentium Pro (P6) 200MHz CPU</emphasis>
diff --git a/ja_JP.eucJP/articles/dialup-firewall/article.sgml b/ja_JP.eucJP/articles/dialup-firewall/article.sgml
index 3dc8881f0d..f96b4e90fb 100644
--- a/ja_JP.eucJP/articles/dialup-firewall/article.sgml
+++ b/ja_JP.eucJP/articles/dialup-firewall/article.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -11,12 +18,7 @@
 ���� rushani@bl.mmtr.or.jp
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD �ˤ��������륢�å׼��ե�������������ι���</title>
 
@@ -31,13 +33,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.general;
     </legalnotice>
 
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>
         ���ε����� FreeBSD �� PPP �������륢�åפ� IPFW
diff --git a/ja_JP.eucJP/articles/diskless-x/article.sgml b/ja_JP.eucJP/articles/diskless-x/article.sgml
index 0e17c6a3c5..939f181be5 100644
--- a/ja_JP.eucJP/articles/diskless-x/article.sgml
+++ b/ja_JP.eucJP/articles/diskless-x/article.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
     The FreeBSD Documentation Project
     The FreeBSD Japanese Documentation Project
@@ -5,10 +12,6 @@
     Original revision: 1.17
     $FreeBSD$
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
 <!--
 ��:
@@ -16,7 +19,7 @@
 ��¼ ���� sugimura@jp.FreeBSD.org
 -->
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>�ǥ�����̵���� X ������: ��ĤΥ�����</title>
     
@@ -48,6 +51,8 @@
       &tm-attrib.sun;
       &tm-attrib.general;
     </legalnotice>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
     <abstract>
       <para>FreeBSD-hackers �᡼��󥰥ꥹ�Ȥ�ͧ�ͤ����ν����ˤ�äơ�
@@ -160,7 +165,7 @@ nb8390.com
       <filename>nb8390.com</filename> ��¹Ԥ��ޤ���</para>
     
     <screen><prompt>C:&gt;</prompt> <userinput>cd \netboot</userinput>
-<prompt>C:&gt</prompt> <userinput>nb8390</userinput>
+<prompt>C:&gt;</prompt> <userinput>nb8390</userinput>
 
 <prompt>Boot from Network (Y/N) ?</prompt>  <userinput>Y</userinput>
 
@@ -202,7 +207,7 @@ Searching for server...</screen>
 bootps  dgram  udp  wait  root  /usr/libexec/bootpd bootpd /etc/bootptab</programlisting>
     
     <para>�⤷ <filename>/etc/inetd.conf</filename> �ե�������ѹ������Ȥ��ˤϡ�
-      &man.inetd.8 �� <literal>HUP</literal> �����ʥ�����äƤ���������
+      &man.inetd.8; �� <literal>HUP</literal> �����ʥ�����äƤ���������
       ����򤹤�ˤϡ�<command>inetd</command> �Υץ����� ID ��
       <command>ps -ax | grep inetd | grep -v grep</command> ����
       �������Ƥ����������ץ����� ID ���狼�ä��顢
@@ -369,7 +374,7 @@ export PATH
 # NFS �� /usr �ե����륷���ƥ��ޥ���Ȥ���
 /sbin/mount antares:/DiskLess/usr /usr
 #
-/usr/X11R6/bin/XF86_SVGA -query antares -xf86config /etc/XF86Config.altair > /dev/null 2>&1
+/usr/X11R6/bin/XF86_SVGA -query antares -xf86config /etc/XF86Config.altair > /dev/null 2&gt;&amp;1
 #
 # X ��λ����ȺƵ�ư
 /sbin/reboot
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
index bf98f0fab4..cad3277948 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
@@ -1,14 +1,17 @@
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
 <!ENTITY scratch.ap "<application>FreeBSD �򥼥��������ꤹ��</application>">
+]>
+
 <!--
   $FreeBSD$
   Original revision: 1.11
 -->
-]>
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD �򥼥��������ꤹ��ˤ�</title>
 
@@ -26,13 +29,15 @@
       <holder>Jens Schweikhardt</holder>
     </copyright>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.adobe;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
     <abstract>
@@ -427,7 +432,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
         �ǥХ���̾���ѹ������տ����ԤʤäƤ���������</para>
     </warning>
 
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" format="linespecific"/></programlisting>
 
     <para>�����������: <ulink
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -533,7 +538,7 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
       <filename>LOGDIR/category+port</filename>
       �Ȥ���̾���Υ����ե����뤬��������ޤ���</para>
 
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" format="linespecific"/></programlisting>
 
      <para>�����������: <ulink
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -624,7 +629,7 @@ Creating bzip'd tar ball in '/usr/ports/editors/staroffice52/staroffice-5.2_1.tb
       <application>make</application> �롼���ȤäƷ�̤���Ӥ��Ƥ��ޤ���
       ���Ȥ��С�<application>apache</application> ��
       <filename>httpd.conf</filename> �Ǥ���С����Τ褦��
-      <command>config_apache</command> �Ȥ����������åȤ��Ѱդ��Ƥ����ޤ���
+      <command>config_apache</command> �Ȥ����������åȤ��Ѱդ��Ƥ����ޤ���</para>
 
 <programlisting>
 @if ! cmp -s /usr/local/etc/apache2/httpd.conf httpd.conf; then \
@@ -669,7 +674,7 @@ fi
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>
       ������ץȤǤ������Ƥ��ѹ�����ɬ�פϤʤ��Ǥ��礦��</para>
 
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" format="linespecific"/></programlisting>
 
     <para>�����������: <ulink
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -678,7 +683,7 @@ fi
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>
       ������ץȤǤ����ǽ����ʬ�ˤ����ѿ����ѹ����ޤ��礦��</para>
 
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" format="linespecific"/></programlisting>
 
     <para>�����������: <ulink
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -687,7 +692,7 @@ fi
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink> �Ǥ���
       �����ưŪ�ˤ����ʤ�����μ��򡢤���������ޤ���</para>
 
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" format="linespecific"></programlisting>
+<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" format="linespecific"/></programlisting>
 
     <para>�����������: <ulink
         url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ja_JP.eucJP/articles/fonts/article.sgml b/ja_JP.eucJP/articles/fonts/article.sgml
index 5dfaae73b9..8cf05428de 100644
--- a/ja_JP.eucJP/articles/fonts/article.sgml
+++ b/ja_JP.eucJP/articles/fonts/article.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
     The FreeBSD Documentation Project
     The FreeBSD Japanese Documentation Project
@@ -5,10 +12,6 @@
     $FreeBSD$
     Original revision: 1.30
 -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
 <!-- Recently, I wanted to figure out how to use some additional fonts that
      I had accumulated.  I finally figured out *how to do it* from the various
@@ -32,7 +35,7 @@
      files by Mark Ovens <mark@ukug.uk.FreeBSD.org> 27/5/00
  -->
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>�ե���Ȥ� FreeBSD</title>
 
@@ -64,6 +67,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>�����Ǥ� FreeBSD �� syscons �ɥ饤�Ф�
 	<application>X11</application>, <application>Ghostscript</application>,
@@ -411,9 +416,9 @@ end readonly def
 	<term>���� (slant)</term>
 
 	<listitem>
-	  <para><emphasis remap=bf>r</emphasis>oman (�����ޥ���)��<emphasis
-	      remap=bf>i</emphasis>talic (��������)��<emphasis
-	      remap=bf>o</emphasis>blique (�л���) �ʤɤ�����ޤ���
+	  <para><emphasis remap="bf">r</emphasis>oman (�����ޥ���)��<emphasis
+	      remap="bf">i</emphasis>talic (��������)��<emphasis
+	      remap="bf">o</emphasis>blique (�л���) �ʤɤ�����ޤ���
 	    <emphasis>ItalicAngle</emphasis> ��0�ˤʤäƤ��뤳�Ȥˤ�ꡢ
 	    <emphasis>roman</emphasis> ��ȤäƤ��ޤ���</para>
 	</listitem>
@@ -595,7 +600,7 @@ GS&gt;<userinput>quit</userinput></screen>
       �ե���Ȼ�����ˡ���³���뤳�Ȥˤ��ޤ��礦��</para>
 
     <informalexample>
-      <screen><lineannotation><filename>.afm</filename> �ե������¿���� Mac ����&hellip ���ʤ���Ԥ� ^M �Ƕ��ڤ��Ƥ��ޤ���
+      <screen><lineannotation><filename>.afm</filename> �ե������¿���� Mac ����&hellip; ���ʤ���Ԥ� ^M �Ƕ��ڤ��Ƥ��ޤ���
 �����Ԥ� ^J �Ƕ��ڤ� &unix; ����������Ѵ�����ɬ�פ�����ޤ���</lineannotation>
 &prompt.user; <userinput>cd /tmp</userinput>
 &prompt.user; <userinput>cat /usr/local/share/fonts/type1/showboat.afm |
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.sgml b/ja_JP.eucJP/articles/ipsec-must/article.sgml
index ce8b9b249f..13f11e6401 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.sgml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
     The FreeBSD Documentation Project
     The FreeBSD Japanese Documentation Project
@@ -5,12 +12,8 @@
     $FreeBSD$
     Original revision: 1.15
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD �� IPsec ��ǽ����Ω���ڤ���ˤ�</title>
 
@@ -31,6 +34,8 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>IPsec �򥤥󥹥ȡ��뤷������
         ���줬�������ư��Ƥ��뤫�ɤ���Ĵ�٤�ˤϤɤ��������ɤ��Ǥ��礦?
@@ -302,7 +307,7 @@ char **argv;
     iproduct = 1;
 
     if (run)
-      for (i = Q; run && i &lt; Q + K; i++) {
+      for (i = Q; run &amp;&amp; i &lt; Q + K; i++) {
         j = i;
         b = fgetc(fptr);
 
diff --git a/ja_JP.eucJP/articles/multi-os/article.sgml b/ja_JP.eucJP/articles/multi-os/article.sgml
index 6fa55825e5..91e8bfde02 100644
--- a/ja_JP.eucJP/articles/multi-os/article.sgml
+++ b/ja_JP.eucJP/articles/multi-os/article.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -5,11 +12,8 @@
      Original revision: 1.39
      $FreeBSD$
 -->
-<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
-<article>
+
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD ��¾�� OS ��¸������ˤ�</title>
 
@@ -38,9 +42,11 @@
       &tm-attrib.general;
     </legalnotice>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <abstract>
       <para>
-	�����Ǥϡ�FreeBSD �� (Linux��&ms-dos;��&os2��&windows; 95 �ʤ�)
+	�����Ǥϡ�FreeBSD �� (Linux��&ms-dos;��&os;2��&windows; 95 �ʤ�)
 	�͵��Τ���¾�� OS �Ȥ��ޤ�Ʊ�蘆������ˡ�ˤĤ����������ޤ���
 	����ʸ�Ϥ�񤯤ˤ����ꡢ
 	Annelise Anderson <email>andrsn@stanford.edu</email>��
@@ -58,7 +64,7 @@
       EIDE �ɥ饤�֤˴ؤ��뵭�Ҥ�ޤޤ�Ƥ��ޤ���
       ʣ���� OS ��Ʊ�蘆�����硢�ϡ��ɥǥ������������
       OS ���ȹ礻�Ȥ����Τ����ˤ������󤢤�ޤ�����
-      �����餯 <xref linkend="ch5"> ���Ǥ����Ω�ľϤǤ��礦��
+      �����餯 <xref linkend="ch5"/> ���Ǥ����Ω�ľϤǤ��礦��
       ���ξϤˤϡ�ʣ���� OS ����Ѥ��뤿����ä�ɬ�פ�
       ����ԥ塼������ˤĤ��Ƥξܺ٤��񤫤�Ƥ��ޤ���</para>
 
@@ -206,7 +212,7 @@
           ���٤Ƥ� Linux �ǥ����ȥ�ӥ塼�����ˤĤ��Ƴ�ǧ�����櫓�ǤϤ���ޤ��󤬡�
 	  ���ʤ��Ȥ�
 	  <ulink url="http://www.slackware.com">Slackware</ulink>
-	  �ˤ� LILO (<xref linkend="ch2"> ����)
+	  �ˤ� LILO (<xref linkend="ch2"/> ����)
 	  ���ޤޤ�Ƥ��ޤ���Linux �� <command>fdisk</command>
           ���ޥ�ɤ�Ȥäơ��ϡ��ɥǥ��������ڤ�ʬ����Ȥ����顢
           �錄���ξ��Ϻǽ�Υɥ饤�� (�롼�ȥѡ��ƥ������ȥ���å�
@@ -274,7 +280,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
 
 	  ��) �ǿ��� OEM SR2 �򤪻Ȥ��ξ��ϡ�
           ** ����ʬ�� FAT16��FAT32 ��ɽ������뤳�Ȥ�����ޤ���
-	  �ܤ����� <xref linkend="ch2"> ������������</para>
+	  �ܤ����� <xref linkend="ch2"/> ������������</para>
       </step>
 
       <step>
@@ -284,7 +290,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
 	  �����Ǥʤ����ϡ�
 	  ��ư����Ŭ�ڤʥǥ�����������ȥ��������Ϥ��ʤ���Фʤ�ޤ���
 	  (������ȥ���������ˤϡ�&windows; 95 ��ư����
-	  Microsoft Diagnostics (<filename>MSD.EXE</>) ��Ĵ�٤뤫��
+	  Microsoft Diagnostics (<filename>MSD.EXE</filename>) ��Ĵ�٤뤫��
 	  BIOS �ε�ǽ�ǥ����å����Ʋ�����)��
 	  �����ǤΥѥ�᡼�� <literal>hd0=1416,16,63</literal> �ϡ�
 	  <replaceable>1416</replaceable> �ϥϡ��ɥǥ������Υ��������Ǥ��ꡢ
@@ -338,7 +344,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
     <para>&os2; �� FAT��HPFS �ѡ��ƥ�������ǧ�����ޤ�����
       FFS (FreeBSD)��EXT2 (Linux) �ѡ��ƥ�������ǧ�����ʤ����Ȥ�Ф��Ƥ����Ʋ�������
       Ʊ�ͤˡ�&windows; 95 �ϡ�FAT �� FAT32
-      �ѡ��ƥ�����󤷤��ɤ߽񤭤��뤳�Ȥ��Ǥ��ޤ��� (<xref linkend="ch2"> �򻲾�)��
+      �ѡ��ƥ�����󤷤��ɤ߽񤭤��뤳�Ȥ��Ǥ��ޤ��� (<xref linkend="ch2"/> �򻲾�)��
       FreeBSD �ϡ� �ۤȤ�ɤΥե����륷���ƥ���ɤळ�Ȥ��Ǥ��ޤ�����
       �������� HPFS �ѡ��ƥ��������ɤ߹��ߤˤ��б����Ƥ��ޤ���
       Linux �Ǥϡ�HPFS �ѡ��ƥ��������ɤळ�Ȥ��Ǥ��ޤ�����
@@ -363,7 +369,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
       Boot Easy ��˥塼�� <literal>DOS</literal> �Ȥ�����ʬ���ǧ���Ʋ�������
       ���줬 &windows; 95 �ˤʤ�ޤ���
       �⤷��FreeBSD �θ�� &windows; 95 ��ܤ��Ƥ��ޤä����ϡ�
-      �嵭�� <xref linkend="ch4"> ���ɤ�Dz�������
+      �嵭�� <xref linkend="ch4"/> ���ɤ�Dz�������
       �������Υϡ��ɥǥ������� 1024 ��������ۤ��ʤ����ϡ�
       ��ư��������Ϥ���ޤ���
       �ѡ��ƥ������Τ��� 1 �ĤǤ� 1024 ��ۤ�����Τ����ꡢ
@@ -389,7 +395,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
       ξ���� OS ��ư����Τˡ�Boot Easy ��Ȥ����Ȥ�Ǥ��ޤ���</para>
 
     <para>FreeBSD + Linux + &windows; 95:
-      (<xref linkend="ch3"> �򻲾�)</para>
+      (<xref linkend="ch3"/> �򻲾�)</para>
   </sect1>
 
   <sect1 id="sources">
@@ -468,7 +474,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
       
       <informalexample>
         <para>(3148 ������) &times; (16 �إå�) &times; (63
-          ������/�ȥ�å�) &times (512 �Х���/������)</para>
+          ������/�ȥ�å�) &times; (512 �Х���/������)</para>
       </informalexample>
 
       <para>�����׻������ 1,624,670,208 �Х��ȡ�
@@ -481,7 +487,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
 	Ĵ�٤뤳�Ȥ��Ǥ��ޤ��������餯�ϡ��ɥǥ��������Τˤ⡢
         �������ä�������°���Ƥ���Ǥ��礦��
 	���������դ����ߤ����ΤǤ�����BIOS LBA
-        (<xref linkend="limits"> ����)
+        (<xref linkend="limits"/> ����)
         ����Ѥ��Ƥ����硢
         ʪ��Ū�ʥ�����ȥ��������뤿��Υץ������Ϥɤ�ʤ�ΤǤ��ɤ���
         �Ȥ����櫓�ǤϤ���ޤ���
@@ -509,7 +515,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
 	��������Ω�ľ������Ǥ⡢
         Hale Landis �� <citetitle>How It Works (ư��λ��Ȥ�)</citetitle>
 	�ɥ�����Ƚ��ϻ��ͤˤʤ�ޤ������Υɥ�����Ƚ��˴ؤ��Ƥ�
-	<xref linkend="sources"> �ξϤ򻲾Ȥ��Ƥ���������
+	<xref linkend="sources"/> �ξϤ򻲾Ȥ��Ƥ���������
       </para>
 
       <para>�⤦�Ѹ�ˤĤ��ƤϽ�ʬ�Ǥ��͡�
@@ -539,7 +545,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
         ������ޤ����ѡ��ƥ������ ID �ϡ��ѡ��ƥ������μ���
 	(�ɤ� OS ����Ѥ��Ƥ��뤫) ��
 	���ϰ���/��λ���� �ϥѡ��ƥ������ΰ��֤򼨤��ޤ���
-	<xref linkend="tbl-pid"> �ˡ�
+	<xref linkend="tbl-pid"/> �ˡ�
           �ɤ��Ȥ���ѡ��ƥ������ ID �Υꥹ�Ȥ򼨤��ޤ���</para>
 
       <table id="tbl-pid">
@@ -741,7 +747,7 @@ D: 1         A    PRI DOS                    420     FAT**    60%
 
 	<para>(MBR �Τ���) �ޥ������֡��ȥ�������
 	  �ѡ��ƥ������ư����������ư�ץ����� �ˤĤ��Ƥ�
-	  <xref linkend="booting"> ���������ɤ����ϡ�
+	  <xref linkend="booting"/> ���������ɤ����ϡ�
 	  ��ʬ�Υϡ��ɥǥ������Τɤ��ˡ�
 	  ���ε��Τ����֡��ȥޥ͡����㤬¸�ߤ���Τ����ˤʤ�Ȥ����Ǥ��͡�
 	  ����Ϥȸ����ޤ��ȡ������Ĥ��Υ֡��ȥޥ͡�����ϡ�
diff --git a/ja_JP.eucJP/articles/problem-reports/article.sgml b/ja_JP.eucJP/articles/problem-reports/article.sgml
index 1c5ee69614..0481b5d2b2 100644
--- a/ja_JP.eucJP/articles/problem-reports/article.sgml
+++ b/ja_JP.eucJP/articles/problem-reports/article.sgml
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
    The FreeBSD Japanese Documentation Project
    Original revision: 1.23
    $FreeBSD$
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>FreeBSD �㳲���ν���</title>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <abstract>
       <para>���ε����Ǥϡ����Ƥʾ㳲��� (Problem Report: PR) ��
 	FreeBSD �ץ��������Ȥ���Ф�����ˡ����⤷�ޤ���</para>
@@ -26,6 +27,10 @@
 	<contrib>���: </contrib>
       </author>
     </authorgroup>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <indexterm><primary>�㳲���</primary></indexterm>
@@ -153,12 +158,12 @@
       <listitem>
 	<para>
 	  <ulink
-	    URL="../../books/handbook/eresources.html#ERESOURCES-MAIL">
+	    url="../../books/handbook/eresources.html#ERESOURCES-MAIL">
 	    �᡼��󥰥ꥹ��</ulink>�����Ѥ��롣
 	  &mdash; �᡼��󥰥ꥹ�Ȥ���ɤ��Ƥ��ʤ���С�
 	  FreeBSD �Υ����֥����Ȥˤ���
 	  <ulink
-	    URL="http://www.FreeBSD.org/ja/search/search.html#mailinglists">
+	    url="http://www.FreeBSD.org/ja/search/search.html#mailinglists">
 	    ���������ָ���</ulink>��ȤäƤ���������
 	  �⤷���᡼��󥰥ꥹ�Ȥǵ���������Ƥ��ʤ���С�
 	  ��ʬ������ˤĤ��ƤΥ�å����������äƤߤơ�
diff --git a/ja_JP.eucJP/articles/zip-drive/article.sgml b/ja_JP.eucJP/articles/zip-drive/article.sgml
index 407939d640..0321ceda00 100644
--- a/ja_JP.eucJP/articles/zip-drive/article.sgml
+++ b/ja_JP.eucJP/articles/zip-drive/article.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
     The FreeBSD Documentation Project
     The FreeBSD Japanese Documentation Project
@@ -5,15 +12,11 @@
     Original revision: 1.15
     $FreeBSD$
 -->
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-]>
 <!--
 ��:
 ���� �μ� otemachi@osaka.interq.or.jp
 -->
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>&iomegazip; �ɥ饤��</title>
 
@@ -36,6 +39,10 @@
       &tm-attrib.opengroup;
       &tm-attrib.general;
     </legalnotice>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </articleinfo>
 
   <sect1>
@@ -276,7 +283,7 @@ SCSI-2 Device</programlisting>
 
 	<screen>&prompt.root; <userinput>/usr/sbin/config MYKERNEL</userinput>
 &prompt.root; <userinput>cd ../../compile/MYKERNEL</userinput>	
-&prompt.root; <userinput>make clean depend && make all 
+&prompt.root; <userinput>make clean depend &amp;&amp; make all 
 install</userinput></screen>
       </listitem>
     </orderedlist>
diff --git a/ja_JP.eucJP/books/design-44bsd/book.sgml b/ja_JP.eucJP/books/design-44bsd/book.sgml
index e9823e611e..83e44acb5a 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.sgml
+++ b/ja_JP.eucJP/books/design-44bsd/book.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -6,12 +13,7 @@
      $FreeBSD$
 -->
 
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
-]>
-
-<book>
+<book lang='ja'>
   <bookinfo>
     <title>4.4BSD ���ڥ졼�ƥ��󥰥����ƥ���߷פȼ���</title>
     
@@ -44,6 +46,8 @@
       <year>1996</year>
       <holder>Addison-Wesley Longman, Inc</holder>
     </copyright>
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
     
 <!-- I seem to recall the editor wanting this notice to be bold.  In html, I'd
      use the _strong_ tag.  What should I use instead? -->
@@ -69,7 +73,7 @@
 
       <para>����ʸ������ܸ첽�� FreeBSD
         ���ܸ�ɥ�����ơ������ץ��������Ȥˤ�äƹԤʤ��ޤ�����
-        ���ܸ첽�ξܺ٤�<xref linkend="jacknowledgement">�򻲾Ȥ��Ƥ���������</para>
+        ���ܸ첽�ξܺ٤�<xref linkend="jacknowledgement"/>�򻲾Ȥ��Ƥ���������</para>
 
       <para>The second chapter of the book,  <citetitle>The Design and
           Implementation of the 4.4BSD Operating System</citetitle> is
@@ -176,13 +180,13 @@
           ���եȥ������ξ����ʳˤȤʤ���ʬ�Τ��ȤǤ���
 	  Ʊ����Υ��ڥ졼�ƥ��󥰥����ƥ�θ��桢���Ȥ���
 	  Chorus
-	  <xref linkend="biblio-rozier">,
+	  <xref linkend="biblio-rozier"/>,
 	  Mach
-	  <xref linkend="biblio-accetta">,
+	  <xref linkend="biblio-accetta"/>,
 	  Tunis
-	  <xref linkend="biblio-ewens">,
+	  <xref linkend="biblio-ewens"/>,
 	  V Kernel
-	  <xref linkend="biblio-cheriton"> �Ǥϡ�
+	  <xref linkend="biblio-cheriton"/> �Ǥϡ�
 	  ���Υ����ͥ�Ȥ�����ǽ�ˤ���ʬ�������������Ū��ʣ����ʬ�����Ƥ��ޤ���
 	  �ե����륷���ƥ��ͥåȥ���ץ��ȥ���Ȥ��ä������ӥ��ϡ�
 	  ���γˤ⤷���ϥ����ͥ���Ф��륯�饤����ȥ��ץꥱ�������ץ������Ȥ���
@@ -193,7 +197,7 @@
 	  Ken Thompson �ˤ�äƹԤ�줿���� 2 �Ĥμ����Ǥ�
 	  ����ޥåԥ󥰤��ʤ���
 	  �桼������ӥ����ͥ���֤ϥϡ��ɥ������ˤ��ʬΥ���Ԥʤ��Ƥ��ޤ���Ǥ���
-	  <xref linkend="biblio-ritchie">��
+	  <xref linkend="biblio-ritchie"/>��
 	  ��å�������ã�����ƥ�ϡ�
           �ºݤ˼������줿�����ͥ�ȥ桼���ץ������Υ�ǥ��
           Ʊ�����餤�ưפ˼������뤳�Ȥ���ǽ�Ǥ�����
@@ -523,13 +527,13 @@
 	</tgroup>
       </table>
       
-      <para><xref linkend="table-mach-indep"> ��
+      <para><xref linkend="table-mach-indep"/> ��
         HP300 �� 4.4BSD �����ͥ�������륽�եȥ������Τ�����
         �������¸����ʬ��ޤȤ᤿��ΤǤ���
         2 ���ܤο��ͤ� C ����Υ����������ɡ��إå��ե����롢������
 	������֥����Τ�Τ�ɽ���Ƥ��ꡢ
         ������֥����Τ�Τ� 2% �ʲ���������ޤ���
-	�ޤ���<xref linkend="table-mach-dep"> �����פ������Ƥ���褦�ˡ�
+	�ޤ���<xref linkend="table-mach-dep"/> �����פ������Ƥ���褦�ˡ�
 	�����¸�Υ��եȥ������ϡ�HP/UX ��ǥХ������ݡ��Ȥ�����ơ�
 	�����ͥ�Τ����鷺���� 6.9% ��������ޤ���</para>
       
@@ -636,7 +640,7 @@
 	
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="fig1" format="EPS">
+	    <imagedata fileref="fig1" format="EPS"/>
 	  </imageobject>
 
 	  <textobject>
@@ -657,7 +661,7 @@
 	</mediaobject>
       </figure>
       
-      <para><xref linkend="fig-process-lifecycle">�Ǥϥץ������Υ饤�ե�������򼨤��Ƥ��ޤ���
+      <para><xref linkend="fig-process-lifecycle"/>�Ǥϥץ������Υ饤�ե�������򼨤��Ƥ��ޤ���
 	�ץ������� <emphasis>fork</emphasis> �����ƥॳ������Ѥ��ơ�
 	���Υץ������Υ��ԡ��Ȥ��ƿ������ץ��������������뤳�Ȥ��Ǥ��ޤ���
 	<emphasis>fork</emphasis> �ϸƤӽФ�����
@@ -865,10 +869,10 @@
 	<para><emphasis>mmap</emphasis>
           ���󥿥ե������γ�ȯ�ϡ�4.3BSD �κ�Ȥδ֤�³�����ޤ�����
 	  40 �Ҥ�Ķ�����Ҥȸ��楰�롼�פ���
-          Berkeley Software Architecture Manual <xref linkend="biblio-mckusick-1">
+          Berkeley Software Architecture Manual <xref linkend="biblio-mckusick-1"/>
           �˵��ܤ��줿�������ƥ�����β����Ǥ���ꤹ������˻��ä���
           �����Ĥ��δ�ȤϤ��β����ǤΥ��󥿥ե�������������ޤ���
-          <xref linkend="biblio-gingell">��</para>
+          <xref linkend="biblio-gingell"/>��</para>
 
 	<para>���������ޤ�������Ū������ˤ��
           4.3BSD �ؤ� mmap ���󥿥ե������μ����ϸ������ޤ�����
@@ -891,7 +895,7 @@
           �ǥ������ؤΥǡ���ž�����㸺����
           �ޥ���ץ����å���ư��뤳�Ȥ��Ǥ���ǽ�Ϥ���äƤ��ޤ�����
           ���η�̡����۵��������ƥ�� 4.4BSD �Ǵ������֤��������뤳�Ȥˤʤä��ΤǤ���
-          4.4BSD ���۵��������ƥ�� Mach 2.0 VM �����ƥ� <xref linkend="biblio-tevanian">
+          4.4BSD ���۵��������ƥ�� Mach 2.0 VM �����ƥ� <xref linkend="biblio-tevanian"/>
           ��١����ˡ�Mach 2.5 �� Mach 2.0 �β��ɤ�Τ����줿��ΤǤ���
           ���μ����ϡ�
           ���궦ͭ�θ�Ψ���ɤ������¸��ʬ�ȵ������¸��ʬ�����줤��ʬΥ����Ƥ��ơ�
@@ -921,7 +925,7 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>�ۤȤ�ɤξ��桼���ǡ����ϥڡ��������˥��饤�󤵤�Ƥ��ޤ��󤷡�
-              �ϡ��ɥ������ڡ���Ĺ���ܿ��Ǥ⤢��ޤ���
+              �ϡ��ɥ������ڡ���Ĺ���ܿ��Ǥ⤢��ޤ���</para>
 	  </listitem>
 
 	  <listitem>
@@ -991,7 +995,7 @@
           ���ץꥱ�������ץ�������ѤΥ������դ���¸����뤿���          
           C �饤�֥��롼����˴ޤޤ�Ƥ��� <emphasis>malloc</emphasis> ��
           <emphasis>free</emphasis> ������������󥿥ե���������äƤ��ޤ�
-          <xref linkend="biblio-mckusick-2">��
+          <xref linkend="biblio-mckusick-2"/>��
           ���γ���դ��롼����� C �饤�֥�ꥤ�󥿥ե�������Ʊ�͡�
           �����Ȥ���ɬ�פʥ��ꥵ��������ꤷ�ޤ���
           ������Ƥ���ꥵ�����ξ�¤Ϥ���ޤ��󤬡�
@@ -999,6 +1003,7 @@
           ��������롼����ϲ����������ؤΥݥ��󥿤�����ˤȤ�ޤ���
           ���κݡ�����������ꥵ��������ꤹ��ɬ�פϤ���ޤ���</para>
       </sect2>
+    </sect1>
 
     <sect1 id="overview-io-system">
       <title>I/O �����ƥ�</title>
@@ -1021,7 +1026,7 @@
         �ˤ����ޤ���
         ���Τ褦��ñ��Υǡ�����¤����UNIX
         �Υġ���١����Υ��ץ����� (tool-based approach)
-        ���ǽ�ˤ��Ƥ���ΤǤ�<xref linkend="biblio-kernighan">��
+        ���ǽ�ˤ��Ƥ���ΤǤ�<xref linkend="biblio-kernighan"/>��
         ����ץ������ν��ϥ��ȥ꡼��ϡ�¾�ΤۤȤ�ɤΥץ�����������
         ���ȥ꡼��Ȥ��Ƥ��Τޤ�Ϳ��������Ǥ��ޤ� (���Τ褦������Ū�� 
         UNIX �� I/O ���ȥ꡼���Eighth Edition
@@ -1048,7 +1053,7 @@
           <emphasis>read</emphasis>�����
           <emphasis>write</emphasis>�����ƥॳ����򵭽һҤ��Ф��ƻ��Ѥ���
           �ǡ�����ž����Ԥ��ޤ���
-          <emphasis>close</emphasis>�����ƥॳ����ϡ�Ǥ�դε��һҤ������ޤ���
+          <emphasis>close</emphasis>�����ƥॳ����ϡ�Ǥ�դε��һҤ������ޤ���</para>
 	
 	<para>���һҤϡ������ͥ�ǥ��ݡ��Ȥ���륪�֥������Ȥ�ɽ���ޤ���
           4.4BSD �Ǥϡ��ե����롢�ѥ��ס������åȤ� 3 �ĤΥ��֥������Ȥ�
@@ -1438,7 +1443,7 @@
         
         <mediaobject>
           <imageobject>
-            <imagedata fileref="fig2" format="EPS">
+            <imagedata fileref="fig2" format="EPS"/>
           </imageobject>
 	
           <textobject>
@@ -1472,7 +1477,7 @@
         </mediaobject>
       </figure>
     
-      <para><xref linkend="fig-small-fs">�Ͼ����Ϥʥե����륷���ƥ�ΰ���Ǥ���
+      <para><xref linkend="fig-small-fs"/>�Ͼ����Ϥʥե����륷���ƥ�ΰ���Ǥ���
         �ǥ��쥯�ȥ�ϥ��֥ǥ��쥯�ȥ��ޤळ�Ȥ��Ǥ���
         ����Ҥο����ˤ��ä����¤Ϥ���ޤ���
         �ե����륷���ƥ�ΰ�������ݤĤ��ᡢ
@@ -1768,7 +1773,7 @@
         <listitem>
           <para>Sprite �Ȥ��� OS ���߷פ�ͳ�褹��
             ������¤���ե����륷���ƥ�
-            <xref linkend="biblio-rosenblum"></para>
+            <xref linkend="biblio-rosenblum"/></para>
         </listitem>
       
         <listitem>
@@ -1850,7 +1855,7 @@
         �ͥåȥ���ե����륷���ƥ� (NFS) �Ǥ���
         �����ϥץ��ȥ��뵬�ʤ�����Ω���ƹԤ��ޤ�������
         4.4BSD �����ͥ�� NFS �ץ��ȥ���򥵥ݡ��Ȥ��Ƥ��ޤ�
-        <xref linkend="biblio-macklem">��
+        <xref linkend="biblio-macklem"/>��
         NFS �ץ��ȥ���ˤĤ��Ƥ� 9 �Ϥ��������Ƥ��ޤ���</para>
     </sect1>
     
@@ -2539,7 +2544,7 @@
       FreeBSD doc-jp �Ǥϡ�FreeBSD
       ��Ϣʸ������ܸ��Ǥ���������Ȥ�����Ū��³���Ƥ��ޤ���
       ���κ�Ȥ˶��Ϥ������Ȼפ������ϡ�
-      ����<ulink URL="http://www.jp.FreeBSD.org/doc-jp/">FreeBSD
+      ����<ulink url="http://www.jp.FreeBSD.org/doc-jp/">FreeBSD
         ���ܸ�ɥ�����ơ������ץ��������ȤΥڡ���</ulink>�����ξ�
       doc-jp �ؤ����ä���������</para>
 
diff --git a/ja_JP.eucJP/books/faq/book.sgml b/ja_JP.eucJP/books/faq/book.sgml
index 922d992013..3436991004 100644
--- a/ja_JP.eucJP/books/faq/book.sgml
+++ b/ja_JP.eucJP/books/faq/book.sgml
@@ -1,18 +1,19 @@
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
 ]>
+
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.204 -->
 
-<book>
+<book lang='ja'>
   <bookinfo>
     <title>FreeBSD 2.X��3.X��4.X �ˤĤ��Ƥ� FAQ (�褯�������Ȥ�������)</title>
 
     <corpauthor>FreeBSD �ɥ�����ơ������ץ���������</corpauthor>
 
-    <pubdate>$FreeBSD$</pubdate>
-
     <copyright>
       <year>1995</year>
       <year>1996</year>
@@ -24,7 +25,9 @@
       <holder>FreeBSD �ɥ�����ơ������ץ���������</holder>
     </copyright>
 
-    &bookinfo.legalnotice;
+    &legalnotice;
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
       <para>
@@ -35,15 +38,15 @@
         &a.doc;
         �ޤ� (�Ѹ��) �Żҥ᡼������äƤ���������
         ����ʸ��κǿ��С������ϡ����ĤǤ�
-        <ulink URL="http://www.jp.FreeBSD.org/">���ܹ����� FreeBSD World Wide Web ������</ulink>��
-        <ulink URL="http://www.FreeBSD.org/">FreeBSD World Wide Web ������</ulink>��
+        <ulink url="http://www.jp.FreeBSD.org/">���ܹ����� FreeBSD World Wide Web ������</ulink>��
+        <ulink url="http://www.FreeBSD.org/">FreeBSD World Wide Web ������</ulink>��
         ���뤳�Ȥ��Ǥ��ޤ���
-        �ޤ����ҤȤĤε���� <ulink URL="book.html">HTML</ulink>
+        �ޤ����ҤȤĤε���� <ulink url="book.html">HTML</ulink>
         �ե�����Ȥ��� HTTP �ǥ���������ɤ��뤳�Ȥ�Ǥ��ޤ���
         �ץ졼��ƥ����ȡ�PostScript��PDF������Ӥ���¾�η����Τ�Τ�
-        <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD
+        <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD
           FTP ������</ulink>���֤���Ƥ��ޤ���
-        �ޤ���<ulink URL="http://www.FreeBSD.org/search/search.html">FAQ
+        �ޤ���<ulink url="http://www.FreeBSD.org/search/search.html">FAQ
           �θ���</ulink>���ǽ�Ǥ���</para>
 
       <para>
@@ -65,9 +68,9 @@
       <para>�ޤ������� FreeBSD FAQ �Ȥ��̤ˡ����ܤ� FreeBSD �桼��ͭ�֤ˤ�ä�
         &a.jp.users-jp;
         ��˥塼�����롼��
-        <ulink URL="news:fj.os.bsd.freebsd">fj.os.bsd.freebsd</ulink>
+        <ulink url="news:fj.os.bsd.freebsd">fj.os.bsd.freebsd</ulink>
         �ʤɤؤ���Ƥ��Ȥ˺������줿
-        <ulink URL="http://www.jp.FreeBSD.org/QandA/">QandA</ulink>
+        <ulink url="http://www.jp.FreeBSD.org/QandA/">QandA</ulink>
         ����������Ƥ��ޤ���
         �ä����ܸ�Ķ��ʤ����ܸ�ͭ�����꤬���¤��Ƥ��ޤ��Τǡ�
         ��������碌�Ƥ�������������</para>
@@ -125,7 +128,7 @@
             i386 �Ϥ˰ܿ����� <quote>386BSD</quote> ���ˤ��Ƥ��ޤ�����
             386BSD �Υ����ɤϤۤȤ�ɻĤäƤ��ޤ���
             FreeBSD �ˤĤ��Ƥξܺ٤ȡ������Ǥ��뤫�ˤĤ��Ƥ�
-            <ulink URL="http://www.FreeBSD.org/">FreeBSD �Υۡ���ڡ���</ulink>
+            <ulink url="http://www.FreeBSD.org/">FreeBSD �Υۡ���ڡ���</ulink>
             �򻲾Ȥ��Ƥ���������
           </para>
 
@@ -133,13 +136,13 @@
             FreeBSD �ϴ�Ȥ䥤�󥿡��ͥåȥ����ӥ��ץ��Х���������ԡ�
             ����ԥ塼������ȡ������������Υ桼���ʤɤˤ�ꡢ��̳�䶵�顢
             ��ڤ��Ѥ����Ƥ��ޤ��������˴ؤ��Ƥ�
-            <ulink URL="http://www.FreeBSD.org/gallery/gallery.html"
+            <ulink url="http://www.FreeBSD.org/gallery/gallery.html"
                    >FreeBSD �����꡼</ulink>��������������
           </para>
 
           <para>
             FreeBSD �˴ؤ�����ܤ��������
-            <ulink URL="../handbook/index.html">FreeBSD
+            <ulink url="../handbook/index.html">FreeBSD
             �ϥ�ɥ֥å�</ulink>�򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -241,7 +244,7 @@
         <answer>
 
           <para>
-            <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.3-RELEASE/">4.3</ulink>
+            <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.3-RELEASE/">4.3</ulink>
             ���ǿ��� <emphasis>STABLE</emphasis> �С������ǡ�
             2001 ǯ 4 ��˥�꡼������ޤ�����
             �ޤ�������Ϻǿ��� <emphasis>RELEASE</emphasis>
@@ -281,14 +284,14 @@
 
         <answer>
           <para>
-            <ulink URL="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
+            <ulink url="../handbook/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink>
             �ϥ��ڥ졼�ƥ��󥰥����ƥ�γ�ȯ�С������ǡ�
             �䤬�� 5.0-RELEASE �Ȥʤ�ޤ�����äƤ���ϡ������˷Ȥ�äƤ��볫ȯ�Ԥ䡢
             �ɤ�ʾ㳲�����ۤ��Ƥ����륿�դʰ����Ȥ����ˤȤäƤΤ߶�̣���оݤȤʤ��ΤǤ���
             -CURRENT �λ��Ѥ˺ݤ��Ƥξܺ٤�
-            <ulink URL="../handbook/index.html">FreeBSD �ϥ�ɥ֥å�</ulink>
+            <ulink url="../handbook/index.html">FreeBSD �ϥ�ɥ֥å�</ulink>
             ��
-            <ulink URL="../handbook/cutting-edge.html#CURRENT">��Ϣ���륻�������</ulink>
+            <ulink url="../handbook/cutting-edge.html#CURRENT">��Ϣ���륻�������</ulink>
             �򻲾Ȥ��Ƥ���������
           </para>
 
@@ -307,7 +310,7 @@
           </para>
 
           <para>���������λ����� -CURRENT �� -STABLE �Υ����ɤ򸵤�
-            <ulink URL="http://www.FreeBSD.org/releases/snapshots.html">snapshot</ulink>
+            <ulink url="http://www.FreeBSD.org/releases/snapshots.html">snapshot</ulink>
             ����������Ƥ��ޤ���
             ���ߤϡ����� snapshot �����ۤ����Ѳ�ǽ�Ǥ���
             ���줾��� snapshot �ˤϰʲ��Τ褦����Ū������ޤ���
@@ -358,7 +361,7 @@
 
           <para>
             ���ʥåץ���åȥ�꡼���ϡ�5.0-CURRENT ��
-            <ulink URL="ftp://current.FreeBSD.org/pub/FreeBSD/"
+            <ulink url="ftp://current.FreeBSD.org/pub/FreeBSD/"
                    >ftp://current.FreeBSD.org/pub/FreeBSD/</ulink>
             ���顢4-STABLE ��
             <ulink url="ftp://releng4.FreeBSD.org/pub/FreeBSD"
@@ -384,13 +387,13 @@
           <para>
             FreeBSD 2.0.5 ����꡼�����줿�塢�䤿���� FreeBSD �γ�ȯ��
             2 ������ʬ�䤹�뤳�Ȥˤ��ޤ�����
-            ��Ĥ� <ulink URL="../handbook/stable.html">-STABLE</ulink>
+            ��Ĥ� <ulink url="../handbook/stable.html">-STABLE</ulink>
             �Ȥ����֥����ǡ��Х��ν����Ϥ��ä���ƥ��Ȥ��졢
             ��ǽ�ζ����Ͼ������Ĥ����Ԥ��ޤ���
             (�ޤ��ѹ���¸�Ū��ǽ��˾�ޤʤ���
             ���󥿡��ͥåȥ����ӥ��ץ��Х����������ȸ���)��
             �⤦�����Υ֥�����
-            <ulink URL="../handbook/cutting-edge.html#CURRENT">-CURRENT</ulink>
+            <ulink url="../handbook/cutting-edge.html#CURRENT">-CURRENT</ulink>
             �ǡ�2.0 ����꡼������ư���
             5.0-RELEASE (�����Ƥ��θ��) �ظ�����̮����³���Ƥ����ΤǤ���
             ASCII ����������ñ�ʿޤ��狼��䤹�����ϼ���������ޤ��󤬡�
@@ -492,9 +495,9 @@
           </para>
 
           <para>
-            <ulink URL="http://www.netbsd.org/">NetBSD</ulink>
+            <ulink url="http://www.netbsd.org/">NetBSD</ulink>
             �ޤ���
-            <ulink URL="http://www.openbsd.org/">OpenBSD</ulink>��
+            <ulink url="http://www.openbsd.org/">OpenBSD</ulink>��
           </para>
         </answer>
       </qandaentry>
@@ -509,10 +512,10 @@
             �ץ��������Ȥ�����Ū���������䡢
             ï�˥������ĥ꡼�˥����ɤν񤭹��߸��¤�Ϳ���뤫��
             �ʤɤȤ��ä� FreeBSD �ץ��������Ȥ˴ؤ�����פʰջ׷���ϡ�
-            9 ̾����ʤ�<ulink URL="../handbook/staff.html#STAFF-CORE">����������
+            9 ̾����ʤ�<ulink url="../handbook/staff.html#STAFF-CORE">����������
               (core team)</ulink> �ˤ�äƤʤ���ޤ���
             �������ĥ꡼��ľ���ѹ��Ǥ���ͤϤ�ä�¿����
-            200 ̾�ʾ��<ulink URL="../handbook/staff:committers.html">�������ĥ꡼������
+            200 ̾�ʾ��<ulink url="../handbook/staff:committers.html">�������ĥ꡼������
               (committer)</ulink> �����ޤ���
           </para>
 
@@ -531,7 +534,7 @@
         <answer>
           <para>
             FreeBSD �Τ��٤Ƥμ��פʥ�꡼���� anonymous FTP ��ͳ��
-            <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/">FreeBSD FTP ������</ulink>
+            <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">FreeBSD FTP ������</ulink>
             ��������Ǥ��ޤ���
           </para>
 
@@ -540,7 +543,7 @@
               <listitem>
                 <para>
                   ���ߤ� 3.X-STABLE ��꡼����3.5.1-RELEASE ��
-                  <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.5.1-RELEASE/"
+                  <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.5.1-RELEASE/"
                          >3.5.1-RELEASE �Υǥ��쥯�ȥ�</ulink>�ˤ���ޤ���
                 </para>
               </listitem>
@@ -553,13 +556,13 @@
 
               <listitem>
                 <para>
-                  <ulink URL="ftp://releng4.FreeBSD.org/pub/FreeBSD/">4.X
+                  <ulink url="ftp://releng4.FreeBSD.org/pub/FreeBSD/">4.X
                     Snapshot</ulink> �ϡ��ۤܰ����˰���������Ƥ��ޤ���
                 </para>
               </listitem>
 
             <listitem>
-              <para><ulink URL="ftp://current.FreeBSD.org/pub/FreeBSD/">5.0 Snapshot</ulink>
+              <para><ulink url="ftp://current.FreeBSD.org/pub/FreeBSD/">5.0 Snapshot</ulink>
                   ��꡼���� <link linkend="current">-CURRENT</link>
                   �֥����Ѥ˰����˰���������Ƥ��ꡢ
                   �����Ͻ��˺���ü�γ�ȯ�Ԥ���ӥƥ������Τ�����󶡤���Ƥ��ޤ���
@@ -580,8 +583,8 @@
           <phone>Orders:       +1 800 786-9907</phone>
           <phone>Questions:    +1 925 674-0783</phone>
           <fax>FAX:            +1 925 674-0821</fax>
-          <otheraddr>email:    <ulink URL="mailto:orders@osd.bsdi.com">BSDi Orders address</ulink></otheraddr>
-          <otheraddr>WWW:      <ulink URL="http://www.osd.bsdi.com/">BSDi Home page</ulink></otheraddr><phone>Orders:  +1 800 786-9907</phone></address>
+          <otheraddr>email:    <ulink url="mailto:orders@osd.bsdi.com">BSDi Orders address</ulink></otheraddr>
+          <otheraddr>WWW:      <ulink url="http://www.osd.bsdi.com/">BSDi Home page</ulink></otheraddr><phone>Orders:  +1 800 786-9907</phone></address>
 
           <para>�������ȥ�ꥢ�Ǥϡ����ΤȤ������䤤��碌�Ƥ���������</para>
 
@@ -619,7 +622,7 @@
 
           <para>
             �����ʾ���
-            <ulink URL="../handbook/eresources.html#ERESOURCES-MAIL">FreeBSD
+            <ulink url="../handbook/eresources.html#ERESOURCES-MAIL">FreeBSD
               �ϥ�ɥ֥å��Υ᡼��󥰥ꥹ�Ȥ���</ulink>
             �ˤ���ޤ���
           </para>
@@ -634,7 +637,7 @@
         <answer>
           <para>
             �����ʾ���
-            <ulink URL="http://www.FreeBSD.org/y2kbug.html">
+            <ulink url="http://www.FreeBSD.org/y2kbug.html">
               FreeBSD Y2K �Υڡ���</ulink>
             �ˤ���ޤ���
           </para>
@@ -648,7 +651,7 @@
 
         <answer>
           <para>�����ʾ���
-            <ulink URL="../handbook/eresources-news.html">FreeBSD
+            <ulink url="../handbook/eresources-news.html">FreeBSD
               �ϥ�ɥ֥å��Υ˥塼�����롼�פ���</ulink>�ˤ���ޤ���
           </para>
         </answer>
@@ -747,7 +750,7 @@
             �Ȥ����᡼��󥰥ꥹ�Ȥ�����ޤ���
           </para>
 
-          <para><ulink URL="../handbook/index.html">FreeBSD
+          <para><ulink url="../handbook/index.html">FreeBSD
               �ϥ�ɥ֥å�</ulink>�⤢��ޤ���
             ����ϸ��ߺ����ǡ�
             �Դ������ä���ǿ�����Ǥʤ���Τ��ޤޤ�Ƥ��뤳�Ȥ����դ��Ƥ���������</para>
@@ -762,8 +765,8 @@
             �ޥ˥奢��ڡ����ޤǤ����Ƥ� 773
             �ڡ����ˤ錄�äƽ񤫤�Ƥ��ޤ���
             �����ܤ� (�����Ƹ��ߤ� FreeBSD ��꡼����)
-            <ulink URL="http://www.osd.bsdi.com/">BSDi</ulink>��
-            <ulink URL="http://www.cheapbytes.com/">CheapBytes</ulink>��
+            <ulink url="http://www.osd.bsdi.com/">BSDi</ulink>��
+            <ulink url="http://www.cheapbytes.com/">CheapBytes</ulink>��
             �ޤ��ϺǴ��ν�Ź����ʸ���뤳�Ȥ��Ǥ��ޤ���
             ISBN �����ɤ� 1-57176-246-9 �Ǥ�
             (����ʳ��Υ����ɤξ��⤢�뤫�⤷��ޤ���)��</para>
@@ -780,23 +783,23 @@
             <itemizedlist>
 
               <listitem>
-                <para><xref linkend="biblio-44sysman"></para>
+                <para><xref linkend="biblio-44sysman"/></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="biblio-44userman"></para>
+                <para><xref linkend="biblio-44userman"/></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="biblio-44suppman"></para>
+                <para><xref linkend="biblio-44suppman"/></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="biblio-44progman"></para>
+                <para><xref linkend="biblio-44progman"/></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="biblio-44progsupp"></para>
+                <para><xref linkend="biblio-44progsupp"/></para>
               </listitem>
 
             </itemizedlist>
@@ -804,7 +807,7 @@
 
           <para>
             �����ξܺ٤������� WWW ��ͳ��
-            <ulink URL="http://gnn.com/gnn/bus/ora/category/bsd.html">4.4BSD
+            <ulink url="http://gnn.com/gnn/bus/ora/category/bsd.html">4.4BSD
               books description</ulink>
             �����ɤळ�Ȥ��Ǥ��ޤ���
             ����������ʤ����ᤳ���Υޥ˥奢������ꤷ�ˤ������⤷��ޤ���
@@ -812,10 +815,10 @@
 
           <para>
             4.4BSD �Υ����ͥ빽���ˤĤ��Ƥ��Ű��Ū���Τꤿ���Τʤ顢
-            <xref linkend="biblio-44kernel"> �ʤ�ְ㤤�ʤ��Ǥ��礦��</para>
+            <xref linkend="biblio-44kernel"/> �ʤ�ְ㤤�ʤ��Ǥ��礦��</para>
 
           <para>�����ƥ�����ˤĤ��Ƥ��ɽ� <xref
-            linkend="biblio-nemeth3rd"> �Ǥ���</para>
+            linkend="biblio-nemeth3rd"/> �Ǥ���</para>
 
           <note><para>���ǤǤϤʤ����翧�Υ��С����軰�ǤǤ��뤫��ǧ���Ƥ���
             ������</para></note>
@@ -841,7 +844,7 @@
             �桼��������ѹ��׵᤬�ޤȤ���Ƥ���
             Problem Report �ǡ����١����ϡ�
             �㳲���� web �١����Υ��󥿥ե��������̤��ơ�
-            <ulink URL="http://www.FreeBSD.org/ja/send-pr.html">���</ulink>��<ulink URL="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">�䤤��碌</ulink>��Ԥʤ����Ȥ��Ǥ��ޤ���
+            <ulink url="http://www.FreeBSD.org/ja/send-pr.html">���</ulink>��<ulink url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">�䤤��碌</ulink>��Ԥʤ����Ȥ��Ǥ��ޤ���
             �ޤ���&man.send-pr.1; ���ޥ�ɤ���Ѥ��ơ�
             �Żҥ᡼���ͳ�Ǿ㳲�����ѹ��׵����Ф��뤳�Ȥ�Ǥ��ޤ���</para>
         </answer>
@@ -1223,15 +1226,15 @@ File: +DESC (ignored)</screen>
 
           <itemizedlist>
             <listitem>
-              <para><ulink URL="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</ulink> (moderated)</para>
+              <para><ulink url="news:comp.unix.bsd.freebsd.announce">comp.unix.bsd.freebsd.announce</ulink> (moderated)</para>
             </listitem>
 
             <listitem>
-              <para><ulink URL="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</ulink></para>
+              <para><ulink url="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</ulink></para>
             </listitem>
 
             <listitem>
-              <para><ulink URL="news:comp.unix.bsd.misc">comp.unix.bsd.misc</ulink></para>
+              <para><ulink url="news:comp.unix.bsd.misc">comp.unix.bsd.misc</ulink></para>
             </listitem>
 
           </itemizedlist>
@@ -1240,31 +1243,31 @@ File: +DESC (ignored)</screen>
 
           <itemizedlist>
             <listitem>
-              <para><ulink URL="http://www.FreeBSD.org/">FreeBSD �Υۡ���ڡ���</ulink></para>
+              <para><ulink url="http://www.FreeBSD.org/">FreeBSD �Υۡ���ڡ���</ulink></para>
             </listitem>
 
             <listitem>
-              <para><anchor id="pao">
+              <para><anchor id="pao"/>
                 ��åץȥå� PC ����äƤ������ϡ�
-                �¤����Ȥʤ����ܤ�<ulink URL="http://www.jp.FreeBSD.org/PAO/">���� ã�ʻ��
+                �¤����Ȥʤ����ܤ�<ulink url="http://www.jp.FreeBSD.org/PAO/">���� ã�ʻ��
                   Mobile Computing �Υڡ���</ulink> �򸫤ޤ��礦��
               </para>
             </listitem>
 
             <listitem>
-              <para><anchor id="smp">
+              <para><anchor id="smp"/>
                 SMP (Symmetric MultiProcessing) �˴ؤ������ϡ�
-                <ulink URL="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">SMP
+                <ulink url="http://people.FreeBSD.org/~fsmp/SMP/SMP.html">SMP
                   ���ݡ��ȥڡ���</ulink>��������������
               </para>
             </listitem>
 
             <listitem>
-              <para><anchor id="multimedia">
+              <para><anchor id="multimedia"/>
                 FreeBSD �Υޥ����ǥ������ץꥱ�������˴ؤ������ϡ�
-                <ulink URL="http://people.FreeBSD.org/~faulkner/multimedia/mm.html">�ޥ����ǥ���</ulink>�Υڡ�����������������
+                <ulink url="http://people.FreeBSD.org/~faulkner/multimedia/mm.html">�ޥ����ǥ���</ulink>�Υڡ�����������������
                 �ä�
-                <ulink URL="http://people.FreeBSD.org/~ahasty/Bt848.html">Bt848</ulink>
+                <ulink url="http://people.FreeBSD.org/~ahasty/Bt848.html">Bt848</ulink>
                 �ӥǥ�����ץ�����åפ˶�̣�Τ������ϡ�
                 ��󥯤򤿤ɤäƤߤƤ���������
               </para>
@@ -1272,7 +1275,7 @@ File: +DESC (ignored)</screen>
           </itemizedlist>
 
           <para>FreeBSD �ϥ�ɥ֥å��ˤϡ�
-            �¤˴������줿<ulink URL="../handbook/bibliography.html">���Ϳ޽�</ulink>�ΰ��������ꡢ
+            �¤˴������줿<ulink url="../handbook/bibliography.html">���Ϳ޽�</ulink>�ΰ��������ꡢ
             �㤦�٤��ܤ򤵤����Ƥ��������ɤ���ͤ�����ޤ���
           </para>
         </answer>
@@ -1345,7 +1348,7 @@ File: +DESC (ignored)</screen>
 
           <para>
             ���μ��δ����������ȡ�����Ū�ʥ��󥹥ȡ����������ˤĤ��Ƥ�
-            <ulink URL="../handbook/install.html">FreeBSD
+            <ulink url="../handbook/install.html">FreeBSD
               �ϥ�ɥ֥å��Υ��󥹥ȡ������</ulink>
             �򻲾Ȥ��Ƥ���������</para>
         </answer>
@@ -1402,7 +1405,7 @@ File: +DESC (ignored)</screen>
                 ���᡼���ˤϥե��åԡ��ǥ������δ�������Ȥ��ȥ�å�ñ�̤dz�Ǽ����Ƥ��ꡢ
                 �ե��åԡ��ǥ���������̾�Υե�����Ȥ���
                 ��Ǽ�����褦�����ꤵ��Ƥ���櫓�ǤϤ���ޤ���
-                <ulink URL="../handbook/install.html">FreeBSD
+                <ulink url="../handbook/install.html">FreeBSD
                   �Υ��󥹥ȡ���</ulink>�˵��Ҥ���Ƥ���褦�ˡ�
                 ���٥�Υġ��� (���Ȥ���
                 <command>fdimage</command> ��
@@ -1422,7 +1425,7 @@ File: +DESC (ignored)</screen>
 
         <answer>
           <para>
-            ���󥹥ȡ�����������<ulink URL="../handbook/install.html">FreeBSD
+            ���󥹥ȡ�����������<ulink url="../handbook/install.html">FreeBSD
               �ϥ�ɥ֥å��Υ��󥹥ȡ���ξ�</ulink>�ˤ���ޤ���
           </para>
         </answer>
@@ -1442,7 +1445,7 @@ File: +DESC (ignored)</screen>
           </para>
 
           <para>
-            <xref linkend="hardware" remap="�ϡ��ɥ���������ѥ��ӥ�ƥ�">
+            <xref linkend="hardware" remap="�ϡ��ɥ���������ѥ��ӥ�ƥ�"/>
               �⤴������������
           </para>
         </answer>
@@ -1538,7 +1541,7 @@ File: +DESC (ignored)</screen>
 
         <answer>
           <para>
-            <ulink URL="http://www.FreeBSD.org/tutorials/multi-os/">multi-OS
+            <ulink url="http://www.FreeBSD.org/tutorials/multi-os/">multi-OS
               �Υڡ���</ulink>��������������
           </para>
         </answer>
@@ -2529,7 +2532,7 @@ BUSY</literallayout></entry>
             <listitem>
               <para>�����ͥ�Υ���ե����졼�����ե������ wd
                 �ιԤ�ʲ��Τ褦���ѹ�����
-                <ulink URL="../handbook/kernelconfig.html">�����ͥ�κƹ���</ulink>��Ԥäơ�
+                <ulink url="../handbook/kernelconfig.html">�����ͥ�κƹ���</ulink>��Ԥäơ�
                 �����������ͥ�򥤥󥹥ȡ��뤷�ޤ���</para>
 
               <programlisting>controller      wdc0    at isa? port "IO_WD1" bio irq 14 vector wdintr
@@ -2557,7 +2560,7 @@ disk            wd2     at wdc1 drive 1 # wd3 
           <para>
             ǧ���Ǥ������ξ�¤ϡ�4GB �Ǥ���
             ���ι����ϻ�Ѥߤǡ�
-            �ܺ٤� <ulink URL="ftp://ftp.cdrom.com/archive-info/configuration">wcarchive's
+            �ܺ٤� <ulink url="ftp://ftp.cdrom.com/archive-info/configuration">wcarchive's
               configuration</ulink> ��������������
             ���Τ褦�ˤ�������Υ����ޥ����Ƴ�����褦�Ȥ������ˤϡ�
             ���դ�ɬ�פǤ���ECC ��ǽ�򥵥ݡ��Ȥ����ʤ�����
@@ -2762,11 +2765,11 @@ Filesystem  1024-blocks     Used    Avail Capacity  Mounted on
             �Х��ʥꥹ�ʥåץ���åȤ�Ȥ����Ȥ�<emphasis>����</emphasis>�������ᤷ�ޤ���
             4-STABLE ���ʥåץ���åȤ�
             <ulink
-            URL="ftp://releng4.FreeBSD.org/">releng4.FreeBSD.org</ulink>
+            url="ftp://releng4.FreeBSD.org/">releng4.FreeBSD.org</ulink>
             ���������ǽ�Ǥ���</para>
 
           <para>��������Ȥäƥ��åץ��졼�ɤ�����ϡ��ܺ٤ˤĤ���
-            <ulink URL="http://www.FreeBSD.org/handbook/cutting-edge.html">FreeBSD
+            <ulink url="http://www.FreeBSD.org/handbook/cutting-edge.html">FreeBSD
               �ϥ�ɥ֥å�</ulink>�򻲾Ȥ���褦�ˤ��Ƥ���������</para>
 
           <caution>
@@ -2808,7 +2811,7 @@ Filesystem  1024-blocks     Used    Avail Capacity  Mounted on
           <table>
             <title>����Ǥ��륻�����ƥ��ץ��ե�����</title>
 
-            <tgroup cols=5>
+            <tgroup cols="5">
               <thead>
                 <row>
                   <entry></entry>
@@ -2975,7 +2978,7 @@ Filesystem  1024-blocks     Used    Avail Capacity  Mounted on
         </question>
 
         <answer>
-          <para><ulink URL="../handbook/install.html#INSTALL-HW">FreeBSD
+          <para><ulink url="../handbook/install.html#INSTALL-HW">FreeBSD
               �ϥ�ɥ֥å�</ulink>�˵�����Ƥ��봰���ʥꥹ�Ȥ򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -3117,7 +3120,7 @@ Filesystem  1024-blocks     Used    Avail Capacity  Mounted on
             �ޤ� IDE EZ �� IDE �ɥ饤�֤�Ʊ���Ȥʤ�ޤ���
           </para>
 
-          <para><anchor id="jaz">
+          <para><anchor id="jaz"/>
               �����ƥ��Ư��Υ�ǥ����򴹤ˤĤ���
               FreeBSD ���ɤ�ۤɤ��ޤ�ư�����꤫�ǤϤ���ޤ���
               ��������ǥ����������ؤ������ˤ��Υɥ饤�֤Υޥ���Ȥ������ʤ���Ф����ʤ��Ǥ��礦����
@@ -3136,7 +3139,7 @@ Filesystem  1024-blocks     Used    Avail Capacity  Mounted on
 
         <answer>
           <para>������
-            <ulink URL="../handbook/install-hw.html#INSTALL-MISC">����¾�ΥǥХ���</ulink>����ˤ���ޤ���
+            <ulink url="../handbook/install-hw.html#INSTALL-MISC">����¾�ΥǥХ���</ulink>����ˤ���ޤ���
           </para>
 
           <para>
@@ -3339,7 +3342,7 @@ usbd_flags=""</programlisting>
 
           <para>
             �����ͥ�κƹ��ۤˤĤ��Ƥ褯�Τ�ʤ��ΤǤ���С�
-            <ulink URL="../handbook/kernelconfig.html">�����ͥ�Υ���ե����졼�����</ulink>�򻲾Ȥ��Ƥ���������
+            <ulink url="../handbook/kernelconfig.html">�����ͥ�Υ���ե����졼�����</ulink>�򻲾Ȥ��Ƥ���������
           </para>
 
           <para>
@@ -3744,7 +3747,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
 
         <answer>
           <para>
-            ��괰���ʰ����ˤĤ��Ƥ�<ulink URL="../handbook/install-hw.html#INSTALL-NICS">�������ͥåȥ�����</ulink>����򻲾Ȥ��Ƥ���������</para>
+            ��괰���ʰ����ˤĤ��Ƥ�<ulink url="../handbook/install-hw.html#INSTALL-NICS">�������ͥåȥ�����</ulink>����򻲾Ȥ��Ƥ���������</para>
         </answer>
       </qandaentry>
 
@@ -3788,7 +3791,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
         </question>
 
         <answer>
-          <para><ulink URL="../handbook/install-hw.html#INSTALL-MISC">FreeBSD
+          <para><ulink url="../handbook/install-hw.html#INSTALL-MISC">FreeBSD
               �ϥ�ɥ֥å�</ulink>�˵�����Ƥ��롢
             ���ݡ��Ȥ���Ƥ���¾�ΥǥХ����ΰ����򻲾Ȥ��Ƥ���������
           </para>
@@ -3827,7 +3830,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
             �����������򤹤�ˤϡ�BIOS ��
             <quote>Plug and Play Operating System</quote>
             ��̵�������ꤷ�Ƥ����������ޤ������ܤ��������
-            <ulink URL="http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron">http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron</ulink>
+            <ulink url="http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron">http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron</ulink>
             �򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -3843,9 +3846,9 @@ diff -u -r1.60.2.1 -r1.60.2.2
           <para>
             ������ AIC789x ���꡼���� Adaptec ���åפϡ�3.0 �ǥǥӥ塼���� CAM SCSI
             �ե졼�����ǥ��ݡ��Ȥ���Ƥ��ޤ��� 2.2-STABLE �Υѥå���
-            <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/cam/">ftp://ftp.FreeBSD.org/pub/FreeBSD/development/cam/</ulink> �ˤ���ޤ���
+            <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/cam/">ftp://ftp.FreeBSD.org/pub/FreeBSD/development/cam/</ulink> �ˤ���ޤ���
             CAM �����ƥब���äƤ���ⵡǽ�֡��ȥե��åԡ���
-            <ulink URL="http://people.FreeBSD.org/~abial/cam-boot/">http://people.FreeBSD.org/~abial/cam-boot/</ulink> �ˤ���ޤ���
+            <ulink url="http://people.FreeBSD.org/~abial/cam-boot/">http://people.FreeBSD.org/~abial/cam-boot/</ulink> �ˤ���ޤ���
             �ɤ���ξ��ˤ��Ƥ⡢��Ȥ�Ϥ������ <filename>README</filename>
             ���ɤߤ���������
           </para>
@@ -3939,7 +3942,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
             �����������򤹤�ˤϡ�BIOS ��
             <quote>Plug and Play Operating System</quote>
             ��̵�������ꤷ�Ƥ����������ޤ������ܤ��������
-            <ulink URL="http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron">http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron</ulink>
+            <ulink url="http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron">http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron</ulink>
             �򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -4017,7 +4020,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
 ARRE (Auto Read Reallocation Enbld):  1</screen>
 
           <para>
-            �ʲ��ϡ�<ulink URL="mailto:tedm@toybox.placo.com">Ted
+            �ʲ��ϡ�<ulink url="mailto:tedm@toybox.placo.com">Ted
               Mittelstaedt ��</ulink>����󤻤�줿��ΤǤ���
           </para>
 
@@ -4210,7 +4213,7 @@ ARRE (Auto Read Reallocation Enbld):  1</screen>
             <literal>EISA_SLOTS</literal> �� 12 ���Ѥ���
             ���ɥ쥹���֤ξ��ͤ��ʤ�����
             �褦�ʤդ�򤵤��뤳�ȤǤ� :)
-            <ulink URL="../handbook/kernelconfig.html">�����ͥ�κƹ���</ulink>�˵��Ҥ���Ƥ���褦�ˤ��ƥ����ͥ��ƹ��ۤ��Ƥ���������</para>
+            <ulink url="../handbook/kernelconfig.html">�����ͥ�κƹ���</ulink>�˵��Ҥ���Ƥ���褦�ˤ��ƥ����ͥ��ƹ��ۤ��Ƥ���������</para>
 
           <para>
             ������󡢤���Ϥ��Τ褦�ʥޥ���˥��󥹥ȡ��뤹��ݤ�
@@ -4568,7 +4571,7 @@ quit</programlisting>
             FreeBSD �ΥХ���ȯ��������ǽ��������ޤ���
             �ʲ����������ɤ�Ǿ㳲�������äƤ���������</para>
 
-          <para>�ܺ٤� FAQ �ϡ�<ulink URL="http://www.bitwizard.nl/sig11/">
+          <para>�ܺ٤� FAQ �ϡ�<ulink url="http://www.bitwizard.nl/sig11/">
               the SIG11 problem FAQ</ulink> �ˤ���ޤ���</para>
           </answer>
       </qandaentry>
@@ -4786,16 +4789,16 @@ quit</programlisting>
 
           <para>
             ��Ϥ丽�ߤ�
-            <ulink URL="ftp://rtfm.mit.edu/pub/usenet/news.answers/mail/sendmail-faq">sendmail FAQ</ulink>
+            <ulink url="ftp://rtfm.mit.edu/pub/usenet/news.answers/mail/sendmail-faq">sendmail FAQ</ulink>
             �� sendmail release �Ȥϰ��ˤ��ݼ餵��Ƥ��ޤ���
             ���������Υͥåȥ˥塼�������Ū����Ƥ���Ƥޤ���
-            <ulink URL="news:comp.mail.sendmail">comp.mail.sendmail</ulink>��
-            <ulink URL="news:comp.mail.misc">comp.mail.misc</ulink>��
-            <ulink URL="news:comp.mail.smail">comp.mail.smail</ulink>��
-            <ulink URL="news:comp.answers">comp.answers</ulink>��
-            <ulink URL="news:news.answers">news.answers</ulink>��
+            <ulink url="news:comp.mail.sendmail">comp.mail.sendmail</ulink>��
+            <ulink url="news:comp.mail.misc">comp.mail.misc</ulink>��
+            <ulink url="news:comp.mail.smail">comp.mail.smail</ulink>��
+            <ulink url="news:comp.answers">comp.answers</ulink>��
+            <ulink url="news:news.answers">news.answers</ulink>��
             �ޤ����᡼���ͳ�ǥ��ԡ������ꤹ�����
-            <ulink URL="mailto:mail-server@rtfm.mit.edu">mail-server@rtfm.mit.edu</ulink>
+            <ulink url="mailto:mail-server@rtfm.mit.edu">mail-server@rtfm.mit.edu</ulink>
             ���ޤ���ʸ�� <literal>send usenet/news.answers/mail/sendmail-faq</literal>
             �Ƚ񤤤�����ޤ���
           </para>
@@ -5308,7 +5311,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
           ���Ф��Ƥ褤������Ư���ȻפäƤ��ޤ�)��
           �䤿���Ͼ��ѥ��եȥ������٥���ˡ�
           ���������ʤ��������Ƥ�餦���Ȥ�˾��Ǥ��ޤ����ܤ����ϡ�
-          <ulink URL="http://www.FreeBSD.org/commercial/commercial.html"
+          <ulink url="http://www.FreeBSD.org/commercial/commercial.html"
                  >���ѥ��եȥ������٥�����Υڡ���</ulink>��������������</para>
       </note>
 
@@ -5360,7 +5363,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
           <para>
             FreeBSD �Ѥ������� ELF Motif 2.1.20 (i386 �ǡ�Alpha ��)
             �˴ؤ�������<link linkend="apps2go">Apps2go</link> ����
-            �������뤳�Ȥ��Ǥ��ޤ���<anchor id="apps2go">
+            �������뤳�Ȥ��Ǥ��ޤ���<anchor id="apps2go"/>
           </para>
 
           <para>
@@ -5405,15 +5408,15 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
               <varlistentry>
                 <term>���ܤ��������</term>
                 <listitem>
-                  <para><ulink URL="http://www.apps2go.com/">Apps2go WWW page</ulink></para>
+                  <para><ulink url="http://www.apps2go.com/">Apps2go WWW page</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term>�䤤��碌��</term>
                 <listitem>
-                  <para><ulink URL="mailto:sales@apps2go.com">Sales</ulink> �ޤ���
-                    <ulink URL="mailto:support@apps2go.com">Support</ulink> �Żҥ᡼�륢�ɥ쥹��</para>
+                  <para><ulink url="mailto:sales@apps2go.com">Sales</ulink> �ޤ���
+                    <ulink url="mailto:support@apps2go.com">Support</ulink> �Żҥ᡼�륢�ɥ쥹��</para>
                 </listitem>
               </varlistentry>
 
@@ -5524,7 +5527,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             ���䤵��Ƥ��ޤ����������ߤϴ������䤬��λ���Ƥ��ޤ���
           </para>
 
-          <para><ulink URL="http://www.kde.org/">KDE</ulink>
+          <para><ulink url="http://www.kde.org/">KDE</ulink>
             ¿�������� CDE ��������Ƥ��륪���ץ󥽡����� X11 �ǥ����ȥå״Ķ��Ǥ���
             <ulink url="http://www.xfce.org/">xfce</ulink> ��
             ��å� &amp; �ե����� (����: ���Ѥ������ˡ�Τ���) �ⵤ�����뤫���Τ�ޤ���
@@ -5541,8 +5544,8 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
         </question>
 
         <answer>
-          <para>�Ϥ���<ulink URL="http://www.xig.com/">Xi Graphics</ulink> ��
-            <ulink URL="http://www.metrolink.com/">Metro Link</ulink>
+          <para>�Ϥ���<ulink url="http://www.xig.com/">Xi Graphics</ulink> ��
+            <ulink url="http://www.metrolink.com/">Metro Link</ulink>
             ���顢FreeBSD �ۤ� Intel �١����Υ����ƥ��ư���
             Accelerated-X �Ȥ������ʤ����䤵��Ƥ��ޤ���
           </para>
@@ -5552,7 +5555,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             �ưפ����꤬�Ԥʤ���ۤ�����¿���Υӥǥ��ܡ��ɤ򥵥ݡ��Ȥ���
             �ⵡǽ�� X �����Ф��󶡤��Ƥ��ޤ������ۤϥХ��ʥ�����Τߤǡ�
             FTP �����Ѳ�ǽ�Ǥ���������󡢤ȤƤ�²� ($39) �˼������뤳�Ȥ��Ǥ��ޤ���
-            <anchor id="metrox">
+            <anchor id="metrox"/>
           </para>
 
           <para>
@@ -5563,15 +5566,15 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             <variablelist>
               <varlistentry><term>���ܤ��������</term>
                 <listitem>
-                  <para><ulink URL="http://www.metrolink.com/">Metro Link WWW page</ulink></para>
+                  <para><ulink url="http://www.metrolink.com/">Metro Link WWW page</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry><term>�䤤��碌��</term>
                 <listitem>
-                  <para><ulink URL="mailto:sales@metrolink.com">Sales</ulink>
+                  <para><ulink url="mailto:sales@metrolink.com">Sales</ulink>
                     �ޤ���
-                    <ulink URL="mailto:tech@metrolink.com">Support</ulink> �Żҥ᡼�륢�ɥ쥹</para>
+                    <ulink url="mailto:tech@metrolink.com">Support</ulink> �Żҥ᡼�륢�ɥ쥹</para>
                 </listitem>
               </varlistentry>
 
@@ -5588,7 +5591,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             �򥵥ݡ��Ȥ��Ƥ��ޤ��������ФϥХ��ʥ�Τߤ��ޤޤ�ޤ���
             FreeBSD �Ѥ� Linux �Ѥ����礵�줿�ե��åԡ��ǥ����������äƤ��ޤ���
             Xi Graphics �� Laptop ���ݡ��Ȥ��ò���������ǽ X �����Ф��󶡤��Ƥ��ޤ���
-            <anchor id="xig">
+            <anchor id="xig"/>
           </para>
 
           <para>
@@ -5603,15 +5606,15 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
               <varlistentry>
                 <term>���ܤ��������</term>
                 <listitem>
-                  <para><ulink URL="http://www.xig.com/">Xi Graphics WWW page</ulink></para>
+                  <para><ulink url="http://www.xig.com/">Xi Graphics WWW page</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term>�䤤�礻��</term>
                 <listitem>
-                  <para><ulink URL="mailto:sales@xig.com">Sales</ulink> �ޤ���
-                    <ulink URL="mailto:support@xig.com">Support</ulink></para>
+                  <para><ulink url="mailto:sales@xig.com">Sales</ulink> �ޤ���
+                    <ulink url="mailto:support@xig.com">Support</ulink></para>
                 </listitem>
               </varlistentry>
 
@@ -5632,13 +5635,13 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
         <answer>
           <para>�������Ǥ���FreeBSD �Υ����֥����Ȥˤ���
-            <ulink URL="http://www.FreeBSD.org/commercial/software_bycat.html#CATEGORY_DATABASE">
+            <ulink url="http://www.FreeBSD.org/commercial/software_bycat.html#CATEGORY_DATABASE">
               ���ѥ٥����</ulink> �Ȥ�������������������������
           </para>
 
           <para>
             �ޤ���FreeBSD Ports Collection
-            ��<ulink URL="http://www.FreeBSD.org/ports/databases.html">�ǡ����١���</ulink>�Υ��������⻲�ͤˤʤ�Ǥ��礦��
+            ��<ulink url="http://www.FreeBSD.org/ports/databases.html">�ǡ����١���</ulink>�Υ��������⻲�ͤˤʤ�Ǥ��礦��
           </para>
         </answer>
       </qandaentry>
@@ -5656,11 +5659,11 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
             <itemizedlist>
               <listitem>
-                <para><ulink URL="http://www.scc.nl/~marcel/howto-oracle.html">http://www.scc.nl/~marcel/howto-oracle.html</ulink></para>
+                <para><ulink url="http://www.scc.nl/~marcel/howto-oracle.html">http://www.scc.nl/~marcel/howto-oracle.html</ulink></para>
               </listitem>
 
               <listitem>
-                <para><ulink URL="http://www.lf.net/lf/pi/oracle/install-linux-oracle-on-freebsd">http://www.lf.net/lf/pi/oracle/install-linux-oracle-on-freebsd</ulink></para>
+                <para><ulink url="http://www.lf.net/lf/pi/oracle/install-linux-oracle-on-freebsd">http://www.lf.net/lf/pi/oracle/install-linux-oracle-on-freebsd</ulink></para>
               </listitem>
             </itemizedlist>
         </answer>
@@ -5686,7 +5689,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
         <answer>
           <para>FreeBSD�˰ܿ����줿���եȥ������ѥå������ˤĤ��Ƥϡ�
-            <ulink URL="http://www.FreeBSD.org/ports/">FreeBSD Ports Collection
+            <ulink url="http://www.FreeBSD.org/ports/">FreeBSD Ports Collection
               �Υڡ���</ulink>��������������
             ���Υꥹ�Ȥˤϸ��� 3400 ��ۤ�����ܤ����ꡢ
             ������������������Ƥ��ޤ������Υڡ����򤳤ޤ��ˬ��뤫��
@@ -5735,21 +5738,21 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
               <varlistentry>
                 <term>2.2.8-RELEASE/2.2.8-STABLE ��</term>
                 <listitem>
-                  <para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-2.2.8/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-2.2.8/</ulink></para>
+                  <para><ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-2.2.8/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-2.2.8/</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term>3.X-RELEASE/3.X-STABLE ��</term>
                 <listitem>
-                  <para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-3-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-3-stable/</ulink></para>
+                  <para><ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-3-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-3-stable/</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
                 <term> 4.X-RELEASE/4-STABLE ��</term>
                 <listitem>
-                  <para><ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
+                  <para><ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
                 </listitem>
               </varlistentry>
 
@@ -5768,7 +5771,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
           <para>
             ������ ports ��³�����ɲä���Ƥ�����֤ʤΤǡ����٤Ƥ� ports ��
             �б����� package ��¸�ߤ���櫓�ǤϤʤ����Ȥ�Ф��Ƥ����Ƥ���������
-            ����� <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
+            ����� <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
             �ޥ����������Ȥ�ˬ��ơ��ɤΤ褦��
             package �����ѤǤ���Τ������å�����Τ��ɤ��Ǥ��礦��
           </para>
@@ -5915,7 +5918,7 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx</screen>
 
         <answer>
           <para>inn �� package �� port �򥤥󥹥ȡ��뤷�����Ȥ�
-            <ulink URL="http://www.cis.ohio-state.edu/~barr/INN.html">Dave Barr's
+            <ulink url="http://www.cis.ohio-state.edu/~barr/INN.html">Dave Barr's
               INN Page</ulink> �򸫤Ƥߤޤ��礦���鿴�Ը����� INN FAQ ������ޤ���
           </para>
         </answer>
@@ -5941,9 +5944,9 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx</screen>
 
         <answer>
           <para>�Ϥ���
-            <ulink URL="http://www.FreeBSD.org/java/">http://www.FreeBSD.org/java/</ulink>
+            <ulink url="http://www.FreeBSD.org/java/">http://www.FreeBSD.org/java/</ulink>
             ��������������
-            <ulink URL="../java/">���ܸ���</ulink>
+            <ulink url="../java/">���ܸ���</ulink>
             �⤢��ޤ���
           </para>
         </answer>
@@ -5960,7 +5963,7 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx</screen>
           <para>
             �⤷�����λ����� -CURRENT �� -STABLE
             ����٤Ƥ��äȸŤ��С������� FreeBSD �����Ѥ��Ƥ���ʤ顢
-            <ulink URL="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink>
+            <ulink url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink>
             �ˤ��� ports ���åץ��졼�ɥ��åȤ�ɬ�פǤ���
             �ǿ��� FreeBSD �����Ѥ��Ƥ���Τ�ȯ��������Ϥ����餯��
             -CURRENT �Ǥ�����ʤΤ� -STABLE �ǤϤ��ޤ�ư���ʤ��ʤ�褦���ѹ�������
@@ -6049,7 +6052,7 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx</screen>
         <answer>
           <para>
             �����񤷤�����ޤ���
-            <ulink URL="../handbook/kernelconfig.html">�����ͥ�κƹ���</ulink>��Ĵ�٤Ƥ���������
+            <ulink url="../handbook/kernelconfig.html">�����ͥ�κƹ���</ulink>��Ĵ�٤Ƥ���������
           </para>
 
           <note>
@@ -6319,7 +6322,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
         </question>
 
         <answer>
-          <para><ulink URL="../../tutorials/formatting-media/">www.FreeBSD.org</ulink>
+          <para><ulink url="../../tutorials/formatting-media/">www.FreeBSD.org</ulink>
             �˽񤫤�Ƥ���ǥ������ե����ޥåȥ��塼�ȥꥢ��򻲾Ȥ��Ƥ���������</para>
         </answer>
       </qandaentry>
@@ -6338,8 +6341,8 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
             ���ȤϤɤΥǥХ����Ǥ�����Ʊ���褦�˿ʤߤޤ���
           </para>
 
-          <para><anchor id="disklabel">
-              (���Υ���������<ulink URL="http://www.vmunix.com/mark/FreeBSD/ZIP-FAQ.html">Mark Mayo's ZIP FAQ</ulink> �˴�Ť��Ƥ��ޤ�)
+          <para><anchor id="disklabel"/>
+              (���Υ���������<ulink url="http://www.vmunix.com/mark/FreeBSD/ZIP-FAQ.html">Mark Mayo's ZIP FAQ</ulink> �˴�Ť��Ƥ��ޤ�)
           </para>
 
           <para>
@@ -6578,7 +6581,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
             <literal>NT</literal>:
             FreeBSD �Ѥ��ɤߤ����Τ߲�ǽ�� NTFS �ɥ饤�Ф�����ޤ���
             �ܤ����ϡ�Mark Ovens ��ˤ�äƽ񤫤줿���塼�ȥꥢ��
-            <ulink URL="http://ukug.uk.freebsd.org/~mark/ntfs_install.html">http://ukug.uk.freebsd.org/~mark/ntfs_install.html</ulink>
+            <ulink url="http://ukug.uk.freebsd.org/~mark/ntfs_install.html">http://ukug.uk.freebsd.org/~mark/ntfs_install.html</ulink>
             ��������������
           </para>
 
@@ -6762,7 +6765,7 @@ C:\="DOS"</programlisting>
           </para>
 
           <para>
-            <ulink URL="http://sunsite.unc.edu/LDP/HOWTO/mini/Linux+FreeBSD.html">Linux+FreeBSD
+            <ulink url="http://sunsite.unc.edu/LDP/HOWTO/mini/Linux+FreeBSD.html">Linux+FreeBSD
               mini-HOWTO</ulink> �� FreeBSD �� Linux
             �Ȥ���ߤ˻Ȥ���褦�ˤ��뤿��Τ褤���ͻ����ˤʤ�Ǥ��礦��
           </para>
@@ -6799,7 +6802,7 @@ C:\="DOS"</programlisting>
         </question>
 
         <answer>
-          <para><anchor id="dedicate">
+          <para><anchor id="dedicate"/>
               ���󥹥ȡ������桢
               �ϡ��ɥǥ������Υѡ��ƥ��������ڤ�ݤ�
               2 �Ĥ���ˡ�����֤��Ȥ��Ǥ��ޤ���
@@ -7045,7 +7048,7 @@ C:\="DOS"</programlisting>
         <answer>
           <para>�ϥ�ɥ֥å��Υץ�󥿤���ʬ�򻲾Ȥ��Ƥ���������
             õ���Ƥ�������ΤۤȤ�ɤ��񤫤�Ƥ���Ϥ��Ǥ���
-            <ulink URL="../handbook/printing.html">FreeBSD
+            <ulink url="../handbook/printing.html">FreeBSD
               �ϥ�ɥ֥å��Ρ֥ץ�󥿤����ѡ�</ulink>��������������
           </para>
 
@@ -8568,7 +8571,7 @@ define(`confDELIVERY_MODE', `deferred')dnl</programlisting>
               &man.xdm.1; ��¹Ԥ��뤫�Ǥ���</para>
 
           <para>��ư���� &man.xdm.1; ��¹Ԥ�����ˡ�ξܺ٤ˤĤ��Ƥϡ�
-            <xref linkend="xdm-boot"> �򻲾Ȥ��Ƥ���������</para>
+            <xref linkend="xdm-boot"/> �򻲾Ȥ��Ƥ���������</para>
         </answer>
       </qandaentry>
 
@@ -8587,7 +8590,7 @@ define(`confDELIVERY_MODE', `deferred')dnl</programlisting>
             moused ���ͳ���� sysmouse �ǥХ����ؽ��Ϥ���ޤ���
             ��İʾ�β��ۥ��󥽡���� X ��
             <emphasis>ξ����</emphasis> �ޥ�����Ȥ�������硢
-            <xref linkend="moused" remap="another section">
+            <xref linkend="moused" remap="another section"/>
             �򻲾Ȥ��� moused �����ꤷ�Ƥ���������
           </para>
 
@@ -8631,7 +8634,7 @@ Device          "/dev/sysmouse"
         <answer>
           <para>�Ϥ����������Ȥ��ޤ��������Τ���ˤ�
             X ���饤����ȥץ�������Ŭ�ڤ����ꤹ��ɬ�פ�����ޤ�������ˤĤ��Ƥϡ�
-            <ulink URL="http://www.inria.fr/koala/colas/mouse-wheel-scroll/">Colas Nahaboo
+            <ulink url="http://www.inria.fr/koala/colas/mouse-wheel-scroll/">Colas Nahaboo
               ��Υ����֥ڡ���(http://www.inria.fr/koala/colas/mouse-wheel-scroll/)</ulink>
             �򻲾Ȥ��Ƥ���������</para>
 
@@ -9124,7 +9127,7 @@ ttyvb   "/usr/libexec/getty Pc"         cons25  off secure</programlisting>
 
         <answer>
           <para>
-            <ulink URL="http://www.FreeBSD.org/cgi/man.cgi?manpath=xfree86&amp;query=xdm">xdm</ulink>
+            <ulink url="http://www.FreeBSD.org/cgi/man.cgi?manpath=xfree86&amp;query=xdm">xdm</ulink>
             �ε�ư��ˡ�ˤĤ��Ƥ���Ĥ�ή�ɤ�����ޤ���
             ������ή�ɤǤ��󶡤��줿�����Ѥ��� xdm ��
             <filename>/etc/ttys</filename> (&man.ttys.5; ����)
@@ -9568,7 +9571,7 @@ bitmap_name="/boot/splash.pcx"</programlisting>
 
           <para>
             ���ơ����Ȥϥ��ץ�å��她���꡼����Ѱդ�������Ǥ���
-            ����ˤ� <ulink URL="http://www.baldwin.cx/splash/">http://www.baldwin.cx/splash/</ulink>
+            ����ˤ� <ulink url="http://www.baldwin.cx/splash/">http://www.baldwin.cx/splash/</ulink>
             �Υ����꡼�򥵡��դ��ƤߤƤ���������
           </para>
         </answer>
@@ -9695,7 +9698,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
             �Ȥ����Τϡ�FreeBSD ���ͥåȥ����ǵ�ư����
             ɬ�פʥե������ʬ�Υϡ��ɥǥ������ǤϤʤ��ƥ����Ф����ɤ߹����ΤǤ���
             �ܺ٤ˤĤ��Ƥ�
-            <ulink URL="../handbook/diskless.html">FreeBSD
+            <ulink url="../handbook/diskless.html">FreeBSD
               �ϥ�ɥ֥å��Ρ֥ǥ������쥹�֡��ȡ�</ulink>���ɤ�Ǥ���������
           </para>
         </answer>
@@ -9736,7 +9739,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
             FreeBSD �ˤ� BSD ��ɸ���ϩ����ǡ����Ǥ���
             &man.routed.8;
             ����°���Ƥ��ޤ��������ʣ���ʾ������н褹�뤿��ˤ�
-            <application>GaTeD</application>(<ulink URL="http://www.gated.org/">http://www.gated.org/</ulink>
+            <application>GaTeD</application>(<ulink url="http://www.gated.org/">http://www.gated.org/</ulink>
             ���������ǽ) ����Ѥ��뤳�Ȥ�Ǥ��ޤ���
             3_5Alpha7 �ˤ����� FreeBSD �����ݡ��Ȥ���Ƥ��ޤ���
           </para>
@@ -9948,7 +9951,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
 
           <para>
             �������˴ؤ��Ƥ�
-            <ulink URL="../handbook/nfs.html">FreeBSD
+            <ulink url="../handbook/nfs.html">FreeBSD
               �ϥ�ɥ֥å��Ρ�NFS��</ulink>�򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -10113,7 +10116,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
 
           <para>
             �ܤ��������
-            <ulink URL="http://www.mbone.com/">Mbone Information Web</ulink>
+            <ulink url="http://www.mbone.com/">Mbone Information Web</ulink>
             �ˤ���ޤ���
           </para>
         </answer>
@@ -10129,7 +10132,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
 
         <answer>
           <para>
-            <ulink URL="mailto:gfoster@driver.nsta.org">Glen Foster
+            <ulink url="mailto:gfoster@driver.nsta.org">Glen Foster
               ��</ulink>�ˤ������ˡ�
             �Ƕ�����ʤ��ɲä�����Τ�ʲ��˼����ޤ���
           </para>
@@ -10254,7 +10257,7 @@ Znyx            (2.2.X) ZX312, ZX314, ZX342, ZX345, ZX346, ZX348
 
           <para>
             FreeBSD �Υե������������������ˤĤ��Ƥξ����
-            <ulink URL="../handbook/firewalls.html">FreeBSD
+            <ulink url="../handbook/firewalls.html">FreeBSD
               �ϥ�ɥ֥å��Ρ֥ե��������������</ulink>�ˤ���ޤ���
           </para>
         </answer>
@@ -10458,8 +10461,8 @@ Znyx            (2.2.X) ZX312, ZX314, ZX342, ZX345, ZX346, ZX348
         <answer>
           <para>
             FreeBSD �ѤΥХ���������ġ���ˤϡ�̵���Ǽ���������
-            <ulink URL="http://www.csl.sony.co.jp/person/kjc/programs.html">ALTQ</ulink> �ȡ�
-            <ulink URL="http://www.etinc.com/">Emerging Technologies</ulink>
+            <ulink url="http://www.csl.sony.co.jp/person/kjc/programs.html">ALTQ</ulink> �ȡ�
+            <ulink url="http://www.etinc.com/">Emerging Technologies</ulink>
             ��������Ǥ��� Bandwidth Manager
             �Ȥ������ΤΤ�Τ� 2 ���ब����ޤ���
           </para>
@@ -10518,7 +10521,7 @@ Znyx            (2.2.X) ZX312, ZX314, ZX342, ZX345, ZX346, ZX348
 
           <para>
             �ǥХ����Ρ��ɤκ����ξܺ٤ϡ�
-            <ulink URL="../handbook/kernelconfig-nodes.html">FreeBSD
+            <ulink url="../handbook/kernelconfig-nodes.html">FreeBSD
               �ϥ�ɥ֥å��Ρ֥ǥХ����Ρ��ɡ�</ulink>�򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -10610,7 +10613,7 @@ Znyx            (2.2.X) ZX312, ZX314, ZX342, ZX345, ZX346, ZX348
             �ޤ�
             &man.ppp.8;
             �Υޥ˥奢��ȡ�
-            <ulink URL="../handbook/ppp-and-slip.html#USERPPP">FreeBSD
+            <ulink url="../handbook/ppp-and-slip.html#USERPPP">FreeBSD
               �ϥ�ɥ֥å��Ρ�PPP��</ulink>���ɤ�Ǥߤޤ��礦��
             ���ˡ�
           </para>
@@ -10655,7 +10658,7 @@ Znyx            (2.2.X) ZX312, ZX314, ZX342, ZX345, ZX346, ZX348
           <para>
             ������� <command>ppp</command> �ΥС�������
             <quote><literal>set log</literal></quote>
-            ̿����ᤷ�ʤ����ϡ�<ulink URL="http://people.FreeBSD.org/~brian/">�ǿ���</ulink>�����������ɤ��٤��Ǥ���
+            ̿����ᤷ�ʤ����ϡ�<ulink url="http://people.FreeBSD.org/~brian/">�ǿ���</ulink>�����������ɤ��٤��Ǥ���
             FreeBSD �� 2.1.5 �ʹߤǥӥ�ɤǤ��ޤ���
           </para>
         </answer>
@@ -10748,7 +10751,7 @@ default            10.0.0.2           UGSc        0        0      tun0
           <para>
             �ιԤ򤦤ä���ä��Ƥ��ޤä���ǽ��������ޤ���
             ���ξ��ϡ�
-            <ulink URL="../handbook/ppp-and-slip.html#USERPPP-FINAL">FreeBSD
+            <ulink url="../handbook/ppp-and-slip.html#USERPPP-FINAL">FreeBSD
               �ϥ�ɥ֥å��Ρ֥����ƥ�κǽ������</ulink>�ι���ɤ�ľ���Ƥ���������
           </para>
         </answer>
@@ -10787,7 +10790,7 @@ add 0 0 HISADDR</screen>
 
           <para>
             �ܤ�������ˤĤ��Ƥϡ�
-            <ulink URL="../handbook/ppp-and-slip.html#USERPPP-DYNAMICIP">FreeBSD
+            <ulink url="../handbook/ppp-and-slip.html#USERPPP-DYNAMICIP">FreeBSD
               �ϥ�ɥ֥å��Ρ�PPP ��ưŪ IP �����</ulink>�ι�򻲾Ȥ��Ƥ���������
           </para>
         </answer>
@@ -11833,7 +11836,7 @@ ATDT1234567</programlisting>
               <para>
                 ��������Ϻ�ƣ �߰줵���� <acronym>NAT</acronym>
                 �ѥå���ȤäƤ���Ǥ��ޤ���
-                <ulink URL="http://www2a.biglobe.ne.jp/~junichi/freebsd/lowtech/nat.html">NAT on iij-ppp</ulink>��������������
+                <ulink url="http://www2a.biglobe.ne.jp/~junichi/freebsd/lowtech/nat.html">NAT on iij-ppp</ulink>��������������
               </para>
             </note>
             -->
@@ -11984,7 +11987,7 @@ nat port tcp <replaceable>internal</replaceable>:5631 5631</programlisting>
                   <programlisting>nat port udp <replaceable>internal</replaceable>:6112 6112</programlisting>
 
                   <para>���Τ褦�����ꤹ������ˡ�
-                    <ulink URL="http://www.battle.net/support/proxy/">www.battle.net</ulink>
+                    <ulink url="http://www.battle.net/support/proxy/">www.battle.net</ulink>
                     �� Quake �Υץ����� (proxy) �����ݡ��Ȥ���Ƥ��뤫Ĵ�٤Ƥ⤤���Ǥ��礦��
                   </para>
                 </listitem>
@@ -12072,7 +12075,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
         </answer>
       </qandaentry>
 
-      <qandaentry id=PPPoEwithNAT>
+      <qandaentry id="PPPoEwithNAT">
         <question id="macos-win98-pppoe-freeze">
           <para>�����ȥ������� PPPoE ��¹Ԥ���� MacOS ��
             Windows 98 �Ȥ���³���ե꡼�����Ƥ��ޤ��ΤǤ�����
@@ -12128,7 +12131,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
           <para>
             FreeBSD/NAT/PPPoE �롼���ȶ�¸�����뤿��� Windoze �� MTU
             ���ѹ�������ˡ�˴ؤ���ܺ٤ϡ�
-            <ulink URL="http://search.support.microsoft.com/kb">Microsoft Knowledge
+            <ulink url="http://search.support.microsoft.com/kb">Microsoft Knowledge
             Base</ulink> �ˤ��롢
             �ֹ� <quote>Q158474 - Windows TCPIP Registry Entries</quote>��
             ������ֹ�
@@ -12138,7 +12141,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
 
           <para>��ǰ�ʤ��Ȥˡ�MacOS �ˤ�
             TCP/IP ������ѹ�������ˡ������ޤ���
-            ��������<ulink URL="http://www.softworks.com/">Sustainable Softworks ��</ulink>
+            ��������<ulink url="http://www.softworks.com/">Sustainable Softworks ��</ulink>
             �����䤷�Ƥ��� OTAdvancedTuner (OT �� OpenTransport �Ȥ���
             MacOS �� TCP/IP �����å���̾���Τ���) �Τ褦�ʾ��ѥ��եȥ�������¸�ߤ��ޤ���
             ���Υ��եȥ������ϡ��桼������ TCP/IP ������ѹ���Ԥʤ����Ȥ��ǽ�ˤ��ޤ���
@@ -12176,7 +12179,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
             ���ʤ��λ��äƤ��뤹�٤Ƥξ����
             &a.questions;
             ��
-            <ulink URL="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</ulink>
+            <ulink url="news:comp.unix.bsd.freebsd.misc">comp.unix.bsd.freebsd.misc</ulink>
             �˥塼�����롼�פ����äƤ���������ï�������ʤ���������������Ƴ���Ƥ����Ǥ��礦��
           </para>
         </answer>
@@ -12197,7 +12200,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
       ���Υ��������Ǥϡ�FreeBSD �ǥ��ꥢ����³�򤹤���ΰ���Ū�ʼ���������ޤ���
       <acronym>PPP</acronym> �����
       <acronym>SLIP</acronym> �ˤĤ��Ƥϡ�
-      <xref linkend="networking" remap="�ͥåȥ����">�Υ��������򻲾Ȥ��Ƥ���������
+      <xref linkend="networking" remap="�ͥåȥ����"/>�Υ��������򻲾Ȥ��Ƥ���������
     </para>
 
     <qandaset>
@@ -12516,7 +12519,7 @@ device sio7 at isa? port 0x2b8 tty flags 0x781 irq 7 vector siointr</programlist
             ������ϡ��ݡ��Ȥ� <literal>insecure</literal>
             �Ǥ��������Υݡ��Ȥ� <username>root</username> �ˤʤ�ˤϡ�
             ���̥桼�����Ȥ��ƥ������󤷡����줫��
-            <quote><ulink URL="http://www.FreeBSD.org/cgi/man.cgi?su">su</ulink></quote> ��Ȥä�
+            <quote><ulink url="http://www.FreeBSD.org/cgi/man.cgi?su">su</ulink></quote> ��Ȥä�
             <username>root</username> �ˤʤäƤ���������
             �⤷��<literal>secure</literal>
             ����ꤷ���ʤ�С�
@@ -13040,7 +13043,7 @@ raisechar=^^</programlisting>
             �ޥ����ܡ��ɤ䥷�ꥢ�륫���ɤ� Acer �� UART ���åפ�Ȥä�ʪ�ξ�硢
             FreeBSD �� <devicename>sio</devicename> �ɥ饤�ФǤ����������Ф����������ޤ���
             ����������褹�뤿��ˤϡ�
-            <ulink URL="http://www.lemis.com/serial-port-patch.html">www.lemis.com</ulink>
+            <ulink url="http://www.lemis.com/serial-port-patch.html">www.lemis.com</ulink>
             ����ѥå������ꤷ�Ƥ���������
           </para>
         </answer>
@@ -13490,7 +13493,7 @@ raisechar=^^</programlisting>
             ���ѤϤޤ��ޤ��ǡ����ꤵ�줿�����ӥ������ѤǤ��ޤ���</para>
 
           <para>M-Net �Ȥ��Ƥ��Τ��� <ulink
-            URL="http://www.arbornet.org/">Arbornet, Inc</ulink> ��
+            url="http://www.arbornet.org/">Arbornet, Inc</ulink> ��
             1983 ǯ���� Unix �����ƥ�ؤΥ����������󶡤��Ƥ��ޤ���
             System III ��ư��� Altos �˻Ϥޤꡢ1991 ǯ�ˤ�
             BSD/OS �˰ܹԤ��ޤ�����2000 ǯ 6 ��ˤϡ��Ƥ� FreeBSD ��
@@ -13501,7 +13504,7 @@ raisechar=^^</programlisting>
             ���Ԥ����¤���Ƥ��ޤ����ޤ���M-Net �ϷǼ��ĥ����ƥ��
             ����������åȤ��󶡤��Ƥ��ޤ���</para>
 
-          <para><ulink URL="http://www.grex.org/">Grex</ulink> �ϡ�
+          <para><ulink url="http://www.grex.org/">Grex</ulink> �ϡ�
             �Ǽ��ĥ����ƥ������������åȥ��եȥ�������Ʊ���Ǥ��뤳�Ȥ�ޤᡢ
             M-Net �Ȥ褯���������Ȥ��󶡤��Ƥ��ޤ�����������
             �ޥ���� Sun 4M �ǡ�SunOS ��ư��Ƥ��ޤ���</para>
@@ -13516,7 +13519,7 @@ raisechar=^^</programlisting>
 
         <answer>
           <para>
-            <ulink URL="http://www.FreeBSD.org/cgi/ports.cgi?^sup">SUP</ulink>
+            <ulink url="http://www.FreeBSD.org/cgi/ports.cgi?^sup">SUP</ulink>
             �Ȥϡ����եȥ��������åץǡ��ȥץ��ȥ��� (Software Update Protocol) ��
             �����ͥ����������� (CMU) �dz�ȯ�ĥ꡼��Ʊ���Τ���˳�ȯ����ޤ�����
             �䤿�����濴��ȯ�ĥ꡼���⡼�ȥ����Ȥ�Ʊ�������뤿��˻ȤäƤ��ޤ�����
@@ -13525,7 +13528,7 @@ raisechar=^^</programlisting>
           <para>
             SUP �ϥХ������ϲ�񤷤ޤ��Τǡ����ϻȤäƤ��ޤ���
             �����������ɤΥ��åץǡ��Ȥθ��ߤΤ����������ˡ��
-            <ulink URL="../handbook/synching.html#CVSUP">FreeBSD
+            <ulink url="../handbook/synching.html#CVSUP">FreeBSD
               �ϥ�ɥ֥å��Ρ�CVSup��</ulink>�ˤ���ޤ���
           </para>
         </answer>
@@ -13915,7 +13918,7 @@ raisechar=^^</programlisting>
 
         <answer>
           <para>���ߡ�FreeBSD ��
-            <ulink URL="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS ��ݥ��ȥ�</ulink>
+            <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS ��ݥ��ȥ�</ulink>
             �ˤϡ����ĤΥ����ƥ���/�ॢ���ƥ��֤ʥ֥���������ޤ�
             (�����ƥ��֤ʳ�ȯ�֥����ϻ��Ĥ���¸�ߤ��ʤ����ᡢ
             �����餯 RELENG_2 �֥������ѹ���ǯ�� 2 ������ˤʤ�Ǥ��礦)��</para>
@@ -13994,7 +13997,7 @@ raisechar=^^</programlisting>
           <para>
             ���ˡ�CVS ��ݥ��ȥ����Τ�긵�ˤ����Ƥ���ɬ�פ�����ޤ���
             ��������ꤹ��ˤ�
-            <ulink URL="../handbook/synching.html#CVSUP">CVSUP</ulink>
+            <ulink url="../handbook/synching.html#CVSUP">CVSUP</ulink>
             �����ѤǤ��ޤ�����supfile �� release ��̾�Τ� cvs �ˤ���
             ¾�Υ����� date �ե�����ɤ�������ɬ�פ�����ޤ���
           </para>
@@ -14130,7 +14133,7 @@ doc-all</programlisting>
         <answer>
           <para>
             �Ϥ���
-            <ulink URL="../handbook/synching.html#CTM">CTM
+            <ulink url="../handbook/synching.html#CTM">CTM
               �����ƥ�</ulink>��Ȥäơ�
             �������ĥ꡼���ΤΥ���������ɤ�<emphasis>�Ԥʤ鷺</emphasis>���ɤ������뤳�Ȥ��Ǥ��ޤ���
           </para>
@@ -14170,7 +14173,7 @@ doc-all</programlisting>
 
         <answer>
           <para>
-            <ulink URL="../handbook/contrib.html">FreeBSD
+            <ulink url="../handbook/contrib.html">FreeBSD
               �ϥ�ɥ֥å��Ρ�FreeBSD �ؤι׸���</ulink>�򻲾Ȥ��Ƥ���������
           </para>
 
@@ -14188,7 +14191,7 @@ doc-all</programlisting>
 
         <answer>
           <para>
-            <ulink URL="mailto:uhclem@nemesis.lonestar.org">Frank Durda IV ��</ulink> ���:
+            <ulink url="mailto:uhclem@nemesis.lonestar.org">Frank Durda IV ��</ulink> ���:
           </para>
 
           <blockquote>
@@ -14314,7 +14317,7 @@ doc-all</programlisting>
             ��¾�Υ������ƥ�����ؤΰܿ��˴ؿ��򼨤��Ƥ��ꡢ
             FreeBSD/AXP (ALPHA) �Ϥ��������̤Ȥ��ƤϤȤƤ�����������Τΰ�ĤǤ���
             FreeBSD/AXP �ϸ���
-            <ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/alpha/">ftp://ftp.FreeBSD.org/pub/FreeBSD/alpha</ulink>
+            <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/alpha/">ftp://ftp.FreeBSD.org/pub/FreeBSD/alpha</ulink>
             ��������Ǥ��ޤ���
             ALPHA �ؤΰܿ��Ǥ�����ư������������ĤĤ��ꡢ
             ������ˤ� AlphaStation��AXPpci��PC164��Miata ������ Multia
@@ -14844,7 +14847,7 @@ SECTIONS
       &a.jp.doc-jp;
       �ޤǤ�Ϣ������������
       �ޤ����⤷�䤿���κ�Ȥ�����äƤ����ʤ顢
-      <ulink URL="http://www.jp.FreeBSD.org/doc-jp/">FreeBSD
+      <ulink url="http://www.jp.FreeBSD.org/doc-jp/">FreeBSD
         ���ܸ�ɥ�����ơ������ץ��������ȤΥڡ���</ulink>�����ξ塢���󻲲ä��Ƥ���������
     </para>
 
diff --git a/ja_JP.eucJP/books/fdp-primer/book.sgml b/ja_JP.eucJP/books/fdp-primer/book.sgml
index 4390ba91f7..9b6bb4dd5b 100644
--- a/ja_JP.eucJP/books/fdp-primer/book.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/book.sgml
@@ -1,3 +1,12 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml
+%entities;
+<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
+<!-- ENTITY index SYSTEM "index.sgml" -->
+]>
+
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -33,20 +42,12 @@
      $FreeBSD$
 -->
 
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
-<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!ENTITY % not.published "INCLUDE">
-<!-- ENTITY index SYSTEM "index.sgml" -->
-]>
-
 <!--
 ��:
 ���Ȥ���@ForUs ken@forus.or.jp
 -->
 
-<book>
+<book lang='ja'>
   <bookinfo>
     <title>�������׸��ԤΤ���� FreeBSD �ɥ�����ơ������ץ�������������</title>
 
diff --git a/ja_JP.eucJP/books/fdp-primer/chapters.ent b/ja_JP.eucJP/books/fdp-primer/chapters.ent
index 33da333bbd..e11e0e134b 100644
--- a/ja_JP.eucJP/books/fdp-primer/chapters.ent
+++ b/ja_JP.eucJP/books/fdp-primer/chapters.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP"?>
 <!-- 
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml b/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml
index 53c50a81f0..4b9f5adf22 100644
--- a/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -65,7 +66,7 @@
 
       <programlisting><![ CDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
-<book>
+<book lang='ja'>
   <bookinfo>
     <title>An Example Book</title>
     
@@ -117,7 +118,7 @@
 
       <programlisting><![ CDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
-<article>
+<article lang='ja'>
   <articleinfo>
     <title>An example article</title>
 
diff --git a/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml
index 076bde34b3..4c2a06acb3 100644
--- a/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml
index 7fe5e02d31..85bbd7deb6 100644
--- a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml
index cb377f28bf..8c91dcb232 100644
--- a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml
index fedb95dd58..f5078cff03 100644
--- a/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml
index 819c2bbdca..b8e2975c5c 100644
--- a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.sgml
index d080b06db2..e2232d1638 100644
--- a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml
index 97d5bf1574..de33ab3c91 100644
--- a/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml
index 0778c70925..9ac915f1b2 100644
--- a/ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml
index 4f9b8d7365..86751908d1 100644
--- a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -294,7 +295,7 @@ saugroup END</programlisting>
 	</para>
 
 	<informalexample>
-	  <programlisting><![ CDATA [<article>
+	  <programlisting><![ CDATA [<article lang='ja'>
   <articleinfo>
     <title>NIS</title>
 
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 4ea2c550eb..6b3d89be82 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -350,10 +350,12 @@ CLEANFILES+=	mirrors.sgml.ftp.inc mirrors.sgml.ftp.inc.tmp \
 
 .for p in ftp cvsup
 mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
-	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-	    < $@.tmp > $@ || (${RM} -f $@ && false)
+	${CP} ${.ALLSRC} ${.TARGET}
+#	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
+#	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
 eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
-	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-	    < $@.tmp > $@ || (${RM} -f $@ && false)
+	${CP} ${.ALLSRC} ${.TARGET}
+#	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
+#	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
index 3471715628..5d18f7ad8a 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -488,7 +489,7 @@ Local1 (10.20.30.1, 10.9.9.30)  --&gt;  T1-GW (10.9.9.1)
 	<para>�֥�å���Ʊ���˥ե������������뵡ǽ�����Ѥ��褦�Ȥ��Ƥ���
 	  ���ˤϡ� IPFIREWALL ���ץ�������ꤹ��ɬ�פ�����ޤ���
 	  �֥�å���ե�������������Ȥ������ꤹ��ݤΰ���Ū��
-	  ����˴ؤ��Ƥϡ� <xref linkend="firewalls">
+	  ����˴ؤ��Ƥϡ� <xref linkend="firewalls"/>
 	  �򻲾Ȥ��Ƥ���������</para>
 
 	<para>IP �ʳ��Υѥ��å� (ARP �ʤ�) ���֥�å����̲᤹��褦��
@@ -2206,7 +2207,7 @@ basie&prompt.root; <userinput>cat /etc/master.passwd</userinput>
 root:[password]:0:0::0:0:The super-user:/root:/bin/csh
 toor:[password]:0:0::0:0:The other super-user:/root:/bin/sh
 daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin
-operator:*:2:5::0:0:System &:/:/sbin/nologin
+operator:*:2:5::0:0:System &amp;:/:/sbin/nologin
 bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
 tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin
 kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin
@@ -2820,7 +2821,7 @@ lrwxr-xr-x  1 root  wheel     14 Nov  8 14:27 /usr/lib/libscrypt.so@ -> libscryp
             <literal>pseudo-device bpf</literal>
             �Ȥ����Ԥ��ɲä��� �����ͥ��ƹ��ۤ��ޤ���
             �����ͥ�ι��ۤ˴ؤ���ܺ٤ϡ�
-            <xref linkend="kernelconfig"> �򻲾Ȥ��Ƥ���������</para>
+            <xref linkend="kernelconfig"/> �򻲾Ȥ��Ƥ���������</para>
 
           <para><devicename>bpf</devicename> �ǥХ����ϡ�
             FreeBSD �νвٻ����Ѱդ���Ƥ���
diff --git a/ja_JP.eucJP/books/handbook/backups/chapter.sgml b/ja_JP.eucJP/books/handbook/backups/chapter.sgml
index 0a3bc63d69..9676087d02 100644
--- a/ja_JP.eucJP/books/handbook/backups/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/backups/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.sgml b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
index 445793b50a..755c5e61f4 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -231,10 +232,12 @@
 	</author>
       </authorgroup>
     </sect1info>
+
+    <title>�ե����륷���ƥॢ����������ꥹ��</title>
+
     <indexterm>
       <primary>ACL</primary>
     </indexterm>
-    <title>�ե����륷���ƥॢ����������ꥹ��</title>
 
     <para>���ʥåץ���åȤΤ褦�ʥե����륷���ƥ�γ�ĥ��Ϣ�Ȥ��ơ�
       FreeBSD 5.0 �ʹߤǤϥե����륷���ƥॢ����������ꥹ��
@@ -640,7 +643,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_html</programlisting>
 	  <term><literal>device</literal></term>
 	  <listitem>
 	    <para>�ǥХ�����̾�� (¸�ߤ��Ƥ��ʤ���Фʤ�ޤ���)��
-	      <xref linkend="disks-naming"> ������������ޤ���</para>
+	      <xref linkend="disks-naming"/> ������������ޤ���</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1709,7 +1712,7 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting>
       <title>���󥰥�桼���⡼�ɤΥ��󥽡���</title>
 
       <para><quote>���󥰥�桼���⡼��</quote> �Ȥϲ����Ȥ����ܤ��������ϡ�
-	<xref linkend="boot-singleuser"> �ˤ���ޤ���FreeBSD ��
+	<xref linkend="boot-singleuser"/> �ˤ���ޤ���FreeBSD ��
 	���󥰥�桼���⡼�ɤ�ư�����Ƥ�����ϰ�Ĥ������󥽡��뤬
 	�ʤ��Ȥ������Ȥ����դ��Ƥ������ͤ���Ǥ��礦�����ۥ��󥽡����
 	���ѤǤ��ޤ��󡣥��󥰥�桼���⡼�ɤΥ��󥽡��������ϡ�Ʊ����
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml b/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
index 1601ee9c13..ad47760179 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.sgml
index 6fa5a06d5a..53249da5ef 100644
--- a/ja_JP.eucJP/books/handbook/book.sgml
+++ b/ja_JP.eucJP/books/handbook/book.sgml
@@ -1,3 +1,15 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+
+<!ENTITY % chapters SYSTEM "chapters.ent">
+%chapters;
+<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
+%txtfiles;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -6,58 +18,7 @@
      $FreeBSD$
 -->
 
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
-<!ENTITY % chapters SYSTEM "chapters.ent">
-%chapters;
-<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
-%txtfiles;
-
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
-<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
-]>
-
-<book>
+<book lang='ja'>
   <bookinfo>
     <title>FreeBSD �ϥ�ɥ֥å�</title>
 
@@ -65,6 +26,8 @@
 
     <pubdate>1999 ǯ 2 ��</pubdate>
 
+    <releaseinfo>$FreeBSD$</releaseinfo>
+
     <copyright>
       <year>1995</year>
       <year>1996</year>
@@ -87,7 +50,7 @@
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
-    &bookinfo.legalnotice;
+    &legalnotice;
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -143,7 +106,7 @@
         �⤷�����Υϥ�ɥ֥å����Խ�����ץ��������Ȥ˶��Ϥ������Ȥ��ͤ��ʤ顢
 	&a.doc; �ޤ��Żҥ᡼���(�Ѹ��)���äƤ���������
 	����ʸ��κǿ��С������ϡ����ĤǤ�
-	<ulink URL="http://www.jp.FreeBSD.org/">���ܹ����Ǥ�
+	<ulink url="http://www.jp.FreeBSD.org/">���ܹ����Ǥ�
         FreeBSD �����֥�����</ulink> �����
 	<ulink url="http://www.FreeBSD.org/">FreeBSD �����֥�����</ulink>
 	��������Ǥ��ޤ�
@@ -151,7 +114,7 @@
 	<ulink url="http://docs.FreeBSD.org/doc/"></ulink>
 	��������Ǥ��ޤ�)��
         �ޤ���¾�Τ��ޤ��ޤ�ʸ����������̷����Τ�Τ�
-	<ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP 
+	<ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP 
 	������</ulink> ���¿���� <link linkend="mirrors">�ߥ顼������</link>
 	�������������ɤǤ��ޤ���
 	���Υϥ�ɥ֥å��ν����� (�Ѹ���) �ϡ�
@@ -209,12 +172,12 @@
         �����ؤλ��Ȥ�����ޤ���褦�ˤ��Ƥ��ޤ���</para>
     </partintro>
 
-    <![ %chap.introduction;             [ &chap.introduction;         ]]>
-    <![ %chap.install;                  [ &chap.install;              ]]>
-    <![ %chap.bsdinstall;               [ &chap.bsdinstall;           ]]>
-    <![ %chap.basics;                   [ &chap.basics;               ]]>
-    <![ %chap.ports;                    [ &chap.ports;                ]]>
-    <![ %chap.x11;                      [ &chap.x11;                  ]]>
+    &chap.introduction;
+    &chap.install;
+    &chap.bsdinstall;
+    &chap.basics;
+    &chap.ports;
+    &chap.x11;
   </part>
 
   <part id="common-tasks">
@@ -257,11 +220,11 @@
 
     </partintro>
 
-    <![ %chap.desktop;                  [ &chap.desktop;              ]]>
-    <![ %chap.multimedia;               [ &chap.multimedia;           ]]>
-    <![ %chap.kernelconfig;             [ &chap.kernelconfig;         ]]>
-    <![ %chap.printing;                 [ &chap.printing;             ]]>
-    <![ %chap.linuxemu;                 [ &chap.linuxemu;             ]]>
+    &chap.desktop;
+    &chap.multimedia;
+    &chap.kernelconfig;
+    &chap.printing;
+    &chap.linuxemu;
   </part>
 
   <part id="system-administration">
@@ -278,28 +241,28 @@
         ���٤Ƥ��ɤ��̤�ɬ�פ����롢�Ȥ����櫓�Ǥ⤢��ޤ���</para>
     </partintro>
 
-    <![ %chap.config;                   [ &chap.config;               ]]>
-    <![ %chap.boot;                     [ &chap.boot;                 ]]>
-    <![ %chap.users;                    [ &chap.users;                ]]>
-    <![ %chap.security;                 [ &chap.security;             ]]>
+    &chap.config;
+    &chap.boot;
+    &chap.users;
+    &chap.security;
 <!--
-    <![ %chap.jails;                    [ &chap.jails;                ]]>
+    &chap.jails;
 -->
-    <![ %chap.mac;			[ &chap.mac;		      ]]>
+    &chap.mac;
 <!--
-    <![ %chap.audit;			[ &chap.audit;		      ]]>
+    &chap.audit;
 -->
-    <![ %chap.disks;                    [ &chap.disks;                ]]>
-    <![ %chap.geom;			[ &chap.geom;		      ]]>
+    &chap.disks;
+    &chap.geom;
 <!--
-    <![ %chap.filesystems;              [ &chap.filesystems;          ]]>
-    <![ %chap.vinum;                    [ &chap.vinum;                ]]>
-    <![ %chap.virtualization;           [ &chap.virtualization;       ]]>
+    &chap.filesystems;
+    &chap.vinum;
+    &chap.virtualization;
 -->
-    <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
-    <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
+    &chap.l10n;
+    &chap.cutting-edge;
 <!--
-    <![ %chap.dtrace;                   [ &chap.dtrace;               ]]>
+    &chap.dtrace;
 -->
   </part>
 
@@ -341,24 +304,24 @@
         ���٤Ƥ��ɤ��̤�ɬ�פ����롢�Ȥ����櫓�Ǥ⤢��ޤ���</para>
     </partintro>
 
-    <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
-    <![ %chap.ppp-and-slip;             [ &chap.ppp-and-slip;         ]]>
-    <![ %chap.mail;                     [ &chap.mail;                 ]]>
-    <![ %chap.network-servers;          [ &chap.network-servers;      ]]>
-    <![ %chap.firewalls;                [ &chap.firewalls;            ]]>
-    <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
+    &chap.serialcomms;
+    &chap.ppp-and-slip;
+    &chap.mail;
+    &chap.network-servers;
+    &chap.firewalls;
+    &chap.advanced-networking;
   </part>
 
   <part id="appendices">
     <title>��Ͽ</title>
 
-    <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
-    <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
-    <![ %chap.eresources;               [ &chap.eresources;           ]]>
-    <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
+    &chap.mirrors;
+    &chap.bibliography;
+    &chap.eresources;
+    &chap.pgpkeys;
   </part>
-  <![ %chap.freebsd-glossary;         [ &bookinfo.freebsd-glossary; ]]>
-  <![ %chap.index;                    [ &chap.index;                ]]>
+  &freebsd-glossary;
+  &chap.index;
   &chap.colophon;
 </book>
 
diff --git a/ja_JP.eucJP/books/handbook/boot/chapter.sgml b/ja_JP.eucJP/books/handbook/boot/chapter.sgml
index 0e5cabd4f0..01556f12ea 100644
--- a/ja_JP.eucJP/books/handbook/boot/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/boot/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -661,10 +662,12 @@ boot:</screen>
       </authorgroup>
       <!-- 18 OCT 2002 -->
     </sect1info>
+
+    <title>Device Hints</title>
+
     <indexterm>
       <primary>device.hints</primary>
     </indexterm>
-    <title>Device Hints</title>
 
     <note><para>����� FreeBSD&nbsp;5.0 �ʹߤε�ǽ�Ǥ���
       ��������ΥС������ˤ�¸�ߤ��ޤ���</para></note>
@@ -753,10 +756,11 @@ boot:</screen>
   </sect1>
 
   <sect1 id="boot-init">
+    <title>init: �ץ���������ν����</title>
+
     <indexterm>
       <primary><command>init</command></primary>
     </indexterm>
-    <title>init: �ץ���������ν����</title>
 
     <para>�����ͥ�ε�ư����λ����ȡ�&man.init.8;
       �Ȥ����桼���ץ����������椬�ܤ���ޤ���
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
index ed09dd9a28..6b30ec9b12 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
@@ -50,7 +50,7 @@
       �ȸƤФ�륤�󥹥ȡ���ץ�������Ȥ��ޤ���
       ���ξϤǤϡ�<application>bsdinstall</application> �λȤ����ˤĤ����������ޤ���
       <application>sysinstall</application> �����ѤˤĤ��Ƥϡ�
-      <xref linkend="install"> ���������Ƥ��ޤ���</para>
+      <xref linkend="install"/> ���������Ƥ��ޤ���</para>
 
     <para>���ξϤ��ɤ�ȡ��ʲ��Τ��Ȥ��狼��ޤ���</para>
 
@@ -110,7 +110,7 @@
 	�ޤ���&os; �Υ��󥹥ȡ�����ˡ�ˤ�äơ�
 	�б����Ƥ��� CDROM �ɥ饤�֡�
 	���ˤ�äƤϥͥåȥ�������ץ���ɬ�פȤʤ�ޤ���
-	����˴ؤ��Ƥ� <xref linkend="bsdinstall-installation-media">
+	����˴ؤ��Ƥ� <xref linkend="bsdinstall-installation-media"/>
 	���������ޤ���</para>
 
       <sect3>
@@ -160,7 +160,7 @@
 	  ʣ���� CPU ����ĥ���ԥ塼���� SMP ���б����Ƥ��ޤ���</para>
 
 	<para>32-bit �����ͥ�ϡ�RAM �κǽ�� 2&nbsp;GB ���������ѤǤ��ޤ���
-	  Blue & White PowerMac G3 �Ǥϡ�&firewire; ���б����Ƥ��ޤ���
+	  Blue & White PowerMac G3 �Ǥϡ�&firewire; ���б����Ƥ��ޤ���</para>
       </sect3>
 
       <sect3>
@@ -255,7 +255,7 @@
       <para>&os; ��ɸ��Υ֡��ȥ������ϡ��ץ饤�ޥ�ޤ��� <acronym>GPT</acronym>
 	�ѡ��ƥ��������б����Ƥ��ޤ�
 	(&os; �ε�ư�ץ������Τ��ܤ�������ˤĤ��Ƥϡ�
-	<xref linkend="boot"> ������������)��
+	<xref linkend="boot"/> ������������)��
 	�ǥ�������Τ��٤ƤΥץ饤�ޥꡢ�⤷����
 	<acronym>GPT</acronym> �ѡ��ƥ�����󤬻Ȥ��Ƥ���ΤǤ���С�
 	���ΤҤȤĤ� &os; �Τ���˳������Ƥ���������</para>
@@ -465,7 +465,7 @@
 	      ����Ȥϰۤʤ�ǥ��쥯�ȥ�ѥ����Ȥ��Ƥ��ޤ���
 	      &os;&nbsp;8.<replaceable>X</replaceable>
 	      �����ΥС������Υ���������ɤȥ��󥹥ȡ���ξܺ٤ˤĤ��Ƥϡ�
-	      <xref linkend="install"> ���������Ƥ��ޤ���</para>
+	      <xref linkend="install"/> ���������Ƥ��ޤ���</para>
 	  </tip>
 
 	  <para>���ꥹ�ƥ��å����᡼���ˤϡ�<filename>.img</filename>
@@ -585,7 +585,7 @@ commit your changes?</literallayout>
 	<procedure>
 
 	  <step>
-	    <para><xref linkend="bsdinstall-installation-media">
+	    <para><xref linkend="bsdinstall-installation-media"/>
 	      ����������Ƥ��� <quote>��ư</quote> USB
 	      ���ƥ��å�����Ѥ�����ˤϡ�����ԥ塼����Ω���夲�����ˡ�
 	      USB ���ƥ��å����������Ƥ���������</para>
@@ -668,7 +668,7 @@ Loading /boot/defaults/loader.conf
 	      <title>&os; �֡��ȥ�������˥塼</title>
 	      <mediaobject>
 		<imageobject>
-		  <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu" format="PNG">
+		  <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu" format="PNG"/>
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -745,8 +745,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
 	<screenco>
 	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5">
-	    <area id="bsdinstall-prompt-smp" coords="2 5">
+	    <area id="bsdinstall-prompt-single" coords="1 5"/>
+	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
 	  </areaspec>
 
 	  <screen><prompt>ok     </prompt>
@@ -784,7 +784,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <para>ľ���ˤ��κ�Ȥ�Ԥäơ������ͥ뤬�ǥХ������Ф�¹Ԥ��Ƥ������
 	���̤γ���ή�줿ʸ������ɽ�����Ƥ���������
-	<xref linkend="bsdinstall-dev-probe"> �ˤ褯�������̤�������Ǥ��礦����
+	<xref linkend="bsdinstall-dev-probe"/> �ˤ褯�������̤�������Ǥ��礦����
 	���ʤ��Υ���ԥ塼������ܤ���Ƥ���ǥХ����ˤ�äơ�ɽ�������ʸ����ϰۤʤ�Ǥ��礦��</para>
 
       <figure id="bsdinstall-dev-probe">
@@ -947,7 +947,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	�����ͥ�˴ޤޤ�Ƥ��ʤ��ǥХ����Υ��ݡ��Ȥ��ɲä��뤳�Ȥ��Ǥ��ޤ���</para>
 
       <para>�ǥХ������и塢
-	<xref linkend="bsdinstall-choose-mode"> ��ɽ������ޤ���
+	<xref linkend="bsdinstall-choose-mode"/> ��ɽ������ޤ���
 	���󥹥ȡ����ǥ����ϡ�&os; �Υ��󥹥ȡ��롢"live CD"���ޤ���
 	&os; ������ؤΥ��������� 3 �Ĥ���Ū�����ѽ���ޤ���
 	���������Ȥäƥ��ץ��������򤷡�
@@ -957,7 +957,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>���󥹥ȡ����ǥ���������⡼��</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -998,7 +998,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�����ޥåפ�����</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1012,7 +1012,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�����ܡ��ɥ�˥塼������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1039,7 +1039,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�ۥ���̾������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1059,7 +1059,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>���󥹥ȡ��뤹�륳��ݡ��ͥ�Ȥ�����</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1101,7 +1101,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	    ���եȥ������򥳥�ѥ��뤹��Τ�ɬ�פʥ����������ɤ�ޤ�Ǥ��ޤ���
 	    �����ɥѡ��ƥ������եȥ������ѥå������Υ���������ɡ�
 	    ����ѥ��롢���󥹥ȡ����ư������褦���߷פ��줿�ե�����ν��ޤ�Ǥ���
-	    <xref linkend="ports"> �� Ports Collection �λȤ������������ޤ���</para>
+	    <xref linkend="ports"/> �� Ports Collection �λȤ������������ޤ���</para>
 
 	  <warning>
 	    <para>���󥹥ȡ���ץ������ϡ�
@@ -1147,12 +1147,12 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-files" format="PNG">
+	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-files" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
 
-    <para><xref linkend="bsdinstall-config-network-dev"> �˼�����Ƥ���褦�ˡ�
+    <para><xref linkend="bsdinstall-config-network-dev"/> �˼�����Ƥ���褦�ˡ�
       �ͥåȥ����³�����꤬����äƤ���С��ߥ顼�����Ȥ����򤵤�ޤ���
       �ߥ顼�����Ȥϡ�&os; �ե�����Υ��ԡ��򥭥�å��夷�Ƥ��ޤ���
       &os; �򥤥󥹥ȡ��뤹�륳��ԥ塼����Ʊ���ϰ�Υߥ顼�����Ȥ�����Ǥ���������
@@ -1164,7 +1164,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect" format="PNG">
+	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1190,7 +1190,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1205,7 +1205,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>ʣ���Υǥ������������򤹤�</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1220,7 +1220,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Entire Disk �ޤ��� Partition ������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1241,7 +1241,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�������줿�ѡ��ƥ������γ�ǧ</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1257,7 +1257,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Manual �ˤ��ѡ��ƥ�������ʬ��</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1271,7 +1271,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>��ư�ǥѡ��ƥ��������������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1347,7 +1347,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>��ư�ǥѡ��ƥ��������������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1377,7 +1377,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<filename>/tmp</filename> ������ <filename>/usr</filename>
 	�Ȥ��ä�����Ū�ʥѡ��ƥ������ʬ��Υ쥤�����Ȥ򹥤�ͤ⤤�ޤ���
 	�쥤�����Ȥ��㤬 <xref
-	  linkend="bsdinstall-part-manual-splitfs"> �ˤ���ޤ���</para>
+	  linkend="bsdinstall-part-manual-splitfs"/> �ˤ���ޤ���</para>
 
       <para>���Ѳ�ǽ�� <acronym>GPT</acronym>
 	�ѡ��ƥ�����󥿥��פΰ����ˤĤ��Ƥϡ�&man.gpart.8;
@@ -1521,7 +1521,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>�Ǹ�γ�ǧ</title>
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG">
+	  <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1551,7 +1551,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>���ۥե�����Υ����������</title>
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG">
+	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1564,7 +1564,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>���ۥե�����θ���</title>
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG">
+	  <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1575,14 +1575,14 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>���ۥե�����μ��Ф�</title>
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG">
+	  <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
 
     <para>ɬ�פ����ۥե����뤬���٤Ƽ��Ф��줿�顢
       <application>bsdinstall</application> �ϡ�
-      ���󥹥ȡ����κ�� (<xref linkend="bsdinstall-post">) �˿ʤߤޤ���</para>
+      ���󥹥ȡ����κ�� (<xref linkend="bsdinstall-post"/>) �˿ʤߤޤ���</para>
   </sect1>
 
   <sect1 id="bsdinstall-post">
@@ -1607,7 +1607,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1632,7 +1632,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1662,7 +1662,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>�磻��쥹���������ݥ���ȤΥ������</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG">
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1682,7 +1682,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>�磻��쥹�ͥåȥ��������</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG">
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1697,7 +1697,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>WPA2 �Υ��åȥ��å�</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG">
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1717,7 +1717,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4" format="PNG">
+		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1732,7 +1732,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<note>
 	  <para>Ŭ���ʥͥåȥ����������Ϥ��Ƥ�ư���ʤ��Τǡ�
 	    �ͥåȥ�������Ԥޤ��ϥ����ӥ��ץ��Х������� <xref
-	    linkend="bsdinstall-collect-network-information">
+	    linkend="bsdinstall-collect-network-information"/>
 	    �˼�����Ƥ����������ꤷ�Ƥ���������</para>
 	</note>
 
@@ -1748,7 +1748,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp" format="PNG">
+		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1765,7 +1765,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static" format="PNG">
+		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1808,7 +1808,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6" format="PNG">
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1834,7 +1834,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac" format="PNG">
+		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-slaac" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1851,7 +1851,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static" format="PNG">
+		<imagedata fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1897,7 +1897,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns" format="PNG">
+		<imagedata fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1919,7 +1919,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>��������ޤ��� UTC �����å�������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1936,7 +1936,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�ϰ������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1948,7 +1948,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>��̾������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1960,7 +1960,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�����ॾ���������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1972,7 +1972,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�����ॾ����γ���</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1992,7 +1992,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>�ɲä�ͭ���ˤ��륵���ӥ�������</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2039,7 +2039,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>����å������פ�����</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2063,7 +2063,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-adduser1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2075,7 +2075,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-adduser2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2177,7 +2177,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-adduser3" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2188,7 +2188,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       	<literal>no</literal> �����Ϥ���ȡ��桼�����ɲä�����ꡢ���˿ʤߤޤ���</para>
 
       <para>�桼�����ɲä䡢�桼�������ξܺ٤ˤĤ��Ƥϡ�
-	<xref linkend="users"> �򻲾Ȥ��Ƥ���������</para>
+	<xref linkend="users"/> �򻲾Ȥ��Ƥ���������</para>
     </sect2>
 
     <sect2 id="bsdinstall-final-conf">
@@ -2202,7 +2202,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2215,32 +2215,32 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<listitem>
 	  <para><literal>Add User</literal> -
-	    <xref linkend="bsdinstall-addusers"> ���������Ƥ��ޤ���</para>
+	    <xref linkend="bsdinstall-addusers"/> ���������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para><literal>Root Password</literal> -
-	    <xref linkend="bsdinstall-post-root"> ���������Ƥ��ޤ���</para>
+	    <xref linkend="bsdinstall-post-root"/> ���������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para><literal>Hostname</literal> -
-	    <xref linkend="bsdinstall-hostname"> ���������Ƥ��ޤ���</para>
+	    <xref linkend="bsdinstall-hostname"/> ���������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para><literal>Network</literal> -
-	    <xref linkend="bsdinstall-config-network-dev"> ���������Ƥ��ޤ���</para>
+	    <xref linkend="bsdinstall-config-network-dev"/> ���������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para><literal>Services</literal> -
-	    <xref linkend="bsdinstall-sysconf"> ���������Ƥ��ޤ���</para>
+	    <xref linkend="bsdinstall-sysconf"/> ���������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
 	  <para><literal>Time Zone</literal> -
-	    <xref linkend="bsdinstall-timezone"> ���������Ƥ��ޤ���</para>
+	    <xref linkend="bsdinstall-timezone"/> ���������Ƥ��ޤ���</para>
 	</listitem>
 
 	<listitem>
@@ -2258,7 +2258,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2275,7 +2275,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG">
+	    <imagedata fileref="bsdinstall/bsdinstall-mainexit" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2495,7 +2495,7 @@ login:</screen>
 
       <para>&os; �ϥǥե���ȤǤϡ�����ե�����ʴĶ��򥤥󥹥ȡ��뤷�ޤ��󤬡�
 	¿���Τ�Τ����ѤǤ��ޤ���
-	<xref linkend="x11"> ���ɤ�Ǥ���������</para>
+	<xref linkend="x11"/> ���ɤ�Ǥ���������</para>
 
       </sect3>
     </sect2>
@@ -2608,7 +2608,7 @@ login:</screen>
 	      <filename>/boot/loader.conf</filename> �ե������
 	      <literal>hint.acpi.0.disabled="1"</literal> ���ɲä��Ƥ���������
 	      �֡��ȥ������Τ��ܤ�������ˤĤ��Ƥ�
-	      <xref linkend="boot-synopsis"> ���������ޤ���</para>
+	      <xref linkend="boot-synopsis"/> ���������ޤ���</para>
 	  </answer>
 	</qandaentry>
       </qandaset>
diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent
index 50b4dda32e..7f4818ac76 100644
--- a/ja_JP.eucJP/books/handbook/chapters.ent
+++ b/ja_JP.eucJP/books/handbook/chapters.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP"?>
 <!-- 
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -13,54 +14,232 @@
      Chapters should be listed in the order in which they are referenced.
 -->
 
+<!ENTITY % not.published "INCLUDE">
+
+<!ENTITY % chap.introduction "IGNORE">
+<!ENTITY % chap.install "IGNORE">
+<!ENTITY % chap.bsdinstall "IGNORE">
+<!ENTITY % chap.basics "IGNORE">
+<!ENTITY % chap.ports "IGNORE">
+<!ENTITY % chap.config "IGNORE">
+<!ENTITY % chap.boot "IGNORE">
+<!ENTITY % chap.users "IGNORE">
+<!ENTITY % chap.kernelconfig "IGNORE">
+<!ENTITY % chap.security "IGNORE">
+<!ENTITY % chap.jails "IGNORE">
+<!ENTITY % chap.printing "IGNORE">
+<!ENTITY % chap.disks "IGNORE">
+<!ENTITY % chap.geom "IGNORE">
+<!ENTITY % chap.vinum "IGNORE">
+<!ENTITY % chap.x11 "IGNORE">
+<!ENTITY % chap.l10n "IGNORE">
+<!ENTITY % chap.multimedia "IGNORE">
+<!ENTITY % chap.desktop "IGNORE">
+<!ENTITY % chap.serialcomms "IGNORE">
+<!ENTITY % chap.ppp-and-slip "IGNORE">
+<!ENTITY % chap.advanced-networking "IGNORE">
+<!ENTITY % chap.firewalls "IGNORE">
+<!ENTITY % chap.network-servers "IGNORE">
+<!ENTITY % chap.mail "IGNORE">
+<!ENTITY % chap.cutting-edge "IGNORE">
+<!ENTITY % chap.linuxemu "IGNORE">
+<!ENTITY % chap.mirrors "IGNORE">
+<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
+<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
+<!ENTITY % chap.bibliography "IGNORE">
+<!ENTITY % chap.eresources "IGNORE">
+<!ENTITY % chap.eresources.www.inc "INCLUDE">
+<!ENTITY % chap.pgpkeys "IGNORE">
+<!ENTITY % chap.index "IGNORE">
+<!ENTITY % chap.freebsd-glossary "IGNORE">
+<!ENTITY % chap.mac "IGNORE">
+<!ENTITY % chap.audit "IGNORE">
+<!ENTITY % chap.filesystems "IGNORE">
+<!ENTITY % chap.dtrace "IGNORE">
+
 <!ENTITY chap.preface			SYSTEM "preface/preface.sgml">
+<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 
-<!-- Part one -->
-<!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
-<!ENTITY chap.install			SYSTEM "install/chapter.sgml">
-<!ENTITY chap.bsdinstall		SYSTEM "bsdinstall/chapter.sgml">
-<!ENTITY chap.basics			SYSTEM "basics/chapter.sgml">
-<!ENTITY chap.ports			SYSTEM "ports/chapter.sgml">
-<!ENTITY chap.x11			SYSTEM "x11/chapter.sgml">
+<!-- Part One -->
+<![%chap.introduction;[
+  <!ENTITY chap.introduction	SYSTEM "introduction/chapter.sgml">
+]]>
+<![%chap.install;[
+  <!ENTITY chap.install		SYSTEM "install/chapter.sgml">
+]]>
+<![%chap.bsdinstall;[
+  <!ENTITY chap.bsdinstall	SYSTEM "bsdinstall/chapter.sgml">
+]]>
+<![%chap.basics;[
+  <!ENTITY chap.basics		SYSTEM "basics/chapter.sgml">
+]]>
+<![%chap.ports;[
+  <!ENTITY chap.ports		SYSTEM "ports/chapter.sgml">
+]]>
+<![%chap.x11;[
+  <!ENTITY chap.x11		SYSTEM "x11/chapter.sgml">
+]]>
 
-<!-- Part two -->
-<!ENTITY chap.desktop			SYSTEM "desktop/chapter.sgml">
-<!ENTITY chap.multimedia		SYSTEM "multimedia/chapter.sgml">
-<!ENTITY chap.kernelconfig		SYSTEM "kernelconfig/chapter.sgml">
-<!ENTITY chap.printing			SYSTEM "printing/chapter.sgml">
-<!ENTITY chap.linuxemu			SYSTEM "linuxemu/chapter.sgml">
+<!-- Part Two -->
+<![%chap.desktop;[
+  <!ENTITY chap.desktop		SYSTEM "desktop/chapter.sgml">
+]]>
+<![%chap.multimedia;[
+  <!ENTITY chap.multimedia	SYSTEM "multimedia/chapter.sgml">
+]]>
+<![%chap.kernelconfig;[
+  <!ENTITY chap.kernelconfig	SYSTEM "kernelconfig/chapter.sgml">
+]]>
+<![%chap.printing;[
+  <!ENTITY chap.printing	SYSTEM "printing/chapter.sgml">
+]]>
+<![%chap.linuxemu;[
+  <!ENTITY chap.linuxemu	SYSTEM "linuxemu/chapter.sgml">
+]]>
 
-<!-- Part three -->
-<!ENTITY chap.config			SYSTEM "config/chapter.sgml">
-<!ENTITY chap.boot			SYSTEM "boot/chapter.sgml">
-<!ENTITY chap.users			SYSTEM "users/chapter.sgml">
-<!ENTITY chap.security			SYSTEM "security/chapter.sgml">
-<!--
-<!ENTITY chap.mac			SYSTEM "mac/chapter.sgml">
--->
-<!ENTITY chap.disks			SYSTEM "disks/chapter.sgml">
-<!ENTITY chap.vinum			SYSTEM "vinum/chapter.sgml">
-<!ENTITY chap.l10n			SYSTEM "l10n/chapter.sgml">
-<!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
+<!-- Part Three -->
+<![%chap.config;[
+  <!ENTITY chap.config		SYSTEM "config/chapter.sgml">
+]]>
+<![%chap.boot;[
+  <!ENTITY chap.boot		SYSTEM "boot/chapter.sgml">
+]]>
+<![%chap.users;[
+  <!ENTITY chap.users		SYSTEM "users/chapter.sgml">
+]]>
+<![%chap.security;[
+  <!ENTITY chap.security	SYSTEM "security/chapter.sgml">
+]]>
+<![%chap.jails;[
+  <!ENTITY chap.jails		SYSTEM "jails/chapter.sgml">
+]]>
+<![%chap.mac;[
+  <!ENTITY chap.mac		SYSTEM "mac/chapter.sgml">
+]]>
+<![%chap.audit;[
+  <!ENTITY chap.audit		SYSTEM "audit/chapter.sgml">
+]]>
+<![%chap.disks;[
+  <!ENTITY chap.disks		SYSTEM "disks/chapter.sgml">
+]]>
+<![%chap.geom;[
+  <!ENTITY chap.geom		SYSTEM "geom/chapter.sgml">
+]]>
+<![%chap.filesystems;[
+  <!ENTITY chap.filesystems	SYSTEM "filesystems/chapter.sgml">
+]]>
+<![%chap.vinum;[
+  <!ENTITY chap.vinum		SYSTEM "vinum/chapter.sgml">
+]]>
+<![%chap.l10n;[
+  <!ENTITY chap.l10n		SYSTEM "l10n/chapter.sgml">
+]]>
+<![%chap.cutting-edge;[
+  <!ENTITY chap.cutting-edge	SYSTEM "cutting-edge/chapter.sgml">
+]]>
+<![%chap.dtrace;[
+  <!ENTITY chap.dtrace		SYSTEM "dtrace/chapter.sgml">
+]]>
 
-<!-- Part four -->
-<!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">
-<!ENTITY chap.ppp-and-slip		SYSTEM "ppp-and-slip/chapter.sgml">
-<!ENTITY chap.mail			SYSTEM "mail/chapter.sgml">
-<!--
-<!ENTITY chap.network-servers		SYSTEM "network-servers/chapter.sgml">
--->
-<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
+<!-- Part Four -->
+<![%chap.serialcomms;[
+  <!ENTITY chap.serialcomms	SYSTEM "serialcomms/chapter.sgml">
+]]>
+<![%chap.ppp-and-slip;[
+  <!ENTITY chap.ppp-and-slip	SYSTEM "ppp-and-slip/chapter.sgml">
+]]>
+<![%chap.mail;[
+  <!ENTITY chap.mail		SYSTEM "mail/chapter.sgml">
+]]>
+<![%chap.network-servers;[
+  <!ENTITY chap.network-servers	SYSTEM "network-servers/chapter.sgml">
+]]>
+<![%chap.firewalls;[
+  <!ENTITY chap.firewalls	SYSTEM "firewalls/chapter.sgml">
+]]>
+<![%chap.advanced-networking;[
+  <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
+]]>
 
-<!-- Part five (appendices) -->
-<!ENTITY chap.mirrors			SYSTEM "mirrors/chapter.sgml">
-<!ENTITY chap.mirrors.ftp.inc		SYSTEM "mirrors.sgml.ftp.inc">
-<!ENTITY chap.mirrors.cvsup.inc		SYSTEM "mirrors.sgml.cvsup.inc">
+<!-- Part Five (appendices) -->
+<![%chap.mirrors;[
+  <!ENTITY chap.mirrors		SYSTEM "mirrors/chapter.sgml">
+]]>
+<![%chap.mirrors.ftp.inc;[
+  <!ENTITY chap.mirrors.ftp.inc	SYSTEM "mirrors.sgml.ftp.inc">
+]]>
+<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.sgml.cvsup.inc">
+]]>
+<![%chap.bibliography;[
+  <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.sgml">
+]]>
+<![%chap.eresources;[
+  <!ENTITY chap.eresources	SYSTEM "eresources/chapter.sgml">
+]]>
+<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.sgml.www.inc">
+]]>
+<![%chap.pgpkeys;[
+  <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.sgml">
+]]>
+<![%chap.freebsd-glossary;[
+  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
+]]>
+<![%chap.index;[
+  <!ENTITY chap.index		SYSTEM "index.sgml">
+]]>
 
-<!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.sgml">
-<!ENTITY chap.eresources		SYSTEM "eresources/chapter.sgml">
-<!ENTITY chap.eresources.www.inc	SYSTEM "eresources.sgml.www.inc">
-<!ENTITY chap.pgpkeys			SYSTEM "pgpkeys/chapter.sgml">
-<!ENTITY chap.index			SYSTEM "index.sgml">
-<!ENTITY chap.colophon			SYSTEM "colophon.sgml">
-<!ENTITY chap.jcontrib			SYSTEM "jcontrib/chapter.sgml">
+<!ENTITY chap.colophon	SYSTEM "colophon.sgml">
+
+<!-- IGNORE cases -->
+
+<!-- Part One -->
+<!ENTITY chap.introduction	"">
+<!ENTITY chap.install		"">
+<!ENTITY chap.basics		"">
+<!ENTITY chap.ports		"">
+<!ENTITY chap.x11		"">
+
+<!-- Part Two -->
+<!ENTITY chap.desktop		"">
+<!ENTITY chap.multimedia	"">
+<!ENTITY chap.kernelconfig	"">
+<!ENTITY chap.printing		"">
+<!ENTITY chap.linuxemu		"">
+
+<!-- Part Three -->
+<!ENTITY chap.config		"">
+<!ENTITY chap.boot		"">
+<!ENTITY chap.users		"">
+<!ENTITY chap.security		"">
+<!ENTITY chap.jails		"">
+<!ENTITY chap.mac		"">
+<!ENTITY chap.audit		"">
+<!ENTITY chap.disks		"">
+<!ENTITY chap.geom		"">
+<!ENTITY chap.filesystems	"">
+<!ENTITY chap.vinum		"">
+<!ENTITY chap.virtualization	"">
+<!ENTITY chap.l10n		"">
+<!ENTITY chap.cutting-edge	"">
+<!ENTITY chap.dtrace		"">
+
+<!-- Part Four -->
+<!ENTITY chap.serialcomms	"">
+<!ENTITY chap.ppp-and-slip	"">
+<!ENTITY chap.mail		"">
+<!ENTITY chap.network-servers	"">
+<!ENTITY chap.firewalls		"">
+<!ENTITY chap.advanced-networking	"">
+
+<!-- Part Five (appendices) -->
+<!ENTITY chap.mirrors		"">
+<!ENTITY chap.mirrors.ftp.inc	"">
+<!ENTITY chap.mirrors.cvsup.inc	"">
+<!ENTITY chap.bibliography	"">
+<!ENTITY chap.eresources	"">
+<!ENTITY chap.eresources.www.inc	"">
+<!ENTITY chap.pgpkeys		"">
+<!ENTITY chap.freebsd-glossary	"">
+<!ENTITY chap.index		"">
diff --git a/ja_JP.eucJP/books/handbook/colophon.sgml b/ja_JP.eucJP/books/handbook/colophon.sgml
index 76669b70a0..1148994a90 100644
--- a/ja_JP.eucJP/books/handbook/colophon.sgml
+++ b/ja_JP.eucJP/books/handbook/colophon.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/config/chapter.sgml b/ja_JP.eucJP/books/handbook/config/chapter.sgml
index 3f192528f7..65479beec8 100644
--- a/ja_JP.eucJP/books/handbook/config/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/config/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -80,13 +81,13 @@
     <itemizedlist>
       <listitem>
 	<para>Unix �� FreeBSD �δ��ܤ����򤹤� (<xref
-	    linkend="basics">)��</para>
+	    linkend="basics"/>)��</para>
       </listitem>
       <listitem>
 	<para>FreeBSD �Υ����������ɤ�ǿ����ݤĤ���
-	  (<xref linkend="updating-upgrading">) �ȡ�
+	  (<xref linkend="updating-upgrading"/>) �ȡ�
 	  �����ͥ륳��ե����졼����󤪤�ӹ��ۤδ���
-	  (<xref linkend="kernelconfig">) �˿Ƥ���Ǥ�����</para>
+	  (<xref linkend="kernelconfig"/>) �˿Ƥ���Ǥ�����</para>
       </listitem>
     </itemizedlist>
   </sect1>
diff --git a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
index 4a9cc5c2cf..c5b6b9bf70 100644
--- a/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/contrib/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
index ef2f0a60e8..26b7856040 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -99,10 +100,10 @@
 
     <itemizedlist>
       <listitem><para>�ͥåȥ����³��Ŭ�ڤ����� (<xref
-      linkend="advanced-networking">)</para>
+      linkend="advanced-networking"/>)</para>
       </listitem>
       <listitem><para>�����ɥѡ��ƥ����Υ��եȥ������Υ��󥹥ȡ�����ˡ�ν���
-        (<xref linkend="ports">)</para></listitem>
+        (<xref linkend="ports"/>)</para></listitem>
     </itemizedlist>
 
     <note>
@@ -239,7 +240,7 @@ MergeChanges /etc/ /var/named/etc/</programlisting>
 	<filename class="directory">/etc</filename>
 	��Хå����åפ��Ƥ���ޡ�����ǧ���Ƥ���������
 	<command>mergemaster</command> ���ޥ�ɤξܺ٤ʾ���ˤĤ��Ƥϡ�
-	<xref linkend="mergemaster"> �dz�ǧ���Ƥ���������</para>
+	<xref linkend="mergemaster"/> �dz�ǧ���Ƥ���������</para>
 
       <programlisting># Directory in which to store downloaded updates and temporary
 # files used by &os; Update.
@@ -319,7 +320,7 @@ MergeChanges /etc/ /var/named/etc/</programlisting>
 	    class="directory">/boot/GENERIC</filename>
 	  ���֤��Ƥ������Ȥ��ɤ��ͤ��Ǥ���
 	  ���ޤ��ޤ�������褹��ݤ䡢
-	  <xref linkend="freebsdupdate-upgrade"> ����������Ƥ���褦�ˡ�
+	  <xref linkend="freebsdupdate-upgrade"/> ����������Ƥ���褦�ˡ�
 	  <command>freebsd-update</command>
 	  ���Ѥ��ƥС������򥢥åץ��졼�ɤ���ݤ˽����Ȥʤ�ޤ���</para>
       </note>
@@ -755,7 +756,7 @@ Fetching 133 new ports or files... done.</screen>
 
       <para>&os; �Υɥ�����ȤΥ������䥤�󥹥ȡ��뤵�줿�ɥ�����Ȥϡ�
 	�١��������ƥ�Υ������Υ��åץǡ���
-	(<xref linkend="makeworld"> �򻲾�) ��Ʊ�͡�
+	(<xref linkend="makeworld"/> �򻲾�) ��Ʊ�͡�
         <application>CVSup</application> ���Ѥ��ƥ��åץǡ��ȤǤ��ޤ���
 	������Ǥϰʲ��ˤĤ����������ޤ���</para>
 
@@ -839,7 +840,7 @@ Fetching 133 new ports or files... done.</screen>
       <para>������ <replaceable>cvsup.FreeBSD.org</replaceable> ��Ǥ�᤯��
 	<application>CVSup</application> �����Ф��֤������Ƥ���������
 	�ߥ顼�����Ȥδ����ʰ����ˤĤ��Ƥϡ�<xref
-	  linkend="cvsup-mirrors"> ��������������</para>
+	  linkend="cvsup-mirrors"/> ��������������</para>
 
       <para>�ǽ�˥ɥ�����ȤΥ����������������ɤ���ˤϾ������֤�������ޤ���
 	����������ɤ������ޤǤ��Ԥ�����������</para>
@@ -1204,7 +1205,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	    �η�����̾�����Ĥ����Ƥ��ޤ���
 	    �����ǡ�<replaceable>lang</replaceable> �ϸ��쥳���ɤ�û�̷��Ǥ���
 	    �ϥ󥬥꡼��ξ��� <literal>hu</literal>�����λ��ξ��ˤ�
-	    <literal>zh_cn</literal> �Ǥ���
+	    <literal>zh_cn</literal> �Ǥ���</para>
 	</note>
       </sect3>
 
@@ -1500,11 +1501,12 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 		</note>
 	      </listitem>
 
-              <indexterm>
-	        <primary>-CURRENT</primary>
-		<secondary>CTM ��Ȥä�Ʊ��</secondary>
-	      </indexterm>
               <listitem>
+		<indexterm>
+		  <primary>-CURRENT</primary>
+		  <secondary>CTM ��Ȥä�Ʊ��</secondary>
+		</indexterm>
+
                 <para><application><link linkend="ctm">CTM</link></application>���Ѥ��롣
                   (��³������ۤ��ä��ꡢemail �ǤΥ������������Ǥ��ʤ��褦��)
                   ���ޤ��ɼ��Ǥʤ� TCP/IP ��³�ξ��ˤϡ�<application>CTM</application>
@@ -1672,6 +1674,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
             </para>
 
             <orderedlist>
+	      <listitem>
 	      <indexterm>
 		<primary><command>cvsup</command></primary>
 	      </indexterm>
@@ -1682,7 +1685,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	        <primary>-STABLE</primary>
 		<secondary><application>CVSup</application> ��Ȥä�Ʊ��</secondary>
 	      </indexterm>
-              <listitem>
 		<para><link linkend="cvsup">cvsup</link> ��
 		  <filename>/usr/share/examples/cvsup</filename> �ˤ���
 		  <filename>stable-supfile</filename> �Ȥ���̾�Τ�
@@ -1699,11 +1701,12 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 		  ����</para>
 	      </listitem>
 
-	      <indexterm>
-	        <primary>-STABLE</primary>
-		<secondary>CTM ��Ȥä�Ʊ������</secondary>
-	      </indexterm>
 	      <listitem>
+		<indexterm>
+		  <primary>-STABLE</primary>
+		  <secondary>CTM ��Ȥä�Ʊ������</secondary>
+		</indexterm>
+
 		<para><application><link
 		  linkend="ctm">CTM</link></application> ��ǽ��Ȥ��ޤ���
 		  ���󥿡��ͥåȤؤ���³�˹�®�ǰ²��ʲ��������ѤǤ��ʤ��ΤǤ���С�
@@ -1721,12 +1724,12 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
               ��Ȥ��ޤ��礦��</para>
           </listitem>
 
-	  <indexterm>
-	    <primary>-STABLE</primary>
-	    <secondary>���ۡ�����ѥ���</secondary>
-	  </indexterm>
-
           <listitem>
+	    <indexterm>
+	      <primary>-STABLE</primary>
+	      <secondary>���ۡ�����ѥ���</secondary>
+	    </indexterm>
+
             <para>&os.stable; �򥳥�ѥ��뤹�����ˡ�
               <filename>/usr/src</filename> �ˤ��� Makefile ���
               ���ɤ�Ǥ���������
@@ -1931,7 +1934,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 
       <para>�ޤ��������������ƥ�Υ������򤹤Ǥ����ꤷ�Ƥ��뤳�ȤⲾ�ꤷ�Ƥ��ޤ���
 	�⤷�����ƥ�Υ����������ɤ��Ť��褦�Ǥ����顢
-	<xref linkend="synching"> ���ɤ�ǡ�
+	<xref linkend="synching"/> ���ɤ�ǡ�
 	�����������ɤ򿷤����С�������Ʊ��������ˡ�ξܺ٤����򤷤Ƥ���������</para>
 
       <para>����������Υ����ƥ�Υ��åץǡ��Ȥϡ�
@@ -2578,7 +2581,7 @@ Script done, &hellip;</screen>
         �����������ͥ뤬ư��뤫�ɤ����ƥ��Ȥ��뤿��ˡ�
         ���󥰥�桼���⡼�ɤǺƵ�ư����٤��Ǥ���
         ���󥰥�桼���⡼�ɤǤε�ư�ϡ�
-        <xref linkend="makeworld-singleuser">
+        <xref linkend="makeworld-singleuser"/>
         �˽񤫤�Ƥ�����˽��äƤ���������</para>
     </sect2>
 
@@ -3007,13 +3010,13 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
+	    <indexterm><primary>signal 11</primary></indexterm>
+
 	    <para>signal 11 (�⤷����¾�Υ����ʥ��ֹ�) �Υ��顼����������Ф�
 	      ����ѥ��뤬���Ԥ��ޤ������������äƤ����Ǥ��礦��?</para>
 	  </question>
-	  <indexterm><primary>signal 11</primary></indexterm>
 
 	  <answer>
-
 	    <para>������̾�ϡ��ɥ����������꤬���뤳�Ȥ򼨤��Ƥ��ޤ���
               �����ƥ�κƹ��ۤϡ��ϡ��ɥ��������Ф�������ѵ׻��Ԥʤ������
               ͭ���ʼ��ʤΰ�Ĥǡ�����˴ط��������꤬�褯��𤵤�ޤ���
@@ -3094,7 +3097,7 @@ Script done, &hellip;</screen>
               �κ�Ȥ���ľ���ޤ���
             </para>
 
-	    <para>���Υ�å�����
+	    <para>���Υ�å�����</para>
 
 	      <screen>--------------------------------------------------------------
 Building everything..
@@ -3289,7 +3292,7 @@ Building everything..
       �ˤޤȤ���Ƥ��ޤ���������Ǥϡ�
       ���åץ��졼�ɤβ����Ǥ����Υե��������������ˡ�ˤĤ����������ޤ���</para>
 
-    <para>�����ƥ�ϡ�<xref linkend="canonical-build">
+    <para>�����ƥ�ϡ�<xref linkend="canonical-build"/>
       ������������ˡ�ǹ��ۤ���Ƥ���Ȳ��ꤷ�ޤ���
       <command>make <maketarget>installworld</maketarget></command> �ȡ�
       ���θ�� <command>mergemaster</command> ���ޥ�ɤ�̵���˽���ä��顢
@@ -3436,7 +3439,7 @@ Building everything..
       <title>�١��������ƥ�</title>
 
       <para>���ơ����������ä��Τǡ��ӥ�ɤ��ޤ��礦��
-	<xref linkend="make-buildworld">
+	<xref linkend="make-buildworld"/>
 	�˽񤤤Ƥ���褦�˥����ͥ�ȥ١��������ƥ���ۤ��Ƥ���������
 	�Ǥ⡢�ޤ����󥹥ȡ��뤷�ʤ��Ǥ���������
 	�ӥ�ɤ�����ä��顢�ƥ��ȥޥ���˰ܤꡢ
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml b/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
index 0c88296694..0aa2a895b6 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -42,7 +43,7 @@
       �Ѥ˳�ȯ���줿¿���Υ��ץꥱ��������
       ���ʤ��Υǥ����ȥåפǤ����ѤǤ��ޤ���
       �ɤ�� Linux ���ץꥱ�������򥤥󥹥ȡ��뤹����Ǥ⡢
-      ������ <xref linkend="linuxemu"> ���ɤ�Ǥ������Ȥ򤪤����ᤷ�ޤ���
+      ������ <xref linkend="linuxemu"/> ���ɤ�Ǥ������Ȥ򤪤����ᤷ�ޤ���
       Linux �Х��ʥ�ߴ���ǽ���Ѥ��� port
       ��¿���� <quote>linux-</quote> ����Ϥ��ޤ�̾���ȤʤäƤ��ޤ���
       &man.whereis.1;
@@ -87,19 +88,19 @@
     <itemizedlist>
       <listitem>
 	<para>�����ɥѡ��ƥ������եȥ������Υ��󥹥ȡ�����ˡ
-	  (<xref linkend="ports">)</para>
+	  (<xref linkend="ports"/>)</para>
       </listitem>
 
       <listitem>
 	<para>Linux ���եȥ������Υ��󥹥ȡ�����ˡ
-	  (<xref linkend="linuxemu">)</para>
+	  (<xref linkend="linuxemu"/>)</para>
       </listitem>
     </itemizedlist>
 
     <para>�ޥ����ǥ����Ķ�����������ˡ�ˤĤ��Ƥ�
-      <xref linkend="multimedia"> ��
+      <xref linkend="multimedia"/> ��
       �Żҥ᡼������ꤷ�ƻȤ��������ˤ�
-      <xref linkend="mail"> �򻲾Ȥ��Ƥ���������</para>
+      <xref linkend="mail"/> �򻲾Ȥ��Ƥ���������</para>
 
     <note>
       <title>����</title>
@@ -130,7 +131,7 @@
       <application>GNOME</application> �Ǥϡ��Ϥ��ᤫ�� HTML
       �֥饦�����Ѱդ���Ƥ��ޤ���
       �����Υǥ����ȥå״Ķ������ꤹ�뤿��ξ���ˤĤ��Ƥ�
-      <xref linkend="x11-wm"> �򻲾Ȥ��Ƥ���������</para>
+      <xref linkend="x11-wm"/> �򻲾Ȥ��Ƥ���������</para>
 
     <para>�ڲ��� Web �֥饦����õ���Ƥ�����ˤϡ�Ports Collection ����
       <filename role="package">www/dillo2</filename>,
@@ -198,7 +199,7 @@
 	ɸ��ˤ褯��򤷤� HTML ɽ�����󥸥󡢥��֥֥饦���󥰡��ݥåץ��åץ֥��å���
 	��ĥ�����⤤�������ʤɤ���ħ�Ǥ���
 	<application>Firefox</application> �� <application>Mozilla</application>
-	�Υ����ɥ١����������������֥饦���Ǥ���
+	�Υ����ɥ١����������������֥饦���Ǥ���</para>
 
       <para>package �򥤥󥹥ȡ��뤹��ˤϰʲ��Τ褦�����Ϥ��Ƥ���������</para>
 
diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.sgml b/ja_JP.eucJP/books/handbook/disks/chapter.sgml
index 77d597bb5f..283557d625 100644
--- a/ja_JP.eucJP/books/handbook/disks/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/disks/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -370,6 +371,8 @@
 	  </authorgroup>
 	</sect3info>
 
+	<title>Concatenated Disk Driver (CCD) ������</title>
+
 	<indexterm>
 	  <primary>RAID</primary>
 	  <secondary>���եȥ�����</secondary>
@@ -379,7 +382,6 @@
 	  <secondary>CCD</secondary>
 	</indexterm>
 
-	<title>Concatenated Disk Driver (CCD) ������</title>
 	<para>�����̵�Ͽ�˴ؤ�����ˡ�����򤹤�ݤˤ�äȤ�Ż뤹�٤����Ǥϡ�
 	  ®�١������������������ѤǤ���
 	  ���Ĥ�Ʊ���˥Х�󥹤褯�¸����뤳�Ȥϵ��Ǥ���
@@ -434,7 +436,7 @@ ad3: 29333MB &lt;WDC WD307AA&gt; [59598/16/63] at ata1-slave UDMA33</programlist
 	    ������ɤΤ褦����³����Τ����θ���ޤ���&man.vinum.8;
 	    <!-- Furukawa:2004/1/8
 	    should be refer this after creating vinum/chapter.sgml
-	    (<xref linkend="vinum-vinum">)
+	    (<xref linkend="vinum-vinum"/>)
 	    -->
 	    ����� &man.ccd.4;
 	    ��ξ����Ƥ���٤��Ǥ��礦����������Ǥϡ�&man.ccd.4;
@@ -537,7 +539,7 @@ sh MAKEDEV ccd0</programlisting>
 	    �����Ԥ�����ˤϡ��ʲ��Τ褦�ʥ��ץ�����
 	    &man.ccdconfig.8; ��Ȥ��ޤ���</para>
 
-	  <programlisting>ccdconfig ccd0<co id="co-ccd-dev"> 32<co id="co-ccd-interleave"> 0<co id="co-ccd-flags"> /dev/ad1e<co id="co-ccd-devs"> /dev/ad2e /dev/ad3e</programlisting>
+	  <programlisting>ccdconfig ccd0<co id="co-ccd-dev"/> 32<co id="co-ccd-interleave"/> 0<co id="co-ccd-flags"/> /dev/ad1e<co id="co-ccd-devs"/> /dev/ad2e /dev/ad3e</programlisting>
 
 	  <para>�ƥ��ץ����λ���ˡ�Ȱ�̣�ϰʲ����̤�Ǥ���</para>
 
@@ -631,7 +633,7 @@ sh MAKEDEV ccd0</programlisting>
 	<para>&man.vinum.8; �ξܺ٤ˤĤ��Ƥ� Vinum �ܥ�塼��ޥͥ���
 	  <!-- Furukawa:2004/1/8
 	  should be refer this after creating vinum/chapter.sgml
-	  <xref linkend="vinum-vinum">
+	  <xref linkend="vinum-vinum"/>
 	  -->
 	  �򻲾Ȥ��Ƥ���������</para>
       </sect3>
@@ -1033,7 +1035,7 @@ scsibus1:
 
 	  <screen>&prompt.user; <userinput>cdrecord -v dev=<replaceable>2,0</replaceable> -dao -useinfo  *.wav</userinput></screen>
 
-	  <para><xref linkend="cdrecord"> ����������Ƥ���褦��
+	  <para><xref linkend="cdrecord"/> ����������Ƥ���褦��
 	    <replaceable>2.0</replaceable>
 	    ��Ŭ�ڤ˻��ꤵ��Ƥ��뤳�Ȥ�Τ���Ƥ���������</para>
 	</step>
@@ -1198,11 +1200,12 @@ scsibus1:
     </sect2>
 
     <sect2 id="atapicam">
+      <title>ATAPI/CAM �ɥ饤�Фλ���</title>
+
       <indexterm>
 	<primary>CD �饤��</primary>
 	<secondary>ATAPI/CAM �ɥ饤��</secondary>
       </indexterm>
-      <title>ATAPI/CAM �ɥ饤�Фλ���</title>
 
       <para>���Υɥ饤�Фϡ�ATAPI �ǥХ��� (CD-ROM, CD-RW, DVD �ɥ饤�֤ʤ�)
 	�� SCSI ���֥����ƥ���̤��ƥ����������뤳�Ȥ��ǽ�ˤ��ޤ���
@@ -2800,7 +2803,7 @@ Filesystem 1K-blocks Used Avail Capacity  Mounted on
 	�ǥ������������������Ѥ��뤿��ˤϾ嵭������奫���ͥ���ۤ��ʤ�����
 	�������줿�������५���ͥ�򥤥󥹥ȡ��뤷�ʤ���Ф����ޤ���
 	�����ͥ�Υ���ե����졼�����˴ؤ��Ƥ�
-	<xref linkend="kernelconfig"> ��������������</para>
+	<xref linkend="kernelconfig"/> ��������������</para>
 
       <para>���� <filename>/etc/rc.conf</filename>
 	�ǥǥ���������������ͭ���ˤ���ɬ�פ�����ޤ���
@@ -3038,7 +3041,7 @@ Filesystem 1K-blocks Used Avail Capacity  Mounted on
       (Mandatory Access Control (MAC) �򻲾�)
       <!-- Furukawa:2004/1/8
       should be refer this after updating security/chapter.sgml
-      (<xref linkend="mac"> �򻲾�)
+      (<xref linkend="mac"/> �򻲾�)
       -->
       �ϡ�����ԥ塼����ư����ǡ�OS ���¹���Ǥ���Ȥ��ˡ�
       ̵���Ĥ��軰�Ԥ��ǡ����˥�����������Τ��ɤ����Ȥ���Ω���ޤ���
@@ -3092,7 +3095,7 @@ Password:</screen>
 	  <para><literal>options GEOM_BDE</literal></para>
 
 	  <para>FreeBSD �����ͥ�����ꡢ�ƥ���ѥ��롢���󥹥ȡ��뤷�ޤ���
-	    ���μ��� <xref linkend="kernelconfig"> ����������Ƥ��ޤ���</para>
+	    ���μ��� <xref linkend="kernelconfig"/> ����������Ƥ��ޤ���</para>
 
 	  <para>�����������ͥ�ǺƵ�ư���ޤ���</para>
 	</step>
@@ -3113,7 +3116,7 @@ Password:</screen>
 	<step>
 	  <title>�������ϡ��ɥɥ饤�֤��ɲä���</title>
 
-	  <para><xref linkend="disks-adding"> ����������Ƥ����̤�˿������ɥ饤�֤򥷥��ƥ�����֤��ޤ���
+	  <para><xref linkend="disks-adding"/> ����������Ƥ����̤�˿������ɥ饤�֤򥷥��ƥ�����֤��ޤ���
 	    ������Ǥϡ��������ϡ��ɥɥ饤�֤�
 	    <devicename>/dev/ad4s1c</devicename> �ѡ��ƥ�������
 	    �ä���줿��ΤȤ��ޤ���
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml b/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
index 8b6e55874d..358fce94c6 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -1168,6 +1169,7 @@ help
 	      ������󵯤����ꡢ���������ˡ��������뤳�Ȥ���Ū�Ȥ��Ƥ��ޤ���
 	      ����Ū�ʵ����˶�̣����äƤ������λ��äⴿ�ޤ��ޤ���</para>
 	  </listitem>
+	</varlistentry>
 
 	<varlistentry>
 	  <term>&a.zope.name;</term>
diff --git a/ja_JP.eucJP/books/handbook/hw/chapter.sgml b/ja_JP.eucJP/books/handbook/hw/chapter.sgml
index 7c8215cc3b..5f2202bd56 100644
--- a/ja_JP.eucJP/books/handbook/hw/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/hw/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.sgml b/ja_JP.eucJP/books/handbook/install/chapter.sgml
index a5cb7ebf03..f60ef5079a 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -43,7 +44,7 @@
       ���ξϤǤϡ�<application>sysinstall</application> ��Ȥä�
       &os; �Υ��󥹥ȡ�����ˡ���������ޤ���
       <application>bsdsysinstall</application> �����ѤˤĤ��Ƥ�
-      <xref linkend="bsdinstall"> ���������ޤ���</para>
+      <xref linkend="bsdinstall"/> ���������ޤ���</para>
 
     <para>���ξϤ��ɤ�С����Τ��Ȥ��狼��Ǥ��礦:</para>
 
@@ -104,7 +105,7 @@
 	�ޤ���&os; �Υ��󥹥ȡ�����ˡ�ˤ�äơ��ե��åԡ��ɥ饤�֤䡢
 	�б����Ƥ��� CDROM �ɥ饤�֡�
 	���ˤ�äƤϥͥåȥ�������ץ���ɬ�פȤʤ�ޤ���
-	����˴ؤ��Ƥϡ�<xref linkend="install-boot-media">
+	����˴ؤ��Ƥϡ�<xref linkend="install-boot-media"/>
 	����������Ƥ��ޤ���</para>
 
       <sect3>
@@ -150,7 +151,7 @@
 
 	<para>&os;/&arch.sparc64; �򥤥󥹥ȡ��뤹��ˤϡ�
 	  ���ݡ��Ȥ���Ƥ���ϡ��ɥ�������ɬ�פǤ�
-	  (<xref linkend="install-hardware-supported"> ������������)��</para>
+	  (<xref linkend="install-hardware-supported"/> ������������)��</para>
 
 	<para>�������Ǥϡ�¾�Υ��ڥ졼�ƥ��󥰥����ƥ�ȥǥ������ζ�ͭ���Ǥ��ʤ��Τǡ�
 	  &os;/&arch.sparc64; ���ѤΥǥ�������ɬ�פǤ���</para>
@@ -171,6 +172,7 @@
       &os; �Υ����֥����Ȥ� <ulink
       url="http://www.FreeBSD.org/ja/releases/index.html">��꡼������</ulink>
       �Υڡ����ˤ���ޤ���</para>
+    </sect2>
   </sect1>
 
   <sect1 id="install-pre">
@@ -205,10 +207,10 @@
 	<title>����ץ�ǥХ�������</title>
 
 	<tgroup cols="4">
-	  <colspec colwidth="2*">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="4*">
+	  <colspec colwidth="2*"/>
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="4*"/>
 	  <thead>
 	    <row>
 	      <entry>�ǥХ�����̾��</entry>
@@ -443,7 +445,7 @@
 
 	  <listitem>
 	    <para>��˽Ҥ٤� <application>&partitionmagic;</application>
-	      ��Ϥ���Ȥ��� &windows; �ѡ��ƥ�������̾�����ġ������Ѥ��롣
+	      ��Ϥ���Ȥ��� &windows; �ѡ��ƥ�������̾�����ġ������Ѥ��롣</para>
 	  </listitem>
 	</orderedlist>
       </example>
@@ -591,14 +593,14 @@
 
       <para>FreeBSD �� CD �ޤ��� DVD �ǹ������Ƥ���ΤǤ���С�
 	ɬ�פʤ�ΤϤ��٤Ƥ����äƤ���Τǡ�������
-	(<xref linkend="install-boot-media">) ���ɤ����Ф��Ƥ���������</para>
+	(<xref linkend="install-boot-media"/>) ���ɤ����Ф��Ƥ���������</para>
 
       <para>FreeBSD �Υ��󥹥ȡ���ե������ޤ����äƤ��ʤ��ΤǤ���С�
-	<xref linkend="install-diff-media"> �ޤ��ɤ����Ф��Ƥ���������
+	<xref linkend="install-diff-media"/> �ޤ��ɤ����Ф��Ƥ���������
 	FreeBSD
 	���Ǽ�������꤫�饤�󥹥ȡ��뤹�뤿��ν����ˤĤ����������Ƥ��ޤ���
 	���Υ����������ɤ߽���ä��塢��������äƤ��ơ�
-	<xref linkend="install-boot-media"> ���ɤ�Ǥ���������</para>
+	<xref linkend="install-boot-media"/> ���ɤ�Ǥ���������</para>
     </sect2>
 
     <sect2 id="install-boot-media">
@@ -647,7 +649,7 @@
 	      �ۤʤ�ǥ��쥯�ȥ�ѥ����Ȥ��Ƥ��ޤ���
 	      &os;&nbsp;9.0-RELEASE
 	      �ʹߤΥС������Υ���������ɤȥ��󥹥ȡ���ξܺ٤ˤĤ��Ƥϡ�
-	      <xref linkend="bsdinstall"> ���������ޤ���</para>
+	      <xref linkend="bsdinstall"/> ���������ޤ���</para>
 	  </tip>
 
 	  <para>���ꥹ�ƥ��å����᡼���ˤϡ�<filename>.img</filename>
@@ -939,7 +941,7 @@ We can take no responsibility for lost disk contents!</literallayout>
 	</step>
 
 	<step>
-	  <para><xref linkend="install-boot-media">
+	  <para><xref linkend="install-boot-media"/>
 	    ����������Ƥ��� <quote>��ư</quote> USB ���ƥ��å�����Ѥ�����ˤϡ�
 	    ����ԥ塼����Ω���夲�����ˡ�USB ���ƥ��å����������Ƥ���������</para>
 
@@ -948,7 +950,7 @@ We can take no responsibility for lost disk contents!</literallayout>
 
 	  <note>
 	    <para>&os;&nbsp;7.<replaceable>X</replaceable> �Ǥϡ�
-	      <xref linkend="install-boot-media">
+	      <xref linkend="install-boot-media"/>
 	      ����������Ƥ�����ˡ�Ǻ���������ư�ե��åԡ����Ѥ��ƥ��󥹥ȡ���Ǥ��ޤ���
 	      <filename>boot.flp</filename> ���ǽ���������� disc �Ǥ���
 	      ���Υǥ�������ե��åԡ��ɥ饤�֤��������ơ�
@@ -1039,7 +1041,7 @@ Insert disk labelled "Kernel floppy 1" and press any key...</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="install/boot-loader-menu" format="PNG">
+		<imagedata fileref="install/boot-loader-menu" format="PNG"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1080,8 +1082,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
 	<screenco>
 	  <areaspec>
-	    <area id="prompt-single" coords="1 5">
-	    <area id="prompt-smp" coords="2 5">
+	    <area id="prompt-single" coords="1 5"/>
+	    <area id="prompt-smp" coords="2 5"/>
 	  </areaspec>
 
 	  <screen><prompt>ok     </prompt>
@@ -1117,7 +1119,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <para>ľ���ˤ��κ�Ȥ�Ԥäơ������ͥ뤬�ǥХ������Ф�¹Ԥ��Ƥ������
 	���̤γ���ή�줿ʸ������ɽ�����Ƥ���������
-	<xref linkend="install-dev-probe"> �ˤ褯�������̤�������Ǥ��礦����
+	<xref linkend="install-dev-probe"/> �ˤ褯�������̤�������Ǥ��礦����
 	���ʤ��Υ���ԥ塼������ܤ���Ƥ���ǥХ����ˤ�äơ�ɽ�������ʸ����ϰۤʤ�Ǥ��礦��</para>
 
       <figure id="install-dev-probe">
@@ -1194,7 +1196,7 @@ Mounting root from ufs:/dev/md0c
 	�����ͥ�˴ޤޤ�Ƥ��ʤ��ǥХ����Υ��ݡ��Ȥ��ɲä��뤳�Ȥ��Ǥ��ޤ���</para>
 
       <para>�ǥХ������и塢
-	<xref linkend="config-country"> ��ɽ������ޤ���
+	<xref linkend="config-country"/> ��ɽ������ޤ���
 	���������Ȥäơ����ϰ衢���롼�פ����򤷤Ƥ���������
 	���θ塢<keycap>Enter</keycap> �򲡤��Ƥ���������
 	����ñ������Ǥ��ޤ���</para>
@@ -1204,7 +1206,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG">
+	    <imagedata fileref="install/config-country" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1220,7 +1222,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG">
+	    <imagedata fileref="install/config-keymap" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1244,7 +1246,7 @@ Mounting root from ufs:/dev/md0c
       �����ξܤ�������Ȥ��ΰ�̣�ˤĤ��Ƥ�
       <application>sysinstall</application> �λ���ˡ����������Ƥ��ޤ���</para>
 
-    <para>�����������ɤ�ˤϡ�<xref linkend="sysinstall-main3"> �˼����褦�ˡ�
+    <para>�����������ɤ�ˤϡ�<xref linkend="sysinstall-main3"/> �˼����褦�ˡ�
       <guimenuitem>Usage</guimenuitem> �ι��ܤ���Ĵɽ�����졢
       <guibutton>[Select]</guibutton> �ܥ������򤵤�Ƥ��뤳�Ȥ��ǧ���ơ�
       <keycap>Enter</keycap> �򲡤��Ƥ���������</para>
@@ -1257,7 +1259,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG">
+	  <imagedata fileref="install/main1" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1274,7 +1276,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG">
+	    <imagedata fileref="install/main-doc" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1286,7 +1288,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG">
+	    <imagedata fileref="install/docmenu1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1316,7 +1318,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG">
+	    <imagedata fileref="install/main-keymap" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1337,7 +1339,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG">
+	    <imagedata fileref="install/keymap" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1355,7 +1357,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main-options" format="PNG">
+	  <imagedata fileref="install/main-options" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1365,7 +1367,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG">
+	    <imagedata fileref="install/options" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1397,7 +1399,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG">
+	    <imagedata fileref="install/main-std" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1557,7 +1559,7 @@ Mounting root from ufs:/dev/md0c
       <para>�ؼ����줿�Ȥ��� <keycap>Enter</keycap> �򲡤��Ƥ���������
 	���ˡ��ǥХ�����������¹Ԥ����Ȥ��˥����ͥ뤬���դ�����
 	���٤ƤΥϡ��ɥɥ饤�֤Υꥹ�Ȥ�ɽ�������Ǥ��礦��
-	<xref linkend="sysinstall-fdisk-drive1"> ��
+	<xref linkend="sysinstall-fdisk-drive1"/> ��
 	IDE �ǥ���������Ĥ�ĥ����ƥ����Ǥ���
 	������
 	<devicename>ad0</devicename> �����
@@ -1568,7 +1570,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG">
+	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1612,7 +1614,7 @@ Mounting root from ufs:/dev/md0c
 
       <para>FreeBSD �򥤥󥹥ȡ��뤷�����ǥ����������򤷤ơ�
 	&gui.ok; �򲡤��Ƥ���������
-	<xref linkend="sysinstall-fdisk1"> �Τ褦��ɽ���ȤȤ��
+	<xref linkend="sysinstall-fdisk1"/> �Τ褦��ɽ���ȤȤ��
 	<application>fdisk</application> ����ư����Ǥ��礦��</para>
 
       <para><application>fdisk</application>
@@ -1640,7 +1642,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG">
+	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1661,7 +1663,7 @@ Mounting root from ufs:/dev/md0c
 	�����Ԥä��顢��������������Ȥäƿ������������줿
 	FreeBSD ���饤�������򤷡����饤���˵�ư��ǽ�ΰ���Ĥ��뤿���
 	<keycap>S</keycap> �����򲡤��Ƥ���������
-	���ΤȤ������̤θ����ܤ� <xref linkend="sysinstall-fdisk2">
+	���ΤȤ������̤θ����ܤ� <xref linkend="sysinstall-fdisk2"/>
 	�Ȥ褯������ΤȤʤ�Ǥ��礦��
 	<literal>Flags</literal> ��� <literal>A</literal> �����դ��Ƥ���������
 	����Ϥ��Υ��饤���� <emphasis>�����ƥ���</emphasis> �ǡ�
@@ -1689,7 +1691,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG">
+	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1730,7 +1732,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG">
+	    <imagedata fileref="install/boot-mgr" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1761,7 +1763,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG">
+	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1802,10 +1804,10 @@ Mounting root from ufs:/dev/md0c
 	<title>����ܤΥǥ������Υѡ��ƥ������쥤������</title>
 
 	<tgroup cols="4">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="4*">
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="4*"/>
 
 	  <thead>
 	    <row>
@@ -1918,10 +1920,10 @@ Mounting root from ufs:/dev/md0c
 	<title>�Ĥ�Υǥ������Υѡ��ƥ��������</title>
 
 	<tgroup cols="4">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="1*">
-	  <colspec colwidth="2*">
-	  <colspec colwidth="3*">
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="2*"/>
+	  <colspec colwidth="3*"/>
 
 	  <thead>
 	    <row>
@@ -2000,7 +2002,7 @@ Mounting root from ufs:/dev/md0c
 	FreeBSD �ѡ��ƥ�����󥨥ǥ�����Ϥ���뤿���
 	<keycap>Enter</keycap> �����򲡤��Ƥ���������</para>
 
-      <para><xref linkend="sysinstall-label"> ��
+      <para><xref linkend="sysinstall-label"/> ��
 	<application>disklabel</application>
 	��Ϥ���Ƶ�ư�����Ȥ��β���ɽ���Ǥ���
 	���β��̤ϻ��ĤΥ���������ʬ����Ƥ��ޤ���
@@ -2027,7 +2029,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG">
+	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2038,7 +2040,7 @@ Mounting root from ufs:/dev/md0c
 	�ǥե���ȤΥ������ϡ�
 	�ǥ������Υ���������ѡ��ƥ�����󥵥�������륢�르�ꥺ��ˤ�äƷ׻�����ޤ���
 	<keycap>A</keycap> �����򲡤��ơ�����Ƥ���������
-	<xref linkend="sysinstall-label2"> �Ȥ褯�������̤Ȥʤ�Ǥ��礦��
+	<xref linkend="sysinstall-label2"/> �Ȥ褯�������̤Ȥʤ�Ǥ��礦��
 	���ʤ������Ѥ��Ƥ���ǥ������Υ������˰�¸���Ƥ���Τǡ�
 	�ǥե���Ȥϴ�˾���Ƥ����Τˤʤ뤫�⤷��ޤ��󤷡�
 	�ʤ�ʤ����⤷��ޤ���
@@ -2059,7 +2061,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG">
+	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2076,7 +2078,7 @@ Mounting root from ufs:/dev/md0c
 	���̤���Ƭ��Ŭ�ڤʥǥ��������饤�������򤵤�Ƥ��뤳�Ȥ��ǧ���ơ�
 	<keycap>C</keycap> �����򲡤��Ƥ���������
 	�������ѡ��ƥ������Υ����������Ϥ򤦤ʤ��������������������Ǥ��礦
-	(<xref linkend="sysinstall-label-add">)��
+	(<xref linkend="sysinstall-label-add"/>)��
 	���Ѥ�������������֥��å��ο������ϤǤ��ޤ���
 	�ޤ��ϡ�
 	�ᥬ�Х���ñ�̤ǻ��ꤹ�� <literal>M</literal>��
@@ -2089,7 +2091,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG">
+	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2098,7 +2100,7 @@ Mounting root from ufs:/dev/md0c
 	���饤���˻ĤäƤ��륵�����Υѡ��ƥ��������������Ǥ��礦��
 	��Ҥ����ѡ��ƥ�����󥵥������Ѥ������ <keycap>Backspace</keycap>
 	�������Ѥ���ɽ������Ƥ������������
-	<xref linkend="sysinstall-label-add2"> �Τ褦�� <userinput>512M</userinput>
+	<xref linkend="sysinstall-label-add2"/> �Τ褦�� <userinput>512M</userinput>
 	�����Ϥ��Ƥ��������������� &gui.ok; �򲡤��Ƥ���������</para>
 
       <figure id="sysinstall-label-add2">
@@ -2106,7 +2108,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG">
+	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2114,7 +2116,7 @@ Mounting root from ufs:/dev/md0c
       <para>�ѡ��ƥ������Υ����������Ϥ���ȡ�
 	���ˤ��Υѡ��ƥ������ϥե����륷���ƥ�ʤΤ���
 	����Ȥ⥹��å��ΰ�ʤΤ���ʹ�����Ǥ��礦��
-	<xref linkend="sysinstall-label-type">
+	<xref linkend="sysinstall-label-type"/>
 	�Τ褦�˥�����������ɽ������ޤ���
 	���ΰ����ܤΥѡ��ƥ������ˤϥե����륷���ƥब�ޤޤ��Τǡ�
 	<guimenuitem>FS</guimenuitem> �����򤷡�
@@ -2125,7 +2127,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG">
+	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2133,7 +2135,7 @@ Mounting root from ufs:/dev/md0c
       <para>�ե����륷���ƥ��������褦�Ȥ��Ƥ���Τǡ�
 	�Ǹ�� <application>disklabel</application> ���Ф��ơ�
 	���Υե����륷���ƥब�ɤ��˥ޥ���Ȥ���뤫�����ʤ���Фʤ�ޤ���
-	<xref linkend="sysinstall-label-mount">
+	<xref linkend="sysinstall-label-mount"/>
 	�Τ褦�ʥ�����������ɽ������ޤ���
 	�롼�ȥե����륷���ƥ�Υޥ���ȥݥ���Ȥ� <filename>/</filename>
 	�ʤΤǡ�<userinput>/</userinput> �����Ϥ�
@@ -2144,7 +2146,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG">
+	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2161,7 +2163,7 @@ Mounting root from ufs:/dev/md0c
 
       <para>�ǽ�Ū�� FreeBSD �ǥ�������٥륨�ǥ��� �β��̤ϡ�
 	���򤵤줿���ͤϰۤʤäƤ��뤫�⤷��ޤ��󤬡�
-	<xref linkend="sysinstall-label4"> �Τ褦�ˤʤ�Ǥ��礦��
+	<xref linkend="sysinstall-label4"/> �Τ褦�ˤʤ�Ǥ��礦��
 	<keycap>Q</keycap> �����򲡤��ƽ�λ���ޤ���</para>
 
       <figure id="sysinstall-label4">
@@ -2169,7 +2171,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG">
+	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2196,14 +2198,14 @@ Mounting root from ufs:/dev/md0c
 	&os; �Υ��󥹥ȡ�����
 	X �����ФˤĤ��Ƥ�����ȥǥե���ȥǥ����ȥåפ������ԤäƤ���������
 	X �����ФΥ��󥹥ȡ��������˴ؤ���ܺ٤ʾ����
-	<xref linkend="x11"> �ˤ���ޤ���</para>
+	<xref linkend="x11"/> �ˤ���ޤ���</para>
 
       <para>�������५���ͥ�򥳥�ѥ��뤹��ͽ��ʤ�Х����������ɤ�ޤ४�ץ��������򤷤ޤ���
     �ʤ��������५���ͥ���ۤ���Τ����ޤ��������५���ͥ�ι�����ˡ�˴ؤ��Ƥ�
-    <xref linkend="kernelconfig"> �򻲾Ȥ��Ƥ���������</para>
+    <xref linkend="kernelconfig"/> �򻲾Ȥ��Ƥ���������</para>
 
       <para>�����ʤ��顢���Ƥ�ޤॷ���ƥब�Ǥ�¿���Τ��Ȥ�Ԥ��ޤ���
-    ��ʬ�ʥǥ��������ڡ���������ʤ�С�<xref linkend="distribution-set1">
+    ��ʬ�ʥǥ��������ڡ���������ʤ�С�<xref linkend="distribution-set1"/>
     �Ǽ������褦�� <guimenuitem>All</guimenuitem> ��������������򤷡�
     <keycap>Enter</keycap> �򲡤��ޤ���
     �ǥ��������ڡ����˷�ǰ������ʤ�С������˹�ä����դ��路�����ץ��������򤷤ޤ���
@@ -2215,7 +2217,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG">
+	    <imagedata fileref="install/dist-set" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2229,7 +2231,7 @@ Mounting root from ufs:/dev/md0c
     Ports Collection �Ȥϡ���ñ�˥��եȥ������򥤥󥹥ȡ��뤹����ˡ�Ǥ���
     ����ϥ��եȥ������򥳥�ѥ��뤹��Τ�ɬ�פʥ����������ɤ�ޤߤޤ���
     �������ꡢ�����ɥѡ��ƥ����Υ��եȥ������ѥå�������ưŪ�˥���������ɡ�����ѥ��롢���󥹥ȡ����Ԥ�����Υե�����ν��ޤ�Ǥ���
-    <xref linkend="ports"> �� Ports Collection �λ�����ˡ�����⤵��Ƥ��ޤ���</para>
+    <xref linkend="ports"/> �� Ports Collection �λ�����ˡ�����⤵��Ƥ��ޤ���</para>
 
       <para>���󥹥ȡ���ץ������ϥǥ������˽�ʬ�ʶ������̤����뤫�ɤ���������å����ޤ���Τǡ�
 	��ʬ�ʶ������̤�������Τߤ��Υ��ץ��������򤷤Ƥ���������
@@ -2268,7 +2270,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG">
+	    <imagedata fileref="install/dist-set2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2299,7 +2301,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG">
+	  <imagedata fileref="install/media" format="PNG"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2500,7 +2502,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG">
+	    <imagedata fileref="install/ed0-conf" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2539,7 +2541,7 @@ installation menus to retry whichever operations have failed.
       <para>&gui.yes; ���������硢
 	<application>dhclient</application> ��¹Ԥ��ޤ������꤬��������ȡ�
 	�ͥåȥ��������󤬼�ư�䴰����ޤ��� �ܺ٤ˤĤ��Ƥ�
-	<xref linkend="dhcp"><!-- <xref linkend="network-dhcp"> --> �򻲾Ȥ��Ƥ���������</para>
+	<xref linkend="dhcp"/><!-- <xref linkend="network-dhcp"/> --> �򻲾Ȥ��Ƥ���������</para>
 
       <para>���Υͥåȥ��������̤Ǥϡ�LAN
 	�ѥ����ȥ����������ƥ�Υ������ͥåȥǥХ���������ɽ������ޤ���</para>
@@ -2549,7 +2551,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG">
+	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2683,7 +2685,7 @@ Do you want to configure inetd and the network services that it provides?
 
       <para>�����Υ����ӥ��ϡ����󥹥ȡ����� <filename>/etc/inetd.conf</filename>
 	��ʬ�ι����ʥƥ����ȥ��ǥ������Խ����뤳�Ȥ�ͭ���ˤʤ�ޤ���
-	�ܤ����� inetd �ξ� <!-- <xref linkend="network-inetd-overview"> --> �򸫤Ƥ���������</para>
+	�ܤ����� inetd �ξ� <!-- <xref linkend="network-inetd-overview"/> --> �򸫤Ƥ���������</para>
 
       <para>�����Υ����ӥ������Ѥ������ȹͤ��Ƥ���ʤ�С�
 	&gui.yes; �����ӥ��󥹥ȡ��뤷�Ƥ���������
@@ -2737,7 +2739,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG">
+	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2764,7 +2766,7 @@ use the current settings.
 	�Υǡ����Ǥ��� &man.sshd.8; ��ͭ���ˤʤ�ޤ���
 	����ԥ塼���ؤΰ����ʥ�⡼�ȥ�����������Ĥ��ޤ���
 	<application>OpenSSH</application> �Τ��ܤ�������ˤĤ��Ƥϡ�
-	<xref linkend="openssh"> ��������������</para>
+	<xref linkend="openssh"/> ��������������</para>
     </sect2>
 
     <sect2 id="ftpanon">
@@ -2797,7 +2799,7 @@ use the current settings.
 	  ���Υ��ץ�����ͭ���ˤ������ˡ�
 	  �������ƥ������������Ƥ���Ƥ���������
 	  �������ƥ��˴ؤ���ܺ٤ˤĤ��Ƥϡ�
-	  <xref linkend="security"> ��������������</para>
+	  <xref linkend="security"/> ��������������</para>
 
 	<para>anonymous FTP ��ͭ���ˤ���ˤϡ����������Ȥä�
 	  &gui.yes; �����򤷡�<keycap>Enter</keycap>
@@ -2824,7 +2826,7 @@ use the current settings.
 	<para>���Υ�å������ϡ�<filename>/etc/inetd.conf</filename>
 	  �ˤ����Ƥ� FTP �����ӥ���ͭ���ˤ���ɬ�פ����뤳�Ȥ򼨤��Ƥ��ޤ���
 	  �⤷��anonymous FTP ��³����Ĥ���ΤǤ���С�<xref
-	  linkend="inetd-services"> ��������������
+	  linkend="inetd-services"/> ��������������
 	  &gui.yes; ������ <keycap>Enter</keycap> �򲡤�����˿ʤ�ȡ�
 	  �ʲ��β��̤�ɽ������ޤ���</para>
 
@@ -2833,7 +2835,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG">
+	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2909,7 +2911,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG">
+	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2933,7 +2935,7 @@ use the current settings.
       <para>�ͥåȥ���ե����륷���ƥ� (NFS) ���Ѥ���ȡ�
 	�ͥåȥ����𤷤ƥե�����ζ�ͭ��Ԥ����Ȥ��Ǥ��ޤ���
 	����ԥ塼���򥵡��С����饤����Ȥޤ���ξ��������Ǥ��ޤ���
-	���ܤ�������ˤĤ��Ƥ� <xref linkend="nfs"> <!-- <xref linkend="network-nfs"> -->�򻲾Ȥ��Ƥ���������</para>
+	���ܤ�������ˤĤ��Ƥ� <xref linkend="nfs"/> <!-- <xref linkend="network-nfs"/> -->�򻲾Ȥ��Ƥ���������</para>
 
       <sect3 id="nsf-server-options">
 	<title>NFS ������</title>
@@ -2967,7 +2969,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/nfs-server-edit" format="PNG">
+	      <imagedata fileref="install/nfs-server-edit" format="PNG"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3016,7 +3018,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver1" format="PNG">
+	    <imagedata fileref="install/console-saver1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3030,7 +3032,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver2" format="PNG">
+	    <imagedata fileref="install/console-saver2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3052,7 +3054,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3" format="PNG">
+	    <imagedata fileref="install/console-saver3" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3066,7 +3068,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver4" format="PNG">
+	    <imagedata fileref="install/console-saver4" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3109,7 +3111,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG">
+	    <imagedata fileref="install/timezone1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3122,7 +3124,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG">
+	    <imagedata fileref="install/timezone2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3135,7 +3137,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG">
+	    <imagedata fileref="install/timezone3" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3206,7 +3208,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG">
+	    <imagedata fileref="install/mouse1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3219,7 +3221,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG">
+	    <imagedata fileref="install/mouse2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3235,7 +3237,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG">
+	    <imagedata fileref="install/mouse3" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3248,7 +3250,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG">
+	    <imagedata fileref="install/mouse4" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3263,7 +3265,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG">
+	    <imagedata fileref="install/mouse5" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3277,7 +3279,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG">
+	    <imagedata fileref="install/mouse6" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3321,7 +3323,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-cat" format="PNG">
+	    <imagedata fileref="install/pkg-cat" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3342,7 +3344,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-sel" format="PNG">
+	    <imagedata fileref="install/pkg-sel" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3371,7 +3373,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-install" format="PNG">
+	    <imagedata fileref="install/pkg-install" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3385,7 +3387,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-confirm" format="PNG">
+	    <imagedata fileref="install/pkg-confirm" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3425,7 +3427,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG">
+	    <imagedata fileref="install/adduser1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3438,7 +3440,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG">
+	    <imagedata fileref="install/adduser2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3541,7 +3543,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG">
+	    <imagedata fileref="install/adduser3" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3607,7 +3609,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG">
+	    <imagedata fileref="install/mainexit" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3637,7 +3639,7 @@ Retype new password :</screen>
 
       <para>�����ƥ�ϺƵ�ư����Τǡ�
 	ɽ������뤫�⤷��ʤ����٤ƤΥ��顼��å����������դ��Ƥ���������
-	�ܺ٤ˤĤ��Ƥϡ�<xref linkend="freebsdboot"> ��������������</para>
+	�ܺ٤ˤĤ��Ƥϡ�<xref linkend="freebsdboot"/> ��������������</para>
     </sect2>
 
     <sect2 id="network-services">
@@ -3659,7 +3661,7 @@ Retype new password :</screen>
 	��ޤ฽��Τ��٤ƤΥ��ڥ졼�ƥ��󥰥����ƥ�ˤȤäƽ��פʤΤǡ�&os;
 	�ι��ϰϤˤ錄��ͥåȥ����ǽ�Ϥ����򤹤뤳�ȤϤȤƤ����Ω���ޤ���
 	���󥹥ȡ�����˥ͥåȥ�������ӥ�����������򤹤�ȡ�
-	�桼�������ѤǤ��뤵�ޤ��ޤʥ����ӥ�������Ǥ��ޤ���
+	�桼�������ѤǤ��뤵�ޤ��ޤʥ����ӥ�������Ǥ��ޤ���</para>
 
       <para>�ͥåȥ�������ӥ��ϡ�
 	�ͥåȥ����Τɤ�����Ǥ⥢����������Ĥ���ץ������Ǥ���
@@ -3685,13 +3687,13 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG">
+	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
       <para>�ǽ�Υ��ץ����Ǥ��� <guimenuitem>Interfaces</guimenuitem> �ˤĤ��Ƥϡ�
-	���Ǥ� <xref linkend="inst-network-dev"> �����������Τǡ�
+	���Ǥ� <xref linkend="inst-network-dev"/> �����������Τǡ�
 	̵�뤷�ƹ����ޤ���</para>
 
       <para><guimenuitem>AMD</guimenuitem> ���ץ��������򤹤��
@@ -3722,7 +3724,7 @@ Retype new password :</screen>
 	�ǥ��쥯�ȥ�ϡ�<acronym>IP</acronym>
 	���ɥ쥹���饨�����ݡ��Ȥ��줿�ե����륷���ƥ�Υޥ���Ȥ˻Ȥ��ޤ���
 	<filename>/etc/amd.map</filename> �ե�����ϡ�
-	<acronym>AMD</acronym> �������ݡ��ȤΥǥե���ȥ��ץ�����������ޤ���
+	<acronym>AMD</acronym> �������ݡ��ȤΥǥե���ȥ��ץ�����������ޤ���</para>
 
       <indexterm>
 	<primary>FTP</primary>
@@ -3741,7 +3743,7 @@ Retype new password :</screen>
 	����ե����졼������˥塼�Ǥϡ�
 	����ԥ塼���򥲡��ȥ����������ꤷ�ޤ���
 	�⤷�����󥹥ȡ���β����� <guimenuitem>Gateway</guimenuitem>
-	���ץ�����ְ�ä����򤷤��ΤǤ���С�������̵���ˤǤ��ޤ���
+	���ץ�����ְ�ä����򤷤��ΤǤ���С�������̵���ˤǤ��ޤ���</para>
 
       <para><guimenuitem>Inetd</guimenuitem> ���ץ�����Ȥ��ȡ�����ޤǤ˵�������
 	&man.inetd.8; �ǡ��������ꤷ���ꡢ������̵���ˤǤ��ޤ���</para>
@@ -3755,7 +3757,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG">
+	    <imagedata fileref="install/mta-main" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3793,8 +3795,8 @@ Retype new password :</screen>
 	���Υ��ץ��������򤷤ʤ��ޤޤˤ��Ƥ������Ȥ�����ޤ���
 	�����ƥ�Ϲ��ʤ��������ɬ�פȤ��ޤ���
 	���饤����Ȥ䥵���Ф�����ˤĤ��Ƥξܺ٤�
-	<xref linkend="nfs"> ��������������
-<!--	<xref linkend="network-nfs"> --> </para>
+	<xref linkend="nfs"/> ��������������
+<!--	<xref linkend="network-nfs"/> --> </para>
 
       <para>���β��Υ��ץ���� <guimenuitem>NFS server</guimenuitem> ���ץ����Ǥ���
 	�����ƥ�� <acronym>NFS</acronym> �����Ф˥��åȥ��åפǤ��ޤ���
@@ -3812,7 +3814,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG">
+	    <imagedata fileref="install/ntp-config" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3840,7 +3842,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG">
+	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4251,7 +4253,7 @@ Please press any key to reboot.</screen>
 	      <filename>/boot/loader.conf</filename> �ե������
 	      <literal>hint.acpi.0.disabled="1"</literal> ���ɲä��Ƥ���������
 	      �֡��ȥ������Τ��ܤ�������ˤĤ��Ƥ�
-	      <xref linkend="boot-synopsis"> ���������ޤ���</para>
+	      <xref linkend="boot-synopsis"/> ���������ޤ���</para>
 	  </answer>
 	</qandaentry>
 	<qandaentry>
@@ -4388,11 +4390,12 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 
+	  <question>
 	  <indexterm>
 	    <primary>color</primary>
 	    <secondary>contrast</secondary>
 	  </indexterm>
-	  <question>
+
 	    <para>X11 ü������ <application>sysinstall</application> ��Ȥ��ȡ�
 	      �饤�ȥ��졼���طʤ˥ե���Ȥ�������ɽ�����졢�ɤߤ��餤�Ǥ���
 	      ���Υ��ץꥱ�������Υ���ȥ饹�Ȥ�⤯���뤳�ȤϤǤ��ޤ���?</para>
@@ -4448,9 +4451,9 @@ Please press any key to reboot.</screen>
 	�ɤΤ褦�ˤ���Ф褤�Ǥ��礦��?
 	���ꥢ�륳�󥽡����ȤäƤ���������
 	���ꥢ�륳�󥽡���ϴ���Ū���̤Υޥ���򥷥��ƥ�μ�ǥ����ץ쥤�䥭���ܡ��ɤȤ��ƻȤ��ޤ���
-	�����Ԥ��ˤϡ�<xref linkend="install-boot-media">
+	�����Ԥ��ˤϡ�<xref linkend="install-boot-media"/>
 	�������˽��������󥹥ȡ����Ѥ� USB ���ꥹ�ƥ��å���������뤫��
-	<xref linkend="install-cdrom"> ����������Ƥ��륤�󥹥ȡ����Ѥ�
+	<xref linkend="install-cdrom"/> ����������Ƥ��륤�󥹥ȡ����Ѥ�
 	ISO ���᡼�������������ɤ��Ƥ���������</para>
 
       <para>�ʲ��������˽��äơ�
@@ -4498,7 +4501,7 @@ Please press any key to reboot.</screen>
 	      <primary><command>mount</command></primary>
 	    </indexterm>
 	    <para>���󥹥ȡ����Ѥ� ISO ���᡼�� (<xref
-	      linkend="install-cdrom"> ������������) ����������� CD �ǵ�ư����ȡ�
+	      linkend="install-cdrom"/> ������������) ����������� CD �ǵ�ư����ȡ�
 	      &os; ���̾�Υ��󥹥ȡ���⡼�ɤǵ�ư���ޤ���
 	      ���󥹥ȡ���˥��ꥢ�륳�󥽡����Ȥä� &os; ��ư�������Τǡ�
 	      ���Τ���ˤϡ�ISO ���᡼���� CD-R ��ǥ����˾Ƥ����ˡ�
@@ -4762,7 +4765,7 @@ Please press any key to reboot.</screen>
 	  <para>���󥿡��ͥåȤؤΥ����������¤����ѤǤ���ΤǤ���С�
 	    <literal>bootonly</literal> ISO ��ȤäƤ���������
 	    &os; �򥤥󥹥ȡ��뤷�����θ�ɬ�פǤ���С�
-	    ports/packages �����ƥ� (<xref linkend="ports"> ������������)
+	    ports/packages �����ƥ� (<xref linkend="ports"/> ������������)
 	    ���Ѥ��ƥ����ɥѡ��ƥ����� package
 	    �����������ɤ������󥹥ȡ���Ǥ��ޤ���</para>
 
@@ -4780,9 +4783,9 @@ Please press any key to reboot.</screen>
 
 	  <para>���ˡ�CD ���᡼����ǥ������˽񤭹���Ǥ���������
 	    ¾�� FreeBSD �����ƥ��ǽ񤭹��ߤ�Ԥ����ˤϡ�
-	    <xref linkend="creating-cds">
-	    (�äˡ�<xref linkend="burncd"> �����
-	    <xref linkend="cdrecord">) ���ɤ�ǡ�
+	    <xref linkend="creating-cds"/>
+	    (�äˡ�<xref linkend="burncd"/> �����
+	    <xref linkend="cdrecord"/>) ���ɤ�ǡ�
 	    ���ܤ�����������Ƥ���������</para>
 
 	  <para>¾�Υץ�åȥե������ǽ񤭹��ߤ�Ԥ����ˤϡ�
@@ -4923,7 +4926,7 @@ Please press any key to reboot.</screen>
 	    <filename>base.inf</filename> �ե������ɬ�פǤ���
 	    ���󥹥ȡ���ץ������Ϥ��Υե�������ɤ߹��ߡ�
 	    ���ۥե������ fetch ����Ϣ�뤹��ݤˡ�
-	    �ɤ�����ο��Τ����ޤ��ʬ����Ƥ��뤫�����򤷤ޤ���
+	    �ɤ�����ο��Τ����ޤ��ʬ����Ƥ��뤫�����򤷤ޤ���</para>
 	</important>
 
 	<para>���󥹥ȡ����ǥ�����������̤ˤʤä��顢
diff --git a/ja_JP.eucJP/books/handbook/internals/chapter.sgml b/ja_JP.eucJP/books/handbook/internals/chapter.sgml
index 0b9cffbdeb..0c65c80f26 100644
--- a/ja_JP.eucJP/books/handbook/internals/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/internals/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml b/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
index b7b7b50ad0..2ad2ac2b4a 100644
--- a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -74,8 +75,9 @@
 	���󤲤�аʲ��Τ褦�ˤʤ�ޤ�:</para>
 
       <itemizedlist>
-	<indexterm><primary>�ץꥨ��ץƥ��֥ޥ����������</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>�ץꥨ��ץƥ��֥ޥ����������</primary></indexterm>
+
 	  <para>
 	    ͥ���٤�ưŪ��Ĵ�᤹�뵡ǽ�������뤳�Ȥ�
 	    ���ץꥱ�������ȥ桼���Ȥδ֤DZ꤫߳�ĸ�ʿ��
@@ -84,7 +86,6 @@
 	    <emphasis>�ץꥨ��ץƥ��֥ޥ����������</emphasis>��</para>
 	</listitem>
 
-	<indexterm><primary>�ޥ���桼����ǽ</primary></indexterm>
 	<listitem>
 	  <para>¿���ο͡��� 1 �Ĥ� &os;
 	    �����ƥ�򤵤ޤ��ޤ���Ū��Ʊ���˻Ȥ����Ȥ��ǽ�ˤ���
@@ -98,7 +99,6 @@
 	  </para>
 	</listitem>
 
-	<indexterm><primary>TCP/IP �ͥåȥ����</primary></indexterm>
 	<listitem>
 	  <para>SCTP �� DHCP, NFS, NIS, PPP, SLIP, IPsec, IPv6
 	    �Ȥ��ä��ȳ�ɸ�൬�ʤΥ��ݡ��Ȥ�ޤ�����Ǥ�
@@ -111,8 +111,9 @@
 	    �����ӥ����Ѥ��ƥ��󥿡��ͥåȤ���³�Ǥ��ޤ���</para>
 	</listitem>
 
-	<indexterm><primary>�����ݸ�</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>�����ݸ�</primary></indexterm>
+
 	  <para>���ץꥱ������� (���뤤�ϥ桼��) �����ߤ��˴��ĤǤ��ʤ�
 	    �褦�ˤ���<emphasis>�����ݸ�</emphasis>��ǽ��
 	    ���ץꥱ������󤬥���å��夷�Ƥ⡢
@@ -127,17 +128,18 @@
 	    �ǽ餫�餽�Τ褦�ˤ��Ĥ��Ĥ��߷פ���ޤ�����</para>
 	</listitem>
 
-	<indexterm>
-	  <primary>X Window System</primary>
-	</indexterm>
-
 	<listitem>
+	  <indexterm>
+	    <primary>X Window System</primary>
+	  </indexterm>
+
 	  <para>�ȳ�ɸ��Ǥ��� <emphasis>X Window �����ƥ�</emphasis>
 	    (X11R7) �ϡ����̤�
 	    VGA �����ɤ��˥��ǥ���ե�����桼�����󥿥ե����� (GUI)
 	    ���󶡤������٤ƤΥ����������ɤ�����󶡤���ޤ���</para>
 	</listitem>
 
+	<listitem>
 	<indexterm>
 	  <primary>�Х��ʥ�ߴ���</primary>
 	  <secondary>Linux</secondary>
@@ -158,7 +160,6 @@
 	  <primary>�Х��ʥ�ߴ���</primary>
 	  <secondary>NetBSD</secondary>
 	</indexterm>
-	<listitem>
 	  <para>Linux �� SCO, SVR4, BSDI, NetBSD
 	    �Ѥ˺��줿¿���Υץ������Ȥ�
 	    <emphasis>�Х��ʥ�ߴ���</emphasis>��</para>
@@ -181,8 +182,9 @@
 	    �⤷���ä��Ȥ��Ƥ�ۤ�ξ������ѹ��ǥ���ѥ��뤹�뤳�Ȥ��Ǥ��ޤ���</para>
 	</listitem>
 
-	<indexterm><primary>���ۥ���</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>���ۥ���</primary></indexterm>
+
 	  <para>�ǥޥ�ɥڡ�����<emphasis>���ۥ���</emphasis>
 	    �Ȥ���� <quote>�տ�� VM/buffer ����å���</quote> ���߷פϡ�
 	    ¿���Υ�����׵᤹�륢�ץꥱ���������Ф���
@@ -190,31 +192,34 @@
 	    ¾�Υ桼�����Ф��Ƥ�����Ū�ʱ�����ݻ����ޤ���</para>
 	</listitem>
 
-	<indexterm>
-	  <primary>�оη��ޥ���ץ����å��� (SMP)</primary>
-	</indexterm>
 	<listitem>
+	  <indexterm>
+	    <primary>�оη��ޥ���ץ����å��� (SMP)</primary>
+	  </indexterm>
+
 	  <para>ʣ���� CPU ����ܤ����ޥ���ˤ�����
 	    <emphasis>SMP ��ǽ</emphasis>�Υ��ݡ��ȡ�
 	  </para>
 	</listitem>
 
-	<indexterm>
-	  <primary>����ѥ���</primary>
-	  <secondary>C</secondary>
-	</indexterm>
-	<indexterm>
-	  <primary>����ѥ���</primary>
-	  <secondary>C++</secondary>
-	</indexterm>
 	<listitem>
+	  <indexterm>
+	    <primary>����ѥ���</primary>
+	    <secondary>C</secondary>
+	  </indexterm>
+	  <indexterm>
+	    <primary>����ѥ���</primary>
+	    <secondary>C++</secondary>
+	  </indexterm>
+
 	  <para>������ <emphasis>C</emphasis> �� <emphasis>C++</emphasis>
 	    �γ�ȯ�ġ��롣�ʤ������䳫ȯ�Τ����¿����¾�θ����
 	    ports �� packages ���쥯�������󶡤���Ƥ��ޤ���</para>
 	</listitem>
 
-	<indexterm><primary>������������</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>������������</primary></indexterm>
+
 	  <para>�����ƥ����Τ�<emphasis>������������</emphasis>
 	    ���󶡤���Ƥ���Τǡ�
 	    �׵�˹�碌�ƴĶ������¤�Ŭ�礵���뤳�Ȥ��Ǥ��ޤ���
@@ -274,13 +279,15 @@
 	    ���󥿡��ͥåȥ����ӥ�������Ū�ʥץ�åȥե�����ˤʤ�ޤ�:</para>
 
 	  <itemizedlist>
-	    <indexterm><primary>FTP ������</primary></indexterm>
 	    <listitem>
+	      <indexterm><primary>FTP ������</primary></indexterm>
+
 	      <para>FTP ������</para>
 	    </listitem>
 
-	    <indexterm><primary>web ������</primary></indexterm>
 	    <listitem>
+	      <indexterm><primary>web ������</primary></indexterm>
+
 	      <para>World Wide Web ������ (ɸ�ࡢ�⤷���ϰ����� [SSL])</para>
 	    </listitem>
 
@@ -288,26 +295,28 @@
 	      <para>IPv4 ����� IPv6 �롼�ƥ���</para>
 	    </listitem>
 
-	    <indexterm><primary>�ե�������������</primary></indexterm>
-	    <indexterm><primary>NAT</primary></indexterm>
 	    <listitem>
+	      <indexterm><primary>�ե�������������</primary></indexterm>
+	      <indexterm><primary>NAT</primary></indexterm>
+
 	      <para>�ե�������������� NAT
 		(<quote>IP �ޥ����졼��</quote>) �����ȥ�����</para>
 	    </listitem>
 
+	    <listitem>
 	    <indexterm>
 	      <primary>�Żҥ᡼��</primary>
 	    </indexterm>
 	    <indexterm>
 	      <primary>email</primary>
 	    </indexterm>
-	    <listitem>
 	      <para>�Żҥ᡼�륵����
 	      </para>
 	    </listitem>
 
-	    <indexterm><primary>USENET</primary></indexterm>
 	    <listitem>
+	      <indexterm><primary>USENET</primary></indexterm>
+
 	      <para>USENET �˥塼��������ŻҷǼ��ĥ����ƥ�
 	      </para>
 	    </listitem>
@@ -349,9 +358,10 @@
 	    Υ�줿���롼�פǤ⥢���ǥ����䳫ȯ�ζ�ͭ�ˤ�붦Ʊ������ǽ�ˤ��ޤ���</para>
 	</listitem>
 
-	<indexterm><primary>�롼��</primary></indexterm>
-	<indexterm><primary>DNS ������</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>�롼��</primary></indexterm>
+	  <indexterm><primary>DNS ������</primary></indexterm>
+
 	  <para><emphasis>�ͥåȥ����:</emphasis>
 	    �������롼����ɬ��? �͡��ॵ���� (DNS) ��?
 	    �����Υͥåȥ����͡�������ե��������������?
@@ -360,6 +370,7 @@
 	    �Ѥ��뤳�Ȥ��Ǥ��ޤ���</para>
 	</listitem>
 
+	<listitem>
 	<indexterm>
 	  <primary>X Window System</primary>
 	</indexterm>
@@ -367,7 +378,6 @@
 	  <primary>X Window System</primary>
 	  <secondary>Accelerated-X</secondary>
 	</indexterm>
-	<listitem>
 	  <para><emphasis>X Window ������ơ������:</emphasis>
 	    ��ͳ�����ѤǤ��� X11 �����Ф�Ȥ����Ȥˤ�äơ�
 	    �²��� X ü���Ȥ��� &os; ��Ȥ����Ȥ�Ǥ��ޤ���
@@ -379,8 +389,9 @@
 	    �ưפ˴������뤳�Ȥ�����ǽ�ˤ��ޤ���</para>
 	</listitem>
 
-	<indexterm><primary>GNU Compiler Collection</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>GNU Compiler Collection</primary></indexterm>
+
 	  <para><emphasis>���եȥ�������ȯ:</emphasis>
 	    ����Ū�� &os; �����ƥ�ˤϡ�ͭ̾�� GNU �� C/C++
 	    ����ѥ����ǥХå���ޤ�������ʳ�ȯ�ġ��뤬�Ĥ��Ƥ��ޤ���</para>
@@ -389,7 +400,7 @@
 
       <para>&os; �ϡ��������ȥХ��ʥ��ξ���Ȥ⡢CD-ROM �ޤ���
 	anonymous FTP �������ǽ�Ǥ���
-	�ܤ����� <xref linkend="mirrors"> ��������������</para>
+	�ܤ����� <xref linkend="mirrors"/> ��������������</para>
     </sect2>
 
     <sect2 id="introduction-nutshell-users">
@@ -404,23 +415,27 @@
 	IT ��ҤΥǥХ�����������ʤΥץ�åȥե�����Ȥ������Ѥ���Ƥ��ޤ���</para>
 
       <itemizedlist>
-	<indexterm><primary>Apple</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Apple</primary></indexterm>
+
 	  <para><ulink url="http://www.apple.com/">Apple</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Cisco</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Cisco</primary></indexterm>
+
 	  <para><ulink url="http://www.cisco.com/">Cisco</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Juniper</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Juniper</primary></indexterm>
+
 	  <para><ulink url="http://www.juniper.net/">Juniper</ulink></para>
 	</listitem>
 
-	<indexterm><primary>NetApp</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>NetApp</primary></indexterm>
+
 	  <para><ulink url="http://www.netapp.com/">NetApp</ulink></para>
 	</listitem>
       </itemizedlist>
@@ -429,64 +444,72 @@
 	���󥿡��ͥåȾ�Ǻ��祯�饹�Υ����ȤǤ����Ѥ���Ƥ��ޤ���</para>
 
       <itemizedlist>
-	<indexterm><primary>Yahoo!</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Yahoo!</primary></indexterm>
+
 	  <para><ulink url="http://www.yahoo.com/">Yahoo!</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Yandex</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Yandex</primary></indexterm>
+
 	  <para><ulink url="http://www.yandex.ru/">Yandex</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Apache</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Apache</primary></indexterm>
+
 	  <para><ulink url="http://www.apache.org/">Apache</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Rambler</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Rambler</primary></indexterm>
+
 	  <para><ulink url="http://www.rambler.ru/">Rambler</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Sina</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Sina</primary></indexterm>
+
 	  <para><ulink url="http://www.sina.com/">Sina</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Pair Networks</primary></indexterm>
 	<listitem>
 	  <para><ulink url="http://www.pair.com/">Pair Networks</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Sony Japan</primary></indexterm>
 	<listitem>
 	  <para><ulink url="http://www.sony.co.jp/">Sony Japan</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Netcraft</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Netcraft</primary></indexterm>
+
 	  <para><ulink url="http://www.netcraft.com/">Netcraft</ulink></para>
 	</listitem>
 
-	<indexterm><primary>NetEase</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>NetEase</primary></indexterm>
+
 	  <para><ulink url="http://www.163.com/">NetEase</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Weathernews</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Weathernews</primary></indexterm>
+
 	  <para><ulink url="http://www.wni.com/">Weathernews</ulink></para>
 	</listitem>
 
-	<indexterm><primary>TELEHOUSE America</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>TELEHOUSE America</primary></indexterm>
+
 	  <para><ulink url="http://www.telehouse.com/">TELEHOUSE
 	    America</ulink></para>
 	</listitem>
 
-	<indexterm><primary>Experts Exchange</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>Experts Exchange</primary></indexterm>
+
 	  <para><ulink url="http://www.experts-exchange.com/">Experts
 	    Exchange</ulink></para>
 	</listitem>
@@ -828,8 +851,9 @@
       <variablelist>
 	<varlistentry>
 	  <term>SVN �� CVS ��ݥ��ȥ�
-	    <anchor id="development-cvs-repository"></term>
+	    <anchor id="development-cvs-repository"/></term>
 
+	  <listitem>
 	  <indexterm>
 	    <primary>CVS</primary>
 	    <secondary>��ݥ��ȥ�</secondary>
@@ -846,7 +870,6 @@
 	    <primary>Subversion</primary>
 	    <see>SVN</see>
 	  </indexterm>
-	  <listitem>
 	    <para>Ĺǯ�ˤ錄�� &os; �Υ������ĥ꡼��
 	      <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>
 	      (Concurrent Versions System) �ˤ�äƥ��ƥʥ󥹤���Ƥ��ޤ�����
@@ -885,10 +908,11 @@
 
 	<varlistentry>
 	  <term>�������ĥ꡼������
-	    <anchor id="development-committers"></term>
+	    <anchor id="development-committers"/></term>
 
-	  <indexterm><primary>���ߥå���</primary></indexterm>
 	  <listitem>
+	    <indexterm><primary>���ߥå���</primary></indexterm>
+
 	    <para><firstterm>���ߥå��� (committers)</firstterm> ��
 	      CVS �ĥ꡼�ؤ�<emphasis>�񤭹��߸���</emphasis>����äƤ���͡�
 	      &os; �Υ��������ѹ���ä��뤳�Ȥ��Ǥ���ͤǤ�
@@ -905,9 +929,8 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FreeBSD ����������<anchor id="development-core"></term>
+	  <term>FreeBSD ����������<anchor id="development-core"/></term>
 
-	  <indexterm><primary>����������</primary></indexterm>
 	  <listitem>
 	    <para><firstterm>&os; ����������</firstterm>��
 	      &os;&nbsp;�ץ��������Ȥ���Ҥ��Ȥ���ȼ������ˤ������ΤǤ���
@@ -942,14 +965,15 @@
 	<varlistentry>
 	  <term>����¾�Υ���ȥ�ӥ塼��</term>
 
-	  <indexterm><primary>����ȥ�ӥ塼��</primary></indexterm>
 	  <listitem>
+	    <indexterm><primary>����ȥ�ӥ塼��</primary></indexterm>
+
 	    <para>�Ǹ�ˤʤ�ޤ�����
 	      ��äȤ���פ�¿���򤷤�볫ȯ�Ԥϥե����ɥХå���Х��ե�������ɤ�ɤ����äƤ����桼�����ȤǤ���
 	      &os; �γ�ȯ�˴ؤ�äƤ��������Ȥ����ͤϡ�
 	      �����ξ�Ǥ��� &a.hackers; �˻��ä���Ȥ褤�Ǥ��礦��
 	      &os; ��Ϣ�᡼��󥰥ꥹ�Ȥ˴ؤ���ܺ٤ϡ�
-	      <xref linkend="eresources"> ��������������</para>
+	      <xref linkend="eresources"/> ��������������</para>
 
 	    <para>
 	      <citetitle><ulink url="&url.articles.contributors;/article.html">
@@ -1051,7 +1075,7 @@
 	(<command>pkg_add</command>
 	�Ȥ������ޥ�ɤ�) ��ñ�˥��󥹥ȡ���Ǥ��ޤ���
 	package �� ports �˴ؤ���ܺ٤ϡ�
-	<xref linkend="ports"> ��������������</para>
+	<xref linkend="ports"/> ��������������</para>
 
       <para>�Ƕ�� &os; �Ǥϡ������ƥ�κǽ�Υ��åȥ��å׻��ˡ�
 	���󥹥ȡ��� (&man.sysinstall.8; �ޤ���
@@ -1060,7 +1084,7 @@
 	  class="directory">/usr/local/share/doc/freebsd</filename>
 	�ʲ��˥��󥹥ȡ��뤹�뤳�Ȥ�����Ǥ��ޤ���
 	�����ƥ�Υ��󥹥ȡ����Ǥ⡢<xref
-	  linkend="doc-ports-install-package"> �˵��Ҥ���Ƥ���
+	  linkend="doc-ports-install-package"/> �˵��Ҥ���Ƥ���
 	package ��Ȥ����Ȥǡ����ĤǤ�ɥ�����Ȥ򥤥󥹥ȡ���Ǥ��ޤ���
 	�����Υ�������˥��󥹥ȡ��뤵�줿�ɥ�����Ȥϡ�HTML
 	�֥饦����Ȥäưʲ��� URL ���黲�ȤǤ��ޤ���</para>
diff --git a/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml b/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml
index d9b8c027fb..e0309be0ba 100644
--- a/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
index 515ee2337a..ca6955de22 100644
--- a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -318,7 +319,7 @@ following line in &man.loader.conf.5;:
 	�ǥ��쥯�ȥ꤬¸�ߤ��ʤ� (�ޤ��ϡ����Ǥ���) �ΤǤ���С�
 	�����ͥ�Υ����������󥹥ȡ��뤵��Ƥ��ޤ���
 	���٤ƤΥ������ĥ꡼�򥤥󥹥ȡ��뤹���äȤ��ñ����ˡ�ϡ�<xref
-	  linkend="synching"> ���������� &man.csup.1; ���Ѥ�����ˡ�Ǥ���
+	  linkend="synching"/> ���������� &man.csup.1; ���Ѥ�����ˡ�Ǥ���
 	�ʲ��Τ褦�ˡ�<filename>/usr/src/sys/</filename>
 	�ؤΥ���ܥ�å���󥯤�������Ƥ���������</para>
 
@@ -503,7 +504,7 @@ following line in &man.loader.conf.5;:
       <literal>#</literal> ��³����ΤϤ��٤ƥ����ȤȤ��ư���졢
       ̵�뤵��ޤ��������Ǥϡ����줾��Υ�����ɤˤĤ���
       <filename>GENERIC</filename> �˽ФƤ�����֤��������ޤ���
-      <anchor id="kernelconfig-options">�������ƥ������¸�Τ��Ӥ����������Υ��ץ��������ˤĤ��Ƥϡ�
+      <anchor id="kernelconfig-options"/>�������ƥ������¸�Τ��Ӥ����������Υ��ץ��������ˤĤ��Ƥϡ�
       <filename>GENERIC</filename> ��Ʊ���ǥ��쥯�ȥ�ˤ���
       <filename>NOTES</filename> �ե������������������
       �������ƥ�����˰�¸���ʤ����ץ����ˤĤ��Ƥϡ�
@@ -671,7 +672,7 @@ cpu          I686_CPU</programlisting>
 
     <para>���Υ��ץ����ϡ������ͥ�Υ�����������ꥹ�ȤΥ��ݡ��Ȥ�ͭ���ˤ��ޤ���
       ���ε�ǽ�ϳ�ĥ°������� <acronym>UFS2</acronym> ��ͭ���ˤʤäƤ��뤳�Ȥ˰�¸����
-      <xref linkend="fs-acl"> �ǵ�ǽ���������Ԥ��Ƥ��ޤ���
+      <xref linkend="fs-acl"/> �ǵ�ǽ���������Ԥ��Ƥ��ޤ���
       <acronym>ACL</acronym> �ϥǥե���Ȥ�ͭ���ˤ���Ƥ��ޤ���
       �⤷������ޤǤ˥ե����륷���ƥ��ͭ���ˤ��Ƥ����ΤǤ���С�
       �����ͥ�����̵���ˤ��٤��ǤϤ���ޤ���
@@ -910,7 +911,7 @@ device          ata</programlisting>
     <para>ATA RAID �ɥ饤�֤ˤ�
       <literal>device ata</literal> �ȶ��ˤ��ΥǥХ�����ɬ�פǤ���</para>
 
-    <programlisting><anchor id="kernelconfig-atapi">device          atapicd                 # ATAPI CDROM drives</programlisting>
+    <programlisting><anchor id="kernelconfig-atapi"/>device          atapicd                 # ATAPI CDROM drives</programlisting>
 
     <para>ATAPI CDROM �ɥ饤�֤ˤ� <literal>device ata</literal>
       �ȶ��ˤ��ιԤ�ɬ�פǤ���</para>
@@ -1307,7 +1308,7 @@ device   loop          # Network loopback</programlisting>
       �ܺ٤Ϥ����ܤ� <link linkend="userppp">PPP</link>
       ���������򻲾Ȥ��Ʋ�������</para>
 
-    <programlisting><anchor id="kernelconfig-ptys">
+    <programlisting><anchor id="kernelconfig-ptys"/>
 device   pty           # Pseudo-ttys (telnet etc)</programlisting>
 
     <para>����� <quote>���������ߥʥ�</quote> �����ϥ��ߥ�졼�Ȥ��줿��������ݡ��ȤǤ���
@@ -1512,7 +1513,7 @@ device          fwe           # Ethernet over FireWire (non-standard!)</programl
 
       <varlistentry>
 	<term>�����ͥ뤬��ư���ʤ�<anchor
-	  id="kernelconfig-noboot"></term>
+	  id="kernelconfig-noboot"/></term>
 	<listitem>
 	  <para>�����������ͥ뤬��ư���ʤ��ä��ꡢ
 	    �ǥХ�����ǧ���򤷤ʤ����Ǥ⤢��Ƥʤ��Ǥ�������!
@@ -1540,7 +1541,7 @@ device          fwe           # Ethernet over FireWire (non-standard!)</programl
 	  <note>
 	    <para>�����ͥ�ι�����˥ȥ�֥뤬���������˻Ȥ�����ˡ�
 	      GENERIC ��¾�Υ����ͥ�򼡲�ι��ۤǾä���ʤ��褦�̤�̾������¸����褦�ˤ��Ƥ���������<emphasis
-		remap=tt>kernel.old</emphasis>
+		remap="tt">kernel.old</emphasis>
 	      �Ͽ����������ͥ�򥤥󥹥ȡ��뤹����ˡ�
 	      ���ΰ�����˥��󥹥ȡ��뤷����
 	      ���ޤ�ư���ʤ����⤷��ʤ������ͥ�Ǿ�񤭤���Ƥ��ޤ��Τ����ƤˤǤ��ޤ���
diff --git a/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml b/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml
index b388e0a83c..b5896d2f60 100644
--- a/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/kernelopts/chapter.sgml b/ja_JP.eucJP/books/handbook/kernelopts/chapter.sgml
index 22f8c5f393..cc2fef7a84 100644
--- a/ja_JP.eucJP/books/handbook/kernelopts/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/kernelopts/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/l10n/chapter.sgml b/ja_JP.eucJP/books/handbook/l10n/chapter.sgml
index 1bc2245f92..e330698c0a 100644
--- a/ja_JP.eucJP/books/handbook/l10n/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/l10n/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -56,7 +57,7 @@
 
     <itemizedlist>
       <listitem><para>�����ɥѡ��ƥ������ץꥱ�������Υ��󥹥ȡ�����ˡ
-	  (<xref linkend="ports">)��</para></listitem>
+	  (<xref linkend="ports"/>)��</para></listitem>
     </itemizedlist>
   </sect1>
 
@@ -237,14 +238,16 @@
       <para>�ʲ�����ĤδĶ��ѿ�������ե�����ǻ��ꤹ��ɬ�פ�����ޤ���</para>
 
       <itemizedlist>
-	<indexterm><primary>POSIX</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>POSIX</primary></indexterm>
+
 	  <para>&posix; &man.setlocale.3; ��Ϣ�δؿ��Τ����
 	    <envar>LANG</envar></para>
 	</listitem>
 
-	<indexterm><primary>MIME</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>MIME</primary></indexterm>
+
 	  <para>���ץꥱ��������Ѥ� MIME ʸ�����åȤΤ����
 	    <envar>MM_CHARSET</envar></para>
 	</listitem>
@@ -341,7 +344,7 @@ me:\
 
 	    <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
 
-	    <bridgehead renderas=sect4>�������󥯥饹�� &man.vipw.8; ���ѹ�����</bridgehead>
+	    <bridgehead renderas="sect4">�������󥯥饹�� &man.vipw.8; ���ѹ�����</bridgehead>
 
 	    <indexterm>
 	      <primary><command>vipw</command></primary>
@@ -352,7 +355,7 @@ me:\
 
 	    <programlisting>user:password:1111:11:<replaceable>language</replaceable>:0:0:User Name:/home/user:/bin/sh</programlisting>
 
-	    <bridgehead renderas=sect4>�������󥯥饹�� &man.adduser.8; ���ѹ�����</bridgehead>
+	    <bridgehead renderas="sect4">�������󥯥饹�� &man.adduser.8; ���ѹ�����</bridgehead>
 
 	    <indexterm>
 	      <primary><command>adduser</command></primary>
@@ -386,7 +389,7 @@ me:\
 	      </listitem>
 	    </itemizedlist>
 
-	    <bridgehead renderas=sect4>�������󥯥饹�� &man.pw.8; ���ѹ�����</bridgehead>
+	    <bridgehead renderas="sect4">�������󥯥饹�� &man.pw.8; ���ѹ�����</bridgehead>
 
 	    <indexterm>
 	      <primary><command>pw</command></primary>
diff --git a/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml b/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml
index 2be85b78fd..88f6a47a4a 100644
--- a/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -670,7 +671,7 @@ export PATH</programlisting>
 
       <para>SAP �Υ��󥹥ȡ���ˤϰʲ��� CD-ROM ��Ȥ��ޤ�����</para>
       <informaltable>
-	<tgroup cols=3>
+	<tgroup cols="3">
 	<thead>
 	<row>
 	  <entry>̾��</entry> <entry>�ֹ�</entry> <entry>����</entry>
diff --git a/ja_JP.eucJP/books/handbook/mail/chapter.sgml b/ja_JP.eucJP/books/handbook/mail/chapter.sgml
index f33971a2b4..4e326e79f3 100644
--- a/ja_JP.eucJP/books/handbook/mail/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/mail/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -39,7 +40,7 @@
       ���ξϤǤ� FreeBSD ��ǥ᡼�륵���Ф�¹Ԥ��뤿��δ���Ū��Ƴ�����������ޤ���
       ������������ʸ��ϴ����ʻ���ʸ���ǤϤʤ���
       �ºݤΤȤ�����θ���٤����פ�����¿������ά����Ƥ��ޤ���
-      ���η�ˤĤ��ơ�������夷����ΤˤĤ��Ƥ� <xref linkend="bibliography">
+      ���η�ˤĤ��ơ�������夷����ΤˤĤ��Ƥ� <xref linkend="bibliography"/>
       �˷Ǻܤ���Ƥ���¿����ͥ�줿���Ҥ򻲾Ȥ��Ƥ���������</para>
 
     <para>���ξϤǤϡ��ʲ���ʬ��ˤĤ����������ޤ���</para>
@@ -85,17 +86,17 @@
     <itemizedlist>
       <listitem>
 	<para>�ͥåȥ����³��Ŭ�ڤ�������ˡ
-	  (<xref linkend="advanced-networking">)</para>
+	  (<xref linkend="advanced-networking"/>)</para>
       </listitem>
 
       <listitem>
 	<para>���ʤ��Υ᡼��ۥ��Ȥ��Ф��� DNS �����Ŭ�ڤ�������ˡ
-	  (<xref linkend="advanced-networking">)</para>
+	  (<xref linkend="advanced-networking"/>)</para>
       </listitem>
 
       <listitem>
 	<para>�����ɥѡ��ƥ������եȥ������Υ��󥹥ȡ�����ˡ
-	  (<xref linkend="ports">)</para></listitem>
+	  (<xref linkend="ports"/>)</para></listitem>
     </itemizedlist>
   </sect1>
 
@@ -803,15 +804,16 @@ FEATURE(use_cw_file) 
 ���ɲä��Ƥ���������</programlisting>
 
 	  <para><application>sendmail</application> FAQ ��
-	    <ulink URL="http://www.sendmail.org/faq"></ulink> �ˤ���ޤ��Τǡ�
+	    <ulink url="http://www.sendmail.org/faq"></ulink> �ˤ���ޤ��Τǡ�
 	    �᡼�������� <quote>�������ʤ���</quote> ������о���ɤ�Ǥ���������</para>
 	</answer>
       </qandaentry>
 
-      <indexterm><primary>PPP</primary></indexterm>
       <qandaentry>
 
 	<question>
+	  <indexterm><primary>PPP</primary></indexterm>
+
 	  <para>�������륢�å� PPP �ۥ��Ȥǥ᡼�륵���Ф�¹Ԥ���ˤϤɤ������餤����?</para>
 	</question>
 
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index fc098747a0..a7c580302b 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -268,7 +269,7 @@
       �ޤ��ϥ���ѥ���Ѥߤ� package �Ȥ�������Ǥ��ޤ���</para>
 
     <para>BitTorrent ���Ѥ��ƥ���������ɤ��� ISO ���᡼����
-      <xref linkend="burncd"> ����������Ƥ��� burncd ��Ȥä�
+      <xref linkend="burncd"/> ����������Ƥ��� burncd ��Ȥä�
       CD �� DVD ��ǥ����˽񤭹���ޤ���</para>
   </sect1>
 
@@ -278,7 +279,7 @@
     <para><emphasis>��: &a.jp.sugimura;</emphasis>��1998 ǯ 7 �� 19 ��</para>
 
     <sect2>
-      <title><anchor id="anoncvs-intro">Ƴ��</title>
+      <title><anchor id="anoncvs-intro"/>Ƴ��</title>
 
       <indexterm>
 	<primary>CVS</primary>
@@ -336,7 +337,7 @@
     </sect2>
 
     <sect2>
-      <title><anchor id="anoncvs-usage">Anonymous CVS ��Ȥ�</title>
+      <title><anchor id="anoncvs-usage"/>Anonymous CVS ��Ȥ�</title>
 
       <para>&man.cvs.1; �����ꤷ�� Anonymous CVS
         ��ݥ��ȥ��Ȥ��ˤ�ñ�� <envar>CVSROOT</envar>
@@ -404,7 +405,7 @@ SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_
         ���ΰ�̣�Ϥ��礦�������Ǥϰ㤦��ΤˤʤäƤ���Ǥ��礦��
       </para>
 
-      <para><xref linkend="cvs-tags">
+      <para><xref linkend="cvs-tags"/>
         �ˤϥ桼������̣����ĤǤ�������ӥ���󥿥��ΰ������ܤ����Ƥ��ޤ���
         �����Ϥ������ Ports Collection ���Ф��ƻȤ����ȤϤǤ��ޤ���
         Ports Collection ��ʣ���γ�ȯ�֥�������äƤ��ʤ�����Ǥ���</para>
@@ -1060,7 +1061,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 
       <itemizedlist>
 	<listitem>
-	  <para><anchor id="cvsup-config-files">
+	  <para><anchor id="cvsup-config-files"/>
 	    �ɤΥե�����������ꤿ���Τ�?</para>
 
 	  <para><application>CVSup</application>
@@ -1081,7 +1082,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	</listitem>
 
 	<listitem>
-	  <para><anchor id="cvsup-config-vers">
+	  <para><anchor id="cvsup-config-vers"/>
 	    �ɤΥС������Τ�Τ��ߤ����Τ�?</para>
 
 	  <para><application>CVSup</application> ����Ѥ���ȡ�
@@ -1119,7 +1120,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	    �����������Ǥ�
 	    �ۤʤ��ӥ����򻲾Ȥ��뤳�Ȥˤʤ뤫�⤷��ޤ���</para>
 
-	  <para><xref linkend="cvs-tags">
+	  <para><xref linkend="cvs-tags"/>
         �ˤϥ桼������̣����ĤǤ�������ӥ���󥿥��ΰ������ܤ����Ƥ��ޤ���
 	    <application>CVSup</application> ������ե�������ǥ�������ꤹ����ϡ�
 	    <literal>tag=</literal> ��³���ƽ񤭤ޤ�
@@ -1172,7 +1173,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	</listitem>
 
 	<listitem>
-	  <para><anchor id="cvsup-config-where">
+	  <para><anchor id="cvsup-config-where"/>
 	    �ɤ��������ꤷ�����Τ�?</para>
 
 	  <para>���������ɤ��������ꤹ�뤫��
@@ -1196,7 +1197,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	</listitem>
 
 	<listitem>
-	  <para><anchor id="cvsup-config-dest">
+	  <para><anchor id="cvsup-config-dest"/>
 	    ��ʬ�Υޥ���Τɤ����֤������Τ�?</para>
 
 	  <para><literal>prefix=</literal> �ե�����ɤϡ�
@@ -1213,7 +1214,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	</listitem>
 
 	<listitem>
-	  <para><anchor id="cvsup-config-status">
+	  <para><anchor id="cvsup-config-status"/>
 	    �ɤ��� status �ե�������֤������Τ�?</para>
 
 	  <para><application>CVSup</application> ���饤����Ȥ�
@@ -1361,7 +1362,7 @@ doc/tr_*
 doc/zh_*</screen>
 
         <para>¾�θ���ˤĤ��Ƥ�Ʊ�ͤǤ� (���ꥹ�Ȥ� <ulink
-          URL="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os;
+          url="http://www.FreeBSD.org/cgi/cvsweb.cgi/">&os;
           CVS ��ݥ��ȥ�</ulink> �����ˤʤäƤ�������)��</para>
 
         <para>���μ¤������ʵ�ǽ��Ȥ���
diff --git a/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml b/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml
index a4b6dd94d4..8b982140be 100644
--- a/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -42,7 +43,7 @@
     <para>���ξϤǤϥ�����ɥ����ɤ����ꤹ�뤿���ɬ�פ���ˡ���������ޤ�
       (���������ⲻ���Ǻ������뤿��ˤϼ㴳����Ĵ����ɬ�פ��⤷��ޤ���)��
       �ӥǥ������ɤΥϡ��ɥ������˴ؤ�������ϡ�
-      X11 (<xref linkend="x11">)
+      X11 (<xref linkend="x11"/>)
       �Υ��󥹥ȡ��������ˤ����Ƥ��Ǥ˰����ޤ����Τǡ�
       �������������������</para>
 
@@ -96,7 +97,7 @@
 
     <itemizedlist>
       <listitem><para>�����������ͥ�����ꤷ�ƥ��󥹥ȡ��뤹����ˡ
-	  (<xref linkend="kernelconfig">)</para></listitem>
+	  (<xref linkend="kernelconfig"/>)</para></listitem>
     </itemizedlist>
 
     <warning>
@@ -189,7 +190,7 @@
 	������ɥ����ɤΥɥ饤�Ф򥫡��ͥ����Ū���Ȥ߹��ळ�ȤǤ���
 	�ʲ�����Ǥϡ�������ˡ�ǥϡ��ɥ��������б���������ˡ���������ޤ���
 	�����ͥ�ƹ��ۤξܺ٤�
-	<xref linkend="kernelconfig"> �򻲾Ȥ��Ƥ���������</para>
+	<xref linkend="kernelconfig"/> �򻲾Ȥ��Ƥ���������</para>
 
       <sect3>
 	<title>������ɤ��б������������५���ͥ�����ꤹ��</title>
@@ -286,7 +287,7 @@ kld snd_ich (1p/2r/0v channels duplex default)</screen>
 	���ޤǤμ��򿶤��֤äƤߤƤ���������
 	�����ͥ륳��ե����졼�����ե������⤦���ٸ�ľ���ơ�
 	�������ǥХ����ɥ饤�Ф����򤷤Ƥ��뤫�ɤ�����ǧ���Ƥ���������
-	�ȥ�֥륷�塼�ƥ��󥰤� <xref linkend="troubleshooting">
+	�ȥ�֥륷�塼�ƥ��󥰤� <xref linkend="troubleshooting"/>
 	�򻲾Ȥ��Ƥ���������</para>
 
       <para>���٤Ƥ��ޤ������С�������ɥ����ɤ���ǽ����Ǥ��礦��
@@ -628,7 +629,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
         �ɥ饤�־�Υ����ǥ����ȥ�å���Ÿ������Τ˻Ȥ��ޤ���
         �����Ǥ��뤫�ܤ������Ȥ�
         �����ǥ��� CD ��ʣ���ˤĤ���
-        <xref linkend="duplicating-audiocds">
+        <xref linkend="duplicating-audiocds"/>
 	�򻲾Ȥ��Ƥ���������</para>
 
     </sect2>
@@ -758,7 +759,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
       <screen>&prompt.user; <userinput>sox -t wav -r 44100 -s -w -c 2 <replaceable>track.wav track.raw</replaceable></userinput></screen>
 
       <para>FreeBSD �Ǥ� CD �����ξܤ��������
-        <xref linkend="creating-cds"> �򻲾Ȥ��Ƥ���������</para>
+        <xref linkend="creating-cds"/> �򻲾Ȥ��Ƥ���������</para>
     </sect2>
   </sect1>
 
@@ -960,7 +961,7 @@ no adaptors present</screen>
 	  �������ʤ��顢���ʤ��Υӥǥ������ɤ���ӥץ����å��ˤ�äƤϡ�
 	  ����Ǥ���­�Τ�����ǽ�������뤫�⤷��ޤ���
 	  ��ǽ����夵����ˤ�
-	  <xref linkend="video-further-reading">
+	  <xref linkend="video-further-reading"/>
 	  ��褯�ɤ�Ȥ褤�Ǥ��礦��</para>
 
       </sect3>
@@ -1862,7 +1863,7 @@ found SCSI scanner "AGFA SNAPSCAN 600 1.10" at /dev/pass3</screen>
       <screen>&prompt.root; <userinput>scanimage -L</userinput>
 device `snapscan:/dev/pass3' is a AGFA SNAPSCAN 600 flatbed scanner</screen>
 
-      <para>�ޤ���<xref linkend="scanners-kernel-usb">
+      <para>�ޤ���<xref linkend="scanners-kernel-usb"/>
 	�ǻ��Ѥ��� USB ������ʤ���Ǥϡ��ʲ��ν��Ϥ�������Ǥ��礦��</para>
 
       <screen>&prompt.root; <userinput>scanimage -L</userinput>
@@ -1887,7 +1888,7 @@ device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner<
 	����� USB ������ʤ�ȯ�������ΤǤ���</para>
 
       <para>���Ȥ��С�
-	<xref linkend="scanners-kernel-usb">
+	<xref linkend="scanners-kernel-usb"/>
 	�ǻ��Ѥ��� USB ������ʤϡ�
 	&os;&nbsp;8.X �ˤ����������ǧ������ư��ޤ���
 	�����������������ΥС�������
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
index 03e30b5449..6ff3dd3e33 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/policies/chapter.sgml b/ja_JP.eucJP/books/handbook/policies/chapter.sgml
index b400e4c1d4..6f05ea33b5 100644
--- a/ja_JP.eucJP/books/handbook/policies/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/policies/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/ports/chapter.sgml b/ja_JP.eucJP/books/handbook/ports/chapter.sgml
index 55bdafaa31..e253bd441e 100644
--- a/ja_JP.eucJP/books/handbook/ports/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/ports/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -264,9 +265,9 @@
 	  ���ץꥱ�������򤹤٤�ɽ�������뤳�Ȥ�Ǥ��ޤ���</para>
       </listitem>
 
-      <indexterm><primary>FreshPorts</primary></indexterm>
-
       <listitem>
+	<indexterm><primary>FreshPorts</primary></indexterm>
+
 	<para>Dan Langille ��
 	  <ulink url="http://www.FreshPorts.org/"></ulink>
 	  �� FreshPorts ��������Ƥ��ޤ���
@@ -275,9 +276,9 @@
 	  �ѹ�������ȥ᡼��ǹ�����������äƤ���ޤ���</para>
       </listitem>
 
-      <indexterm><primary>FreshMeat</primary></indexterm>
-
       <listitem>
+	<indexterm><primary>FreshMeat</primary></indexterm>
+
 	<para>����˾�Υ��ץꥱ��������̾�����狼��ʤ���С�
 	  FreshMeat (<ulink url="http://www.freshmeat.net/"></ulink>)
 	  �Τ褦�ʥ����Ȥǥ��ץꥱ��������õ���Ʋ�������
@@ -382,7 +383,7 @@ R-deps: </screen>
       <listitem><para><command>sysinstall</command>
 	���饷���ƥ�� packages �򥤥󥹥ȡ��뤷�������Ǥ��ޤ���
 	�ޤ������󥹥ȡ��뤵�줿 packages �����Ѳ�ǽ�� packages �ΰ�����ɽ���Ǥ��ޤ���
-        �ܺ٤ˤĤ��Ƥϡ�<xref linkend="packages">
+        �ܺ٤ˤĤ��Ƥϡ�<xref linkend="packages"/>
 	�򻲾Ȥ��Ƥ���������</para></listitem>
       <listitem><para>���ξϤǤϡ����ޥ�ɥ饤���
 	package �����ġ���ˤĤ����������ޤ���</para></listitem>
@@ -670,7 +671,7 @@ docbook                     =
 	    <application>CVSup</application> �����Ф��ѹ����Ƥ���������
 	    �ߥ顼�����Ȥδ����ʥꥹ�Ȥ� <link
 	    linkend="cvsup-mirrors">CVSup ������</link> (<xref
-	    linkend="cvsup-mirrors">) �ˤ���ޤ���</para>
+	    linkend="cvsup-mirrors"/>) �ˤ���ޤ���</para>
 
 	  <note>
 	    <para>
@@ -696,7 +697,7 @@ docbook                     =
 		  <application>CVSup</application> �����Ф��ѹ����Ƥ���������
 		  �ߥ顼�����Ȥδ����ʥꥹ�Ȥ� <link
 		  linkend="cvsup-mirrors">CVSup ������</link> (<xref
-		  linkend="cvsup-mirrors">) �ˤ���ޤ���</para>
+		  linkend="cvsup-mirrors"/>) �ˤ���ޤ���</para>
 	      </step>
 
 	      <step>
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
index 18a4c78c43..073c2bd24a 100644
--- a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -2263,7 +2264,7 @@ silvia.HIP.Berke localhost.Berkeley UGH        34 47641234  lo0 -       0.438
 
           <para><command>sliplogin</command>
             ���嵭�Υ���ȥ�򸫤Ĥ����,
-            <emphasis remap=tt>Shelmerg</emphasis> �����Ѥ���
+            <emphasis remap="tt">Shelmerg</emphasis> �����Ѥ���
             ���륷�ꥢ�������, ���Ѳ�ǽ��
             SLIP���󥿥ե������Τʤ��κǽ�Τ�Τ� ��³��, �������Ƥ�
             <filename>/etc/sliphome/slip.login</filename>
diff --git a/ja_JP.eucJP/books/handbook/preface/preface.sgml b/ja_JP.eucJP/books/handbook/preface/preface.sgml
index c3b70fab3a..3002e41805 100644
--- a/ja_JP.eucJP/books/handbook/preface/preface.sgml
+++ b/ja_JP.eucJP/books/handbook/preface/preface.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -9,7 +10,7 @@
 <preface id="book-preface">
   <title>����</title>
 
-  <bridgehead id="preface-audience" renderas=sect1>���ꤷ�Ƥ����ɼ�</bridgehead>
+  <bridgehead id="preface-audience" renderas="sect1">���ꤷ�Ƥ����ɼ�</bridgehead>
 
   <para>�ǽ����ʬ�� FreeBSD ��Ȥ��Ϥ᤿�͸����ǡ�FreeBSD
     �Υ��󥹥ȡ���β�������������&unix;
@@ -22,9 +23,9 @@
     �����ξϤϡ����ξϤ������ɤ�Ǥ����٤����Ȥ��侩����Ƥ��ꡢ
     �ƾϤλϤ�γ��פǽҤ٤��Ƥ��ޤ���</para>
 
-  <para>����ʤ���󸻤ΰ����ϡ�<xref linkend="bibliography"> ��������������</para>
+  <para>����ʤ���󸻤ΰ����ϡ�<xref linkend="bibliography"/> ��������������</para>
 
-  <bridgehead id="preface-changes" renderas=sect1>�� 1 �Ǥ�����ѹ�</bridgehead>
+  <bridgehead id="preface-changes" renderas="sect1">�� 1 �Ǥ�����ѹ�</bridgehead>
 
     <para>�� 2 �Ǥϡ�FreeBSD
       �ɥ�����ơ������ץ��������Ȥθ���Ū�ʥ��С��ˤ��
@@ -50,30 +51,30 @@
 	<quote>��Ͽ</quote> �� 3 �Ĥ�����Ū����ʬ�˺ƹ�������ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="install"> (<quote>FreeBSD �Υ��󥹥ȡ���</quote>)
+	<para><xref linkend="install"/> (<quote>FreeBSD �Υ��󥹥ȡ���</quote>)
 	�Ͽ����桼������ʸ�Ϥ����Ƥ����򤷤䤹���褦��¿���Υ����꡼�󥷥�åȤ�����ƴ����˽�ľ����ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="basics"> (<quote>&unix; �δ����μ�	</quote>) �ˤϡ�
+	<para><xref linkend="basics"/> (<quote>&unix; �δ����μ�	</quote>) �ˤϡ�
 	�ץ��������ǡ���󡢥����ʥ�˴ؤ�������ɲä���ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ports"> (<quote>���ץꥱ�������Υ��󥹥ȡ���</quote>)
+	<para><xref linkend="ports"/> (<quote>���ץꥱ�������Υ��󥹥ȡ���</quote>)
 	�ˤϡ��Х��ʥ�ѥå������δ����˴ؤ�������ɲä���ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="x11"> (<quote>The X Window System</quote>) �ϡ�
+	<para><xref linkend="x11"/> (<quote>The X Window System</quote>) �ϡ�
 	&xfree86; 4.X ��� <application>KDE</application> ��
 	<application>GNOME</application>
 	�Τ褦�ʶ���Ū�ʥǥ����ȥåץƥ��Υ����������Ѥ��뤳�Ȥ������򤪤��ơ�
 	�����˽�ľ����ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="boot"> (<quote>FreeBSD �ε�ư�ץ�����</quote>)
+	<para><xref linkend="boot"/> (<quote>FreeBSD �ε�ư�ץ�����</quote>)
 	����ĥ����ޤ�����</para>
       </listitem>
       <listitem>
-        <para><xref linkend="disks"> (<quote>���ȥ졼��</quote>) �ϡ�
+        <para><xref linkend="disks"/> (<quote>���ȥ졼��</quote>) �ϡ�
         <quote>�ǥ�����</quote> �� <quote>�Хå����å�</quote> ��
 	2 �ĤξϤ�ʬ����Ƥ�����Τ�ޤȤ�ƽ�ľ����ޤ������䤿���ϡ�
         ��������� 1 �ĤξϤˤޤȤ�Ƽ���������ʬ����䤹���ȴ����Ƥ��ޤ���
@@ -81,24 +82,24 @@
         �˴ؤ�������ɲä���ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="serialcomms"> (<quote>���ꥢ���̿�</quote>)
+	<para><xref linkend="serialcomms"/> (<quote>���ꥢ���̿�</quote>)
 	�� FreeBSD 4.X/5.X �����˰줫��ƹ�������ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ppp-and-slip"> (<quote>PPP �� SLIP</quote>)
+	<para><xref linkend="ppp-and-slip"/> (<quote>PPP �� SLIP</quote>)
 	�������˹�������ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="advanced-networking"> (<quote>���٤ʥͥåȥ��</quote>)
+	<para><xref linkend="advanced-networking"/> (<quote>���٤ʥͥåȥ��</quote>)
 	�ˡ�¿���ο������᤬�ɲä���ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="mail"> (<quote>�Żҥ᡼��</quote>) �ˡ�
+	<para><xref linkend="mail"/> (<quote>�Żҥ᡼��</quote>) �ˡ�
 	  <application>sendmail</application>
 	  ������ˤĤ��Ƥ��¿���ξ��󤬲ä����ޤ�����</para>
       </listitem>
       <listitem>
-	<para><xref linkend="linuxemu"> (<quote>Linux �Х��ʥ�ߴ���ǽ</quote>)
+	<para><xref linkend="linuxemu"/> (<quote>Linux �Х��ʥ�ߴ���ǽ</quote>)
 	  �ˤϡ�<application>&oracle;</application> ��
 	  <application>&sap.r3;</application> �Υ��󥹥ȡ�����󤬲ä����ޤ���
 	  (����: ���ܸ��ǤϺ����Ǥ�)��</para>
@@ -107,16 +108,16 @@
 	<para>������ 2 �ǤǤϡ��ʲ��ο��������꤬�����Ƥ��ޤ���</para>
 	<itemizedlist>
 	  <listitem>
-	    <para>����ȥ��塼�˥� (<xref linkend="config-tuning">)</para>
+	    <para>����ȥ��塼�˥� (<xref linkend="config-tuning"/>)</para>
 	  </listitem>
 	  <listitem>
-           <para>�ޥ����ǥ��� (<xref linkend="multimedia">)</para>
+           <para>�ޥ����ǥ��� (<xref linkend="multimedia"/>)</para>
 	  </listitem>
 	</itemizedlist>
       </listitem>
     </itemizedlist>
 
-  <bridgehead id="preface-overview" renderas=sect1>����ʸ��ι���</bridgehead>
+  <bridgehead id="preface-overview" renderas="sect1">����ʸ��ι���</bridgehead>
 
   <para>����ʸ��� 3 �������ˤʤäƤ��ޤ���
     �� 1 ��<emphasis>Ƴ��</emphasis>�Ǥϡ�
@@ -132,21 +133,21 @@
 
   <variablelist>
     <varlistentry>
-      <term><emphasis><xref linkend="introduction">, �Ϥ����</emphasis></term>
+      <term><emphasis><xref linkend="introduction"/>, �Ϥ����</emphasis></term>
       <listitem>
 	<para>�����桼���� FreeBSD ��Ҳ𤷤ޤ��������Ǥϡ�FreeBSD
 	�ץ��������Ȥ���ˡ���ɸ�ȳ�ȯ��ǥ�ˤĤ��ƽҤ٤Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="install">, ���󥹥ȡ���</emphasis></term>
+      <term><emphasis><xref linkend="install"/>, ���󥹥ȡ���</emphasis></term>
       <listitem>
 	<para>���󥹥ȡ����������̤�桼���˰��⤷�Ƥ��ޤ���
 	�ޤ������ꥢ�륳�󥽡����ͳ�ǤΥ��󥹥ȡ���Τ褦�ʹ��٤�����⤤���餫���äƤ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="basics">, &unix; �δ����μ�</emphasis></term>
+      <term><emphasis><xref linkend="basics"/>, &unix; �δ����μ�</emphasis></term>
       <listitem>
 	<para>FreeBSD
 	  ���ڥ졼�ƥ��󥰥����ƥ�δ���Ū�ʥ��ޥ�ɤ䵡ǽ�򰷤äƤ��ޤ���
@@ -155,14 +156,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ports">, ���ץꥱ�������Υ��󥹥ȡ���</emphasis></term>
+      <term><emphasis><xref linkend="ports"/>, ���ץꥱ�������Υ��󥹥ȡ���</emphasis></term>
       <listitem>
 	<para>FreeBSD �γ׿�Ū�� <quote>Ports Collection</quote>
 	  �����ɸ��Ū�ʥХ��ʥ�ѥå������ˤ�륵���ɥѡ��ƥ����ץꥱ�������Υ��󥹥ȡ���ˤĤ����������Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="x11">, X Window System</emphasis></term>
+      <term><emphasis><xref linkend="x11"/>, X Window System</emphasis></term>
       <listitem>
 	<para>X Window System ���̤ȡ��ä� FreeBSD ��Ǥ�
 	<application>&xfree86;</application> �����ѤˤĤ��ƽҤ٤Ƥ��ޤ���
@@ -172,7 +173,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="config-tuning">, ����ȥ��塼�˥�</emphasis></term>
+      <term><emphasis><xref linkend="config-tuning"/>, ����ȥ��塼�˥�</emphasis></term>
       <listitem>
 	<para>�����ƥ�����Ԥ� FreeBSD
 	  �����ƥ��Ĵ�����ƺ�Ŭ����ǽ������Ф��Τ����ѤǤ���ѥ�᡼���ˤĤ��ƽҤ٤Ƥ��ޤ���
@@ -181,14 +182,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="boot">, ��ư�ץ�����</emphasis></term>
+      <term><emphasis><xref linkend="boot"/>, ��ư�ץ�����</emphasis></term>
       <listitem>
 	<para>FreeBSD �ε�ư�ץ���������⤷��
 	  ���Υץ����������ꥪ�ץ��������椹����ˡ���������Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="users">, �桼���ȴ���Ū�ʥ�������
+      <term><emphasis><xref linkend="users"/>, �桼���ȴ���Ū�ʥ�������
       �Ȥδ���</emphasis></term>
       <listitem>
 	<para>�桼����������Ȥ����������ˤĤ��ƽҤ٤Ƥ��ޤ����ޤ���
@@ -196,7 +197,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="kernelconfig">, FreeBSD
+      <term><emphasis><xref linkend="kernelconfig"/>, FreeBSD
       �����ͥ�Υ���ե����졼�����</emphasis></term>
       <listitem>
 	<para>�ɤΤ褦�ʾ��˿����˥����ͥ��������ɬ�פ����뤫����������
@@ -205,21 +206,21 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="security">, �������ƥ�</emphasis></term>
+      <term><emphasis><xref linkend="security"/>, �������ƥ�</emphasis></term>
       <listitem>
 	<para>FreeBSD �����ƥ��������ݤĤ������Ω�� Kerberos, IPsec, OpenSSH,
 	  �ͥåȥ���ե�������������Ȥ��ä����Ѳ�ǽ���͡��ʥġ���ˤĤ����������Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="printing">, �ץ�󥿤�����</emphasis></term>
+      <term><emphasis><xref linkend="printing"/>, �ץ�󥿤�����</emphasis></term>
       <listitem>
 	<para>FreeBSD �ˤ�����ץ�󥿤μ�갷�����������Ƥ��ޤ������Ȥ��С�
 	�Хʡ��ڡ������ץ�󥿡��βݶ⡢�������Ȥ��ä����ȤǤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="disks">, ���ȥ졼��</emphasis></term>
+      <term><emphasis><xref linkend="disks"/>, ���ȥ졼��</emphasis></term>
       <listitem>
 	<para>FreeBSD
 	  �ǥ��ȥ졼����ǥ�����ե����륷���ƥ��ɤ����������������Ƥ��ޤ���
@@ -230,7 +231,7 @@
     </varlistentry>
   <!-- XXX: to be commented in when handbook/vinum is translated.
     <varlistentry>
-      <term><emphasis><xref linkend="vinum-vinum">, Vinum</emphasis></term>
+      <term><emphasis><xref linkend="vinum-vinum"/>, Vinum</emphasis></term>
 	<para>�ǥХ������¸�������ǥ������ȥ��եȥ����� RAID-0,
 	  RAID-1, RAID-5 ���󶡤��������ܥ�塼��������եȥ�����
 	  Vinum �λȤ������������Ƥ��ޤ���</para>
@@ -238,42 +239,42 @@
     </varlistentry>
   -->
     <varlistentry>
-      <term><emphasis><xref linkend="l10n">, �ϰ貽</emphasis></term>
+      <term><emphasis><xref linkend="l10n"/>, �ϰ貽</emphasis></term>
       <listitem>
 	<para>FreeBSD ��Ѹ�ʳ��θ���ǻȤ���ˡ���������Ƥ��ޤ���
 	  �����ƥ�ȥ��ץꥱ�������ξ���Υ�٥���ϰ貽�򰷤äƤ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="desktop">, �ǥ����ȥåץ��ץꥱ�������</emphasis></term>
+      <term><emphasis><xref linkend="desktop"/>, �ǥ����ȥåץ��ץꥱ�������</emphasis></term>
       <listitem>
 	<para>Web �֥饦��������������ġ���Τ褦�ʰ���Ū�ʥǥ����ȥåץ��ץꥱ�������򤤤��Ĥ��󤲡�
 	  FreeBSD �ˤ����륤�󥹥ȡ�����ˡ���������Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="multimedia">, �ޥ����ǥ���</emphasis></term>
+      <term><emphasis><xref linkend="multimedia"/>, �ޥ����ǥ���</emphasis></term>
       <listitem>
 	<para>�����ƥ������ӥǥ��������б������뤿��ˤɤ����ꤹ�뤫���������ޤ���
 	  �ޤ���������ӥǥ����ץꥱ���������㼨���Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="serialcomms">, ���ꥢ���̿�</emphasis></term>
+      <term><emphasis><xref linkend="serialcomms"/>, ���ꥢ���̿�</emphasis></term>
       <listitem>
 	<para>FreeBSD �����ƥ��ü�����ǥ��
   	������륤��ޤ��ϥ�����륢�����Ѥ���³������ˡ���������Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ppp-and-slip">, PPP �� SLIP</emphasis></term>
+      <term><emphasis><xref linkend="ppp-and-slip"/>, PPP �� SLIP</emphasis></term>
       <listitem>
 	<para>FreeBSD �ǡ�PPP, SLIP �� PPP over Ethernet
 	  ��Ȥäƥ�⡼�ȥ����ƥ����³������ˡ���������Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="advanced-networking">, ���٤ʥͥåȥ��</emphasis></term>
+      <term><emphasis><xref linkend="advanced-networking"/>, ���٤ʥͥåȥ��</emphasis></term>
       <listitem>
 	<para>LAN ���¾�Υ���ԥ塼���ȥ��󥿡��ͥå���³�ζ�ͭ��
 	  �ͥåȥ���ե����륷���ƥ�����ѡ�NIS ��ͳ�Υ�������Ⱦ���ζ�ͭ��
@@ -282,7 +283,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mail">, �Żҥ᡼��</emphasis></term>
+      <term><emphasis><xref linkend="mail"/>, �Żҥ᡼��</emphasis></term>
       <listitem>
 	<para>�Żҥ᡼�륵���Фι������Ǥ򤽤줾����������
 	�Ǥ�褯�Ȥ��Ƥ���᡼�륵���Х��եȥ������Ǥ���
@@ -291,7 +292,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="updating-upgrading">, ��ȯ�κ�����</emphasis></term>
+      <term><emphasis><xref linkend="updating-upgrading"/>, ��ȯ�κ�����</emphasis></term>
       <listitem>
 	<para>FreeBSD-STABLE, FreeBSD-CURRENT �� FreeBSD
 	  �Υ�꡼���ΰ㤤���������ޤ���
@@ -300,7 +301,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="linuxemu">, Linux �Х��ʥ�ߴ���ǽ</emphasis></term>
+      <term><emphasis><xref linkend="linuxemu"/>, Linux �Х��ʥ�ߴ���ǽ</emphasis></term>
       <listitem>
 	<para>FreeBSD �� Linux �Х��ʥ�ߴ���ǽ���������Ƥ��ޤ����ޤ���
 	<application>&oracle;</application>,
@@ -310,14 +311,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mirrors">, FreeBSD ��������ˡ</emphasis></term>
+      <term><emphasis><xref linkend="mirrors"/>, FreeBSD ��������ˡ</emphasis></term>
       <listitem>
 	<para>FreeBSD ���Ͽ���� CDROM �� DVD ���͡���������䡢FreeBSD
 	  �����������ɤ��ƥ��󥹥ȡ���Ǥ��륤�󥿡��ͥåȾ�Υ����Ȥ�󤲤Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bibliography">, ���Ϳ޽�</emphasis></term>
+      <term><emphasis><xref linkend="bibliography"/>, ���Ϳ޽�</emphasis></term>
       <listitem>
 	<para>����ʸ��ϡ�
 	  ��äȾܤ����������ߤ����ʤ뤫�⤷��ʤ����ޤ��ޤ����ܤˤĤ��ƿ���Ƥ��ޤ���
@@ -326,7 +327,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="eresources">, ���󥿡��ͥåȾ�Υ꥽����</emphasis></term>
+      <term><emphasis><xref linkend="eresources"/>, ���󥿡��ͥåȾ�Υ꥽����</emphasis></term>
       <listitem>
 	<para>FreeBSD �桼���� FreeBSD �ˤĤ��Ƽ��䤷���ꡢ
 	  ����Ū�ʵ����˻��äǤ��롢
@@ -334,19 +335,19 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="pgpkeys">, PGP ������</emphasis></term>
+      <term><emphasis><xref linkend="pgpkeys"/>, PGP ������</emphasis></term>
       <listitem>
 	<para>¿���� FreeBSD ��ȯ�Ԥ� PGP fingerprint ��ܤ��Ƥ��ޤ���</para>
       </listitem>
     </varlistentry>
   </variablelist>
 
-  <bridgehead id="preface-conv" renderas=sect1>����ʸ����Ѥ����Ƥ���ɽ��ˡ</bridgehead>
+  <bridgehead id="preface-conv" renderas="sect1">����ʸ����Ѥ����Ƥ���ɽ��ˡ</bridgehead>
 
     <para>��Ӥ����ɤߤ䤹��ʸ�Ϥ��󶡤��뤿��ˡ�
       ����ʸ�����ΤǤϰʲ���ɽ��ˡ���Ѥ����Ƥ��ޤ���</para>
 
-  <bridgehead id="preface-conv-typographic" renderas=sect2>���Τˤ��ɽ��
+  <bridgehead id="preface-conv-typographic" renderas="sect2">���Τˤ��ɽ��
   </bridgehead>
 
   <variablelist>
@@ -377,7 +378,7 @@
 
 <!-- Var list -->
   <bridgehead id="preface-conv-commands"
-  renderas=sect2>�桼��������</bridgehead>
+  renderas="sect2">�桼��������</bridgehead>
 
   <para>ʸ�Ϥ�¾����ʬ�ȶ��̤��뤿�ᡢ
     ������<keycap>����</keycap>�Ǽ�����Ƥ��ޤ���
@@ -417,7 +418,7 @@
 
 <!-- How to type in key stokes, etc.. -->
   <bridgehead id="preface-conv-examples"
-  renderas=sect2>��</bridgehead>
+  renderas="sect2">��</bridgehead>
 
   <para><devicename>E:\&gt;</devicename> �ǻϤޤ���ϡ�&ms-dos;
     ���ޥ�ɤ�ɽ���Ƥ��ޤ����ä����᤬�ʤ���С������Υ��ޥ�ɤϺǶ��
@@ -443,7 +444,7 @@
   <screen>&prompt.user; <userinput>top</userinput></screen>
 
   <bridgehead id="preface-acknowledgements"
-  renderas=sect1>�ռ�</bridgehead>
+  renderas="sect1">�ռ�</bridgehead>
 
   <para>���ʤ�����ˤ��Ƥ���ʸ��ϡ�
     ������β�ɴ�ͤ�ο͡������Ϥλ�ʪ�Ǥ���
diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.sgml b/ja_JP.eucJP/books/handbook/printing/chapter.sgml
index 4f7c14aeb5..5161221b66 100644
--- a/ja_JP.eucJP/books/handbook/printing/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/printing/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -88,7 +89,7 @@
     <itemizedlist>
       <listitem>
 	<para>�����������ͥ������ȥ��󥹥ȡ�����ˡ�ˤĤ������򤹤뤳��
-	  (<xref linkend="kernelconfig">)��</para>
+	  (<xref linkend="kernelconfig"/>)��</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -119,8 +120,9 @@
           ���뤤�ϥͥåȥ�����¾�ۥ��Ȥ���³���줿�ץ�󥿤��Ф��륢�����������Ԥʤ��ޤ���</para>
       </listitem>
 
-      <indexterm><primary>�ץ��ȥ����</primary></indexterm>
       <listitem>
+	<indexterm><primary>�ץ��ȥ����</primary></indexterm>
+
 	<para>�ե������ץ��Ȥ����׵���Ф��Ƶ��Ĥ�Ϳ���ޤ���
 	  �����׵���ä�<emphasis>�����</emphasis>�ȸƤФ�Ƥ��ޤ���</para>
       </listitem>
@@ -180,8 +182,9 @@
             �ǡ������ץ�󥿤����������ޤ��Ԥ�ɬ�פ��ʤ��ʤ�ޤ���</para>
         </listitem>
 
-        <indexterm><primary>&tex;</primary></indexterm>
         <listitem>
+	  <indexterm><primary>&tex;</primary></indexterm>
+
 	  <para><application>LPD</application>
 	    �Ǥϥ���֤�ե��륿���̤��ƥץ��Ȥ��뤳�Ȥ���ñ�ˤǤ��ޤ���
             ����ˤ�ꡢ����ʪ�Υإå��˻�������դ����줿�ꡢ
@@ -295,10 +298,6 @@
 	    1 �İʾ夬�Ĥ��Ƥ��ޤ���</para>
 
           <itemizedlist>
-            <indexterm>
-              <primary>�ץ��</primary>
-              <secondary>���ꥢ��</secondary>
-            </indexterm>
             <listitem>
               <para><emphasis>���ꥢ��</emphasis>���󥿥ե�������
 		�� RS-232 �ޤ��� COM �ݡ��ȤȤ�ƤФ�ޤ�����
@@ -312,11 +311,12 @@
 		�礭�ʲ������������Τˤϼ���Ū�ǤϤ���ޤ���</para>
             </listitem>
 
-            <indexterm>
-              <primary>�ץ��</primary>
-              <secondary>�ѥ���</secondary>
-            </indexterm>
             <listitem>
+	      <indexterm>
+		<primary>�ץ��</primary>
+		<secondary>�ѥ���</secondary>
+	      </indexterm>
+
               <para><emphasis>�ѥ���</emphasis>���󥿥ե������Ǥϥץ�󥿤˥ǡ������������뤿��ˡ�
                 ����ԥ塼���ˤ���ѥ���ݡ��Ȥ���Ѥ��ޤ���
 		�ѥ��륤�󥿥ե������� PC �ȳ��ǤϤ褯�Ȥ��Ƥ��ꡢ
@@ -334,11 +334,12 @@
                 ����ϡ��ץ���ѤΥ��ͥ��������פȤ��ƺ��Ѥ��줿���̾�դ����ޤ�����</para>
             </listitem>
 
-	    <indexterm>
-	      <primary>�ץ��</primary>
-	      <secondary>USB</secondary>
-	    </indexterm>
 	    <listitem>
+	      <indexterm>
+	        <primary>�ץ��</primary>
+	        <secondary>USB</secondary>
+	      </indexterm>
+
 	      <para>USB ���󥿥ե������ϡ�Universal Serial Bus
 		(���ѥ��ꥢ��Х�) ��ά�ǡ��ѥ���� RS-232
 		���ꥢ���ꤵ���®��ư��ޤ���
@@ -423,8 +424,9 @@
                 ���ܤǤϥ��ȥ졼�ȥ����֥�Ȥ���̾��������Ƥ��ޤ�)��</para>
             </listitem>
 
-            <indexterm><primary>�̥��ǥ��ѥ����֥�</primary></indexterm>
             <listitem>
+	      <indexterm><primary>�̥��ǥ��ѥ����֥�</primary></indexterm>
+
               <para><emphasis>�̥��ǥ�</emphasis>�ѥ����֥�Ǥϡ�
                 ����ԥ���б�����ԥ�Ȥ���³���Ƥ��ޤ�����
                 ����ԥ�
@@ -952,8 +954,9 @@ showpage</programlisting>
 	      �򻲾Ȥ��Ƥ���������</para>
 	  </step>
 
-          <indexterm><primary>�إå��ڡ���</primary></indexterm>
 	  <step>
+	    <indexterm><primary>�إå��ڡ���</primary></indexterm>
+
 	    <para><literal>sh</literal> �ι��ܤ��ɲä��뤳�Ȥǡ�
 	      �إå��ڡ����ν��Ϥ�ػߤ��ޤ� (�ǥե���Ȥϵ���)��
 	      ����ˤĤ��Ƥϡ���<link
@@ -1791,11 +1794,12 @@ $%&amp;'()*+,-./01234567
 	      </variablelist>
 	  </listitem>
 
-          <indexterm>
-            <primary>����</primary>
-            <secondary>�ե��륿</secondary>
-          </indexterm>
 	  <listitem>
+	    <indexterm>
+	      <primary>����</primary>
+	      <secondary>�ե��륿</secondary>
+	    </indexterm>
+
 	    <para><emphasis>�Ѵ��ե��륿</emphasis>�ϡ�
 	      ����Υե����������ץ��
 	      ����˰����Ǥ���褦�ʤ�Τ��Ѵ����ޤ������Ȥ��С�
@@ -1915,10 +1919,10 @@ $%&amp;'()*+,-./01234567
 	  ����֤κǽ�� 2 ʸ��������ʤ�С�&postscript; �Ǥ��뤳�Ȥ�ʬ����ޤ���
 	  �������äơ�
 	  ����֤Τ���ʹߤ���ʬ��ץ�󥿤�ľ�����뤳�Ȥ��Ǥ��ޤ�
-	  (����: &postscript; �Ǥϡ�<emphasis remap=tt>%</emphasis>
+	  (����: &postscript; �Ǥϡ�<emphasis remap="tt">%</emphasis>
 	  �ʹߤϥ����ȤȤ��ư�����Τǡ��ǽ�� <emphasis
-	    remap=tt>%!</emphasis> �ιԤ��ɤ߼ΤƤƤ�����Ϥʤ�)��
-	  �ǽ��2ʸ���� <emphasis remap=tt>%!</emphasis> �Ǥʤ����ϡ�
+	    remap="tt">%!</emphasis> �ιԤ��ɤ߼ΤƤƤ�����Ϥʤ�)��
+	  �ǽ��2ʸ���� <emphasis remap="tt">%!</emphasis> �Ǥʤ����ϡ�
 	  �ե��륿�ϥƥ����Ȥ� &postscript; ���Ѵ�����
 	  ���η�̤�Ȥäư����򤪤��ʤ��ޤ���</para>
 
@@ -3645,7 +3649,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	  ���Υۥ��ȤǤ�ץ�󥿤���ѤǤ���ͤ���ꤹ��Τ�
 	  �����Ǥ���Ȼפ����ϡ�
 	  ���Υۥ��Ȥ� <filename>/etc/printcap</filename> �ˤ�
-	  <emphasis remap=tt>rg</emphasis>
+	  <emphasis remap="tt">rg</emphasis>
 	  ����򤪤��ʤ�ɬ�פ�����ޤ���</para>
 
 	<para>���Ȥ��С��ץ�� <literal>rattan</literal>
@@ -5002,8 +5006,9 @@ cfA013rose dequeued
       <varlistentry>
         <term>LPRng</term>
 
-        <indexterm><primary>LPRng</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>LPRng</primary></indexterm>
+
 	  <para><quote>������ LPR</quote> �����
 	    <application>LPRng</application> �ϡ�
 	    PLP �����˽񤭴�������ΤǤ���
@@ -5017,8 +5022,9 @@ cfA013rose dequeued
       <varlistentry>
 	<term>CUPS</term>
 
- 	<indexterm><primary>CUPS</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>CUPS</primary></indexterm>
+
 	  <para><application>CUPS</application> (the Common UNIX Printing
 	    System) �ϡ�&unix; �١����Υ��ڥ졼�ƥ��󥰥����ƥ���Ф��ơ�
 	    �ܿ����ι⤤�����쥤����󶡤��ޤ���
@@ -5048,8 +5054,9 @@ cfA013rose dequeued
       <varlistentry>
 	<term>HPLIP</term>
 
-	<indexterm><primary>HPLIP</primary></indexterm>
 	<listitem>
+	  <indexterm><primary>HPLIP</primary></indexterm>
+
 	  <para><application>HPLIP</application>
 	    (the HP &linux; Imaging and Printing system) �ϡ�
 	    HP ���ץ饤�����Ѥ� HP ����ȯ������
@@ -5255,7 +5262,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 		         LF �� CR+LF
 			���֤������� cat ���ޥ�ɤ�����ˡ�������ͤ����ޤ���
 			�����ơ����Υ��ޥ�ɤȡ�<emphasis
-			  remap=tt>if-simple</emphasis> �� cat
+			  remap="tt">if-simple</emphasis> �� cat
 			����ʬ���֤�������Ф褤�櫓�Ǥ���
 			����Ū�ˤɤΤ褦�ˤ��뤫�ϡ�
 			�ɼԤؤ���������Ȥ��ޤ��礦��</para>
diff --git a/ja_JP.eucJP/books/handbook/security/chapter.sgml b/ja_JP.eucJP/books/handbook/security/chapter.sgml
index e96114f728..63d3537b04 100644
--- a/ja_JP.eucJP/books/handbook/security/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/security/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -2310,7 +2311,7 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat Apr 29 17:50:09 SAT 1995</screen>
 	1 �Ĥޤ���ʣ���Υ��ץ����򥫡��ͥ륳��ե����졼�����ե�������ɲä���
 	�����ͥ��ƥ���ѥ��뤹��ɬ�פ�����Ǥ��礦��
 	�����ͥ�κƥ���ѥ�����ˡ�ξܺ٤ˤĤ��Ƥϡ�
-	�֥����ͥ�Υ���ե����졼������(<xref linkend="kernelconfig">)
+	�֥����ͥ�Υ���ե����졼������(<xref linkend="kernelconfig"/>)
 	��������������</para>
 
       <para>���ߡ�IPFW
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml b/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
index ec4678a092..e0910f6d35 100644
--- a/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -33,9 +34,9 @@
     <para>���ξϤ��ɤ����˰ʲ��Τ��Ȥ�ԤäƤ����٤��Ǥ���</para>
     <itemizedlist>
       <listitem><para>�����������ͥ�������ƥ��󥹥ȡ��뤹����ˡ��Ф���
-	(<xref linkend="kernelconfig">)��</para></listitem>
+	(<xref linkend="kernelconfig"/>)��</para></listitem>
       <listitem><para>Unix �Υѡ��ߥå����ȥץ������ˤĤ������򤹤�
-	(<xref linkend="basics">)��</para></listitem>
+	(<xref linkend="basics"/>)��</para></listitem>
       <listitem><para>FreeBSD �ǻȤ����Ȥ��Ƥ��륷�ꥢ��ϡ��ɥ�����
 	(��ǥ�ޤ��ϥޥ���ݡ��ȥ�����)
 	�Υƥ��˥���ޥ˥奢����ɤ��褦�ˤ��롣</para></listitem>
@@ -500,7 +501,7 @@
 	������򤪤��ʤ���ü������³����Ƥ����Τȹͤ��ơ������ʤ�
 	�ޤ���</para>
 
-      <para><xref linkend="boot"> �ǽҤ٤��褦��
+      <para><xref linkend="boot"/> �ǽҤ٤��褦��
 	<command>init</command> �ץ������ϡ�
 	�����ƥ൯ư���ˤ��٤ƤΥץ����������������򤪤��ʤäƤ��ޤ���
 	<command>init</command> ���ԤäƤ���Ż��ΰ�Ĥϡ�
@@ -640,9 +641,9 @@ ttyd5</programlisting>
 	  ����˾ܤ������⤵��Ƥ��ޤ���</para>
 
 	<para><filename>/etc/ttys</filename> �� <emphasis
-	    remap=tt>getty</emphasis> �����פ�����򤹤�ݤϡ�
+	    remap="tt">getty</emphasis> �����פ�����򤹤�ݤϡ�
 	  ü��¦���̿� �ѥ�᡼�������꤬��<emphasis
-	    remap=tt>getty</emphasis>
+	    remap="tt">getty</emphasis>
 	  �����פΤ�ΤȰ��פ��Ƥ��뤳�Ȥ��ǧ�� �Ƥ���������</para>
 
 	<para>�Ҳ𤷤Ƥ������Ǥϡ�Wyse50 �ϥѥ�ƥ��ʤ� 38400 bps
@@ -852,7 +853,7 @@ ttyd5   "/usr/libexec/getty std.19200"	 vt100 on insecure # Guest bathroom</prog
 	      �ץ������ξ����Ĵ�٤ơ�Ŭ�ڤ�
 	      <replaceable>getty</replaceable>
 	      �Υ����פ����Ѥ���Ƥ��뤳�Ȥ��ǧ���Ƥ����������ְ�ä�
-	      <emphasis remap=tt>getty</emphasis>
+	      <emphasis remap="tt">getty</emphasis>
 	      �����פ����Ѥ���Ƥ�����ϡ�
 	      <filename>/etc/ttys</filename> ������ �Ƥ��顢
 	      <command>kill -HUP 1</command>
@@ -1597,7 +1598,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
 	    ������³���ߤ����®�٤�������
 	    (<literal>V19200</literal> ��
 	    <filename>gettytab</filename> ����ȥ�)�򤽤Τޤ�
-	    <emphasis remap=tt>ttys</emphasis> ���ɲä����ΤǤ���С�
+	    <emphasis remap="tt">ttys</emphasis> ���ɲä����ΤǤ���С�
 	    <filename>ttys</filename>
 	    ����ȥ�ϰʲ��Τ褦�ˤʤ�ޤ���</para>
 
@@ -2263,7 +2264,7 @@ raisechar=^^</programlisting>
     <indexterm><primary>�̥��ǥॱ���֥�</primary></indexterm>
 	  <para>�̥��ǥॱ���֥롢
             �⤷����ɸ�ॷ�ꥢ�륱���֥�ȥ̥��ǥॢ���ץ���ɬ�פȤʤ�ޤ���
-            ���ꥢ�륱���֥�ˤĤ��Ƥ� <xref linkend="term"> ������������</para>
+            ���ꥢ�륱���֥�ˤĤ��Ƥ� <xref linkend="term"/> ������������</para>
 	</step>
 	
 	<step>
@@ -2595,7 +2596,7 @@ boot:</screen>
       <para>�֡��ȥ������������ɤ��졢�֡��ȥץ��������軰���ơ�����
       ������ˤϡ��ޤ���¢���󥽡���ȥ��ꥢ�륳�󥽡�����ڤ��ؤ��뤳�Ȥ��Ǥ��ޤ���
       ����ˤϥ֡��ȥ������δĶ��ѿ���Ŭ�ڤ����ꤹ����ɤ��ΤǤ�����
-      �ܺ٤ˤĤ��Ƥ� <xref linkend="serialconsole-loader"> �򻲾Ȥ��Ƥ���������</para>
+      �ܺ٤ˤĤ��Ƥ� <xref linkend="serialconsole-loader"/> �򻲾Ȥ��Ƥ���������</para>
     </sect2>
   
   <sect2 id="serialconsole-summary">
@@ -2960,7 +2961,7 @@ start</programlisting>
 	<para><devicename>sio0</devicename> �ʳ��Υ��ꥢ��ݡ��Ȥ�
           ���󥽡���Ȥ��ƻȤ��ˤϡ��֡��ȥ�������ƥ���ѥ��뤹��ɬ�פ�����ޤ���
           ����ˤϡ�
-          <xref linkend="serialconsole-com2"> �˽񤫤�Ƥ��������ˤ������äƲ�������</para>
+          <xref linkend="serialconsole-com2"/> �˽񤫤�Ƥ��������ˤ������äƲ�������</para>
       </sect3>
     </sect2>
     
diff --git a/ja_JP.eucJP/books/handbook/staff/chapter.sgml b/ja_JP.eucJP/books/handbook/staff/chapter.sgml
index 713638ae92..c694a4db1b 100644
--- a/ja_JP.eucJP/books/handbook/staff/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/staff/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/txtfiles.ent b/ja_JP.eucJP/books/handbook/txtfiles.ent
index 95f9cd9639..7dd300073d 100644
--- a/ja_JP.eucJP/books/handbook/txtfiles.ent
+++ b/ja_JP.eucJP/books/handbook/txtfiles.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP"?>
 <!-- 
      Creates entities for each .txt screenshot that is included in the 
      Handbook.
diff --git a/ja_JP.eucJP/books/handbook/users/chapter.sgml b/ja_JP.eucJP/books/handbook/users/chapter.sgml
index f74116b777..89fc59efb1 100644
--- a/ja_JP.eucJP/books/handbook/users/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/users/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.sgml b/ja_JP.eucJP/books/handbook/x11/chapter.sgml
index ff2ce56558..b7f1208457 100644
--- a/ja_JP.eucJP/books/handbook/x11/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/x11/chapter.sgml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -74,7 +75,7 @@
     <itemizedlist>
       <listitem>
 	<para>�����ɥѡ��ƥ������եȥ������Υ��󥹥ȡ�����ˡ
-	  (<xref linkend="ports">)</para>
+	  (<xref linkend="ports"/>)</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -536,7 +537,7 @@ dbus_enable="YES"</programlisting>
 
 	<para>�⤷�ޥ�����ư��ʤ���С�
 	  ��ؿʤ����˥ޥ����������Ԥ�ɬ�פ�����ޤ���
-	  &os; ���󥹥ȡ���ξϤ� <xref linkend="mouse"> �򻲾Ȥ��Ƥ���������
+	  &os; ���󥹥ȡ���ξϤ� <xref linkend="mouse"/> �򻲾Ȥ��Ƥ���������
 	  ����ˡ�
 	  �Ƕ�� <application>Xorg</application> �Ǥϡ��ǥХ����μ�ưǧ���Τ��ᡢ
 	  <filename>xorg.conf</filename> ��
@@ -1162,7 +1163,7 @@ EndSection</programlisting>
 	��������̾�ȥѥ���ɤ��Ȥ߹�碌�ʤ�ǧ�ھ�������ϤǤ��륰��ե�����ʥ��󥿥ե��������󶡤��Ƥ��ޤ���</para>
 
       <para><application>XDM</application> ���桼���� &man.getty.8;
-	(�ܤ����� <xref linkend="term-config"> ������������)
+	(�ܤ����� <xref linkend="term-config"/> ������������)
 	��Ʊ����ǽ���󶡤��뤳�Ȥ�ͤ��ƤߤƤ���������
 	�Ĥޤꡢ�ǥ����ץ쥤��ǥ����ƥ�ؤΥ������󤬤Ǥ���
 	�桼��������˥��å����ޥ͡�����
@@ -1191,7 +1192,7 @@ EndSection</programlisting>
 	��ư���������ˤϡ�<filename>/etc/ttys</filename>
 	�ˤ��Τ���Υ���ȥ��ä��Ƥ����Τ���ñ�Ǥ���
 	���Υե�����Υե����ޥåȤ������ˡ�ˤĤ��Ƥξܺ٤�
-	<xref linkend="term-etcttys"> �򻲾Ȥ��Ƥ���������
+	<xref linkend="term-etcttys"/> �򻲾Ȥ��Ƥ���������
 	�ǥե���Ȥ� <filename>/etc/ttys</filename>
 	�ե�����ˤϲ���ü����� <application>XDM</application>
 	�ǡ�����ư���뤿��ι�:</para>
@@ -1201,7 +1202,7 @@ EndSection</programlisting>
       <para>������ޤ���
 	���Υ���ȥ�ϥǥե���ȤǤ�̵���ˤʤäƤ��ꡢͭ���ˤ���ˤ�
 	5 ���ܤΥ����� <literal>off</literal> ����
-	<literal>on</literal> �ˤ���<xref linkend="term-hup">
+	<literal>on</literal> �ˤ���<xref linkend="term-hup"/>
 	�λؼ��˽��ä� &man.init.8; ��Ƶ�ư���ޤ���
 	�ǽ�Υ����Ϥ��Υץ�����ब��������ü����̾���ǡ����ξ��
 	<literal>ttyv8</literal> �ˤʤ�ޤ���
diff --git a/ja_JP.eucJP/books/porters-handbook/book.sgml b/ja_JP.eucJP/books/porters-handbook/book.sgml
index e73cad031a..ed98f850ac 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.sgml
+++ b/ja_JP.eucJP/books/porters-handbook/book.sgml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
+]>
+
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -6,12 +13,7 @@
      $FreeBSD$
 -->
 
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
-]>
-
-<book>
+<book lang='ja'>
   <bookinfo>
     <title>FreeBSD port �����ԤΤ���Υϥ�ɥ֥å�</title>
 
@@ -45,7 +47,9 @@
 	FreeBSD &a.jp.doc-jp; �ޤ����ܸ�ǥ����Ȥ򤪴󤻤���������</para>
     </abstract>
 
-    &bookinfo.legalnotice;
+    &legalnotice;
+
+    <releaseinfo>$FreeBSD$</releaseinfo>
   </bookinfo>
 
   <chapter id="own-port">
@@ -58,7 +62,7 @@
       �����ɥ饤��򤤤��Ĥ������ޤ���
       ��¸�� port �򹹿��������ȹͤ��Ƥ�����Ǥ��äƤ⡢
       �ޤ����ξϤ��ɤ�Ǥ��顢����
-      <xref linkend="port-upgrading"> ���ɤ�褦�ˤ��Ƥ���������</para>
+      <xref linkend="port-upgrading"/> ���ɤ�褦�ˤ��Ƥ���������</para>
 
     <para>����ʸ��ǤϽ�ʬ�˾ܺ٤��狼��ʤ����ˤϡ�
       <filename>/usr/ports/Mk/bsd.port.mk</filename> �򻲾Ȥ��Ƥ���������
@@ -2154,7 +2158,7 @@ EXTRACT_ONLY=  source.tar.gz</programlisting>
 	    2 �Ĥ��̤Υ����Ȥ������������ɤ��ʤ���Фʤ�ʤ����ץꥱ��������ͤ��Ƥߤޤ��礦��
 	    ���� port �� <filename>Makefile</filename>
 	    �ˤϡ�<xref
-	      linkend="ports-master-sites-n-example-simple-use-one-file-per-site">
+	      linkend="ports-master-sites-n-example-simple-use-one-file-per-site"/>
 	    �Τ褦�ʹԤ�����Ȥ��ޤ���</para>
 
 	  <example
@@ -2173,7 +2177,7 @@ DISTFILES=      source1.tar.gz:source1 \
 	  <filename>source3.tar.gz</filename> �����äơ�
 	  <hostid>ftp.example2.com</hostid> �������������ɤ��٤����Ȥ��ޤ��礦��
 	  <filename>Makefile</filename> �� <xref
-	      linkend="ports-master-sites-n-example-simple-use-more-than-one-file-per-site">
+	      linkend="ports-master-sites-n-example-simple-use-more-than-one-file-per-site"/>
 	    �Τ褦�ˤʤ�ޤ���</para>
 
 	  <example
@@ -2221,12 +2225,12 @@ DISTFILES=      source1.tar.gz:source1 \
 		�����̤ʰ�̣��Ϳ�����Ƥ���Τǡ�
 		�������ղä���ΤˤϻȤ��ޤ���
 		(����ϡ�<xref
-		  linkend="porting-master-sites-n-what-changes-in-port-targets">
+		  linkend="porting-master-sites-n-what-changes-in-port-targets"/>
 		�������Ū�����Ѥ���Ƥ��ޤ�)��
 		����ˡ�<literal>DEFAULT</literal>
 		�����̤ʰ�̣�����ñ��Ǥ�
 		(<xref
-		  linkend="porting-master-sites-n-DEFAULT-group">
+		  linkend="porting-master-sites-n-DEFAULT-group"/>
 		�ι���ǧ���Ƥ�������)��</para>
 	    </listitem>
 
@@ -2246,7 +2250,7 @@ DISTFILES=      source1.tar.gz:source1 \
 		��Ĥ���Τϡ��������Ǥ� <literal>DEFAULT</literal>
 		�Ȥ���ʳ��Υ��롼�פ�Ʊ���˳�����Ƥ����ΤǤʤ���С�
 		��Ĺ�˲᤮�ޤ���
-		(<xref linkend="porting-master-sites-n-comma-operator">
+		(<xref linkend="porting-master-sites-n-comma-operator"/>
 		�ι���ǧ���Ƥ�������)��</para>
 
 	      <para>������Ϥɤ����Ʊ����̣�Ǥ�����
@@ -2338,9 +2342,9 @@ MASTER_SITES=   alpha:DEFAULT,SOME_SITE</programlisting>
 		    ���롼�פ�������ǤϤʤ���
 		    ���Ǥ�ͭ���ʰ���ʬ�Ȥ��ư����ޤ���
 		    <xref
-		      linkend="ports-master-sites-n-example-detailed-use-master-site-subdir">
+		      linkend="ports-master-sites-n-example-detailed-use-master-site-subdir"/>
 		    �� <xref
-		      linkend="ports-master-sites-n-example-detailed-use-complete-example-master-sites">
+		      linkend="ports-master-sites-n-example-detailed-use-complete-example-master-sites"/>
 		    �����������������</para>
 
 		  <example id="ports-master-sites-n-example-detailed-use-master-site-subdir">
@@ -2557,7 +2561,7 @@ MASTER_SITE_SUBDIR=     directory-trial:1 directory-n/:groupn \
 		�������������̤��ѿ��򥰥롼�פ˳�����Ƥ�ˤϤɤ�����Ф褤�Ǥ���?</para>
 
 	      <para><xref
-		  linkend="ports-master-sites-n-example-detailed-use-master-site-sourceforge">
+		  linkend="ports-master-sites-n-example-detailed-use-master-site-sourceforge"/>
 		��������������</para>
 
 	      <example
@@ -2581,7 +2585,7 @@ DISTFILES=      something.tar.gz:sourceforge</programlisting>
 
 	      <para>���٤Ƥ���� <makevar>MASTER*</makevar>
 		�ѿ���ȤäƤ��ޤ�����<xref
-		  linkend="ports-master-sites-n-example-detailed-use-patch-sites">
+		  linkend="ports-master-sites-n-example-detailed-use-patch-sites"/>
 		�ˤ���褦�ˡ�<makevar>PATCH*</makevar>
 		�ѿ����Ф��Ƥ�ޤä���Ʊ���褦��Ư���ޤ���</para>
 
@@ -2606,7 +2610,7 @@ PATCHFILES=     patch1:test</programlisting>
 	      <para>���ߤΤ��٤Ƥ� ports �Ϥ��Τޤ��Ѥ��ޤ���
 		<literal>MASTER_SITES:n</literal>
 		��ǽ�Υ����ɤϡ�<xref
-		  linkend="porting-master-sites-n-group-semantics">
+		  linkend="porting-master-sites-n-group-semantics"/>
 		�ǽҤ٤�ʸˡ�˽���
 		<literal>:<replaceable>n</replaceable></literal>
 		�Τ褦�ʷ���������ˤĤ������Ǥ����������ư��ޤ���</para>
@@ -2638,7 +2642,7 @@ PATCHFILES=     patch1:test</programlisting>
 		    <makevar>MASTER_SITE_SUBDIR</makevar> ��
 		    <makevar>PATCH_SITE_SUBDIR</makevar>
 		    �����Ѥ��ޤ���<xref
-		      linkend="ports-master-sites-n-example-detailed-use-complete-example-master-sites">
+		      linkend="ports-master-sites-n-example-detailed-use-complete-example-master-sites"/>
 		    ��������������</para>
 		</listitem>
 
@@ -2670,7 +2674,7 @@ PATCHFILES=     patch1:test</programlisting>
 		    �Τɤ��餫�Υ������åȤ�Ȥ������褤�Ǥ���
 		    �ޤ�������ΥС������Ǥ�ľ�ܳ�ǧ���Ǥ��뤫�ɤ������ݾڤ���Ƥ��ޤ���
 		    ����鿷�� port �������åȤˤĤ��Ƥϡ�<xref
-		      linkend="porting-master-sites-n-new-port-targets-master-sites-all">
+		      linkend="porting-master-sites-n-new-port-targets-master-sites-all"/>
 		    �ι�򤴳�ǧ����������</para>
 		</listitem>
 
@@ -2772,7 +2776,7 @@ PATCHFILES=     patch1:test</programlisting>
 
       <para>���ʤ��Υ᡼�륢�ɥ쥹�򤳤�������Ƥ���������
 	���ꤤ���ޤ���
-	<!-- smiley --><emphasis remap=tt>:-)</emphasis></para>
+	<!-- smiley --><emphasis remap="tt">:-)</emphasis></para>
 
       <para>�ݼ�ô���� (maintainer) ����Ǥ�˴ؤ���ܺ������ϡ�
 	<ulink url="../developers-handbook/policies.html#POLICIES-MAINTAINER">
@@ -2949,13 +2953,13 @@ PATCHFILES=     patch1:test</programlisting>
 	  �Ȥ���̾���Υץ�������õ���ޤ���
 	  ���Ĥ���ʤ����ˤϡ�ports �ĥ꡼��
 	  <filename>net/ncftp2</filename>
-	  ���֥ǥ��쥯�ȥ�ǥӥ�ɤȥ��󥹥ȡ����Ԥʤ��ޤ���
+	  ���֥ǥ��쥯�ȥ�ǥӥ�ɤȥ��󥹥ȡ����Ԥʤ��ޤ���</para>
 
 	<para>���ΰ�¸�ط��� <maketarget>fetch</maketarget>
 	  �������å���ǥ����å�����ޤ���
 	  <replaceable>target</replaceable> ����ʬ�ϡ�
 	  <makevar>DEPENDS_TARGET</makevar>
-	  ��Ʊ�����ˤϾ�ά���뤳�Ȥ��Ǥ��ޤ���
+	  ��Ʊ�����ˤϾ�ά���뤳�Ȥ��Ǥ��ޤ���</para>
       </sect2>
 
       <sect2>
@@ -3019,7 +3023,7 @@ PATCHFILES=     patch1:test</programlisting>
 
 		<entry>���� port ��ӥ�ɤ��ƥ��󥹥ȡ��뤹��Τ� Perl 5
 		  ��ɬ�פǤ���Perl �˴�Ϣ���������ǽ��¾���ѿ��ˤĤ��Ƥ�
-		  <xref linkend="using-perl"> ��������������</entry>
+		  <xref linkend="using-perl"/> ��������������</entry>
 	      </row>
 
 	      <row>
@@ -3028,7 +3032,7 @@ PATCHFILES=     patch1:test</programlisting>
 		<entry>���� port �� <makevar>PREFIX</makevar> �ǤϤʤ�
 		  <makevar>X11BASE</makevar> �˥��󥹥ȡ��뤵��ޤ���
 		  X11 �˴�Ϣ���������ǽ��¾���ѿ��ˤĤ��Ƥϡ�
-		  <xref linkend="using-x11"> ��������������</entry>
+		  <xref linkend="using-x11"/> ��������������</entry>
 	      </row>
 
 	      <row>
@@ -3037,7 +3041,7 @@ PATCHFILES=     patch1:test</programlisting>
 		<entry>���� port �Υӥ�ɤ� GNU <command>automake</command>
 		  ���Ȥ��ޤ���<command>automake</command>
 		  �˴ؤ��¾�������ǽ���ѿ��ˤĤ��Ƥϡ�
-		  <xref linkend="using-automake"> ��������������</entry>
+		  <xref linkend="using-automake"/> ��������������</entry>
 	      </row>
 
 	      <row>
@@ -3046,7 +3050,7 @@ PATCHFILES=     patch1:test</programlisting>
 		<entry>���� port �Υӥ�ɤ� GNU <command>autoconf</command>
 		  ���Ȥ��ޤ���<command>autoconf</command>
 		  �˴ؤ��¾�������ǽ���ѿ��ˤĤ��Ƥϡ�
-		  <xref linkend="using-automake"> ��������������</entry>
+		  <xref linkend="using-automake"/> ��������������</entry>
 	      </row>
 
 	      <row>
@@ -3055,7 +3059,7 @@ PATCHFILES=     patch1:test</programlisting>
 		<entry>���� port �Υӥ�ɤ� GNU <command>libtool</command>
 		  ���Ȥ��ޤ���<command>libtool</command>
 		  �˴ؤ��¾�������ǽ���ѿ��ˤĤ��Ƥϡ�
-		  <xref linkend="using-automake"> ��������������</entry>
+		  <xref linkend="using-automake"/> ��������������</entry>
 	      </row>
 
 	      <row>
@@ -3078,7 +3082,7 @@ PATCHFILES=     patch1:test</programlisting>
 		<entry><maketarget>install.man</maketarget>
 		  �������åȤ�Ȥ��ޤ���</entry>
 	      </row>
-
+	    </tbody>
 	  </tgroup>
 	</table>
 
@@ -3178,7 +3182,7 @@ PATCHFILES=     patch1:test</programlisting>
 	<filename>Makefile</filename> �ˤ� <makevar>WANT_PKG</makevar>
 	�򥻥åȤ���ɬ�פ�����ޤ���
 	�����ơ��ӥ�ɻ��� <makevar>HAVE_PKG</makevar> ���������Ƥ����
-	<makevar>PKG</makevar> ��Ȥ��С�����󤬥ӥ�ɤ���뤳�Ȥˤʤ�ޤ���
+	<makevar>PKG</makevar> ��Ȥ��С�����󤬥ӥ�ɤ���뤳�Ȥˤʤ�ޤ���</para>
 
       <para>���ߡ����Τ褦�ʷ��ǥ��ݡ��Ȥ���Ƥ���
 	<makevar>WANT_*</makevar> �ѿ��ϡ�
@@ -3380,6 +3384,7 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
 
 	<para><makevar>NO_PACKAGE</makevar> �ˤϡ�
 	  �ѥå�������������٤��ǤϤʤ���ͳ��Ҥ٤�ʸ��������ꤹ�٤��Ǥ���</para>
+      </sect2>
 
       <sect2>
 	<title><makevar>NO_CDROM</makevar></title>
diff --git a/ja_JP.eucJP/books/ppp-primer/book.sgml b/ja_JP.eucJP/books/ppp-primer/book.sgml
index 10a14ca888..6571d33e77 100644
--- a/ja_JP.eucJP/books/ppp-primer/book.sgml
+++ b/ja_JP.eucJP/books/ppp-primer/book.sgml
@@ -1,6 +1,8 @@
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
-%books.ent;
+<?xml version="1.0" encoding="eucJP" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
+	"../../../share/sgml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml/entities.ent">
+%entities;
 ]>
 
 <!-- The FreeBSD Japanese Documentation Project -->
@@ -16,7 +18,7 @@ DocBook
 ��¼ ���� sugimura@jp.FreeBSD.org
 -->
 
-<book>
+<book lang='ja'>
 
 <bookinfo>
 <title>PPP - Pedantic PPP Primer</title>
@@ -31,7 +33,7 @@ DocBook
 </author>
 </authorgroup>
 
-<pubdate>$FreeBSD$</pubdate>
+<releaseinfo>$FreeBSD$</releaseinfo>
 
 <abstract><para>����� FreeBSD �����ƥ���������Ķ��Υ������륢�åץ롼�� /
 �����ȥ������Ȥ��ƥ��åȥ��åפ��뤿��Υ��ƥåץ��åץ����ɤǤ�.
@@ -44,11 +46,11 @@ DocBook
 <title>����:</title>
 
 <para>FreeBSD 2.2 �ˤ�����桼���⡼�� PPP
-(<emphasis remap=it>"IIJ-PPP"</emphasis> �Ȥ��Ƥ��Τ��Ƥ��ޤ�) ��,
+(<emphasis remap="it">"IIJ-PPP"</emphasis> �Ȥ��Ƥ��Τ��Ƥ��ޤ�) ��,
 ���ߥ������륢�åץ��󥿡��ͥåȴĶ��ˤ����� Packet Aliasing �򥵥ݡ��Ȥ��Ƥ��ޤ�.
-���ε�ǽ��, "<emphasis remap=it>Masquerading</emphasis>",
-"<emphasis remap=it>IP Aliasing</emphasis>", ������
-"<emphasis remap=it>Network Address Translation</emphasis>" �Ȥ��Ƥ�
+���ε�ǽ��, "<emphasis remap="it">Masquerading</emphasis>",
+"<emphasis remap="it">IP Aliasing</emphasis>", ������
+"<emphasis remap="it">Network Address Translation</emphasis>" �Ȥ��Ƥ�
 �Τ��Ƥ���, ���ε�ǽ���������� FreeBSD �����ƥ�򥤡����ͥåȤ���פȤ���
 �������륨�ꥢ�ͥåȥ�� (LAN) �ȥ��󥿡��ͥåȥ����ӥ��ץ��Х����֤�
 �������륪��ǥޥ�ɥ롼���Ȥ��Ƴ��Ѥ��뤳�Ȥ��Ǥ��ޤ�.
@@ -155,7 +157,7 @@ Microsoft 
 </para>
 
 <informaltable>
-  <tgroup cols=3>
+  <tgroup cols="3">
     <thead>
       <row>
         <entry>̾��</entry>
@@ -194,7 +196,7 @@ Microsoft 
 
 <para>���Υ����ɤǤϥ�ǥ�� FreeBSD �ޥ���ΰ����ܤΥ��ꥢ��ݡ���
 ('<filename>/dev/cuaa0</filename>' DOS �Ѹ�Ǥ�
-'<emphasis remap=tt>COM1:</emphasis>') ����³����Ƥ����ΤȤ��ޤ�.</para>
+'<emphasis remap="tt">COM1:</emphasis>') ����³����Ƥ����ΤȤ��ޤ�.</para>
 
 <para>�Ǹ��, ���󥿡��ͥåȥ����ӥ��ץ��Х��� (ISP) �� PPP/FreeBSD
 �����ɤ� ISP �����ɤ�ξ���˼�ưŪ�� IP ���ɥ쥹�������Ƥ��ΤȤ��ޤ�.
@@ -252,7 +254,7 @@ FreeBSD 
   
 <para>FreeBSD �����ƥ�Υۥ���̾��ɽ�����줿�Ϥ��Ǥ�.
 �⤷�ۥ���̾����������� (�����狼��Ǥ��� :-),
-<xref linkend="verify-ether-if-config"> �ޤǿʤ�Ǥ�������.</para>
+<xref linkend="verify-ether-if-config"/> �ޤǿʤ�Ǥ�������.</para>
   
 <para>�㤨��, ��������Υͥåȥ���Ǥ�, ���󥹥ȡ����� /
 ��˥ۥ���̾�����������ꤷ�Ƥ����, 'hostname` ���ޥ�ɤ�
@@ -268,16 +270,16 @@ FreeBSD 
 <sect2>
 <title>FreeBSD �Υۥ���̾�����ꤹ��</title>
 
-<para><emphasis><emphasis remap=bf>ǰ�Τ���: �����ƥ�����ե�������Խ����뤿��ˤ�
+<para><emphasis><emphasis remap="bf">ǰ�Τ���: �����ƥ�����ե�������Խ����뤿��ˤ�
 'root' �ǥ������󤹤�ɬ�פ�����ޤ�!</emphasis></emphasis></para>
 
-<para><emphasis><emphasis remap=bf>�ٹ�: �����ƥ�����ե�����ˤ��������ѹ���
+<para><emphasis><emphasis remap="bf">�ٹ�: �����ƥ�����ե�����ˤ��������ѹ���
 �ä������, �����ƥब����� **��ư���ʤ�** ��ǽ��������ޤ�!
 ���줰��⤴���դ�!</emphasis></emphasis></para>
 
 <para>�֡��Ȼ��� FreeBSD �����ƥ�Υۥ���̾����ꤷ�Ƥ�������ե������
 <filename>/etc/rc.conf</filename> �Ǥ�. �ǥե���ȤΥƥ����ȥ��ǥ���
-('<emphasis remap=tt>ee</emphasis>') ��ȤäƤ��Υե�������Խ����ޤ��礦.</para>
+('<emphasis remap="tt">ee</emphasis>') ��ȤäƤ��Υե�������Խ����ޤ��礦.</para>
   
 <para>�桼�� 'root' �ǥ�������, �ʲ��Υ��ޥ�ɤ����Ϥ���
 <filename>/etc/rc.conf</filename> �򥨥ǥ������ɤ߹��ߤޤ��礦.
@@ -316,7 +318,7 @@ hostname="curly.my.domain"	# Set this!
 <title>�������ͥåȥ��󥿥ե�����������γ�ǧ</title>
 
 <para>�⤦���ٳ�ǧ�Ǥ���, ���Υ����ɤǤ� FreeBSD
-�����ƥ�Υ������ͥåȥ��󥿥ե������Ȥ��� '<emphasis remap=tt>ed0</emphasis>'
+�����ƥ�Υ������ͥåȥ��󥿥ե������Ȥ��� '<emphasis remap="tt">ed0</emphasis>'
 ���Ѥ����Ƥ�������ꤷ�Ƥ��ޤ�. ����� NE-1000, NE-2000,
 WD/SMC models 8003, 8013 ��  Elite Ultra (8216)
 �ͥåȥ�������ץ����ǥե���Ȥǻ��Ѥ����ΤǤ�.</para>
@@ -326,8 +328,8 @@ WD/SMC models 8003, 8013 
 ������å�����, �ͥåȥ�������ץ��ε��Ҥ�õ���Ƥ�������.
 �����ץ��ΥǥХ���̾��ʬ����ʤ�����, FreeBSD FAQ ���ɤ��,
 ������Υ����ɤΥǥХ���̾��Τ���, �ʲ��Υ��ƥåפ��о줹��ǥХ���̾�򤽤�̾��
-(�㤨�� '<emphasis remap=tt>de0</emphasis>',
-'<emphasis remap=tt>zp0</emphasis>' �ʤ�) ���ɤ��ؤ��Ƥ�������.</para>
+(�㤨�� '<emphasis remap="tt">de0</emphasis>',
+'<emphasis remap="tt">zp0</emphasis>' �ʤ�) ���ɤ��ؤ��Ƥ�������.</para>
   
 <para>�ۥ���̾��Ʊ��, �������ͥåȥ��󥿥ե������� FreeBSD
 �����ƥ�Υ��󥹥ȡ���������ꤵ��Ƥ����礬����ޤ�.</para>
@@ -340,7 +342,7 @@ WD/SMC models 8003, 8013 
 </informalexample>
 
 (�եġ��θ��դ�ľ����, �֤����Υͥåȥ���ǥХ�����
-<emphasis remap=bf>I</emphasis>nter<emphasis remap=bf>F</emphasis>ace
+<emphasis remap="bf">I</emphasis>nter<emphasis remap="bf">F</emphasis>ace
 <acronym>CONFIG</acronym>uration �򸫤��ơפäư�̣�Ǥ�)</para>
   
 <para>�㤨��...
@@ -362,17 +364,17 @@ WD/SMC models 8003, 8013 
   
 <para>������Ǥ�, �ʲ��ΥǥХ�����ɽ������ޤ���.</para>
   
-<para><emphasis remap=tt>ed0:</emphasis>  �������ͥåȥ��󥿥ե�����</para>
+<para><emphasis remap="tt">ed0:</emphasis>  �������ͥåȥ��󥿥ե�����</para>
   
-<para><emphasis remap=tt>lp0:</emphasis>  �ѥ���ݡ��ȥ��󥿥ե����� (���Υ����ɤǤϿ���ޤ���)</para>
+<para><emphasis remap="tt">lp0:</emphasis>  �ѥ���ݡ��ȥ��󥿥ե����� (���Υ����ɤǤϿ���ޤ���)</para>
   
-<para><emphasis remap=tt>tun0:</emphasis> �֥ȥ�ͥ�ץǥХ��� <emphasis>�桼���⡼�� ppp ���Ȥ���ĤǤ�!</emphasis></para>
+<para><emphasis remap="tt">tun0:</emphasis> �֥ȥ�ͥ�ץǥХ��� <emphasis>�桼���⡼�� ppp ���Ȥ���ĤǤ�!</emphasis></para>
   
-<para><emphasis remap=tt>sl0:</emphasis>  SL/IP �ǥХ��� (���Υ����ɤǤϿ���ޤ���)</para>
+<para><emphasis remap="tt">sl0:</emphasis>  SL/IP �ǥХ��� (���Υ����ɤǤϿ���ޤ���)</para>
   
-<para><emphasis remap=tt>ppp0:</emphasis> �⤦��Ĥ� PPP �ǥХ��� (�����ͥ� ppp ��. ���Υ����ɤǤϿ���ޤ���)</para>
+<para><emphasis remap="tt">ppp0:</emphasis> �⤦��Ĥ� PPP �ǥХ��� (�����ͥ� ppp ��. ���Υ����ɤǤϿ���ޤ���)</para>
   
-<para><emphasis remap=tt>lo0:</emphasis>  �֥롼�ץХå��ץǥХ��� (���Υ����ɤǤϿ���ޤ���)</para>
+<para><emphasis remap="tt">lo0:</emphasis>  �֥롼�ץХå��ץǥХ��� (���Υ����ɤǤϿ���ޤ���)</para>
   
 <para>������Ǥ�, 'ed0' �ǥХ����ϡ־夬�äơ�ư��Ƥ��ޤ�.
 �ʲ���ɽ���������ˤʤ�ޤ�.
@@ -383,7 +385,7 @@ WD/SMC models 8003, 8013 
 </listitem>
 
 <listitem>
-<para>���󥿡��ͥå� ("<emphasis remap=tt>inet</emphasis>") ���ɥ쥹
+<para>���󥿡��ͥå� ("<emphasis remap="tt">inet</emphasis>") ���ɥ쥹
 (������Ǥ� 192.168.1.1) �����,</para>
 </listitem>
 
@@ -409,16 +411,16 @@ WD/SMC models 8003, 8013 
 �������ͥåȥ����ɤϤޤ����ꤵ��Ƥ��ޤ���.</para>
   
 <para>�������ͥåȥ��󥿥ե����������꤬�������Ԥ��Ƥ���ʤ�,
-<xref linkend="list-lan-hosts"> �ޤǿʤ�Ǥ�������.</para>
+<xref linkend="list-lan-hosts"/> �ޤǿʤ�Ǥ�������.</para>
   
 
 <sect2>
 <title>�������ͥåȥ��󥿥ե�����������</title>
 
-<para><emphasis><emphasis remap=bf>ǯ�Τ���: �����ƥ�����ե�������Խ����뤿��ˤ�
+<para><emphasis><emphasis remap="bf">ǯ�Τ���: �����ƥ�����ե�������Խ����뤿��ˤ�
 'root' �ǥ������󤹤�ɬ�פ�����ޤ�!</emphasis></emphasis></para>
   
-<para><emphasis><emphasis remap=bf>�ٹ�: �����ƥ�����ե�����ˤ��������ѹ���
+<para><emphasis><emphasis remap="bf">�ٹ�: �����ƥ�����ե�����ˤ��������ѹ���
 �ä������, �����ƥब����� **��ư���ʤ�** ��ǽ��������ޤ�!
 ���줰��⤴���դ�!</emphasis></emphasis></para>
   
@@ -442,7 +444,7 @@ WD/SMC models 8003, 8013 
 </informalexample>
 </para>
   
-<para>FreeBSD �� '<emphasis remap=tt>ed0</emphasis>' �Ȥ���̾����
+<para>FreeBSD �� '<emphasis remap="tt">ed0</emphasis>' �Ȥ���̾����
 �̤ΥǥХ�����ä��뤳�Ȥ�������ˤ�,
 ���ιԤ�������ɬ�פ�����ޤ�. ���ιԤ򼡤Τ褦���Ѥ��Ƥ�������.</para>
   
@@ -452,12 +454,12 @@ WD/SMC models 8003, 8013 
 </informalexample>
 </para>
   
-<para>(�롼�ץХå��ǥХ��� ("<emphasis remap=tt>lo0</emphasis>") ��
-�������ͥåȥǥХ��� ("<emphasis remap=tt>ed0</emphasis>") ������δ֤�
+<para>(�롼�ץХå��ǥХ��� ("<emphasis remap="tt">lo0</emphasis>") ��
+�������ͥåȥǥХ��� ("<emphasis remap="tt">ed0</emphasis>") ������δ֤�
 ���ڡ����������Τ�˺��ʤ��Ǥ�������!)</para>
   
-<para><emphasis><emphasis remap=bf> ǰ�Τ���: �������ͥåȥ����ɤ�̾����
-'<emphasis remap=tt>ed0</emphasis>' �Ǥʤ����,
+<para><emphasis><emphasis remap="bf"> ǰ�Τ���: �������ͥåȥ����ɤ�̾����
+'<emphasis remap="tt">ed0</emphasis>' �Ǥʤ����,
 ������Ȥ����������ǥХ���̾����ꤷ�Ƥ�������</emphasis></emphasis></para>
   
 <para>FreeBSD ��ͥåȥ�����󥹥ȡ��뤷�����,
@@ -465,7 +467,7 @@ WD/SMC models 8003, 8013 
 �ιԤ����Ǥ˥������ͥåȥ����ץ��򻲾Ȥ��Ƥ����礬����ޤ�. ���ξ��,
 ���줬�������ǥХ���̾���ɤ������ǧ���Ƥ�������.</para>
   
-<para>����, �������ͥåȥǥХ��� ('<emphasis remap=tt>ed0</emphasis>')
+<para>����, �������ͥåȥǥХ��� ('<emphasis remap="tt">ed0</emphasis>')
 ���󥿥ե������������Ԥ��ޤ��礦.</para>
   
 <para>�����ƥ��֤ˤ��륤�󥿥ե������λ���Ԥβ���,
@@ -478,7 +480,7 @@ WD/SMC models 8003, 8013 
 </informalexample>
 </para>
   
-<para>���β��� '<emphasis remap=tt>ed0</emphasis>' �ǥХ�����
+<para>���β��� '<emphasis remap="tt">ed0</emphasis>' �ǥХ�����
 ����򵭽Ҥ���Ԥ�ä��ޤ��礦.</para>
   
 <para>FreeBSD ��ͥåȥ�����󥹥ȡ��뤷�����,
@@ -526,7 +528,7 @@ IP 
   
 <para>FreeBSD �����ƥि������򥤥󥿡��ͥå��ѤΥ�����ơ������Ȥ��ƻ��Ѥ�,
 LAN �Ρ��ɤ� ISP �֤ȤΥ����ȥ������Ȥ��ƻ��Ѥ��ʤ�����,
-<xref linkend="list-lan-hosts"> �ޤǿʤߤޤ��礦.</para>
+<xref linkend="list-lan-hosts"/> �ޤǿʤߤޤ��礦.</para>
    
 <para>PPP �ץ���������Ѥ��ƥ�������� FreeBSD �ޥ���� LAN
 �Υ�����ơ������ (�Ĥޤ�롼��) �Ȥ��Ƥⵡǽ���������,
@@ -548,7 +550,7 @@ IP 
 
       <para><filename>/etc/rc.conf</filename> ���ɲä��ޤ�.</para>
 
-<para><emphasis><emphasis remap=bf>����: FreeBSD �����ƥ�Υ��󥹥ȡ������
+<para><emphasis><emphasis remap="bf">����: FreeBSD �����ƥ�Υ��󥹥ȡ������
 IP �ե���ǥ��󥰤�ͭ���ˤʤäƤ������, ���Ǥ�
 '<literal>gateway_enable=YES</literal>'
 �Ȥ������꤬�Ԥ��Ƥ����礬����ޤ�.</emphasis></emphasis></para>
@@ -566,7 +568,7 @@ IP 
 �롼�ץХå��ǥХ��� ('lo0') �Υۥ���̾�ȥ��ɥ쥹�Ǥ�.
 �ͥåȥ���˴ؤ�����«���ˤ������ä�, ���ΥǥХ���̾�Ϥ��Ĥ� "localhost"
 ��̾�դ����, 127.0.0.1 �Ȥ��� IP ���ɥ쥹����Ĥ��ȤˤʤäƤ��ޤ�
-<xref linkend="verify-ether-if-config">.</para>
+<xref linkend="verify-ether-if-config"/>.</para>
   
 <para><filename>/etc/hosts</filename> ���Խ����뤿���,
 �ʲ��Υ��ޥ�ɤ����Ϥ��Ƥ�������.
@@ -589,7 +591,7 @@ LAN 
 </informalexample>
 </para>
   
-<para>('<emphasis remap=tt>127.0.0.1 localhost</emphasis>'
+<para>('<emphasis remap="tt">127.0.0.1 localhost</emphasis>'
 �Υ���ȥ꤬�񤫤줿�Ԥ��ѹ�����ɬ�פϤ���ޤ���.)</para>
   
 <para>���Ϥ򽪤�����, 'Esc' �����򲡤��ƥ���ȥ������˥塼��ƤӽФ��Ƥ�������.
@@ -674,13 +676,13 @@ IP 
   
 <para>�⤷ "curly" �� IP ���ɥ쥹�� 192.168.1.1 �ǤϤʤ�, ���뤤��
 "localhost" �Υ��ɥ쥹�� 127.0.0.1 �ǤϤʤ����,
-<xref linkend="list-lan-hosts"> �ޤ���ä�
+<xref linkend="list-lan-hosts"/> �ޤ���ä�
 <filename>/etc/hosts</filename> �����Ƥ�ľ���Ƥ�������.</para>
   
 <para>ping ���ޥ�ɤν��Ϥǥۥ���̾�ȥ��ɥ쥹���������б��Ť����Ƥ��뤬,
 ����¾�Υ��顼��ɽ�������ʤ�,
 ���󥿥ե����������꤬���ޤ��ԤäƤ��ʤ��ΤǤ��礦.
-<xref linkend="system-config"> �ޤ���äƺǽ餫���ǧ��ľ���Ƥ�������.</para>
+<xref linkend="system-config"/> �ޤ���äƺǽ餫���ǧ��ľ���Ƥ�������.</para>
   
 <para>�����å�����������ä���, �Ĥ��ξϤ˿ʤ�Ǥ�������.</para>
   
@@ -740,13 +742,13 @@ IP 
   
 <para>'<filename>/etc</filename>' �ǥ��쥯�ȥ�˰ܤ�ޤ�.</para>
   
-<para><emphasis remap=tt># cd /etc</emphasis></para>
+<para><emphasis remap="tt"># cd /etc</emphasis></para>
   
 <para>'ppp' �ǥ��쥯�ȥ���Υ��ꥸ�ʥ�Υե�����ΥХå����åפ�Ĥ���ޤ�.</para>
   
-<para><emphasis remap=tt># cp -R ppp ppp.ORIGINAL</emphasis></para>
+<para><emphasis remap="tt"># cp -R ppp ppp.ORIGINAL</emphasis></para>
   
-<para>����� '<filename>/etc</filename>' �ǥ��쥯�ȥ�β��� '<emphasis remap=tt>ppp</emphasis>' ��
+<para>����� '<filename>/etc</filename>' �ǥ��쥯�ȥ�β��� '<emphasis remap="tt">ppp</emphasis>' ��
 '<filename>ppp.ORIGINAL</filename>' �Ȥ�����ĤΥ��֥ǥ��쥯�ȥ꤬�Ǥ��ޤ���.</para>
   
 </sect1>
@@ -857,9 +859,9 @@ demand:
 ����˴�Ϣ���뻰�ĤΥ�������󤬤���ޤ�.</para>
 
 <sect3>
-<title>"<emphasis remap=tt>default</emphasis>" ���������</title>
+<title>"<emphasis remap="tt">default</emphasis>" ���������</title>
 
-<para>'<emphasis remap=tt>default:</emphasis>' ���������ˤ�,
+<para>'<emphasis remap="tt">default:</emphasis>' ���������ˤ�,
 ���Υե������¾�ΤɤΥ�������󤫤�⻲�Ȥ�����ͤ����꤬��������Ƥ��ޤ�.
 ���Υ������������Ƥ�, 
 ���ۤ����¾�Υ�������������˽񤭲ä������Τȹͤ��Ƥ������ɤ��Ǥ��礦.</para>
@@ -877,10 +879,10 @@ demand:
 
 ����ʸ�� PPP �ץ������˰����ܤΥ��ꥢ��ݡ��Ȥ���Ѥ���褦���Τ��Ƥ��ޤ�.
 FreeBSD ���ˤ����� '<filename>/dev/cuaa0</filename>' �ǥХ����Ȥ�, DOS, Windows,
-Windows 95 �ʤ󤫤Ǹ����Ȥ����� "<emphasis remap=tt>COM1:</emphasis>" ��Ʊ���ݡ��ȤΤ��ȤǤ�.</para>
+Windows 95 �ʤ󤫤Ǹ����Ȥ����� "<emphasis remap="tt">COM1:</emphasis>" ��Ʊ���ݡ��ȤΤ��ȤǤ�.</para>
   
-<para>��ǥब <emphasis remap=tt>COM2:</emphasis> �ˤĤʤ���Ƥ������, 
-'<filename>/dev/cuaa1</filename>' ����ꤷ�Ƥ�������. <emphasis remap=tt>COM3:</emphasis> �ξ���
+<para>��ǥब <emphasis remap="tt">COM2:</emphasis> �ˤĤʤ���Ƥ������, 
+'<filename>/dev/cuaa1</filename>' ����ꤷ�Ƥ�������. <emphasis remap="tt">COM3:</emphasis> �ξ���
 '<filename>/dev/cuaa2</filename>' �Ǥ�.</para>
   
 <para>
@@ -1016,9 +1018,9 @@ PPP 
 </sect3>
 
 <sect3>
-<title>"<emphasis remap=tt>interactive</emphasis>" ���������</title>
+<title>"<emphasis remap="tt">interactive</emphasis>" ���������</title>
 
-<para>'<emphasis remap=tt>interactive:</emphasis>' ���������ˤ�,
+<para>'<emphasis remap="tt">interactive:</emphasis>' ���������ˤ�,
 ����Υ�⡼�ȥ����ƥ�ȡ�����Ū (interactive)�פ�
 PPP ���å������Ω����Ȥ��˻��Ѥ�����ͤ����꤬��������Ƥ��ޤ�.
 ���Υ�������������ˤ�, "default" �������������Ƥ���ưŪ���ɲä���ޤ�.</para>
@@ -1051,15 +1053,15 @@ ISP 
 </listitem>
 
 <listitem>
-<para>The IBM Network (<ulink URL="http://www.ibm.net/">http://www.ibm.net/</ulink>)</para>
+<para>The IBM Network (<ulink url="http://www.ibm.net/">http://www.ibm.net/</ulink>)</para>
 </listitem>
 
 <listitem>
-<para>AT&amp;T WorldNet (<ulink URL="http://att.com/worldnet/">http://att.com/worldnet/</ulink>)</para>
+<para>AT&amp;T WorldNet (<ulink url="http://att.com/worldnet/">http://att.com/worldnet/</ulink>)</para>
 </listitem>
 
 <listitem>
-<para>Erol's (<ulink URL="http://www.erols.com/">http://www.erols.com/</ulink>)</para>
+<para>Erol's (<ulink url="http://www.erols.com/">http://www.erols.com/</ulink>)</para>
 </listitem>
 
 </itemizedlist>
@@ -1088,7 +1090,7 @@ ISP 
 </informalexample>
 
 ��⡼�ȥ����ƥ�������ֹ�Ǥ�. PBX (Private Branch eXchange, ����򴹵�)
-�������ˤ������, <emphasis remap=tt>9, </emphasis> ���ֹ�����˲ä��뤳�Ȥ��Ǥ��ޤ�.</para>
+�������ˤ������, <emphasis remap="tt">9, </emphasis> ���ֹ�����˲ä��뤳�Ȥ��Ǥ��ޤ�.</para>
   
 <para>
 <informalexample>
@@ -1122,7 +1124,7 @@ ISP 
 </sect3>
 
 <sect3>
-<title>"<emphasis remap=tt>demand</emphasis>" ���������</title>
+<title>"<emphasis remap="tt">demand</emphasis>" ���������</title>
 
 <para>����Υ�⡼�ȥ����Ȥȡ֥������롦���󡦥ǥޥ�ɡפ� PPP
 ���å������Ω����Ȥ��˻��Ѥ�����ͤ����꤬��������Ƥ��ޤ�.
@@ -1198,7 +1200,7 @@ ISP 
 </para>
   
 <para>PPP ��󥯤Υ�������¦�ȥ�⡼��¦�Ρֵ��Ρ� IP ���ɥ쥹�Υڥ������ꤷ,
-��������¦�� '<emphasis remap=tt>tun0</emphasis>' (�ȥ�ͥ�) �ǥХ���
+��������¦�� '<emphasis remap="tt">tun0</emphasis>' (�ȥ�ͥ�) �ǥХ���
 �� 127.1.1.1 ��, ��⡼��¦�ˤ�
 127.2.2.2 �� IP ���ɥ쥹����������褦�� PPP �ץ�������̿���Ƥ��ޤ�.
 ξ���Υ��ɥ쥹�� '<filename>/0</filename>' ��Ĥ��Ƥ�����,
@@ -1214,10 +1216,10 @@ PPP 
 <para>����. ������Ǥ� ISP ����󥯤�ξü���Ф��� IP
 ���ɥ쥹��ưŪ���󶡤����Τ����ꤷ�Ƥ��ޤ�! �⤷ ISP
 �����������¦�ǻ��Ѥ��٤�����Ū�� IP ���ɥ쥹�γ�����Ƥ�����Ƥ�����,
-<emphasis remap=tt>127.1.1.1</emphasis> ��<emphasis>�����</emphasis>���� IP ���ɥ쥹�����Ϥ��Ƥ�������.</para>
+<emphasis remap="tt">127.1.1.1</emphasis> ��<emphasis>�����</emphasis>���� IP ���ɥ쥹�����Ϥ��Ƥ�������.</para>
   
 <para>�դ�, ISP ����⡼��¦�ǻ��Ѥ������Ū�� IP ���ɥ쥹����ꤷ�Ƥ�����,
-<emphasis remap=tt>127.2.2.2</emphasis> ��<emphasis>�����</emphasis>���� IP ���ɥ쥹�����Ϥ��Ƥ�������.</para>
+<emphasis remap="tt">127.2.2.2</emphasis> ��<emphasis>�����</emphasis>���� IP ���ɥ쥹�����Ϥ��Ƥ�������.</para>
   
 <para>�����ξ��ˤ����Ƥ�, �ƥ��ɥ쥹�θ���� '<filename>/0</filename>'
 ��Ĥ��Ƥ����Τ��ɤ��ͤ��Ǥ��礦.
@@ -1234,8 +1236,8 @@ PPP 
 IP �ȥ�ե��å��Υǥե���ȥ롼�Ȥ��ɲä���褦,
 PPP �ץ�������̿���Ƥ��ޤ�.</para>
   
-<para><emphasis><emphasis remap=bf>����: ���ιԤ� <emphasis remap=tt>127.2.2.2</emphasis> ������� ISP
-�˻��ꤵ�줿���ɥ쥹���Ѥ��Ƥ�����, �����Ǥ� <emphasis remap=tt>127.2.2.2</emphasis>
+<para><emphasis><emphasis remap="bf">����: ���ιԤ� <emphasis remap="tt">127.2.2.2</emphasis> ������� ISP
+�˻��ꤵ�줿���ɥ쥹���Ѥ��Ƥ�����, �����Ǥ� <emphasis remap="tt">127.2.2.2</emphasis>
 ������ˤ����ֹ����Ѥ��Ƥ�������</emphasis></emphasis>.</para>
   
 <para>���Ρֵ��פ� IP �ȥ�ե��å��롼�Ȥ��ɲä��Ƥ�����,
@@ -1331,12 +1333,12 @@ MYADDR:
 
 �褦, PPP �ץ�������̿���Ƥ��ޤ�.</para>
   
-<para>'<filename>/etc/ppp/ppp.conf</filename>' ��� '<emphasis remap=tt>set ifaddr</emphasis>' �� '<emphasis remap=tt>add 0 0</emphasis>'
+<para>'<filename>/etc/ppp/ppp.conf</filename>' ��� '<emphasis remap="tt">set ifaddr</emphasis>' �� '<emphasis remap="tt">add 0 0</emphasis>'
 ����Ѥ��Ƥ������� (�Ĥޤ�, �������륪��ǥޥ�ɤ�����) �ˤ����Ƥ�,
 <filename>/etc/ppp/ppp.linkup</filename> ��� "delete ALL" �� "add 0 0 HISADDR"
 ���ޥ�ɤ�¹Ԥ��뤳�Ȥ����פˤʤ�ޤ�.</para>
   
-<para><emphasis><emphasis remap=bf>���줳������󥯤Υ���ǥޥ����������椹��ᥫ�˥��������Ǥ�.</emphasis></emphasis></para>
+<para><emphasis><emphasis remap="bf">���줳������󥯤Υ���ǥޥ����������椹��ᥫ�˥��������Ǥ�.</emphasis></emphasis></para>
   
 <para><filename>/etc/ppp/ppp.linkup</filename> �������Ū��̾������ꤵ��Ƥ��ʤ������,
 "MYADDR:" ���������ˤ��륳�ޥ�ɤ� (���줬���Ǥ���) �¹Ԥ��ޤ�.
@@ -1355,7 +1357,7 @@ FreeBSD 
   
 <para>�⤷���Υ����ɤ��ɤ���Ū�� FreeBSD �ȥ��󥿡��ͥåȤ�������륢����
 ppp ����³���뤳�Ȥ����Ǥ�����,
-<xref linkend="testing-the-network"> �ޤǿʤ�Ǥ�������.</para>
+<xref linkend="testing-the-network"/> �ޤǿʤ�Ǥ�������.</para>
   
 <para>PPP �ץ������򥪥�ǥޥ�ɥ⡼�ɤ�ư���������礭�������ΰ�Ĥ�,
 �ץ�����ब�������륨�ꥢ�ͥåȥ�� (LAN) ���¾�Υ����ƥ�֤� IP
@@ -1373,11 +1375,11 @@ ppp 
   
 <para>�ץ�����ब�ʲ��Υ��ޥ�ɤΤ����줫�ǵ�ư���줿�Ȥ��ޤ��礦.</para>
   
-<para><emphasis remap=tt># ppp interactive   (Interactive mode)</emphasis></para>
+<para><emphasis remap="tt"># ppp interactive   (Interactive mode)</emphasis></para>
   
 <para> �ޤ���</para>
   
-<para><emphasis remap=tt># ppp -auto demand  (Dial-on-Demand mode)</emphasis></para>
+<para><emphasis remap="tt"># ppp -auto demand  (Dial-on-Demand mode)</emphasis></para>
   
 <para>�����, �����ƥ�� FreeBSD �ޥ�����Ф���<emphasis>�Τ�</emphasis>,
 ���󥿡��ͥåȤ���³���줿������ơ������Ȥ��Ƥε�ǽ���󶡤���Ǥ��礦.</para>
@@ -1385,17 +1387,17 @@ ppp 
 <para>PPP �ץ������� LAN �λ񸻤ȥ��󥿡��ͥåȴ֤Υ����ȥ������Ȥ��Ƶ�ư����ˤ�,
 ����˰ʲ��Υ��ޥ�ɤΤ����줫����Ѥ��Ƥ�������.</para>
   
-<para><emphasis remap=tt># ppp -alias interactive   (Interactive mode)</emphasis></para>
+<para><emphasis remap="tt"># ppp -alias interactive   (Interactive mode)</emphasis></para>
   
 <para> �ޤ���</para>
   
-<para><emphasis remap=tt># ppp -auto -alias demand  (Dial-on-Demand mode)</emphasis></para>
+<para><emphasis remap="tt"># ppp -auto -alias demand  (Dial-on-Demand mode)</emphasis></para>
   
-<para>�ޤ�, <emphasis remap=tt>``alias enable yes''</emphasis> �Ȥ������ޥ�ɤ� ppp
+<para>�ޤ�, <emphasis remap="tt">``alias enable yes''</emphasis> �Ȥ������ޥ�ɤ� ppp
 ������ե�����ˤ���Ƥ�����ˡ��Ȥ뤳�Ȥ�Ǥ��ޤ�
 (�ܺ٤ˤĤ��Ƥ� man ������������).</para>
   
-<para><xref linkend="config-window-system"> �˿ʤ�Ǥ�,
+<para><xref linkend="config-window-system"/> �˿ʤ�Ǥ�,
 ���Τ��Ȥ�˺��ʤ��Ǥ����Ƥ�������.</para>
   
 </sect1>
@@ -1412,7 +1414,7 @@ LAN 
 �ƥΡ��ɤ�Ŭ�ڤ����ꤵ���ɬ�פ�����ޤ�.
 ���Υ��������� Windows ������ơ������Υ������륢�åץͥåȥ����
 ����ˡ�����������ΤǤϤ���ޤ���. ��������������ܤ��ʤ�,
-<ulink URL="http://www.aladdin.co.uk/techweb/">http://www.aladdin.co.uk/techweb/</ulink> �򤪴��ᤷ�ޤ�.</para>
+<ulink url="http://www.aladdin.co.uk/techweb/">http://www.aladdin.co.uk/techweb/</ulink> �򤪴��ᤷ�ޤ�.</para>
   
 
 <sect1>
@@ -1423,10 +1425,10 @@ Windows 95 
 FreeBSD �����ƥ����Ѥ���褦�ѹ���������ǺѤफ��Ǥ�.
 �ʲ��μ���Ƨ��Ǥ�������.</para>
   
-<para><emphasis remap=bf>Windows 95 �Ѥ� "hosts" �ե������Ĥ���</emphasis></para>
+<para><emphasis remap="bf">Windows 95 �Ѥ� "hosts" �ե������Ĥ���</emphasis></para>
   
 <para>LAN ���¾�� TCP/IP �����ƥ����³���뤿��ˤ�,
-<xref linkend="list-lan-hosts"> ��
+<xref linkend="list-lan-hosts"/> ��
 FreeBSD �����ƥ�˥��󥹥ȡ��뤷�� "hosts"
 �ե�����Ȥޤä���Ʊ����Τ�������Ƥ��ɬ�פ�����ޤ�.</para>
   
@@ -1440,7 +1442,7 @@ FreeBSD 
 </listitem>
 
 <listitem>
-<para>���ǥ�������������, <xref linkend="list-lan-hosts"> �� hosts
+<para>���ǥ�������������, <xref linkend="list-lan-hosts"/> �� hosts
 �ե�����˽񤤤Ƥ��륢�ɥ쥹�ȥ����ƥ�̾�����Ϥ��Ƥ�������.</para>
 </listitem>
 
@@ -1452,7 +1454,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>Windows 95 �� TCP/IP �ͥåȥ��������</emphasis></para>
+<para><emphasis remap="bf">Windows 95 �� TCP/IP �ͥåȥ��������</emphasis></para>
   
 <para>
 <itemizedlist>
@@ -1490,7 +1492,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>IP ���ɥ쥹���������</emphasis>
+<para><emphasis remap="bf">IP ���ɥ쥹���������</emphasis>
 <itemizedlist>
 
 <listitem>
@@ -1516,7 +1518,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>�����ȥ������ξ��������</emphasis></para>
+<para><emphasis remap="bf">�����ȥ������ξ��������</emphasis></para>
   
 <para>
 <itemizedlist>
@@ -1538,7 +1540,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>DNS ���������</emphasis></para>
+<para><emphasis remap="bf">DNS ���������</emphasis></para>
   
 <para>���Υ����ɤǤ�, ���󥿡��ͥåȥ����ӥ��ץ��Х��� (ISP)
 �����Ѳ�ǽ�ʥɥᥤ��͡��ॵ���� (�ޤ��ϡ�DNS �����С�)
@@ -1583,16 +1585,16 @@ DNS 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>����¾�� Windows 95 �� TCP/IP ���ץ����</emphasis></para>
+<para><emphasis remap="bf">����¾�� Windows 95 �� TCP/IP ���ץ����</emphasis></para>
   
 <para>���Υ����ɤǤ�,
 �־ܺ�����ס�WINS ����ס֥Х���ɡפΥ��֤β��ˤ�������Ͻ��פǤϤ���ޤ���.</para>
   
 <para>Windows Internet Naming Service ("WINS") ����Ѥ������ʤ�,
-<ulink URL="http://www.localnet.org/">http://www.localnet.org/</ulink> �عԤäƤߤޤ��礦. WINS ������,
+<ulink url="http://www.localnet.org/">http://www.localnet.org/</ulink> �عԤäƤߤޤ��礦. WINS ������,
 �ä˥��󥿡��ͥå�Ʃ��ǤΥե����붦ͭ�˴ؤ���ܺ٤ʾ��������ޤ�.</para>
   
-<para><emphasis remap=bf>�����</emphasis>
+<para><emphasis remap="bf">�����</emphasis>
 <itemizedlist>
 
 <listitem>
@@ -1622,13 +1624,13 @@ Windows NT 
 Windows 95 �Ȼ��Ƥ��ޤ�.</para>
   
 <para>�����Ǥμ��� Windows NT 4.0 ������ơ�������ѤΤ�ΤǤ���,
-��§Ū�ˤ� NT 3.5x �Ǥ�Ʊ���Ǥ�. Windows NT 3.5<emphasis remap=it>x</emphasis> ����Ѥ��Ƥ�����,
+��§Ū�ˤ� NT 3.5x �Ǥ�Ʊ���Ǥ�. Windows NT 3.5<emphasis remap="it">x</emphasis> ����Ѥ��Ƥ�����,
 ��Windows for Workgroups ������פ򻲾Ȥ���Τ��ɤ����⤷��ޤ���.
 NT 3.5 �� WfW �ϥ桼�����󥿥ե�������Ʊ��������Ǥ�.</para>
   
 <para>���μ���Ƨ��Ǥ�������.</para>
   
-<para><emphasis remap=bf>Windows NT �Ѥ� "hosts" �ե������Ĥ���</emphasis></para>
+<para><emphasis remap="bf">Windows NT �Ѥ� "hosts" �ե������Ĥ���</emphasis></para>
   
 <para>LAN ���¾�� TCP/IP �����ƥ����³���뤿��ˤ�, 3.4 �Ϥ�
 FreeBSD �����ƥ�˥��󥹥ȡ��뤷�� "hosts"
@@ -1656,7 +1658,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>Windows NT �� TCP/IP �ͥåȥ��������</emphasis></para>
+<para><emphasis remap="bf">Windows NT �� TCP/IP �ͥåȥ��������</emphasis></para>
   
 <para>
 <itemizedlist>
@@ -1699,7 +1701,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>IP ���ɥ쥹������</emphasis></para>
+<para><emphasis remap="bf">IP ���ɥ쥹������</emphasis></para>
   
 <para>�������ͥåȥ��󥿥ե��������֥����ץ��ץܥå��������ɽ������Ƥ��뤫�ɤ����Τ���Ƥ�������.
 ɽ������Ƥ��ʤ����,
@@ -1726,7 +1728,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>�����ȥ������ξ��������</emphasis></para>
+<para><emphasis remap="bf">�����ȥ������ξ��������</emphasis></para>
   
 <para>��������Υͥåȥ���Ǥ�, FreeBSD
 �ޥ��󤬥��󥿡��ͥåȤؤΥ����ȥ������Ȥ���Ư��,
@@ -1746,7 +1748,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>DNS ������</emphasis></para>
+<para><emphasis remap="bf">DNS ������</emphasis></para>
   
 <para>�����֤��ޤ���, ���Υ����ɤǤ�, ���󥿡��ͥåȥ����ӥ��ץ��Х��� (ISP)
 �����Ѳ�ǽ�ʥɥᥤ��͡��ॵ���� (�ޤ��ϡ� DNS �����С�)
@@ -1783,16 +1785,16 @@ DNS 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>����¾�� Windows NT �� TCP/IP ���ץ����</emphasis></para>
+<para><emphasis remap="bf">����¾�� Windows NT �� TCP/IP ���ץ����</emphasis></para>
   
 <para>���Υ����ɤǤ�,
 "WINS Address" �� "Routing" ���֤β��ˤ�������ϻ��Ѥ��ޤ���.</para>
   
 <para>Windows Internet Naming Service ("WINS") ����Ѥ������ʤ�,
-<ulink URL="http://www.localnet.org/">http://www.localnet.org/</ulink> �عԤäƤߤޤ��礦. WINS ������,
+<ulink url="http://www.localnet.org/">http://www.localnet.org/</ulink> �عԤäƤߤޤ��礦. WINS ������,
 �ä˥��󥿡��ͥå�Ʃ��ǤΥե����붦ͭ�˴ؤ���ܺ٤ʾ��������ޤ�.</para>
   
-<para><emphasis remap=bf>�����</emphasis>
+<para><emphasis remap="bf">�����</emphasis>
 <itemizedlist>
 
 <listitem>
@@ -1821,12 +1823,12 @@ DNS 
 Microsoft TCP/IP-32
 �ɥ饤�Хǥ�������������ơ������˥��󥹥ȡ��뤵��Ƥ���ɬ�פ�����ޤ�.
 TCP/IP �ɥ饤�Ф� WfW �� CD / �ǥ������ˤ���°���Ƥ��ޤ���.
-���ԡ��� <ulink URL="ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip/">ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip/</ulink>
+���ԡ��� <ulink url="ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip/">ftp://ftp.microsoft.com:/peropsys/windows/public/tcpip/</ulink>
 ����������ޤ�.</para>
   
 <para>TCP/IP �ɥ饤�Ф��ɤ߹�����顢���μ�³����Ƨ��Ǥ�������.</para>
   
-<para><emphasis remap=bf>Windows for Workgroups �Ѥ� "hosts" �ե������Ĥ���</emphasis></para>
+<para><emphasis remap="bf">Windows for Workgroups �Ѥ� "hosts" �ե������Ĥ���</emphasis></para>
   
 <para>LAN ���¾�� TCP/IP �����ƥ����³���뤿��ˤ�, 3.4 �Ϥ�
 FreeBSD �����ƥ�˥��󥹥ȡ��뤷�� "hosts"
@@ -1852,7 +1854,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>Windows for Workgroups �� TCP/IP �ͥåȥ��������</emphasis></para>
+<para><emphasis remap="bf">Windows for Workgroups �� TCP/IP �ͥåȥ��������</emphasis></para>
   
 <para>
 <itemizedlist>
@@ -1874,7 +1876,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>Windows for Workgroups �� IP ���ɥ쥹������</emphasis></para>
+<para><emphasis remap="bf">Windows for Workgroups �� IP ���ɥ쥹������</emphasis></para>
   
 <para>�������������ͥåȥ��󥿥ե������� "Adapter"
 �ꥹ�Ȥ����򤵤�Ƥ��뤫�ɤ�����ǧ���Ƥ�������. ���򤵤�Ƥ��ʤ����,
@@ -1900,7 +1902,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>�����ȥ������ξ��������</emphasis></para>
+<para><emphasis remap="bf">�����ȥ������ξ��������</emphasis></para>
   
 <para>��������Υͥåȥ���Ǥ�, FreeBSD
 �ޥ��󤬥��󥿡��ͥåȤؤΥ����ȥ������Ȥ���Ư��,
@@ -1918,7 +1920,7 @@ FreeBSD 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>DNS ������</emphasis></para>
+<para><emphasis remap="bf">DNS ������</emphasis></para>
   
 <para>�����֤��ޤ���, ���Υ����ɤǤ�, ���󥿡��ͥåȥ����ӥ��ץ��Х��� (ISP)
 �����Ѳ�ǽ�ʥɥᥤ��͡��ॵ���� (�ޤ��ϡ�DNS �����С�)
@@ -1952,7 +1954,7 @@ DNS 
 </itemizedlist>
 </para>
   
-<para><emphasis remap=bf>�����</emphasis>
+<para><emphasis remap="bf">�����</emphasis>
 <itemizedlist>
 
 <listitem>
@@ -2051,7 +2053,7 @@ FreeBSD 
 </orderedlist>
 </para>
   
-<para> '<emphasis remap=tt>ee</emphasis>' ���ǥ�����Ȥä�, �ʲ������Ƥ�
+<para> '<emphasis remap="tt">ee</emphasis>' ���ǥ�����Ȥä�, �ʲ������Ƥ�
 <filename>/etc/namedb/named.boot</filename> �ե������Ĥ��äƤ�������.
 <informalexample>
 <screen>; boot file for mini-name server
@@ -2077,7 +2079,7 @@ primary   my.domain.		mydomain.db</screen>
 </listitem>
 
 <listitem>
-<para><emphasis remap=tt>cache . named.root</emphasis>
+<para><emphasis remap="tt">cache . named.root</emphasis>
 </para>
 
 <para>�͡��ॵ���Ф˥��󥿡��ͥåȤ� "Top-Level" �� DNS �����Фΰ�����
@@ -2106,7 +2108,7 @@ primary   my.domain.		mydomain.db</screen>
 (LAN) ��<emphasis>���٤Ƥ�</emphasis>�����ƥ�Υۥ���̾�� IP ���ɥ쥹������ˤ�����ΤǤ�.</para>
   
 <para><emphasis>���Υե�����ǻ��Ѥ���Ƥ���ʸ�ξܺ٤������ˤĤ��Ƥ�,
-<emphasis remap=tt>named</emphasis> �� man �򻲾Ȥ��Ƥ�������.</emphasis></para>
+<emphasis remap="tt">named</emphasis> �� man �򻲾Ȥ��Ƥ�������.</emphasis></para>
   
 <para>���Υ�������Υͥåȥ���� DNS �����Ф���������¹Ԥ�
 <filename>/etc/namedb/mydomain.db</filename> �ե������, ���Τ褦�����Ƥˤʤ�Ǥ��礦.
@@ -2175,7 +2177,7 @@ $ORIGIN 0.0.127.IN-ADDR.ARPA
 �ʲ��Τ褦�� '<filename>/etc/rc.conf</filename>'
 �����Ѥ���������ѹ����뤳�Ȥ��Ǥ��ޤ�.</para>
   
-<para>'<emphasis remap=tt>ee</emphasis>' ���ǥ�����Ȥä� <filename>/etc/rc.conf</filename> ���ɤ߹���,
+<para>'<emphasis remap="tt">ee</emphasis>' ���ǥ�����Ȥä� <filename>/etc/rc.conf</filename> ���ɤ߹���,
 ���Τ褦�ʥ���������������ޤ� 40 �Ԥۤɲ��äƤ�������.
 <informalexample>
 <screen>---
@@ -2221,7 +2223,7 @@ named_flags="-b /etc/namedb/named.boot" # Flags to named (if enabled).
 ��󥯤λ��ѤˤĤ��Ƥ����Υ�������������󶡤��뤳�ȤϤǤ���ΤǤ�.</para>
   
 <para>(FreeBSD �����ƥ���ꥻ���奢���ˤ�����ˡ���Τꤿ������
-'<emphasis remap=tt>man ipfw</emphasis>' ���Ƥ�������)</para>
+'<emphasis remap="tt">man ipfw</emphasis>' ���Ƥ�������)</para>
   
 <para>PPP ���ǻ��ѤǤ����͡��ʥե��륿�Ȥ�������ˡ�ˤĤ��Ƥδ�����������
 PPP �� man �ˤ���ޤ�.</para>
@@ -2230,7 +2232,7 @@ PPP 
 <itemizedlist>
 
 <listitem>
-<para><emphasis remap=tt>afilter</emphasis> - �������������� (�ޤ��� "Keep Alive") �Υե��륿
+<para><emphasis remap="tt">afilter</emphasis> - �������������� (�ޤ��� "Keep Alive") �Υե��륿
 </para>
 
 <para>����ե�������� <literal>set timeout=</literal>
diff --git a/ja_JP.eucJP/share/sgml/books.ent b/ja_JP.eucJP/share/sgml/books.ent
deleted file mode 100644
index 7e1a17887d..0000000000
--- a/ja_JP.eucJP/share/sgml/books.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
-%authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA">
-%teams-ja;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
-%mailing-lists-ja;
-<!--
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
--->
-<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA">
-%newsgroups-ja;
-<!--
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
--->
-<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%trademarks-ja;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
diff --git a/ja_JP.eucJP/share/sgml/catalog b/ja_JP.eucJP/share/sgml/catalog
index 6fb9df840f..f2d4a3d64b 100644
--- a/ja_JP.eucJP/share/sgml/catalog
+++ b/ja_JP.eucJP/share/sgml/catalog
@@ -4,15 +4,12 @@
   -- $FreeBSD$
   --
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA"
+	"entities.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN" 
-       "articles.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" 
-       "books.ent"
-
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
 	"mailing-lists.ent"
 
diff --git a/ja_JP.eucJP/share/sgml/articles.ent b/ja_JP.eucJP/share/sgml/entities.ent
similarity index 94%
rename from ja_JP.eucJP/share/sgml/articles.ent
rename to ja_JP.eucJP/share/sgml/entities.ent
index a2b7182fef..679ba28ec6 100644
--- a/ja_JP.eucJP/share/sgml/articles.ent
+++ b/ja_JP.eucJP/share/sgml/entities.ent
@@ -34,3 +34,5 @@
 %trademarks;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
 %urls;
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+%glossary;
diff --git a/ja_JP.eucJP/share/sgml/jauthors.ent b/ja_JP.eucJP/share/sgml/jauthors.ent
deleted file mode 100644
index 4cb8809cfa..0000000000
--- a/ja_JP.eucJP/share/sgml/jauthors.ent
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD Japanese Documentation Project
-
-     Original revision: 
-     $FreeBSD$
-
-     Names and email address of Japanese local contributing authors and 
-     castle.jp.freebsd.org CVS committers.
-     Entity names for committers on castle should be the same as their login
-     names on castle.jp.FreeBSD.ORG.
-
-     Use these entities when referencing people.
-
-     Please keep this list in alphabetical order by entity names.
--->
-
-<!ENTITY a.jp.arimura "ͭ¼ ���� <email>arimura@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.candy  "���� �ҹ� <email>candy@fct.kgc.co.jp</email>">
-
-<!ENTITY a.jp.condle "�� ľǷ <email>mori@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.g92k0323 "����  ���� <email>g92k0323@cfi.waseda.ac.jp</email>">
-
-<!ENTITY a.jp.graphite "���� ���� <email>graphite@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.hino "���� ���� <email>hino@ccm.cl.nec.co.jp</email>">
-
-<!ENTITY a.jp.ikuo "���� ���� <email>ikuo@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.iwasaki "��� �� <email>iwasaki@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.katsu "������ �� <email>katsu@baum.kiyose.tokyo.jp</email>">
-
-<!ENTITY a.jp.kimura "��¼ ��ȼ <email>kimura@netlab.is.tsukuba.ac.jp</email>">
-
-<!ENTITY a.jp.kiroh "�Ϥ�� ������ <email>kiroh@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.kmiyakoda "���ġ���Ϻ <email>kmiyakoda@ctn.co.jp</email>">
-
-<!ENTITY a.jp.masaki  "���� ���� <email>masaki@po.iijnet.or.jp</email>">
-
-<!ENTITY a.jp.mihoko "���� ����� <email>Mihoko_Tanaka@yokogawa.co.jp</email>">
-
-<!ENTITY a.jp.mita "���� ��Ϻ <email>mita@jp.FreeBSD.ORG</email>">
-
-<!ENTITY a.jp.miyasita "�ܲ� ���� <email>miyasita@hashilab.ee.ous.ac.jp</email>">
-
-<!--
-<!ENTITY a.jp.motoyuki "���� ��Ƿ <email>motoyuki@jp.FreeBSD.org</email>">
-authors.sgml �����äƤ���Τǥ����ȥ�����
--->
-
-<!ENTITY a.jp.mrt "��餿���夦�������� <email>mrt@mickey.ai.kyutech.ac.jp</email>">
-
-<!ENTITY a.jp.nakai "��� ���� <email>nakai@mlab.t.u-tokyo.ac.jp</email>">
-
-<!ENTITY a.jp.nao "���� ľ�� <email>nao@tom-yam.or.jp</email>">
-
-<!ENTITY a.jp.saeki "���� � <email>saeki@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.shou "���� ���� <email>shou@kt.rim.or.jp</email>">
-
-<!ENTITY a.jp.simokawa "���� ���� <email>simokawa@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.sugimura "��¼ ���� <email>sugimura@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.tmaruya "�ݻ� ��� <email>tmaruya@nnc.or.jp</email>">
-
-<!ENTITY a.jp.tomo "���� ��ͺ <email>tomo@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.ts "���� ���� <email>ts@icu.ac.jp</email>">
-
-<!ENTITY a.jp.y-koga "�����褦�������� <email>y-koga@ccs.mt.nec.co.jp</email>">
-
-<!ENTITY a.jp.yasu "���� ���� <email>yasu@hike.te.chiba-u.ac.jp</email>">
-
-<!ENTITY a.jp.yoshiaki "���� ��� <email>yoshiaki@kt.rim.or.jp</email>">
-
-<!ENTITY a.jp.yuki "���� ���� <email>yuki@jp.FreeBSD.org</email>">
-
-<!--
-     Names of FreeBSD mailing list in Japan.  If we refer many mailing
-     lists in Japan, create jmailing-lists.ent file and store them in
-     it.
--->
-
-<!ENTITY a.jp.doc-jp "���ܸ�ɥ�����ơ������ץ��������� <email>doc-jp@jp.FreeBSD.org</email>">
-
-<!ENTITY a.jp.users-jp "FreeBSD users-jp �᡼��󥰥ꥹ�� <email>FreeBSD-users-jp@jp.FreeBSD.org</email>">