diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index f8036854de..61045b3035 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -2242,7 +2242,7 @@
       </biblioentry>
 
       <biblioentry id="biblio-kernighan">
-        <abbrev>Kernighan & Pike, 1984</abbrev>
+        <abbrev>Kernighan &amp; Pike, 1984</abbrev>
 
         <title>The UNIX Programming Environment</title>
 
@@ -2299,7 +2299,7 @@
       </biblioentry>
 
       <biblioentry id="biblio-mckusick-2">
-        <abbrev>McKusick & Karels, 1988</abbrev>
+        <abbrev>McKusick &amp; Karels, 1988</abbrev>
 
         <biblioset relation="article">
           <title>Design of a General Purpose Memory Allocator for the 4.3BSD
@@ -2393,7 +2393,7 @@
       </biblioentry>
 
       <biblioentry id="biblio-rosenblum">
-        <abbrev>Rosenblum & Ousterhout, 1992</abbrev>
+        <abbrev>Rosenblum &amp; Ousterhout, 1992</abbrev>
 
         <biblioset relation="article">
           <title>The Design and Implementation of a Log-Structured File
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index 142989c7a2..b913f435ab 100644
--- a/ja_JP.eucJP/books/faq/book.xml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -3596,11 +3596,11 @@ diff -u -r1.60.2.1 -r1.60.2.2
      if (verbose >= 2)
  	printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
 +#endif
-     if (sc->config & PSM_CONFIG_RESOLUTION) {
+     if (sc->config &amp; PSM_CONFIG_RESOLUTION) {
          sc->mode.resolution
  	    = set_mouse_resolution(sc->kbdc,
--	        (sc->config & PSM_CONFIG_RESOLUTION) - 1);
-+				   (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+-	        (sc->config &amp; PSM_CONFIG_RESOLUTION) - 1);
++				   (sc->config &amp; PSM_CONFIG_RESOLUTION) - 1);
 +    } else if (sc->mode.resolution >= 0) {
 +	sc->mode.resolution
 +	    = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
@@ -3611,7 +3611,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
 +    set_mouse_scaling(sc->kbdc, 1);
 
      /* request a data packet and extract sync. bits */
-     if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
+     if (get_mouse_status(sc->kbdc, stat, 1, 3) &lt; 3) {</programlisting>
 
           <para>FreeBSD 3.2
             ��꿷������꡼���ǤϤ������ư���Ϥ��Ǥ���
@@ -4980,7 +4980,7 @@ Checking for Plug-n-Play devices...
 Card assigned CSN #1
 Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
 PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug &amp; Play Modem
 
 Logical Device ID: PMC2430 0x3024a341 #0
         Device supports I/O Range Check
@@ -5998,7 +5998,7 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx</screen>
           <para>�����ƥब�����ư���Ƥ���ʤ�С�
             <filename>/etc/periodic.conf</filename> ��
             <literal>weekly_status_pkg_enable="YES"</literal> ��
-            ���ꤷ�ơ�&man.periodic.8 �����ƥ�ˤ�ä��轵������ɬ�פ� ports
+            ���ꤷ�ơ�&man.periodic.8; �����ƥ�ˤ�ä��轵������ɬ�פ� ports
             �ΰ����������Ǥ��ޤ���</para>
         </answer>
       </qandaentry>
@@ -12096,7 +12096,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
             Base</ulink> �ˤ��롢
             �ֹ� <quote>Q158474 - Windows TCPIP Registry Entries</quote>��
             ������ֹ�
-            <quote>Q120642 - TCPIP & NBT Configuration Parameters for Windows NT</quote>
+            <quote>Q120642 - TCPIP &amp; NBT Configuration Parameters for Windows NT</quote>
             �򻲾Ȥ��Ƥ���������
           </para>
 
diff --git a/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
index a445bd6814..3682257ca5 100644
--- a/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
index ebfcd50583..f4c9d5de15 100644
--- a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
index 8bab5e67ef..c556097fe0 100644
--- a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
index b01b5c2894..f2aeaae77b 100644
--- a/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
index 6d98f02ddc..a58ad4a427 100644
--- a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
index c5073db9e4..dbb34be62c 100644
--- a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
index b1a42a17cf..374e691101 100644
--- a/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
index 07a8f09690..9aef3181e4 100644
--- a/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- 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.xml b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
index 6b3deda627..2bf75efc2d 100644
--- a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 3e390930ea..25b9a8b818 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -320,42 +320,56 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc.tmp \
-		mirrors-cvsup:::mirrors.xml.cvsup.inc.tmp \
-		eresources:::eresources.xml.www.inc.tmp
+XMLDOCS=	lastmod:::mirrors.lastmod.inc \
+		mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+		mirrors-ftp:::mirrors.xml.ftp.inc \
+		mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
+		mirrors-cvsup:::mirrors.xml.cvsup.inc \
+		eresources-index:::eresources.xml.www.index.inc \
+		eresources:::eresources.xml.www.inc
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
 NO_TIDY.DEFAULT=	yes
 
+
+PARAMS.lastmod+=	--param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+=	--param 'type' "'ftp'" \
+				--param 'proto' "'ftp'" \
+				--param 'target' "'index'"
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
 			--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+=	--param 'type' "'cvsup'" \
+				--param 'proto' "'cvsup'" \
+				--param 'target' "'index'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
 			--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+=	--param 'type' "'www'" \
+				--param 'proto' "'http'" \
+				--param 'target' "'index'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
 			--param 'target' "'handbook/eresources/chapter.xml'"
 
-SRCS+=		mirrors.xml.ftp.inc \
+SRCS+=		mirrors.lastmod.inc \
+		mirrors.xml.ftp.inc \
+		mirrors.xml.ftp.index.inc \
 		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
-CLEANFILES+=	mirrors.xml.ftp.inc mirrors.xml.ftp.inc.tmp \
-		mirrors.xml.cvsup.inc mirrors.xml.cvsup.inc.tmp \
-		eresources.xml.www.inc eresources.xml.www.inc.tmp
+CLEANFILES+=	mirrors.lastmod.inc \
+		mirrors.xml.ftp.inc \
+		mirrors.xml.ftp.index.inc \
+		mirrors.xml.cvsup.inc \
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+	mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+	eresources.xml.www.inc eresources.xml.www.index.inc
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
-
-.for p in ftp cvsup
-mirrors.xml.${p}.inc: mirrors.xml.${p}.inc.tmp
-	${CP} ${.ALLSRC} ${.TARGET}
-#	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-#	    < $@.tmp > $@ || (${RM} -f $@ && false)
-.endfor
-
-eresources.xml.www.inc: eresources.xml.www.inc.tmp
-	${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.xml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
index c723da61ec..f009855aa3 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.xml b/ja_JP.eucJP/books/handbook/basics/chapter.xml
index b5c9630b9a..fedbda78c2 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.xml b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
index dcecb9cff9..ae2c0a083f 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/book.xml b/ja_JP.eucJP/books/handbook/book.xml
index 6301d20b27..df7ea5494b 100644
--- a/ja_JP.eucJP/books/handbook/book.xml
+++ b/ja_JP.eucJP/books/handbook/book.xml
@@ -247,13 +247,10 @@
     &chap.security;
 <!--
     &chap.jails;
--->
     &chap.mac;
-<!--
     &chap.audit;
 -->
     &chap.disks;
-    &chap.geom;
 <!--
     &chap.filesystems;
     &chap.vinum;
@@ -307,8 +304,10 @@
     &chap.serialcomms;
     &chap.ppp-and-slip;
     &chap.mail;
+<!--
     &chap.network-servers;
     &chap.firewalls;
+-->
     &chap.advanced-networking;
   </part>
 
diff --git a/ja_JP.eucJP/books/handbook/boot/chapter.xml b/ja_JP.eucJP/books/handbook/boot/chapter.xml
index 821d8083c0..5c39217ace 100644
--- a/ja_JP.eucJP/books/handbook/boot/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index 7b6b3903ad..84ce97db68 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -117,7 +117,7 @@
       <sect3>
 	<title>&os;/&arch.i386;</title>
 
-	<para>&os;/&arch.i386 �������ƥ�����ϡ�
+	<para>&os;/&arch.i386; �������ƥ�����ϡ�
 	  486 �ʾ�Υץ����å��ȡ�
 	  ���ʤ��Ȥ� 64&nbsp;MB �� RAM ��ɬ�פǤ���
 	  �Ǿ��Υ��󥹥ȡ���Ǥϡ�
@@ -161,7 +161,7 @@
 	  ʣ���� CPU ����ĥ���ԥ塼���� SMP ���б����Ƥ��ޤ���</para>
 
 	<para>32-bit �����ͥ�ϡ�RAM �κǽ�� 2&nbsp;GB ���������ѤǤ��ޤ���
-	  Blue & White PowerMac G3 �Ǥϡ�&firewire; ���б����Ƥ��ޤ���</para>
+	  Blue &amp; White PowerMac G3 �Ǥϡ�&firewire; ���б����Ƥ��ޤ���</para>
       </sect3>
 
       <sect3>
@@ -2592,7 +2592,7 @@ login:</screen>
     </sect2>
 
     <sect2>
-      <title>�ȥ�֥륷�塼�ƥ��󥰤˴ؤ��� Q & A</title>
+      <title>�ȥ�֥륷�塼�ƥ��󥰤˴ؤ��� Q &amp; A</title>
 
       <qandaset>
 	<qandaentry>
diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent
index 1505851dc2..a8690771db 100644
--- a/ja_JP.eucJP/books/handbook/chapters.ent
+++ b/ja_JP.eucJP/books/handbook/chapters.ent
@@ -14,232 +14,57 @@
      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.xml">
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 
 <!-- Part One -->
-<![%chap.introduction;[
   <!ENTITY chap.introduction	SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
   <!ENTITY chap.install		SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
   <!ENTITY chap.bsdinstall	SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
   <!ENTITY chap.basics		SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
   <!ENTITY chap.ports		SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
   <!ENTITY chap.x11		SYSTEM "x11/chapter.xml">
-]]>
 
 <!-- Part Two -->
-<![%chap.desktop;[
   <!ENTITY chap.desktop		SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
   <!ENTITY chap.multimedia	SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
   <!ENTITY chap.kernelconfig	SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
   <!ENTITY chap.printing	SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
   <!ENTITY chap.linuxemu	SYSTEM "linuxemu/chapter.xml">
-]]>
 
 <!-- Part Three -->
-<![%chap.config;[
   <!ENTITY chap.config		SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
   <!ENTITY chap.boot		SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
   <!ENTITY chap.users		SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
   <!ENTITY chap.security	SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
   <!ENTITY chap.jails		SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
-  <!ENTITY chap.mac		SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
   <!ENTITY chap.audit		SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
   <!ENTITY chap.disks		SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
-  <!ENTITY chap.geom		SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
   <!ENTITY chap.filesystems	SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
   <!ENTITY chap.vinum		SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
   <!ENTITY chap.l10n		SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
   <!ENTITY chap.cutting-edge	SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
   <!ENTITY chap.dtrace		SYSTEM "dtrace/chapter.xml">
-]]>
 
 <!-- Part Four -->
-<![%chap.serialcomms;[
   <!ENTITY chap.serialcomms	SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
   <!ENTITY chap.ppp-and-slip	SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
   <!ENTITY chap.mail		SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
-  <!ENTITY chap.network-servers	SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
-  <!ENTITY chap.firewalls	SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
   <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.xml">
-]]>
 
 <!-- Part Five (appendices) -->
-<![%chap.mirrors;[
-  <!ENTITY chap.mirrors		SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
-  <!ENTITY chap.mirrors.ftp.inc	SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
-  <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
+  <!ENTITY chap.mirrors         SYSTEM "mirrors/chapter.xml">
+  <!ENTITY chap.mirrors.lastmod.inc         SYSTEM "mirrors.lastmod.inc">
+  <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+  <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+  <!ENTITY chap.mirrors.cvsup.index.inc       SYSTEM "mirrors.xml.cvsup.index.inc">
+  <!ENTITY chap.mirrors.cvsup.inc       SYSTEM "mirrors.xml.cvsup.inc">
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
-  <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
-  <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
+  <!ENTITY chap.eresources      SYSTEM "eresources/chapter.xml">
+  <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
+  <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
   <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
-]]>
-<![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.xml">
-]]>
+  <!ENTITY chap.index		"">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
-
-<!-- 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.xml b/ja_JP.eucJP/books/handbook/colophon.xml
index f0bd815755..c39677f324 100644
--- a/ja_JP.eucJP/books/handbook/colophon.xml
+++ b/ja_JP.eucJP/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/config/chapter.xml b/ja_JP.eucJP/books/handbook/config/chapter.xml
index fbbb32a03c..9b9f81fe1e 100644
--- a/ja_JP.eucJP/books/handbook/config/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -372,7 +372,7 @@ stop)
         kill -9 `cat /var/run/foobar.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" >&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
index 3d68eef8b4..0620296357 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -1174,81 +1174,6 @@ Fetching 133 new ports or files... done.</screen>
 	<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
       </sect3>
     </sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
-    <sect2 id="docsnap">
-      <sect2info>
-	<authorgroup>
-	  <author>
-	    <firstname>Pav</firstname>
-	    <surname>Lucistnik</surname>
-	    <contrib>Based on information provided by </contrib>
-	  </author>
-	</authorgroup>
-      </sect2info>
-
-      <title>Using Docsnap</title>
-
-      <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
-      <indexterm>
-	<primary>Docsnap</primary>
-	<see>Updating and Upgrading</see>
-      </indexterm>
-
-      <para><application>Docsnap</application> is an &man.rsync.1;
-	repository for updating installed &os; Documentation in a
-	relatively easy and fast way.  A
-	<quote><application>Docsnap</application> server</quote> tracks
-	the documentation sources, and builds them in HTML format every
-	hour.  The <filename role="package">textproc/docproj</filename>
-	is unneeded with <application>Docsnap</application> as only
-	patches to the built documentation exist.</para>
-
-      <para>The only requirement for using this technique is
-	the <filename role="package">net/rsync</filename> port or
-	package.  To add it, use the following command:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-	<para><application>Docsnap</application> has been originally
-	  developed for updating documentation installed
-	  to <filename class="directory">/usr/share/doc</filename>, but
-	  the following examples could be adapted for other directories
-	  as well.  For user directories, it does not require
-	  <username>root</username> privileges.</para>
-      </note>
-
-      <para>To update the documentation set, issue the following
-	command:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <note>
-	<para>There is only one <application>Docsnap</application>
-	  server at the moment;
-	  the <hostid>docsnap.sk.FreeBSD.org</hostid> shown
-	  above.</para>
-      </note>
-
-      <para>Do not use the <option>--delete</option> flag here as there
-	are some items installed
-	into <filename class="directory">/usr/share/doc</filename>
-	during <command>make installworld</command>, which would
-	accidentally be removed.  To clean up, use this command
-	instead:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <para>If a subset of documentation needs to be updated, for
-	example, the English documentation only, the following command
-	should be used:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
-    </sect2>
-]]>
   </sect1>
 
   <sect1 id="current-stable">
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
index b86d00f0ee..fe8a1314cf 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -270,7 +270,7 @@
       <para>&os; �Ѥ� &adobe; &flash; �ץ饰������󶡤���Ƥ��ޤ���
 	�������ʤ��顢Linux �С������Υץ饰�����¹Ԥ��뤿��Υ��եȥ������쥤�� (wrapper) ��¸�ߤ��ޤ���
 	���� wrapper �ϡ�&adobe; &acrobat; �ץ饰�����
-	&realplayer �ץ饰����ʤɤˤ��б����Ƥ��ޤ���</para>
+	&realplayer; �ץ饰����ʤɤˤ��б����Ƥ��ޤ���</para>
 
       <para>���Ѥ��Ƥ��� &os; �ΥС������ˤ�ä�ɬ�פʺ�Ȥϰۤʤ�ޤ���</para>
 
diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.xml b/ja_JP.eucJP/books/handbook/disks/chapter.xml
index 0f688934d3..5668a1f3f3 100644
--- a/ja_JP.eucJP/books/handbook/disks/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -1319,7 +1319,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	  <para>���� <filename>/dev</filename> ���Υ���ȥ�� (��)
 	    ��������ʤ���Фʤ�ޤ��󡣼��Υ��ޥ�ɤǤ����Ԥ��ޤ���</para>
 
-	  <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
+	  <screen>&prompt.root; <userinput>cd /dev &amp;&amp; ./MAKEDEV "fd*"</userinput></screen>
 	</sect4>
 
 	<sect4>
@@ -1935,9 +1935,9 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	���Ѥ��ƥ�⡼�ȥơ��ץɥ饤�֤˥ǡ��������뤳�Ȥ��Ǥ��ޤ���</para>
 
       <screen>&prompt.root; <userinput>for f in <replaceable>directory_list; do</replaceable></userinput>
-<userinput>find $f >> backup.list</userinput>
+<userinput>find $f &gt;&gt; backup.list</userinput>
 <userinput>done</userinput>
-&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>user</replaceable>@<replaceable>host</replaceable> "cat > <replaceable>backup_device</replaceable>"</userinput></screen>
+&prompt.root; <userinput>cpio -v -o --format=newc &lt; backup.list | ssh <replaceable>user</replaceable>@<replaceable>host</replaceable> "cat &gt; <replaceable>backup_device</replaceable>"</userinput></screen>
 
       <para><replaceable>directory_list</replaceable>
 	�ϥХå����åפ������ǥ��쥯�ȥ�Υꥹ�Ȥǡ�
@@ -2147,7 +2147,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	<example>
 	  <title>�֡��ȥե��åԡ���������륹����ץ�</title>
 
-	  <programlisting><![ CDATA [#!/bin/sh
+	  <programlisting><![CDATA[#!/bin/sh
 #
 # create a restore floppy
 #
@@ -2275,7 +2275,7 @@ cd /
 #
 # create minimum file system table
 #
-cat > /mnt/etc/fstab <<EOM
+cat &gt; /mnt/etc/fstab &lt;&lt;EOM
 /dev/fd0a    /    ufs    rw  1  1
 EOM
 
@@ -2361,13 +2361,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
 	  �ɤΤ褦����ͳ�ǺƤӻ��Τ��������ꡢ�ǡ����������뤫�狼��ޤ���
 	  ����˿����֤��񤹤��Ȥǡ��塹�κ��񤫤�ߤ��ޤ���</para>
       </sect3>
-
-<![ %not.published; [
-      <sect3>
-	<title>* �����к��򤷤Ƥ��ޤ���Ǥ�����
-	  �ɤ������餤���Ǥ��礦��?</title>
-      </sect3>
-]]>
     </sect2>
   </sect1>
 
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.xml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
index 7dd701845b..05b9248a7b 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -1519,6 +1519,10 @@
   <sect1 id="eresources-web">
     <title>World Wide Web ������</title>
 
+    &chap.eresources.www.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.eresources.www.inc;
   </sect1>
 
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index eb08fabebe..dab56b7d19 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -111,7 +111,7 @@
       <sect3>
 	<title>&os;/&arch.i386; ����� &os;/&arch.pc98;</title>
 
-	<para>&os;/&arch.i386 �� &os;/&arch.pc98 ��ξ���Υ������ƥ�����ϡ�
+	<para>&os;/&arch.i386; �� &os;/&arch.pc98; ��ξ���Υ������ƥ�����ϡ�
 	  486 �ʾ�Υץ����å��ȡ�
 	  ���ʤ��Ȥ� 24&nbsp;MB �� RAM ��ɬ�פǤ���
 	  �Ǿ��Υ��󥹥ȡ���Ǥϡ�
@@ -3059,7 +3059,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 	</mediaobject>
       </figure>
 
-      <para>�ͤ��ѹ������� &gui.ok �����򤷡�
+      <para>�ͤ��ѹ������� &gui.ok; �����򤷡�
 	<keycap>Enter</keycap> �򲡤��ơ�
 	�����ƥॳ�󥽡���������˥塼����äƤ���������</para>
 
@@ -4228,7 +4228,7 @@ Please press any key to reboot.</screen>
     </sect2>
 
     <sect2>
-      <title>�ȥ�֥륷�塼�ƥ��󥰤˴ؤ��� Q & A</title>
+      <title>�ȥ�֥륷�塼�ƥ��󥰤˴ؤ��� Q &amp; A</title>
 
       <qandaset>
 	<qandaentry>
@@ -4368,7 +4368,7 @@ Please press any key to reboot.</screen>
 	    <para>���Ѥ��Ƥ��륫���ɤ� IRQ ����
 	      <filename>/boot/device.hints</filename>
 	      �ե�����ǻ��ꤵ�줿 IRQ �Ȱۤʤ��ǽ��������ޤ���
-	      &man.ed.4 �ɥ饤�Фϡ��ǥե���ȤǤ� <quote>���եȥ�����</quote> ����ե����졼�����
+	      &man.ed.4; �ɥ饤�Фϡ��ǥե���ȤǤ� <quote>���եȥ�����</quote> ����ե����졼�����
 	      (&ms-dos; �� EZSETUP �����Ϥ��줿��) ���Ѥ��ޤ���
 	      ���󥿡��ե������Υҥ�Ⱦ���� <literal>-1</literal> ����ꤷ�����ˤϡ�
 	      ���եȥ���������ե����졼������Ѥ����ޤ���</para>
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.xml b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
index 9d8c3eaa6f..9e4771cae0 100644
--- a/ja_JP.eucJP/books/handbook/introduction/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
index dcb68446f7..45ad47378b 100644
--- a/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
index 61da1b21e6..12c9a10630 100644
--- a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -831,7 +831,7 @@ options          NFS_ROOT          # NFS usable as /, requires NFSCLIENT</progra
 
     <para>�ꥢ�륿�����ĥ�� 1993 &posix; ���ɲä���ޤ�����
       Ports Collection ����Τ����Ĥ��Υ��ץꥱ�������
-      (���Ȥ��� <application>&staroffice</application>)
+      (���Ȥ��� <application>&staroffice;</application>)
       �Ϥ����ȤäƤ��ޤ���</para>
 
     <programlisting>options          KBD_INSTALL_CDEV  # install a CDEV entry in /dev</programlisting>
@@ -1175,7 +1175,7 @@ device          ppc</programlisting>
 
     <programlisting>#device         puc</programlisting>
 
-    <para>&man.puc.4 glue �ɥ饤�Ф����ݡ��Ȥ��Ƥ���
+    <para>&man.puc.4; glue �ɥ饤�Ф����ݡ��Ȥ��Ƥ���
       <quote>dumb</quote> ���ꥢ�롢
       �ޤ��ϥѥ��� PCI �����ɤ���äƤ���ΤǤ���С�
       ���ΥǥХ�����ͭ���ˤ��Ƥ���������</para>
diff --git a/ja_JP.eucJP/books/handbook/l10n/chapter.xml b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
index b4352e3ec7..902cf258f4 100644
--- a/ja_JP.eucJP/books/handbook/l10n/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
index c1221a72ea..afed0f6046 100644
--- a/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -2258,7 +2258,7 @@ drwxrwxr-x 11 idsadm sapsys 512 May 4 14:20 trans </screen>
       <indexterm><primary>execution class loader</primary></indexterm>
 
     <para>FreeBSD �ϡ�&ldquo;�¹ԥ��饹������ (execution class loader) &rdquo;
-      �ȸƤФ�����Ū�ʵ�������äƤ��ޤ�������� &man.execve.2
+      �ȸƤФ�����Ū�ʵ�������äƤ��ޤ�������� &man.execve.2;
       �����ƥॳ����ؤ�ܸ�Ȥ������Ǽ�������Ƥ��ޤ���
     </para>
 
diff --git a/ja_JP.eucJP/books/handbook/mail/chapter.xml b/ja_JP.eucJP/books/handbook/mail/chapter.xml
index e8b1d2bba9..1ed5b554a8 100644
--- a/ja_JP.eucJP/books/handbook/mail/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -452,7 +452,7 @@ mail.example.com</programlisting>
 
       <para><application>sendmail</application> �μ�����ե������
 	<application>sendmail</application> �ε�ǽ��ư�����ꤹ��
-	&man.m4.1 �ޥ������鹽�ۤǤ��ޤ���
+	&man.m4.1; �ޥ������鹽�ۤǤ��ޤ���
 	�ܺ٤ˤĤ��Ƥ�
 	<filename>/usr/src/contrib/sendmail/cf/README</filename>
 	�򻲾Ȥ��Ƥ���������</para>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
index 8892d3580d..a997332056 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -207,6 +207,10 @@
       �ƥ����Ȥ��󶡤��Ƥ��륢��������ˡ�ϡ�
       �ۥ���̾��³����̤���˵��ܤ���Ƥ��ޤ���</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2423,6 +2427,10 @@ doc/zh_*</screen>
       <para>&os; �� <link linkend="cvsup">CVSup</link>
         �����Фϰʲ��Υ����ȤDz�Ư���Ƥ��ޤ���</para>
 
+      &chap.mirrors.cvsup.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
diff --git a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
index b3a84a2373..3a18879904 100644
--- a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -1656,7 +1656,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
 
       <para>MythTV �ǡ����١��������ꤷ�Ƥ���������</para>
 
-      <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+      <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
 
       <para>�Хå�����ɤ����ꤷ�Ƥ���������</para>
 
@@ -1714,7 +1714,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
     <sect2>
       <title>�����ͥ�Υ���ե����졼�����</title>
 
-      <para>���ҤΤ褦�ˡ�&os �ϥ�����ʤΥ��󥿥ե������Ȥ���
+      <para>���ҤΤ褦�ˡ�&os; �ϥ�����ʤΥ��󥿥ե������Ȥ���
 	SCSI ��	USB ��ξ�����б����Ƥ��ޤ���
 	������ʤΥ��󥿥ե������ˤ�äơ�ɬ�פȤʤ�ɥ饤�Ф��ۤʤ�ޤ���</para>
 
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
index 3270bcba7a..33e9250c26 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/ports/chapter.xml b/ja_JP.eucJP/books/handbook/ports/chapter.xml
index 7f118e0edb..8ffda81c91 100644
--- a/ja_JP.eucJP/books/handbook/ports/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -880,7 +880,7 @@ docbook                     =
 	���Τ褦�ʥե�������Ѥ����ü�ʾ����ˤ��б����Ƥ��ޤ���
 	�����Υե�����ˤĤ��Ƥξܺ٤����
 	ports �ΰ���Ū�������ˤĤ��Ƥϡ�<ulink
-	url="&url.books.porters-handbook/index.html">port
+	url="&url.books.porters-handbook;/index.html">port
 	�����ԤΤ���Υϥ�ɥ֥å�</ulink> ������������</para>
 
       <para>port �ϥ����������ɤ��饢�ץꥱ���������ۤ�����ˡ���󶡤��ޤ�����
@@ -1624,7 +1624,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
         <listitem>
 	  <para>��ʬ��ľ���ޤ��礦!
 	    <quote>Ports</quote> �����ƥ�˴ؤ���ܺ٤ʾ���� <ulink
-	    url="&url.books.porters-handbook/index.html">
+	    url="&url.books.porters-handbook;/index.html">
 	    port �����ԤΤ���Υϥ�ɥ֥å�</ulink> �ˤ���ޤ���
 	    ���Υ����������ɤ�ȡ�����Ƥ��ޤä� port ��ľ�����ꡢ
 	    ��ʬ�Ǻ�ä� port ����Ф�����Ǥ���褦�ˤʤ�ޤ�!</para>
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
index d6611c60ae..859d7ecf73 100644
--- a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -454,7 +454,7 @@ nameserver <replaceable>y.y.y.y</replaceable></programlisting>
                 <para>���Υץ��Х����������ֹ����ꤷ�ޤ�.
                   ʣ���������ֹ��  <literal>:</literal> ��
                   <literal>|</literal> �Ƕ��ڤäƻ��ꤹ�뤳�Ȥ��Ǥ��ޤ�.
-                  �������ڤ�ʸ���ΰ㤤�ˤĤ��Ƥ�, &man.ppp.8
+                  �������ڤ�ʸ���ΰ㤤�ˤĤ��Ƥ�, &man.ppp.8;
                   �� �ܤ����񤫤�Ƥ��ޤ�.
                   ���󤹤��, ���㤦�ֹ�� ���������ΤǤ����
                   <literal>:</literal> ��Ȥ��ޤ�.  ���
@@ -1718,7 +1718,7 @@ reinput 1 {\255}
 if success goto slhup
 reinput 1 {\127}
 if success goto slhup
-if < \%x 60 goto look
+if &lt; \%x 60 goto look
 else goto slhup
 
 :sllogin                        ; login
@@ -1739,7 +1739,7 @@ reinput 1 {\255}
 if success goto slhup
 reinput 1 {\127}
 if success goto slhup
-if < \%x 10 goto slloop         ; try 10 times to get a login prompt
+if &lt; \%x 10 goto slloop         ; try 10 times to get a login prompt
 else goto slhup                 ; hang up and start again if 10 failures
 
 :sluid
diff --git a/ja_JP.eucJP/books/handbook/preface/preface.xml b/ja_JP.eucJP/books/handbook/preface/preface.xml
index 541ce41af6..44078b6854 100644
--- a/ja_JP.eucJP/books/handbook/preface/preface.xml
+++ b/ja_JP.eucJP/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.xml b/ja_JP.eucJP/books/handbook/printing/chapter.xml
index 33deeea85e..39554c77fb 100644
--- a/ja_JP.eucJP/books/handbook/printing/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/security/chapter.xml b/ja_JP.eucJP/books/handbook/security/chapter.xml
index 941450d408..e8ccf73288 100644
--- a/ja_JP.eucJP/books/handbook/security/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -3171,7 +3171,7 @@ options          IPSEC_ESP          #IP security (crypto; define w/IPSEC)</progr
 
       <screen>
 	           (1)
-	�ۥ��� A ------> �ۥ��� B
+	�ۥ��� A ------&gt; �ۥ��� B
 
 	(1)PROTO=AH
 		ALG=MD5(RFC1826)
@@ -3179,8 +3179,8 @@ options          IPSEC_ESP          #IP security (crypto; define w/IPSEC)</progr
 		SPI=1000
 
 	           (2.1)
-	�ۥ��� A <------ �ۥ��� B
-	         <------
+	�ۥ��� A &lt;------ �ۥ��� B
+	         &lt;------
 	           (2.2)
 
 	(2.1)
@@ -3231,10 +3231,10 @@ B 
   �ۥ��� A -------------------------------------> �ۥ��� B
   10.2.3.4                                       10.6.7.8
           |                                     |
-          ========== old AH keyed-md5 ==========>
+          ========== old AH keyed-md5 ==========&gt;
 
-          <========= new AH hmac-sha1 ===========
-          <========= new ESP des-cbc ============
+          &lt;========= new AH hmac-sha1 ===========
+          &lt;========= new ESP des-cbc ============
 </screen>
     </sect2>
 
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
index 58f9bc6b68..6dd0b42bf3 100644
--- a/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/users/chapter.xml b/ja_JP.eucJP/books/handbook/users/chapter.xml
index c9b658f9bb..5cb6f46c0e 100644
--- a/ja_JP.eucJP/books/handbook/users/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.xml b/ja_JP.eucJP/books/handbook/x11/chapter.xml
index 80df9f8c88..16a25ba7af 100644
--- a/ja_JP.eucJP/books/handbook/x11/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
@@ -322,12 +322,12 @@
   <sect1 id="x-install">
     <title>X11 �Υ��󥹥ȡ���</title>
 
-    <para>&os �Υǥե���Ȥ� X11 �ϡ�<application>&xorg;</application>
+    <para>&os; �Υǥե���Ȥ� X11 �ϡ�<application>&xorg;</application>
       �Ǥ���
       <application>&xorg;</application> ��  X.Org Foundation
       ����꡼�����Ƥ��� X Window System �Υ����ץ󥽡����ʼ����Ǥ���
       <application>&xorg;</application> ��
-      <application>&xfree86&nbsp;4.4RC2</application>
+      <application>&xfree86;&nbsp;4.4RC2</application>
       �� X11R6.6 �Υ����ɤ򸵤ˤ��Ƥ��ޤ���
       ���� &os; Ports Collection �����Ѳ�ǽ��
       <application>&xorg;</application> �ΥС�������
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index c94418b23f..c2fa6558d9 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.xml
+++ b/ja_JP.eucJP/books/porters-handbook/book.xml
@@ -3917,7 +3917,7 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
 	<para>�����ѿ��ϡ��ʲ��Τ褦�ˤ���
 	  <filename>bsd.port.mk</filename> ������ꤵ��ޤ���</para>
 
-	<programlisting>PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout</programlisting>
+	<programlisting>PORTOBJFORMAT!= test -x /usr/bin/objformat &amp;&amp; /usr/bin/objformat || echo aout</programlisting>
 
 	<para>�����ѿ���Ȥäơ�port �� make
 	  �β����Dz��򤹤٤�������ꤹ�٤��Ǥ�����
@@ -4070,8 +4070,8 @@ PKGNAMESUFFIX=  ${RESOLUTION}
  :
 # default
 RESOLUTION?=   300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
-       ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+       ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
        @${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
        @${ECHO} "Possible values are: 118, 240, 300 (default) and 400."
        @${FALSE}
@@ -6797,17 +6797,17 @@ pre-install:
 
     <para>���Υǥ��쥯�ȥ깽¤�򿷤����ե��������¸���Ƥ���������</para>
 
-    <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort -r &gt; OLD-DIRS</userinput></screen>
+    <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * -type d) | sort -r &gt; OLD-DIRS</userinput></screen>
 
     <para>�⤷���ʤ��� port �� <makevar>PREFIX</makevar> �ˤ����Ƚ����ʤ顢
       ������ port �򥤥󥹥ȡ��뤷�ƥѥå��󥰥ꥹ�Ȥ��뤳�Ȥ��Ǥ��ޤ���</para>
 
     <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp</userinput>
-&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
 
     <para>�������������줿�ǥ��쥯�ȥ�Ϥ��٤ƥѥå��󥰥ꥹ�Ȥ��ɲä���ɬ�פ�����ޤ���</para>
 
-    <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort -r | comm -13 OLD-DIRS - | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+    <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * -type d) | sort -r | comm -13 OLD-DIRS - | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
     <para>�Ǹ�˥ѥå��󥰥ꥹ�Ȥ���������ɬ�פ�����ޤ�;
       <emphasis>���٤�</emphasis>����ư������Ƥ���櫓�ǤϤ���ޤ���
diff --git a/ja_JP.eucJP/share/xml/mirrors-local.xsl b/ja_JP.eucJP/share/xml/mirrors-local.xsl
index 849d4cda79..dfeea04e7a 100644
--- a/ja_JP.eucJP/share/xml/mirrors-local.xsl
+++ b/ja_JP.eucJP/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="euc-jp"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- template: "mirrors-docbook-contact" -->