diff --git a/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
index e8601ada9b..3870e4af6a 100644
--- a/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
+++ b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd">
-
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 <!--
      The FreeBSD Documentation Project
 
diff --git a/bn_BD.ISO10646-1/articles/new-users/article.xml b/bn_BD.ISO10646-1/articles/new-users/article.xml
index bae4188ed4..5edbda2ebf 100644
--- a/bn_BD.ISO10646-1/articles/new-users/article.xml
+++ b/bn_BD.ISO10646-1/articles/new-users/article.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd">
-
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 <!--
      The FreeBSD Documentation Project
 
diff --git a/bn_BD.ISO10646-1/share/xml/catalog.xml b/bn_BD.ISO10646-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..a3feec86ca
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xml/catalog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+</catalog>
diff --git a/bn_BD.ISO10646-1/share/xml/entities.ent b/bn_BD.ISO10646-1/share/xml/entities.ent
new file mode 100644
index 0000000000..3eb78e7529
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xml/entities.ent
@@ -0,0 +1 @@
+<!-- $FreeBSD$ -->
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/articles/ipsec-must/article.xml b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
index f0d54f350d..209cd67e46 100644
--- a/da_DK.ISO8859-1/articles/ipsec-must/article.xml
+++ b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/articles/pxe/article.xml b/da_DK.ISO8859-1/articles/pxe/article.xml
index 35658564ac..69c1a571b0 100644
--- a/da_DK.ISO8859-1/articles/pxe/article.xml
+++ b/da_DK.ISO8859-1/articles/pxe/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/share/xml/catalog b/da_DK.ISO8859-1/share/xml/catalog
index b44849dbf5..2422c1740c 100644
--- a/da_DK.ISO8859-1/share/xml/catalog
+++ b/da_DK.ISO8859-1/share/xml/catalog
@@ -1,23 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-  --
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
-	"teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
-	"translators.ent"
+       "freebsd.dsl"
diff --git a/da_DK.ISO8859-1/share/xml/catalog.xml b/da_DK.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..68a49c118f
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent"/>
+  <public publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+        uri="translators.ent" />
+</catalog>
diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index 2b612813a1..f59c2fe83c 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+	"translators.ent">
 %translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
+	"teams.ent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
diff --git a/da_DK.ISO8859-1/share/xml/freebsd.dsl b/da_DK.ISO8859-1/share/xml/freebsd.dsl
index be8e51cbc7..3672899869 100644
--- a/da_DK.ISO8859-1/share/xml/freebsd.dsl
+++ b/da_DK.ISO8859-1/share/xml/freebsd.dsl
@@ -2,46 +2,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <!-- HTML only .................................................... -->
-
-      <![ %output.html; [
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Dette og andre dokumenter kan downloades fra ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "For sp�rgsm�l om FreeBSD, l�s ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "dokumentationen"))
-                (literal " f�r du kontakter <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "For sp�rgsm�l ang�ende denne dokumentation, e-mail <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-      ]]>
 	<!-- Fix a problem with the Danish localisation. -->
 	(define (local-da-label-title-sep)
 	(list
diff --git a/da_DK.ISO8859-1/share/xml/mailing-lists.ent b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
index 080b91e29f..e6647db98c 100644
--- a/da_DK.ISO8859-1/share/xml/mailing-lists.ent
+++ b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Navne p� FreeBSD mailing lister og relateret software.
 
diff --git a/da_DK.ISO8859-1/share/xml/newsgroups.ent b/da_DK.ISO8859-1/share/xml/newsgroups.ent
index fe16bf2b42..85d53e443d 100644
--- a/da_DK.ISO8859-1/share/xml/newsgroups.ent
+++ b/da_DK.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Navne p� FreeBSD nyhedsgrupper
 
diff --git a/da_DK.ISO8859-1/share/xml/teams.ent b/da_DK.ISO8859-1/share/xml/teams.ent
index 25a971a3b7..32179d0bbe 100644
--- a/da_DK.ISO8859-1/share/xml/teams.ent
+++ b/da_DK.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Navne og email adresser p� de teams af folk der arbejder
      p� specifikke opgaver.  Normalt er de bare mail aliaser der
diff --git a/da_DK.ISO8859-1/share/xml/translators.ent b/da_DK.ISO8859-1/share/xml/translators.ent
index 58c5b91f99..df69892e8f 100644
--- a/da_DK.ISO8859-1/share/xml/translators.ent
+++ b/da_DK.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Dannish Documentation Project
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-common.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..22d504e228
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Dette og andre dokumenter kan downloades fra
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>For sp�rgsm�l om FreeBSD, l�s
+    <a href="http://www.FreeBSD.org/docs.html">documentationen</a> f�r du kontakter
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    For sp�rgsm�l ang�ende denne dokumentation, e-mail
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/articles/contributing-ports/article.xml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
index 065f63199c..585df8c56a 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/contributing/article.xml b/de_DE.ISO8859-1/articles/contributing/article.xml
index d009d11d32..6993c696dd 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
       The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
index 9f35d43391..d383c634cf 100644
--- a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml b/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml
index 5e2d9d0fce..38439fb83a 100644
--- a/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/de_DE.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
 <!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
 ]>
 
@@ -836,14 +834,14 @@ the new builds.</screen>
 
 	<screen>               # Build the world
 		   log "Building world"
-		   cd /usr/src &&
-		   make -j 2 ${COMPATFLAGS} buildworld 2>&1
+		   cd /usr/src &amp;&amp;
+		   make -j 2 ${COMPATFLAGS} buildworld 2&gt;&amp;1
 
 		# Distribute the world
 		   log "Distributing world"
-		   cd /usr/src/release &&
-		   make -j 2 obj &&
-		   make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+		   cd /usr/src/release &amp;&amp;
+		   make -j 2 obj &amp;&amp;
+		   make ${COMPATFLAGS} release.1 release.2 2&gt;&amp;1</screen>
       </listitem>
 
       <listitem>
diff --git a/de_DE.ISO8859-1/articles/laptop/article.xml b/de_DE.ISO8859-1/articles/laptop/article.xml
index b3b638f0ba..8c8c2de164 100644
--- a/de_DE.ISO8859-1/articles/laptop/article.xml
+++ b/de_DE.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/linux-comparison/article.xml b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
index b462224939..0670e959bd 100644
--- a/de_DE.ISO8859-1/articles/linux-comparison/article.xml
+++ b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 Copyright (c) 2005 Dru Lavigne
diff --git a/de_DE.ISO8859-1/articles/nanobsd/article.xml b/de_DE.ISO8859-1/articles/nanobsd/article.xml
index c4f799fc30..875d6c7214 100644
--- a/de_DE.ISO8859-1/articles/nanobsd/article.xml
+++ b/de_DE.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="de">
   <articleinfo>
diff --git a/de_DE.ISO8859-1/articles/new-users/article.xml b/de_DE.ISO8859-1/articles/new-users/article.xml
index b4ecabca51..8a3c9b1c93 100644
--- a/de_DE.ISO8859-1/articles/new-users/article.xml
+++ b/de_DE.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml b/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 924c1b8f51..8debb40602 100644
--- a/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -138,8 +135,8 @@
       <para>Wir erwarten, dass Mentoren ihre Mentees die Lekt&uuml;re
 	des <ulink url="&url.books.porters-handbook;">Handbuch
 	f&uuml;r Ports Committer</ulink>, die <ulink
-	url="&url.articles.pr-guidelines">PR-Richtlinien</ulink> sowie
-	den <ulink url="&url.articles.committers-guide">Committer's
+	url="&url.articles.pr-guidelines;">PR-Richtlinien</ulink> sowie
+	den <ulink url="&url.articles.committers-guide;">Committer's
 	Guide</ulink> empfehlen. Obwohl es nicht notwendig ist, all
 	diese Details im Ged&auml;chtnis zu behalten, sollte jeder
 	Committer einen &Uuml;berblick &uuml;ber diese Dinge haben, um
diff --git a/de_DE.ISO8859-1/articles/solid-state/article.xml b/de_DE.ISO8859-1/articles/solid-state/article.xml
index 664b85e130..819b02ef07 100644
--- a/de_DE.ISO8859-1/articles/solid-state/article.xml
+++ b/de_DE.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- Copyright (c) 2001 The FreeBSD Documentation Project
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/book.xml b/de_DE.ISO8859-1/books/developers-handbook/book.xml
index 2cffde0118..c3b492a770 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index dd7ef91614..44ccf7d1c4 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -116,7 +116,7 @@
       </listitem>
      </itemizedlist>
 
-     <para>Aus Scheifler & Gettys: "X Window System"</para>
+     <para>Aus Scheifler &amp; Gettys: "X Window System"</para>
   </sect1>
 
   <sect1 id="introduction-layout">
diff --git a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index d6fc6e55a1..b24a67e27a 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 1aef995166..a6af8072e1 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 4202d00db7..d74d1b70aa 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
       The FreeBSD Documentation Project
       The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index 4974cee9ff..4cbb98738f 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 07abb8ee37..cb736efd1d 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 1d2db0a404..b136a71534 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 86f9d1e35d..689f3477bf 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 22984d8345..30fde27ed4 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
index f70bf8d3c0..cf76487e17 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
index ec6f4b3391..f9c2256efd 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/faq/book.xml b/de_DE.ISO8859-1/books/faq/book.xml
index e5fa268010..8bdf375c17 100644
--- a/de_DE.ISO8859-1/books/faq/book.xml
+++ b/de_DE.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
@@ -6520,7 +6518,7 @@ perm      /dev/acd0       0660</programlisting>
 	    die Zeile dort.</para>
 
           <para>Wenn Sie zum Beispiel den mitgelieferten DNS-Server
-	    &man.named.8 aktivieren wollen, m�ssen Sie lediglich
+	    &man.named.8; aktivieren wollen, m�ssen Sie lediglich
 	    das folgende Kommando eingeben:</para>
 
           <screen>&prompt.root; <userinput>echo 'named_enable="YES"' &gt;&gt; /etc/rc.conf</userinput></screen>
@@ -10551,9 +10549,9 @@ ATDT1234567
             genannten Befehl:</para>
 
           <programlisting>
-sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
+sio0: &lt;16550A-compatible COM port&gt; port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
 sio0: type 16550A
-sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
+sio1: &lt;16550A-compatible COM port&gt; port 0x2f8-0x2ff irq 3 on acpi0
 sio1: type 16550A</programlisting>
 
           <para>Es zeigt zwei serielle Schnittstellen.  Die erste
diff --git a/de_DE.ISO8859-1/books/fdp-primer/book.xml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
index 1fa3352165..4dd715903b 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/book.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 ]>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 5df1ae817a..b98298a25f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 6d4efeb166..fcc9b34592 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 8a93b8ec9c..dbfe39477b 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 3e7c40a424..7c18f9e9da 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index b050760ed3..d46df3d784 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 7d06cb0ae3..4f9e407ffd 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -2531,7 +2531,7 @@ This is the file called 'foo2'</screen>
 
         <para>Das folgende Beispiel soll das bisher geschriebene
           illustrieren. Angenommen es liegt eine einzubindende Grafik
-          in der Datei <filename>bild1</filename> vor, die  die
+          in der Datei <filename>bild1.png</filename> vor, die  die
           Darstellung eines As in einem Rechteck enth�lt. Die
           ASCII-Alternative k�nnte so ausgezeichnet werden:</para>
 
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 423ff66717..e764116813 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -1070,28 +1070,6 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
   -- mehrzeilige Kommentare.     -->]]></programlisting>
     </example>
 
-    <!--? Noch zu uebersetzen. Oliver Fischer -->
-    <![%output.print;[
-      <important>
-	<title>Es sind zwei Bindestriche</title>
-
-	<para>Es gibt ein Problem mit den PostScript- oder
-	  PDF-Versionen dieses Dokuments.  Das obige Beispiel
-	  zeigt vielleicht nur einen Bindestrich (<literal>-</literal>)
-	  hinter <literal>&lt;!</literal> und vor
-	  <literal>&gt;</literal>.</para>
-
-	<para>Es <emphasis>m�ssen</emphasis> zwei Bindestriche
-	  und <emphasis>nicht</emphasis> nur einer benutzt werden.
-	  Die PostScript- und PDF-Versionen haben vielleicht
-	  beide Bindestriche zu einem l�ngeren Strich, dem
-	  <emphasis>em-dash</emphasis>, zusammengefasst.</para>
-
-	<para>Die HTML-, nur-Text und RTF-Versionen dieses Dokuments
-	  sind nicht von diesem Problem betroffen.</para>
-      </important>
-    ]]>
-
     <para>Hat man fr�her schon Erfahrungen mit HTML gesammelt,
       wird man vielleicht andere Regeln f�r den Gebrauch von
       Kommentaren kennengelernt haben. Beispielsweise wird oft
diff --git a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
index e45a999686..33915bf998 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -255,7 +255,7 @@
 	  <para>Enth�lt eine Kapiteldatei beispielsweise die
 	    Eintr�ge</para>
 
-	  <programlisting><![ CDATA [
+	  <programlisting><![CDATA[
 <chapter id="kernelconfig">
 ...
 </chapter>]]></programlisting>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 6baa107347..7047aa418c 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 41961041e3..a1adb37ffe 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 88156b4417..5cad0b9773 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
index a57d6b7c95..3ccb09e9c5 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index da0c48d69b..5dc80f2671 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 8d10125d59..d3775164db 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -23,7 +23,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF= yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -287,29 +286,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index a673e9f97b..95c92266d1 100644
--- a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -6636,7 +6636,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	  <hostid>provider.example.org</hostid> den folgenden
 	  Befehl ein:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>Dieser Befehl muss auf das
 	  <devicename>carp</devicename>-Ger�t ausgef�hrt
diff --git a/de_DE.ISO8859-1/books/handbook/audit/chapter.xml b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
index b5aac5a9e5..e0512ed6da 100644
--- a/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
index afde1bfbd5..20c6598b89 100644
--- a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -1191,7 +1191,7 @@ Old Password:</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1214,7 +1214,7 @@ Old Password:</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1249,7 +1249,7 @@ Old Password:</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1277,7 +1277,7 @@ Old Password:</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1303,7 +1303,7 @@ Old Password:</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1641,7 +1641,7 @@ Old Password:</screen>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
index aadbd720d3..bfa1d01f8c 100644
--- a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/book.xml b/de_DE.ISO8859-1/books/handbook/book.xml
index ff0c917717..de58618ee9 100644
--- a/de_DE.ISO8859-1/books/handbook/book.xml
+++ b/de_DE.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
 ]>
diff --git a/de_DE.ISO8859-1/books/handbook/boot/chapter.xml b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
index a6bb602c7b..91931165cd 100644
--- a/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 652296a845..27fa6d5e83 100644
--- a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -154,7 +154,7 @@
 		<para>Es gibt zwei Klassen von Prozessoren, die in der Lage sind,
 		  auf &os;/&arch.amd64; zu laufen.  Die erste Klasse sind
 		  AMD64-Prozessoren, was sowohl &amd.athlon;64,
-		  &amd.athlon;64-FX, &amd.opteron oder bessere Prozessoren
+		  &amd.athlon;64-FX, &amd.opteron; oder bessere Prozessoren
 		  beinhaltet.</para>
 
 		<para>Die zweite Klasse von Prozessoren, die &os;/&arch.amd64;
@@ -726,7 +726,7 @@ Loading /boot/defaults/loader.conf
 	      <mediaobject>
 			<imageobject>
 			  <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"
-			    format="PNG"/>
+			   />
 			</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -798,14 +798,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		  role="Programmable Read Only Memory">PROM</acronym>
 		  Befehlszeile zu gelangen.  Es sieht dann so aus:</para>
 
-		<screenco>
-		  <areaspec>
-		    <area id="bsdinstall-prompt-single" coords="1 5"/>
-		    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-		  </areaspec>
-
-		  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+		  <screen><prompt>ok     </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	      <calloutlist>
 	        <callout arearefs="bsdinstall-prompt-single">
@@ -818,7 +812,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		        Die Zahl gibt die Nummer der aktiven CPU an.</para>
 		    </callout>
 		  </calloutlist>
-		</screenco>
 
 		<para>An dieser Eingabeaufforderung angekommen, legen Sie nun
 		  die CD-ROM in Ihr Laufwerk und geben Sie
@@ -1023,7 +1016,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 		<mediaobject>
 		  <imageobject>
 		    <imagedata
-		      fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
+		      fileref="bsdinstall/bsdinstall-choose-mode"/>
 		  </imageobject>
 		</mediaobject>
       </figure>
@@ -1066,7 +1059,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 		<title>Tastaturbelegung festlegen</title>
 		<mediaobject>
           <imageobject>
-	    	<imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
+	    	<imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"/>
           </imageobject>
 		</mediaobject>
       </figure>
@@ -1080,7 +1073,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 		<title>Tastaturauswahlbildschirm</title>
         <mediaobject>
           <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -1110,7 +1103,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Festlegen des Rechnernamens</title>
       <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-config-hostname"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1131,7 +1124,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Komponenten f�r die Installation ausw�hlen</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-config-components"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1224,7 +1217,7 @@ 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"/>
 	    </imageobject>
       </mediaobject>
     </figure>
@@ -1244,7 +1237,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"/>
 	    </imageobject>
       </mediaobject>
     </figure>
@@ -1271,7 +1264,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Gef�hrte oder manuelle Partitionierung ausw�hlen</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"/>
 	  </imageobject>
      </mediaobject>
     </figure>
@@ -1286,7 +1279,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Aus mehreren Platten eine ausw�hlen</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1304,7 +1297,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Auswahl der gesamten Platte oder einer Partition</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1325,7 +1318,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>�berpr�fen der erstellen Partitionen</title>
       <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-part-review"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1341,7 +1334,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Partitionen manuell erstellen</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1356,7 +1349,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Partitionen manuell anlegen</title>
 	  <mediaobject>
 	    <imageobject>
-	     <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
+	     <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1429,7 +1422,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Partitionen manuell erzeugen</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1608,7 +1601,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Letzte Best�tigung</title>
       <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"/>
 	    </imageobject>
       </mediaobject>
     </figure>
@@ -1640,7 +1633,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Herunterladen der Distributionsdateien</title>
       <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"/>
  	    </imageobject>
       </mediaobject>
     </figure>
@@ -1654,7 +1647,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>�berpr�fen der Distributionsdateien</title>
       <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"/>
 	    </imageobject>
       </mediaobject>
     </figure>
@@ -1666,7 +1659,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Entpacken der Distributionsdateien</title>
       <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"/>
 	    </imageobject>
       </mediaobject>
     </figure>
@@ -1700,7 +1693,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"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1728,7 +1721,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"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -1764,7 +1757,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Nach drahtlosen Access Points scannen</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
 	    </imageobject>
 	   </mediaobject>
 	  </figure>
@@ -1787,7 +1780,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Ein drahtloses Netzwerk ausw�hlen</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
 	    </imageobject>
 	   </mediaobject>
 	  </figure>
@@ -1805,7 +1798,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Verbindungsaufbau mit WPA2</title>
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
 	    </imageobject>
 	   </mediaobject>
 	  </figure>
@@ -1827,7 +1820,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"/>
 	      </imageobject>
 	     </mediaobject>
 	    </figure>
@@ -1863,7 +1856,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"/>
 	       </imageobject>
 	      </mediaobject>
 	     </figure>
@@ -1880,7 +1873,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"/>
 	        </imageobject>
 	      </mediaobject>
 	    </figure>
@@ -1924,7 +1917,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1951,7 +1944,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"/>
 	        </imageobject>
 	      </mediaobject>
 	    </figure>
@@ -1969,7 +1962,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"/>
 	        </imageobject>
 	      </mediaobject>
 	    </figure>
@@ -2018,7 +2011,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"/>
 	        </imageobject>
 	      </mediaobject>
 	    </figure>
@@ -2042,7 +2035,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Lokale oder UTC-Zeit</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2059,7 +2052,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <title>Das Gebiet ausw�hlen</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-timezone-region"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2072,7 +2065,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Das Land ausw�hlen</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-timezone-country"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2085,7 +2078,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>W�hlen einer Zeitzone</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2098,7 +2091,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Best�tigen der Zeitzone</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2120,7 +2113,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Auswahl zus�tzlicher Dienste</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-config-services"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2169,7 +2162,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <title>Aktivierung der Absturzaufzeichnung</title>
 	    <mediaobject>
 	      <imageobject>
-	        <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
+	        <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"/>
 	      </imageobject>
     	</mediaobject>
       </figure>
@@ -2194,7 +2187,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"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2207,7 +2200,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"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2310,7 +2303,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"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2337,7 +2330,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"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
@@ -2394,7 +2387,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"/>
 	    </imageobject>
 	   </mediaobject>
       </figure>
@@ -2412,7 +2405,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"/>
 	      </imageobject>
 	    </mediaobject>
       </figure>
diff --git a/de_DE.ISO8859-1/books/handbook/chapters.ent b/de_DE.ISO8859-1/books/handbook/chapters.ent
index b9a3d52402..f8bb7e300f 100644
--- a/de_DE.ISO8859-1/books/handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/handbook/chapters.ent
@@ -15,234 +15,63 @@
 
 <!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.mac "IGNORE">
-<!ENTITY % chap.audit "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.network-servers "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.advanced-networking "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.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-<!ENTITY % chap.colophon "IGNORE">
-
 <!ENTITY chap.preface		SYSTEM "preface/preface.xml">
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 
 <!-- Teil Eins -->
-<![%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">
-]]>
 
 <!-- Teil Zwei -->
-<![%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">
-]]>
 
 <!-- Teil Drei -->
-<![%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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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">
-]]>
 
 <!-- Teil Vier -->
-<![%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">
-]]>
 
 <!-- Teil Fuenf (Anhang) -->
-<![%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.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.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.mirrors.lastmod.inc	SYSTEM "mirrors.lastmod.inc">
+<!ENTITY chap.mirrors.ftp.index.inc	SYSTEM "mirrors.xml.ftp.index.inc">
+<!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
+<!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
 
 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Teil Eins -->
-<!ENTITY chap.introduction	"">
-<!ENTITY chap.install		"">
-<!ENTITY chap.basics		"">
-<!ENTITY chap.ports		"">
-<!ENTITY chap.x11		"">
-
-<!-- Teil Zwei -->
-<!ENTITY chap.desktop		"">
-<!ENTITY chap.multimedia	"">
-<!ENTITY chap.kernelconfig	"">
-<!ENTITY chap.printing		"">
-<!ENTITY chap.linuxemu		"">
-
-<!-- Teil Drei -->
-<!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		"">
-
-<!-- Teil Vier -->
-<!ENTITY chap.serialcomms	"">
-<!ENTITY chap.ppp-and-slip	"">
-<!ENTITY chap.mail		"">
-<!ENTITY chap.network-servers	"">
-<!ENTITY chap.firewalls		"">
-<!ENTITY chap.advanced-networking	"">
-
-<!-- Teil Fuenf (Anhang) -->
-<!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/de_DE.ISO8859-1/books/handbook/colophon.xml b/de_DE.ISO8859-1/books/handbook/colophon.xml
index be6a7ac978..9f3a254fdd 100644
--- a/de_DE.ISO8859-1/books/handbook/colophon.xml
+++ b/de_DE.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/de_DE.ISO8859-1/books/handbook/config/chapter.xml b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
index 8d32c66931..db5f293476 100644
--- a/de_DE.ISO8859-1/books/handbook/config/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -829,7 +829,7 @@ sshd is running as pid 433.</screen>
       Manualpages zu &man.rc.8; sowie &man.rc.subr.8;.  Wenn Sie
       Ihre eigenen <filename>rc.d</filename>-Skripte schreiben
       wollen, sollten Sie den Artikel
-      <ulink url="&url.articles.rc-scripting.en">Practical rc.d
+      <ulink url="&url.articles.rc-scripting.en;">Practical rc.d
       scripting in BSD</ulink> lesen.</para>
   </sect1>
 
diff --git a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index b64b0da8a0..1a3ebf10a3 100644
--- a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -1158,7 +1158,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 
 	  <listitem>
 	    <para>Schliesslich gibt es noch einen sogenannten <quote>slave
-	      port</quote> f&&uml;r jede �bersetzung, z.B.: <filename
+	      port</quote> f�r jede �bersetzung, z.B.: <filename
 	      role="package">misc/freebsd-doc-hu</filename> f�r
 	      Dokumentation in ungarischer Sprache.  All diese ben�tigen
 	      den Master-Port und installieren die �bersetzte
@@ -1300,8 +1300,8 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
       </sect3>
     </sect2>
 
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
+<!-- FIXME: Waiting for a working docsnap server...
+
     <sect2 id="docsnap">
       <sect2info>
 	<authorgroup>
@@ -1358,14 +1358,14 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	  above.</para>
       </note>
 
-      <para>Do not use the <option>--delete</option> flag here as there
+      <para>Do not use the <option>&dash;&dash;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>
+      <screen>&prompt.root; <userinput>rsync -rltvz &dash;&dash;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
@@ -1373,7 +1373,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 
       <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/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
index 8d09183488..96015c2912 100644
--- a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
index af06f36a2d..8974b76820 100644
--- a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -1078,8 +1078,8 @@ umass0: detached</screen>
 
       <para>Welches Tool Sie zum Brennen von CDs benutzen, h�ngt davon
 	ab, ob Ihr CD-Brenner ein ATAPI-Ger�t ist oder nicht.
-	Mit ATAPI-CD-Brennern wird <command><link linkend="burncd">
-	</link>burncd</command> benutzt, das Teil des Basissystems ist.
+	Mit ATAPI-CD-Brennern wird <command>burncd</command> benutzt,
+	das Teil des Basissystems ist.
 	SCSI- und USB-CD-Brenner werden mit <command><link linkend="cdrecord">
 	cdrecord</link></command> aus <filename
 	role="package">sysutils/cdrtools</filename> benutzt.
@@ -3112,18 +3112,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
           dranh�ngen, kann Ihnen sp�ter ein weiteres Missgeschick
           ersparen.</para>
       </sect3>
-
-<![%not.published;[
-
-      <sect3>
-        <title>* Ich habe mich nicht auf Missgeschicke vorbereitet - was
-          nun?</title>
-
-        <para></para>
-      </sect3>
-
-]]>
-
     </sect2>
   </sect1>
 
@@ -5014,7 +5002,7 @@ case "$1" in
 
 		# Wait for any "hastd secondary" processes to stop
 		for disk in ${resources}; do
-			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2&gt;&amp;1 ); do
 				sleep 1
 			done
 
@@ -5029,7 +5017,7 @@ case "$1" in
 		# Wait for the /dev/hast/* devices to appear
 		for disk in ${resources}; do
 			for I in $( jot 60 ); do
-				[ -c "/dev/hast/${disk}" ] && break
+				[ -c "/dev/hast/${disk}" ] &amp;&amp; break
 				sleep 0.5
 			done
 
@@ -5062,7 +5050,7 @@ case "$1" in
 				umount -f /hast/${disk}
 			fi
 			sleep $delay
-			hastctl role secondary ${disk} 2>&1
+			hastctl role secondary ${disk} 2&gt;&amp;1
 			if [ $? -ne 0 ]; then
 				logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
 				exit 1
diff --git a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
index e7f3807937..23d06a80a2 100644
--- a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 Recently I suggested to myself that this should become a profiling
 and debugging chapter, which covers things like ktrace(1) and
diff --git a/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
index 4e8b4fc0be..189e45e3e9 100644
--- a/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -2151,6 +2151,11 @@
 
     <sect2 id="eresources-web-mirrors">
       <title>Official Mirrors</title>
+
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
index 5dba58b61e..7f8d0156c1 100644
--- a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -244,7 +244,7 @@ example      17547136       0 17547136     0%    /example</screen>
 	  von den Benutzern aufgelistet werden, wie im folgenden Beispiel
 	  gezeigt wird:</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
index f77ee1b386..5a679c9224 100644
--- a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index f6507dc38b..db8ac567d2 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -108,7 +108,7 @@
       &mdash; Master Boot Records, <acronym>BSD</acronym>-Label usw.
       &mdash; durch die Nutzung von Datentr�gern (Providern) oder
       den besonderen Dateien in <filename
-      role="directory">/dev</filename>. Verschiedene Software
+      class="directory">/dev</filename>. Verschiedene Software
       <acronym>RAID</acronym>-Konfigurationen unterst�tzend, wird
       GEOM Ihnen transparenten Zugriff auf das Betriebssystem und
       System-Dienstprogramme gew�hren.</para>
@@ -187,7 +187,7 @@
 	  existiert. Falls dieser Datentr�ger eine Root-Partition
 	  werden soll, dann nutzen Sie zeitweise einen anderen
 	  Mount-Punkt, beispielsweise <filename
-	  role="directory">/mnt</filename>:</para>
+	  class="directory">/mnt</filename>:</para>
 
 	<screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 996c9b6359..46232bc007 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1113,7 +1113,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"/>
 	        </imageobject>
 	      </mediaobject>
 	    </figure>
@@ -1155,14 +1155,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  Programmen &man.tip.1; oder &man.cu.1;).  In beiden F�llen
 	  landen Sie anschlie�end am PROM-Prompt:</para>
 
-    <screenco>
-      <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
-      </areaspec>
-
-      <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+      <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
       <calloutlist>
 	<callout arearefs="prompt-single">
@@ -1174,7 +1168,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	    dabei f�r die Anzahl der vorhandenen Prozessoren.</para>
 	</callout>
       </calloutlist>
-    </screenco>
 
     <para>Nun legen Sie Ihre CD-ROM in das Laufwerk ein und geben am
       PROM-Prompt <command>boot cdrom</command> ein.  Danach startet Ihr
@@ -1291,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1309,7 +1302,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1353,7 +1346,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1370,7 +1363,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1382,7 +1375,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1414,7 +1407,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1438,7 +1431,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1455,7 +1448,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-	    <imagedata fileref="install/main-options" format="PNG"/>
+	    <imagedata fileref="install/main-options"/>
 	  </imageobject>
         </mediaobject>
       </figure>
@@ -1465,7 +1458,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1504,7 +1497,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1699,7 +1692,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1775,7 +1768,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1824,7 +1817,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1871,7 +1864,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1903,7 +1896,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2177,7 +2170,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2207,7 +2200,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2235,7 +2228,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2255,7 +2248,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2273,7 +2266,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2291,7 +2284,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2317,7 +2310,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2375,7 +2368,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2434,7 +2427,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2471,7 +2464,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2679,7 +2672,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2732,7 +2725,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2917,7 +2910,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3017,7 +3010,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3100,7 +3093,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3164,7 +3157,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3219,7 +3212,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3234,7 +3227,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3257,7 +3250,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3271,7 +3264,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3318,7 +3311,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3331,7 +3324,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3344,7 +3337,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3416,7 +3409,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3430,7 +3423,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3447,7 +3440,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3461,7 +3454,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3477,7 +3470,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3493,7 +3486,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3542,7 +3535,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3565,7 +3558,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3599,7 +3592,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3615,7 +3608,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3672,7 +3665,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3686,7 +3679,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3795,7 +3788,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3863,7 +3856,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3942,7 +3935,7 @@ Be sure to remove the media from the drive.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4016,7 +4009,7 @@ Be sure to remove the media from the drive.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4073,7 +4066,7 @@ Be sure to remove the media from the drive.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4101,7 +4094,7 @@ Be sure to remove the media from the drive.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
index 917deaae84..9c004f9636 100644
--- a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/jails/chapter.xml b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
index e3790afe6d..d5c7b6b274 100644
--- a/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 91a804a89c..a4aaa32765 100644
--- a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
index 2f786cb223..5c28fb6a3d 100644
--- a/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 6faf4ab1d7..a63bb0ef13 100644
--- a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -715,14 +715,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -1025,7 +1025,7 @@ exit 0</programlisting>
 	    nachstehendem Inhalt:</para>
 
 	  <programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/de_DE.ISO8859-1/books/handbook/mac/chapter.xml b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
index 6fb2a6b88d..289f99fffd 100644
--- a/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -758,49 +758,43 @@ test: biba/high</screen>
 	Biba, Lomac, <acronym>MLS</acronym> und
 	<acronym>SEBSD</acronym>.</para>
 
-<!-- ================================================================================== --
-  -- ================================================================================== --
-  -- ================================================================================== --
-  -- Das folgende Beispiel weigere ich mich zu uebersetzen. Der Autor selbst schreibt   --
-  -- schreibt ja, dass es only a quick example ist.						--
+<!-- Das folgende Beispiel weigere ich mich zu uebersetzen. Der Autor selbst schreibt
+     schreibt ja, dass es only a quick example ist.
 
 
-  --  <para>In many cases, the <option>multilabel</ option> may not need		--
-  --    to be set at all.  Consider the following situation and				--
-  --    security model:</para>								--
-  --    <itemizedlist>		--
-  --      <listitem>		--
-  --      <para>&os; web-server using the <acronym>MAC</acronym>			--
-  --        framework and a mix of the various policies.</para>				--
-  --      </listitem>		--
+      <para>In many cases, the <option>multilabel</ option> may not need
+        to be set at all.  Consider the following situation and
+        security model:</para>
+      <itemizedlist>
+        <listitem>
+          <para>&os; web-server using the <acronym>MAC</acronym>
+            framework and a mix of the various policies.</para>
+        </listitem>
 
-  --       <listitem>		--
-  --      <para>This machine only requires one label,					--
-  --        <literal>biba/high</literal>, for everything in the system.			--
-  --        Here the file system would not require the					--
-  --        <option>multilabel</ option> option as a single label			--
-  --        will always be in effect.</para>						--
-  --    </listitem>     --
+        <listitem>
+          <para>This machine only requires one label,
+            <literal>biba/high</literal>, for everything in the system.
+            Here the file system would not require the
+            <option>multilabel</ option> option as a single label
+            will always be in effect.</para>
+        </listitem>
 
-  --    <listitem>	--
-  --      <para>But, this machine will be a web server and should have			--
-  --        the web server run at <literal>biba/low</literal> to prevent		--
-  --        write up capabilities.  The Biba policy and how it works			--
-  --        will be discussed later, so if the previous comment was			--
-  --        difficult to interpret just continue reading and return.			--
-  --        The server could use a separate partition set at				--
-  --        <literal>biba/low</literal> for most if not all of its			--
-  --        runtime state.  Much is lacking from this example, for			--
-  --        instance the restrictions on data, configuration and user			--
-  --        settings; however, this is just a quick example to prove the		--
-  --        aforementioned point.</para>						--
-  --    </listitem>		--
-  --  </itemizedlist>		--
+        <listitem>
+          <para>But, this machine will be a web server and should have
+            the web server run at <literal>biba/low</literal> to prevent
+            write up capabilities.  The Biba policy and how it works
+            will be discussed later, so if the previous comment was
+            difficult to interpret just continue reading and return.
+            The server could use a separate partition set at
+            <literal>biba/low</literal> for most if not all of its
+            runtime state.  Much is lacking from this example, for
+            instance the restrictions on data, configuration and user
+            settings; however, this is just a quick example to prove the
+            aforementioned point.</para>
+        </listitem>
+      </itemizedlist>
 
-  -- end of quick example 								--
-  -- ================================================================================== --
-  -- ================================================================================== --
-  -- ================================================================================== -->
+  -->
 
       <para>Wenn Richtlinien benutzt werden sollen, die ohne Labels auskommen,
         wird die Option <option>multilabel</option> nicht ben�tigt.  Dies
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index 5d74286666..be3fbc3bca 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -1804,11 +1804,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	  den nachstehenden Kommandos:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para><application>sendmail</application> sollte sich ohne Probleme
 	  �bersetzen lassen, wenn die Dateien in
@@ -2082,7 +2082,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2093,7 +2093,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2137,7 +2137,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2192,7 +2192,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2214,7 +2214,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2225,7 +2225,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2238,7 +2238,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2258,7 +2258,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
index 9bd6352d33..373bc85959 100644
--- a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -253,6 +253,10 @@
       stehenden Zugriffsmethoden sind bei jedem Server in Klammern
       angegeben.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2402,6 +2406,10 @@ doc/zh_*</screen>
       <para>Die folgende Aufz�hlung enth�lt
         <link linkend="cvsup">CVSup</link> Server f�r &os;:</para>
 
+      &chap.mirrors.cvsup.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
index ea7f6ef88e..49dfc1d5ca 100644
--- a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -1731,7 +1731,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
 
       <para>Richten Sie anschliessend die MythTV-Datenbank ein:</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>Konfigurieren Sie dann das Backend:</para>
 
diff --git a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
index 27724ca3d8..720d0c939a 100644
--- a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index d18e5f1b30..b855de0ba0 100644
--- a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/ports/chapter.xml b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
index 48fb4648be..25948e7238 100644
--- a/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index f8683e8a70..e7fe8e8ffd 100644
--- a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/preface/preface.xml b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
index 55949300e9..751e9cac4a 100644
--- a/de_DE.ISO8859-1/books/handbook/preface/preface.xml
+++ b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
index c4ec2b2043..f5d20e2454 100644
--- a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -1313,7 +1313,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    identifiziert und angelegt haben, m�ssen Sie dem
 	    <application>LPD</application>-System mitteilen, welche
 	    Ger�tedatei im Verzeichnis <filename
-	    role="directory">/dev</filename> es f�r die
+	    class="directory">/dev</filename> es f�r die
 	    Daten�bertragung zum Drucker verwenden soll.</para>
 
 	  <para>Geben Sie die Ger�tedatei durch das Attribut
diff --git a/de_DE.ISO8859-1/books/handbook/security/chapter.xml b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
index da19ec5b67..71869bb038 100644
--- a/de_DE.ISO8859-1/books/handbook/security/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
@@ -708,7 +708,7 @@
         <literal>schg</literal> Flag auf kritische Startdateien,
         Verzeichnisse und Scripte (z.B. alles was l�uft bis zu
         dem Punkt auf dem das Securelevel gesetzt ist) zu setzen.  Dies
-        k�nnte etwas &uuml,bertrieben sein, und auch das Upgrade
+        k�nnte etwas &uuml;bertrieben sein, und auch das Upgrade
         des Systems ist sehr viel schwerer, wenn es auf einem hohen
         Securelevel l�uft.  Ein strengerer Kompromiss ist es, das
         System auf einem h�heren Securelevel laufen zu lassen, aber
diff --git a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
index c78f38d11b..8c85b9a3b0 100644
--- a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/users/chapter.xml b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
index eda4969f05..d6f34352ed 100644
--- a/de_DE.ISO8859-1/books/handbook/users/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
index 4784c0247d..3a4089f3e7 100644
--- a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 	The Vinum Volume Manager
 	By Greg Lehey (grog at lemis dot com)
diff --git a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
index 95c771c026..433fc3898c 100644
--- a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/x11/chapter.xml b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
index 2bc9464905..60558f71df 100644
--- a/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -320,7 +320,7 @@
       <application>&xorg;</application> ist der von der
       X.Org Foundation herausgegebene X-Server des Open-Source
       X&nbsp;Window Systems.  <application>&xorg;</application>
-      beruht auf <application>&xfree86&nbsp;4.4RC2</application> und
+      beruht auf <application>&xfree86;&nbsp;4.4RC2</application> und
       X11R6.6.  Derzeit ist die Version &xorg.version; von
       <application>&xorg;</application> in der Ports-Sammlung
       vorhanden.</para>
diff --git a/de_DE.ISO8859-1/books/porters-handbook/Makefile b/de_DE.ISO8859-1/books/porters-handbook/Makefile
index 82650b4629..cc63278fb8 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/porters-handbook/Makefile
@@ -22,10 +22,6 @@ INSTALL_ONLY_COMPRESSED?=
 # XML content
 SRCS=  book.xml
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 # Images from the cross-document image library
 IMAGES_LIB+=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
index abffe8878e..b0a5203477 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
@@ -10044,7 +10041,7 @@ etc/orbit.conf.sample
       <para>Speichern Sie die Verzeichnisstruktur in einer neuen
 	Datei.</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
 
       <para>Erstellen Sie eine leere
 	<filename>pkg-plist</filename>-Datei:</para>
@@ -10056,12 +10053,12 @@ etc/orbit.conf.sample
 	Paketliste erstellt werden.</para>
 
       <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
 
       <para>Sie m�ssen auch alle neu erstellten Verzeichnisse in
 	die Paketliste aufnehmen.</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
       <para>Zu guter Letzt muss die Paketliste noch manuell
 	aufger�umt werden - es funktioniert eben nicht
diff --git a/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl b/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 957e41347f..0000000000
--- a/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD German Documentation Project
-     $FreeBSD$
-     $FreeBSDde: de-docproj/books/porters-handbook/freebsd.dsl,v 1.2 2007/07/29 11:57:54 jkois Exp $
-     basiert auf:  1.5
--->
-<!--
-     Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files,
-     rather than the -questions mailing list.
--->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE">
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
-
-      <![ %output.html; [
-	(define ($email-footer$)
-          (make sequence
-            (make empty-element gi: "br")
-            (literal "Fragen zum FreeBSD Ports-System richten Sie bitte an <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal ">,")
-            (literal "  Fragen zu diesem Dokument hingegen an <")
-            (create-link (list (list "HREF" "mailto:de-bsd-translators@de.FreeBSD.org"))
-              (literal "de-bsd-translators@de.FreeBSD.org"))
-            (literal ">.")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/de_DE.ISO8859-1/share/xml/catalog b/de_DE.ISO8859-1/share/xml/catalog
index 44bca8a074..2422c1740c 100644
--- a/de_DE.ISO8859-1/share/xml/catalog
+++ b/de_DE.ISO8859-1/share/xml/catalog
@@ -1,57 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- German specific ...................................................... --
-
-  -- $FreeBSD$ --
-  -- $FreeBSDde: de-docproj/share/xml/catalog,v 1.10 2004/11/28 18:16:45 jkois Exp $ --
-  -- basiert auf: 1.5 --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DE"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DE"
-	"teams.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//DE"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//DE"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
-	"glossary.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
-        "translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
-	"trademarks.ent"
-
-  -- ...................................................................... --
-  -- HTML docs  ........................................................... --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/de_DE.ISO8859-1/share/xml/catalog.xml b/de_DE.ISO8859-1/share/xml/catalog.xml
index 20a5875de6..6e76ac8d3a 100644
--- a/de_DE.ISO8859-1/share/xml/catalog.xml
+++ b/de_DE.ISO8859-1/share/xml/catalog.xml
@@ -13,7 +13,14 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+        uri="translators.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent
index 0048526ffd..d1c5b456a2 100644
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@@ -4,29 +4,33 @@
 	basiert auf: 1.1
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+	"translators.ent">
 %translators;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE">
+<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
+	"trademarks.ent">
 %de-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
+	"glossary.ent">
 %glossary;
diff --git a/de_DE.ISO8859-1/share/xml/freebsd.dsl b/de_DE.ISO8859-1/share/xml/freebsd.dsl
index 0342573287..09befccd31 100644
--- a/de_DE.ISO8859-1/share/xml/freebsd.dsl
+++ b/de_DE.ISO8859-1/share/xml/freebsd.dsl
@@ -6,37 +6,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-
-      <![ %output.html; [
-
-	(define ($email-footer$)
-          (make sequence
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Wenn Sie Fragen zu FreeBSD haben, schicken Sie eine E-Mail an <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:de-bsd-questions@de.FreeBSD.org"))
-                  (literal "de-bsd-questions@de.FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "Wenn Sie Fragen zu dieser Dokumentation haben, schicken Sie eine E-Mail an <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:de-bsd-translators@de.FreeBSD.org"))
-                  (literal "de-bsd-translators@de.FreeBSD.org"))
-	        (literal ">.")))))
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/de_DE.ISO8859-1/share/xml/l10n.ent b/de_DE.ISO8859-1/share/xml/l10n.ent
index 59defb096c..7e6e2c1de0 100644
--- a/de_DE.ISO8859-1/share/xml/l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (en).
 
diff --git a/de_DE.ISO8859-1/share/xml/mailing-lists.ent b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
index ff0b7bd91a..d4011db972 100644
--- a/de_DE.ISO8859-1/share/xml/mailing-lists.ent
+++ b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Namen der FreeBSD Mailinglisten und verwandter Software
 
diff --git a/de_DE.ISO8859-1/share/xml/mirrors-local.xsl b/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
index efb34f7a79..b7abdc1fdf 100644
--- a/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
@@ -11,7 +11,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- these params should be externally bound. The values
diff --git a/de_DE.ISO8859-1/share/xml/newsgroups.ent b/de_DE.ISO8859-1/share/xml/newsgroups.ent
index 7b62f42be1..8c647970a5 100644
--- a/de_DE.ISO8859-1/share/xml/newsgroups.ent
+++ b/de_DE.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Namen der FreeBSD-Newsgroups
 
diff --git a/de_DE.ISO8859-1/share/xml/teams.ent b/de_DE.ISO8859-1/share/xml/teams.ent
index 1f67441164..f5ad53f6b3 100644
--- a/de_DE.ISO8859-1/share/xml/teams.ent
+++ b/de_DE.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/de_DE.ISO8859-1/share/xml/trademarks.ent b/de_DE.ISO8859-1/share/xml/trademarks.ent
index 1c6879d352..218b70a202 100644
--- a/de_DE.ISO8859-1/share/xml/trademarks.ent
+++ b/de_DE.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/de_DE.ISO8859-1/share/xml/translators.ent b/de_DE.ISO8859-1/share/xml/translators.ent
index 41efe4c6cc..747d5116e1 100644
--- a/de_DE.ISO8859-1/share/xml/translators.ent
+++ b/de_DE.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
       The FreeBSD Documentation Project
       The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-common.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..bae15af13e
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Wenn Sie Fragen zu FreeBSD haben, schicken Sie eine E-Mail an
+    &lt;<a href="mailto:de-bsd-questions@de.FreeBSD.org">de-bsd-questions@de.FreeBSD.org</a>&gt;.<br/>
+    Wenn Sie Fragen zu dieser Dokumentation haben, schicken Sie eine E-Mail an
+    &lt;<a href="mailto:de-bsd-translators@de.FreeBSD.org">de-bsd-translators@de.FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/de_DE.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
index ac8bbd5de5..b8c54d75a1 100644
--- a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
+++ b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
index a2eb4744f7..04eaf8029f 100644
--- a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
+++ b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY nvidia "nVidia">
 ]>
 
diff --git a/el_GR.ISO8859-7/articles/contributing/article.xml b/el_GR.ISO8859-7/articles/contributing/article.xml
index 312c69fff9..8417de73ad 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
@@ -216,7 +212,7 @@
 	  <para>������������ �� ������ ��������� ��� ������� ������� ���� �� &posix;.  ��������
 	    �� ������ ���������� ������� �� ���� �� ������� ����
 	    ���������� <ulink url="&url.base;/projects/c99/index.html">&os;
-	    C99 & POSIX Standards Conformance Project</ulink>.  ���������� ���
+	    C99 &amp; POSIX Standards Conformance Project</ulink>.  ���������� ���
 	    ����������� ��� &os; �� ��� ����������� ��� �� �������.  �� �
 	    ����������� ��������, ��������� �� ����� � ����������� ������ ���
 	    ������������, ������� ��� ������� ����������� ������� �� ����.  �� ����� �������
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
index fdbefd6ce8..f39077162e 100644
--- a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
+++ b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
index de559a7519..871cfc6350 100644
--- a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
+++ b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
index bac63efbc8..942163e19b 100644
--- a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
+++ b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
index e7119be0b1..3c61f4d901 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
 ]>
 
 <!--
@@ -277,7 +274,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel1.png"/>
+	  <imagedata fileref="disklabel1"/>
 	</imageobject>
       </mediaobject>
 
@@ -353,7 +350,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel2.png"/>
+	  <imagedata fileref="disklabel2"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/el_GR.ISO8859-7/articles/greek-language-support/article.xml b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
index b7523c8722..9db16e7b84 100644
--- a/el_GR.ISO8859-7/articles/greek-language-support/article.xml
+++ b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
 <!ENTITY iso-ucs "ISO/IEC&nbsp;10646">
 ]>
diff --git a/el_GR.ISO8859-7/articles/laptop/article.xml b/el_GR.ISO8859-7/articles/laptop/article.xml
index 3187c5524a..78a77fe4d4 100644
--- a/el_GR.ISO8859-7/articles/laptop/article.xml
+++ b/el_GR.ISO8859-7/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/linux-users/article.xml b/el_GR.ISO8859-7/articles/linux-users/article.xml
index 42b459dcc3..3b800dba5e 100644
--- a/el_GR.ISO8859-7/articles/linux-users/article.xml
+++ b/el_GR.ISO8859-7/articles/linux-users/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
index 8153a9ba78..dafb174122 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/nanobsd/article.xml b/el_GR.ISO8859-7/articles/nanobsd/article.xml
index 1a41f7f944..30b61210e6 100644
--- a/el_GR.ISO8859-7/articles/nanobsd/article.xml
+++ b/el_GR.ISO8859-7/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   �������� ��������� ���: Introduction to NanoBSD
diff --git a/el_GR.ISO8859-7/articles/new-users/article.xml b/el_GR.ISO8859-7/articles/new-users/article.xml
index be31b2e062..66f6747099 100644
--- a/el_GR.ISO8859-7/articles/new-users/article.xml
+++ b/el_GR.ISO8859-7/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/problem-reports/article.xml b/el_GR.ISO8859-7/articles/problem-reports/article.xml
index ffc4fea0d9..5ee2aa9f02 100644
--- a/el_GR.ISO8859-7/articles/problem-reports/article.xml
+++ b/el_GR.ISO8859-7/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 
diff --git a/el_GR.ISO8859-7/articles/releng-packages/article.xml b/el_GR.ISO8859-7/articles/releng-packages/article.xml
index 7c85947b4f..2d070829a7 100644
--- a/el_GR.ISO8859-7/articles/releng-packages/article.xml
+++ b/el_GR.ISO8859-7/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   � �������� ������� ��� ������� ���������� ��� ������� ��� FreeBSD
diff --git a/el_GR.ISO8859-7/articles/releng/article.xml b/el_GR.ISO8859-7/articles/releng/article.xml
index 4659d752fe..590f04ad16 100644
--- a/el_GR.ISO8859-7/articles/releng/article.xml
+++ b/el_GR.ISO8859-7/articles/releng/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html">� �������� ������� ��� ������� ���������� ��� �������</ulink>'>
 ]>
 
diff --git a/el_GR.ISO8859-7/books/faq/book.xml b/el_GR.ISO8859-7/books/faq/book.xml
index ec1d38e9e8..6f5a7c0cd4 100644
--- a/el_GR.ISO8859-7/books/faq/book.xml
+++ b/el_GR.ISO8859-7/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 ]>
 
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 00b8ae191e..fe5f159acd 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -44,7 +44,6 @@ DOC?=		book
 FORMATS?=	html-split
 
 HAS_INDEX=	true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -318,30 +317,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS=	lastmod:::mirrors.lastmod.inc \
+		mirrors-ftp:::mirrors.xml.ftp.inc \
+		mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
 		mirrors-cvsup:::mirrors.xml.cvsup.inc \
-		eresources:::eresources.xml.www.inc
+		mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
+		eresources:::eresources.xml.www.inc \
+		eresources-index:::eresources.xml.www.index.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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index 7f143e23b0..8c187c5e69 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����������� ������ ���������
@@ -2908,7 +2908,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
 		<filename>pxeboot</filename>, not the kernel.  There are other
 		interesting possibilities, like loading
 		<filename>pxeboot</filename> from a &os; CD-ROM
-		<filename role="directory">/boot</filename> directory (as
+		<filename class="directory">/boot</filename> directory (as
 		&man.pxeboot.8; can load a <filename>GENERIC</filename> kernel,
 		this makes it possible to use <acronym>PXE</acronym> to boot
 		from a remote CD-ROM).</para>
@@ -4794,7 +4794,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	  should be issued on
 	  <hostid>provider.example.org</hostid>:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>This should be done on the <devicename>carp</devicename>
 	  interface which corresponds to the correct host.</para>
diff --git a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
index d4e062a558..e76ff9fa67 100644
--- a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������� ��������� ���������
@@ -232,7 +232,7 @@
     <title>Audit Configuration</title>
 
     <para>All configuration files for security audit are found in
-      <filename role="directory">/etc/security</filename>.  The following
+      <filename class="directory">/etc/security</filename>.  The following
       files must be present before the audit daemon is started:</para>
 
     <itemizedlist>
diff --git a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
index 9b19881c83..23fa33a490 100644
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������� ������� ��� Unix
@@ -1214,7 +1214,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir1" format="EPS" />
+	<imagedata fileref="install/example-dir1" />
       </imageobject>
 
       <textobject>
@@ -1235,7 +1235,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir2" format="EPS"/>
+	<imagedata fileref="install/example-dir2"/>
       </imageobject>
 
       <textobject>
@@ -1264,7 +1264,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir3" format="EPS" />
+	<imagedata fileref="install/example-dir3" />
       </imageobject>
 
       <textobject>
@@ -1291,7 +1291,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir4" format="EPS"/>
+	<imagedata fileref="install/example-dir4"/>
       </imageobject>
 
       <textobject>
@@ -1317,7 +1317,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir5" format="EPS"/>
+	<imagedata fileref="install/example-dir5"/>
       </imageobject>
 
       <textobject>
@@ -1635,7 +1635,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/disk-layout" format="EPS"/>
+	  <imagedata fileref="install/disk-layout"/>
 	</imageobject>
 
 	<textobject>
diff --git a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
index d7426c1885..8eb5287d48 100644
--- a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������������
diff --git a/el_GR.ISO8859-7/books/handbook/book.xml b/el_GR.ISO8859-7/books/handbook/book.xml
index ca8bac31b0..3bb9c80aa3 100644
--- a/el_GR.ISO8859-7/books/handbook/book.xml
+++ b/el_GR.ISO8859-7/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/el_GR.ISO8859-7/books/handbook/boot/chapter.xml b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
index 78fd02bb2e..1eb393009f 100644
--- a/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: � ���������� ��������� ��� FreeBSD
diff --git a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
index 562791a918..6aaf503c34 100644
--- a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
@@ -693,7 +693,7 @@ Loading /boot/defaults/loader.conf
 
 	      <mediaobject>
 		<imageobject>
-		  <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu" format="PNG"/>
+		  <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"/>
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -766,14 +766,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	    role="Programmable Read Only Memory">PROM</acronym> � �����
 	  ������� �� ��� ��������:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5"/>
-	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="bsdinstall-prompt-single">
@@ -786,7 +780,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		������� ��� ������ ��� ������� CPU.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>��� ������ ����, ����������� �� CDROM ���� ����� ���
 	  ���� �������� ��� <acronym>PROM</acronym> ������
@@ -986,7 +979,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1032,7 +1025,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1047,7 +1040,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1076,7 +1069,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1098,7 +1091,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-components" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-config-components"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1188,7 +1181,7 @@ 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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1205,7 +1198,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1232,7 +1225,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1248,7 +1241,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1267,7 +1260,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1288,7 +1281,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-review" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-review"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1305,7 +1298,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1321,7 +1314,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1397,7 +1390,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1581,7 +1574,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-final-confirmation" format="PNG"/>
+	  <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1613,7 +1606,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching" format="PNG"/>
+	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1627,7 +1620,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying" format="PNG"/>
+	  <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1640,7 +1633,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting" format="PNG"/>
+	  <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1674,7 +1667,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1700,7 +1693,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1735,7 +1728,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1756,7 +1749,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1774,7 +1767,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup" format="PNG"/>
+	      <imagedata fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1795,7 +1788,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1826,7 +1819,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1843,7 +1836,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1888,7 +1881,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1914,7 +1907,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1931,7 +1924,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1978,7 +1971,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2002,7 +1995,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2020,7 +2013,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2033,7 +2026,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-country" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2046,7 +2039,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2059,7 +2052,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2081,7 +2074,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-services" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-config-services"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2131,7 +2124,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-crashdump" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2156,7 +2149,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2168,7 +2161,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2272,7 +2265,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2298,7 +2291,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2355,7 +2348,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2372,7 +2365,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/el_GR.ISO8859-7/books/handbook/chapters.ent b/el_GR.ISO8859-7/books/handbook/chapters.ent
index daa4314a4b..eefe8973a2 100644
--- a/el_GR.ISO8859-7/books/handbook/chapters.ent
+++ b/el_GR.ISO8859-7/books/handbook/chapters.ent
@@ -17,235 +17,62 @@
 
 -->
 
-<!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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
-]]>
-<![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.xml">
-]]>
+  <!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">
+  <!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">
+  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!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/el_GR.ISO8859-7/books/handbook/colophon.xml b/el_GR.ISO8859-7/books/handbook/colophon.xml
index 98df77588e..2db2cb7527 100644
--- a/el_GR.ISO8859-7/books/handbook/colophon.xml
+++ b/el_GR.ISO8859-7/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: �������� �������
diff --git a/el_GR.ISO8859-7/books/handbook/config/chapter.xml b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
index d9c096ae43..7a748980e8 100644
--- a/el_GR.ISO8859-7/books/handbook/config/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������� ��� ��������������
@@ -403,7 +403,7 @@ stop)
         kill -9 `cat /var/run/utility.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" &gt;&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
@@ -854,7 +854,7 @@ $sshd_enable=YES</screen>
       ������� �� ������� ���� ������� �������� &man.rc.8; ��� &man.rc.subr.8;.
       �� ������������ ��� ��� ������� ����� ���
       �������� <filename>rc.d</filename> � ��� ��� �������� ��� ���
-      ����������, �� ������ <ulink url="&url.articles.rc-scripting">���
+      ����������, �� ������ <ulink url="&url.articles.rc-scripting;">���
       �������� �����</ulink> ������ �������.</para>
   </sect1>
 
diff --git a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
index 0620644521..2989c85826 100644
--- a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������� ��� ���������� ��� FreeBSD
@@ -1272,7 +1272,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
       </sect3>
     </sect2>
 
-<![ IGNORE [
+<!-- XXX
     <sect2 id="docsnap">
       <sect2info>
 	<authorgroup>
@@ -1332,13 +1332,13 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	  ��������.</para>
       </note>
 
-      <para>��� ��������������� ��� ������� <option>--delete</option>, �����
+      <para>��� ��������������� ��� ������� <option>&dash;&dash;delete</option>, �����
 	� <command>make installworld</command> ��������� ������ �������� ����
 	�������� <filename class="directory">/usr/share/doc</filename> ��
 	����� �� ��������.  ��� �� ���������� �� ����� ������, ��������������
 	��� �������� ������:</para>
 
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>rsync -rltvz &dash;&dash;delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
 
       <para>�� ���������� �� ����������� ��� ��������� ��� �����������, ���
 	���������� ���� ��� ������� ����������, �������� �� ���������������
@@ -1346,7 +1346,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 
       <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/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
index 77b5691edd..6c69393afa 100644
--- a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: Desktop ���������
diff --git a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
index e865836ba7..05a30a92d1 100644
--- a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������������ ����
@@ -2694,7 +2694,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	<example>
 	  <title>A Script for Creating a Bootable Floppy</title>
 
-	<programlisting><![ CDATA [#!/bin/sh
+	<programlisting><![CDATA[#!/bin/sh
 #
 # create a restore floppy
 #
@@ -2740,7 +2740,7 @@ mkdir /mnt/var
 #
 if [ ! -x /sys/compile/MINI/kernel ]
 then
-	 cat << EOM
+	 cat &lt;&lt; EOM
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
@@ -2822,19 +2822,19 @@ cd /
 #
 # create minimum file system table
 #
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab &lt;&lt;EOM
 /dev/fd0a    /    ufs    rw  1  1
 EOM
 
 #
 # create minimum passwd file
 #
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/passwd &lt;&lt;EOM
+root:*:0:0:Charlie &amp;:/root:/bin/sh
 EOM
 
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/master.passwd &lt;&lt;EOM
+root::0:0::0:0:Charlie &amp;:/root:/bin/sh
 EOM
 
 chmod 600 /mnt/etc/master.passwd
@@ -2906,16 +2906,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
 	  Whatever caused the crash or data loss may strike again.  Another
 	  hour spent now may save you from further distress later.</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* I Did Not Prepare for the Disaster, What Now?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
@@ -3908,7 +3898,7 @@ device crypto</screen>
 	  <para>The following example will describe how to generate a
 	    key file, which will be used as part of the Master Key for
 	    the encrypted provider mounted under
-	    <filename role="directory">/private</filename>.  The key
+	    <filename class="directory">/private</filename>.  The key
 	    file will provide some random data used to encrypt the
 	    Master Key.  The Master Key will be protected by a
 	    passphrase as well.  Provider's sector size will be 4kB big.
@@ -3980,7 +3970,7 @@ Filesystem     Size   Used  Avail Capacity  Mounted on
 	  <title>Unmounting and Detaching the Provider</title>
 
 	  <para>Once the work on the encrypted partition is done, and
-	    the <filename role="directory">/private</filename> partition
+	    the <filename class="directory">/private</filename> partition
 	    is no longer needed, it is prudent to consider unmounting
 	    and detaching the <command>geli</command> encrypted
 	    partition from the kernel.</para>
diff --git a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
index ba77da0fa4..3d0a0545b0 100644
--- a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: DTrace
diff --git a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
index dbd61564f6..5bfedf526b 100644
--- a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����� ������������ ��� ���������
@@ -1585,7 +1585,7 @@
 
 	    <para>���������� �������� �������� �� ���
 	      <quote>������� ��� Ports</quote> (<filename
-		role="directory">/usr/ports</filename>) ��� ������������ ��
+		class="directory">/usr/ports</filename>) ��� ������������ ��
 	      ����� ����������� � ���������� ��������� ��� &os; ���� ��� �����
 	      �������� �������.  ��������������� �������� �������� ��
 	      ������� ���� ������������� ��� ��� �������, ���� �����������
@@ -2196,6 +2196,10 @@
     <sect2 id="eresources-web-mirrors">
       <title>������� Mirrors</title>
 
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
index b9dd86fd33..520d07ee65 100644
--- a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������� �������
@@ -241,7 +241,7 @@ example      17547136       0 17547136     0%    /example</screen>
 	  ��� ����� ������� ������� ������ �� �� ����, ���� �������� ���
 	  �������� ����������:</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
index b02e5148e6..c58f023aaf 100644
--- a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: Firewalls
diff --git a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
index 298c4e9e17..661117e46c 100644
--- a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: GEOM: ���������� ���������� ������
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index cb7d31d596..8af797331d 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������������� �� FreeBSD
@@ -328,7 +328,7 @@
 	��������� ��� �����, ��� ��� ���������� ��� ������ ����������.</para>
 
       <sect3 id="install-where-i386">
-	<title>����������� ������ ��� ������������� &os/&arch.i386;</title>
+	<title>����������� ������ ��� ������������� &os;/&arch.i386;</title>
 
 	<para>���� ������� ������ PC ������ �� �������� �� �������� �������.
 	  �� ������� ���� ���������
@@ -1066,7 +1066,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"/>
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -1104,14 +1104,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  <command>~#</command> ��� &man.tip.1; � ��� &man.cu.1;) ��� ��
 	  ������� ���� �������� ��� PROM.  �������� ���� ��������:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1124,7 +1118,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		SMP, �� ����� ������� ��� ������ ��� ������� CPU.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>��� ������ ����, ����������� �� CDROM ���� �����, ��� ��� ���
 	  �������� ��� PROM, ������ <command>boot cdrom</command>.</para>
@@ -1235,7 +1228,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1251,7 +1244,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1291,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1307,7 +1300,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1319,7 +1312,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1350,7 +1343,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1372,7 +1365,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1389,7 +1382,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-options" format="PNG"/>
+	    <imagedata fileref="install/main-options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1399,7 +1392,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1437,7 +1430,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1619,7 +1612,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1688,7 +1681,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1734,7 +1727,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1779,7 +1772,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1811,7 +1804,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2070,7 +2063,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2100,7 +2093,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2127,7 +2120,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2146,7 +2139,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2164,7 +2157,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2181,7 +2174,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2204,7 +2197,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2259,7 +2252,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2313,7 +2306,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2346,7 +2339,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2549,7 +2542,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2594,7 +2587,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2775,7 +2768,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2870,7 +2863,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2952,7 +2945,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3012,7 +3005,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3064,7 +3057,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3079,7 +3072,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3099,7 +3092,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3113,7 +3106,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3156,7 +3149,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3169,7 +3162,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3182,7 +3175,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3251,7 +3244,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3265,7 +3258,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3282,7 +3275,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3296,7 +3289,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3311,7 +3304,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3327,7 +3320,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3370,7 +3363,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3391,7 +3384,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3420,7 +3413,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3435,7 +3428,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3477,7 +3470,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3490,7 +3483,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3593,7 +3586,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3658,7 +3651,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3733,7 +3726,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3807,7 +3800,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3865,7 +3858,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3890,7 +3883,7 @@ Retype new password :</screen>
 	<title>������� ������� Lower-level (��������� ��������)</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
index 6df27ecefc..42a539d791 100644
--- a/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������
diff --git a/el_GR.ISO8859-7/books/handbook/jails/chapter.xml b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
index 0149ef15ad..e6e7c88d59 100644
--- a/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: Jails
diff --git a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
index 4aa66c2439..e42bb7b4cc 100644
--- a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����������� ��� ������ ��� FreeBSD
diff --git a/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
index faa054cd4a..3a0c9e58b9 100644
--- a/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������� ��������� - ����� ��� ������� I18N/L10N
diff --git a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
index 6b0bc9d9b9..498c48d5ec 100644
--- a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����������� �� ���������� ��� Linux
@@ -698,14 +698,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -1002,7 +1002,7 @@ exit 0</programlisting>
 	    �������� �� ��������:</para>
 
 	  <programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/el_GR.ISO8859-7/books/handbook/mac/chapter.xml b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
index ccdc74afc0..a674a3147e 100644
--- a/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������������ ������� ���������
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index f056b75c19..6779668675 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����������� �����������
@@ -1761,11 +1761,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	  ���������� ��� �������� �������:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>� ������������ ��� <application>sendmail</application> ���
 	  ������ �� ����������� ����������, �� ��
@@ -2031,7 +2031,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2042,7 +2042,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2080,7 +2080,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2133,7 +2133,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2154,7 +2154,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2165,7 +2165,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2178,7 +2178,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2196,7 +2196,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
index e8e879bbc4..4f54ea2d93 100644
--- a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��� �� ������ �� FreeBSD
@@ -212,6 +212,10 @@
       ������������ ������ �������� ����������� ��������� ��� ���� site
       ��������:</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2376,6 +2380,10 @@ doc/zh_*</screen>
       <para>�������� �� ������ ������������ <link linkend="cvsup">CVSup</link>
 	��� �� &os; ���� ��������� ����������:</para>
 
+      &chap.mirrors.cvsup.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
index d6f26eedf2..f8368676da 100644
--- a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������
@@ -1667,7 +1667,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>�������� �� backend:</para>
 
diff --git a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
index cf3eaab2a0..ec5b7daf26 100644
--- a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������������ �������
@@ -3104,7 +3104,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<hostid>org.</hostid>, as <hostid>org.</hostid> is more specific
 	than the root zone.  The layout of each part of a hostname is
 	much like a file system: the
-	<filename role="directory">/dev</filename> directory falls
+	<filename class="directory">/dev</filename> directory falls
 	within the root, and so on.</para>
     </sect2>
 
@@ -3188,7 +3188,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	    </row>
 
 	    <row>
-	      <entry><filename role="directory">/etc/namedb</filename></entry>
+	      <entry><filename class="directory">/etc/namedb</filename></entry>
 	      <entry>Directory where BIND zone information resides.</entry>
 	    </row>
 
@@ -3202,10 +3202,10 @@ dhcpd_ifaces="dc0"</programlisting>
 
       <para>Depending on how a given zone is configured on the server,
 	the files related to that zone can be found in the <filename
-	role="directory">master</filename>, <filename
-	role="directory">slave</filename>, or <filename
-	role="directory">dynamic</filename> subdirectories of the
-	<filename role="directory">/etc/namedb</filename> directory.
+	class="directory">master</filename>, <filename
+	class="directory">slave</filename>, or <filename
+	class="directory">dynamic</filename> subdirectories of the
+	<filename class="directory">/etc/namedb</filename> directory.
 	These files contain the <acronym>DNS</acronym> information that
 	will be given out by the name server in response to queries.</para>
     </sect2>
@@ -3253,7 +3253,7 @@ dhcpd_ifaces="dc0"</programlisting>
 
       <para>Configuration files for <application>named</application>
 	currently reside in
-	<filename role="directory">/etc/namedb</filename> directory and
+	<filename class="directory">/etc/namedb</filename> directory and
 	will need modification before use, unless all that is needed is
 	a simple resolver.  This is where most of the configuration will
 	be performed.</para>
@@ -3262,7 +3262,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<title>Using <command>make-localhost</command></title>
 
 	<para>To configure a master zone for the localhost visit the
-	  <filename role="directory">/etc/namedb</filename> directory
+	  <filename class="directory">/etc/namedb</filename> directory
 	  and run the following command:</para>
 
 	<screen>&prompt.root; <userinput>sh make-localhost</userinput></screen>
diff --git a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
index 4bfb7574f2..f3876f083a 100644
--- a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������� PGP
diff --git a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
index 8f9f091262..9fba5ed3c1 100644
--- a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����������� ���������: Packages ��� Ports
@@ -679,7 +679,7 @@ docbook                     =
 	</note>
 
 	<para>������������� ��� ��
-	  <filename role="directory">/usr/ports</filename>
+	  <filename class="directory">/usr/ports</filename>
 	  ����� ����� ���� ���������� �� <application>csup</application> ���
 	  ����� ����!  ��� ����� ��� ��������� �� ������� ��� Ports ����
 	  ������� ����� �����, �� <application>csup</application>
diff --git a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
index ef5b3378ea..61f24b024f 100644
--- a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: PPP ��� SLIP
diff --git a/el_GR.ISO8859-7/books/handbook/preface/preface.xml b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
index 6d945c2eff..3008e81f47 100644
--- a/el_GR.ISO8859-7/books/handbook/preface/preface.xml
+++ b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������
diff --git a/el_GR.ISO8859-7/books/handbook/printing/chapter.xml b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
index c5c5eb6f86..d39064cba6 100644
--- a/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ����������
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.xml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
index ce0a37b849..e1e9ee4368 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������
@@ -2693,7 +2693,7 @@ kadmind5_server_enable="YES"</programlisting>
 
 	<para>This is done because the applications for
 	  <acronym>MIT</acronym> kerberos installs binaries in the
-	  <filename role="directory">/usr/local</filename>
+	  <filename class="directory">/usr/local</filename>
 	  hierarchy.</para>
       </sect2>
 
diff --git a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
index 1e1d557673..b309e8b819 100644
--- a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������� ������������
diff --git a/el_GR.ISO8859-7/books/handbook/users/chapter.xml b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
index 9b49303608..3377c0f694 100644
--- a/el_GR.ISO8859-7/books/handbook/users/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ������� ��� ������ ���������� �����������
diff --git a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
index 8ff93bc5df..4d6b51e7bf 100644
--- a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: � ������������ ����� Vinum
diff --git a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
index b55c5811fb..dd2f79e415 100644
--- a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: ��������������
@@ -1026,7 +1026,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	  role="package">emulators/virtualbox-ose-additions</filename>
 	��� ������������� &os; �����������.</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
 
       <para>��������� ��� �������� ������� ���
 	<filename>/etc/rc.conf</filename>:</para>
diff --git a/el_GR.ISO8859-7/books/handbook/x11/chapter.xml b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
index d709336dd8..30231906f0 100644
--- a/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ���������� ��� FreeBSD: �� ������� X Window
@@ -336,7 +336,7 @@
       � ����������� � ��� ���������� X Window System ��� X.Org Foundation,
       ��� ����� �������� ������.  � <application>&xorg;</application> �����
       ���������� ���� ������ ���
-      <application>&xfree86&nbsp;4.4RC2</application> ��� ��� X11R6.6.
+      <application>&xfree86;&nbsp;4.4RC2</application> ��� ��� X11R6.6.
       � ������ ��� <application>&xorg;</application> ��� ����������
       ��� ��� ������� ��� Ports ��� &os; ����� � &xorg.version;.</para>
 
diff --git a/el_GR.ISO8859-7/share/xml/catalog b/el_GR.ISO8859-7/share/xml/catalog
index 3effaf96b0..2422c1740c 100644
--- a/el_GR.ISO8859-7/share/xml/catalog
+++ b/el_GR.ISO8859-7/share/xml/catalog
@@ -1,60 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-  --
-  -- %SOURCE%	en_US.ISO8859-1/share/xml/catalog
-  -- %SRCID%	1.5
-
-  -- It doesn't make sense to translate all the entity files of the
-  -- FreeBSD docs to Greek; some of the entities are better left off in
-  -- their original English version.  Please use your judgement wisely
-  -- when adding new entity translations to the Greek translations.
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
-        "../../../share/xml/freebsd.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
-        "freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
-	"glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
-	"mailing-lists.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
-        "newsgroups.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
-        "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
-        "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
-	"translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-        "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
-	"urls.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/el_GR.ISO8859-7/share/xml/catalog.xml b/el_GR.ISO8859-7/share/xml/catalog.xml
index 12c0f02504..a3feec86ca 100644
--- a/el_GR.ISO8859-7/share/xml/catalog.xml
+++ b/el_GR.ISO8859-7/share/xml/catalog.xml
@@ -9,4 +9,8 @@
                  rewritePrefix="../../"/>
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
 </catalog>
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index ad55947dbf..7a156813e3 100644
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ��� entities ��� ����� �������� �� ��� �� ������ ��� ���������
@@ -12,50 +13,57 @@
 
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
+	"translators.ent">
 %translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+	"teams.ent">
 %teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
+	"glossary.ent">
 %glossary;
 
 <!-- � ����� ��� %freebsd.el; ��� %freebsd; ����� ���������.
      ������������� ����� �� entities ��� ��������� �����.  ����� ���������
      ��� ����� ����������� ��� ��������, �� �������� �������� ��� ���
      ������� ������ -->
-<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL">
+<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
+	"freebsd.ent">
 %freebsd.el;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
+	"trademarks.ent">
 %trademarks;
 
 <!-- � ����� ��� %urls.el; ��� %urls; ����� ���������.
      ������������� ����� �� entities ��� ��������� �����.  ����� ���������
      ��� ����� ����������� ��� ��������, �� �������� �������� ��� ���
      ������� ������ -->
-<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL">
+<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
+	"urls.ent">
 %urls.el;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
 
 <!--
diff --git a/el_GR.ISO8859-7/share/xml/freebsd.dsl b/el_GR.ISO8859-7/share/xml/freebsd.dsl
index a825f1eace..a84951bb2e 100644
--- a/el_GR.ISO8859-7/share/xml/freebsd.dsl
+++ b/el_GR.ISO8859-7/share/xml/freebsd.dsl
@@ -11,57 +11,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
-<!ENTITY % lang.el.dsssl "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <!-- HTML only .................................................... -->
-
-      <![ %output.html; [
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "���� �� �������, ��� ���� �������, ������ �� ������ ��� ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "��� ��������� ������� �� �� FreeBSD, �������� ��� ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "����������"))
-                (literal " ���� �� �������������� �� ��� <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "��� ��������� ������� �� ���� ��� ����������, ������� e-mail ���� <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-
-        (element quote
-          (make sequence
-            (make entity-ref name: "laquo")
-            (process-children)
-            (make entity-ref name: "raquo")))
-      ]]>
-
       (define (local-el-label-title-sep)
         (list
           (list (normalize "warning")		": ")
@@ -79,11 +33,3 @@
 
   <external-specification id="docbook" document="freebsd.dsl">
 </style-sheet>
-
-<!--
-Local variables:
-coding: iso-8859-7
-mode: dsssl
-fill-column: 78
-End:
--->
diff --git a/el_GR.ISO8859-7/share/xml/freebsd.ent b/el_GR.ISO8859-7/share/xml/freebsd.ent
index 783ac46705..4f62e17b80 100644
--- a/el_GR.ISO8859-7/share/xml/freebsd.ent
+++ b/el_GR.ISO8859-7/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� DocBook Entities ��� �� FreeBSD Project.
diff --git a/el_GR.ISO8859-7/share/xml/l10n.ent b/el_GR.ISO8859-7/share/xml/l10n.ent
index 9fe0efeefd..12ba0ae45d 100644
--- a/el_GR.ISO8859-7/share/xml/l10n.ent
+++ b/el_GR.ISO8859-7/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ��������������� ��� ��������� ��������� ��� ��� HTML charset ��� �����������
diff --git a/el_GR.ISO8859-7/share/xml/mailing-lists.ent b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
index b75e42da12..314654ee0d 100644
--- a/el_GR.ISO8859-7/share/xml/mailing-lists.ent
+++ b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ��� ��� ������ ������������ ������������ ��� FreeBSD,
diff --git a/el_GR.ISO8859-7/share/xml/newsgroups.ent b/el_GR.ISO8859-7/share/xml/newsgroups.ent
index b937d55599..b43cf09bb9 100644
--- a/el_GR.ISO8859-7/share/xml/newsgroups.ent
+++ b/el_GR.ISO8859-7/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ������ ���������� Usenet ��� �� FreeBSD
diff --git a/el_GR.ISO8859-7/share/xml/teams.ent b/el_GR.ISO8859-7/share/xml/teams.ent
index 54a2782dac..4465078694 100644
--- a/el_GR.ISO8859-7/share/xml/teams.ent
+++ b/el_GR.ISO8859-7/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   �� ������� ��� �� ���������� ��� ������ ��� ����� ������������
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index 520d80b930..a9aa5958de 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ����� ������������� �������� ��� ��������� ��������, ���� ���������
diff --git a/el_GR.ISO8859-7/share/xml/translators.ent b/el_GR.ISO8859-7/share/xml/translators.ent
index 90b9e081d8..e851501192 100644
--- a/el_GR.ISO8859-7/share/xml/translators.ent
+++ b/el_GR.ISO8859-7/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   ������� ��� ����������� ������������ ������������� ��� ����� ���
diff --git a/el_GR.ISO8859-7/share/xml/urls.ent b/el_GR.ISO8859-7/share/xml/urls.ent
index 8658f8c6de..365c42d573 100644
--- a/el_GR.ISO8859-7/share/xml/urls.ent
+++ b/el_GR.ISO8859-7/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   URLs ��� ����� ����� ���� �� ��� �������� ���������� ��� FreeBSD.
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-common.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..f1e6f1701c
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-7'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>���� �� �������, ��� ���� �������, ������ �� ������ ���
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>��� ��������� ������� �� �� FreeBSD, �������� ���
+    <a href="http://www.FreeBSD.org/docs.html">����������</a> ���� �� �������������� �� ���
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    ��� ��������� ������� �� ���� ��� ����������, ������� e-mail ����
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/el_GR.ISO8859-7/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index f1cdd5a381..f1043f3ed3 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <title>Why you should use a BSD style license for your Open Source Project</title>
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index 16ab5ec83f..86ae7b5600 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
@@ -395,7 +392,7 @@
         <title>FreeBSD Organization</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="freebsd-organization" format="PIC"/>
+            <imagedata fileref="freebsd-organization"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -448,7 +445,7 @@
         <title>FreeBSD Release Branches</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="freebsd-branches" format="EPS"/>
+            <imagedata fileref="freebsd-branches"/>
           </imageobject>
         </mediaobject>
       </figure>
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
index d126919ccc..0e2156becd 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <title>Argentina.com : A Case Study</title>
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 0326045957..0ddf939687 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY ga "Google Analytics">
 ]>
 
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index 542ccf1556..951829cb0a 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/article.xml
+++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="en">
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/console-server/article.xml b/en_US.ISO8859-1/articles/console-server/article.xml
index 0207854871..b0c78d3ef3 100644
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
@@ -786,7 +783,7 @@ exit 0</programlisting>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="tk0231-9-1.png"/>
+	  <imagedata fileref="tk0231-9-1"/>
 	</imageobject>
 
 	<textobject>
diff --git a/en_US.ISO8859-1/articles/contributing-ports/article.xml b/en_US.ISO8859-1/articles/contributing-ports/article.xml
index 6b81d92b01..f9778f0e7d 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/article.xml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributing/article.xml b/en_US.ISO8859-1/articles/contributing/article.xml
index c938c2e239..ac6d5f2450 100644
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributors/article.xml b/en_US.ISO8859-1/articles/contributors/article.xml
index 661c0c2d65..c7c0a6fa95 100644
--- a/en_US.ISO8859-1/articles/contributors/article.xml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % contrib.ent SYSTEM "contrib.ent">
 %contrib.ent;
 <!ENTITY % not.published "IGNORE">
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
index 1d9100b739..398ff330aa 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
   <itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 4ba081f290..2bd83c8d55 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 15723d8303..f633eb270c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index f6027c1e48..45028ce029 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
   <itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
index d186e02da5..319651d9d9 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 
 <!-- $FreeBSD$ -->
   <itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
index 8516d79d8d..4c7d03fe7c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
   <itemizedlist>
diff --git a/en_US.ISO8859-1/articles/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 35c13dfcc9..7f4f83578b 100644
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 95c88263d6..f003443fe1 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
@@ -77,7 +74,7 @@
 	<application>binutils</application> using the &os; ports tree,
 	issue the following command:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils &amp;&amp; make install</userinput></screen>
     </sect2>
 
     <sect2 id="installing-gcc">
@@ -94,7 +91,7 @@
 	<application>GCC</application> ports, run the following
 	command:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> &amp;&amp; make install</userinput></screen>
     </sect2>
   </sect1>
 
@@ -113,7 +110,7 @@
 	<filename>/etc/make.conf</filename> file (or modify
 	appropriately):</para>
 
-      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
 CC=gcc44
 CXX=g++44
 CPP=cpp44
@@ -172,7 +169,7 @@ libstdc++.so.6  gcc44/libstdc++.so.6</programlisting>
 	<filename>/etc/make.conf</filename> according to the following
 	example:</para>
 
-      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
 CC=gcc44
 CXX=g++44
 CPP=cpp44
@@ -195,7 +192,7 @@ CFLAGS+=-mssse3
 	<filename>/etc/make.conf</filename> according to the following
 	example:</para>
 
-      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
 .if empty(.CURDIR:M/usr/ports/net/openldap*)
 CC=gcc44
 CXX=g++44
@@ -208,7 +205,7 @@ CPP=cpp44
 	<filename role="package">net/openldap</filename>* ports.  It is
 	also possible to specify more ports on a single line:</para>
 
-      <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+      <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) &amp;&amp; empty(.CURDIR:M/usr/ports/xxx/yyy) &amp;&amp; ...</programlisting>
     </sect2>
   </sect1>
 
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index e19b4b3dd8..ddf0d2845b 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.xml b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
index ef3d40ccaa..eb6f1530d5 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 3ca6798cca..8adbfcb619 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
 ]>
 
-<article lang='en'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
   <articleinfo>
     <title>FreeBSD From Scratch</title>
 
@@ -383,7 +381,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
       which you need to modify substantially.  The comments give you
       enough information what to change.</para>
 
-<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_1.conf.default" parse="text"/></programlisting>
 
     <para>Download <ulink
         url="stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -487,7 +485,7 @@ news inn-stable       CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
       <filename>LOGDIR/category+port</filename> is created for each port
       it actually installs.</para>
 
-<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_2.conf.default" parse="text"/></programlisting>
 
     <para>Download <ulink
         url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -588,7 +586,7 @@ fi
         url="stage_1.sh"><filename>stage_1.sh</filename></ulink>
       script, which you should not need to modify.</para>
 
-<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_1.sh" parse="text"/></programlisting>
 
     <para>Download <ulink
         url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -598,7 +596,7 @@ fi
       script.  You may want to modify the variables at the
       beginning.</para>
 
-<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_2.sh" parse="text"/></programlisting>
 
     <para>Download <ulink
         url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -607,7 +605,7 @@ fi
         url="stage_3.mk"><filename>stage_3.mk</filename></ulink> to
       give you an idea how to automate all reconfiguration.</para>
 
-<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_3.mk" parse="text"/></programlisting>
 
     <para>Download <ulink
         url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.xml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index 0ff9690ad1..bf122f7872 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/fonts/article.xml b/en_US.ISO8859-1/articles/fonts/article.xml
index da22671ed1..8715ce7311 100644
--- a/en_US.ISO8859-1/articles/fonts/article.xml
+++ b/en_US.ISO8859-1/articles/fonts/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.xml b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
index 4092f4b104..0ea4545f87 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index 1d1e16d6d7..3eb9bec50b 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
 ]>
 
@@ -790,14 +788,14 @@ the new builds.</screen>
 
 	<screen>               # Build the world
 		   log "Building world"
-		   cd /usr/src &&
-		   make -j 2 ${COMPATFLAGS} buildworld 2>&1
+		   cd /usr/src &amp;&amp;
+		   make -j 2 ${COMPATFLAGS} buildworld 2>&amp;1
 
 		# Distribute the world
 		   log "Distributing world"
-		   cd /usr/src/release &&
-		   make -j 2 obj &&
-		   make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+		   cd /usr/src/release &amp;&amp;
+		   make -j 2 obj &amp;&amp;
+		   make ${COMPATFLAGS} release.1 release.2 2>&amp;1</screen>
       </listitem>
 
       <listitem>
diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml
index 4ceccd753e..e089c2b054 100644
--- a/en_US.ISO8859-1/articles/geom-class/article.xml
+++ b/en_US.ISO8859-1/articles/geom-class/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <title>Writing a GEOM Class</title>
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index cfd89a4664..1b0566cba2 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="en">
   <articleinfo>
@@ -224,7 +221,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel1.png"/>
+	  <imagedata fileref="disklabel1"/>
 	</imageobject>
       </mediaobject>
 
@@ -286,7 +283,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel2.png"/>
+	  <imagedata fileref="disklabel2"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/en_US.ISO8859-1/articles/hubs/article.xml b/en_US.ISO8859-1/articles/hubs/article.xml
index 7292390508..7fdcbabe7f 100644
--- a/en_US.ISO8859-1/articles/hubs/article.xml
+++ b/en_US.ISO8859-1/articles/hubs/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.xml b/en_US.ISO8859-1/articles/ipsec-must/article.xml
index 58a5db6ccb..80abb023d0 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.xml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/articles/laptop/article.xml b/en_US.ISO8859-1/articles/laptop/article.xml
index 524bc45724..c283427099 100644
--- a/en_US.ISO8859-1/articles/laptop/article.xml
+++ b/en_US.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/ldap-auth/article.xml b/en_US.ISO8859-1/articles/ldap-auth/article.xml
index 6a89f2429a..7f055fa72a 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/article.xml
+++ b/en_US.ISO8859-1/articles/ldap-auth/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="en">
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.xml b/en_US.ISO8859-1/articles/linux-comparison/article.xml
index a2d1b85be5..3d24209113 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.xml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 Copyright (c) 2005 Dru Lavigne
diff --git a/en_US.ISO8859-1/articles/linux-emulation/article.xml b/en_US.ISO8859-1/articles/linux-emulation/article.xml
index 4cd9ddff17..0f7b4e9ee6 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/article.xml
+++ b/en_US.ISO8859-1/articles/linux-emulation/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/linux-users/article.xml b/en_US.ISO8859-1/articles/linux-users/article.xml
index 7ab8662b66..d5a00d5dd6 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.xml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
index 03a06ad331..4f839f52cc 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/mh/article.xml b/en_US.ISO8859-1/articles/mh/article.xml
index 5dc3b56d0f..5f31506852 100644
--- a/en_US.ISO8859-1/articles/mh/article.xml
+++ b/en_US.ISO8859-1/articles/mh/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/nanobsd/article.xml b/en_US.ISO8859-1/articles/nanobsd/article.xml
index 4f921c9c48..a126f2f99f 100644
--- a/en_US.ISO8859-1/articles/nanobsd/article.xml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/new-users/article.xml b/en_US.ISO8859-1/articles/new-users/article.xml
index 86bd6b318f..d298a80c6d 100644
--- a/en_US.ISO8859-1/articles/new-users/article.xml
+++ b/en_US.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index f0c1492efb..d93580c45b 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.xml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <title>Perforce in &os; Development</title>
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 75dfb6bef9..deba48a499 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   - Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -39,7 +36,7 @@
   - SUCH DAMAGE.
   -->
 
-<article lang='en'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
   <articleinfo>
     <title>Pluggable Authentication Modules</title>
 
@@ -837,8 +834,7 @@ sshd	password	required	pam_permit.so</programlisting>
       <title id="pam-config-breakdown.title">Breakdown of a
 	configuration line</title>
 
-      <para>As explained in the <link linkend="pam-config-file"
-	endterm="pam-config-file.title"></link> section, each line in
+      <para>As explained in <xref linkend="pam-config-file"/>, each line in
 	<filename>/etc/pam.conf</filename> consists of four or more
 	fields: the service name, the facility name, the control flag,
 	the module name, and zero or more module arguments.</para>
@@ -855,13 +851,10 @@ sshd	password	required	pam_permit.so</programlisting>
 	facility name.</para>
 
       <para>The facility is one of the four facility keywords
-	described in the <link linkend="pam-facilities-primitives"
-	endterm="pam-facilities-primitives.title"></link>
-	section.</para>
+	described in <xref linkend="pam-facilities-primitives"/>.</para>
 
       <para>Likewise, the control flag is one of the four keywords
-	described in the <link linkend="pam-chains-policies"
-	endterm="pam-chains-policies.title"></link> section,
+	described in <xref linkend="pam-chains-policies"/>,
 	describing how to interpret the return code from the module.
 	Linux-PAM supports an alternate syntax that lets you specify
 	the action to associate with each possible return code, but
@@ -1231,14 +1224,12 @@ sshd	password	required	pam_permit.so</programlisting>
       build this application on a system with a different PAM library,
       you will have to provide your own conversation function.  A
       robust conversation function is surprisingly difficult to
-      implement; the one presented in the <link
-      linkend="pam-sample-conv"
-      endterm="pam-sample-conv.title"></link> appendix is a good
+      implement; the one presented in <xref
+      linkend="pam-sample-conv"/> is a good
       starting point, but should not be used in real-world
       applications.</para>
 
-<programlisting><inlinegraphic fileref="pam_app.c"
-  format="linespecific"/></programlisting>
+<programlisting><xi:include href="su.c" parse="text"/></programlisting>
   </appendix>
 
   <appendix id="pam-sample-module">
@@ -1251,8 +1242,7 @@ sshd	password	required	pam_permit.so</programlisting>
       &man.pam.get.authtok.3;, which enormously simplifies prompting
       the user for a password.</para>
 
-<programlisting><inlinegraphic fileref="pam_module.c"
-  format="linespecific"/></programlisting>
+<programlisting><xi:include href="pam_unix.c" parse="text"/></programlisting>
   </appendix>
 
   <appendix id="pam-sample-conv">
@@ -1268,8 +1258,7 @@ sshd	password	required	pam_permit.so</programlisting>
       your uses; we believe it to be as robust as a tty-oriented
       conversation function can reasonably get.</para>
 
-<programlisting><inlinegraphic fileref="pam_conv.c"
-  format="linespecific"/></programlisting>
+<programlisting><xi:include href="converse.c" parse="text"/></programlisting>
   </appendix>
 
   <bibliography id="pam-further">
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 949f37fe59..5d98119f6a 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="en">
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 88530bb066..d882a2ed29 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
@@ -82,11 +79,11 @@
       </note>
 
       <para>The scripts that control all of this live in either
-	<filename role="directory">/a/portbuild/scripts/</filename> or.
-	<filename role="directory">/a/portbuild/admin/scripts/</filename>.
+	<filename class="directory">/a/portbuild/scripts/</filename> or.
+	<filename class="directory">/a/portbuild/admin/scripts/</filename>.
 	These are the checked-out copies from the Subversion repository at
 	<ulink url="http://svnweb.freebsd.org/base/projects/portbuild/">
-	  <filename role="directory">base/projects/portbuild/</filename>
+	  <filename class="directory">base/projects/portbuild/</filename>
 	</ulink>.</para>
 
       <para>Typically, incremental builds are done that use previous
@@ -1547,7 +1544,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 
 	<step>
 	  <para>Generate a kernel config file.  Include
-	    <filename>GENERIC</filename> (or, if on &i386, and
+	    <filename>GENERIC</filename> (or, if on &i386;, and
 	    you are using more than
 	    3.5G, <filename>PAE</filename>).</para>
 
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.xml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
index a1c189c949..0333091503 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 ]>
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.xml b/en_US.ISO8859-1/articles/problem-reports/article.xml
index 016df6b954..61ad4fa589 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.xml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/rc-scripting/article.xml b/en_US.ISO8859-1/articles/rc-scripting/article.xml
index 4fa3f56145..c12a4a58d6 100644
--- a/en_US.ISO8859-1/articles/rc-scripting/article.xml
+++ b/en_US.ISO8859-1/articles/rc-scripting/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/relaydelay/article.xml b/en_US.ISO8859-1/articles/relaydelay/article.xml
index d332ee73e0..26cfe3903b 100644
--- a/en_US.ISO8859-1/articles/relaydelay/article.xml
+++ b/en_US.ISO8859-1/articles/relaydelay/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     $FreeBSD$
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.xml b/en_US.ISO8859-1/articles/releng-packages/article.xml
index e4c9903e0d..cfcef421c2 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.xml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <title>FreeBSD Release Engineering for Third Party Software
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 5cdf764f98..6f855f1f03 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
 ]>
 
diff --git a/en_US.ISO8859-1/articles/remote-install/article.xml b/en_US.ISO8859-1/articles/remote-install/article.xml
index ef94bce981..8907656c4a 100644
--- a/en_US.ISO8859-1/articles/remote-install/article.xml
+++ b/en_US.ISO8859-1/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.xml b/en_US.ISO8859-1/articles/serial-uart/article.xml
index 04ccddabf2..0e42ec2833 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.xml
+++ b/en_US.ISO8859-1/articles/serial-uart/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='en'>
   <articleinfo>
diff --git a/en_US.ISO8859-1/articles/solid-state/article.xml b/en_US.ISO8859-1/articles/solid-state/article.xml
index 800610ec93..1290cb19cc 100644
--- a/en_US.ISO8859-1/articles/solid-state/article.xml
+++ b/en_US.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- Copyright (c) 2001 The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/articles/vm-design/article.xml b/en_US.ISO8859-1/articles/vm-design/article.xml
index cfc3726b42..4a4de7d640 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.xml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- FreeBSD Documentation Project -->
@@ -188,7 +185,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig1" format="EPS"/>
+        <imagedata fileref="fig1"/>
       </imageobject>
 
       <textobject>
@@ -210,7 +207,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig2" format="EPS"/>
+        <imagedata fileref="fig2"/>
       </imageobject>
 
       <textobject>
@@ -230,7 +227,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig3" format="EPS"/>
+        <imagedata fileref="fig3"/>
       </imageobject>
 
       <textobject>
@@ -260,7 +257,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig4" format="EPS"/>
+        <imagedata fileref="fig4"/>
       </imageobject>
 
       <textobject>
diff --git a/en_US.ISO8859-1/articles/wp-toolbox/article.xml b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
index 61e2546b22..ac6460d6a3 100644
--- a/en_US.ISO8859-1/articles/wp-toolbox/article.xml
+++ b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY ports		"Ports Collection">
 <!ENTITY os.ports	"&os; &ports;">
 <!ENTITY frisbee	"<application>Frisbee</application>">
diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index 541cf7ec7b..e471d87bef 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % mac-entities SYSTEM "mac.ent">
diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
index ea41ea36d1..3d54df590d 100644
--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/chapters.ent b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
index d36157997c..7fdd3df4ad 100644
--- a/en_US.ISO8859-1/books/arch-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
@@ -33,7 +33,7 @@
 <!ENTITY chap.pccard			SYSTEM "pccard/chapter.xml">
 
 <!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
   <!ENTITY chap.index			SYSTEM "index.xml">
 ]]>
 <!ENTITY chap.index			"">
diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
index 6bec082728..2815b30aa8 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -314,7 +314,7 @@ echo_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
 	 * We either write from the beginning or are appending -- do
 	 * not allow random access.
 	 */
-	if (uio-&gt;uio_offset != 0 && (uio-&gt;uio_offset != echomsg-&gt;len))
+	if (uio-&gt;uio_offset != 0 &amp;&amp; (uio-&gt;uio_offset != echomsg-&gt;len))
 		return (EINVAL);
 
 	/* This is a new message, reset length */
diff --git a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
index 8faa72bac6..f413a0dbb1 100644
--- a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
index ca7b7876a8..f6d6e404da 100644
--- a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
index 48cd65a3ad..f08b847166 100644
--- a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
index 0818c0fbdd..4486cfb648 100644
--- a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
index 401afd00ad..923dd53eb6 100644
--- a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Copyright (c) 2002-2005 Networks Associates Technology, Inc.
     All rights reserved.
diff --git a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
index 8cd5741d7b..48df641aa6 100644
--- a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 	The FreeBSD Documentation Project
 	$FreeBSD$
diff --git a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
index fb527c7bb2..b894c1e68e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
index 0365ea0f85..15a70da312 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
index a95997cd52..af76ac8d6d 100644
--- a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
index bda5ce70f4..f6ab5e9985 100644
--- a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
index 2412e283a2..65c06106e4 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
index 01b91357c1..7898ee7e2e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
index 7acd5111f2..61c244bf8b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
index 8360ef1eaf..39ec4fba3c 100644
--- a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 7fe6b60ef3..778160a2be 100644
--- a/en_US.ISO8859-1/books/bibliography/book.xml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 ]>
 
diff --git a/en_US.ISO8859-1/books/design-44bsd/Makefile b/en_US.ISO8859-1/books/design-44bsd/Makefile
index 927603f613..04041c8de2 100644
--- a/en_US.ISO8859-1/books/design-44bsd/Makefile
+++ b/en_US.ISO8859-1/books/design-44bsd/Makefile
@@ -11,10 +11,6 @@ INSTALL_ONLY_COMPRESSED?=
 
 SRCS= book.xml
 
-# Use the local DSSSL file
-DSLHTML?=       ${.CURDIR}/freebsd.dsl
-DSLPRINT?=      ${.CURDIR}/freebsd.dsl
-
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 64b66a623c..04637580a8 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- FreeBSD Documentation Project -->
@@ -680,7 +677,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="fig1" format="EPS"/>
+	    <imagedata fileref="fig1"/>
 	  </imageobject>
 
 	  <textobject>
@@ -1666,7 +1663,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="fig2" format="EPS"/>
+	  <imagedata fileref="fig2"/>
 	</imageobject>
 
 	<textobject>
diff --git a/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl b/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl
deleted file mode 100644
index 59efdeff4e..0000000000
--- a/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      ;; Keep the legalnotice together with the rest of the text
-      (define %generate-legalnotice-link%
-        #f)
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index 8f5cf68d83..97213996fd 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 ]>
@@ -288,7 +286,7 @@
             <para>
                 <figure>
                     <title>The FreeBSD Project's structure</title>
-                    <graphic fileref="orghierarchy.png" format="PNG"/>
+                    <graphic fileref="orghierarchy"/>
                 </figure>
             </para>
 
@@ -346,7 +344,7 @@
             <para>
                 <figure>
                     <title>The FreeBSD Project's structure with committers in categories</title>
-                    <graphic fileref="orghierarchy2.png" format="PNG"/>
+                    <graphic fileref="orghierarchy2"/>
                 </figure>
             </para>
             <para>
@@ -440,7 +438,7 @@
                 <para>
                     <figure>
                         <title>J&oslash;rgenssen's model for change integration</title>
-                        <graphic fileref="maintenance.png" format="PNG"/>
+                        <graphic fileref="maintenance"/>
                     </figure>
                 </para>
 
@@ -605,7 +603,7 @@
                 <para>
                     <figure>
                         <title>The FreeBSD release tree</title>
-                        <graphic fileref="branches.png" format="PNG"/>
+                        <graphic fileref="branches"/>
                     </figure>
                 </para>
                 <para>
@@ -686,7 +684,7 @@
                 <para>
                     <figure>
                         <title>The overall development model</title>
-                        <graphic fileref="freebsd-code-model.png" format="PNG"/>
+                        <graphic fileref="freebsd-code-model"/>
                     </figure>
                 </para>
                 <para>
@@ -866,7 +864,7 @@
                 <para>
                     <figure>
                         <title>Overview of official hats</title>
-                        <graphic fileref="hats-overview.png" format="PNG"/>
+                        <graphic fileref="hats-overview"/>
                     </figure>
                 </para>
 
@@ -1324,7 +1322,7 @@
                 <para>
                     <figure>
                         <title>Process summary: adding a new committer</title>
-                        <graphic fileref="proc-add-committer.png" format="PNG"/>
+                        <graphic fileref="proc-add-committer"/>
                     </figure>
                 </para>
 
@@ -1356,7 +1354,7 @@
                 <para>
                     <figure>
                         <title>Process summary: removing a committer</title>
-                        <graphic fileref="proc-rm-committer.png" format="PNG"/>
+                        <graphic fileref="proc-rm-committer"/>
                     </figure>
                 </para>
 
@@ -1450,7 +1448,7 @@
                 <para>
                     <figure>
                         <title>Process summary: adding a CVSup mirror</title>
-                        <graphic fileref="proc-add-cvsup.png" format="PNG"/>
+                        <graphic fileref="proc-add-cvsup"/>
                     </figure>
                 </para>
 
@@ -1554,7 +1552,7 @@
                 <para>
                     <figure>
                         <title>Process summary: A committer commits code</title>
-                        <graphic fileref="proc-commit.png" format="PNG"/>
+                        <graphic fileref="proc-commit"/>
                     </figure>
                 </para>
 
@@ -1578,7 +1576,7 @@
                 <para>
                     <figure>
                         <title>Process summary: A contributor commits code</title>
-                        <graphic fileref="proc-contrib.png" format="PNG"/>
+                        <graphic fileref="proc-contrib"/>
                     </figure>
                 </para>
 
@@ -1678,7 +1676,7 @@
                 <para>
                     <figure>
                         <title>Process summary: Core elections</title>
-                        <graphic fileref="proc-elections.png" format="PNG"/>
+                        <graphic fileref="proc-elections"/>
                     </figure>
                 </para>
 
@@ -1840,7 +1838,7 @@
                 <para>
                     <figure>
                         <title>J&oslash;rgenssen's model for change integration</title>
-                        <graphic fileref="maintenance.png" format="PNG"/>
+                        <graphic fileref="maintenance"/>
                     </figure>
                 </para>
 
@@ -1920,7 +1918,7 @@
                 <para>
                     <figure>
                         <title>Process summary: problem reporting</title>
-                        <graphic fileref="proc-pr.png" format="PNG"/>
+                        <graphic fileref="proc-pr"/>
                     </figure>
                 </para>
 
@@ -2157,7 +2155,7 @@
                 <para>
                     <figure>
                         <title>Process summary: release engineering</title>
-                        <graphic fileref="proc-releng.png" format="PNG"/>
+                        <graphic fileref="proc-releng"/>
                     </figure>
                 </para>
 
@@ -2321,7 +2319,7 @@
                 <para>
                     <figure id="fig-ports">
                         <title>Number of ports added between 1996 and 2005</title>
-                        <graphic fileref="portsstatus.png" format="PNG"/>
+                        <graphic fileref="portsstatus"/>
                     </figure>
                 </para>
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/book.xml b/en_US.ISO8859-1/books/developers-handbook/book.xml
index 755ee5d18c..6a9a7f220c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index 6c53a7d0ee..0f7e8270b7 100644
--- a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index 15cfb17c23..66c0ff75b9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 0857fc51d4..0c147b8eb6 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 2b83d4b6b1..b901c833e4 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -869,7 +869,7 @@ Debugger (msg=0xf01b0383 "Boot flags requested debugger")
 	  <filename>/etc/make.conf</filename> and rebuild
 	  &man.loader.8;:</para>
 
-        <screen>&prompt.root; <userinput>cd /sys/boot/i386 && make clean && make && make install</userinput></screen>
+        <screen>&prompt.root; <userinput>cd /sys/boot/i386 &amp;&amp; make clean &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
         <para>To enable &man.dcons.4; as an active low-level
 	  console, add <literal>boot_multicons="YES"</literal> to 
diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index c8bcb1b561..1dbc259899 100644
--- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 3dac25f241..6d7432628c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
index e35fe1afdd..4a655c189c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 89b29f957a..7cb263be69 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
index f28bec2323..080ed93b10 100644
--- a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 1162219255..890979af7d 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
index 65e17b742b..dafbb31103 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 203ae537e2..d652c37f09 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.xml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index e1b821036b..273cf4ab15 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!-- ENTITY index SYSTEM "index.xml" -->
 ]>
diff --git a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 7b969da21a..05d5abbea4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 95bd162179..ee6b7e139e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 0ea6c85fef..f3a36601a3 100644
--- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 9901723f10..6e8dd4ef35 100644
--- a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 64da1923c8..65f4df3962 100644
--- a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 1a1e9d9372..35c9680552 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -2413,7 +2413,7 @@ This is the file called 'foo2'</screen>
 
 	<para>An example will probably make things easier to
 	  understand.  Suppose you have an image, called
-	  <filename>fig1</filename>, that you want to include in the
+	  <filename>fig1.png</filename>, that you want to include in the
 	  document.  This image is of a rectangle with an A inside it.
 	  The markup for this would be as follows.</para>
 
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 7ba090c6ae..f24a2b0848 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -828,28 +828,6 @@ example.xml:5: element head: validity error : Element head content does not foll
   -- doing multiline comments -->]]></programlisting>
     </example>
 
-    <![%output.print;[
-    <important>
-      <title>Use 2 Dashes</title>
-
-      <para>There is a problem with producing the Postscript and PDF
-	versions of this document.  The above example probably shows
-	just one hyphen symbol, <literal>-</literal> after the
-	<literal>&lt;!</literal> and before the
-	<literal>&gt;</literal>.</para>
-
-      <para>You <emphasis>must</emphasis> use two
-	<literal>-</literal>, <emphasis>not</emphasis> one.  The
-	Postscript and PDF versions have translated the two
-	<literal>-</literal> in the original to a longer, more
-	professional <emphasis>em-dash</emphasis>, and broken this
-	example in the process.</para>
-
-      <para>The XHTML, plain text, and RTF versions of this document
-	are not affected.</para>
-    </important>
-    ]]>
-
     <para>If you have used XHTML before you may have been shown
       different rules for comments.  In particular, you may think that
       the string <literal>&lt;!--</literal> opens a comment, and it is
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0111965b9e..7a688264b4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 23126ed4b8..bfdbca8f4e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 0b57d5065f..6d7fa06c8f 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 979b907ffd..f915276fb0 100644
--- a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
index c17ce5cdf0..056b41ffce 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index bae4a73c72..44f4b217f9 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -185,7 +185,7 @@
 	<emphasis>not</emphasis> <sgmltag>PARA</sgmltag>.</para>
 
       <para>Text that appears in SGML contexts is generally written in
-	upper case, <literal>&lt!ENTITY&hellip;&gt;</literal>, and
+	upper case, <literal>&lt;!ENTITY&hellip;&gt;</literal>, and
 	<literal>&lt;!DOCTYPE&hellip;&gt;</literal>,
 	<emphasis>not</emphasis>
 	<literal>&lt;!entity&hellip;&gt;</literal> and
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index d90bc2b9fd..65e6220067 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -40,7 +40,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -315,30 +314,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 3f2700574c..38876324db 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/audit/chapter.xml b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
index c27110fabf..5d5540e5f6 100644
--- a/en_US.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 9a24713816..ef4171b7be 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1117,7 +1117,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir1" format="EPS"/>
+	<imagedata fileref="install/example-dir1"/>
       </imageobject>
 
       <textobject>
@@ -1138,7 +1138,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir2" format="EPS"/>
+	<imagedata fileref="install/example-dir2"/>
       </imageobject>
 
       <textobject>
@@ -1170,7 +1170,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir3" format="EPS"/>
+	<imagedata fileref="install/example-dir3"/>
       </imageobject>
 
       <textobject>
@@ -1199,7 +1199,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir4" format="EPS"/>
+	<imagedata fileref="install/example-dir4"/>
       </imageobject>
 
       <textobject>
@@ -1225,7 +1225,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir5" format="EPS"/>
+	<imagedata fileref="install/example-dir5"/>
       </imageobject>
 
       <textobject>
@@ -1525,7 +1525,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/disk-layout" format="EPS"/>
+	  <imagedata fileref="install/disk-layout"/>
 	</imageobject>
 
 	<textobject>
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
index 03d8a27211..2b7bdece60 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index 51a45d23f2..33ae587894 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!--
      The FreeBSD Documentation Project
 
@@ -22,7 +19,7 @@
 
     <corpauthor>The FreeBSD Documentation Project</corpauthor>
 
-    <pubdate>February 1999</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <releaseinfo>$FreeBSD$</releaseinfo>
 
diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.xml b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
index 6f0253d2e7..2f4f619f34 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 06b5ee31b9..f6ae2a4985 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -162,7 +162,7 @@
 	  multiple CPUs.</para>
 
 	<para>A 32-bit kernel can only use the first 2&nbsp;GB of RAM.
-	  &firewire; is not supported on the Blue & White PowerMac
+	  &firewire; is not supported on the Blue &amp; White PowerMac
 	  G3.</para>
       </sect3>
 
@@ -668,7 +668,7 @@ Loading /boot/defaults/loader.conf
 		<imageobject>
 		  <imagedata
 		    fileref="bsdinstall/bsdinstall-boot-loader-menu"
-		    format="PNG"/>
+		   />
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -739,14 +739,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	    role="Programmable Read Only Memory">PROM</acronym>
 	  prompt.  It looks like this:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5"/>
-	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok    </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok    </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="bsdinstall-prompt-single">
@@ -759,7 +753,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		indicates the number of the active CPU.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>At this point, place the CDROM into your drive, and from
 	  the <acronym>PROM</acronym> prompt, type
@@ -960,7 +953,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1006,7 +999,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-keymap-select-default"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1022,7 +1015,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1052,7 +1045,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1075,7 +1068,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-config-components"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1164,7 +1157,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1184,7 +1177,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1211,7 +1204,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-part-guided-manual"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1229,7 +1222,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-guided-disk"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1249,7 +1242,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-entire-part"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1270,7 +1263,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-review"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1289,7 +1282,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-manual-create"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1307,7 +1300,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-manual-partscheme"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1388,7 +1381,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-manual-addpart"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1568,7 +1561,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-final-confirmation"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1601,7 +1594,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1617,7 +1610,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-distfile-verifying"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1632,7 +1625,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-distfile-extracting"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1667,7 +1660,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-post-root-passwd"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1695,7 +1688,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-configure-network-interface"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1729,8 +1722,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-scan"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1752,8 +1744,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1772,8 +1763,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1795,8 +1785,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"/>
+		fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1830,7 +1819,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1849,7 +1838,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1895,8 +1884,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"/>
+		fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1925,7 +1913,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1944,7 +1932,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1993,8 +1981,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"/>
+		fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2019,7 +2006,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-set-clock-local-utc"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2038,7 +2025,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2053,7 +2040,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-timezone-country"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2067,7 +2054,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2082,7 +2069,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-timezone-confirm"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2104,7 +2091,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-services"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2154,7 +2141,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-config-crashdump"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2179,7 +2166,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-adduser1"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2192,7 +2179,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-adduser2"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2293,7 +2280,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-adduser3"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2320,7 +2307,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-finalconfiguration"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2377,7 +2364,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-final-modification-shell"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2396,7 +2383,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-mainexit"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index a2a9455f59..d7efb577fe 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -10,235 +10,62 @@
      $FreeBSD$
 -->
 
-<!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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc       SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc      SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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.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/en_US.ISO8859-1/books/handbook/colophon.xml b/en_US.ISO8859-1/books/handbook/colophon.xml
index b7db4156a7..bf5aae5e6f 100644
--- a/en_US.ISO8859-1/books/handbook/colophon.xml
+++ b/en_US.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index e8abe102b8..fba2a7c58b 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -784,7 +784,7 @@ sshd is running as pid 433.</screen>
 
     <para>Additional information about the <filename>rc.d</filename>
       system can be found in &man.rc.8; and &man.rc.subr.8;.  Refer to
-      <ulink url="&url.articles.rc-scripting">this article</ulink> for
+      <ulink url="&url.articles.rc-scripting;">this article</ulink> for
       instructions on how to create custom <filename>rc.d</filename>
       scripts.</para>
   </sect1>
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 09d7188854..a7160bfae3 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1205,81 +1205,6 @@ Fetching 133 new ports or files... done.</screen>
 	<screen>&prompt.root; <userinput>portmaster -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.
-	<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 install the package, use the following
-	command:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-	<para><application>Docsnap</application> was originally
-	  developed for updating documentation installed to
-	  <filename class="directory">/usr/share/doc</filename>, but
-	  the following examples could be adapted for other
-	  directories.  Updating to user directories 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 <option>--delete</option> 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/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index 79d432e9db..cd599f7917 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index e8438321d1..56996b94d2 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -613,7 +613,7 @@ bsdlabel -e ad3</programlisting>
 	  storage.  &man.vinum.4; implements the RAID-0, RAID-1 and
 	  RAID-5 models, both individually and in combination.</para>
 
-	<para>Refer to <link linkend="vinum-vinum"></link> for more
+	<para>Refer to <xref linkend="vinum-vinum"/> for more
 	  information about &man.vinum.4;.</para>
       </sect3>
     </sect2>
@@ -824,7 +824,7 @@ da0: 126MB (258048 512 byte sectors: 64H 32S/T 126C)</screen>
 &lt;Generic Traveling Disk 1.11&gt;      at scbus0 target 0 lun 0 (da0,pass0)</screen>
 
       <para>If the drive comes with a file system, it can be mounted.
-	Refer to <link linkend="disks-adding"></link> for
+	Refer to <xref linkend="disks-adding"/> for
 	instructions on how to format and create partitions on the USB
 	drive.</para>
 
@@ -1201,8 +1201,8 @@ scsibus1:
 	  <screen>&prompt.user; <userinput>cdrecord -v dev=<replaceable>2,0</replaceable> -dao -useinfo  *.wav</userinput></screen>
 
 	  <para>Make sure that <replaceable>2,0</replaceable> is set
-	    appropriately, as described in <link
-	      linkend="cdrecord"></link>.</para>
+	    appropriately, as described in <xref
+	      linkend="cdrecord"/>.</para>
 	</step>
       </procedure>
 
@@ -1503,7 +1503,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	    as a removable hard drive.  However, this media is not
 	    compatible with most DVD-ROM drives and DVD-Video players
 	    as only a few DVD writers support the DVD-RAM format.
-	    Refer to <link linkend="creating-dvd-ram"></link> for more
+	    Refer to <xref linkend="creating-dvd-ram"/> for more
 	    information on DVD-RAM use.</para>
 	</listitem>
 
@@ -1547,7 +1547,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	therefore <link linkend="atapicam">ATAPI/CAM support</link>
 	must be loaded or statically compiled into the kernel.  This
 	support is not needed if the burner uses the USB interface.
-	Refer to <link linkend="usb-disks"></link> for more details
+	Refer to <xref linkend="usb-disks"/> for more details
 	on USB device configuration.</para>
 
       <para>DMA access must also be enabled for ATAPI devices, by
@@ -3035,8 +3035,8 @@ Filesystem 1K-blocks Used Avail Capacity  Mounted on
 
       <para>The <filename>GENERIC</filename> kernel does not
 	have this enabled by default, so a custom kernel must be
-	compiled in order to use disk quotas.  Refer to <link
-	  linkend="kernelconfig"></link> for more information on
+	compiled in order to use disk quotas.  Refer to <xref
+	  linkend="kernelconfig"/> for more information on
 	kernel configuration.</para>
 
       <para>Next, enable disk quotas in
@@ -3338,7 +3338,7 @@ Password:</screen>
 	    <title>Add the New Hard Drive</title>
 
 	    <para>Install the new drive to the system as explained in
-	      <link linkend="disks-adding"></link>.  For the purposes
+	      <xref linkend="disks-adding"/>.  For the purposes
 	      of this example, a new hard drive partition has been
 	      added as <devicename>/dev/ad4s1c</devicename> and
 	      <devicename>/dev/ad0s1<replaceable>*</replaceable></devicename>
@@ -4289,7 +4289,7 @@ Device          1K-blocks     Used    Avail Capacity
 	  other, and both are configured as primary nodes, the
 	  condition is called <literal>split-brain</literal>.  To
 	  troubleshoot this situation, follow the steps described in
-	  <link linkend="disks-hast-sb"></link>.</para>
+	  <xref linkend="disks-hast-sb"/>.</para>
       </caution>
 
       <para>Verify the result by running &man.hastctl.8; on each
@@ -4345,7 +4345,7 @@ Device          1K-blocks     Used    Avail Capacity
 	  same network segment to share an IP address.  Set up
 	  <acronym>CARP</acronym> on both nodes of the cluster
 	  according to the documentation available in
-	  <link linkend="carp"></link>.  After setup, each node will
+	  <xref linkend="carp"/>.  After setup, each node will
 	  have its own <devicename>carp0</devicename> interface with a
 	  shared IP address of
 	  <replaceable>172.16.0.254</replaceable>.  The primary
@@ -4431,7 +4431,7 @@ case "$1" in
 
 		# Wait for any "hastd secondary" processes to stop
 		for disk in ${resources}; do
-			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
 				sleep 1
 			done
 
@@ -4446,7 +4446,7 @@ case "$1" in
 		# Wait for the /dev/hast/* devices to appear
 		for disk in ${resources}; do
 			for I in $( jot 60 ); do
-				[ -c "/dev/hast/${disk}" ] && break
+				[ -c "/dev/hast/${disk}" ] &amp;&amp; break
 				sleep 0.5
 			done
 
@@ -4479,7 +4479,7 @@ case "$1" in
 				umount -f /hast/${disk}
 			fi
 			sleep $delay
-			hastctl role secondary ${disk} 2>&1
+			hastctl role secondary ${disk} 2>&amp;1
 			if [ $? -ne 0 ]; then
 				logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
 				exit 1
diff --git a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
index eebfb6be9f..e527aab5b8 100644
--- a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 Recently I suggested to myself that this should become a profiling
 and debugging chapter, which covers things like ktrace(1) and
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
index 08b3d9bced..b4003d0fee 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1613,7 +1613,7 @@
 
 	    <para>Important news for developers, porters, and users
 	      of the <quote>Ports Collection</quote> (<filename
-		role="directory">/usr/ports</filename>), including
+		class="directory">/usr/ports</filename>), including
 	      architecture/infrastructure changes, new capabilities,
 	      critical upgrade instructions, and release engineering
 	      information.  This is a low-volume mailing list,
@@ -2209,6 +2209,10 @@
     <sect2 id="eresources-web-mirrors">
       <title>Official Mirrors</title>
 
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
index 52d70a318e..8797a46e57 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index 15ddc0f4e7..f7867afa2b 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -660,7 +660,7 @@ ipnat_rules="/etc/ipnat.rules"    # rules definition file for ipnat</programlist
 
       <para>There is a way to build IPF rules that utilize the power
 	of script symbolic substitution.  For more information, see
-	<link linkend="firewalls-ipf-rules-script"></link>.</para>
+	<xref linkend="firewalls-ipf-rules-script"/>.</para>
     </sect2>
 
     <sect2>
@@ -2194,7 +2194,7 @@ ipfw add deny out</programlisting>
 
       <para>If the machine is acting as a gateway providing
 	<acronym>NAT</acronym> using &man.natd.8;,
-	refer to <link linkend="network-natd"></link> for information
+	refer to <xref linkend="network-natd"/> for information
 	regarding the required <filename>/etc/rc.conf</filename>
 	options.</para>
     </sect2>
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index 2ffb508df3..72654b37c6 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -388,13 +388,13 @@ Done.</screen>
 	mirror with &man.dump.8; and &man.restore.8;.</para>
 
       <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput></screen>
 
       <para><filename>/mnt/etc/fstab</filename> must be edited to
 	point to the new mirror filesystems:</para>
@@ -630,15 +630,15 @@ BSD 8
 	dumped with <command>dump -L</command>.</para>
 
       <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt &amp;&amp; restore -rf -)</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 &amp;&amp; restore -rf -)</userinput></screen>
 
       <para>Restart the system, booting from
 	<devicename>ada1</devicename>.  If everything is working, the
diff --git a/en_US.ISO8859-1/books/handbook/index.xml b/en_US.ISO8859-1/books/handbook/index.xml
new file mode 100644
index 0000000000..cad9d876e1
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/index.xml
@@ -0,0 +1 @@
+<index/>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index c32951bd4b..499bff5f43 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -989,7 +989,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1027,14 +1027,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  &man.tip.1; or &man.cu.1;) to get to the PROM prompt.  It
 	  looks like this:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1047,7 +1041,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		indicates the number of the active CPU.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>At this point, place the CDROM into your drive, and from
 	  the PROM prompt, type <command>boot cdrom</command>.</para>
@@ -1157,7 +1150,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1173,7 +1166,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1212,7 +1205,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1229,7 +1222,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1241,7 +1234,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1271,7 +1264,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1291,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1309,7 +1302,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1319,7 +1312,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1353,7 +1346,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1518,7 +1511,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1584,7 +1577,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1627,7 +1620,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1669,7 +1662,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1699,7 +1692,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1948,7 +1941,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1976,7 +1969,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2003,7 +1996,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2021,7 +2014,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2038,7 +2031,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2055,7 +2048,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2077,7 +2070,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2129,7 +2122,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2184,7 +2177,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2217,7 +2210,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2414,7 +2407,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2460,7 +2453,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2635,7 +2628,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2728,7 +2721,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2807,7 +2800,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2864,7 +2857,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2914,7 +2907,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2928,7 +2921,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2948,7 +2941,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2962,7 +2955,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3006,7 +2999,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3019,7 +3012,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3032,7 +3025,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3073,7 +3066,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3086,7 +3079,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3101,7 +3094,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3114,7 +3107,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3128,7 +3121,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3144,7 +3137,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3189,7 +3182,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3210,7 +3203,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3237,7 +3230,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3251,7 +3244,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3291,7 +3284,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3304,7 +3297,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3404,7 +3397,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3469,7 +3462,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3544,7 +3537,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3611,7 +3604,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3665,7 +3658,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3691,7 +3684,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
index 2e6d77207b..91f3cf6293 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.xml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
index 0812972bd3..9c9c777a15 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index a4381d1e2f..fa4e2609b2 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -292,7 +292,7 @@ following line in &man.loader.conf.5;:
 	not exist or it is empty, source has not been installed.  The
 	easiest way to install source is to use
 	<application>svn</application> as described in <xref
-	  linkend="svn"></xref>.  One should also create a symlink to
+	  linkend="svn"/>.  One should also create a symlink to
 	<filename class="directory">/usr/src/sys/</filename>:</para>
 
 	<screen>&prompt.root; <userinput>ln -s /usr/src/sys /sys</userinput></screen>
@@ -616,7 +616,7 @@ cpu          I686_CPU</programlisting>
     <para>This option enables kernel support for access control lists
       (<acronym>ACL</acronym>s).  This relies on the use of extended
       attributes and <acronym>UFS2</acronym>, and the feature is
-      described in detail in <xref linkend="fs-acl"></xref>.
+      described in detail in <xref linkend="fs-acl"/>.
       <acronym>ACL</acronym>s are enabled by default and should not be
       disabled in the kernel if they have been used previously on a
       file system, as this will remove the ACLs, changing the way
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index a0aa5e7e10..1fbe10fc99 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -638,7 +638,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
 
       <para>Although <application>Xorg</application> is not installed
 	with &os;, it can be installed from the Ports Collection.
-	Refer to <link linkend="x11"></link> for more information on
+	Refer to <xref linkend="x11"/> for more information on
 	how to do this.  This section discusses how to localize
 	<application>Xorg</application> once it is installed.</para>
 
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 1df01aa6b3..f1de8f6b06 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -134,8 +134,8 @@ Id Refs Address    Size     Name
     <para>Users who prefer to statically link &linux; binary
       compatibility into the kernel should add <literal>options
 	COMPAT_LINUX</literal> to the custom kernel configuration
-      file.  Compile and install the new kernel as described in <link
-	linkend="kernelconfig"></link>.</para>
+      file.  Compile and install the new kernel as described in <xref
+	linkend="kernelconfig"/>.</para>
 
     <sect2 id="linuxemu-libs-manually">
       <title>Installing Libraries Manually</title>
@@ -686,7 +686,7 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \
 	6.5</application> onto a &os; system.  It works quite well,
       with the exception of the
       <application>&java.virtual.machine;</application> which is
-      described further in <link linkend="matlab-jre"></link>.</para>
+      described further in <xref linkend="matlab-jre"/>.</para>
 
     <para>The &linux; version of <application>&matlab;</application>
       can be purchased and licensed from <ulink
@@ -887,7 +887,7 @@ exit 0</programlisting>
 	      contains the following:</para>
 
 	    <programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.xml b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
index ad38259ebe..facf372522 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 7a9a9676f0..5d6aea0866 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1960,7 +1960,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1971,7 +1971,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2009,7 +2009,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2061,7 +2061,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2082,7 +2082,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2093,7 +2093,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2106,7 +2106,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2125,7 +2125,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index b518220471..2b147a8b91 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -114,6 +114,10 @@
       access methods available for each site are provided in
       parentheses after the hostname.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -802,7 +806,7 @@ Certificate information:
       the server, and the verification step will be repeated on the
       next connection.  Accepting the certificate permanently will
       store the authentication credentials in
-      <filename role="directory">~/.subversion/auth/</filename> and
+      <filename class="directory">~/.subversion/auth/</filename> and
       the user will not be asked to verify the fingerprint again until
       the certificate expires.</para>
 
@@ -1679,7 +1683,12 @@ usr.bin/</programlisting>
       <para><link linkend="cvsup">CVSup</link> servers for &os; are
 	running at the following sites:</para>
 
+      &chap.mirrors.cvsup.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.mirrors.cvsup.inc;
+
     </sect2>
   </sect1>
 
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
index 0d80aae29a..c884ce14e5 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1629,7 +1629,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
 
       <para>Set up the MythTV database:</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>Configure the backend:</para>
 
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 4e608b1115..e8c035e014 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 5d9c73c4f3..d711c544fc 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index d9d559f421..16ba81e3b7 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 72b3ee8535..86d0c65702 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.xml b/en_US.ISO8859-1/books/handbook/preface/preface.xml
index 85604b28cc..1d2a2a62e9 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.xml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      $FreeBSD$
 -->
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.xml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
index 5dd21751cf..a368f5ad9a 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
index dfab0f9448..0beccf251e 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 3146e74cb7..86436fe80a 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1420,7 +1420,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
 	</indexterm>
 
 	<para>Configuration of <filename>/etc/ttys</filename>
-	  is covered in <link linkend="ex-etc-ttys"></link>.
+	  is covered in <xref linkend="ex-etc-ttys"/>.
 	  Configuration for modems is similar, but a different
 	  argument is passed to <command>getty</command> and a
 	  different terminal type is specified.  The general format
@@ -2103,7 +2103,7 @@ raisechar=^^</programlisting>
 	developers who want to debug the kernel or device
 	drivers.</para>
 
-      <para>As described in <link linkend="boot"></link>, &os; employs
+      <para>As described in <xref linkend="boot"/>, &os; employs
 	a three stage bootstrap.  The first two stages are in the boot
 	block code which is stored at the beginning of the &os;
 	slice on the boot disk.  The boot block then loads and runs
@@ -2166,8 +2166,8 @@ raisechar=^^</programlisting>
 	  <indexterm><primary>null-modem cable</primary></indexterm>
 
 	  <para>Use either a null-modem cable or a standard serial
-	    cable and a null-modem adapter.  See <link
-	      linkend="serial-cables-ports"></link> for a discussion
+	    cable and a null-modem adapter.  See <xref
+	      linkend="serial-cables-ports"/> for a discussion
 	    on serial cables.</para>
 	</step>
 
@@ -2482,7 +2482,7 @@ boot:</screen>
       <para>During the third stage of the boot process, one can still
 	switch between the internal console and the serial console by
 	setting appropriate environment variables in the boot loader.
-	See <link linkend="serialconsole-loader"></link> for more
+	See <xref linkend="serialconsole-loader"/> for more
 	information.</para>
     </sect2>
 
@@ -2635,8 +2635,8 @@ boot:</screen>
 	  <listitem>
 	    <para>Recompile the boot blocks with
 	      <makevar>BOOT_COMCONSOLE_SPEED</makevar> set to the
-	      new console speed.  See <link
-		linkend="serialconsole-com2"></link> for detailed
+	      new console speed.  See <xref
+		linkend="serialconsole-com2"/> for detailed
 	      instructions about building and installing new boot
 	      blocks.</para>
 
@@ -2686,8 +2686,8 @@ console="comconsole,vidconsole"</programlisting>
 
 	<procedure>
 	  <step>
-	    <para>Get the kernel source as described in <link
-		linkend="updating-upgrading"></link>.</para>
+	    <para>Get the kernel source as described in <xref
+		linkend="updating-upgrading"/>.</para>
 	  </step>
 
 	  <step>
@@ -2844,8 +2844,8 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting>
 
 	<para>The boot loader needs to be compiled in order to use a
 	  serial port other than <devicename>sio0</devicename> for the
-	  serial console.  Follow the procedure described in <link
-	    linkend="serialconsole-com2"></link>.</para>
+	  serial console.  Follow the procedure described in <xref
+	    linkend="serialconsole-com2"/>.</para>
       </sect3>
     </sect2>
 
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index e8f7eae7d9..c6be01a81e 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -594,7 +594,7 @@ Other information:</screen>
 	  &man.ypchsh.1;.  <acronym>NIS</acronym> support is
 	  automatic, so specifying the <literal>yp</literal> before
 	  the command is not necessary.  How to configure NIS is
-	  covered in <link linkend="network-servers"></link>.</para>
+	  covered in <xref linkend="network-servers"/>.</para>
       </note>
     </sect2>
     <sect2 id="users-passwd">
@@ -685,8 +685,8 @@ passwd: done</screen>
     <indexterm><primary>disk quotas</primary></indexterm>
     <para>Disk quotas limit the amount of disk space available to
       users and provide a way to quickly check that usage without
-      calculating it every time.  Quotas are discussed in <link
-	linkend="quotas"></link>.</para>
+      calculating it every time.  Quotas are discussed in <xref
+	linkend="quotas"/>.</para>
 
     <para>The other resource limits include ways to limit the amount
       of CPU, memory, and other resources a user may consume.  These
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index 0bf1b15a6d..0b0dc34114 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 	The Vinum Volume Manager
 	By Greg Lehey (grog at lemis dot com)
@@ -142,7 +142,7 @@
       relationships.  It works well when the access to the virtual
       disk is spread evenly about its address space.  When access is
       concentrated on a smaller area, the improvement is less marked.
-      <link linkend="vinum-concat"></link> illustrates the sequence in
+      <xref linkend="vinum-concat"/> illustrates the sequence in
       which storage units are allocated in a concatenated
       organization.</para>
 
@@ -179,7 +179,7 @@
       somewhat more effort to locate the data, and it can cause
       additional I/O load where a transfer is spread over multiple
       disks, but it can also provide a more constant load across the
-      disks.  <link linkend="vinum-striped"></link> illustrates the
+      disks.  <xref linkend="vinum-striped"/> illustrates the
       sequence in which storage units are allocated in a striped
       organization.</para>
 
@@ -379,7 +379,7 @@
 	</listitem>
       </itemizedlist>
 
-      <para><link linkend="vinum-comparison"></link> summarizes the
+      <para><xref linkend="vinum-comparison"/> summarizes the
 	advantages and disadvantages of each plex organization.</para>
 
       <table id="vinum-comparison" frame="none">
@@ -512,8 +512,8 @@
 	S myvol.p0.s0           State: up       PO:        0  B Size:      512 MB</programlisting>
 
       <para>This output shows the brief listing format of
-	&man.gvinum.8;.  It is represented graphically in <link
-	  linkend="vinum-simple-vol"></link>.</para>
+	&man.gvinum.8;.  It is represented graphically in <xref
+	  linkend="vinum-simple-vol"/>.</para>
 
       <para>
 	<figure id="vinum-simple-vol">
@@ -579,7 +579,7 @@
 	S mirror.p0.s0          State: up       PO:        0  B Size:        512 MB
 	S mirror.p1.s0          State: empty    PO:        0  B Size:        512 MB</programlisting>
 
-      <para><link linkend="vinum-mirrored-vol"></link> shows the
+      <para><xref linkend="vinum-mirrored-vol"/> shows the
 	structure graphically.</para>
 
       <para>
@@ -658,8 +658,8 @@
 	  <graphic fileref="vinum/vinum-striped-vol"/>
 	</figure></para>
 
-      <para>This volume is represented in <link
-	  linkend="vinum-striped-vol"></link>.  The darkness of the
+      <para>This volume is represented in <xref
+	  linkend="vinum-striped-vol"/>.  The darkness of the
 	stripes indicates the position within the plex address space,
 	where the lightest stripes come first and the darkest
 	last.</para>
@@ -693,7 +693,7 @@
 	writes do not go to the same subdisks even if a transfer goes
 	over two drives.</para>
 
-      <para><link linkend="vinum-raid10-vol"></link> represents the
+      <para><xref linkend="vinum-raid10-vol"/> represents the
 	structure of this volume.</para>
 
       <para>
@@ -1134,8 +1134,8 @@ Subdisk root.p1.s0:
 	within the <devicename>vinum</devicename> partition
 	<literal>h</literal>, and the offset of this partition
 	within the device or slice.  This is a typical setup that is
-	necessary to avoid the problem described in <link
-	  linkend="vinum-root-panic"></link>.  The entire
+	necessary to avoid the problem described in <xref
+	  linkend="vinum-root-panic"/>.  The entire
 	<literal>a</literal> partition is completely within the
 	<literal>h</literal> partition containing all the
 	<devicename>vinum</devicename> data for this device.</para>
@@ -1232,8 +1232,8 @@ Subdisk root.p1.s0:
 	<para>Similarly, if the above situation has been recovered,
 	  by booting from a <quote>Fixit</quote> media, and the
 	  bootstrap has been re-installed using
-	  <command>bsdlabel -B</command> as described in <link
-	    linkend="boot-boot1"></link>, the bootstrap will trash the
+	  <command>bsdlabel -B</command> as described in <xref
+	    linkend="boot-boot1"/>, the bootstrap will trash the
 	  <devicename>vinum</devicename> header, and
 	  <devicename>vinum</devicename> will no longer find its
 	  disk(s).  Though no actual <devicename>vinum</devicename>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index 92150a2882..10cf700741 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -270,8 +270,8 @@
 	      the host &mac;.  This can be accomplished by adding
 	      <literal>ifconfig_ed0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in <link
-		linkend="advanced-networking"></link>.</para>
+	      networking setups are described in <xref
+		linkend="advanced-networking"/>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -780,8 +780,8 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	      the &microsoft.windows; host.  This can be accomplished
 	      by adding <literal>ifconfig_de0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in <link
-		linkend="advanced-networking"></link>.</para>
+	      networking setups are described in <xref
+		linkend="advanced-networking"/>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -983,8 +983,8 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	      the host &mac;.  This can be accomplished by adding
 	      <literal>ifconfig_em0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in <link
-		linkend="advanced-networking"></link>.</para>
+	      networking setups are described in <xref
+		linkend="advanced-networking"/>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -1027,7 +1027,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	package or port in the &os; guest.  This will install
 	the port:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
 
       <para>Add these lines to
 	<filename>/etc/rc.conf</filename>:</para>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index c435a3a6d5..bfd3ae1ec0 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/en_US.ISO8859-1/books/pmake/answers/chapter.xml b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
index e3f96181fa..68d86a9db3 100644
--- a/en_US.ISO8859-1/books/pmake/answers/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     $FreeBSD$
 -->
diff --git a/en_US.ISO8859-1/books/pmake/basics/chapter.xml b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
index 12df062549..4ae0a8b799 100644
--- a/en_US.ISO8859-1/books/pmake/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      $FreeBSD$
 -->
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index c7c31487e1..6fd4709813 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters.ent SYSTEM "chapters.ent">
 %chapters.ent;
 ]>
@@ -16,7 +14,25 @@
       <surname>de Boor</surname>
     </author>
 
-    &legalnotice;
+    <copyright>
+      <year>1988</year>
+      <year>1989</year>
+      <holder>Adam de Boor</holder>
+    </copyright>
+
+    <copyright>
+      <year>1989</year>
+      <holder>Berkeley Softworks</holder>
+    </copyright>
+
+    <copyright>
+      <year>1988</year>
+      <year>1989</year>
+      <year>1993</year>
+      <holder>The Regents of the University of California.</holder>
+    </copyright>
+
+    &pmake.legalnotice;
 
     <releaseinfo>$FreeBSD$</releaseinfo>
   </bookinfo>
diff --git a/en_US.ISO8859-1/books/pmake/chapters.ent b/en_US.ISO8859-1/books/pmake/chapters.ent
index 709d6a73f3..c1bb3f5f28 100644
--- a/en_US.ISO8859-1/books/pmake/chapters.ent
+++ b/en_US.ISO8859-1/books/pmake/chapters.ent
@@ -5,7 +5,7 @@
      $FreeBSD$
 -->
 
-<!ENTITY legalnotice      SYSTEM "legalnotice.xml">
+<!ENTITY pmake.legalnotice SYSTEM "legalnotice.xml">
 <!ENTITY chap.intro       SYSTEM "intro/chapter.xml">
 <!ENTITY chap.basics      SYSTEM "basics/chapter.xml">
 <!ENTITY chap.shortcuts   SYSTEM "shortcuts/chapter.xml">
diff --git a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
index 9b59545ea8..d983027d75 100644
--- a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
+++ b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      $FreeBSD$
 -->
diff --git a/en_US.ISO8859-1/books/pmake/gods/chapter.xml b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
index bc57aba8c9..6bca57995b 100644
--- a/en_US.ISO8859-1/books/pmake/gods/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     $FreeBSD$
 -->
diff --git a/en_US.ISO8859-1/books/pmake/intro/chapter.xml b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
index 39597afc0b..b1cfcec310 100644
--- a/en_US.ISO8859-1/books/pmake/intro/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      PMake - A Tutorial
 
diff --git a/en_US.ISO8859-1/books/pmake/legalnotice.xml b/en_US.ISO8859-1/books/pmake/legalnotice.xml
index d443019036..5226e208a0 100644
--- a/en_US.ISO8859-1/books/pmake/legalnotice.xml
+++ b/en_US.ISO8859-1/books/pmake/legalnotice.xml
@@ -1,26 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     $FreeBSD$
 -->
 
-<copyright>
-  <year>1988</year>
-  <year>1989</year>
-  <holder>Adam de Boor</holder>
-</copyright>
-
-<copyright>
-  <year>1989</year>
-  <holder>Berkeley Softworks</holder>
-</copyright>
-
-<copyright>
-  <year>1988</year>
-  <year>1989</year>
-  <year>1993</year>
-  <holder>The Regents of the University of California.</holder>
-</copyright>
-
 <legalnotice id="legalnotice">
   <para>All rights reserved.</para>
 
diff --git a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
index 417e3b65a5..9c7a90cac9 100644
--- a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     $FreeBSD$
 -->
diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile
index 016d32d309..7e813c64ac 100644
--- a/en_US.ISO8859-1/books/porters-handbook/Makefile
+++ b/en_US.ISO8859-1/books/porters-handbook/Makefile
@@ -22,10 +22,6 @@ INSTALL_ONLY_COMPRESSED?=
 SRCS=  book.xml
 SRCS+= uses.xml
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 # Images from the cross-document image library
 IMAGES_LIB+=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 8758226db8..45f14f80ae 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY values.uses SYSTEM "uses.xml">
 ]>
 
diff --git a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl b/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index f5e26338e4..0000000000
--- a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!-- Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files, 
-     rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE"> 
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      <![ %output.html; [ 
-	(define ($email-footer$)
-          (make sequence
-            (literal "For questions about the FreeBSD ports system, e-mail <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal ">.")
-            (make empty-element gi: "br")
-            (literal "For questions about this documentation, e-mail <")
-            (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-              (literal "doc@FreeBSD.org"))
-            (literal ">.")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc.jpg b/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc.jpg
new file mode 100644
index 0000000000..8800b5b3b7
Binary files /dev/null and b/en_US.ISO8859-1/htdocs/projects/2011-freebsd-gsoc.jpg differ
diff --git a/en_US.ISO8859-1/share/xml/catalog b/en_US.ISO8859-1/share/xml/catalog
index a865eaa313..2422c1740c 100644
--- a/en_US.ISO8859-1/share/xml/catalog
+++ b/en_US.ISO8859-1/share/xml/catalog
@@ -1,32 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-  --
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/en_US.ISO8859-1/share/xml/catalog.xml b/en_US.ISO8859-1/share/xml/catalog.xml
index a077690b34..7f0d5f9037 100644
--- a/en_US.ISO8859-1/share/xml/catalog.xml
+++ b/en_US.ISO8859-1/share/xml/catalog.xml
@@ -13,4 +13,8 @@
                  rewritePrefix="../../"/>
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
 </catalog>
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index fe8eb023c8..e5a3813abe 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -3,23 +3,24 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"../../../share/xml/freebsd.ent">
 %freebsd;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	"glossary.ent">
 %glossary;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"../../../share/xml/trademarks.ent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"../../../share/xml/urls.ent">
 %urls;
diff --git a/en_US.ISO8859-1/share/xml/freebsd.dsl b/en_US.ISO8859-1/share/xml/freebsd.dsl
index a6e8b41aea..30c745f542 100644
--- a/en_US.ISO8859-1/share/xml/freebsd.dsl
+++ b/en_US.ISO8859-1/share/xml/freebsd.dsl
@@ -2,13 +2,6 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
-<!ENTITY % output.print.niceheaders "IGNORE">
 ]>
 
 <style-sheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-common.xsl b/en_US.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl b/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl b/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..2e5af6f86d
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/en_US.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 598c3888dc..28080609bc 100644
--- a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='es'>
   <title>Argentina.com : Un estudio de caso</title>
diff --git a/es_ES.ISO8859-1/articles/contributing/article.xml b/es_ES.ISO8859-1/articles/contributing/article.xml
index 84d59e794b..49212c4bef 100644
--- a/es_ES.ISO8859-1/articles/contributing/article.xml
+++ b/es_ES.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="es">
   <articleinfo>
diff --git a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
index 0d9af8f764..35f9e5f459 100644
--- a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
index 26a31cad7e..4f3e4d17aa 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Spanish Documentation Project -->
@@ -254,7 +251,7 @@
       <listitem>
         <para>Existe la creencia de que los proyectos BSD est�n
          fragmentados y enfrentados entre s�.  El <ulink
-          url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall Street
+          url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall Street
             Journal</ulink> habl� de la <quote>balcanizaci�n
          </quote> de los proyectos BSD.  Como en el caso del pleito, esa
           creencia se fundamenta en historia antigua.</para>
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
index f9b491df3f..fd0fc8e1d6 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
 ]>
 
-<article lang='es'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='es'>
   <articleinfo>
     <title>FreeBSD From Scratch</title>
 
@@ -472,7 +470,8 @@ Do you wish to delete what is left of /var/tmp/temproot.fase1? [no] <userinput>n
         dispositivos como corresponda.</para>
     </warning>
 
-<programlisting><inlinegraphic fileref="fase_1.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_1.sh" parse="text"
+  encoding="iso-8859-1"/></programlisting>
 
     <para>Descargue <ulink
         url="fase_1.sh"><filename>fase_1.sh</filename></ulink>.</para>
@@ -588,7 +587,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
       compartida no olvide copiarlo al sistema nuevo antes de
       arrancarlo.</para>
 
-<programlisting><inlinegraphic fileref="fase_2.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_2.sh" parse="text"
+  encoding="iso-8859-1"/></programlisting>
 
     <para>Descargue <ulink
         url="fase_2.sh"><filename>fase_2.sh</filename></ulink>.</para>
@@ -626,7 +626,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
       partici�n compartida bien copi�ndolo en alg�n
       lugar dentro del nuevo sistema.</para>
 
-<programlisting><inlinegraphic fileref="fase_3.mk" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_3.mk" parse="text"
+  encoding="iso-8859-1"/></programlisting>
 
     <para>Descargue <ulink
         url="fase_3.mk"><filename>fase_3.mk</filename></ulink>.</para>
diff --git a/es_ES.ISO8859-1/articles/fdp-es/article.xml b/es_ES.ISO8859-1/articles/fdp-es/article.xml
index 6d796c031d..02f4f44c32 100644
--- a/es_ES.ISO8859-1/articles/fdp-es/article.xml
+++ b/es_ES.ISO8859-1/articles/fdp-es/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/articles/laptop/article.xml b/es_ES.ISO8859-1/articles/laptop/article.xml
index 7f202815f2..34d6db171a 100644
--- a/es_ES.ISO8859-1/articles/laptop/article.xml
+++ b/es_ES.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang="es">
   <articleinfo>
diff --git a/es_ES.ISO8859-1/articles/linux-comparison/article.xml b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
index 100dfba3aa..0178b96b45 100644
--- a/es_ES.ISO8859-1/articles/linux-comparison/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 Copyright (c) 2005 Dru Lavigne
diff --git a/es_ES.ISO8859-1/articles/linux-users/article.xml b/es_ES.ISO8859-1/articles/linux-users/article.xml
index 1e888ab636..05f59f2195 100644
--- a/es_ES.ISO8859-1/articles/linux-users/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.1			-->
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
index 683cab8e61..04cf0f3ec9 100644
--- a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$
   Traducido de la version 1.4
diff --git a/es_ES.ISO8859-1/articles/nanobsd/article.xml b/es_ES.ISO8859-1/articles/nanobsd/article.xml
index 4a603b736c..61890e630e 100644
--- a/es_ES.ISO8859-1/articles/nanobsd/article.xml
+++ b/es_ES.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.3                   -->
@@ -123,7 +120,7 @@
 	    <listitem>
 	      <para>La partici�n que contiene los ficheros de
 	        configuraci�n, que puede montarse bajo
-	        <filename role="directory">/cfg</filename> durante el
+	        <filename class="directory">/cfg</filename> durante el
 	        funcionamiento del sistema.</para>
 	    </listitem>
       </itemizedlist>
@@ -131,20 +128,20 @@
       <para>Estas particiones se montan normalmente en modo de
         s�lo lectura.</para>
 
-      <para>Los directorios <filename role="directory">/etc</filename>
-        y <filename role="directory">/var</filename> son discos
+      <para>Los directorios <filename class="directory">/etc</filename>
+        y <filename class="directory">/var</filename> son discos
         &man.md.4; (malloc).</para>
 
       <para>La partici�n de los ficheros de configuraci�n
         permanece bajo el
-        directorio <filename role="directory">/cfg</filename>.  Este
+        directorio <filename class="directory">/cfg</filename>.  Este
         directorio contiene ficheros que usa el
-        directorio <filename role="directory">/etc</filename> y se
+        directorio <filename class="directory">/etc</filename> y se
         monta en modo de s�lo lectura inmediatamente
         despu�s del arranque; por lo tanto, es necesario que
         los ficheros que se modifiquen
-        en <filename role="directory">/etc</filename> se copien
-        en <filename role="directory">/cfg</filename> si se desea que
+        en <filename class="directory">/etc</filename> se copien
+        en <filename class="directory">/cfg</filename> si se desea que
         los cambios perduren despu�s del reinicio del
         sistema.</para>
 
@@ -161,13 +158,13 @@
 
       <note>
 	    <para>La partici�n que contiene el
-	      directorio <filename role="directory">/cfg</filename>
+	      directorio <filename class="directory">/cfg</filename>
 	      deber�a montarse �nicamente en el arranque y
 	      mientras se sobreescriben los ficheros de
 	      configuraci�n.</para>
 
 	    <para>No es buena idea montar siempre el
-          directorio <filename role="directory">/cfg</filename>,
+          directorio <filename class="directory">/cfg</filename>,
           especialmente si el
           sistema <application>NanoBSD</application> se ejecuta en un
           dispositivo de almacenamiento masivo que pueda verse
@@ -184,7 +181,7 @@
       <para>Una imagen de <application>NanoBSD</application> se genera
 	    usando el sencillo script de
 	    shell <filename>nanobsd.sh</filename>, ubicado en el
-	    directorio <filename role="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
+	    directorio <filename class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
 	    El script crea una imagen que se deber� copiar al medio
 	    de almacenamiento mediante la utilidad &man.dd.1;.</para>
 
@@ -330,7 +327,7 @@ customize_cmd cust_foo</programlisting>
     <para>A continuaci�n vemos un ejemplo m�s �til
       de funci�n personalizada, que cambia el tama�o por
       omisi�n del directorio
-      <filename role="directory">/etc</filename> de 5MB a 30MB:</para>
+      <filename class="directory">/etc</filename> de 5MB a 30MB:</para>
 
 	<programlisting>cust_etc_size () (
 	cd &dollar;{NANO_WORLDDIR}/conf
@@ -360,7 +357,7 @@ customize_cmd cust_etc_size</programlisting>
 	  <listitem>
 	    <para><literal>cust_install_files</literal> : Instala ficheros
 	      de configuraci�n desde el
-	      directorio <filename role="directory">nanobsd/files</filename>,
+	      directorio <filename class="directory">nanobsd/files</filename>,
           que contiene scripts �tiles para la
 	      administraci�n del sistema.</para>
 	  </listitem>
@@ -497,7 +494,7 @@ customize_cmd cust_nobeastie</programlisting>
 	nueva en su sistema <application>NanoBSD</application> en
 	funcionamiento dispone de los scripts <filename>updatep1</filename>
         y <filename>updatep2</filename>, ubicados en el directorio
-        <filename role="directory">/root</filename>.  La
+        <filename class="directory">/root</filename>.  La
         elecci�n de uno u otro script depende de qu�
         partici�n est� ejecutando el sistema,
         la primera o la segunda.</para>
diff --git a/es_ES.ISO8859-1/articles/p4-primer/article.xml b/es_ES.ISO8859-1/articles/p4-primer/article.xml
index 55023fe416..593feebfd9 100644
--- a/es_ES.ISO8859-1/articles/p4-primer/article.xml
+++ b/es_ES.ISO8859-1/articles/p4-primer/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='es'>
   <title><application>Perforce</application> en el contexto del desarrollo de &os;</title>
@@ -253,7 +250,7 @@
 
         <para>Esto asociar� por completo el repositorio
 	<application>Perforce</application> al directorio
-	  <filename role="directory">Root</filename>
+	  <filename class="directory">Root</filename>
 	  del cliente.  <emphasis>NO USE ESTE VALOR POR DEFECTO</emphasis>.
 	  El repositorio de &os; es enorme e intentar asociarlo y
 	  sincronizarse con dicho repositorio tardar� much�simo y
@@ -261,7 +258,7 @@
 	  s�lamente la secci�n del repositorio en la que va a
 	  trabajar.  Por ejemplo, hay un �rbol para el proyecto
 	  smpng en <filename
-	  role="directory">//depot/projects/smpng</filename>.  Una
+	  class="directory">//depot/projects/smpng</filename>.  Una
 	  asociaci�n en ese caso ser�a algo as�:</para>
 
 	<programlisting>//depot/projects/smpng/... //<replaceable>cliente</replaceable>/...</programlisting>
@@ -358,7 +355,7 @@
   <para>Puede sincronizarse parte del �rbol o del cliente
     especificando una ruta relativa a la orden <quote>sync</quote>.
   Por ejemplo, para sincronizar s�lo el directorio
-    <filename role="directory">ufs</filename>
+    <filename class="directory">ufs</filename>
     del proyecto <literal>smpng</literal> ejecute lo
     siguiente:</para>
 
@@ -396,7 +393,7 @@
     es un �nico �rbol plano.  Se accede a cada fichero a
     trav�s de una
     sencilla ruta bajo el directorio <filename
-    role="directory">//depot</filename>, tanto si se trata de un
+    class="directory">//depot</filename>, tanto si se trata de un
     fichero de nueva creaci�n como si proviene de una
     ramificaci�n.
     Esto supone una gran diferencia con respecto a sistemas como CVS,
@@ -915,7 +912,7 @@
     servidor de CVS sobre cambios realizados en la rama HEAD, y dichos
     cambios se entregan a <application>Perforce</application> dentro del
     �rbol <filename
-    role="directory">//depot/vendor/freebsd/...</filename>.
+    class="directory">//depot/vendor/freebsd/...</filename>.
    De este modo este �rbol permite la ramificaci�n y
    la integraci�n de proyectos derivados.  Cualquier proyecto
    que implique la modificaci�n del c�digo fuente de
@@ -972,7 +969,7 @@
   <para>La mayor�a de los proyectos de &os; dentro del programa
     <quote>Google Summer of Code</quote> est�n en
     <filename
-    role="directory">//depot/projects/soc2005/<replaceable>nombre_del_proyecto</replaceable>/...</filename>
+    class="directory">//depot/projects/soc2005/<replaceable>nombre_del_proyecto</replaceable>/...</filename>
     en el servidor &os; de <application>Perforce</application>.</para>
 
   <para>Entre las responsabilidades del mentor del proyecto
diff --git a/es_ES.ISO8859-1/articles/problem-reports/article.xml b/es_ES.ISO8859-1/articles/problem-reports/article.xml
index db02c89a9b..ad3ac9ab1b 100644
--- a/es_ES.ISO8859-1/articles/problem-reports/article.xml
+++ b/es_ES.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='es'>
   <articleinfo>
diff --git a/es_ES.ISO8859-1/articles/releng/article.xml b/es_ES.ISO8859-1/articles/releng/article.xml
index c5b6cf2823..1054c066e8 100644
--- a/es_ES.ISO8859-1/articles/releng/article.xml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/faq/book.xml b/es_ES.ISO8859-1/books/faq/book.xml
index 4d8d30a2cd..3cc977e35e 100644
--- a/es_ES.ISO8859-1/books/faq/book.xml
+++ b/es_ES.ISO8859-1/books/faq/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <book lang="es">
   <bookinfo>
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index 4b13f0b455..96f6a5e7fa 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -37,7 +37,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index a8e054b92f..e2620b2db5 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2696,7 +2696,7 @@ Exports list on foobar:
         trabajo de alto rendimiento, como por ejemplo estaciones de Silicon
         Graphics y de Sun Microsystems.  El montaje del sistema de ficheros
         remoto suele funcionar perfectamente y algunas operaciones sobre el
-        el sistema de ficheros pueden tener &eacute,xito pero de repente el
+        el sistema de ficheros pueden tener �xito pero de repente el
         el servidor que no responde a las peticiones del cliente, aunque
         peticiones y respuestas de otros clientes funcionan con normalidad y
         se contin�an procesando.  Esto sucede en los sistemas clientes,
@@ -3172,7 +3172,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
                 n�cleo, lo hace <filename>pxeboot</filename>.
                 Existen otras posibilidades interesantes, como cargar
 		<filename>pxeboot</filename> desde el directorio
-              <filename role="directory">/boot</filename>
+              <filename class="directory">/boot</filename>
                 de una unidad de CD-ROM de &os; (ya que &man.pxeboot.8; puede
                cargar un n�cleo
               <filename>GENERIC</filename> surge la posibilidad de utilizar
@@ -3522,7 +3522,7 @@ options     BOOTP_NFSROOT  # NFS mount root filesystem using BOOTP info
             m�todo de configuraci�n distinto del que se
             utiliza en <filename>clone_root</filename> y en los <quote>
 	    scripts</quote> del sistema de <filename
-	    role="directory">/etc</filename>, que resultan ser un tanto
+	    class="directory">/etc</filename>, que resultan ser un tanto
             confusos.  No obstante se pueden utilizar a modo de referencia,
             excepto si se prefiere utilizar el m�todo que se describe
             en ellos, en cuyo caso se necesitar� modificar y
@@ -3543,7 +3543,7 @@ options     BOOTP_NFSROOT  # NFS mount root filesystem using BOOTP info
 	  <programlisting>#!/bin/sh
 export DESTDIR=/data/misc/diskless
 mkdir -p ${DESTDIR}
-cd /usr/src; make world && make kernel
+cd /usr/src; make world &amp;&amp; make kernel
 cd /usr/src/etc; make distribution</programlisting>
 
 	  <para>Una vez ejecutado puede ser necesario ajustar los ficheros
@@ -3637,7 +3637,7 @@ host margaux {
 	</sect4>
 
 	<sect4>
-	  <title><acronym>NFS</acronym> swap en &os&nbsp;5.X</title>
+	  <title><acronym>NFS</acronym> swap en &os;&nbsp;5.X</title>
 
 	  <para>El n�cleo no soporta la activaci�n del
             intercambio a trav�s de <acronym>NFS</acronym> en tiempo de
@@ -6888,10 +6888,10 @@ www             IN CNAME        @</programlisting>
           <para>Reorganizar y crear los archivos de configuraci�n de
             zona b�sicos:</para>
 	  <screen>&prompt.root; <userinput>cp /etc/localtime etc</userinput><co id="localtime"/>
-&prompt.root; <userinput>mv named.conf etc && ln -sf etc/named.conf</userinput>
+&prompt.root; <userinput>mv named.conf etc &amp;&amp; ln -sf etc/named.conf</userinput>
 &prompt.root; <userinput>mv named.root master</userinput>
 <!-- I don't like this next bit -->
-&prompt.root; <userinput>sh make-localhost && mv localhost.rev localhost-v6.rev master</userinput>
+&prompt.root; <userinput>sh make-localhost &amp;&amp; mv localhost.rev localhost-v6.rev master</userinput>
 &prompt.root; <userinput>cat > master/named.localhost
 $ORIGIN localhost.
 $TTL 6h
@@ -6921,12 +6921,12 @@ $TTL 6h
             del directorio del <quote>sandbox</quote>:</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src/lib/libisc</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libbind</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
 &prompt.root; <userinput>cd /usr/src/libexec/named-xfer</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make NOSHARED=yes all</userinput>
-&prompt.root; <userinput>cp named-xfer /etc/namedb/bin && chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make NOSHARED=yes all</userinput>
+&prompt.root; <userinput>cp named-xfer /etc/namedb/bin &amp;&amp; chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
 
 	  <para>Despue�s de instalar la versi�n est�tica
 	    de <command>named-xfer</command> se deben realizar algunas tareas
@@ -6945,11 +6945,11 @@ $TTL 6h
 	      <para>En algunas ocasiones este paso puede fallar.  Si es su caso
                 ejecute lo siguiente:</para>
 
-	      <screen>&prompt.root; <userinput>cd /usr/src && make cleandir && make cleandir</userinput></screen>
+	      <screen>&prompt.root; <userinput>cd /usr/src &amp;&amp; make cleandir &amp;&amp; make cleandir</userinput></screen>
 
 	      <para>y borre su directorio <filename>/usr/obj</filename>:</para>
 
-	      <screen>&prompt.root; <userinput>rm -fr /usr/obj && mkdir /usr/obj</userinput></screen>
+	      <screen>&prompt.root; <userinput>rm -fr /usr/obj &amp;&amp; mkdir /usr/obj</userinput></screen>
 
 		<para>Esto limpia cualquier <quote>impureza</quote> del
 		  �rbol de fuentes y si se repiten los pasos anteriores
@@ -6969,7 +6969,7 @@ $TTL 6h
             que <application>named</application> pueda verlo y pueda escribir
             sobre �l:</para>
 
-	  <screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>
+	  <screen>&prompt.root; <userinput>cd /etc/namedb/dev &amp;&amp; mknod null c 2 2</userinput>
 &prompt.root; <userinput>chmod 666 null</userinput></screen>
 	</listitem>
 
diff --git a/es_ES.ISO8859-1/books/handbook/audit/chapter.xml b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
index 40721a2b72..becd1a38a3 100644
--- a/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index cc0e7bf93c..b22187d26b 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1232,7 +1232,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1254,7 +1254,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1284,7 +1284,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1311,7 +1311,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1337,7 +1337,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1534,7 +1534,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
         que se preve que ocupen una slice.</para>
 
       <para>Tanto las �slice� y las unidades f�sicas
-        �peligrosamente dedicadas&raquo, como otras unidades
+        �peligrosamente dedicadas�, como otras unidades
         contienen <firstterm>particiones</firstterm>, que se designan
         mediante letras desde la <literal>a</literal>
         hasta <literal>h</literal>.  Esta letra se a�ade al nombre
@@ -1681,7 +1681,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
index adcaf1ef07..cdcb9e9203 100755
--- a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/book.xml b/es_ES.ISO8859-1/books/handbook/book.xml
index 92c20ce932..0992d8dcfb 100755
--- a/es_ES.ISO8859-1/books/handbook/book.xml
+++ b/es_ES.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/es_ES.ISO8859-1/books/handbook/boot/chapter.xml b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
index c30266dbcb..3a2fa91d94 100644
--- a/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/chapters.ent b/es_ES.ISO8859-1/books/handbook/chapters.ent
index fab3b141f3..2de5ecc113 100755
--- a/es_ES.ISO8859-1/books/handbook/chapters.ent
+++ b/es_ES.ISO8859-1/books/handbook/chapters.ent
@@ -19,231 +19,61 @@
      $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/chapters.ent,v 1.2 2004/10/08 22:36:51 jesusr Exp $
 -->
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "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.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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
-]]>
-<![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.xml">
-]]>
+  <!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">
+  <!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">
+  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!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/es_ES.ISO8859-1/books/handbook/colophon.xml b/es_ES.ISO8859-1/books/handbook/colophon.xml
index 757be7a2dd..36cba45a64 100644
--- a/es_ES.ISO8859-1/books/handbook/colophon.xml
+++ b/es_ES.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/config/chapter.xml b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
index bdf9fce3a7..b97e06f27d 100644
--- a/es_ES.ISO8859-1/books/handbook/config/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f4f13fc3a0..9656d5dd78 100755
--- a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
index da24efcfd7..e4316d8b02 100644
--- a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Version en ingles traducida: 1.45
 
 
@@ -199,7 +199,7 @@
 	electr�nico, lector de noticias e incluso ofrece un
 	editor de p�ginas HTML por si quiere crear
         p�ginas web.  Los usuarios de
-        <application>&netscape</application> encontrar�n semejanzas
+        <application>&netscape;</application> encontrar�n semejanzas
         con la suite <application>Communicator</application>, dado que
         ambos navegadores comparten parte de la base de desarrollo.</para>
 
diff --git a/es_ES.ISO8859-1/books/handbook/disks/chapter.xml b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
index 797e418fdb..20f4c7839c 100644
--- a/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2026,7 +2026,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
           <para>Algunas veces las entradas bajo <filename>/dev</filename>
             tendr�n que ser (re)creadas.  Para ello, ejecute:</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>
@@ -2680,9 +2680,9 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
         para mandar los datos a una unidad de cinta remota.</para>
 
       <screen>&prompt.root; <userinput>for f in <replaceable>lista_directorios; do</replaceable></userinput>
-<userinput>find $f >> backup.list</userinput>
+<userinput>find $f &lt;&lt; backup.list</userinput>
 <userinput>done</userinput>
-&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>usuario</replaceable>@<replaceable>m�quina</replaceable> "cat > <replaceable>dispositivo_de_respaldo</replaceable>"</userinput></screen>
+&prompt.root; <userinput>cpio -v -o --format=newc &lt; backup.list | ssh <replaceable>usuario</replaceable>@<replaceable>m�quina</replaceable> "cat > <replaceable>dispositivo_de_respaldo</replaceable>"</userinput></screen>
 
       <para>Donde <replaceable>lista_directorios</replaceable> es la lista de
         directorios que desea respaldar,
@@ -2890,7 +2890,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	  <title>Un <quote>script</quote> para la creaci�n de discos
             flexibles de arranque</title>
 
-	<programlisting><![ CDATA [#!/bin/sh
+	<programlisting><![CDATA[#!/bin/sh
 #
 # create a restore floppy
 #
@@ -2936,7 +2936,7 @@ mkdir /mnt/var
 #
 if [ ! -x /sys/compile/MINI/kernel ]
 then
-	 cat << EOM
+	 cat &lt;&lt; EOM
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
@@ -3018,19 +3018,19 @@ cd /
 #
 # create minimum file system table
 #
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab &lt;&lt;EOM
 /dev/fd0a    /    ufs    rw  1  1
 EOM
 
 #
 # create minimum passwd file
 #
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/passwd &lt;&lt;EOM
+root:*:0:0:Charlie &amp;:/root:/bin/sh
 EOM
 
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/master.passwd &lt;&lt;EOM
+root::0:0::0:0:Charlie &amp;:/root:/bin/sh
 EOM
 
 chmod 600 /mnt/etc/master.passwd
@@ -3111,17 +3111,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
           Una hora m�s que gaste ahora puede ahorrarle mucho
           sufrimiento m�s adelante.</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-        <title>* No tom� medidas antes del desastre
-          ?Y ahora qu�?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
diff --git a/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
index ed00cd1f37..048d4fc722 100755
--- a/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1770,7 +1770,7 @@ help
 	    <entry>SSH only</entry>
 	    <entry>CVS de s�lo lectura, espacio web personal,
               correo electr�nico</entry>
-	    <entry>&a.brian</entry>
+	    <entry>&a.brian;</entry>
           </row>
 
 	  <row>
diff --git a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
index 27b273129a..daef773e24 100644
--- a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index 3a3a17c509..ab2b653812 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Spanish Documentation Project
 
@@ -100,7 +100,7 @@
     <para>GEOM permite el acceso y control de clases &mdash;sectores de
       arranque maestros (MBR), etiquetas <acronym>BSD</acronym>, etc&mdash; por
       medio del uso de proveedores, o de los ficheros especiales de
-      <filename role="directory">/dev</filename>.
+      <filename class="directory">/dev</filename>.
       Capaz de trabajar con varias configuraciones de <acronym>RAID</acronym>
       por software, GEOM proporcionar� transparentemente acceso al
       sistema operativo y las utilidades del mismo.</para>
@@ -171,7 +171,7 @@
       <step><para>Aseg�rese de que existe un punto de montaje adecuado.
 	Si este volumen se convertir� en una partici�n ra�z,
 	utilice temporalmente otro punto de montaje, como <filename
-        role="directory">/mnt</filename>.</para>
+        class="directory">/mnt</filename>.</para>
 
         <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
@@ -209,7 +209,7 @@ XXX: What message?  Put it inside the screen output above.
       <step><para>Aadem�s del dispositivo <filename>st0</filename>,
 	este proceso deber�a haber creado otros dos
 	dispositivos en el directorio
-	<filename role="directory">/dev/stripe</filename>, incluyendo
+	<filename class="directory">/dev/stripe</filename>, incluyendo
 	<filename>st0a</filename> y <filename>st0c</filename>.
         Ahora se debe crear un sistema de ficheros en el dispositivo
 	<filename>st0a</filename> usando la siguiente orden
@@ -273,7 +273,7 @@ XXX: What message?  Put it inside the screen output above.
       particiones.  Una deber�a ser una partici�n de intercambio,
       de dos veces el tama�o de la <acronym>RAM</acronym>, y todo el
       espacio restante se dedicar� al sistema de ficheros ra�z
-      (<filename role="directory">/</filename>).
+      (<filename class="directory">/</filename>).
       Es posible tener particiones aparte para otros puntos de montajes; sin
       embargo, esto multiplicar� por diez el nivel de dificultad, debido
       a la alteraci�n manual de las opciones de &man.bsdlabel.8; y
@@ -300,7 +300,7 @@ Done.</screen>
 
     <note>
 	    <para>Esta orden deber�a haber creado en el directorio
-	<filename role="directory">/dev/mirror</filename> los nodos de
+	<filename class="directory">/dev/mirror</filename> los nodos de
 	dispositivo <filename>gm0</filename>, <filename>gm0s1</filename>,
 	<filename>gm0s1a</filename>, y <filename>gm0s1c</filename>.</para>
     </note>
@@ -332,7 +332,7 @@ Done.</screen>
       informaci�n y un pu�ado de n�meros.  Esto es bueno.
       Examine la pantalla por si hay alg�n mensaje de error y monte el
       dispositivo en el punto de montaje
-      <filename role="directory">/mnt</filename>:</para>
+      <filename class="directory">/mnt</filename>:</para>
 
     <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
 
@@ -343,7 +343,7 @@ Done.</screen>
       copiar� el c�digo de arranque.  De ese modo, el fallo
       estar�a garantizado.</para>
 
-    <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
+    <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt &amp;&amp; restore -r -v -f-)</userinput></screen>
 
     <para>Se debe hacer esto para cada sistema de ficheros.  Simplemente
       ponga el sistema de ficheros adecuado en la ubicaci�n correcta
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 9561c329e2..d2676e4993 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1169,14 +1169,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  &man.tip.1; o &man.cu.1;) para as� recuperar el prompt de
 	  PROM.  Tiene este aspecto:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1189,7 +1183,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		indica el n�mero de la CPU activa.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>Ponga el CDROM dentro de la unidad y tecl�e
 	  <command>boot cdrom</command> en el prompt
@@ -1308,7 +1301,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1318,7 +1311,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1376,7 +1369,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1394,7 +1387,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1406,7 +1399,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1436,7 +1429,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1458,7 +1451,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1476,7 +1469,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1486,7 +1479,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1526,7 +1519,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1726,7 +1719,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1809,7 +1802,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1860,7 +1853,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1903,7 +1896,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1937,13 +1930,13 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
       <para>El <keycap>tabulador</keycap> se usa para hacer pasar el
-        cursor entre &gui.ok, &gui.cancel;.</para>
+        cursor entre &gui.ok;, &gui.cancel;.</para>
 
       <para>Pulse <keycap>tabulador</keycap> para pasar el cursor a
 	&gui.ok; y pulse
@@ -2227,7 +2220,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2256,7 +2249,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2287,7 +2280,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2308,7 +2301,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2327,7 +2320,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2345,7 +2338,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2371,7 +2364,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2438,7 +2431,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2522,7 +2515,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2557,7 +2550,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2815,7 +2808,7 @@ operaci
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2862,7 +2855,7 @@ operaci
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3057,7 +3050,7 @@ Dicho esto ?desea activar inetd?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3197,7 +3190,7 @@ Upload subdirectory:
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3272,7 +3265,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+	      <imagedata fileref="install/nfs-server-edit"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3327,7 +3320,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver1" format="PNG"/>
+	    <imagedata fileref="install/console-saver1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3344,7 +3337,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver2" format="PNG"/>
+	    <imagedata fileref="install/console-saver2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3365,7 +3358,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3" format="PNG"/>
+	    <imagedata fileref="install/console-saver3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3379,7 +3372,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver4" format="PNG"/>
+	    <imagedata fileref="install/console-saver4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3432,7 +3425,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3445,7 +3438,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3458,7 +3451,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3505,7 +3498,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
       <para>Esta opci�n le permitir� cortar y pegar texto en
 	consola y en otros programas mediante un rat�n de tres
-	botones.  Consulte &man.moused.8 si usa uno de 2 botones, es posible
+	botones.  Consulte &man.moused.8; si usa uno de 2 botones, es posible
 	emular ese tercer bot�n.  En el siguiente ejemplo veremos la
 	configuraci�n de un rat�n �no USB� (es
 	decir, PS/2 o de puerto COM):</para>
@@ -3524,7 +3517,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3537,7 +3530,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3554,7 +3547,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3567,7 +3560,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3582,7 +3575,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3598,7 +3591,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3645,7 +3638,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-cat" format="PNG"/>
+	    <imagedata fileref="install/pkg-cat"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3669,7 +3662,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-sel" format="PNG"/>
+	    <imagedata fileref="install/pkg-sel"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3703,7 +3696,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-install" format="PNG"/>
+	    <imagedata fileref="install/pkg-install"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3718,7 +3711,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-confirm" format="PNG"/>
+	    <imagedata fileref="install/pkg-confirm"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3776,7 +3769,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3789,7 +3782,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3898,7 +3891,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3977,7 +3970,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4067,7 +4060,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4138,7 +4131,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4196,7 +4189,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4224,7 +4217,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4714,7 +4707,7 @@ Please press any key to reboot.</screen>
 	    <para>Cuando el disco de arranque no sea el primer disco
 	      del sistema &os; necesitar� un poco de ayuda para
 	      poderlo encontrar.  Puede haber dos escenarios donde
-	      suceda esto y en ambos hay que decirle a &os, d�nde
+	      suceda esto y en ambos hay que decirle a &os;, d�nde
 	      encontrar el sistema de ficheros ra�z.  Esto se
 	      hace especificando el n�mero de disco seg�n
 	      la BIOS, el tipo de disco y el n�mero de disco
@@ -4908,7 +4901,7 @@ Please press any key to reboot.</screen>
             <screen>&prompt.root; <userinput>mount /dev/fd0 /mnt</userinput></screen>
 
 	    <para>Una vez montado el disquete entre en el directorio
-	      <filename role="directory">/mnt</filename>&nbsp;:</para>
+	      <filename class="directory">/mnt</filename>&nbsp;:</para>
 
 	    <screen>&prompt.root; <userinput>cd /mnt</userinput></screen>
 
diff --git a/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
index f7c37db1e5..1e54c65d94 100755
--- a/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
index 3ca141ef23..43ce34e3bf 100644
--- a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The FreeBSD Documentation Project
 
@@ -281,11 +281,11 @@ no es necesario en &os; 6.0 y versiones posteriores.</para></footnote>
 	<para>El mejor punto de partida es la elecci�n del punto
 	  del sistema de ficheros del servidor donde estar�
 	  f�sicamente ubicada la jaula.  <filename
-	    role="directory">/usr/jail/<replaceable>nombredelajaula</replaceable></filename>
+	    class="directory">/usr/jail/<replaceable>nombredelajaula</replaceable></filename>
 	  es un buen sitio.   <replaceable>nombredelajaula</replaceable>
 	  es el nombre de m�quina que identifica a la jaula.  El
 	  sistema de ficheros <filename
-	    role="directory">/usr/</filename> suele tener espacio
+	    class="directory">/usr/</filename> suele tener espacio
 	    suficiente para albergar el sistema de ficheros de la jaula que,
 	    cuando se trata de jaulas <quote>completas</quote>, es
 	    esencialmente lo necesario para alojar todos y cada uno de
@@ -308,10 +308,10 @@ no es necesario en &os; 6.0 y versiones posteriores.</para></footnote>
 	  <application>make</application> se instalan todos los ficheros
 	  de configuraci�n necesarios.  En pocas palabras,
 	  instala cada fichero instalable que haya en
-	  <filename role="directory">/usr/src/etc/</filename> en el
-	  directorio <filename role="directory">/etc</filename> de la
+	  <filename class="directory">/usr/src/etc/</filename> en el
+	  directorio <filename class="directory">/etc</filename> de la
 	  jaula, es decir, en
-	  <filename role="directory">$D/etc/</filename>.</para>
+	  <filename class="directory">$D/etc/</filename>.</para>
       </callout>
 
       <callout arearefs="jaildevfs">
@@ -661,10 +661,10 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	<itemizedlist>
 	  <listitem>
 	    <para>Cada jaula se montar� bajo <filename
-		role="directory">/home/j</filename>.</para>
+		class="directory">/home/j</filename>.</para>
 	  </listitem>
 	  <listitem>
-	    <para><filename role="directory">/home/j/mroot</filename>
+	    <para><filename class="directory">/home/j/mroot</filename>
 	      ser� la plantilla para cada jaula y la
 	      partici�n de s�lo lectura para todas las
 	      jaulas.</para>
@@ -672,29 +672,29 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	  <listitem>
 	    <para>Se crear� un directorio vac�o para
 	      cada jaula bajo el directorio <filename
-		role="directory">/home/j</filename>.</para>
+		class="directory">/home/j</filename>.</para>
 	  </listitem>
 	  <listitem>
 	    <para>Cada jaula tendr� un directorio <filename
-		role="directory">/s</filename> que estar� enlazado
+		class="directory">/s</filename> que estar� enlazado
 	      con la parte de lectura-escritura del sistema.</para>
 	  </listitem>
 	  <listitem>
 	    <para>Cada jaula tendr� su propio sistema en modo
 	      lectura-escritura basado en <filename
-		role="directory">/home/j/skel</filename>.</para>
+		class="directory">/home/j/skel</filename>.</para>
 	  </listitem>
 	  <listitem>
 	    <para>Cada parte de lectura-escritura correspondiente a cada
 	      jaula se crear� en <filename
-		role="directory">/home/js</filename>.</para>
+		class="directory">/home/js</filename>.</para>
 	  </listitem>
 	</itemizedlist>
 
 	<note>
 	  <para>Se asume que las jaulas se instalar�n bajo
 	    la partici�n <filename
-	      role="directory">/home</filename>.  Por supuesto esto no
+	      class="directory">/home</filename>.  Por supuesto esto no
 	    es en absoluto obligatorio, pero hay que tener en cuenta que
 	    debe hacerse el mismo cambio en cada uno de los ejemplos que
 	    se muestran m�s adelante.</para>
@@ -775,7 +775,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	      ficheros de s�lo lectura.  Por favor,
 	      aseg�rese de que los enlaces simb�licos
 	      se crean en las ubicaciones correctas: <filename
-		role="directory">s/</filename>.  Si se usan directorios
+		class="directory">s/</filename>.  Si se usan directorios
 	      reales o directorios err�neos la instalaci�n
 	      no funcionar�.</para>
 
@@ -871,12 +871,12 @@ jail_www_devfs_enable="YES"</programlisting>
 	      <para>:&nbsp;La raz�n por la que
 		<varname>jail_<replaceable>nombre</replaceable>_rootdir</varname>
 		contiene <filename
-		  role="directory">/usr/home</filename> y no
-		<filename role="directory">/home</filename> es que la ruta
+		  class="directory">/usr/home</filename> y no
+		<filename class="directory">/home</filename> es que la ruta
 		f�sica del directorio<filename
-		  role="directory">/home</filename> en una instalaci�n
+		  class="directory">/home</filename> en una instalaci�n
 		de &os; por omisi�n es <filename
-		  role="directory">/usr/home</filename>.  La variable
+		  class="directory">/usr/home</filename>.  La variable
 		<varname>jail_<replaceable>nombre</replaceable>_rootdir</varname>
 		<emphasis>no</emphasis> debe apuntar a una ruta que
 		contenga un enlace simb�lico porque ser�a
@@ -959,7 +959,7 @@ jail_www_devfs_enable="YES"</programlisting>
 	    <para>El primer paso es actualizar el servidor que aloja
 	      las jaulas de la forma habitual.  Despu�s creamos
 	      una plantilla de s�lo lectura temporal en <filename
-		role="directory">/home/j/mroot2</filename>.</para>
+		class="directory">/home/j/mroot2</filename>.</para>
 
 	    <screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
@@ -1008,7 +1008,7 @@ jail_www_devfs_enable="YES"</programlisting>
 	    <note>
 	      <para>Los sistemas de ficheros de lectura-escritura
 	        cuelgan del sistema de s�lo lectura <filename
-		  role="directory">/s</filename> y por tanto deben
+		  class="directory">/s</filename> y por tanto deben
 		desmontarse antes.</para>
 	    </note>
 	  </step>
diff --git a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index e6c565ac1f..da31429a20 100755
--- a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -367,7 +367,7 @@ ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 &prompt.root; <userinput>cp GENERIC MIKERNEL</userinput></screen>
 
     <para>Por tradici�n el nombre se escribe con may�suculas y
-      si tiene varias maquinas &os, con diferente hardware es recomendable
+      si tiene varias maquinas &os;, con diferente hardware es recomendable
       darle a cada kernel el mismo nombre que la m�quina en la que va
       a ejecutarse.  En este ejemplo usaremos el nombre de
       <filename>MIKERNEL</filename> .</para>
diff --git a/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
index 8eb69d1a3d..ef9caf7f8b 100755
--- a/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Spanish Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 29f119cd53..1c75327839 100755
--- a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -60,7 +60,7 @@
       su producto si existieran esas versiones para &os;, y
       la mayor�a contin�a desarrollando �nicamente
       para Linux.
-      Vista la situaci�n ?que puede hacer un usuario de &os?
+      Vista la situaci�n ?que puede hacer un usuario de &os;?
       Aqu� es donde entra en juego la compatibilidad binaria con
       Linux.</para>
 
@@ -686,14 +686,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+	lmgrd -c ${LICENSE_FILE} 2&lt;&lt; ${LOG} 1&lt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&lt;&lt; ${LOG} 1&lt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1>&2
+	echo "Usage: `basename $0` {start|stop}" 1&lt;&amp;2
 	exit 64
 	;;
 esac
@@ -992,7 +992,7 @@ exit 0</programlisting>
             contenido:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/es_ES.ISO8859-1/books/handbook/mac/chapter.xml b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
index bf520959eb..a91a700e55 100644
--- a/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 972aca5bcf..50590ba2e0 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2031,7 +2031,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
       <screen>&prompt.user; <userinput>mail</userinput></screen>
 
       <para>El contenido de la carpeta de usuario en el directorio
-	<filename role="directory">/var/mail</filename> se leen
+	<filename class="directory">/var/mail</filename> se leen
 	autom�ticamente.
 	Si la carpeta se encuentra vac�a la aplicaci�n termina
 	su ejecuci�n con un mensaje que indica que no ha podido
@@ -2053,7 +2053,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
 	el n�mero del mensaje que queremos leer.
         En este ejemplo vamos a leer el primer correo:</para>
 
-      <screen>& <userinput>t 1</userinput>
+      <screen>&prompt.user; <userinput>t 1</userinput>
 Message 1:
 From root@localhost  Mon Mar  8 14:05:52 2004
 X-Original-To: marcs@localhost
@@ -2086,7 +2086,7 @@ This is a test message, please reply if you receive it.</screen>
         (<keycap>.</keycap>) a continuaci�n de un salto de
 	l�nea.  Veamos un ejemplo:</para>
 
-      <screen>& <userinput>R 1</userinput>
+      <screen>&prompt.user; <userinput>R 1</userinput>
 To: root@localhost
 Subject: Re: test
 
@@ -2105,7 +2105,7 @@ EOT</screen>
 	<keycap>.</keycap> tras un saldo de l�nea y pulsando la
 	tecla <quote>enter</quote>.</para>
 
-      <screen>& <userinput>mail root@localhost</userinput>
+      <screen>&prompt.user; <userinput>mail root@localhost</userinput>
 Subject: <userinput>I mastered mail
 
 Now I can send and receive email using mail ... :)
@@ -2179,7 +2179,7 @@ EOT</screen>
 
       <para><application>mutt</application> lee autom�ticamente el
         contenido de la carpeta de correo del usuario dentro del directorio
-	<filename role="directory">/var/mail</filename> y muestra por pantalla
+	<filename class="directory">/var/mail</filename> y muestra por pantalla
 	su contenido.  Si el directorio est� vac�o
         <application>mutt</application>
         quedar� a la espera de los comandos que pueda pasarle el
@@ -2190,7 +2190,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2201,7 +2201,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2233,7 +2233,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2288,7 +2288,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2302,7 +2302,7 @@ EOT</screen>
 
       <para>El directorio por defecto que <application>pine</application>
         intenta abrir es <filename
-	role="directory">inbox</filename>.  Para ver el �ndice de
+	class="directory">inbox</filename>.  Para ver el �ndice de
 	todos los mensajes recibidos pulse la tecla
         <keycap>I</keycap> o seleccione la opci�n de men�
 	denominada
@@ -2311,7 +2311,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2322,7 +2322,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2334,7 +2334,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2353,7 +2353,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
@@ -2537,7 +2537,7 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
       a la direcci�n <literal>corredefiar@ejemplo2.com</literal>:</para>
 
     <programlisting>:0
-* < 1000
+* &lt; 1000
 ! correodefiar@ejemplo2.com</programlisting>
 
     <para>Env�o de todos los correos dirigidos a
diff --git a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
index 95d76fe814..2ad2162903 100755
--- a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
index 36d7389b18..28684c2af3 100644
--- a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
index a1f505b2c2..fa6bfd3767 100644
--- a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index a67436d033..8408f8d52e 100755
--- a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/ports/chapter.xml b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
index bb5822a5d4..c70dad0efb 100755
--- a/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1165,7 +1165,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
       <screen>&prompt.root; <userinput>portupgrade -ai</userinput></screen>
 
       <para>Si solamente quiere actualizar una sola aplicaci�n (y no
-        absolutamente todos los ports) utilice la orden <<command>portupgrade
+        absolutamente todos los ports) utilice la orden <command>portupgrade
 	<replaceable>nombre-de-aplicaci�n</replaceable></command>.
 	A�ada el modificador <option>-R</option> si quiere que
 	<application>portupgrade</application> actualice antes todos los
diff --git a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index f382b7cf30..35d8e0d4df 100755
--- a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1895,7 +1895,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
@@ -1916,7 +1916,7 @@ reinput 1 {\255}
 if success goto slhup
 reinput 1 {\127}
 if success goto slhup
-if < \%x 10 goto slloop         ; intentar 10 veces para obtener un login
+if &lt; \%x 10 goto slloop         ; intentar 10 veces para obtener un login
 else goto slhup                 ; colgar y empezar de nuevo si a la decima falla
 
 :sluid
diff --git a/es_ES.ISO8859-1/books/handbook/preface/preface.xml b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
index 19ecae79f7..5c719c142f 100644
--- a/es_ES.ISO8859-1/books/handbook/preface/preface.xml
+++ b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      $FreeBSD$
 
diff --git a/es_ES.ISO8859-1/books/handbook/printing/chapter.xml b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
index c1c19adca6..4362195974 100755
--- a/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index d70d2a0398..c13f55ec23 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -4817,7 +4817,7 @@ COPYRIGHT            100% |*****************************|  4735
       <title>ssh-keygen</title>
 
       <para>&man.ssh-keygen.1; le permite validar a un usuario sin
-        pedirle la contrase�a:<</para>
+        pedirle la contrase�a:</para>
 
       <screen>&prompt.user; <userinput>ssh-keygen -t <replaceable>dsa</replaceable></userinput>
 Generating public/private dsa key pair.
@@ -5320,7 +5320,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_html</programlisting>
     <para>Si quiere usar <application>Portaudit</application>
       inst�lelo desde la colecci�n de ports:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit &amp;&amp; make install clean</userinput></screen>
 
     <para>Durante el proceso de instalaci�n los ficheros
       de configuraci�n de &man.periodic.8; se actualizan
@@ -5333,7 +5333,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_html</programlisting>
 
     <para>Despu�s de la instalaci�n un administrador debe
       actualizar la base de datos alojada en local en
-      <filename role="directory">/var/db/portaudit</filename>
+      <filename class="directory">/var/db/portaudit</filename>
       mediante:</para>
 
     <screen>&prompt.root; <userinput>portaudit -F</userinput></screen>
diff --git a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
index e4ede53d79..c8af2d1fe4 100755
--- a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/users/chapter.xml b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
index 7f231264e3..8dbf408674 100644
--- a/es_ES.ISO8859-1/books/handbook/users/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 5873bc6cf0..4d44745af3 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
      The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
index 5c4ba92666..c51654db4d 100644
--- a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/es_ES.ISO8859-1/books/handbook/x11/chapter.xml b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
index 8d881d66d2..81a8b50fb9 100755
--- a/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -356,7 +356,7 @@
     <para><application>&xorg;</application> es la implementaci�n
       de X11 por omisi�n en &os;.  <application>&xorg;</application>
       est� basado en c�digo de
-      <application>&xfree86&nbsp;4.4RC2</application> y X11R6.6.
+      <application>&xfree86;&nbsp;4.4RC2</application> y X11R6.6.
       La versi�n de <application>&xorg;</application> que se
       distribuye actualmente en la Colecci�n de Ports de &os; es
       la &xorg.version;.</para>
diff --git a/es_ES.ISO8859-1/share/xml/catalog b/es_ES.ISO8859-1/share/xml/catalog
index 7a81027959..2422c1740c 100644
--- a/es_ES.ISO8859-1/share/xml/catalog
+++ b/es_ES.ISO8859-1/share/xml/catalog
@@ -1,53 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Spanish specific ..................................................... --
-
-  -- $FreeBSD$
-  -- $FreeBSDes: doc/es_ES.ISO8859-1/share/xml/catalog,v 1.5 2004/08/05 17:11:47 carvay Exp $
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
-        "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
-        "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
-	"translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
-        "es-mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/es_ES.ISO8859-1/share/xml/catalog.xml b/es_ES.ISO8859-1/share/xml/catalog.xml
index 3553c62fbc..72795603b7 100644
--- a/es_ES.ISO8859-1/share/xml/catalog.xml
+++ b/es_ES.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,10 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent
index efe217eed8..a651859d38 100644
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@@ -2,29 +2,33 @@
 	$FreeBSD$
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % es-mailing-lists PUBLIC  "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES">
+<!ENTITY % es-mailing-lists PUBLIC  "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
+	"es-mailing-lists.ent">
 %es-mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
+	"translators.ent">
 %translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
+	"glossary.ent">
 %glossary;
diff --git a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
index 5183360936..17a24c6e09 100644
--- a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Listas de correo oficiales de FreeBSD en castellano.
 
diff --git a/es_ES.ISO8859-1/share/xml/freebsd.dsl b/es_ES.ISO8859-1/share/xml/freebsd.dsl
index 1c61f2c5fc..30c745f542 100644
--- a/es_ES.ISO8859-1/share/xml/freebsd.dsl
+++ b/es_ES.ISO8859-1/share/xml/freebsd.dsl
@@ -2,47 +2,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <!-- HTML only .................................................... -->
-
-      <![ %output.html; [
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Puede descargar �ste y muchos otros documentos desde ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Si tiene dudas sobre FreeBSD consulte la ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "documentaci�n"))
-                (literal " antes de escribir a la lista <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "Env�e sus preguntas sobre la documentaci�n a <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-      ]]>
-
     </style-specification-body>
   </style-specification>
 
diff --git a/es_ES.ISO8859-1/share/xml/l10n.ent b/es_ES.ISO8859-1/share/xml/l10n.ent
index 61b5e9d79c..891c4a7cee 100644
--- a/es_ES.ISO8859-1/share/xml/l10n.ent
+++ b/es_ES.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (es).
 
diff --git a/es_ES.ISO8859-1/share/xml/mailing-lists.ent b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
index 0cce7a953a..cd219e1139 100755
--- a/es_ES.ISO8859-1/share/xml/mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Nombres de las listas de correo de FreeBSD y software relacionado.
 
diff --git a/es_ES.ISO8859-1/share/xml/newsgroups.ent b/es_ES.ISO8859-1/share/xml/newsgroups.ent
index add9889dfb..22c0898e7c 100644
--- a/es_ES.ISO8859-1/share/xml/newsgroups.ent
+++ b/es_ES.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Nombres de los grupos de noticias de FreeBSD
 
diff --git a/es_ES.ISO8859-1/share/xml/teams.ent b/es_ES.ISO8859-1/share/xml/teams.ent
index 8e43da6f0a..2228734cd5 100644
--- a/es_ES.ISO8859-1/share/xml/teams.ent
+++ b/es_ES.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 0417ce6cf8..3d2ed3c283 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/es_ES.ISO8859-1/share/xml/translators.ent b/es_ES.ISO8859-1/share/xml/translators.ent
index 4045e9ff6d..5d3f1384ac 100644
--- a/es_ES.ISO8859-1/share/xml/translators.ent
+++ b/es_ES.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
       The FreeBSD Spanish Documentation Project
 
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-common.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..3604f423a4
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Puede descargar �ste y muchos otros documentos desde
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>Si tiene dudas sobre FreeBSD consulte la
+    <a href="http://www.FreeBSD.org/docs.html">documentaci�n</a> antes de escribir a la lista
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    Env�e sus preguntas sobre la documentaci�n a
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/es_ES.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index bc645c8020..e2254ac3bf 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -520,7 +516,7 @@
 	<title>L'organisation &os;</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="freebsd-organization" format="PIC"/>
+	    <imagedata fileref="freebsd-organization"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -588,7 +584,7 @@
 	<title>Les branches &os;</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="freebsd-branches" format="EPS"/>
+	    <imagedata fileref="freebsd-branches"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -871,12 +867,12 @@ bde         2005-10-29 16:34:50 UTC
 66    1.14         (bde      29-Oct-05):      int32_t e0,i,nx,n,ix,hx;
 67    1.1          (jkh      19-Aug-94):
 68    1.1          (jkh      19-Aug-94):      GET_FLOAT_WORD(hx,x);
-69    1.1          (jkh      19-Aug-94):      ix = hx&0x7fffffff;
-70    1.1          (jkh      19-Aug-94):      if(ix<=0x3f490fd8)   /* |x| ~<= pi/4 , no need for reduction */
+69    1.1          (jkh      19-Aug-94):      ix = hx&amp;0x7fffffff;
+70    1.1          (jkh      19-Aug-94):      if(ix&lt;=0x3f490fd8)   /* |x| ~&lt;= pi/4 , no need for reduction */
 71    1.1          (jkh      19-Aug-94):          {y[0] = x; y[1] = 0; return 0;}
 72    1.14         (bde      29-Oct-05):      /* 33+53 bit pi is good enough for special and medium size cases */
-73    1.2          (bde      07-Apr-95):      if(ix<0x4016cbe4) {  /* |x| < 3pi/4, special case with n=+-1 */
-74    1.14         (bde      29-Oct-05):          if(hx>0) {
+73    1.2          (bde      07-Apr-95):      if(ix&lt;0x4016cbe4) {  /* |x| &lt; 3pi/4, special case with n=+-1 */
+74    1.14         (bde      29-Oct-05):          if(hx&gt;0) {
 75    1.15         (bde      06-Nov-05):              z = x - pio2;
 76    1.15         (bde      06-Nov-05):              n = 1;
 77    1.15         (bde      06-Nov-05):          } else {
@@ -887,7 +883,7 @@ bde         2005-10-29 16:34:50 UTC
 82    1.15         (bde      06-Nov-05):          y[1] = z - y[0];
 83    1.15         (bde      06-Nov-05):          return n;
 84    1.15         (bde      06-Nov-05):      }
-85    1.15         (bde      06-Nov-05):      if(ix<0x407b53d1) {  /* |x| < 5*pi/4, special case with n=+-2 */
+85    1.15         (bde      06-Nov-05):      if(ix&lt;0x407b53d1) {  /* |x| &lt; 5*pi/4, special case with n=+-2 */
               </programlisting>
 	    </figure>
 
@@ -956,7 +952,7 @@ bde         2005-10-29 16:34:50 UTC
 	      rapproch�es, il est recommand� d'embaucher
 	      ou de s'attacher les services d'un d�veloppeur ou
 	      d'une firme qui a de l'exp�rience avec &os;.  La
-	      &a.jobs est un canal de communication utile si vous
+	      &a.jobs; est un canal de communication utile si vous
 	      �tes &agrave; la recherche de talents dans le
 	      domaine.  Le projet &os; maintient une <ulink
 	      url="&url.base;/commercial/consult_bycat.html"> liste
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/article.xml b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
index c9d09132f0..ec417b9f4e 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/article.xml
+++ b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
index 0459343d27..8af66ba7b2 100644
--- a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributing/article.xml b/fr_FR.ISO8859-1/articles/contributing/article.xml
index 6aebc1c185..b560aa2b68 100644
--- a/fr_FR.ISO8859-1/articles/contributing/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
       The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributors/article.xml b/fr_FR.ISO8859-1/articles/contributors/article.xml
index d8dd56d741..92913e883e 100644
--- a/fr_FR.ISO8859-1/articles/contributors/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributors/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
       The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
index 189a052967..382f416e25 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
@@ -304,7 +301,7 @@
       <listitem>
 	<para>Il existe une id�e selon laquelle les projets BSD
 	  seraient fragment�s et concurrents.  Le <ulink
-	  url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
+	  url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall
 	  Street Journal</ulink> a m�me parl� d'une
 	  <quote>balkanisation</quote> des projets BSD.  Tout comme
 	  les poursuites judiciaires, cette perception se base sur de
diff --git a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
index dd88d3a120..032b3146a1 100644
--- a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 	The FreeBSD Project - http://www.FreeBSD.org
diff --git a/fr_FR.ISO8859-1/articles/fonts/article.xml b/fr_FR.ISO8859-1/articles/fonts/article.xml
index 2620de0106..3932729d06 100755
--- a/fr_FR.ISO8859-1/articles/fonts/article.xml
+++ b/fr_FR.ISO8859-1/articles/fonts/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
index a917063e3e..ea23b38459 100644
--- a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
+++ b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/laptop/article.xml b/fr_FR.ISO8859-1/articles/laptop/article.xml
index 695253903e..a3cb19c6b0 100644
--- a/fr_FR.ISO8859-1/articles/laptop/article.xml
+++ b/fr_FR.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/linux-users/article.xml b/fr_FR.ISO8859-1/articles/linux-users/article.xml
index 30bf94cf7c..a3c95c3ab0 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
       The FreeBSD French Documentation Project
@@ -414,7 +411,7 @@ apache22_flags="-DSSL"</programlisting>
 	une interface r�seau, &os; utilise le nom du pilote
 	suivi d'un nombre en tant qu'identifiant.  La sortie suivante
 	de &man.ifconfig.8; montre deux interfaces r�seau
-	&intel&nbsp;Pro&nbsp;1000 (<devicename>em0</devicename> et
+	&intel;&nbsp;Pro&nbsp;1000 (<devicename>em0</devicename> et
 	<devicename>em1</devicename>):</para>
 
       <screen>&prompt.user; <userinput>ifconfig</userinput>
diff --git a/fr_FR.ISO8859-1/articles/mh/article.xml b/fr_FR.ISO8859-1/articles/mh/article.xml
index 5978e969e9..accbfaa79c 100644
--- a/fr_FR.ISO8859-1/articles/mh/article.xml
+++ b/fr_FR.ISO8859-1/articles/mh/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/nanobsd/article.xml b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
index 9ea8414f13..ebd7d3df8a 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
@@ -146,19 +143,19 @@
 	seule.</para>
 
       <para>Les r�pertoires <filename
-	role="directory">/etc</filename> et <filename
-	role="directory">/var</filename> sont des disques &man.md.4;
+	class="directory">/etc</filename> et <filename
+	class="directory">/var</filename> sont des disques &man.md.4;
 	(malloc).</para>
 
       <para>La partition de configuration est mont�e sur le
-	r�pertoire <filename role="directory">/cfg</filename>.
+	r�pertoire <filename class="directory">/cfg</filename>.
 	Elle contient les fichiers du r�pertoire <filename
-	role="directory">/etc</filename> et est bri�vement
+	class="directory">/etc</filename> et est bri�vement
 	mont�e en lecture seule juste apr�s le
 	d�marrage du syst�me, par cons�quent il
 	est n�cessaire de recopier les fichiers modifi�s
-	de <filename role="directory">/etc</filename> vers le
-	r�pertoire <filename role="directory">/cfg</filename>
+	de <filename class="directory">/etc</filename> vers le
+	r�pertoire <filename class="directory">/cfg</filename>
 	si l'on souhaite que les changements soient encore effectifs
 	apr�s le red�marrage du syst�me.</para>
 
@@ -175,11 +172,11 @@
 
       <note>
 	<para>La partition qui abrite <filename
-	  role="directory">/cfg</filename> doit �tre
+	  class="directory">/cfg</filename> doit �tre
 	  mont�e uniquement au d�marrage et lors de la
 	  copie des fichiers de configuration.</para>
 
-	<para>Garder <filename role="directory">/cfg</filename>
+	<para>Garder <filename class="directory">/cfg</filename>
 	  mont� en permanence n'est pas une bonne id�e,
 	  en particulier si le syst�me
 	  <application>NanoBSD</application> tourne sur un
@@ -198,7 +195,7 @@
 	cr��e &agrave; l'aide d'une simple
 	proc�dure <filename>nanobsd.sh</filename>, qui peut
 	�tre trouv�e dans le r�pertoire <filename
-	role="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
+	class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>.
 	Ce programme cr�e une image, qui peut �tre
 	copi�e sur le support de stockage &agrave; l'aide de
 	&man.dd.1;.</para>
@@ -355,7 +352,7 @@ customize_cmd cust_foo</programlisting>
 
 	<para>Un exemple plus utile de fonction de personnalisation
 	  est le suivant, qui change la taille par d�faut du
-	  r�pertoire <filename role="directory">/etc</filename>
+	  r�pertoire <filename class="directory">/etc</filename>
 	  de 5Mo &agrave; 30Mo:</para>
 
 	<programlisting>cust_etc_size () (
@@ -387,7 +384,7 @@ customize_cmd cust_etc_size</programlisting>
 	  <listitem>
 	    <para><literal>cust_install_files</literal> &mdash;
 	      Installe les fichiers du r�pertoire <filename
-	      role="directory">nanobsd/Files</filename>, qui contient
+	      class="directory">nanobsd/Files</filename>, qui contient
 	      des programmes utiles pour l'administration
 	      syst�me.</para>
 	  </listitem>
@@ -511,7 +508,7 @@ customize_cmd cust_nobeastie</programlisting>
 	possible d'utiliser la proc�dure
 	<filename>updatep1</filename> ou <filename>updatep2</filename>
 	situ�e dans le r�pertoire <filename
-	role="directory">/root</filename>, en fonction de la partition
+	class="directory">/root</filename>, en fonction de la partition
 	qui est en cours d'utilisation sur le syst�me.</para>
 
       <para>En fonction des services disponibles sur la machine qui
diff --git a/fr_FR.ISO8859-1/articles/new-users/article.xml b/fr_FR.ISO8859-1/articles/new-users/article.xml
index 4337df6b18..e4e4cd3114 100755
--- a/fr_FR.ISO8859-1/articles/new-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index 4407f4880b..3e1d5fc4ea 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   - Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -39,7 +36,7 @@
   - SUCH DAMAGE.
   -->
 
-<article lang='fr'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='fr'>
   <articleinfo>
     <title>Pluggable Authentication Modules</title>
 
@@ -830,9 +827,8 @@ sshd	password	required	pam_permit.so</programlisting>
       <title id="pam-config-breakdown.title">Breakdown of a
 	configuration line</title>
 
-      <para>Comme      expliqu�     dans     la      section     <link
-	linkend="pam-config-file-locations"
-	endterm="pam-config-file-locations.title"></link>,  chaque ligne de
+      <para>Comme      expliqu�     dans     <xref
+	linkend="pam-config-file-locations"/>, chaque ligne de
 	<filename>pam.conf</filename> consiste en quatre champs ou plus: le
 	nom de service, le nom du m�canisme, le drapeau de contr�le, le nom
 	du module et la pr�sence ou non d'arguments pour le module.</para>
@@ -851,13 +847,11 @@ sshd	password	required	pam_permit.so</programlisting>
       commencent par le nom du m�canisme.</para>
 
 
-      <para>Le m�canisme est  l'un des quatre mots clef  d�crit dans la
-      section         <link        linkend="pam-facilities-primitives"
-      endterm="pam-facilities-primitives.title"></link></para>
+      <para>Le m�canisme est  l'un des quatre mots clef  d�crit dans
+      <xref        linkend="pam-facilities-primitives"/>.</para>
 
       <para>De m�me, le  drapeau de contr�le est l'un  des quatre mots
-      clef d�crits dans la section <link linkend="pam-chains-policies"
-      endterm="pam-chains-policies.title"></link>  et  d�crit comment
+      clef d�crits dans <xref linkend="pam-chains-policies"/> et  d�crit comment
       le   module   doit   interpr�ter    le   code   de   retour   du
       module.  Linux-PAM  supporte une  syntaxe  alternative qui  vous
       laisse  sp�cifier l'action &agrave;  associer &agrave;  chaque code  de retour
@@ -1215,14 +1209,13 @@ sshd	password	required	pam_permit.so</programlisting>
     biblioth�que  PAM  diff�rente  vous  devrez fournir  votre  propre
     fonction de conversation. Une fonction de conversation robuste est
     �tonnamment   difficile  &agrave;   impl�menter;  celle   pr�sent�e  dans
-    l'appendice<link                          linkend="pam-sample-conv"
-    endterm="pam-sample-conv.title"></link>   est  un  bon   point  de
+    <xref                          linkend="pam-sample-conv"/>
+    est  un  bon   point  de
     d�part, mais  ne devrait pas  �tre utilis�e dans  des applications
     r�elles.</para>
 
 <programlisting>
-<inlinegraphic fileref="pam_app.c"
-  format="linespecific"/>
+<xi:include href="su.c" parse="text"/>
 </programlisting>
   </appendix>
 
@@ -1239,8 +1232,7 @@ sshd	password	required	pam_permit.so</programlisting>
 
 
 <programlisting>
-<inlinegraphic fileref="pam_module.c"
-  format="linespecific"/>
+<xi:include href="pam_unix.c" parse="text"/>
 </programlisting>
   </appendix>
 
@@ -1259,9 +1251,7 @@ sshd	password	required	pam_permit.so</programlisting>
     orient�e tty peut l'�tre.</para>
 
 <programlisting>
-
-<inlinegraphic fileref="pam_conv.c"
-  format="linespecific"/>
+<xi:include href="converse.c" parse="text"/>
 </programlisting>
   </appendix>
 
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
index 57da8c89ba..f127b5941a 100644
--- a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 	Problem Report Handling Guidelines
diff --git a/fr_FR.ISO8859-1/articles/problem-reports/article.xml b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
index 7e624179c9..6b6eccd30f 100644
--- a/fr_FR.ISO8859-1/articles/problem-reports/article.xml
+++ b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/article.xml b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
index 2e2cb9e43c..9beaa50d61 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/article.xml
+++ b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/book.xml b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
index 44f6ae4f0e..f07e83dca7 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
index 398cec854c..87e701e170 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -122,7 +122,7 @@ KMOD=skeleton
       <para>Lancer simplement la commande <command>make</command> avec ce fichier Makefile
         cr�era un fichier <filename>skeleton.ko</filename> qui peut
         �tre charg� dans votre syst�me en tapant :
-<screen> &prompt.root
+<screen> &prompt.root;
 	  kldload -v ./skeleton.ko
 </screen>
       </para>
@@ -179,7 +179,7 @@ KMOD=skeleton
  * Murray Stokely
  */
 
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) &lt; (b)) ? (a) : (b))
 
 #include &lt;sys/types.h&gt;
 #include &lt;sys/module.h&gt;
@@ -244,7 +244,7 @@ echo_loader(struct module *m, int what, void *arg)
 
   switch (what) {
   case MOD_LOAD:                /* kldload */
-    sdev = make_dev(<literal>&</literal>echo_cdevsw,
+    sdev = make_dev(<literal>&amp;</literal>echo_cdevsw,
 		    0,
 		    UID_ROOT,
 		    GID_WHEEL,
@@ -298,7 +298,7 @@ echo_read(dev_t dev, struct uio *uio, int ioflag)
 
   /* De quelle taille est cette operation read ?  Aussi grande que l'utilisateur le veut,
      ou aussi grande que les donnees restantes */
-  amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset > 0) ? echomsg->len - uio->uio_offset : 0);
+  amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset &gt; 0) ? echomsg->len - uio->uio_offset : 0);
   if ((err = uiomove(echomsg->msg + uio->uio_offset,amt,uio)) != 0) {
     uprintf("uiomove echoue!\n");
   }
@@ -338,15 +338,15 @@ DEV_MODULE(echo,echo_loader,NULL);</programlisting>
       votre syst�me de fichiers avec une commande comme : </para>
 
 <screen>
-	&prompt.root mknod /dev/echo c 33 0
+	&prompt.root; mknod /dev/echo c 33 0
 </screen>
 
     <para>Avec ce pilote charg�, vous devriez maintenant �tr capable de taper
       quelque chose comme :</para>
 
 <screen>
-        &prompt.root echo -n "Test Donnees" > /dev/echo
-        &prompt.root cat /dev/echo
+        &prompt.root; echo -n "Test Donnees" > /dev/echo
+        &prompt.root; cat /dev/echo
 	Test Donnees
 </screen>
 
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
index c3a703c746..ca308534df 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
index 129ef1be60..22b31e9a33 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -29,7 +29,7 @@
  * Murray Stokely
  */
 
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) &lt; (b)) ? (a) : (b))
 
 #include &lt;sys/types.h&gt;
 #include &lt;sys/module.h&gt;
@@ -138,7 +138,7 @@ static int
 mypci_attach(device_t dev)
 {
   uprintf("Rattachement de MonPCI pour: ID Peripherique: 0x%x\n",pci_get_vendor(dev));
-  sdev = make_dev(<literal>&</literal>mypci_cdevsw,
+  sdev = make_dev(<literal>&amp;</literal>mypci_cdevsw,
 		  0,
 		  UID_ROOT,
 		  GID_WHEEL,
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
index 9692f16ecb..f56c6a51f9 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 19f5de9645..473dbc6f90 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -343,7 +343,7 @@ int main() {
       les permissions d'un fichier, le propri�taire, le groupe, la taille,
       la date d'acc�s, et la date de modification.</simpara></listitem>
       <listitem><simpara>Se lier &agrave; des ports privil�gi�s sur Internet
-        (ports < 1024)</simpara></listitem>
+        (ports &lt; 1024)</simpara></listitem>
       </itemizedlist>
 
       <para><function>Jail</function> est un outil tr�s utile pour ex�cuter
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 6bf317ae99..6a7400b235 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -974,7 +974,7 @@ free(foo);
             <para>Si vous voulez cr�er un fichier <filename>core</filename> depuis
 	    l'ext�rieur de votre programme, mais ne voulez pas que le processus
 	    s'arr�t,vous pouvez utiliser le programme <command>gcore</command>.
-	    Voir la page de manuel en ligne de &man.gcore.1 pour plus d'informations.
+	    Voir la page de manuel en ligne de &man.gcore.1; pour plus d'informations.
 	    </para>
 
 	  </answer>
@@ -1005,7 +1005,7 @@ free(foo);
       Aussi, nous pourrions avoir quelque chose comme �a:
       </para>
 
-      <screen>&prompt.user; <userinput>cc fichier1.o fichier2.o</userinput> &hellip; <userinput>fichier37.c</userinput> &hellip
+      <screen>&prompt.user; <userinput>cc fichier1.o fichier2.o</userinput> &hellip; <userinput>fichier37.c</userinput> &hellip;
       </screen>
 
       <para>si nous avions chang� le fichier <filename>fichier37.c</filename> mais aucun
@@ -1472,7 +1472,7 @@ main() {
 
 	i = 5;
 	printf("C'est mon programme\n");
-<lineannotation>&hellip</lineannotation></programlisting>
+<lineannotation>&hellip;</lineannotation></programlisting>
 
       <para>mais nous n'avions pas mis la ligne <literal>i=5;</literal>. Comme
       nous n'avons pas initialis� <symbol>i</symbol>, il a pris le nombre se trouvant
@@ -1591,17 +1591,17 @@ Cannot access memory at address 0x7020796d.
       de <command>gdb</command>):
       </para>
 
-      <screen><lineannotation>&hellip</lineannotation>
-if ((pid = fork()) < 0)		/* _Toujours_ verifier cela */
+      <screen><lineannotation>&hellip;</lineannotation>
+if ((pid = fork()) &lt; 0)		/* _Toujours_ verifier cela */
 	error();
 else if (pid == 0) {		/* le fils */
 	int PauseMode = 1;
 
 	while (PauseMode)
 		sleep(10);	/* Attendre jusqu'a ce que quelqu'un se brache sur nous */
-	<lineannotation>&hellip</lineannotation>
+	<lineannotation>&hellip;</lineannotation>
 } else {			/* le pere */
-	<lineannotation>&hellip</lineannotation>
+	<lineannotation>&hellip;</lineannotation>
       </screen>
 
       <para>Maintenant tout ce que nous avons &agrave; faire est de nous brancher sur le processus fils,
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
index 66a7dbcfc7..201363d704 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index 4dabbccf71..fd2070aeae 100644
--- a/fr_FR.ISO8859-1/books/faq/book.xml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 <!ENTITY isbn.amazon 'http://www.amazon.com/exec/obidos/ASIN'>
 ]>
@@ -62,7 +60,7 @@
         <para>N.d.T.: Contactez la &a.fr-doc; si vous voulez
         collaborer &agrave; ce projet.</para>
         &trans.a.gioria;
-        <para><emphasis>Premi�re version de &a.fr.gioria et
+        <para><emphasis>Premi�re version de &a.fr.gioria; et
         &a.fr.dntt;</emphasis></para>
 
         </abstract>
@@ -739,7 +737,7 @@ besoin de reformater ces fichiers sous une forme plus lisible, lancez
 la commande col sur le fichier&nbsp;:
 
 <programlisting>
-$ col -b < fichierOrigine > fichierSortie
+$ col -b &lt; fichierOrigine &gt; fichierSortie
 </programlisting>
 </para>
     </sect1>
@@ -1181,7 +1179,7 @@ lp0 des deux c
 <para>Par exemple, si vous voulez connecter l'ordinateur max avec moritz&nbsp;:</para>
 
 	<programlisting>
-                 max <-----> moritz
+                 max &lt;-----&gt; moritz
 IP Address    10.0.0.1      10.0.0.2
 	</programlisting>
 
@@ -1199,7 +1197,7 @@ IP Address    10.0.0.1      10.0.0.2
 	# ifconfig lp0 10.0.0.2 10.0.0.1
 	</programlisting>
 
-<para>C'est tout&nbsp! Lisez aussi les manpages
+<para>C'est tout&nbsp;! Lisez aussi les manpages
 <citerefentry><refentrytitle>lp</refentrytitle><manvolnum>4</manvolnum></citerefentry> and
 <citerefentry><refentrytitle>lpt</refentrytitle><manvolnum>4</manvolnum></citerefentry>.</para>
 
@@ -1361,7 +1359,7 @@ dans les 504 premiers Mo.</para>
 
 
     <sect1>
-      <title>A propos des gestionnaires de disque&nbsp;? Ou bien, j'ai un disque de grande capacit�&nbsp!</title>
+      <title>A propos des gestionnaires de disque&nbsp;? Ou bien, j'ai un disque de grande capacit�&nbsp;!</title>
 
       <para>FreeBSD reconnait le gestionnaire "Ontrack Disk Manager" et le tol�re.
 Les autres gestionnaires de disque ne sont pas support�s.</para>
@@ -2045,7 +2043,7 @@ moused_flags=""
   </sect1>
 
   <sect1>
-    <title>Je n'ai pas de coprocesseur arithm�tique. Est-ce un probl�me&nbsp?</title>
+    <title>Je n'ai pas de coprocesseur arithm�tique. Est-ce un probl�me&nbsp;?</title>
 
     <note>
       <para>Cela ne touche que ceux qui ont un 386/486SX/486SLC -
@@ -4077,12 +4075,12 @@ quitter ce mode tapez Control-D.</para>
 j@uriah 191% sendmail -bt
 ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)
 Enter &lt;ruleset&gt; &lt;address&gt;
-> 0 foo@interface-business.de
+&gt; 0 foo@interface-business.de
 rewrite: ruleset  0   input: foo @ interface-business . de
 ...
 rewrite: ruleset  0 returns: $# uucp-dom $@ if-bus $: foo \
-< @ interface-business . de >
-> ^D
+&lt; @ interface-business . de &gt;
+&gt; ^D
 j@uriah 192%
 </programlisting></para>
     </sect1>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.xml b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
index bc654bf9a2..c07499df82 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/book.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY sgml.in-progress SYSTEM "in-progress.xml">
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
index 046d7c6684..032513ab6f 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index bf4faee0c1..c4499afa41 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -163,7 +163,7 @@
           <application>CVSup</application> ou <application>CTM</application>),
           ou en vous servant de <application>CVSup</application> pour ne
           t�l�charger que la version
-          extraite&nbsp;-&nbsp<emphasis>courante</emphasis>.</para>
+          extraite&nbsp;-&nbsp;<emphasis>courante</emphasis>.</para>
       </listitem>
 
       <listitem>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 4090ac8e5f..aadb3dc30a 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 5c79b71093..6213db8893 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 2bede1293e..173191d4c6 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -159,7 +159,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<h1>Premi�re section</h1>
+<![CDATA[<h1>Premi�re section</h1>
 
 <!-- Introduction du document -->
 
@@ -191,7 +191,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Use:</para>
 
 	  <programlisting>
-<![ CDATA [<h1>Premi�re section</h1>
+<![CDATA[<h1>Premi�re section</h1>
 
 <!-- Introduction du document -->
 
@@ -213,7 +213,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>C'est un paragraphe. Il peut contenir pratiquement
+<![CDATA[<p>C'est un paragraphe. Il peut contenir pratiquement
   n'importe quel �l�ment.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -231,7 +231,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Un court extrait de la Constitution des Etats-Unis&nbsp;:</p>
+<![CDATA[<p>Un court extrait de la Constitution des Etats-Unis&nbsp;:</p>
 
 <blockquote>Nous le Peuple des Etats-Unis, dans le But de former
   une Union plus parfaite, d'�tablir la Justice, d'assurer
@@ -276,7 +276,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Une liste non ordonn�e. Les �l�ments de la liste seront
+<![CDATA[<p>Une liste non ordonn�e. Les �l�ments de la liste seront
   probablement pr�c�d�s par des puces.</p>
 
 <ul>
@@ -307,7 +307,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<dl>
+<![CDATA[<dl>
   <dt>Terme 1</dt>
 
   <dd><p>Paragraphe 1 de la d�finition 1.</p></dd>
@@ -345,7 +345,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
             texte d'un courrier �lectronique&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<pre>
+<![CDATA[<pre>
   From: nik@freebsd.org
   To: freebsd-doc@freebsd.org
   Subject: Nouvelle documentation disponible
@@ -389,7 +389,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>C'est une table 2x2 simple.</p>
+<![CDATA[<p>C'est une table 2x2 simple.</p>
 
 <table>
   <tr>
@@ -416,7 +416,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Une grande cellule &agrave; gauche, deux petites cellule &agrave; droite.</p>
+<![CDATA[<p>Une grande cellule &agrave; gauche, deux petites cellule &agrave; droite.</p>
 
 <table>
   <tr>
@@ -437,7 +437,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Une grande cellule en haut, deux petites cellules en dessous.</p>
+<![CDATA[<p>Une grande cellule en haut, deux petites cellules en dessous.</p>
 
 <table>
   <tr>
@@ -459,7 +459,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Use:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Sur une grille 3x3, la cellule en haut &agrave; gauche s'�tend sur deux
+<![CDATA[<p>Sur une grille 3x3, la cellule en haut &agrave; gauche s'�tend sur deux
   lignes et deux colonnes. Les autres cellules sont normales.</p>
 
 <table>
@@ -510,7 +510,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p><em>Ceci</em> est accentu�, et
+<![CDATA[<p><em>Ceci</em> est accentu�, et
   <strong>cela</strong> l'est encore plus.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -527,7 +527,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <title><sgmltag>b</sgmltag> et <sgmltag>i</sgmltag></title>
 
 	  <programlisting>
-<![ CDATA [<p><b>Ceci</b> est en gras, tandis que <i>cela</i> est
+<![CDATA[<p><b>Ceci</b> est en gras, tandis que <i>cela</i> est
   en italiques.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -545,7 +545,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>L'auteur original de ce document est
+<![CDATA[<p>L'auteur original de ce document est
   Nik Clayton, qui peut �tre contact� par courrier
   �lectronique &agrave; l'adresse : <tt>nik@freebsd.org</tt>.</p>]]></programlisting>
 	</example>
@@ -590,7 +590,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Les trois extraits suivants ont le m�me r�sultat&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Ce texte est <small>un peu plus petit</small>.
+<![CDATA[<p>Ce texte est <small>un peu plus petit</small>.
   Mais celui-l&agrave; <big>est un peu plus gros</big>.</p>
 
 <p>Ce texte est <font size="-1">un peu plus petit</font>.
@@ -628,7 +628,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations sur le
+<![CDATA[<p>Vous trouverez plus d'informations sur le
   <a href="http://www.freebsd.org/">site Web de FreeBSD</a>.</p>]]></programlisting>
 	</example>
 
@@ -653,7 +653,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	  <para>Utilisez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<p><a name="para1">Ce</a> paragraphe peut �tre r�f�renc�
+<![CDATA[<p><a name="para1">Ce</a> paragraphe peut �tre r�f�renc�
   par d'autres liens via le nom <tt>para1</tt>.</p>]]></programlisting>
 	</example>
 
@@ -668,7 +668,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
             dans un document appel� <filename>foo.html</filename>.</para>
 
 	  <programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations au
+<![CDATA[<p>Vous trouverez plus d'informations au
   <a href="foo.html#para1">premier paragraphe</a> de
   <tt>foo.html</tt>.</p>]]></programlisting>
 	</example>
@@ -684,7 +684,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	    de ce document.</para>
 
 	  <programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations au
+<![CDATA[<p>Vous trouverez plus d'informations au
   <a href="#para1">premier paragraphe</a> de
   ce document.</p>]]></programlisting>
 	</example>
@@ -913,7 +913,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	<example>
 	  <title>Un chapitre</title>
 
-	  <programlisting><![ CDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>Le titre du chapitre</title>
 
   ...
@@ -927,7 +927,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	<example>
 	  <title>Chapitres vides</title>
 
-	  <programlisting><![ CDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>C'est un chapitre vide</title>
 
   <para></para>
@@ -956,7 +956,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 	<example>
 	  <title>Sections dans les chapitres</title>
 
-	  <programlisting><![ RCDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>Exemple de chapitre</title>
 
   <para>Du texte dans le chapitre.</para>
@@ -1005,7 +1005,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
           d�finissant une ou plusieurs <sgmltag>part</sgmltag>s. Ce n'est pas
           possible dans un <sgmltag>article</sgmltag>.</para>
 
-	<programlisting><![ CDATA [<part>
+	<programlisting><![CDATA[<part>
   <title>Introduction</title>
 
   <chapter>
@@ -1050,7 +1050,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>C'est un paragraphe. Il peut contenir
+	  <programlisting><![CDATA[<para>C'est un paragraphe. Il peut contenir
   presque n'importe quel autre �l�ment.</para> ]]></programlisting>
 
 	  <para>Apparence&nbsp;:</para>
@@ -1075,7 +1075,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Un court extrait de la constitution des Etats-Unis&nbsp;:</para>
+	  <programlisting><![CDATA[<para>Un court extrait de la constitution des Etats-Unis&nbsp;:</para>
 
 <blockquote>
   <title>Pr�ambule &agrave; la Constitution des Etats-Unis</title>
@@ -1159,7 +1159,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<warning>
+	  <programlisting><![CDATA[<warning>
   <para>Installer FreeBSD peut vous donner envie de supprimer
     Windows de votre disque dur.</para>
 </warning>]]></programlisting>
@@ -1209,7 +1209,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<itemizedlist>
+	  <programlisting><![CDATA[<itemizedlist>
   <listitem>
     <para>C'est le premier �l�ment de la liste.</para>
   </listitem>
@@ -1304,7 +1304,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA[<para>Quand vous aurez fini, votre programme
+	  <programlisting><![CDATA[<para>Quand vous aurez fini, votre programme
  ressemblera &agrave; cela :</para>
 
 <programlisting>#include &lt;stdio.h&gt;
@@ -1375,7 +1375,7 @@ main(void)
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<informaltable>
+	  <programlisting><![CDATA[<informaltable>
   <tgroup cols="2">
     <thead>
       <row>
@@ -1532,7 +1532,7 @@ main(void)
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+	  <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
 foo1
 foo2
 foo3
@@ -1591,7 +1591,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>FreeBSD est sans aucun doute
+	  <programlisting><![CDATA[<para>FreeBSD est sans aucun doute
   <emphasis>le</emphasis> premier syst�me
   d'exploitation de type Unix pour
   architecture Intel.</para>]]></programlisting>
@@ -1678,7 +1678,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para><application>Sendmail</application> est le logiciel de
+	  <programlisting><![CDATA[<para><application>Sendmail</application> est le logiciel de
   courrier �lectronique le plus employ� sous Unix.</para>
 
 <para><application>Sendmail</application> comporte les
@@ -1730,7 +1730,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Vous trouverez le source SGML du Manuel
+	  <programlisting><![CDATA[<para>Vous trouverez le source SGML du Manuel
   de R�f�rence en Anglais dans
   <filename>/usr/doc/en/handbook/</filename>. Le
   fichier principal, dans ce r�pertoire, s'appelle
@@ -1776,7 +1776,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para><devicename>sio</devicename> sert
+	  <programlisting><![CDATA[<para><devicename>sio</devicename> sert
   sous FreeBSD aux communications s�ries.
   <devicename>sio</devicename> correspond
   &agrave; un certain nombre d'entr�es dans
@@ -1899,7 +1899,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>La machine locale peut toujours
+	  <programlisting><![CDATA[<para>La machine locale peut toujours
   �tre d�sign�e par <hostid>localhost</hostid>,
   et aura l'adresse IP
   <hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -1965,7 +1965,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Pour effectuer la plupart des
+	  <programlisting><![CDATA[<para>Pour effectuer la plupart des
   t�ches d'administration syst�me,
   vous aurez besoin d'�tre
   <username>root</username>.</para>]]></programlisting>
@@ -2004,7 +2004,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Il y a deux cibles courantes dans les
+	  <programlisting><![CDATA[<para>Il y a deux cibles courantes dans les
   <filename>Makefile</filename>&nbsp;:
   <maketarget>all</maketarget> et
   <maketarget>clean</maketarget>.</para>
@@ -2058,7 +2058,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>La ligne <literal>maxusers 10</literal> du fichier
+	  <programlisting><![CDATA[<para>La ligne <literal>maxusers 10</literal> du fichier
   de configuration du noyau d�termine la table de nombreuses
   tables syst�me et d�finit approximativement le nombre de
   connexions simultan�es qu'acceptera le syst�me.</para>]]></programlisting>
@@ -2091,7 +2091,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<informalexample>
+	  <programlisting><![CDATA[<informalexample>
   <screen>&prompt.user; <userinput>man
   <replaceable>command</replaceable></userinput></screen>
 </informalexample>]]></programlisting>
@@ -2110,7 +2110,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>La ligne <literal>maxusers 10</literal> du fichier
+	  <programlisting><![CDATA[<para>La ligne <literal>maxusers 10</literal> du fichier
   de configuration du noyau d�termine la table de nombreuses
   tables syst�me et d�finit approximativement le nombre
   de connexions simultan�es qu'acceptera le syst�me.</para>
@@ -2160,7 +2160,7 @@ C'est le fichier 'foo2'</screen>
 	<example>
 	  <title><literal>id</literal> de chapitres et de section</title>
 
-	  <programlisting><![ CDATA [<chapter id="chapitre1">
+	  <programlisting><![CDATA[<chapter id="chapitre1">
   <title>Introduction</title>
 
   <para>C'est l'introduction. Elle comporte une sous-section,
@@ -2190,7 +2190,7 @@ C'est le fichier 'foo2'</screen>
 	<example>
 	  <title><sgmltag>anchor</sgmltag></title>
 
-	  <programlisting><![ CDATA [<para>Ce paragraphe inclut un
+	  <programlisting><![CDATA[<para>Ce paragraphe inclut un
   <anchor id="para1">lien interne. Il n'appara�t
   pas dans le document.</para>]]></programlisting>
 	</example>
@@ -2217,7 +2217,7 @@ C'est le fichier 'foo2'</screen>
             document qui contienne l'exemple que nous avons donn� pour
 	    <literal>id</literal>&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Vous trouverez plus d'information
+	  <programlisting><![CDATA[<para>Vous trouverez plus d'information
   au <xref linkend="chapter1">.</para>
 
 <para>Vous trouverez des informations plus d�taill�es dans
@@ -2259,7 +2259,7 @@ C'est le fichier 'foo2'</screen>
             document qui contienne l'exemple que nous avons donn� pour
 	    <literal>id</literal>&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Vous trouverez plus d'information
+	  <programlisting><![CDATA[<para>Vous trouverez plus d'information
   au <link linkend="chapter1">premier chapitre</link>.</para>
 
 <para>Vous trouverez des informations plus d�taill�es dans
@@ -2310,7 +2310,7 @@ C'est le fichier 'foo2'</screen>
 
 	  <para>Utilisez&nbsp;:</para>
 
-	  <programlisting><![ CDATA [<para>Vous pouvez bien s�r cessez de lire
+	  <programlisting><![CDATA[<para>Vous pouvez bien s�r cessez de lire
   ce document, et aller au lieu de cela sur la <ulink
     url="http://www.FreeBSD.org/"> page Web de FreeBSD</ulink>.</para>]]></programlisting>
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 0af6c8fe1d..6dd690c5fd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -107,7 +107,7 @@
     <para>L'exemple pr�c�dent est cod� comme suit dans le pr�sent
       document&nbsp;:</para>
 
-    <programlisting><![ CDATA [
+    <programlisting><![CDATA[
 <para>Pour effacer <filename>/tmp/foo</filename>, utilisez
   &man.rm.1;.</para>
 
@@ -232,7 +232,7 @@
         de d�but et une de fin.</para>
 
       <programlisting>
-<![ CDATA [<p>C'est un paragraphe. Il commence avec la marque de d�but pour
+<![CDATA[<p>C'est un paragraphe. Il commence avec la marque de d�but pour
   l'�l�ment 'p', et se terminera avec la marque de fin pour
   l'�l�ment 'p'</p>
 
@@ -254,7 +254,7 @@
         donc qu'une marque de d�but.</para>
 
       <programlisting>
-<![ CDATA [<p>C'est un paragraphe.</p>
+<![CDATA[<p>C'est un paragraphe.</p>
 
 <hr>
 
@@ -271,7 +271,7 @@
       <title>El�ments dans des �l�ments&nbsp;; <sgmltag>em</sgmltag></title>
 
       <programlisting>
-<![ CDATA [<p>C'est un <em>paragraphe</em> simple o� certains
+<![CDATA[<p>C'est un <em>paragraphe</em> simple o� certains
   <em>mots</em> ont �t� <em>mis en valeur</em>.</p>]]></programlisting>
     </example>
 
@@ -322,7 +322,7 @@
       <title>Utiliser un �l�ment avec un attribut</title>
 
       <programlisting>
-<![ CDATA [<p align="left">L'attribut align est superflus pour ce paragraphe,
+<![CDATA[<p align="left">L'attribut align est superflus pour ce paragraphe,
   puisque 'left' est la valeur par d�faut.</p>
 
 <p align="center">Ce paragraphe sera peut-�tre centr�.</p>]]></programlisting>
@@ -338,7 +338,7 @@
       <title>Simples quotes dans un attribut</title>
 
       <programlisting>
-<![ CDATA [<p align='right'>Je suis &agrave; droite&nbsp;!</p>]]></programlisting>
+<![CDATA[<p align='right'>Je suis &agrave; droite&nbsp;!</p>]]></programlisting>
     </example>
 
     <para>Vous n'avez pas toujours besoin de mettre la valeur de l'attribut
@@ -401,7 +401,7 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/catalog:$SGML_CATALOG_FILES</prog
             mettrez&nbsp;:</para>
 
 	  <programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0
   Transitional//EN">
 
 <html>
@@ -563,7 +563,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       4.0 de la DTD HTML&nbsp;:</para>
 
     <programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
 
     <para>Cette ligne a plusieurs composants distincts&nbsp;:</para>
 
@@ -797,7 +797,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
       <para>La syntaxe pour le faire est l�g�rement diff�rente&nbsp;:</para>
 
       <programlisting>
-<![ CDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+<![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
 
       <para>Le mot-cl� <literal>SYSTEM</literal> indique que le processeur
         SGML doit localiser le fichier d'une fa�on qui d�pend du syst�me. Cela
@@ -856,7 +856,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
       <programlisting>
 <!-- commentaire de test --></programlisting>
 
-      <programlisting><![ CDATA [
+      <programlisting><![CDATA[
 <!-- C'est le texte du commentaire -->
 
 <!-- C'est un autre commentaire -->
@@ -868,7 +868,8 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
   -- de le faire -->]]></programlisting>
     </example>
 
-    <![ %output.print; [
+<!--
+    <![%output.print;[
     <important>
       <title>Utilisez 2 tirets</title>
 
@@ -887,6 +888,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	sujettes &agrave; ce probl�me.</para>
     </important>
     ]]>
+-->
 
     <para>Si vous avez d�j&agrave; utilis� HTML auparavant, on vous a peut-�tre
       donn� des r�gles diff�rentes pour les commentaires. En particulier, vous
@@ -901,7 +903,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
     <example>
       <title>Commentaires SGML erronn�s</title>
 
-      <programlisting><![ CDATA [
+      <programlisting><![CDATA[
 <!-- C'est en commentaire --
 
      CE N'EST PAS EN COMMENTAIRE!
@@ -917,13 +919,13 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
         source de confusion.</para>
 
       <programlisting>
-<![ CDATA [<!--------------- C'est un tr�s mauvaise id�e --------------->]]></programlisting>
+<![CDATA[<!--------------- C'est un tr�s mauvaise id�e --------------->]]></programlisting>
 
       <para>Comme l'exemple le sugg�re, ne mettez <emphasis>pas</emphasis> de
         commentaires de ce type.</para>
 
       <programlisting>
-<![ CDATA [<!--===================================================-->]]></programlisting>
+<![CDATA[<!--===================================================-->]]></programlisting>
 
       <para>C'est une (l�g�rement) meilleure id�e, mais c'est toute de m�me
         une source de confusion potentielle pour les d�butants en SGML.</para>
@@ -980,7 +982,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
         courante de votre produit. Vous pourriez �crire&nbsp;:</para>
 
       <programlisting>
-<![ CDATA [<para>La version courante de notre produit est la
+<![CDATA[<para>La version courante de notre produit est la
   &version.courante;.</para>]]></programlisting>
 
       <para>Quand le num�ro de version change, il vous suffit de modifier la
@@ -1007,7 +1009,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	<title>D�finition d'entit�s g�n�rales</title>
 
 	<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version.courante    "3.0-RELEASE">
 <!ENTITY derniere.version  "2.2.7-RELEASE">
 ]>]]></programlisting>
@@ -1047,7 +1049,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	<title>D�finition d'entit�s param�tres</title>
 
 	<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY % param.du "du">
 <!ENTITY % param.texte "text">
 <!ENTITY % param.encore  "encore %param.du more %param.texte">
@@ -1069,7 +1071,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	    <filename>exemple.xml</filename>.</para>
 
 	  <programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY version "1.1">
 ]>
 
@@ -1169,7 +1171,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
           fichiers</title>
 
 	<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
 <!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
 <!ENTITY chapitre.3 SYSTEM "chapitre3.xml">
@@ -1225,7 +1227,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
           contiendra&nbsp;:</para>
 
 	<programlisting>
-<![ CDATA [<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
+<![CDATA[<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
 <!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
 <!ENTITY chapitre.3 SYSTEM "chapitre3.xml">]]></programlisting>
 
@@ -1236,7 +1238,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
           pr�c�demment&nbsp;:</para>
 
 	<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!--
      D�finissez une entit� param�tre pour inclure le fichier
      des entit�s g�n�rales pour les chapitres
@@ -1270,7 +1272,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	    <para>Mettez-y quelque chose qui ressemble &agrave; ceci&nbsp;:</para>
 
 	    <programlisting>
-<![ CDATA [<p>C'est le premier paragraphe.</p>]]></programlisting>
+<![CDATA[<p>C'est le premier paragraphe.</p>]]></programlisting>
 	  </step>
 
 	  <step>
@@ -1278,7 +1280,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
               suivante&nbsp;:</para>
 
 	    <programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
 <!ENTITY para1 SYSTEM "para1.xml">
 <!ENTITY para2 SYSTEM "para2.xml">
@@ -1331,7 +1333,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
               <filename>exemple.xml</filename>&nbsp;:</para>
 
 	    <programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY % entites SYSTEM "entites.xml"> %entites;
 ]>
 
@@ -1355,7 +1357,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	      qui contienne&nbsp;:</para>
 
 	    <programlisting>
-<![ CDATA [<!ENTITY version "1.1">
+<![CDATA[<!ENTITY version "1.1">
 <!ENTITY para1 SYSTEM "para1.xml">
 <!ENTITY para2 SYSTEM "para2.xml">
 <!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1396,7 +1398,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
     </example>
 
     <para>Comme vous pouviez vous y attendre, une section marqu�e est une
-      fonctionnalit� SGML et commence donc par <literal>&lt!</literal>.</para>
+      fonctionnalit� SGML et commence donc par <literal>&lt;!</literal>.</para>
 
     <para>Le premier crochet ouvrant d�limite la section marqu�e.</para>
 
@@ -1467,7 +1469,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
   &lt;programlisting>) est du DocBook.&lt;/para>
 
 &lt;programlisting>
-  &lt![ CDATA [  <![ CDATA [
+  &lt;![CDATA[<![CDATA[
     <p>Cet exemple vous montre quelques �l�ments de HTML. Comme les
       caract�res < et > y sont si fr�quemment utilis�s, il est plus
       facile de marquer tout l'exemple comme CDATA plut�t que de se
@@ -1482,7 +1484,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
     <p>C'est la fin de l'exemple.</p>]]>
   ]]&gt;
-&lt/programlisting></programlisting>
+&lt;/programlisting></programlisting>
 
 	  <para>Si vous consultez le source de ce document, vous verrez qu'il
             utilise constamment cette technique.</para>
@@ -1557,7 +1559,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
             l'entit� en&nbsp;:</para>
 
 	  <programlisting>
-&lt!ENTiTY % version.electronique "IGNORE"></programlisting>
+&lt;!ENTiTY % version.electronique "IGNORE"></programlisting>
 
 	  <para>A la seconde passe sur le document, les sections marqu�es qui
             utilisent <literal>%version.electronique</literal> comme mot-cl�
@@ -1585,17 +1587,17 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
   &lt;/head>
 
   &lt;body>
-    &lt;p>Ce paragraphe &lt;![ CDATA [contient de nombreux
+    &lt;p>Ce paragraphe &lt;![CDATA[contient de nombreux
       caract�res &lt; (&lt; &lt; &lt; &lt; &lt;) il est donc
       plus facile de l'inclure dans une section marqu�e
-      CDATA ]]&gt;&lt/p>
+      CDATA ]]&gt;&lt;/p>
 
-    &lt;![ IGNORE [
+    &lt;![IGNORE[
     &lt;p>Ce paragraphe n'appara�tra jamais dans les
       sorties.&lt;/p>
     ]]&gt;
 
-    &lt;![ <![ CDATA [%sortie.texte]]> [
+    &lt;![ <![CDATA[%sortie.texte]]> [
     &lt;p>Ce paragraphe appara�tra peut-�tre dans les
       sorties.&lt;/p>
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 4255e6939e..e7f63861fd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
index cf5a56b93f..100df04e41 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
index b9b6035187..048a36aebc 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -107,7 +107,7 @@
 
       <para>Si par exemple, un des chapitres contient&nbsp;:</para>
 
-    <programlisting><![ CDATA [
+    <programlisting><![CDATA[
 <chapter id="kernelconfiguration">
 ...
 </chapter>]]></programlisting>
@@ -190,7 +190,7 @@
         <literal>&lt;PARA&gt;</literal>.</para>
 
       <para>Le texte dans les contextes SGML est normalement en majuscules,
-	<literal>&lt!ENTITY&hellip;&gt;</literal> ou
+	<literal>&lt;!ENTITY&hellip;&gt;</literal> ou
 	<literal>&lt;!DOCTYPE&hellip;&gt;</literal> et
         <emphasis>non</emphasis> <literal>&lt;!entity&hellip;&gt;</literal>
         ou <literal>&lt;!doctype&hellip;&gt;</literal>.</para>
@@ -211,7 +211,7 @@
         section&nbsp;:</para>
 
       <programlisting>
-<![ CDATA [+--- C'est la colonne 0
+<![CDATA[+--- C'est la colonne 0
 
 <chapter>
   <title>...</title>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 832c07f2d5..5c72c201ec 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/todo.xml b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
index 15867fb5c2..68c1adc5c0 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
index a2d21f8326..ff6b93e468 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 3bae95c1d3..d4649355dd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -82,7 +82,7 @@
     <qandaentry>
       <question>
 	<para>Y-a-t-il une liste de diffusion pour les
-          traducteurs&nbsp?</para>
+          traducteurs&nbsp;?</para>
       </question>
 
       <answer>
@@ -458,7 +458,7 @@
 	<para>Les en-t�tes de la version anglaise du document ressembleront &agrave;
           ceci&nbsp;:</para>
 
-	<programlisting><![ CDATA [<!--
+	<programlisting><![CDATA[<!--
      The FreeBSD Documentation Project
 
      &dollar;Id: chapter.xml,v 1.11 1999/06/20 21:18:57 billf Exp $
@@ -481,7 +481,7 @@
 	<para>Donc, la version espagnole du pr�sent fichier commencerait
           par&nbsp;:</para>
 
-	<programlisting><![ CDATA [<!--
+	<programlisting><![CDATA[<!--
      The FreeBSD Spanish Documentation Project
 
      &dollar;Id: chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp $
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 69636eb910..9fa77093d2 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index c686b96a12..e19bd2cc04 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -34,7 +34,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -247,30 +246,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 8ef8052277..bb183ec3d2 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -1410,7 +1410,7 @@ linuxemu/chapter.xml -->
 	  <para>Nous pouvons enfin compiler et installer le module du
 	    pilote:</para>
 
-	  <screen>&prompt.root; <userinput>make && make install</userinput></screen>
+	  <screen>&prompt.root; <userinput>make &amp;&amp; make install</userinput></screen>
 
 	  <para>Pour utiliser le pilote, vous devez charger les
 	    modules appropri�s:</para>
@@ -2131,7 +2131,7 @@ Success, response: OK, Success (0x20)</screen>
 	les objets entrant seront stock�s doit �tre
 	cr��.  Le chemin d'acc�s par
 	d�faut du r�pertoire racine est <filename
-	role="directory">/var/spool/obex</filename>.  Le serveur OBEX
+	class="directory">/var/spool/obex</filename>.  Le serveur OBEX
 	enregistrera automatiquement le service OBEX Object Push
 	aupr�s du &ldquo;daemon&rdquo; SDP local.  L'exemple
 	ci-dessous montre comment d�marrer le serveur
@@ -2508,7 +2508,7 @@ net.link.ether.bridge_ipfw=1</programlisting>
       <listitem>
 	<para>Des fichiers de d�marrage du syst�me
 	  existent dans le r�pertoire <filename
-	  role="directory">/etc</filename> pour d�tecter et
+	  class="directory">/etc</filename> pour d�tecter et
 	  supporter le d�marrage d'un syst�me sans disque
 	  dur.</para>
       </listitem>
@@ -2811,7 +2811,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
 	      int�ressantes, comme le chargement de
 	      <filename>pxeboot</filename> &agrave; partir du
 	      r�pertoire <filename
-	      role="directory">/boot</filename> d'un CD-ROM &os;
+	      class="directory">/boot</filename> d'un CD-ROM &os;
 	      (comme &man.pxeboot.8; peut charger un noyau
 	      <filename>GENERIC</filename> cela rend possible
 	      l'utilisation de <acronym>PXE</acronym> pour
@@ -2909,7 +2909,7 @@ margaux:ha=0123456789ab:tc=.def100
 	  o� vous avez install�
 	  <application>Etherboot</application>, puis rendez-vous dans
 	  le r�pertoire <filename
-	  role="directory">src</filename> de l'arborescence
+	  class="directory">src</filename> de l'arborescence
 	  <application>Etherboot</application> et tapez:</para>
 
 	<screen>
@@ -2977,7 +2977,7 @@ margaux:ha=0123456789ab:tc=.def100
 	    <para>Cr�ez un r�pertoire &agrave; partir
 	      duquel <application>tftpd</application> proposera les
 	      fichiers, e.g. <filename
-	      role="directory">/tftpboot</filename>.</para>
+	      class="directory">/tftpboot</filename>.</para>
 	  </step>
 
 	  <step>
@@ -3004,7 +3004,7 @@ margaux:ha=0123456789ab:tc=.def100
         </procedure>
 
 	<para>Le r�pertoire <filename
-	  role="directory">tftpboot</filename> peut �tre
+	  class="directory">tftpboot</filename> peut �tre
 	  plac� n'importe o� sur le serveur.
 	  Assurez-vous que son emplacement est d�fini dans les
 	  fichiers <filename>inetd.conf</filename> et
@@ -3161,14 +3161,14 @@ options     BOOTP_NFSROOT  # NFS mount root filesystem using BOOTP info
 
 	  <para>Les fichiers <filename>README</filename> dans le
 	    r�pertoire <filename
-	    role="directory">/usr/share/examples/diskless</filename>
+	    class="directory">/usr/share/examples/diskless</filename>
 	    contiennent beaucoup d'information de fond, mais, avec les
 	    autres exemples du r�pertoire <filename
-	    role="directory">diskless</filename>, ils documentent une
+	    class="directory">diskless</filename>, ils documentent une
 	    m�thode de configuration qui est distincte de celle
 	    utilis�e par <filename>clone_root</filename> et les
 	    proc�dures de d�marrage du syst�me de
-	    <filename role="directory">/etc</filename>, ce qui est un
+	    <filename class="directory">/etc</filename>, ce qui est un
 	    peu &agrave; l'origine de confusions.  Utilisez-les comme
 	    r�f�rence uniquement, &agrave; moins que
 	    vous pr�f�riez la m�thode qu'ils
@@ -3299,7 +3299,7 @@ host margaux {
 
 	<sect4>
 	  <title>Pagination via <acronym>NFS</acronym> sous
-	    &os&nbsp;5.X</title>
+	    &os;&nbsp;5.X</title>
 
 	  <para>Le noyau ne supporte pas l'activation de la pagination
 	    par <acronym>NFS</acronym> au d�marrage.  L'espace
@@ -3337,7 +3337,7 @@ host margaux {
 	    configur�e pour ex�cuter X, you devrez
 	    ajuster le fichier de configuration de
 	    <application>XDM</application>, qui envoie le journal
-	    d'erreurs sur <filename role="directory">/usr</filename>
+	    d'erreurs sur <filename class="directory">/usr</filename>
 	    par d�faut.</para>
 	</sect4>
 
@@ -3353,7 +3353,7 @@ host margaux {
 	  <para>Dans cette situation, il y a parfois des
 	    probl�mes avec les fichiers sp�ciaux de
 	    p�riph�riques dans <filename
-	    role="directory">/dev</filename>, en raison de
+	    class="directory">/dev</filename>, en raison de
 	    diff�rences de taille sur les entiers.  Une
 	    solution &agrave; ce probl�me est d'exporter un
 	    r�pertoire &agrave; partir du serveur non-&os;, de
@@ -3478,7 +3478,7 @@ host margaux {
       <para>Pour de la documentation sur
 	<application>isdn4bsd</application>, consultez le
 	r�pertoire <filename
-	role="directory">/usr/share/examples/isdn/</filename> sur
+	class="directory">/usr/share/examples/isdn/</filename> sur
 	votre syst�me &os; ou sur la <ulink
 	url="http://www.freebsd-support.de/i4b/">page web
 	d'isdn4bsd</ulink> qui propose �galement des astuces,
diff --git a/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
index a2c6f06d53..ffb73ffcee 100644
--- a/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
index f148ff7c60..63f50c97a5 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -1165,7 +1165,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir1" format="EPS"/>
+	<imagedata fileref="install/example-dir1"/>
       </imageobject>
 
       <textobject>
@@ -1188,7 +1188,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir2" format="EPS"/>
+	<imagedata fileref="install/example-dir2"/>
       </imageobject>
 
       <textobject>
@@ -1219,7 +1219,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir3" format="EPS"/>
+	<imagedata fileref="install/example-dir3"/>
       </imageobject>
 
       <textobject>
@@ -1248,7 +1248,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir4" format="EPS"/>
+	<imagedata fileref="install/example-dir4"/>
       </imageobject>
 
       <textobject>
@@ -1275,7 +1275,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir5" format="EPS"/>
+	<imagedata fileref="install/example-dir5"/>
       </imageobject>
 
       <textobject>
@@ -1643,7 +1643,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/disk-layout" format="EPS"/>
+	  <imagedata fileref="install/disk-layout"/>
 	</imageobject>
 
           <textobject>
diff --git a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
index d01562747c..f1f741e208 100644
--- a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/book.xml b/fr_FR.ISO8859-1/books/handbook/book.xml
index 9455ef0d16..a3446dc4fe 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
 ]>
diff --git a/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
index a669a14f65..68cd24ce49 100644
--- a/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/chapters.ent b/fr_FR.ISO8859-1/books/handbook/chapters.ent
index d7a930da14..b6aac4feae 100644
--- a/fr_FR.ISO8859-1/books/handbook/chapters.ent
+++ b/fr_FR.ISO8859-1/books/handbook/chapters.ent
@@ -14,229 +14,60 @@
      Original revision: 1.37
 -->
 
-<!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.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.vinum;[
   <!ENTITY chap.vinum		SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
-]]>
-<![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.xml">
-]]>
+  <!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">
+  <!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">
+  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!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/fr_FR.ISO8859-1/books/handbook/colophon.xml b/fr_FR.ISO8859-1/books/handbook/colophon.xml
index b4788e5303..c622d39f1b 100644
--- a/fr_FR.ISO8859-1/books/handbook/colophon.xml
+++ b/fr_FR.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/config/chapter.xml b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
index bc6153e124..f8b243bb47 100644
--- a/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -416,7 +416,7 @@
       &man.cron.8;, sont lanc�s par l'interm�diaire des
       proc�dures de d�marrage du syst�me.  Ces
       proc�dures peuvent varier en fonction de la version de
-      &os,; ou du fournisseur; cependant, l'aspect le plus important
+      &os;, ou du fournisseur; cependant, l'aspect le plus important
       &agrave; consid�rer est que leur configuration de
       d�marrage peut �tre g�r�e &agrave;
       l'aide de proc�dures de d�marrage simples.</para>
@@ -468,7 +468,7 @@ stop)
         kill -9 `cat /var/run/utility.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" &gt;&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
@@ -839,7 +839,7 @@ HOME=/var/log
       </authorgroup>
     </sect1info>
 
-    <title>Utilisation du syst�me rc sous &os</title>
+    <title>Utilisation du syst�me rc sous &os;</title>
 
     <para>En 2002, le syst�me <filename>rc.d</filename> de NetBSD pour
       l'initialisation du syst�me a
@@ -993,7 +993,7 @@ sshd is running as pid 433.</screen>
       int�ress� par l'�criture de vos propres
       proc�dures <filename>rc.d</filename> ou pour
       l'am�lioration des proc�dures existantes, vous
-      trouverez <ulink url="&url.articles.rc-scripting">cette
+      trouverez <ulink url="&url.articles.rc-scripting;">cette
       article</ulink> utile.</para>
   </sect1>
 
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 727e99804e..89bc6c7eb8 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -1034,7 +1034,7 @@ Fetching 133 new ports or files... done.</screen>
 		  avec le fichier <filename>supfile</filename>
 		  nomm� <filename>standard-supfile</filename>
 		  disponible dans le r�pertoire <filename
-		  role='directory'>/usr/share/examples/cvsup</filename>.
+		  class='directory'>/usr/share/examples/cvsup</filename>.
 		  C'est la m�thode recommand�e, puisqu'elle
 		  permet de r�cup�rer la totalit�
 		  des sources la premi�re fois et par la suite
@@ -1292,7 +1292,7 @@ Fetching 133 new ports or files... done.</screen>
 		  avec le fichier <filename>supfile</filename>
 		  nomm� <filename>stable-supfile</filename>
 		  disponible dans le r�pertoire <filename
-		  role='directory'>/usr/share/examples/cvsup</filename>.
+		  class='directory'>/usr/share/examples/cvsup</filename>.
 		  C'est la m�thode recommand�e, puisqu'elle
 		  permet de r�cup�rer la totalit�
 		  des sources la premi�re fois et par la suite
diff --git a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
index 95f8d89ecb..e9c353f69d 100644
--- a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
index 5eb97a5822..f50d7ee16a 100755
--- a/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -3151,7 +3151,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	  <title>Proc�dure de cr�ation d'une disquette
 	    de d�marrage</title>
 
-	<programlisting><![ CDATA [#!/bin/sh
+	<programlisting><![CDATA[#!/bin/sh
 #
 # create a restore floppy
 #
@@ -3197,7 +3197,7 @@ mkdir /mnt/var
 #
 if [ ! -x /sys/compile/MINI/kernel ]
 then
-	 cat << EOM
+	 cat &lt;&lt; EOM
 The MINI kernel does not exist, please create one.
 Here is an example config file:
 #
@@ -3279,19 +3279,19 @@ cd /
 #
 # create minimum file system table
 #
-cat > /mnt/etc/fstab <<EOM
+cat &lt; /mnt/etc/fstab &lt;&lt;EOM
 /dev/fd0a    /    ufs    rw  1  1
 EOM
 
 #
 # create minimum passwd file
 #
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat &lt; /mnt/etc/passwd &lt;&lt;EOM
+root:*:0:0:Charlie &amp;:/root:/bin/sh
 EOM
 
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat &lt; /mnt/etc/master.passwd &lt;&lt;EOM
+root::0:0::0:0:Charlie &amp;:/root:/bin/sh
 EOM
 
 chmod 600 /mnt/etc/master.passwd
@@ -3376,17 +3376,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
 	  reproduire.  Une heure de perdue maintenant peut vous
 	  �pargner d'autres ennuis plus tard.</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* Je ne me suis pas pr�par� au d�sastre,
-	  que faire?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
diff --git a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
index a5bde54d41..cee2b1844c 100644
--- a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -787,7 +787,7 @@
 	    Pour la plupart des listes, il y a d�j&agrave; beaucoup de
 	    souscripteurs communs, et mis &agrave; part les cas les plus
 	    �sot�riques (par exemple
-	    &ldquo;-stable & -scsi&rdquo;), il n'y a pas vraiment de
+	    &ldquo;-stable &amp; -scsi&rdquo;), il n'y a pas vraiment de
 	    raison de poster sur plus d'une liste &agrave; la fois.
 	    Si vous recevez un message o� apparaissent sur la
 	    ligne <literal>Cc</literal> plusieurs listes de diffusion,
diff --git a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
index cc942dde79..c98fc76040 100644
--- a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
index a82fe8ce2a..f5d3459f02 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -96,7 +96,7 @@
       Boot Records</quote>), labels <acronym>BSD</acronym>, etc.
       &mdash; par l'interm�diaire d'interfaces, ou de fichiers
       sp�ciaux du r�pertoire <filename
-      role="directory">/dev</filename>.  En supportant plusieurs
+      class="directory">/dev</filename>.  En supportant plusieurs
       configurations <acronym>RAID</acronym> logicielles, GEOM offrira
       un acc�s transparent au syst�me d'exploitation et
       &agrave; ses utilitaires.</para>
@@ -176,7 +176,7 @@
 	<para>Assurez-vous de l'existence d'un point de montage.  Si
 	  ce volume doit devenir une partition racine, utilisez alors un
 	  autre point de montage comme <filename
-	  role="directory">/mnt</filename>.</para>
+	  class="directory">/mnt</filename>.</para>
 
         <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
@@ -212,7 +212,7 @@ XXX: What message?  Put it inside the screen output above.
 	<para>Cette op�ration doit avoir cr��
 	  deux autres p�riph�riques dans le
 	  r�pertoire <filename
-	  role="directory">/dev/stripe</filename> en plus du
+	  class="directory">/dev/stripe</filename> en plus du
 	  p�riph�rique <devicename>st0</devicename>:
 	  <devicename>st0a</devicename> et
 	  <devicename>st0c</devicename>.  A ce stade, un syst�me de fichiers
@@ -285,7 +285,7 @@ XXX: What message?  Put it inside the screen output above.
       partitions.  Une partition sera la partition de pagination d'une
       taille double &agrave; celle de la <acronym>RAM</acronym> et
       l'espace restant sera allou� au syst�me de
-      fichiers racine (<filename role="directory">/</filename>).  Il
+      fichiers racine (<filename class="directory">/</filename>).  Il
       est possible d'avoir des partitions s�par�es pour
       les autres points de montage, cependant cela augmentera
       �norm�ment le niveau de difficult� en
@@ -317,7 +317,7 @@ Done.</screen>
       <para>Cette commande devrait cr�er le fichier
 	sp�cial de p�riph�rique
 	<devicename>gm0</devicename> sous le r�pertoire
-	<filename role="directory">/dev/mirror</filename>.</para>
+	<filename class="directory">/dev/mirror</filename>.</para>
     </note>
 
     <para>Installez un label <command>fdisk</command> et un code de
@@ -350,7 +350,7 @@ Done.</screen>
       d'informations et de nombres.  C'est bon signe.  Contr�lez
       l'affichage &agrave; la recherche de messages d'erreur et montez
       le p�riph�rique sur le point de montage <filename
-      role="directory">/mnt</filename>:</para>
+      class="directory">/mnt</filename>:</para>
 
     <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
 
@@ -513,7 +513,7 @@ ggate0
 
     <para>A partir d'ici, on peut acc�der au
       p�riph�rique par l'interm�diaire du point
-      de montage <filename role="directory">/mnt</filename>.</para>
+      de montage <filename class="directory">/mnt</filename>.</para>
 
     <note>
       <para>Il est &agrave; noter que toutes ces op�rations
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index 657ea32ddc..af90cbfd80 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -799,7 +799,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	    sur votre m�dia d'installation dans le r�pertoire
 	    <filename>floppies/</filename> et peuvent �galement �tre
 	    t�l�charg�es par FTP depuis le
-	    r�pertoire <filename role="directory">floppies</filename>,
+	    r�pertoire <filename class="directory">floppies</filename>,
 	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>&lt;arch&gt;</replaceable>/<replaceable>&lt;version&gt;</replaceable>-RELEASE/floppies/</literal>.
 	    Remplacez <replaceable>&lt;arch&gt;</replaceable> et
 	    <replaceable>&lt;version&gt;</replaceable> avec
@@ -1100,7 +1100,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1208,14 +1208,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  ou &man.cu.1;) pour obtenir l'invite PROM.  Elle ressemble
 	  &agrave; ceci:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1229,7 +1223,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		CPU actifs.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>En ce point, placez le CDROM dans le lecteur, et
 	  &agrave; l'invite PROM, tapez <command>boot
@@ -1355,7 +1348,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1365,7 +1358,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1427,7 +1420,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1444,7 +1437,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1456,7 +1449,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1490,7 +1483,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1515,7 +1508,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1533,7 +1526,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1543,7 +1536,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1583,7 +1576,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1793,7 +1786,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1875,7 +1868,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1932,7 +1925,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1982,7 +1975,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2017,7 +2010,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2303,7 +2296,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2336,7 +2329,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2368,7 +2361,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2386,7 +2379,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2406,7 +2399,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2426,7 +2419,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2454,7 +2447,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2520,7 +2513,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2562,7 +2555,7 @@ Mounting root from ufs:/dev/md0c
  The ports collection is a very valuable resource and well worth having
  on your /usr partition, so it is advisable to say Yes to this option.
 
- For more information on the ports collection & the latest ports,
+ For more information on the ports collection &amp; the latest ports,
  visit:
      http://www.FreeBSD.org/ports
 
@@ -2580,7 +2573,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2616,7 +2609,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2824,7 +2817,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2878,7 +2871,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3062,7 +3055,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3167,7 +3160,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3255,7 +3248,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3321,7 +3314,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3375,7 +3368,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3391,7 +3384,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3417,7 +3410,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3432,7 +3425,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3480,7 +3473,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3494,7 +3487,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3508,7 +3501,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3575,7 +3568,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3589,7 +3582,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3606,7 +3599,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3620,7 +3613,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3637,7 +3630,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3652,7 +3645,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3707,7 +3700,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3732,7 +3725,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3769,7 +3762,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3784,7 +3777,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3830,7 +3823,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3844,7 +3837,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3956,7 +3949,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4025,7 +4018,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4106,7 +4099,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4194,7 +4187,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4259,7 +4252,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4287,7 +4280,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
index c088d921a4..731a4740c8 100644
--- a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
index 435cdfacbb..34cfca80f3 100644
--- a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The FreeBSD Documentation Project
     The FreeBSD French Documentation Project
@@ -328,10 +328,10 @@
 	  o� l'environnement jail se trouvera dans le
 	  syst�me de fichiers de la machine h�te.  Un bon
 	  choix peut �tre <filename
-	  role="directory">/usr/jail/<replaceable>jailname</replaceable></filename>,
+	  class="directory">/usr/jail/<replaceable>jailname</replaceable></filename>,
 	  o� <replaceable>jailname</replaceable> est le nom de
 	  machine identifiant l'environnement jail.  Le syst�me
-	  de fichiers <filename role="directory">/usr/</filename>
+	  de fichiers <filename class="directory">/usr/</filename>
 	  dispose g�n�ralement de suffisamment d'espace
 	  pour le syst�me de fichiers de l'environnement jail,
 	  qui est pour les environnements <quote>complets</quote>,
@@ -356,10 +356,10 @@
 	  configuration n�cessaires.  Ou pour faire simple, cette
 	  commande installe tous les fichiers installables du
 	  r�pertoire <filename
-	  role="directory">/usr/src/etc/</filename> vers le
-	  r�pertoire <filename role="directory">/etc</filename>
+	  class="directory">/usr/src/etc/</filename> vers le
+	  r�pertoire <filename class="directory">/etc</filename>
 	  de l'environnement jail: <filename
-	  role="directory">$D/etc/</filename>.</para>
+	  class="directory">$D/etc/</filename>.</para>
       </callout>
 
       <callout arearefs="jaildevfs">
diff --git a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index f5b6ce611f..13212ccb99 100755
--- a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -352,7 +352,7 @@
     </indexterm>
 
     <para>Le nouveau noyau sera copi� dans le r�pertoire
-      <filename role="directory">/boot/kernel</filename> avec le nom
+      <filename class="directory">/boot/kernel</filename> avec le nom
       <filename>/boot/kernel/kernel</filename> et l'ancien noyau sera renomm� en
       <filename>/boot/kernel.old/kernel</filename>.  Maintenant, arr�tez
       le syst�me et red�marrez pour utiliser votre
@@ -1371,7 +1371,7 @@ device          fwe           # Ethernet over FireWire (non-standard!)</programl
 	familles de microprocesseurs &pentium; Pro et
 	suivantes.</para>
 
-      <para>L'extension de l'adressage physique&mdash,&ldquo;Physical
+      <para>L'extension de l'adressage physique&mdash;,&ldquo;Physical
 	Address Extension&rdquo; (<acronym>PAE</acronym>) est une
 	caract�ristique des microprocesseurs &intel; &pentium;
 	Pro et suivants autorisant les configurations m�moires
diff --git a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
index 6d14310f94..4b59247fa6 100644
--- a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -900,10 +900,10 @@ font8x8="cp866-8x8"</programlisting>
 	  utilis�e, et <option>-W</option> fixe la table de
 	  conversion de caract�res.  Pour utiliser l'option
 	  <option>-W</option> assurez-vous de monter <filename
-	  role='directory'>/usr</filename> avant la partition &ms-dos;,
+	  class='directory'>/usr</filename> avant la partition &ms-dos;,
 	  car en effet les tables de conversion sont situ�es
 	  dans le r�pertoire <filename
-	  role='directory'>/usr/libdata/msdosfs</filename>.  Pour plus
+	  class='directory'>/usr/libdata/msdosfs</filename>.  Pour plus
 	  d'informations, consultez la page de manuel
 	  &man.mount.msdosfs.8;.</para>
       </sect3>
diff --git a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index e57131cdde..bd1175712e 100644
--- a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -736,14 +736,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -1061,7 +1061,7 @@ exit 0</programlisting>
 	    ce qui suit:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
@@ -1829,7 +1829,7 @@ export PATH</programlisting>
 		<entry><filename>/dev/da0s1a</filename></entry>
 		<entry>1.016.303</entry>
 		<entry>1</entry>
-		<entry><filename role='directory'>/</filename></entry>
+		<entry><filename class='directory'>/</filename></entry>
 	      </row>
 
 	      <row>
@@ -1843,35 +1843,35 @@ export PATH</programlisting>
 		<entry><filename>/dev/da0s1e</filename></entry>
 		<entry>2.032.623</entry>
 		<entry>2</entry>
-		<entry><filename role='directory'>/var</filename></entry>
+		<entry><filename class='directory'>/var</filename></entry>
 	      </row>
 
 	      <row>
 		<entry><filename>/dev/da0s1f</filename></entry>
 		<entry>8.205.339</entry>
 		<entry>8</entry>
-		<entry><filename role='directory'>/usr</filename></entry>
+		<entry><filename class='directory'>/usr</filename></entry>
 	      </row>
 
 	      <row>
 		<entry><filename>/dev/da1s1e</filename></entry>
 		<entry>45.734.361</entry>
 		<entry>45</entry>
-		<entry><filename role='directory'>/compat/linux/oracle</filename></entry>
+		<entry><filename class='directory'>/compat/linux/oracle</filename></entry>
 	      </row>
 
 	      <row>
 		<entry><filename>/dev/da1s1f</filename></entry>
 		<entry>2.032.623</entry>
 		<entry>2</entry>
-		<entry><filename role='directory'>/compat/linux/sapmnt</filename></entry>
+		<entry><filename class='directory'>/compat/linux/sapmnt</filename></entry>
 	      </row>
 
 	      <row>
 		<entry><filename>/dev/da1s1g</filename></entry>
 		<entry>2.032.623</entry>
 		<entry>2</entry>
-		<entry><filename role='directory'>/compat/linux/usr/sap</filename></entry>
+		<entry><filename class='directory'>/compat/linux/usr/sap</filename></entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -2014,17 +2014,17 @@ pam-0.68-7.i386.rpm</userinput></screen>
 	    </thead>
 	    <tbody>
 	      <row>
-		<entry><filename role='directory'>/compat/linux/oracle</filename></entry>
+		<entry><filename class='directory'>/compat/linux/oracle</filename></entry>
 		<entry>45 Go</entry>
 	      </row>
 
 	      <row>
-		<entry><filename role='directory'>/compat/linux/sapmnt</filename></entry>
+		<entry><filename class='directory'>/compat/linux/sapmnt</filename></entry>
 		<entry>2 Go</entry>
 	      </row>
 
 	      <row>
-		<entry><filename role='directory'>/compat/linux/usr/sap</filename></entry>
+		<entry><filename class='directory'>/compat/linux/usr/sap</filename></entry>
 		<entry>2 Go</entry>
 	      </row>
 	    </tbody>
@@ -2216,7 +2216,7 @@ Shell: bash  (/compat/linux/bin/bash)</programlisting>
 	  qu'utilisateur
 	  <username>ora<replaceable>sid</replaceable></username>.  Ce
 	  seront tous les r�pertoires du type
-	  <filename role='directory'>/oracle/<replaceable>SID</replaceable></filename>:</para>
+	  <filename class='directory'>/oracle/<replaceable>SID</replaceable></filename>:</para>
 
 	<screen>&prompt.root; <userinput>su - ora<replaceable>sid</replaceable></userinput>
 &prompt.root; <userinput>cd /oracle/<replaceable>SID</replaceable></userinput>
@@ -2239,7 +2239,7 @@ Shell: bash  (/compat/linux/bin/bash)</programlisting>
 &prompt.root; <userinput>mkdir 817_32</userinput></screen>
 
 	<note><para>Le r�pertoire <filename
-	  role='directory'>client/80x_32</filename> est
+	  class='directory'>client/80x_32</filename> est
 	  cr�� tel quel.  Ne remplacez pas le
 	  <emphasis>x</emphasis> par quelque chose
 	  d'autre.</para></note>
@@ -2422,7 +2422,7 @@ options SEMUME=100       #number of UNDO keys</programlisting>
 	<title>Ex�cuter la proc�dure d'installation</title>
 
 	<para>Tout d'abord, vous devez pr�parer un r�pertoire
-	  <filename role='directory'>install</filename>:</para>
+	  <filename class='directory'>install</filename>:</para>
 
 	<screen>&prompt.root; <userinput>cd /oracle/<replaceable>SID</replaceable>/sapreorg</userinput>
 &prompt.root; <userinput>mkdir install</userinput>
@@ -2431,7 +2431,7 @@ options SEMUME=100       #number of UNDO keys</programlisting>
 	<para>Ensuite la proc�dure d'installation est
 	  lanc�e, qui copiera tous fichiers correspondant dans
 	  le r�pertoire <filename
-	  role='directory'>install</filename>:</para>
+	  class='directory'>install</filename>:</para>
 
 	<screen>&prompt.root; <userinput>/oracle/<replaceable>SID</replaceable>/sapreorg/KERNEL/UNIX/INSTTOOL.SH</userinput></screen>
 
@@ -2447,7 +2447,7 @@ options SEMUME=100       #number of UNDO keys</programlisting>
 	  IDES, on doit donc copier le fichier
 	  <filename>CENTRDB.R3S</filename> correspondant du
 	  r�pertoire <filename
-	  role='directory'>EXPORT1</filename>, sinon
+	  class='directory'>EXPORT1</filename>, sinon
 	  <command>R3SETUP</command> ne demandera que trois CDs
 	  EXPORT.</para>
 
@@ -2958,7 +2958,7 @@ options SEMUME=100       #number of UNDO keys</programlisting>
 	avez produite &agrave; partir du r�pertoire
 	d'installation sur un syst�me Linux, et
 	d�sarchivez-la dans le r�pertoire <filename
-	role='directory'>/oracle/<replaceable>SID</replaceable>/817_32/</filename>.</para>
+	class='directory'>/oracle/<replaceable>SID</replaceable>/817_32/</filename>.</para>
     </sect2>
 
     <sect2 id="continuewithsapr4installation">
@@ -3713,7 +3713,7 @@ drwxrwxr-x 11 idsadm sapsys 512 May 4 14:20 trans</screen>
 	  consultez les fichiers journaux correspondants qui peuvent
 	  �tre trouv�s dans le r�pertoire
 	  <filename
-	  role='directory'>/usr/sap/<replaceable>SID</replaceable>/DVEBMGS<replaceable>nr</replaceable>/work/</filename>.
+	  class='directory'>/usr/sap/<replaceable>SID</replaceable>/DVEBMGS<replaceable>nr</replaceable>/work/</filename>.
 	  Les fichiers &agrave; consulter sont
 	  <filename>dev_ms</filename> et
 	  <filename>dev_disp</filename>.</para>
@@ -3865,11 +3865,11 @@ options SHMMAXPGS=393216
 	<literal>unionfs</literal>!) de montage des syst�mes de
 	fichiers.  Tout d'abord, une tentative est faite pour
 	rechercher le fichier dans le r�pertoire <filename
-	role='directory'>/compat/linux/<replaceable>chemin-origine</replaceable></filename>,
+	class='directory'>/compat/linux/<replaceable>chemin-origine</replaceable></filename>,
 	<emphasis>puis</emphasis> uniquement si cela �choue, la
 	recherche est effectu�e dans le r�pertoire
 	<filename
-	role='directory'>/<replaceable>chemin-origine</replaceable></filename>.
+	class='directory'>/<replaceable>chemin-origine</replaceable></filename>.
 	Cela permet de s'assurer que les binaires n�cessitant
 	d'autres binaires puissent s'ex�cuter (par exemple,
 	l'ensemble des outils Linux peuvent tourner sous l'ABI Linux).
@@ -3877,7 +3877,7 @@ options SHMMAXPGS=393216
 	charger et ex�cuter les binaires &os;, s'il n'y a pas
 	de binaires Linux correspondant pr�sents, et vous
 	pourriez placer une commande &man.uname.1; dans l'arborescence
-	<filename role='directory'>/compat/linux</filename> pour vous
+	<filename class='directory'>/compat/linux</filename> pour vous
 	assurer que les binaires Linux ne puissent pas dire qu'ils ne
 	tournent pas sous Linux.</para>
 
diff --git a/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
index 95cc5ee3d7..fbe8daea67 100644
--- a/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index 99feb4e4d0..470cc45db8 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -1507,7 +1507,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
       la configuration se fait &agrave; un haut niveau d'abstraction.
       Les fichiers de configuration &man.m4.1; se trouvent dans le
       r�pertoire <filename
-      role="directory">/usr/src/usr.sbin/sendmail/cf</filename>.</para>
+      class="directory">/usr/src/usr.sbin/sendmail/cf</filename>.</para>
 
     <para>Si vous n'avez pas install� toutes les sources du
       syst�me, l'ensemble des fichiers de configuration de
@@ -1521,7 +1521,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
 
     <para>Cette extraction ne donne lieu qu'&agrave; une centaine de
       kilo-octets.  Le fichier <filename>README</filename> dans le
-      r�pertoire <filename role="directory">cf</filename>
+      r�pertoire <filename class="directory">cf</filename>
       pourra faire office d'une introduction &agrave; la configuration
       &man.m4.1;.</para>
 
@@ -1534,7 +1534,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
 
     <para>Tout d'abord, vous devez cr�er votre fichier
       <filename>.mc</filename>.  Le r�pertoire <filename
-      role="directory">/usr/src/usr.sbin/sendmail/cf/cf</filename>
+      class="directory">/usr/src/usr.sbin/sendmail/cf/cf</filename>
       contient quelques exemples.  En supposant que vous avez
       appel� votre fichier <filename>foo.mc</filename>, tout ce
       dont vous avez besoin de faire pour le convertir en un fichier
@@ -1738,7 +1738,7 @@ hostname=_HOSTNAME_</programlisting>
     <para><filename role="package">mail/ssmtp</filename> dispose
       d'autres options.  Consultez le fichier de configuration
       d'exemple dans le r�pertoire <filename
-      role="directory">/usr/local/etc/ssmtp</filename> ou la page de
+      class="directory">/usr/local/etc/ssmtp</filename> ou la page de
       manuel de <application>ssmtp</application> pour quelques
       exemples et plus d'informations.</para>
 
@@ -2084,7 +2084,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
       <screen>&prompt.user; <userinput>mail</userinput></screen>
 
       <para>Le contenu de la bo�te aux lettres de l'utilisateur
-	dans <filename role="directory">/var/mail</filename> est
+	dans <filename class="directory">/var/mail</filename> est
 	automatiquement lu par l'utilitaire <command>mail</command>.
 	Si la bo�te est vide, l'utilitaire rend la main avec un
 	message indiquant qu'aucun courrier �lectronique ne
@@ -2107,7 +2107,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
 	qui devra �tre affich�.  Dans cet exemple, nous
 	lirons le premier courrier �lectronique:</para>
 
-      <screen>& <userinput>t 1</userinput>
+      <screen>&prompt.user; <userinput>t 1</userinput>
 Message 1:
 From root@localhost  Mon Mar  8 14:05:52 2004
 X-Original-To: marcs@localhost
@@ -2141,7 +2141,7 @@ This is a test message, please reply if you receive it.</screen>
 	<keycap>.</keycap> sur une nouvelle ligne.  Ci-dessous est
 	pr�sent� un exemple:</para>
 
-      <screen>& <userinput>R 1</userinput>
+      <screen>&prompt.user; <userinput>R 1</userinput>
 To: root@localhost
 Subject: Re: test
 
@@ -2159,7 +2159,7 @@ EOT</screen>
 	d'un message doit �tre indiqu�e en mettant un
 	<keycap>.</keycap> seul sur une nouvelle ligne.</para>
 
-      <screen>& <userinput>mail root@localhost</userinput>
+      <screen>&prompt.user; <userinput>mail root@localhost</userinput>
 Subject: <userinput>I mastered mail
 
 Now I can send and receive email using mail ... :)
@@ -2241,7 +2241,7 @@ EOT</screen>
 
       <para><application>mutt</application> lira automatiquement le
 	contenu de la bo�te aux lettres de l'utilisateur dans
-	<filename role="directory">/var/mail</filename> et en affiche
+	<filename class="directory">/var/mail</filename> et en affiche
 	le contenu le cas �ch�ant.  Si aucun message
 	n'est trouv� dans cette bo�te, alors
 	<application>mutt</application> attendra une commande de
@@ -2251,7 +2251,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2263,7 +2263,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2304,7 +2304,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2365,7 +2365,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2381,14 +2381,14 @@ EOT</screen>
 
       <para>Le r�pertoire ouvert par d�faut par
 	<application>pine</application> est <filename
-	role="directory">inbox</filename>.  Pour afficher l'index des
+	class="directory">inbox</filename>.  Pour afficher l'index des
 	messages, appuyez sur <keycap>I</keycap>, ou
 	s�lectionnez l'option <guimenuitem>MESSAGE
 	INDEX</guimenuitem> comme montr� ci-dessous:</para>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2400,7 +2400,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2414,7 +2414,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2435,7 +2435,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
@@ -2628,7 +2628,7 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
       <literal>goodmail@example2.com</literal>:</para>
 
     <programlisting>:0
-* < 1000
+* &lt; 1000
 ! goodmail@example2.com</programlisting>
 
     <para>Mettre tout le courrier &agrave; destination de
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 2bcec5bbd0..3e1181a492 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -2691,11 +2691,11 @@ doc/zh_*</screen>
 	<application>Portsnap</application> ne met pas &agrave; jour
 	le catalogue des logiciels port�s directement dans le
 	r�pertoire <filename
-	role="directory">/usr/ports</filename>; le logiciel travaille
+	class="directory">/usr/ports</filename>; le logiciel travaille
 	plut�t par d�faut sur une version
 	compress�e de l'arborescence des logiciels
 	port�s dans le r�pertoire <filename
-	role="directory">/var/db/portsnap</filename>.  Cette copie
+	class="directory">/var/db/portsnap</filename>.  Cette copie
 	compress�e est ensuite utilis�e pour mettre
 	&agrave; jour le catalogue des logiciels port�s.</para>
 
@@ -2704,8 +2704,8 @@ doc/zh_*</screen>
 	  install� &agrave; partir du catalogue des logiciels
 	  port�s de &os;, alors l'emplacement par d�faut
 	  pour son instantan� compress� sera <filename
-	  role="directory">/usr/local/portsnap</filename> au lieu de
-	  <filename role="directory">/var/db/portsnap</filename>.</para>
+	  class="directory">/usr/local/portsnap</filename> au lieu de
+	  <filename class="directory">/var/db/portsnap</filename>.</para>
       </note>
     </sect2>
 
@@ -2754,8 +2754,8 @@ doc/zh_*</screen>
 	instantan� compress� de
 	l'int�gralit� de l'arborescence des logiciels
 	port�s dans <filename
-	role="directory">/var/db/portsnap</filename> (ou <filename
-	role="directory">/usr/local/portsnap</filename> si
+	class="directory">/var/db/portsnap</filename> (ou <filename
+	class="directory">/usr/local/portsnap</filename> si
 	<application>Portsnap</application> a �t�
 	install� &agrave; partir du catalogue des logiciels
 	port�s).  Au d�but de l'ann�e 2006, cela
@@ -2768,7 +2768,7 @@ doc/zh_*</screen>
 	�t� r�cup�r�, une copie
 	utilisable de l'arborescence des logiciels port�s peut
 	�tre extraite dans le r�pertoire <filename
-	role="directory">/usr/ports</filename>.  Cela est
+	class="directory">/usr/ports</filename>.  Cela est
 	n�cessaire m�me si une arborescence a
 	d�j&agrave; �t� cr��e dans
 	ce r�pertoire (par exemple en utilisant
@@ -2782,7 +2782,7 @@ doc/zh_*</screen>
 
       <note>
 	<para>Dans l'installation par d�faut de &os; <filename
-	  role="directory">/usr/ports</filename> n'est pas
+	  class="directory">/usr/ports</filename> n'est pas
 	  cr��.  Si vous utilisez &os;&nbsp;6.0-RELEASE,
 	  ce r�pertoire doit �tre cr�� avant
 	  d'utiliser la commande <command>portsnap</command>.  Sur les
@@ -2802,7 +2802,7 @@ doc/zh_*</screen>
 	des logiciels port�s ait �t�
 	r�cup�r� puis d�compress�
 	dans le r�pertoire <filename
-	role="directory">/usr/ports</filename>, la mise &agrave; jour
+	class="directory">/usr/ports</filename>, la mise &agrave; jour
 	du catalogue se divise en deux �tapes: la
 	r�cup�ration (<emphasis>fetch</emphasis>) des
 	mises &agrave; jour de l'instantan�, et leur
@@ -2860,7 +2860,7 @@ doc/zh_*</screen>
 	<command>portsnap</command> de mettre &agrave; jour son
 	instantan� compress� et les fichiers
 	<filename>INDEX</filename> du r�pertoire <filename
-	role="directory">/usr/ports</filename>, et enverra un courrier
+	class="directory">/usr/ports</filename>, et enverra un courrier
 	�lectronique si un logiciel port�
 	install� n'est pas &agrave; jour:</para>
 
diff --git a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
index 4155773d9e..9beeb7bdef 100644
--- a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
index 1459610b9c..815669e5dd 100644
--- a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index f4f623adcf..29d9f64b50 100644
--- a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
index 3626333f8c..8ede17b082 100644
--- a/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index d8ef215988..d13b6c1846 100644
--- a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -144,9 +144,9 @@
 
       <para>Avant de configurer PPP sur votre machine, v�rifiez
 	que <command>pppd</command> est bien dans le r�pertoire
-	<filename role="directory">/usr/sbin</filename> et que le
+	<filename class="directory">/usr/sbin</filename> et que le
 	r�pertoire <filename
-	role="directory">/etc/ppp</filename> existe.</para>
+	class="directory">/etc/ppp</filename> existe.</para>
 
       <para>La commande <command>pppd</command> peut fonctionner selon
 	deux modes:</para>
@@ -566,7 +566,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                        ; ouverture de session
@@ -587,7 +587,7 @@ reinput 1 {\255}
 if success goto slhup
 reinput 1 {\127}
 if success goto slhup
-if < \%x 10 goto slloop         ; essayer 10 fois d'obtenir une invite de session
+if &lt; \%x 10 goto slloop         ; essayer 10 fois d'obtenir une invite de session
 else goto slhup                 ; raccrocher et recommencer apr�s 10 �checs
 
 :sluid
@@ -886,17 +886,17 @@ ppp_profile="adsl"</programlisting>
 	logiciel port� place un ensemble de fichiers de
 	configuration tr�s bien comment�s dans le
 	r�pertoire <filename
-	role="directory"><replaceable>PREFIX</replaceable>/etc/mpd/</filename>.
+	class="directory"><replaceable>PREFIX</replaceable>/etc/mpd/</filename>.
 	Notez qu'ici <replaceable>PREFIX</replaceable>
 	repr�sente le r�pertoire dans lequel les
 	logiciels port�s sont install�s, par
 	d�faut le r�pertoire <filename
-	role="directory">/usr/local/</filename>.  Un guide complet
+	class="directory">/usr/local/</filename>.  Un guide complet
 	pour la configuration de <application>mpd</application> est
 	disponible dans le format HTML, une fois que le logiciel a
 	�t� install�.  Il se trouve dans le
 	r�pertoire <filename
-	role="directory"><replaceable>PREFIX</replaceable>/share/doc/mpd/</filename>.
+	class="directory"><replaceable>PREFIX</replaceable>/share/doc/mpd/</filename>.
 	Voici un exemple de configuration pour se connecter &agrave;
 	un service ADSL &agrave; l'aide de
 	<application>mpd</application>.  La configuration est
diff --git a/fr_FR.ISO8859-1/books/handbook/preface/preface.xml b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
index ea04cf7aa8..707d2a2cf6 100644
--- a/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
+++ b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
index 5e08df4535..1cb089d513 100755
--- a/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
index 784ac56c29..ccbbc6c883 100755
--- a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -2162,7 +2162,7 @@ options          IPSEC_ESP          #IP security (crypto; define w/IPSEC)</progr
 
       <screen>
 	          (1)
-	Machine A ------> Machine B
+	Machine A ------&gt; Machine B
 
 	(1)PROTO=AH
 		ALG=MD5(RFC1826)
@@ -2170,8 +2170,8 @@ options          IPSEC_ESP          #IP security (crypto; define w/IPSEC)</progr
 		SPI=1000
 
 	           (2.1)
-	Machine A <------ Machine B
-	          <------
+	Machine A &lt;------ Machine B
+	          &lt;------
 	           (2.2)
 
 	(2.1)
@@ -2224,10 +2224,10 @@ C
    Machine A --------------------------> Machine E
    10.2.3.4                               10.6.7.8
       |                                     |
-      ========= ancien AH keyed-md5 ========>
+      ========= ancien AH keyed-md5 ========&gt;
 
-      <======== nouveau AH hmac-sha1 ========
-      <======== nouveau ESP des-cbc =========
+      &lt;======== nouveau AH hmac-sha1 ========
+      &lt;======== nouveau ESP des-cbc =========
 </screen>
     </sect2>
 
@@ -3330,7 +3330,7 @@ VII. References<co id="co-ref"/></programlisting>
 	    aidera &agrave; d�terminer la r�vision.  Pour
 	    les logiciels port�s, le num�ro de version est
 	    list� apr�s le nom du logiciel dans <filename
-	    role="directory">/var/db/pkg</filename>.  Si le
+	    class="directory">/var/db/pkg</filename>.  Si le
 	    syst�me ne se synchronise pas avec le
 	    r�f�rentiel <acronym>CVS</acronym> &os; et ne
 	    recompile pas les sources quotidiennement, il y a des
diff --git a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index d4e4fd8974..0a659096ed 100644
--- a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/users/chapter.xml b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
index 413638d912..83bc588601 100644
--- a/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
index 06df24be69..d3e6bc9bdf 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 	The Vinum Volume Manager
 	Par Greg Lehey (grog at lemis dot com)
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
index e5682a6873..bf11412fcb 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
index 710c3e7781..6a49b82196 100644
--- a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -112,7 +112,7 @@
 	juste la lettre suivante dans l'alphabet romain.</para>
 
       <para>X peut �tre appel� &ldquo;X&rdquo;,
-	&ldquo;Syst�me X Window&rdquo;, <quote>X11&</quote>, et sous d'autres
+	&ldquo;Syst�me X Window&rdquo;, <quote>X11</quote>, et sous d'autres
 	noms.  Il se peut que vous puissiez trouver que nommer
 	X11 <quote>X Windows</quote> peut �tre offensant pour
 	certaines personnes; consultez &man.X.7; pour un peu plus
@@ -364,7 +364,7 @@
       l'impl�mentation open source du syst�me X Window
       publi�e par la fondation X.Org.
       <application>&xorg;</application> est bas�e sur le code
-      de <application>&xfree86&nbsp;4.4RC2</application> et d'X11R6.6.
+      de <application>&xfree86;&nbsp;4.4RC2</application> et d'X11R6.6.
       la version d'<application>&xorg;</application> actuellement disponible dans le catalogue des logiciels
       port�s de &os; est la &xorg.version;.</para>
 
@@ -969,8 +969,8 @@ EndSection</programlisting>
 	d'<application>&xfree86;</application> 4.3.0.  Depuis
 	<application>&xfree86;</application> 4.3.0, toutes les polices
 	sous X11 se trouvant dans les r�pertoires <filename
-	role="directory">/usr/local/lib/X11/fonts/</filename> et
-	<filename role="directory">~/.fonts/</filename> sont
+	class="directory">/usr/local/lib/X11/fonts/</filename> et
+	<filename class="directory">~/.fonts/</filename> sont
 	automatiquement disponibles pour l'anticr�nelage avec
 	les applications compatibles Xft.  Toutes les applications ne
 	sont pas compatibles Xft, mais de nombreuses ont
@@ -1014,9 +1014,9 @@ EndSection</programlisting>
       <para>Comme pr�cis� pr�c�demment,
 	l'ensemble des polices de caract�res du
 	r�pertoire <filename
-	role="directory">/usr/local/lib/X11/fonts/</filename> comme du
+	class="directory">/usr/local/lib/X11/fonts/</filename> comme du
 	r�pertoire <filename
-	role="directory">~/.fonts/</filename> sont disponibles pour
+	class="directory">~/.fonts/</filename> sont disponibles pour
 	les applications compatibles Xft.  Si vous d�sirez
 	ajouter un autre r�pertoire en dehors des ces deux
 	l&agrave;, ajoutez une ligne similaire &agrave; la suivante au
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/Makefile b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
index ce788f016c..72d7b727fb 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
@@ -22,9 +22,5 @@ INSTALL_ONLY_COMPRESSED?=
 # XML content
 SRCS=  book.xml
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/book.xml b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
index 577af96668..d239aba36a 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl b/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 16d795c0a4..0000000000
--- a/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- 
-	The FreeBSD Documentation Project
-	The FreeBSD French Documentation Project
-
-	$FreeBSD$
-	Original Revision: 1.5
--->
-
-<!-- Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files, 
-     rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE"> 
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      <![ %output.html; [ 
-	(define ($email-footer$)
-          (make sequence
-            (literal "Pour toutes questions sur le systeme des ports, e-mail <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal ">.")
-            (make empty-element gi: "br")
-            (literal "Pour toutes questions a propos de la documentation, e-mail <")
-            (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-              (literal "doc@FreeBSD.org"))
-            (literal ">.")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/fr_FR.ISO8859-1/share/xml/abstract.ent b/fr_FR.ISO8859-1/share/xml/abstract.ent
index a4e8a1e907..2d75349f46 100644
--- a/fr_FR.ISO8859-1/share/xml/abstract.ent
+++ b/fr_FR.ISO8859-1/share/xml/abstract.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/artheader.ent b/fr_FR.ISO8859-1/share/xml/artheader.ent
index 76c9b9f728..36d17523ae 100644
--- a/fr_FR.ISO8859-1/share/xml/artheader.ent
+++ b/fr_FR.ISO8859-1/share/xml/artheader.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/catalog b/fr_FR.ISO8859-1/share/xml/catalog
index fb22c6654c..2422c1740c 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog
+++ b/fr_FR.ISO8859-1/share/xml/catalog
@@ -1,59 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- French specific ...................................................... --
-
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
-	"mailing-lists.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
-        "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
-	"teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
-        "urls.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
-        "translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
-        "abstract.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
-        "artheader.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//FR"
-        "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/fr_FR.ISO8859-1/share/xml/catalog.xml b/fr_FR.ISO8859-1/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog.xml
+++ b/fr_FR.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent
index 90b26890c8..fd5cf3bbea 100644
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@@ -2,35 +2,44 @@
   Original revision: 1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
+	"translators.ent">
 %translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
+	"teams.ent">
 %teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
+	"glossary.ent">
 %glossary;
 <!--
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
 -->
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
+	"urls.ent">
 %urls;
+<!ENTITY % urls-en PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
+%urls-en;
diff --git a/fr_FR.ISO8859-1/share/xml/freebsd.dsl b/fr_FR.ISO8859-1/share/xml/freebsd.dsl
index 310845b2d1..b573e51290 100644
--- a/fr_FR.ISO8859-1/share/xml/freebsd.dsl
+++ b/fr_FR.ISO8859-1/share/xml/freebsd.dsl
@@ -10,53 +10,12 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
 
-      <![ %output.html; [
-
-        <!-- Fix a problem with the French localisation.  This should really
-             be a patch to the dsssl-docbook-modular port, but this gets it
-             more widely available sooner.  A patch will be applied to the
-             port as well, and then this can be removed. -->
-        (define (gentext-fr-nav-prev prev)
-          (make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
-
-        (define ($email-footer$)
-          (make sequence
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Ce document, ainsi que d'autres peut �tre t�l�charg� sur ")
-                (make element gi: "a"
-                      attributes: (list (list "href" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc"))
-                  (literal "ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Pour toutes questions � propos de FreeBSD, lisez la ")
-                (make element gi: "a"
-                      attributes: (list (list "href" "http://www.freebsd.org/docs.html"))
-                  (literal "documentation"))
-                (literal " avant de contacter <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "Pour les questions sur cette documentation, contactez <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-                (literal ">.")))))
-      ]]>
 	<!-- Fix a problem with the French localisation. The bug was
 	submitted to authors of docbook project -->
 	(define (local-fr-label-title-sep)
diff --git a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
index 6d1ba10546..14c5772c09 100644
--- a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 	The FreeBSD Documentation Project
 	The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl b/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
index d95a126a65..afcc035684 100644
--- a/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
@@ -14,7 +14,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- template: "mirrors-docbook-contact" -->
diff --git a/fr_FR.ISO8859-1/share/xml/newsgroups.ent b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
index 7cdc47e2dc..b336f9f126 100644
--- a/fr_FR.ISO8859-1/share/xml/newsgroups.ent
+++ b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/teams.ent b/fr_FR.ISO8859-1/share/xml/teams.ent
index 184cb8e2fe..f4db86c00d 100644
--- a/fr_FR.ISO8859-1/share/xml/teams.ent
+++ b/fr_FR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index 24f72ae816..4616c292ab 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/translators.ent b/fr_FR.ISO8859-1/share/xml/translators.ent
index 24f4a06bad..e65790ce54 100644
--- a/fr_FR.ISO8859-1/share/xml/translators.ent
+++ b/fr_FR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/urls.ent b/fr_FR.ISO8859-1/share/xml/urls.ent
index 6bcbdf8d31..2ebd4513b2 100644
--- a/fr_FR.ISO8859-1/share/xml/urls.ent
+++ b/fr_FR.ISO8859-1/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..3865c406a6
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Ce document, ainsi que d'autres peut �tre t�l�charg� sur
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>Pour toutes questions � propos de FreeBSD, lisez la
+    <a href="http://www.FreeBSD.org/docs.html">documentation</a> avant de contacter
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    Pour les questions sur cette documentation, contactez
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
index 1a841fa1fe..156f6d70b8 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
@@ -7,8 +7,6 @@
 # %SRCID%     1.1
 #
 
-NO_TIDY = yes
-
 MAINTAINER = doc@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
index a090177e9e..d3fb1c2c2d 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 
diff --git a/hu_HU.ISO8859-2/articles/cups/Makefile b/hu_HU.ISO8859-2/articles/cups/Makefile
index ae7697c49b..5c1c095cbe 100644
--- a/hu_HU.ISO8859-2/articles/cups/Makefile
+++ b/hu_HU.ISO8859-2/articles/cups/Makefile
@@ -7,8 +7,6 @@
 # %SRCID%   1.2
 #
 
-NO_TIDY= yes
-
 MAINTAINER= doc@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/cups/article.xml b/hu_HU.ISO8859-2/articles/cups/article.xml
index 59f349006d..acf35d5b9f 100644
--- a/hu_HU.ISO8859-2/articles/cups/article.xml
+++ b/hu_HU.ISO8859-2/articles/cups/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
index 6c7d521e6a..3d3f3220ed 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
@@ -6,12 +6,6 @@
 # %SRCID%     1.6
 #
 
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
 MAINTAINER= gabor@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
index bb27cddb99..00332db692 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
index f397ca0ebf..a1ea94ceb9 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
@@ -7,8 +7,6 @@
 # %SRCID%   1.1
 #
 
-NO_TIDY= yes
-
 MAINTAINER= doc@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 5407cf2524..5aba2911ae 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 
@@ -369,7 +366,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel1.png"/>
+	  <imagedata fileref="disklabel1"/>
 	</imageobject>
       </mediaobject>
 
@@ -474,7 +471,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel2.png"/>
+	  <imagedata fileref="disklabel2"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/hu_HU.ISO8859-2/articles/laptop/Makefile b/hu_HU.ISO8859-2/articles/laptop/Makefile
index d150d68778..f11d6e7e59 100644
--- a/hu_HU.ISO8859-2/articles/laptop/Makefile
+++ b/hu_HU.ISO8859-2/articles/laptop/Makefile
@@ -6,12 +6,6 @@
 # %SRCID%     1.4
 #
 
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
 MAINTAINER= doc@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/laptop/article.xml b/hu_HU.ISO8859-2/articles/laptop/article.xml
index 5b1268299e..b8b046fa3a 100644
--- a/hu_HU.ISO8859-2/articles/laptop/article.xml
+++ b/hu_HU.ISO8859-2/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
index 7e5040c4dd..ec5b75a2cd 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
@@ -6,12 +6,6 @@
 # %SRCID%     1.1
 #
 
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
 MAINTAINER= gabor@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
index 7af790b2ec..1f4c4645d6 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 Copyright (c) 2005 Dru Lavigne
diff --git a/hu_HU.ISO8859-2/articles/linux-users/Makefile b/hu_HU.ISO8859-2/articles/linux-users/Makefile
index 61647af74b..e258717fb9 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-users/Makefile
@@ -7,12 +7,6 @@
 # %SRCID%     1.1
 #
 
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY = yes
-
 MAINTAINER = doc@FreeBSD.org
 
 DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/linux-users/article.xml b/hu_HU.ISO8859-2/articles/linux-users/article.xml
index 0e54a29591..67ec405b2c 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 
diff --git a/hu_HU.ISO8859-2/books/faq/Makefile b/hu_HU.ISO8859-2/books/faq/Makefile
index ee9666705e..5b5a6838be 100644
--- a/hu_HU.ISO8859-2/books/faq/Makefile
+++ b/hu_HU.ISO8859-2/books/faq/Makefile
@@ -8,8 +8,6 @@
 
 MAINTAINER=doc@FreeBSD.org
 
-NO_TIDY = yes
-
 DOC?= book
 
 FORMATS?= html-split html
diff --git a/hu_HU.ISO8859-2/books/faq/book.xml b/hu_HU.ISO8859-2/books/faq/book.xml
index 5d8fb7e0cf..6187090e35 100644
--- a/hu_HU.ISO8859-2/books/faq/book.xml
+++ b/hu_HU.ISO8859-2/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY enbase "http://www.FreeBSD.org">
 <!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
 <!ENTITY url.base.hu "&enbase;/hu">
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/Makefile b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
index 760d0fc5c8..1e071055f9 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/Makefile
+++ b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
@@ -7,8 +7,6 @@
 # Build the FreeBSD Documentation Project Primer.
 #
 
-NO_TIDY=yes
-
 MAINTAINER=doc@FreeBSD.org
 
 DOC?= book
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/book.xml b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
index 8ee2b33599..2a729e7d53 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/book.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
index fff5bf42a2..66a5801a54 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
@@ -3006,7 +3006,7 @@ Ez lenne az 'ize2' nev
 	<para>Egy p�ld�n kereszt�l mindez
 	  val�sz�n�leg sokkal k�nnyebben
 	  �rthet�v� v�lik.  Tegy�k
-	  teh�t most fel, hogy van egy <filename>abra1</filename>
+	  teh�t most fel, hogy van egy <filename>abra1.png</filename>
 	  nev� k�p�nk, amelyet szeretn�nk
 	  betenni a dokumentumba.  Ez a k�p egy A bet�t
 	  �br�zol egy t�glalapban.  A
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
index 4e29f4e028..763f5100b4 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
@@ -1166,31 +1166,6 @@ onsgmls:pr
   --]]> t�bbsoros megjegyz�sek �r�s�nak <![CDATA[-->]]></programlisting>
     </example>
 
-    <![%output.print;[
-    <important>
-      <title>A k�t k�t�jel haszn�lata</title>
-
-      <para>A Postscript �s PDF v�ltozatok eset�n
-	kisebb probl�m�k jelentkeznek enn�l a
-	p�ld�n�l, ugyanis benn�k csak egyetlen
-	k�t�jel fog l�tszani a <literal>&lt;!</literal>
-	�s <literal>&gt;</literal> szimb�lumok
-	mellett.</para>
-
-      <para>A forr�sk�dban azonban k�t
-	<literal>-</literal> (k�t�jel) szimb�lumot
-	<emphasis>kell</emphasis> haszn�lnunk,
-	<emphasis>nem</emphasis> pedig egyet.  A Postscript �s
-	PDF v�ltozatokban az eredetileg k�t
-	k�t�jelet �sszevonj�k egyetlen hosszabb
-	k�t�jell�, ez�ltal elrontj�k az
-	im�nti p�ld�t.</para>
-
-      <para>A dokumentum HTML, sz�veges �s RTF
-	v�ltozatait ez nem �rinti.</para>
-    </important>
-    ]]>
-
     <para>Ha dolgoztunk m�r kor�bban HTML k�ddal,
       akkor el�fordulhat, hogy m�s meghat�roz�st
       l�ttunk a megjegyz�sekre.  Ez�rt
@@ -1814,7 +1789,7 @@ onsgmls:pr
 
     <para>A kor�bbiakban tapasztaltak szerint
       term�szetesen a jel�lt szakaszokat az SGML
-      r�szek�nt a <literal>&lt!</literal>
+      r�szek�nt a <literal>&lt;!</literal>
       szimb�lummal vezetj�k be.</para>
 
     <para>Ezt k�vet�en az els� sz�gletes
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 00a705f322..abc2388059 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -38,12 +38,6 @@
 
 .PATH: ${.CURDIR}/../../share/xml/glossary
 
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY=	yes
-
 MAINTAINER=	doc@FreeBSD.org
 
 DOC?= book
@@ -51,7 +45,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -280,30 +273,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index 7d236f68a6..02d63e3fd2 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2823,7 +2823,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
 	    <application>hostapd</application>
 	    elind�t�sa:</para>
 
-	  <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
 
 	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -6288,7 +6288,7 @@ cd /usr/src/etc; make distribution</programlisting>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="advanced-networking/isdn-bus"/>
+	    <imagedata fileref="advanced-networking/isdn-buse"/>
 	  </imageobject>
 
 	  <textobject>
@@ -8102,7 +8102,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	  k�vetkez� parancsot kell kiadnia a
 	  <hostid>szolgaltato.minta.org</hostid> g�pen:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>Ezt az adott g�phez tartoz�
 	  <devicename>carp</devicename> fel�lettel kell
diff --git a/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
index a6ee4e1726..144e36ad2b 100644
--- a/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
index cae9986ffd..927e9e5e7e 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1531,7 +1531,7 @@ drwxrwxrwt  10 root  wheel          512 Aug 31 01:49 tmp</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir1" format="EPS"/>
+	<imagedata fileref="install/example-dir1"/>
       </imageobject>
 
       <textobject>
@@ -1558,7 +1558,7 @@ drwxrwxrwt  10 root  wheel          512 Aug 31 01:49 tmp</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir2" format="EPS"/>
+	<imagedata fileref="install/example-dir2"/>
       </imageobject>
 
       <textobject>
@@ -1593,7 +1593,7 @@ drwxrwxrwt  10 root  wheel          512 Aug 31 01:49 tmp</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir3" format="EPS"/>
+	<imagedata fileref="install/example-dir3"/>
       </imageobject>
 
       <textobject>
@@ -1625,7 +1625,7 @@ drwxrwxrwt  10 root  wheel          512 Aug 31 01:49 tmp</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir4" format="EPS"/>
+	<imagedata fileref="install/example-dir4"/>
       </imageobject>
 
       <textobject>
@@ -1652,7 +1652,7 @@ drwxrwxrwt  10 root  wheel          512 Aug 31 01:49 tmp</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir5" format="EPS"/>
+	<imagedata fileref="install/example-dir5"/>
       </imageobject>
 
       <textobject>
@@ -2058,7 +2058,7 @@ drwxrwxrwt  10 root  wheel          512 Aug 31 01:49 tmp</screen>
 
     <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/disk-layout" format="EPS"/>
+	  <imagedata fileref="install/disk-layout"/>
 	</imageobject>
 
 	<textobject>
diff --git a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
index 95c00eb831..2fb59e89c3 100644
--- a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/book.xml b/hu_HU.ISO8859-2/books/handbook/book.xml
index 6528435392..4f2a5509fb 100644
--- a/hu_HU.ISO8859-2/books/handbook/book.xml
+++ b/hu_HU.ISO8859-2/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
index 8abc84d77d..4641eb9718 100644
--- a/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/chapters.ent b/hu_HU.ISO8859-2/books/handbook/chapters.ent
index 8eaef370e2..fb50794c97 100644
--- a/hu_HU.ISO8859-2/books/handbook/chapters.ent
+++ b/hu_HU.ISO8859-2/books/handbook/chapters.ent
@@ -15,231 +15,61 @@
      %SRCID%     1.39
 -->
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "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.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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
-  <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
-]]>
-<![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.xml">
-]]>
+  <!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">
+  <!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">
+  <!ENTITY chap.freebsd-glossary        "&freebsd-glossary;">
+  <!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/hu_HU.ISO8859-2/books/handbook/colophon.xml b/hu_HU.ISO8859-2/books/handbook/colophon.xml
index 63b68017ec..8c1e46030c 100644
--- a/hu_HU.ISO8859-2/books/handbook/colophon.xml
+++ b/hu_HU.ISO8859-2/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/config/chapter.xml b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
index e661ddaa21..f489ff510d 100644
--- a/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index 93566945fe..15b45b2f54 100644
--- a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1000,7 +1000,7 @@ Fetching 133 new ports or files... done.</screen>
 
     <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
 
-    <para>Ez a parancs let�lti a Portgy&251;jtem�ny
+    <para>Ez a parancs let�lti a Portgy�jtem�ny
       legfrissebb v�ltozat�t, majd
       kit�m�r�ti azt a helyi <filename
 	class="directory">/usr/ports</filename>
@@ -1663,98 +1663,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
       </sect3>
     </sect2>
-
-<![ IGNORE [
-    <sect2 id="docsnap">
-      <sect2info>
-	<authorgroup>
-	  <author>
-	    <firstname>Pav</firstname>
-	    <surname>Lucistnik</surname>
-	    <contrib>A sz�ks�ges inform�ci�kat
-	      szolg�ltatta: </contrib>
-	  </author>
-	</authorgroup>
-      </sect2info>
-
-      <title>A Docsnap haszn�lata</title>
-
-      <indexterm><primary>friss�t�s �s frissen
-	tart�s</primary></indexterm>
-
-      <indexterm>
-	<primary>Docsnap</primary>
-	<see>friss�t�s �s frissen tart�s</see>
-      </indexterm>
-
-      <para>A <application>Docsnap</application> a &os;
-	dokument�ci�j�nak egy viszonylag gyors
-	�s k�nny� friss�t�s�re
-	alkalmas &man.rsync.1; repository.  Az �n.
-	<quote><application>Docsnap</application> szerver</quote>
-	folyamatosan k�veti a dokument�ci�
-	forr�sainak v�ltoz�sait, majd minden
-	�r�ban el��ll�tja a HTML
-	v�ltozatukat.  A <application>Docsnap</application>
-	haszn�latakor nincs sz�ks�g�nk a
-	<filename role="package">textproc/docproj</filename> port
-	telep�t�s�re, mivel mindig csak a
-	m�r el��ll�tott
-	dokument�ci�t friss�tj�k.</para>
-
-      <para>A m�dszer haszn�lat�hoz mind�ssze
-	a <filename role="package">net/rsync</filename> port vagy csomag
-	telep�t�se sz�ks�geltetik.  Ezt a
-	k�vetkez� paranccsal tudjuk elv�gezni:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-	<para>A <application>Docsnap</application>
-	  m�dszer�t eredetileg a <filename
-	    class="directory">/usr/share/doc</filename>
-	  k�nyvt�rban t�rolt
-	  dokument�ci� friss�t�s�re
-	  fejlesztett�k ki, de a bemutatott p�ld�k
-	  tetsz�leges k�nyvt�rra alkalmazhat�ak.
-	  Felhaszn�l�i k�nyvt�rak
-	  eset�n m�g rendszergazdai jogosults�gokra
-	  sincs sz�ks�g�nk a feladat
-	  elv�gz�s�hez.</para>
-      </note>
-
-      <para>A dokument�ci� �gy az al�bbi
-	paranccsal friss�thet�:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <note>
-	<para>Jelenleg csak egyetlen <application>Docsnap</application>
-	  szerver �rhet� el, ez a fentebb is
-	  l�that�
-	  <hostid>docsnap.sk.FreeBSD.org</hostid>.</para>
-      </note>
-
-      <para>K�zvetlen�l ne haszn�ljuk a
-	<option>--delete</option> param�tert, mert a <command>make
-	installworld</command> parancs fut�sa k�zben olyan
-	elemeket is telep�thetett a <filename
-	  class="directory">/usr/share/doc</filename>
-	k�nyvt�rba, amelyek �gy
-	t�rl�dn�nek.  Helyette ink�bb �gy
-	haszn�ljuk a parancsot:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <para>Ha csak a dokument�ci� egy
-	r�sz�t akarjuk friss�teni,
-	p�ld�ul csak az angol nyelv�
-	v�ltozat�t, akkor pedig ezt a parancsot
-	haszn�ljuk:</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/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
index 08fcf9a485..504547e8b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
index 931ca60809..fd4c0ef218 100644
--- a/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -3936,17 +3936,6 @@ return billenty
 	  magunkat.</para>
 
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* Mit tegyek, ha nem k�sz�ltem fel a
-	  katasztr�f�ra?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
diff --git a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
index 2007d0b765..efffd80788 100644
--- a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
index 01b979b6de..b90c0555e6 100644
--- a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2610,6 +2610,10 @@
     <sect2 id="eresources-web-mirrors">
       <title>Hivatalos t�kr�z�sek</title>
 
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
index 7cdb7529f6..ea3716707a 100644
--- a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -314,7 +314,7 @@ minta        17547136       0 17547136     0%    /minta</screen>
 	  �llom�nyok hozhat�ak rajta l�tre
 	  vagy list�zhat� a tartalma:</para>
 
-	<screen>&prompt.root <userinput>cd /minta</userinput>
+	<screen>&prompt.root; <userinput>cd /minta</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch proba</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
index e1b72c2819..ec1793e84a 100644
--- a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -358,7 +358,7 @@
 	  kiad�sokban alap�rtelmez�s szerint
 	  tal�lhat� egy <filename>pf.conf</filename>
 	  �llom�ny az <filename
-	  role="directory">/etc</filename>
+	  class="directory">/etc</filename>
 	  k�nyvt�rban.</para>
       </note>
 
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
index ad674c1e9a..fdca1d5761 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index ea9be46471..99694a019f 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1320,7 +1320,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1371,14 +1371,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  haszn�lat�val).  K�r�lbel�l
 	  �gy n�z ki:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1393,7 +1387,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		sorsz�m�t jel�li.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>Most helyezz�k a CD-t a meghajt�ba, �s
 	  a PROM parancssor�ban pedig g�pelj�k be
@@ -1531,7 +1524,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1554,7 +1547,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1565,7 +1558,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1649,7 +1642,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1669,7 +1662,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1683,7 +1676,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1728,7 +1721,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1757,7 +1750,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1778,7 +1771,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1789,7 +1782,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1841,7 +1834,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2115,7 +2108,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2216,7 +2209,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2287,7 +2280,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2349,7 +2342,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2391,7 +2384,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2724,7 +2717,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2767,7 +2760,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2804,7 +2797,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2830,7 +2823,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2854,7 +2847,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2878,7 +2871,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2913,7 +2906,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2998,7 +2991,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3092,7 +3085,7 @@ a k
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3140,7 +3133,7 @@ a k
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -3447,7 +3440,7 @@ megpr
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3524,7 +3517,7 @@ megpr
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3800,7 +3793,7 @@ fogadjuk el.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3956,7 +3949,7 @@ fogadjuk el.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -4059,7 +4052,7 @@ fogadjuk el.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -4159,7 +4152,7 @@ szerkeszt
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/nfs-server-edit" format="PNG"/>
+	      <imagedata fileref="install/nfs-server-edit"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -4241,7 +4234,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver1" format="PNG"/>
+	    <imagedata fileref="install/console-saver1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4258,7 +4251,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver2" format="PNG"/>
+	    <imagedata fileref="install/console-saver2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4289,7 +4282,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3" format="PNG"/>
+	    <imagedata fileref="install/console-saver3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4308,7 +4301,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver4" format="PNG"/>
+	    <imagedata fileref="install/console-saver4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4384,7 +4377,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4399,7 +4392,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4414,7 +4407,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4522,7 +4515,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4538,7 +4531,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4559,7 +4552,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4574,7 +4567,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4593,7 +4586,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4610,7 +4603,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4678,7 +4671,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-cat" format="PNG"/>
+	    <imagedata fileref="install/pkg-cat"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4703,7 +4696,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-sel" format="PNG"/>
+	    <imagedata fileref="install/pkg-sel"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4744,7 +4737,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-install" format="PNG"/>
+	    <imagedata fileref="install/pkg-install"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4763,7 +4756,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-confirm" format="PNG"/>
+	    <imagedata fileref="install/pkg-confirm"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4830,7 +4823,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4846,7 +4839,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4978,7 +4971,7 @@ szerkeszt
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -5080,7 +5073,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -5202,7 +5195,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -5307,7 +5300,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -5392,7 +5385,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -5428,7 +5421,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
index afcd4fc3e6..be14b8e209 100644
--- a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
index 9391061d45..faddb51710 100644
--- a/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
     The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index 2b66058407..65684cb9b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
index 3e78307827..0772ecf635 100644
--- a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
index fa8a3fbfca..5599112f6b 100644
--- a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -880,14 +880,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -1241,7 +1241,7 @@ exit 0</programlisting>
 	    k�vetkez�:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
index 971f865e29..d8b479e2bf 100644
--- a/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index 1ac404ad39..d616070a3a 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2241,11 +2241,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	  el:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>A <application>sendmail</application>
 	  ford�t�sa eset�n semmilyen
@@ -2571,7 +2571,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2583,7 +2583,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2634,7 +2634,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2702,7 +2702,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2729,7 +2729,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2742,7 +2742,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2758,7 +2758,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2779,7 +2779,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
index 99cdd2a284..a21d3085ab 100644
--- a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -282,6 +282,10 @@
       m�dszereket a nev�k ut�n
       z�r�jelben k�z�lj�k.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2999,6 +3003,10 @@ doc/zh_*</screen>
       <para>A &os; <link linkend="cvsup">CVSup</link> szerverei az
 	al�bbi oldalakon �rhet�ek el:</para>
 
+      &chap.mirrors.cvsup.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.mirrors.cvsup.inc;
 
     </sect2>
diff --git a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
index 19603a94df..afb85355f7 100644
--- a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
index 9dfe80d894..f09b877955 100644
--- a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index aaf079153b..e9cc9cab89 100644
--- a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
index 86df55f0db..688945f54c 100644
--- a/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index a8d8ad1e16..2d684502b3 100644
--- a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/preface/preface.xml b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
index 96a205cf0c..9b9f015c0f 100644
--- a/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
+++ b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      $FreeBSD$
 -->
diff --git a/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
index 059b6d216f..548546f0ea 100644
--- a/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/security/chapter.xml b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
index 8e0e5e2f98..1b536465be 100644
--- a/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
index e92c197311..e1371dfc67 100644
--- a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/users/chapter.xml b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
index 1e046a17b7..6e540f5e58 100644
--- a/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
index e03ef42112..032905b69e 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The Vinum Volume Manager
      By Greg Lehey (grog at lemis dot com)
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
index fce0116b0a..c299662d14 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
index 9b2dcc7874..1c1af26583 100644
--- a/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/hu_HU.ISO8859-2/share/xml/bibliography.xml b/hu_HU.ISO8859-2/share/xml/bibliography.xml
index 2a73c12864..47ed73976a 100644
--- a/hu_HU.ISO8859-2/share/xml/bibliography.xml
+++ b/hu_HU.ISO8859-2/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
   $FreeBSD$
 -->
diff --git a/hu_HU.ISO8859-2/share/xml/catalog b/hu_HU.ISO8859-2/share/xml/catalog
index b7bb103082..2422c1740c 100644
--- a/hu_HU.ISO8859-2/share/xml/catalog
+++ b/hu_HU.ISO8859-2/share/xml/catalog
@@ -1,61 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Hungarian specific ...................................................... --
-
-  -- $FreeBSD$ --
-
-  -- %SOURCE%    share/xml/catalog
-  -- %SRCID%     1.32
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
-	"freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
-	"teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
-	"translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/hu_HU.ISO8859-2/share/xml/catalog.xml b/hu_HU.ISO8859-2/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/hu_HU.ISO8859-2/share/xml/catalog.xml
+++ b/hu_HU.ISO8859-2/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent
index c16d43fd24..97b921021f 100644
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,30 @@
      %SRCID%	1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+	"freebsd.ent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
+	"translators.ent">
 %translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
+	"glossary.ent">
 %glossary;
diff --git a/hu_HU.ISO8859-2/share/xml/freebsd.dsl b/hu_HU.ISO8859-2/share/xml/freebsd.dsl
index cf3b08fe2c..36f1c23016 100644
--- a/hu_HU.ISO8859-2/share/xml/freebsd.dsl
+++ b/hu_HU.ISO8859-2/share/xml/freebsd.dsl
@@ -8,43 +8,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-
-      <![ %output.html; [
-	(define ($email-footer$)
-          (make sequence
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Ha k�rd�se van a FreeBSD-vel kapcsolatban, a k�vetkez�
-		  c�mre �rhat (angolul): <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:freebsd-questions@FreeBSD.org"))
-                  (literal "freebsd-questions@FreeBSD.org>."))
-                (make empty-element gi: "br")
-                (literal "Ha ezzel a dokumentummal kapcsolatban van k�rd�se,
-		  k�rj�k erre a c�mre �rjon: <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:gabor@FreeBSD.org"))
-                  (literal "gabor@FreeBSD.org>."))
-	        ))))
-
-	(define (local-hu-label-title-sep)
-	  (list
-	    (list (normalize "caution")		": ")
-	    (list (normalize "warning")		": ")
-	  ))
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/hu_HU.ISO8859-2/share/xml/freebsd.ent b/hu_HU.ISO8859-2/share/xml/freebsd.ent
index be9b49e4e5..0f05aae175 100644
--- a/hu_HU.ISO8859-2/share/xml/freebsd.ent
+++ b/hu_HU.ISO8859-2/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
diff --git a/hu_HU.ISO8859-2/share/xml/l10n.ent b/hu_HU.ISO8859-2/share/xml/l10n.ent
index fcf514af55..5412f263c2 100644
--- a/hu_HU.ISO8859-2/share/xml/l10n.ent
+++ b/hu_HU.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (hu).
 
diff --git a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
index f6d57d919b..61952e93c8 100644
--- a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
+++ b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names of FreeBSD mailing lists and related software.
 
diff --git a/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl b/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
index 67da8c7b18..51ce50a143 100644
--- a/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
+++ b/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
@@ -14,6 +14,9 @@
   exclude-result-prefixes="cvs"
   extension-element-prefixes="str">
 
+  <!-- must point to master copy, doc/share/xml/mirrors-master.xsl -->
+  <xsl:import href="../../../share/xml/mirrors-master.xsl" />
+
   <xsl:variable name="svnKeyword">
     <xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
   </xsl:variable>
@@ -23,15 +26,8 @@
   </xsl:variable>
 
   <xsl:output type="xml" encoding="iso-8859-2"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
-  <!-- these params should be externally bound. The values
-       here are not used actually -->
-  <xsl:param name="type" select="''" />
-  <xsl:param name="proto" select="''" />
-  <xsl:param name="target" select="''" />
-
   <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
 
   <!--
@@ -39,29 +35,8 @@
 
         * "mirrors-lastmodified"
         * "mirrors-docbook-contact"
-        * "mirrors-docbook-country-index-all"
-        * "mirrors-docbook-variablelist"
-        * "mirrors-docbook-itemizedlist"
   -->
 
-  <xsl:template match="/">
-    <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
-	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
-	<xsl:call-template name="mirrors-docbook-variablelist" />
-      </xsl:when>
-      <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
-	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
-	<xsl:call-template name="mirrors-docbook-itemizedlist" />
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="'*** processing error ***'" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
   <!-- template: "mirrors-docbook-contact" -->
 
   <xsl:template name="mirrors-docbook-contact">
@@ -77,199 +52,4 @@
     <xsl:text>D�tum: </xsl:text>
     <xsl:call-template name="mirrors-lastmodified-utc" />
   </xsl:template>
-
-  <!-- template: "mirrors-docbook-country-index-all" -->
-
-  <xsl:template name="mirrors-docbook-country-index-all">
-    <para>
-      <xsl:for-each select="mirrors/entry[country/@role = 'primary'
-	                    and host[@type = $type]]">
-	<xsl:call-template name="mirrors-docbook-country-index">
-	  <xsl:with-param name="mirrors-docbook-country-index-without-period" select="'true'" />
-	</xsl:call-template>
-      </xsl:for-each>
-
-      <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
-	                    host[@type = $type]]">
-	<xsl:sort select="country/@sortkey" data-type="number"/>
-	<xsl:sort select="country" />
-
-	<xsl:call-template name="mirrors-docbook-country-index">
-	  <xsl:with-param name="mirrors-docbook-country-index-without-period" select="'false'" />
-	</xsl:call-template>
-      </xsl:for-each>
-    </para>
-  </xsl:template>
-
-  <xsl:template name="mirrors-docbook-country-index">
-    <xsl:param name="mirrors-docbook-country-index-without-period" />
-    <link>
-      <xsl:attribute name="linkend">
-	<xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
-      </xsl:attribute>
-      <xsl:value-of select="country" />
-    </link>
-    <xsl:choose>
-      <xsl:when test='$mirrors-docbook-country-index-without-period != "true" and
-	position() = last()'><xsl:text>.</xsl:text></xsl:when>
-      <xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- template: "mirrors-docbook-variablelist" -->
-
-  <xsl:template name="mirrors-docbook-variablelist">
-    <variablelist>
-      <xsl:for-each select="mirrors/entry[country/@role = 'primary' and
-	                    host[@type = $type]]">
-	<xsl:call-template name="mirrors-docbook-variablelist-entry" />
-      </xsl:for-each>
-
-      <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
-	                    host[@type = $type]]">
-	<xsl:sort select="country/@sortkey" data-type="number"/>
-	<xsl:sort select="country" />
-
-	<xsl:call-template name="mirrors-docbook-variablelist-entry" />
-      </xsl:for-each>
-    </variablelist>
-  </xsl:template>
-
-  <xsl:template name="mirrors-docbook-variablelist-entry">
-    <varlistentry>
-      <term>
-	<anchor>
-	  <xsl:attribute name="id">
-	    <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
-	  </xsl:attribute>
-	</anchor>
-	<xsl:value-of select="country" />
-      </term>
-
-      <listitem>
-	<xsl:if test="$type = 'ftp' and email">
-	  <xsl:call-template name="mirrors-docbook-contact">
-	    <xsl:with-param name="email" select="email" />
-	  </xsl:call-template>
-	</xsl:if>
-
-	<itemizedlist>
-	  <xsl:for-each select="host[@type = $type]">
-	    <listitem>
-	      <para>
-		<xsl:choose>
-		  <xsl:when test="url[@proto = $proto]">
-		    <xsl:for-each select="url[@proto = $proto]">
-		      <ulink>
-			<xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
-			<xsl:value-of select="name" />
-		      </ulink>
-		    </xsl:for-each>
-
-		    <xsl:value-of select="' (ftp'" />
-
-		    <xsl:choose>
-		      <xsl:when test="url[@proto != $proto]">
-			<xsl:for-each select="url[@proto != $proto]">
-			  <xsl:value-of select="' / '" />
-			  <xsl:choose>
-			    <xsl:when test=". != ''">
-			      <ulink>
-				<xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
-				<xsl:value-of select="@proto" />
-			      </ulink>
-			    </xsl:when>
-			    <xsl:otherwise>
-			      <xsl:value-of select="@proto" />
-			    </xsl:otherwise>
-			  </xsl:choose>
-			</xsl:for-each>
-		      </xsl:when>
-		    </xsl:choose>
-
-		    <xsl:value-of select="') '" />
-		  </xsl:when>
-
-		  <xsl:otherwise>
-		    <xsl:value-of select="name" />
-		  </xsl:otherwise>
-		</xsl:choose>
-	      </para>
-	    </listitem>
-	  </xsl:for-each>
-	</itemizedlist>
-      </listitem>
-    </varlistentry>
-  </xsl:template>
-
-  <!-- template: "mirrors-docbook-itemizedlist" -->
-
-  <xsl:template name="mirrors-docbook-itemizedlist">
-    <itemizedlist>
-      <xsl:for-each select="mirrors/entry[country/@role = 'primary' and
-	                    host[@type = $type]]">
-	<xsl:call-template name="mirrors-docbook-itemizedlist-listitem" />
-      </xsl:for-each>
-
-      <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
-	                    host[@type = $type]]">
-	<xsl:sort select="country/@sortkey" data-type="number"/>
-	<xsl:sort select="country" />
-
-	<xsl:call-template name="mirrors-docbook-itemizedlist-listitem" />
-      </xsl:for-each>
-    </itemizedlist>
-  </xsl:template>
-
-  <xsl:template name="mirrors-docbook-itemizedlist-listitem">
-    <listitem>
-      <anchor>
-	<xsl:attribute name="id">
-	  <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
-	</xsl:attribute>
-      </anchor>
-
-      <para><xsl:value-of select="country" /></para>
-
-      <itemizedlist>
-	<xsl:for-each select="host[@type = $type]">
-	  <listitem>
-	    <para>
-	      <xsl:choose>
-		<xsl:when test="url[@proto = $proto]">
-		  <xsl:for-each select="url[@proto = $proto]">
-		    <ulink>
-		      <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
-		      <xsl:value-of select="name" />
-		    </ulink>
-		  </xsl:for-each>
-
-		  <xsl:if test="url[
-		    contains(@proto, 'ftpv6')
-		    or contains(@proto, 'httpv6')
-		    or contains(@proto, 'rsyncv6')]">
-		    <xsl:text> (IPv6)</xsl:text>
-		  </xsl:if>
-		</xsl:when>
-
-		<xsl:otherwise>
-		  <xsl:value-of select="name" />
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </para>
-	  </listitem>
-	</xsl:for-each>
-      </itemizedlist>
-    </listitem>
-  </xsl:template>
-
-  <!-- template: "mirrors-lastmodified-utc" -->
-
-  <xsl:template name="mirrors-lastmodified-utc">
-    <xsl:param name="basestr" select="substring-after(substring-after($date, ',v '), ' ')" />
-    <xsl:param name="datestr" select="substring-before($basestr, ' ')" />
-    <xsl:param name="timestr" select="substring-before(substring-after($basestr, ' '), ' ')" />
-
-    <xsl:value-of select="concat($datestr, ' ', $timestr, ' UTC')" />
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xml/newsgroups.ent b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
index b828bf5d85..7df30d0c4f 100644
--- a/hu_HU.ISO8859-2/share/xml/newsgroups.ent
+++ b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/hu_HU.ISO8859-2/share/xml/teams.ent b/hu_HU.ISO8859-2/share/xml/teams.ent
index cb1aa614f6..9c3d708ea4 100644
--- a/hu_HU.ISO8859-2/share/xml/teams.ent
+++ b/hu_HU.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index c39ebc2e4f..0047602504 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/hu_HU.ISO8859-2/share/xml/translators.ent b/hu_HU.ISO8859-2/share/xml/translators.ent
index ebecb0c89f..e4fee6f43b 100644
--- a/hu_HU.ISO8859-2/share/xml/translators.ent
+++ b/hu_HU.ISO8859-2/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
       The FreeBSD Hungarian Documentation Project
 
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..e43c36bdc3
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='iso-8859-2'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Ha k�rd�se van a FreeBSD-vel kapcsolatban, a
+    k�vetkez� c�mre �rhat (angolul):
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    Ha ezzel a dokumentummal kapcsolatban van k�rd�se, k�rj�k erre a c�mre �rjon:
+    &lt;<a href="mailto:gabor@FreeBSD.org">gabor@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/hu_HU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.xml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
index 192c27e6f3..c6c12cc153 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/article.xml
+++ b/it_IT.ISO8859-15/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Italian Documentation Project
@@ -283,25 +280,25 @@
       <itemizedlist>
         <listitem>
           <para>ncvs@ - a proposito di <filename
-              role="directory">/home/ncvs</filename>, il repository dei
+              class="directory">/home/ncvs</filename>, il repository dei
             src</para>
         </listitem>
 
         <listitem>
           <para>pcvs@ - a proposito di <filename
-              role="directory">/home/pcvs</filename>, il repository dei
+              class="directory">/home/pcvs</filename>, il repository dei
             port</para>
         </listitem>
 
         <listitem>
           <para>dcvs@ - a proposito di <filename
-              role="directory">/home/dcvs</filename>, il repository dei
+              class="directory">/home/dcvs</filename>, il repository dei
             doc</para>
         </listitem>
 
         <listitem>
           <para>projcvs@ - a proposito di <filename
-              role="directory">/home/projcvs</filename>, il repository dei
+              class="directory">/home/projcvs</filename>, il repository dei
             progetti di terze parti</para>
         </listitem>
       </itemizedlist>
diff --git a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
index 47260430b8..c21bfe494e 100644
--- a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
+++ b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
index 85e05a8669..e6c7a87667 100644
--- a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
+++ b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/new-users/article.xml b/it_IT.ISO8859-15/articles/new-users/article.xml
index d21aa73adb..e4cfb54492 100644
--- a/it_IT.ISO8859-15/articles/new-users/article.xml
+++ b/it_IT.ISO8859-15/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.xml b/it_IT.ISO8859-15/articles/vm-design/article.xml
index 481ba23bbc..aaccaa4e5d 100644
--- a/it_IT.ISO8859-15/articles/vm-design/article.xml
+++ b/it_IT.ISO8859-15/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Italian Documentation Project
@@ -234,7 +231,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig1" format="EPS"/>
+        <imagedata fileref="fig1"/>
       </imageobject>
 
       <textobject>
@@ -260,7 +257,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig2" format="EPS"/>
+        <imagedata fileref="fig2"/>
       </imageobject>
 
       <textobject>
@@ -281,7 +278,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig3" format="EPS"/>
+        <imagedata fileref="fig3"/>
       </imageobject>
 
       <textobject>
@@ -316,7 +313,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig4" format="EPS"/>
+        <imagedata fileref="fig4"/>
       </imageobject>
 
       <textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index cdb9231eca..185b307110 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -35,7 +35,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF= yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -248,30 +247,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
index ed63027375..292ce6984b 100644
--- a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/audit/chapter.xml b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
index 134f42f4ec..2621b4d925 100644
--- a/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
index dda1e24083..1058ad1fb6 100644
--- a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -1028,7 +1028,7 @@ total 530
                 memoria � montato in
                 <filename class="directory">/var</filename>.
                 Questo pu� essere automatizzato usando le variabili
-                relative a varmfs di &man.rc.conf.5 (o con un entry in
+                relative a varmfs di &man.rc.conf.5; (o con un entry in
                 <filename>/etc/fstab</filename>; consultare
                 &man.mdmfs.8;).</entry>
             </row>
@@ -1134,7 +1134,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="install/example-dir1" format="EPS"/>
+        <imagedata fileref="install/example-dir1"/>
       </imageobject>
 
       <textobject>
@@ -1154,7 +1154,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="install/example-dir2" format="EPS"/>
+        <imagedata fileref="install/example-dir2"/>
       </imageobject>
 
       <textobject>
@@ -1183,7 +1183,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="install/example-dir3" format="EPS"/>
+        <imagedata fileref="install/example-dir3"/>
       </imageobject>
 
       <textobject>
@@ -1210,7 +1210,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="install/example-dir4" format="EPS"/>
+        <imagedata fileref="install/example-dir4"/>
       </imageobject>
 
       <textobject>
@@ -1236,7 +1236,7 @@ total 530
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="install/example-dir5" format="EPS"/>
+        <imagedata fileref="install/example-dir5"/>
       </imageobject>
 
       <textobject>
@@ -1556,7 +1556,7 @@ total 530
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="install/disk-layout" format="EPS"/>
+          <imagedata fileref="install/disk-layout"/>
         </imageobject>
 
         <textobject>
diff --git a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
index 567fe467c7..2a0ee13a6b 100644
--- a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/book.xml b/it_IT.ISO8859-15/books/handbook/book.xml
index 5ac5e126b2..67a381dbc2 100644
--- a/it_IT.ISO8859-15/books/handbook/book.xml
+++ b/it_IT.ISO8859-15/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 
diff --git a/it_IT.ISO8859-15/books/handbook/boot/chapter.xml b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
index 3da9ea9e16..4e0ad5bb75 100644
--- a/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/chapters.ent b/it_IT.ISO8859-15/books/handbook/chapters.ent
index 0267af8510..9ceb77664e 100644
--- a/it_IT.ISO8859-15/books/handbook/chapters.ent
+++ b/it_IT.ISO8859-15/books/handbook/chapters.ent
@@ -13,231 +13,61 @@
      Original revision: 1.37
 -->
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "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.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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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/it_IT.ISO8859-15/books/handbook/colophon.xml b/it_IT.ISO8859-15/books/handbook/colophon.xml
index 12584e1292..f2164d55cc 100644
--- a/it_IT.ISO8859-15/books/handbook/colophon.xml
+++ b/it_IT.ISO8859-15/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/config/chapter.xml b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
index 301ee5cbf4..ed4c936181 100644
--- a/it_IT.ISO8859-15/books/handbook/config/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -412,7 +412,7 @@ stop)
         kill -9 `cat /var/run/utility.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" &gt;&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
@@ -876,7 +876,7 @@ sshd is running as pid 433.</screen>
       &man.rc.8;  e &man.rc.subr.8;.  Se sei interessato
       a scrivere un tuo script <filename>rc.d</filename> o
       a migliorarne uno esisente, ti pu� essere utile
-      <ulink url="&url.articles.rc-scripting">questo
+      <ulink url="&url.articles.rc-scripting;">questo
       articolo</ulink>.</para>
   </sect1>
 
diff --git a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
index cf65803818..1f4591d92d 100644
--- a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
index 527a64779f..2ea19b4d15 100644
--- a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/disks/chapter.xml b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
index d1ca1c8bfd..8ddc5083f2 100644
--- a/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
index 32bcf454c5..bc25ce5876 100644
--- a/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -1900,6 +1900,10 @@
   <sect1 id="eresources-web">
     <title>Server World Wide Web</title>
 
+    &chap.eresources.www.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.eresources.www.inc;
   </sect1>
 
diff --git a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
index 9a1175e512..22a53ccfbd 100644
--- a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
index db18e85c1d..b4f7a63e45 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -91,7 +91,7 @@
     <para>GEOM permette l'accesso e il controllo alle classi &mdash; Master Boot
       Records, <acronym>BSD</acronym> labels, ecc &mdash; attraverso l'uso
       di forniture o di di files speciali in <filename
-        role="directory">/dev</filename>.  Mediante il supporto di vari
+        class="directory">/dev</filename>.  Mediante il supporto di vari
       software di configurazione<acronym>RAID</acronym> , GEOM fornisce un
       accesso "trasparente"  al sistema operativo
       e alle utilit� di sistema.</para>
@@ -167,7 +167,7 @@
         <para>Assicurati che esiste una appropriato mount point.  Se il volume
           in questione diventer� una partizione di root, allora usa
           temporaneamente un mount point diverso,ad esempio <filename
-            role="directory">/mnt</filename>:</para>
+            class="directory">/mnt</filename>:</para>
 
         <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
@@ -199,7 +199,7 @@
 
       <step>
         <para>Questa procedura dovrebbe aver creato altri due device in
-          <filename role="directory">/dev/stripe</filename> in aggiunta a
+          <filename class="directory">/dev/stripe</filename> in aggiunta a
           <devicename>st0</devicename>.   Nella fattispecie
           <devicename>st0a</devicename> e <devicename>st0c</devicename>.
           Ora bisogna creare un filesystem nel device
@@ -261,7 +261,7 @@
     <para>Comincia installando &os; sul primo disco creando solamente due
       partizioni.  Una dovrebbe essere una partizione di swap, pari al doppio
       della <acronym>RAM</acronym> presente nel sistema e il resto dello spazio
-      dedicato al filesystem di root (<filename role="directory">/</filename>).
+      dedicato al filesystem di root (<filename class="directory">/</filename>).
       � possibile creare partizioni separate per gli altri mount points,
       aumentando parecchio la difficolt� di realizzazione del progetto;
       questo � dovuto alla necessit� di alterare manualmente i
@@ -290,7 +290,7 @@ Done.</screen>
       <para>Questo comando dovrebbe ora avere creato i nodi di
         device<devicename>gm0</devicename>,<devicename>gm0s1</devicename>,
 	<devicename>gm0s1a</devicename> e <devicename>gm0s1c</devicename> nella
-	directory <filename role="directory">/dev/mirror</filename>.</para>
+	directory <filename class="directory">/dev/mirror</filename>.</para>
     </note>
 
     <para>Crea una label generica e un codice di boot nel device
@@ -319,7 +319,7 @@ Done.</screen>
     <para>Questo dovrebbe causare la visualizzazione di un bel p� di
       numeri e informazioni varie da parte del sistema.  � corretto.
       Esamina bene lo schermo per vedere se ci sono messaggi di errore e monta
-      il device in <filename role="directory">/mnt</filename>:</para>
+      il device in <filename class="directory">/mnt</filename>:</para>
 
     <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
 
@@ -330,7 +330,7 @@ Done.</screen>
       codice di boot.  In caso contrario il fallimento �
       garantito.</para>
 
-    <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
+    <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt &amp;&amp; restore -r -v -f-)</userinput></screen>
 
     <para>Questo deve essere fatto per ciascun filesystem.  Disponi
       semplicemente il filesystem appropriato nella posizione corretta quando
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index 1b14263f69..3fdb9b38d6 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -105,7 +105,7 @@
         processo venga completato con successo, quindi potrai avere bisogno
         di modificare la tua configurazione.</para>
 
-      <para>Se hai gi&agrave un altro sistema operativo installato, ad
+      <para>Se hai gi� un altro sistema operativo installato, ad
         esempio &windows; o Linux, potrebbe essere una buona idea vedere come
         � configurato l'hardware su quei sistemi operativi.  Se non sei
         sicuro della configurazione usata da una certa scheda di espansione,
@@ -683,7 +683,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           <para>Su FreeBSD, <filename>/dev/fd0</filename> �
             riferito al primo floppy disk (il dispositivo
             <devicename>A:</devicename>).  <filename>/dev/fd1</filename> sarebbe
-            il dispositivo <devicename>B:</devicename>, e cos&iacute via.  Altre
+            il dispositivo <devicename>B:</devicename>, e cosi via.  Altre
             varianti &unix; potrebbero avere nomi differenti per i dispositivi
             floppy disk, e se necessario consulta la documentazione del sistema
             che stai usando.</para>
@@ -1022,7 +1022,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+            <imagedata fileref="install/sysinstall-exit"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1077,7 +1077,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="install/main1" format="PNG"/>
+          <imagedata fileref="install/main1"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -1093,7 +1093,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/main-doc" format="PNG"/>
+            <imagedata fileref="install/main-doc"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1105,7 +1105,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/docmenu1" format="PNG"/>
+            <imagedata fileref="install/docmenu1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1135,7 +1135,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/main-keymap" format="PNG"/>
+            <imagedata fileref="install/main-keymap"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1156,7 +1156,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/keymap" format="PNG"/>
+            <imagedata fileref="install/keymap"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1173,7 +1173,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/main-options" format="PNG"/>
+            <imagedata fileref="install/main-options"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1183,7 +1183,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/options" format="PNG"/>
+            <imagedata fileref="install/options"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1217,7 +1217,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/main-std" format="PNG"/>
+            <imagedata fileref="install/main-std"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1400,7 +1400,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+            <imagedata fileref="install/fdisk-drive1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1470,7 +1470,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+            <imagedata fileref="install/fdisk-edit1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1514,7 +1514,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+            <imagedata fileref="install/fdisk-edit2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1556,7 +1556,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/boot-mgr" format="PNG"/>
+            <imagedata fileref="install/boot-mgr"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1587,7 +1587,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+            <imagedata fileref="install/fdisk-drive2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1830,7 +1830,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+            <imagedata fileref="install/disklabel-ed1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1858,7 +1858,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-          <imagedata fileref="install/disklabel-auto" format="PNG"/>
+          <imagedata fileref="install/disklabel-auto"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1897,7 +1897,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disklabel-root1" format="PNG"/>
+            <imagedata fileref="install/disklabel-root1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1915,7 +1915,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disklabel-root2" format="PNG"/>
+            <imagedata fileref="install/disklabel-root2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1932,7 +1932,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disklabel-fs" format="PNG"/>
+            <imagedata fileref="install/disklabel-fs"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1949,7 +1949,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disklabel-root3" format="PNG"/>
+            <imagedata fileref="install/disklabel-root3"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -1972,7 +1972,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+            <imagedata fileref="install/disklabel-ed2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2033,7 +2033,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/dist-set" format="PNG"/>
+            <imagedata fileref="install/dist-set"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2089,7 +2089,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/dist-set2" format="PNG"/>
+            <imagedata fileref="install/dist-set2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2121,7 +2121,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="install/media" format="PNG"/>
+          <imagedata fileref="install/media"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -2313,7 +2313,7 @@ installation menus to retry whichever operations have failed.
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/ed0-conf" format="PNG"/>
+            <imagedata fileref="install/ed0-conf"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2360,7 +2360,7 @@ installation menus to retry whichever operations have failed.
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/ed0-conf2" format="PNG"/>
+            <imagedata fileref="install/ed0-conf2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2534,7 +2534,7 @@ use the current settings.
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+            <imagedata fileref="install/edit-inetd-conf"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2584,7 +2584,7 @@ use the current settings.
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="install/ftp-anon1" format="PNG"/>
+              <imagedata fileref="install/ftp-anon1"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -2634,7 +2634,7 @@ Upload subdirectory:
 
           <mediaobject>
             <imageobject>
-              <imagedata fileref="install/ftp-anon2" format="PNG"/>
+              <imagedata fileref="install/ftp-anon2"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -2692,7 +2692,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"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -2839,7 +2839,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/security" format="PNG"/>
+            <imagedata fileref="install/security"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2918,7 +2918,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/console-saver1" format="PNG"/>
+            <imagedata fileref="install/console-saver1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2933,7 +2933,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/console-saver2" format="PNG"/>
+            <imagedata fileref="install/console-saver2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2954,7 +2954,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/console-saver3" format="PNG"/>
+            <imagedata fileref="install/console-saver3"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -2968,7 +2968,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/console-saver4" format="PNG"/>
+            <imagedata fileref="install/console-saver4"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3013,7 +3013,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/timezone1" format="PNG"/>
+            <imagedata fileref="install/timezone1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3026,7 +3026,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/timezone2" format="PNG"/>
+            <imagedata fileref="install/timezone2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3039,7 +3039,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/timezone3" format="PNG"/>
+            <imagedata fileref="install/timezone3"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3098,7 +3098,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mouse1" format="PNG"/>
+            <imagedata fileref="install/mouse1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3111,7 +3111,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mouse2" format="PNG"/>
+            <imagedata fileref="install/mouse2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3127,7 +3127,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mouse3" format="PNG"/>
+            <imagedata fileref="install/mouse3"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3140,7 +3140,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mouse4" format="PNG"/>
+            <imagedata fileref="install/mouse4"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3155,7 +3155,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mouse5" format="PNG"/>
+            <imagedata fileref="install/mouse5"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3169,7 +3169,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mouse6" format="PNG"/>
+            <imagedata fileref="install/mouse6"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3230,7 +3230,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/net-config-menu1" format="PNG"/>
+            <imagedata fileref="install/net-config-menu1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3261,9 +3261,9 @@ To change any of these settings later, edit /etc/rc.conf
         specifica il file di <filename>log</filename>; di default; comunque,
         quando viene usato <literal>syslogd</literal> tutte le attivit�
         di log saranno inviate al demone di log del sistema. La directory
-        <filename role="directory">/host</filename> � usata per
+        <filename class="directory">/host</filename> � usata per
         montare un filesystem esportato da un host remoto, mentre
-        la directory <filename role="directory">/net</filename> �
+        la directory <filename class="directory">/net</filename> �
         usata per montare un filesystem esportato da un indirizzo
         <acronym>IP</acronym>.  Il file <filename>/etc/amd.map</filename>
         definisce le opzioni di default per le esportazioni
@@ -3302,7 +3302,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mta-main" format="PNG"/>
+            <imagedata fileref="install/mta-main"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3356,7 +3356,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/ntp-config" format="PNG"/>
+            <imagedata fileref="install/ntp-config"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3383,7 +3383,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/net-config-menu2" format="PNG"/>
+            <imagedata fileref="install/net-config-menu2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -3513,7 +3513,7 @@ To change any of these settings later, edit /etc/rc.conf
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/xf86setup" format="PNG"/>
+            <imagedata fileref="install/xf86setup"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4035,7 +4035,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/desktop" format="PNG"/>
+            <imagedata fileref="install/desktop"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4073,7 +4073,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/pkg-cat" format="PNG"/>
+            <imagedata fileref="install/pkg-cat"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4095,7 +4095,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/pkg-sel" format="PNG"/>
+            <imagedata fileref="install/pkg-sel"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4123,7 +4123,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/pkg-install" format="PNG"/>
+            <imagedata fileref="install/pkg-install"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4138,7 +4138,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/pkg-confirm" format="PNG"/>
+            <imagedata fileref="install/pkg-confirm"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4180,7 +4180,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/adduser1" format="PNG"/>
+            <imagedata fileref="install/adduser1"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4193,7 +4193,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/adduser2" format="PNG"/>
+            <imagedata fileref="install/adduser2"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4297,7 +4297,7 @@ failed.  Would you like to try again?
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/adduser3" format="PNG"/>
+            <imagedata fileref="install/adduser3"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4364,7 +4364,7 @@ Retype new password :</screen>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/mainexit" format="PNG"/>
+            <imagedata fileref="install/mainexit"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -4916,7 +4916,7 @@ Please press any key to reboot.</screen>
           <screen>&prompt.root; <userinput>mount /dev/fd0 /mnt</userinput></screen>
 
           <para>Adesso che hai il tuo floppy montato, portati nella directory
-            <filename role="directory">/mnt</filename>:</para>
+            <filename class="directory">/mnt</filename>:</para>
 
           <screen>&prompt.root; <userinput>cd /mnt</userinput></screen>
 
@@ -5159,7 +5159,7 @@ Please press any key to reboot.</screen>
             necessario.</para>
 
           <para>Usa l'immagine del disco uno se vuoi installare una release
-            di &os e se vuoi anche un
+            di &os; e se vuoi anche un
             modesto assortimento di package di terze parti.</para>
 
           <para>Le altre immagini sono utili, ma non essenziali,
diff --git a/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
index 14df612ca5..ec4ce89f21 100644
--- a/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -732,7 +732,7 @@
 
       <para>Quel codice nel nostro albero dei sorgenti che cade sotto
         la GNU General Public Licence (GPL) o la GNU Lesser General Public
-        License (LGPL) ha un po' pi&ugrave di vincoli, sebbene
+        License (LGPL) ha un po' pi� di vincoli, sebbene
         almeno dal lato di rafforzare l'accesso piuttosto che l'opposto.
         Date le complessit� aggiuntive che possono
         risultare dall'uso commerciale di software GPL noi preferiamo,
@@ -932,7 +932,7 @@
         &i486;, &pentium;, &pentium;&nbsp;Pro, &celeron;, &pentium;&nbsp;II,
         &pentium;&nbsp;III, &pentium;&nbsp;4 (o compatibili), &xeon;, DEC
         <trademark>Alpha</trademark> e Sun &ultrasparc;.
-        &Egrave basato principalmente su software del gruppo CSRG della
+        � basato principalmente su software del gruppo CSRG della
         U.C. Berkeley, con alcuni miglioramenti presi da NetBSD, OpenBSD,
         386BSD, e dalla Free Software Foundation.</para>
 
diff --git a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
index caca9ab330..10885db33d 100644
--- a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
     The FreeBSD Italian Documentation Project
 
@@ -267,10 +267,10 @@
           il miglior punto in cui iniziare.  Questo sar� il punto
           in cui la jail risieder� fisicamente nel file system del
           sistema host.  Una buona scelta pu� essere
-          <filename role="directory">/usr/jail/<replaceable>nomejail</replaceable></filename>,
+          <filename class="directory">/usr/jail/<replaceable>nomejail</replaceable></filename>,
           dove <replaceable>nomejail</replaceable> � il nome host
           che identifica la jail.  Il file system
-          <filename role="directory">/usr/</filename> in genere ha abbastanza
+          <filename class="directory">/usr/</filename> in genere ha abbastanza
           spazio vuoto per il file system delle jail, che per una
           jail <quote>completa</quote> �, in pratica, una replica di
           ogni file presente in una installazione base di &os;</para>
@@ -290,10 +290,10 @@
           <application>make</application> installa ogni file di
           configuazione richiesto.  In parole povere, installa ogni
           file di
-          <filename role="directory">/usr/src/etc/</filename> nella
-          directory <filename role="directory">/etc</filename>
+          <filename class="directory">/usr/src/etc/</filename> nella
+          directory <filename class="directory">/etc</filename>
           dell'ambiente jail:
-          <filename role="directory">$D/etc/</filename>.</para>
+          <filename class="directory">$D/etc/</filename>.</para>
       </callout>
 
       <callout arearefs="jaildevfs">
@@ -613,41 +613,41 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
         <itemizedlist>
           <listitem>
             <para>Ogni jail sar� montata sotto la directory
-              <filename role="directory">/home/j</filename>.</para>
+              <filename class="directory">/home/j</filename>.</para>
           </listitem>
 
           <listitem>
-            <para><filename role="directory">/home/j/mroot</filename> �
+            <para><filename class="directory">/home/j/mroot</filename> �
               il template per ogni jail e la partizione in sola lettura per
               tutte le jail.</para>
           </listitem>
 
           <listitem>
             <para>Una directory vuota sar� creata per ogni jail sotto
-            la directory <filename role="directory">/home/j</filename>.</para>
+            la directory <filename class="directory">/home/j</filename>.</para>
           </listitem>
 
           <listitem>
             <para>Ogni jail avr� una directory <filename
-                role="directory">/s</filename>, che sar� linkata
+                class="directory">/s</filename>, che sar� linkata
               alla porzione del sistema in lettura e scrittura.</para>
           </listitem>
 
           <listitem>
             <para>Ogni jail ha il suo sistema in lettura e scrittura in
-              <filename role="directory">/home/j/skel</filename>.</para>
+              <filename class="directory">/home/j/skel</filename>.</para>
           </listitem>
 
           <listitem>
             <para>Ogni spazio di jail (la porzione in lettura e scrittura di
               ogni jail) sar� creato in <filename
-                role="directory">/home/js</filename>.</para>
+                class="directory">/home/js</filename>.</para>
           </listitem>
         </itemizedlist>
 
         <note>
           <para>Si assume che le jail siano posizionate sotto la partizione
-          <filename role="directory">/home</filename>.  Di sicuro, questo
+          <filename class="directory">/home</filename>.  Di sicuro, questo
           pu� essere modificato con qualcosa di diverso, ma questo
           cambiamento dovr� essere tenuto in considerazione
           negli esempi pi� avanti.</para>
@@ -725,7 +725,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
             <para>Ora, linkiamo in modo simbolico il file system in lettura
               e scrittura nel file system di sola lettura.  Assicuriamoci
               che i link simbolici siano creati nelle posizioni corrette in
-              <filename role="directory">s/</filename>.  La creazione di
+              <filename class="directory">s/</filename>.  La creazione di
               directory in posti sbagliati causer� un fallimento
               durante l'installazione.</para>
 
@@ -821,12 +821,12 @@ jail_www_devfs_enable="YES"</programlisting>
                 <para>La ragione del perch� la variabile
                   <varname>jail_<replaceable>nome</replaceable>_rootdir</varname>
                   � settata a <filename
-                    role="directory">/usr/home</filename> invece di
-                  <filename role="directory">/home</filename> � che
+                    class="directory">/usr/home</filename> invece di
+                  <filename class="directory">/home</filename> � che
                   il percorso reale della directory <filename
-                    role="directory">/home</filename> in una installazione
+                    class="directory">/home</filename> in una installazione
                   standard di &os; � <filename
-                    role="directory">/usr/home</filename>.  La variabile
+                    class="directory">/usr/home</filename>.  La variabile
                   <varname>jail_<replaceable>nome</replaceable>_rootdir</varname>
                   <emphasis>non</emphasis> deve essere settata a un percorso
                   che include link simbolici, altrimenti la jail
@@ -906,7 +906,7 @@ jail_www_devfs_enable="YES"</programlisting>
             <para>Il primo passo � aggiornare il sistema host nella
               maniera usuale.  Quindi creiamo un template temporaneo
               in sola lettura in <filename
-                role="directory">/home/j/mroot2</filename>.</para>
+                class="directory">/home/j/mroot2</filename>.</para>
 
             <screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
@@ -955,7 +955,7 @@ jail_www_devfs_enable="YES"</programlisting>
             <note>
               <para>I sistemi in lettura e scrittura sono attaccati al
                 sistema in sola lettura
-                (<filename role="directory">/s</filename>) e devono essere
+                (<filename class="directory">/s</filename>) e devono essere
                 smontati.</para>
             </note>
           </step>
diff --git a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
index ed2eb3a398..16f898a54c 100644
--- a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -290,7 +290,7 @@
 
       <step>
         <para>Entra nella directory <filename
-          role="directory">/usr/src</filename>:</para>
+          class="directory">/usr/src</filename>:</para>
 
         <screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
       </step>
@@ -434,7 +434,7 @@
 
     <programlisting>machine   i386</programlisting>
 
-    <para>Questa &egrave la architettura della macchina.  Deve essere
+    <para>Questa � la architettura della macchina.  Deve essere
       una fra <literal>alpha</literal>, <literal>amd64</literal>,
       <literal>i386</literal>, <literal>ia64</literal>,
       <literal>pc98</literal>, <literal>powerpc</literal>, o
diff --git a/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
index b425244c63..145fc004e4 100644
--- a/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
index b89fed7182..e24f49e4bd 100644
--- a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -443,7 +443,7 @@ multi on</programlisting>
         poterli usare.  Se hai scelto di mettere gli
         eseguibili di <application>&mathematica;</application>
         nella directory
-        <filename role="directory">/usr/local/bin</filename>,
+        <filename class="directory">/usr/local/bin</filename>,
         troverai in questa directory dei link simbolici chiamati
         <filename>math</filename>, <filename>mathematica</filename>,
         <filename>Mathematica</filename>, e
@@ -662,14 +662,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-        lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+        lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
         echo -n " lmgrd"
         ;;
 stop)
-        llmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+        llmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+        echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
         exit 64
         ;;
 esac
@@ -964,7 +964,7 @@ exit 0</programlisting>
             che segue:</para>
 
           <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
         </step>
 
@@ -3739,7 +3739,7 @@ options SHMMAXPGS=393216
 
     <para>Se sei curioso di come funziona la compatibilit� con i binari
       di Linux, questa � la sezione da leggere.  Molto di ci�
-      che segue � basato pesantemente su una email scritta a &a.chat
+      che segue � basato pesantemente su una email scritta a &a.chat;
       da Terry Lambert <email>tlambert@primenet.com</email> (ID del messaggio:
       <literal>&lt;199906020108.SAA07001@usr09.primenet.com&gt;</literal>).</para>
 
diff --git a/it_IT.ISO8859-15/books/handbook/mac/chapter.xml b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
index 6cb97ff857..1e0bc0d344 100644
--- a/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
index 795d4fc7dc..c82eea6e8a 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -1040,7 +1040,7 @@ in /etc/mail/sendmail.cf.</programlisting>
 
           <para>L'altro � trovare un server Internet a tempo pieno
             che fornisca un servizio MX secondario per il tuo dominio.
-            Per esempio, se il dominio della tua societ� &egrave
+            Per esempio, se il dominio della tua societ� �
             <hostid role="domainname">example.com</hostid> e il tuo fornitore
             di servizi Internet ha attivato <hostid
               role="domainname">example.net</hostid> per fornire il servizio
@@ -1756,11 +1756,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
           seguenti comandi:</para>
 
         <screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
         <para>Se <filename>/usr/src</filename> non ha subito enormi cambiamenti
           e se le librerie condivise di cui si ha bisogno sono disponibili, la
@@ -2017,7 +2017,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/mutt1" format="PNG"/>
+          <imagedata fileref="mail/mutt1"/>
         </imageobject>
       </mediaobject>
 
@@ -2027,7 +2027,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/mutt2" format="PNG"/>
+          <imagedata fileref="mail/mutt2"/>
         </imageobject>
       </mediaobject>
 
@@ -2063,7 +2063,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/mutt3" format="PNG"/>
+          <imagedata fileref="mail/mutt3"/>
         </imageobject>
       </mediaobject>
 
@@ -2114,7 +2114,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/pine1" format="PNG"/>
+          <imagedata fileref="mail/pine1"/>
         </imageobject>
       </mediaobject>
 
@@ -2134,7 +2134,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/pine2" format="PNG"/>
+          <imagedata fileref="mail/pine2"/>
         </imageobject>
       </mediaobject>
 
@@ -2145,7 +2145,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/pine3" format="PNG"/>
+          <imagedata fileref="mail/pine3"/>
         </imageobject>
       </mediaobject>
 
@@ -2158,7 +2158,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/pine4" format="PNG"/>
+          <imagedata fileref="mail/pine4"/>
         </imageobject>
       </mediaobject>
 
@@ -2175,7 +2175,7 @@ EOT</screen>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="mail/pine5" format="PNG"/>
+          <imagedata fileref="mail/pine5"/>
         </imageobject>
       </mediaobject>
 
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
index 68d8fd6d78..f07ac6435a 100644
--- a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -289,6 +289,10 @@
       I metodi di accesso disponibili per ogni sito sono elencati fra parentesi
       dopo il nome dell'host.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -312,7 +316,7 @@
         progetto FreeBSD.  Per utilizzarlo � sufficiente impostare la
         variabile di ambiente <envar>CVSROOT</envar> facendola puntare al server
         anoncvs appropriato, immettere la password <quote>anoncvs</quote> con il
-        comando <command>cvs login</command>, e poi usare il comando &man.cvs.1
+        comando <command>cvs login</command>, e poi usare il comando &man.cvs.1;
         per accederci come se fosse un deposito locale.</para>
 
       <note>
@@ -676,7 +680,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host
         toccher� il tuo albero.  Per verificare una delta puoi usare
         l'opzione <option>-c</option> e di fatto <application>CTM</application>
         non toccher� il tuo albero; verificher� soltanto
-        l'integrit&agrave della delta e se questa pu� essere applicata
+        l'integrit� della delta e se questa pu� essere applicata
         in modo pulito al tuo albero attuale.</para>
 
       <para>Ci sono altre opzioni di <application>CTM</application>, guarda
@@ -2281,6 +2285,10 @@ doc/zh_*</screen>
       <para>I server <link linkend="cvsup">CVSup</link> per FreeBSD si trovano
         ai seguenti siti:</para>
 
+        &chap.mirrors.cvsup.index.inc;
+
+        &chap.mirrors.lastmod.inc;
+
         &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
@@ -2392,7 +2400,7 @@ doc/zh_*</screen>
 
       <note>
         <para>Nell'installazione di default la directory
-          <filename role="directory">/usr/ports</filename>
+          <filename class="directory">/usr/ports</filename>
           non viene creata.  Se usi &os;&nbsp;6.0-RELEASE,
           la directory dovrebbe essere creata prima di
           usare <command>portsnap</command>.  Su versioni
diff --git a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
index c000807d38..30c439f4d0 100644
--- a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
index 9853790ca7..ff690571d4 100644
--- a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -2949,7 +2949,7 @@ domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
         disponibile nel port <filename
         role="package">net/isc-dhcp3-server</filename>.  Le
         pagine di manuale &man.dhclient.8;, &man.dhcp-options.5;, e
-        &man.dhclient.conf.5, oltre ai riferimenti
+        &man.dhclient.conf.5;, oltre ai riferimenti
         elencati oltre, sono risorse utili.</para>
     </sect2>
 
@@ -3715,7 +3715,7 @@ dhcpd_ifaces="dc0"</programlisting>
             </row>
 
             <row>
-              <entry><filename role="directory">/etc/namedb</filename></entry>
+              <entry><filename class="directory">/etc/namedb</filename></entry>
 
               <entry>Directory dove risiedono le
                 informazioni di zona di BIND.</entry>
@@ -3734,10 +3734,10 @@ dhcpd_ifaces="dc0"</programlisting>
         A seconda di come certe zone sono configurate
         sul server, i file relativi a quelle zone possono essere
         trovate nelle sottodirectory <filename
-        role="directory">master</filename>, <filename
-        role="directory">slave</filename>, or <filename
-        role="directory">dynamic</filename> della directory
-        <filename role="directory">/etc/namedb</filename>.
+        class="directory">master</filename>, <filename
+        class="directory">slave</filename>, or <filename
+        class="directory">dynamic</filename> della directory
+        <filename class="directory">/etc/namedb</filename>.
         Questi file contengono le informazioni <acronym>DNS</acronym>
         che saranno distribuite dal name server in risposta alle query.</para>
     </sect2>
@@ -3786,7 +3786,7 @@ dhcpd_ifaces="dc0"</programlisting>
       </indexterm>
 
       <para>I file di configurazione per <application>named</application>
-        al corrente risiedono nella directory <filename role="directory">
+        al corrente risiedono nella directory <filename class="directory">
         /etc/named</filename> e necessiteranno di modifiche prima
         dell'uso, a meno che non si voglia un semplice resolver.
         Qui � dove la maggior pare della configurazione viene
@@ -3796,7 +3796,7 @@ dhcpd_ifaces="dc0"</programlisting>
         <title>Usando <command>make-localhost</command></title>
 
         <para>Per configurare una zona master per il localhost
-          visita la directory <filename role="directory">/etc/namedb</filename>
+          visita la directory <filename class="directory">/etc/namedb</filename>
           ed esegui il seguente comando:</para>
 
         <screen>&prompt.root; <userinput>sh make-localhost</userinput></screen>
@@ -4054,7 +4054,7 @@ www             IN      CNAME   @</programlisting>
           <literal>www</literal> si trasformerebbe in
           <hostid>www.example.org</hostid>.</para>
 
-        <para>Il formato di un file di zona &egrave
+        <para>Il formato di un file di zona �
           il seguente:</para>
 
         <programlisting>recordname      IN recordtype
diff --git a/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
index 892d47e998..019a186673 100644
--- a/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -20,7 +20,7 @@
   <sect1 id="pgpkeys-officers">
     <title>Cariche Ufficiali</title>
 
-    &section.pgpkeys-officers
+    &section.pgpkeys-officers;
   </sect1>
 
   <sect1 id="pgpkeys-core">
diff --git a/it_IT.ISO8859-15/books/handbook/ports/chapter.xml b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
index d27179da5e..3380d29503 100644
--- a/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -1250,7 +1250,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
     <para>Di solito dopo aver installato una nuova applicazione dovresti
       leggere la documentazione che potrebbe essere stata inclusa, modificare
       qualche file di configurazione, assicurarti che l'applicazione parta nella
-      fase di avvio (se � un demone), e cos&igrave via;.</para>
+      fase di avvio (se � un demone), e cos� via;.</para>
 
     <para>I passi precisi che devi seguire per configurare un'applicazione
       sono ovviamente diversi da applicazione a applicazione.  Comunque, se hai
diff --git a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
index 3aa926563a..a1c5b38e0c 100644
--- a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/preface/preface.xml b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
index 75f61ad0d2..a23929126e 100644
--- a/it_IT.ISO8859-15/books/handbook/preface/preface.xml
+++ b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/printing/chapter.xml b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
index bcb9a63616..b892a989c2 100644
--- a/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/security/chapter.xml b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
index 6d983c6e33..379ee0644e 100644
--- a/it_IT.ISO8859-15/books/handbook/security/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
index d879ce1aae..c26f7aeddc 100644
--- a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/users/chapter.xml b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
index 2885dfab92..5f6d67652a 100644
--- a/it_IT.ISO8859-15/books/handbook/users/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
index 426a61e26a..333e299d01 100644
--- a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
index b584655cdb..c42e8fef36 100644
--- a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/handbook/x11/chapter.xml b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
index 6f8fee3c4d..e65ad7dab0 100644
--- a/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -337,7 +337,7 @@
       l'implementazione
       dell'X server dell'X Window System rilasciato dalla Fondazione X.Org.
       <application>&xorg;</application> � basato sul codice di
-      <application>&xfree86&nbsp;4.4RC2</application> e X11R6.6.
+      <application>&xfree86;&nbsp;4.4RC2</application> e X11R6.6.
       La versione di <application>&xorg;</application> disponibile al momento
       nella Collezione dei Ports � &xorg.version;.</para>
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
index 4cd3a6bee9..53c457123d 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/book.xml b/it_IT.ISO8859-15/books/unix-introduction/book.xml
index 644f307a4c..02390711ae 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/book.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
index cb86713741..bfa23cb4d5 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
index 198dd8f603..c0e86cc887 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -278,13 +278,13 @@ mon.logins tues.logins differ: char 9, line 2</screen>
 
       <screen>&prompt.user; <userinput>diff mon.logins tues.logins</userinput>
 2d1
-< bsmith
+&lt; bsmith
 4a4
-> jdoe
+&gt; jdoe
 7c7
-< mschmidt
+&lt; mschmidt
 ---
-> proy</screen>
+&gt; proy</screen>
 
       <para>Notare che l'output mostra sia l'elenco delle differenze sia in
         quale file queste esistono.  Le linee del primo file sono precedute da
@@ -1542,7 +1542,7 @@ source.tar.Z:           Blocchi di dati compressi 16 bit</screen>
       <para><emphasis>Esempi:</emphasis></para>
 
       <para>L'esempio seguente usa come file di input una lista di libri di
-        P. G. Wodehouse Jeeves & Wooster.</para>
+        P. G. Wodehouse Jeeves &amp; Wooster.</para>
 
       <programlisting>The Inimitable Jeeves [1923]    The Mating Season [1949]
 Carry On, Jeeves [1925]         Ring for Jeeves [1953]
@@ -2207,22 +2207,22 @@ beauty:01/31/94:#total logins,2175:#different UIDs,1194</screen>
 
       <programlisting>begin 555 binary_filename
 
-M?T5,1@$" 0 " ( ! %"W #0 5"< T "
+M?T5,1@$" 0 " ( ! %"W #0 5"&lt; T "
 M!0 H !4 % 8 T $ - "@ H 4 P
 M -0 !$ ! ! ! %"
-M%P !0A< % $ $ 4(8 -"& W& W% < 0
+M%P !0A&lt; % $ $ 4(8 -"&amp; W&amp; W% &lt; 0
 M @ !0B T(@ )@ !P O=7-R+VQI8B]L9"YS
-M;RXQ ?< 'Y VP "O !VP )8 &6 !G0
-M %[ U0 %G !3 ;< #Q %Q !
+M;RXQ ?&lt; 'Y VP "O !VP )8 &amp;6 !G0
+M %[ U0 %G !3 ;&lt; #Q %Q !
 MEP :P !_ '@ !PP (P
-M N0 =H _0 $D Y < #F /L
-M01 $' $ & ! P #0A@ 4(8
+M N0 =H _0 $D Y &lt; #F /L
+M01 $' $ &amp; ! P #0A@ 4(8
 M" ! 0 !E !@ , T(@ %"( )@ $
 M 0 ( ;@ $ ' -"N !0K@ /H
 M $ # ', ! P #1J 4:@ #8 !
 M !Y 0 , TH %* !=X 0
 M@ @ # -/X !3^ "E, $ (4 !
-M 4_> )0 0 ". P
+M 4_&gt; )0 0 ". P
 ; %0 P )@ $
 
 end</programlisting>
@@ -2885,7 +2885,7 @@ DeBula, e Linda Condron, mentre insegnavano ad usare una nuova versione
 di Unix workshop sviluppata per l'UTS.
 
 Sperando di aver insegnato qualcosa.
-Frank, Linda, & Linda</screen>
+Frank, Linda, &amp; Linda</screen>
 
       <screen>brigadier: condron [77]> <userinput>finger</userinput>
 Login     Name                TTY     Idle    When        Where
@@ -2956,7 +2956,7 @@ frank     Frank G. Fiamingo   p1              Mon 16:19   nyssa</screen>
                   <replaceable>username</replaceable></option></entry>
 
               <entry>si connette all' host remoto con il nome utente specificato
-                (&man.rlogin.1; & &man.rsh.1;)</entry>
+                (&man.rlogin.1; &amp; &man.rsh.1;)</entry>
             </row>
           </tbody>
         </tgroup>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
index e33d4eb84c..ed00d8df12 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
index b5c3a6f7c1..a39c012fc3 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
index 62002d43f9..9e2df2e6d4 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
index b618f2410c..935ad0f810 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
index af7f8cdf9e..bec6644d87 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
index bcfa02ae7e..b00d3a97df 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -550,9 +550,9 @@ $#argv: 5</screen>
 
     <programlisting>#!/bin/sh
 param0=$0
-test -n "$1" && param1=$1
-test -n "$2" && param2=$2
-test -n "$3" && param3=$3
+test -n "$1" &amp;&amp; param1=$1
+test -n "$2" &amp;&amp; param2=$2
+test -n "$3" &amp;&amp; param3=$3
 echo 0: $param0
 echo "1: ${param1-1}: \c" ;echo $param1
 echo "2: ${param2=2}: \c" ;echo $param2
@@ -680,7 +680,7 @@ param=hello frank</screen>
       <para>&man.csh.1; usa il simbolo <literal>$&lt;</literal> per leggere una
         linea da &man.stdin.4;, esempio:</para>
 
-      <para><command>set param = $<</command></para>
+      <para><command>set param = $&lt;</command></para>
 
       <para>Gli spazi bianchi intorno al segno di uguale sono importanti.
         Il seguente script illustra come usarlo:</para>
@@ -744,7 +744,7 @@ Rewind="$Mt -f $device rewind"
 Offline="$Mt -f $device rewoffl"
 # Failure - exit
 failure () {
-  $Mail -s "Backup fallito - $HOST" $admin << EOF_failure
+  $Mail -s "Backup fallito - $HOST" $admin &lt;&lt; EOF_failure
   $HOST
   Script cron backup fallito. A quanto pare non c'� il nastro nel dispositivo.
   EOF_failure
@@ -752,7 +752,7 @@ failure () {
  }
 # Dump failure - exit
 dumpfail () {
-  $Mail -s "Backup fallito - $HOST" $admin << EOF_dumpfail
+  $Mail -s "Backup fallito - $HOST" $admin &lt;&lt; EOF_dumpfail
   $HOST
   Script cron backup fallito. A quanto pare non c'� il nastro nel dispositivo.
   EOF_dumpfail
@@ -760,7 +760,7 @@ dumpfail () {
  }
 # Success
 success () {
-  $Mail -s "Backup completato con successo - $HOST" $admin << EOF_success
+  $Mail -s "Backup completato con successo - $HOST" $admin &lt;&lt; EOF_success
   $HOST
   Script cron backup apparentemente riuscito. Il file /etc/dumpdates �:
   `/bin/cat /etc/dumpdates`
@@ -772,7 +772,7 @@ $Dump 0uf $device / || dumpfail
 $Dump 0uf $device /usr || dumpfail
 $Dump 0uf $device /home || dumpfail
 $Dump 0uf $device /var || dumpfail
-($Dump 0uf $device /var/spool/mail || dumpfail) && success
+($Dump 0uf $device /var/spool/mail || dumpfail) &amp;&amp; success
 $Offline</programlisting>
 
     <para>Questo script illustra alcuni argomenti che sono stati trattati in
@@ -790,7 +790,7 @@ $Offline</programlisting>
       la forma <emphasis>here document</emphasis> per realizzare il contenuto
       della funzione stessa.  Si introducono ora gli operatori logici
       <emphasis>OR</emphasis> (<emphasis>||</emphasis>) e
-      <emphasis>AND</emphasis> (<emphasis>&&</emphasis>); ciascuno �
+      <emphasis>AND</emphasis> (<emphasis>&amp;&amp;</emphasis>); ciascuno �
       posizionato tra una coppia di comandi.  Per l'operatore
       <emphasis>OR</emphasis>, il secondo comando viene eseguito solamente se
       il primo comando non � stato completato con successo.  Per
@@ -808,7 +808,7 @@ $Offline</programlisting>
       (<literal>|| dumpfail</literal>).  Se questa operazione non viene eseguita
       completamente con successo si esegue la procedura
       <command>dumpfail</command> e si esce.  Se l'ultimo backup ha successo si
-      procede con la funzione <command>success</command> (<literal>(...) &&
+      procede con la funzione <command>success</command> (<literal>(...) &amp;&amp;
       success</literal>).  In fine si riavvolge il nastro e lo si manda fuori
       linea affinch� altri utenti non possano accidentalmente scriverci
       sopra.</para>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
index 2c24348841..8ed4cca78f 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
index d5f6144716..674a3649c4 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -247,7 +247,7 @@
         si deve prima redirigere &man.stdout.4; in una sotto-shell,
         cos�:</para>
 
-      <screen>&prompt.user; <userinput>(<replaceable>comando</replaceable> > <replaceable>out_file</replaceable>) >& <replaceable>err_file</replaceable></userinput></screen>
+      <screen>&prompt.user; <userinput>(<replaceable>comando</replaceable> > <replaceable>out_file</replaceable>) &gt;&amp; <replaceable>err_file</replaceable></userinput></screen>
     </sect2>
 
     <sect2 id="special-features-file-redir-sh">
@@ -330,14 +330,14 @@
         supporto, 3.  Si redirige prima 3 su 2, quindi 2 su 1 e in fine si
         redirige 1 su 3.</para>
 
-      <screen>$ <userinput>(<replaceable>comando</replaceable> 3>&2 2>&1 1>&3) > <replaceable>file</replaceable></userinput></screen>
+      <screen>$ <userinput>(<replaceable>comando</replaceable> 3&gt;&amp;2 2&gt;&amp;1 1&gt;&amp;3) &gt; <replaceable>file</replaceable></userinput></screen>
 
       <para>Questo manda &man.stderr.4; in 1 e &man.stdout.4; in 3 che �
         rediretto su 2.  In questo modo, in effetti, si ribaltano i normali
         significati dei descrittori di file 1 e 2.  Si pu� sperimentare
         tutto questo con l'esempio seguente:</para>
 
-      <screen>$ <userinput>(cat <replaceable>file</replaceable> 3>&2 2>&1 1>&3) > <replaceable>errfile</replaceable></userinput></screen>
+      <screen>$ <userinput>(cat <replaceable>file</replaceable> 3&gt;&amp;2 2&gt;&amp;1 1&gt;&amp;3) &gt; <replaceable>errfile</replaceable></userinput></screen>
 
       <para>Quindi se <filename><replaceable>file</replaceable></filename>
         � letto, l'informazione � scartata dall'output del
@@ -413,7 +413,7 @@
             <entry>esegue il comando seguente (a questo simbolo) solamente se il
               comando precedente (a questo simbolo) � stato completato
               con successo, esempio:
-              <command>grep <replaceable>stringa file</replaceable> && cat
+              <command>grep <replaceable>stringa file</replaceable> &amp;&amp; cat
                 <replaceable>file</replaceable></command></entry>
           </row>
 
diff --git a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
index 69db41145d..9815125d3d 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -17,7 +17,7 @@
       interagisce direttamente con l'hardware e fornisce i servizi ai programmi
       utente.  I programmi utente non necessitano di conoscere informazioni
       sull'hardware.  Devono solo sapere come interagire con il kernel ed
-      � quest'ultimo a fornire i servizi richiesti.  Uno dei pi&ugrave
+      � quest'ultimo a fornire i servizi richiesti.  Uno dei pi�
       grandi fattori che ha contribuito alla richiesta di Unix da parte dei
       programmatori � stato che molti programmi utente corretti
       sono indipendenti dall'hardware sottostante, e ci� li rende
diff --git a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
index eb837ed39a..9613715563 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
@@ -353,7 +353,7 @@ peri:/acs/peri/2
       </informaltable>
 
       <note>
-        <para>Poich� il comando &man.ps.1 � molto dipendente dal
+        <para>Poich� il comando &man.ps.1; � molto dipendente dal
           sistema, si raccomanda di consultare le <emphasis>pagine
           man</emphasis> del proprio sistema per i dettagli delle opzioni e per
           l'interpretazione dell'output di &man.ps.1;.</para>
@@ -784,7 +784,7 @@ Mon 06/10/96</screen>
     </table>
 
     <para>I comandi di stampa permettono di stampare file sullo standard output
-      (&man.pr.1;) o attraverso una stampante (&man.lp.1; e &man.lpr.1) fino a
+      (&man.pr.1;) o attraverso una stampante (&man.lp.1; e &man.lpr.1;) fino a
       filtrare l'output.  I comandi di stampa di <emphasis>BSD</emphasis> e
       <emphasis>SysV</emphasis> usano diversi nomi e diverse opzioni per
       produrre lo stesso risultato: &man.lpr.1;, &man.lprm.1; e &man.lpq.1;
diff --git a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
index e1dc50360a..477714c80c 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/catalog b/it_IT.ISO8859-15/share/xml/catalog
index ad65424b71..2422c1740c 100644
--- a/it_IT.ISO8859-15/share/xml/catalog
+++ b/it_IT.ISO8859-15/share/xml/catalog
@@ -1,47 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Italian specific ..................................................... --
-
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//IT"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
-	"translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/it_IT.ISO8859-15/share/xml/catalog.xml b/it_IT.ISO8859-15/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/it_IT.ISO8859-15/share/xml/catalog.xml
+++ b/it_IT.ISO8859-15/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent
index dde7e8ad76..5b4e18e7e0 100644
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@@ -4,29 +4,33 @@
       $FreeBSD$
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT">
+<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
+	"trademarks.ent">
 %it-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
+	"translators.ent">
 %translators;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
+	"glossary.ent">
 %glossary;
diff --git a/it_IT.ISO8859-15/share/xml/freebsd.dsl b/it_IT.ISO8859-15/share/xml/freebsd.dsl
index d9f009ce74..b94833e7ae 100644
--- a/it_IT.ISO8859-15/share/xml/freebsd.dsl
+++ b/it_IT.ISO8859-15/share/xml/freebsd.dsl
@@ -7,45 +7,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %output.html; [
-
-        (define ($email-footer$)
-          (make sequence
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Questo, ed altri documenti, possono essere scaricati da ")
-                (create-link
-                  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Per domande su FreeBSD, leggi la ")
-                (create-link
-                  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "documentazione"))
-                (literal " prima di contattare <")
-                (create-link
-                  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "Per domande su questa documentazione, invia una e-mail a <")
-                (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-                (literal ">.")))))
-      ]]>
-
       (define (local-it-label-title-sep)
         (list
           (list (normalize "warning")           ": ")
diff --git a/it_IT.ISO8859-15/share/xml/l10n.ent b/it_IT.ISO8859-15/share/xml/l10n.ent
index aaffe110e5..d04a282367 100644
--- a/it_IT.ISO8859-15/share/xml/l10n.ent
+++ b/it_IT.ISO8859-15/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/mailing-lists.ent b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
index 71f549f748..f38a62b089 100644
--- a/it_IT.ISO8859-15/share/xml/mailing-lists.ent
+++ b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/trademarks.ent b/it_IT.ISO8859-15/share/xml/trademarks.ent
index 7b4b57d673..db963c92ba 100644
--- a/it_IT.ISO8859-15/share/xml/trademarks.ent
+++ b/it_IT.ISO8859-15/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
      The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xml/translators.ent b/it_IT.ISO8859-15/share/xml/translators.ent
index bc6fdc7abd..11ec3f45bb 100644
--- a/it_IT.ISO8859-15/share/xml/translators.ent
+++ b/it_IT.ISO8859-15/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
 <!--
       The FreeBSD Italian Documentation Project
 
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-common.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..c9729c5199
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-15'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Questo, ed altri documenti, possono essere scaricati da
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>Per domande su FreeBSD, leggi la
+    <a href="http://www.FreeBSD.org/docs.html">documentazione</a> prima di contattare
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    Per domande su questa documentazione, invia una e-mail a
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/it_IT.ISO8859-15/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index bf5e628bb0..d249b475d1 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/contributors/article.xml b/ja_JP.eucJP/articles/contributors/article.xml
index 4beeacef5a..405c2e00db 100644
--- a/ja_JP.eucJP/articles/contributors/article.xml
+++ b/ja_JP.eucJP/articles/contributors/article.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
 %contrib.ent;
-<!ENTITY % not.published "IGNORE">
 ]>
 
 <!--
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index 7f738d2bce..33288da154 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY scratch.ap "<application>FreeBSD �򥼥��������ꤹ��</application>">
 ]>
 
@@ -11,7 +9,7 @@
   Original revision: 1.11
 -->
 
-<article lang='ja'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='ja'>
   <articleinfo>
     <title>FreeBSD �򥼥��������ꤹ��ˤ�</title>
 
@@ -432,7 +430,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
         �ǥХ���̾���ѹ������տ����ԤʤäƤ���������</para>
     </warning>
 
-<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="stage_1.conf.default" parse="text" encoding="euc-jp"/>
+</programlisting>
 
     <para>�����������: <ulink
         url="stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -538,7 +538,9 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
       <filename>LOGDIR/category+port</filename>
       �Ȥ���̾���Υ����ե����뤬��������ޤ���</para>
 
-<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="stage_2.conf.default" parse="text" encoding="euc-jp"/>
+</programlisting>
 
      <para>�����������: <ulink
         url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -674,7 +676,9 @@ fi
         url="stage_1.sh"><filename>stage_1.sh</filename></ulink>
       ������ץȤǤ������Ƥ��ѹ�����ɬ�פϤʤ��Ǥ��礦��</para>
 
-<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="stage_1.sh" parse="text" encoding="euc-jp"/>
+</programlisting>
 
     <para>�����������: <ulink
         url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -683,7 +687,9 @@ fi
         url="stage_2.sh"><filename>stage_2.sh</filename></ulink>
       ������ץȤǤ����ǽ����ʬ�ˤ����ѿ����ѹ����ޤ��礦��</para>
 
-<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="stage_2.sh" parse="text" encoding="euc-jp"/>
+</programlisting>
 
     <para>�����������: <ulink
         url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -692,7 +698,9 @@ fi
         url="stage_3.mk"><filename>stage_3.mk</filename></ulink> �Ǥ���
       �����ưŪ�ˤ����ʤ�����μ��򡢤���������ޤ���</para>
 
-<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="stage_3.mk" parse="text" encoding="euc-jp"/>
+</programlisting>
 
     <para>�����������: <ulink
         url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ja_JP.eucJP/articles/fonts/article.xml b/ja_JP.eucJP/articles/fonts/article.xml
index 1c20df9bca..cf40417297 100644
--- a/ja_JP.eucJP/articles/fonts/article.xml
+++ b/ja_JP.eucJP/articles/fonts/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.xml b/ja_JP.eucJP/articles/ipsec-must/article.xml
index 0d4840e369..effac68cf6 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.xml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/problem-reports/article.xml b/ja_JP.eucJP/articles/problem-reports/article.xml
index 00df7c8adf..b34a1ba53f 100644
--- a/ja_JP.eucJP/articles/problem-reports/article.xml
+++ b/ja_JP.eucJP/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
    The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/design-44bsd/Makefile b/ja_JP.eucJP/books/design-44bsd/Makefile
index 31d1526ff8..da2fc43c7a 100644
--- a/ja_JP.eucJP/books/design-44bsd/Makefile
+++ b/ja_JP.eucJP/books/design-44bsd/Makefile
@@ -12,10 +12,6 @@ INSTALL_ONLY_COMPRESSED?=
 
 SRCS= book.xml
 
-# Use the local DSSSL file
-DSLHTML?=       ${.CURDIR}/freebsd.dsl
-DSLPRINT?=      ${.CURDIR}/freebsd.dsl
-
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index f8036854de..c383b96f9e 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -640,7 +637,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="fig1" format="EPS"/>
+	    <imagedata fileref="fig1"/>
 	  </imageobject>
 
 	  <textobject>
@@ -1443,7 +1440,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="fig2" format="EPS"/>
+            <imagedata fileref="fig2"/>
           </imageobject>
 
           <textobject>
@@ -2242,7 +2239,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 +2296,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 +2390,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/design-44bsd/freebsd.dsl b/ja_JP.eucJP/books/design-44bsd/freebsd.dsl
deleted file mode 100644
index 953a9e8bbc..0000000000
--- a/ja_JP.eucJP/books/design-44bsd/freebsd.dsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- $FreeBSD$ -->
-<!-- FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.3 -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      ;; Keep the legalnotice together with the rest of the text
-      (define %generate-legalnotice-link%
-        #f)
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index 142989c7a2..e73c949b6d 100644
--- a/ja_JP.eucJP/books/faq/book.xml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.204 -->
@@ -3596,11 +3593,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 +3608,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 +4977,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 +5995,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 +12093,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/book.xml b/ja_JP.eucJP/books/fdp-primer/book.xml
index 2ea35255dd..62c69bfe09 100644
--- a/ja_JP.eucJP/books/fdp-primer/book.xml
+++ b/ja_JP.eucJP/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml
-%entities;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!-- ENTITY index SYSTEM "index.xml" -->
 ]>
diff --git a/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
index 46b5ff22fe..b1167c771d 100644
--- a/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
+++ b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
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 72dfc94960..1bd163b587 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -42,7 +42,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -320,42 +319,44 @@ 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
-
-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
+		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 cd71c200ad..192d028849 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
@@ -1926,7 +1926,7 @@ rfcomm_sppd[94692]: Starting on /dev/ttyp6...</screen>
       <para>(<replaceable>if1</replaceable> �����
 	<replaceable>if2</replaceable>
 	����ĤΥͥåȥ�����󥿥ե�������̾�����֤������Ƥ�������)��
-	�֥�å����ͳ�����ѥ��åȤ� &man.ipfw.8 �ǥե��륿���������ˤϡ�
+	�֥�å����ͳ�����ѥ��åȤ� &man.ipfw.8; �ǥե��륿���������ˤϡ�
 	�ʲ��ιԤ��դ��ä���ɬ�פ�����ޤ�</para>
 
       <programlisting>net.link.ether.bridge_ipfw=1</programlisting>
@@ -4763,7 +4763,7 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</
 	�ѥ���ɷ����θߴ���������ޤ���
 	NIS �����Ф� DES �Ź沽�ѥ���ɻȤäƤ�����ˤϡ�
 	Ʊ�ͤ� DES ����Ѥ��Ƥ��륯�饤����Ȥ����б��Ǥ��ޤ���
-	���Ȥ��� &solaris�� �� NIS ���饤����Ȥ��ͥåȥ����ˤ����硢
+	���Ȥ��� &solaris;�� �� NIS ���饤����Ȥ��ͥåȥ����ˤ����硢
 	�ۤܳμ¤� DES �Ź沽�ѥ���ɤ���Ѥ��ʤ���Фʤ�ʤ��Ǥ��礦��</para>
       <para>�����Фȥ��饤����Ȥ��ɤΥ饤�֥�����Ѥ��Ƥ��뤫�ϡ�
 	<filename>/etc/login.conf</filename> ���ǧ���Ƥ���������
@@ -5973,10 +5973,10 @@ www             IN CNAME        @</programlisting>
 	<listitem>
 	  <para>���ܥ�����ե����������ե�������Խ��Ⱥ�����Ԥ��ޤ���</para>
 	  <screen>&prompt.root; <userinput>cp /etc/localtime etc</userinput><co id="localtime"/>
-&prompt.root; <userinput>mv named.conf etc && ln -sf etc/named.conf</userinput>
+&prompt.root; <userinput>mv named.conf etc &amp;&amp; ln -sf etc/named.conf</userinput>
 &prompt.root; <userinput>mv named.root master</userinput>
 <!-- I don't like this next bit -->
-&prompt.root; <userinput>sh make-localhost && mv localhost.rev localhost-v6.rev master</userinput>
+&prompt.root; <userinput>sh make-localhost &amp;&amp; mv localhost.rev localhost-v6.rev master</userinput>
 &prompt.root; <userinput>cat > master/named.localhost
 $ORIGIN localhost.
 $TTL 6h
@@ -6004,12 +6004,12 @@ $TTL 6h
 	    ���ۤ�������˥��ԡ����Ƥ���������</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src/lib/libisc</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libbind</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
 &prompt.root; <userinput>cd /usr/src/libexec/named-xfer</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make NOSHARED=yes all</userinput>
-&prompt.root; <userinput>cp named-xfer /etc/namedb/bin && chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make NOSHARED=yes all</userinput>
+&prompt.root; <userinput>cp named-xfer /etc/namedb/bin &amp;&amp; chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
 
 	  <para>��Ū��󥯤��줿 <command>named-xfer</command>
 	    �򥤥󥹥ȡ��뤷���顢
@@ -6028,12 +6028,12 @@ $TTL 6h
 	      <para>���Υ��ƥåפϻ������Ԥ��뤳�Ȥ���𤵤�Ƥ��ޤ���
 		�⤷���Ԥ�����硢���Υ��ޥ�ɤ�¹Ԥ��Ƥ���������</para>
 
-	      <screen>&prompt.root; <userinput>cd /usr/src && make cleandir && make cleandir</userinput></screen>
+	      <screen>&prompt.root; <userinput>cd /usr/src &amp;&amp; make cleandir &amp;&amp; make cleandir</userinput></screen>
 
 	      <para>������ <filename>/usr/obj</filename>
 		�ĥ꡼�������ޤ���</para>
 
-	      <screen>&prompt.root; <userinput>rm -fr /usr/obj && mkdir /usr/obj</userinput></screen>
+	      <screen>&prompt.root; <userinput>rm -fr /usr/obj &amp;&amp; mkdir /usr/obj</userinput></screen>
 
 	      <para>����ϥ������ĥ꡼���餹�٤Ƥ�
 		<quote>���餯��</quote> ����ݤ��ޤ���
@@ -6053,7 +6053,7 @@ $TTL 6h
 	    �񤭹��ळ�ȤΤǤ��� <devicename>dev/null</devicename>
 	    ��������ޤ���</para>
 
-	  <screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>
+	  <screen>&prompt.root; <userinput>cd /etc/namedb/dev &amp;&amp; mknod null c 2 2</userinput>
 &prompt.root; <userinput>chmod 666 null</userinput></screen>
 	</listitem>
 
@@ -7424,7 +7424,7 @@ hint.ppc.0.irq="7"</programlisting>
 	<literal>device plip</literal> �Ȥ����Ԥ����뤫���ޤ���
 	<filename>plip.ko</filename>
 	�����ͥ�⥸�塼�뤬�ɤ߹��ޤ�Ƥ��뤳�Ȥ��ǧ���Ƥ���������
-	�ɤ���ξ��Ǥ� &man.ifconfig.8 ���ޥ�ɤ�ľ�ܼ¹Ԥ����Ȥ��ˡ�
+	�ɤ���ξ��Ǥ� &man.ifconfig.8; ���ޥ�ɤ�ľ�ܼ¹Ԥ����Ȥ��ˡ�
 	�ѥ���ͥåȥ�����󥿥ե������������Ϥ��Ǥ���
 	&os;&nbsp;4.X �ǤϤ��Τ褦�ˤʤ�ޤ���</para>
 
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.xml b/ja_JP.eucJP/books/handbook/basics/chapter.xml
index 68e93842c8..66afe5e08c 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 e81fb25f12..1a73483977 100644
--- a/ja_JP.eucJP/books/handbook/book.xml
+++ b/ja_JP.eucJP/books/handbook/book.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
@@ -246,13 +243,10 @@
     &chap.security;
 <!--
     &chap.jails;
--->
     &chap.mac;
-<!--
     &chap.audit;
 -->
     &chap.disks;
-    &chap.geom;
 <!--
     &chap.filesystems;
     &chap.vinum;
@@ -306,8 +300,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 b906f9909b..1918e673c9 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>
@@ -671,7 +671,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"/>
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -746,14 +746,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  �ץ���ץȤ�ɽ�����Ƥ���������
 	  ���Τ褦��ɽ���Ǥ���</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5"/>
-	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok    </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok    </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="bsdinstall-prompt-single">
@@ -764,7 +758,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	      <para>SMP �����ƥ�Υץ���ץȡ������ϥ����ƥ��֤� CPU �ο���</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>�����ǡ�CDROM ��ɥ饤�֤���������
 	  <acronym>PROM</acronym> �ץ���ץȤ�
@@ -962,7 +955,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1003,7 +996,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1017,7 +1010,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1044,7 +1037,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1064,7 +1057,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1153,7 +1146,7 @@ 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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1170,7 +1163,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1195,7 +1188,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1210,7 +1203,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1225,7 +1218,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1246,7 +1239,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1262,7 +1255,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1276,7 +1269,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1352,7 +1345,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1531,7 +1524,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1561,7 +1554,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1574,7 +1567,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1585,7 +1578,7 @@ 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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1617,7 +1610,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1642,7 +1635,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1672,7 +1665,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1692,7 +1685,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1707,7 +1700,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1727,7 +1720,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1758,7 +1751,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1775,7 +1768,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1818,7 +1811,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1844,7 +1837,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1861,7 +1854,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1907,7 +1900,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1929,7 +1922,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1946,7 +1939,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1958,7 +1951,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1970,7 +1963,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1982,7 +1975,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2002,7 +1995,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2049,7 +2042,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2073,7 +2066,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2085,7 +2078,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2187,7 +2180,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2212,7 +2205,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2268,7 +2261,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2286,7 +2279,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2594,7 +2587,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 306835318d..180080dfad 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
@@ -1225,80 +1225,6 @@ Fetching 133 new ports or files... done.</screen>
 	<screen>&prompt.root; <userinput>portmaster -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 install the package, use the following
-	command:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-	<para><application>Docsnap</application> was originally
-	  developed for updating documentation installed
- 	  <filename class="directory">/usr/share/doc</filename>, but
- 	  the following examples could be adapted for other
-	  directories.  Updating to user directories 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 <option>--delete</option> 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 48897c8373..e453dacc0f 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
@@ -32,7 +32,7 @@
       ���ξϤǤϡ�packages �� Ports Collection
       ���Ѥ��ơ��͵��ι⤤�ǥ����ȥåץ��ץꥱ��������ڤ˥��󥹥ȡ��뤹����ˡ���������ޤ���</para>
 
-    <para>&os; �ϡ�<link linkend="linuxemu">&linux �Х��ʥ�ߴ�</link>
+    <para>&os; �ϡ�<link linkend="linuxemu">&linux; �Х��ʥ�ߴ�</link>
       ��ǽ����ĤΤǡ�&linux; �Ѥ˳�ȯ���줿¿���Υ��ץꥱ��������
       &os; �Υǥ����ȥåפǤ����ѤǤ��ޤ���
       &linux; �Х��ʥ�ߴ���ǽ���Ѥ��� port
@@ -374,7 +374,7 @@
 	�������ʤ��顢&linux;
 	�С������Υץ饰�����¹Ԥ��뤿��Υ��եȥ������쥤�� (wrapper) ��¸�ߤ��ޤ���
 	���� wrapper �ϡ�
-	&realplayer �ץ饰����Ȥ��ä�¾�Υ֥饦���Υץ饰����ˤ��б����Ƥ��ޤ���</para>
+	&realplayer; �ץ饰����Ȥ��ä�¾�Υ֥饦���Υץ饰����ˤ��б����Ƥ��ޤ���</para>
 
       <para>�ץ饰����򥤥󥹥ȡ��뤷��ͭ���ˤ���ˤϡ�
 	�ʲ���¹Ԥ��Ƥ���������</para>
diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.xml b/ja_JP.eucJP/books/handbook/disks/chapter.xml
index 7c884b07d3..1bd3106faa 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 fb99b653b8..938b61cdcb 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
@@ -1250,7 +1250,7 @@
 		�˴ؤ�����פʥ˥塼���Ȱ���</emphasis></para>
 
 	    <para><quote>Ports Collection</quote> (<filename
-		role="directory">/usr/ports</filename>) �γ�ȯ�ԡ�
+		class="directory">/usr/ports</filename>) �γ�ȯ�ԡ�
 	      �����Ԥ���ӥ桼���ؤν��פʥ˥塼����
 	      �������ƥ�����/����ե饹�ȥ饯������ѹ�����������ǽ��
 	      ���פʥ��åץ��졼�ɤΰ��⡢
@@ -1268,7 +1268,7 @@
 		�ΥХ��˴ؤ������</emphasis></para>
 
 	    <para><quote>Ports Collection</quote> (<filename
-		role="directory">/usr/ports</filename>) �ξ㳲����
+		class="directory">/usr/ports</filename>) �ξ㳲����
 	      ������ ports ���ѹ��ˤĤ��Ƥ���ƤˤĤ��Ƥε�����
 	      ����ϵ���Ū�ʥ᡼��󥰥ꥹ�ȤʤΤǡ�
 	      ��̩�˵���Ū�����ƤΤߤ������ޤ���</para>
@@ -1630,6 +1630,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 7a35c721c0..4a788f70cc 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 ��ɬ�פǤ���
 	  �Ǿ��Υ��󥹥ȡ���Ǥϡ�
@@ -1023,7 +1023,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1062,14 +1062,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  ���������ơ�PROM �ץ���ץȤ�ɽ�����Ƥ���������
 	  ���Τ褦��ɽ���Ǥ���</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1080,7 +1074,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	      <para>SMP �����ƥ�Υץ���ץȡ������ϥ����ƥ��֤� CPU �ο���</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>�����ǡ�CDROM ��ɥ饤�֤���������
 	  PROM �ץ���ץȤ� <command>boot cdrom</command> �����Ϥ��Ƥ���������</para>
@@ -1188,7 +1181,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1204,7 +1197,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1241,7 +1234,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1258,7 +1251,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1270,7 +1263,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1300,7 +1293,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1321,7 +1314,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1339,7 +1332,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1349,7 +1342,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1381,7 +1374,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1553,7 +1546,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1625,7 +1618,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1674,7 +1667,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1715,7 +1708,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1746,7 +1739,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2012,7 +2005,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2044,7 +2037,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2074,7 +2067,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2091,7 +2084,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2110,7 +2103,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2129,7 +2122,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2154,7 +2147,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2200,7 +2193,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2253,7 +2246,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2284,7 +2277,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2488,7 +2481,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2537,7 +2530,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2725,7 +2718,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2821,7 +2814,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2897,7 +2890,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2956,7 +2949,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3005,7 +2998,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3019,7 +3012,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3041,12 +3034,12 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3" format="PNG"/>
+	    <imagedata fileref="install/console-saver3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
-      <para>�ͤ��ѹ������� &gui.ok �����򤷡�
+      <para>�ͤ��ѹ������� &gui.ok; �����򤷡�
 	<keycap>Enter</keycap> �򲡤��ơ�
 	�����ƥॳ�󥽡���������˥塼����äƤ���������</para>
 
@@ -3055,7 +3048,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3098,7 +3091,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3111,7 +3104,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3124,7 +3117,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3168,7 +3161,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3181,7 +3174,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3197,7 +3190,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3210,7 +3203,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3225,7 +3218,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3239,7 +3232,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3283,7 +3276,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3304,7 +3297,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3333,7 +3326,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3347,7 +3340,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3387,7 +3380,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3400,7 +3393,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3503,7 +3496,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3569,7 +3562,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3647,7 +3640,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3717,7 +3710,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3773,7 +3766,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3801,7 +3794,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4192,7 +4185,7 @@ Please press any key to reboot.</screen>
     </sect2>
 
     <sect2>
-      <title>�ȥ�֥륷�塼�ƥ��󥰤˴ؤ��� Q & A</title>
+      <title>�ȥ�֥륷�塼�ƥ��󥰤˴ؤ��� Q &amp; A</title>
 
       <qandaset>
 	<qandaentry>
@@ -4332,7 +4325,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 9e538173f7..bc862c709f 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 aba90ff57f..764995f2ee 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
@@ -1125,7 +1125,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 eb997bb281..513b07aba6 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
@@ -110,6 +110,10 @@
       �ƥ����Ȥ��󶡤��Ƥ��륢��������ˡ�ϡ�
       �ۥ���̾��³����̤���˵��ܤ���Ƥ��ޤ���</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -807,7 +811,7 @@ Certificate information:
       ���Ū��ǧ�ڤǤ���С������ФȤΰ��Υ��å�����ͭ�����¤��ڤ�뤿�ᡢ
       �������³���ˤϤ⤦���ٸ��ڤ��Ԥ��ޤ���
       ����Ū��ǧ�ڤ���������ˤϡ�ǧ�ڤΤ���ξ�����
-      <filename role="directory">~/.subversion/auth/</filename> ����¸���졢
+      <filename class="directory">~/.subversion/auth/</filename> ����¸���졢
       ͭ�����¤��ڤ��ޤǤϡ��ե��󥬡��ץ��Ȥγ�ǧ�ϵ����ޤ���</para>
 
     <para>�ե�������������ޤ���¾������Τ��ᡢ<acronym>HTTPS</acronym>
@@ -1693,6 +1697,10 @@ usr.bin/</programlisting>
       <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 b64d02ebd3..8d30bc6f68 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>
 
@@ -1712,7 +1712,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 4fe836da4c..ab5103d8b0 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
@@ -1284,7 +1284,7 @@ Deinstalling ca_root_nss-3.13.5... done</screen>
 	���Τ褦�ʥե�������Ѥ����ü�ʾ����ˤ��б����Ƥ��ޤ���
 	�����Υե�����ˤĤ��Ƥξܺ٤����
 	ports �ΰ���Ū�������ˤĤ��Ƥϡ�<ulink
-	url="&url.books.porters-handbook/index.html">port
+	url="&url.books.porters-handbook;/index.html">port
 	�����ԤΤ���Υϥ�ɥ֥å�</ulink> ������������</para>
 
       <para>port �ϼºݤΥ����������� (<quote>distfile</quote> �Ȥ�ƤФ�ޤ�)
@@ -1930,7 +1930,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 0cab2fe2e5..8dba6b9c84 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 aa537f2cbb..0794c7399d 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
@@ -694,7 +694,7 @@ passwd: done</screen>
     <indexterm><primary>�ǥ�������������</primary></indexterm>
     <para>�ǥ��������������ϡ��桼�������ѤǤ���ǥ��������̤����¤���
       �������ٷ׻����ʤ��Ƥ�ǥ����������̤��ñ�˳�ǧ�Ǥ�����ʤ��󶡤��Ƥ��ޤ���
-      ���������ˤĤ��Ƥϡ�<link linkend="quotas"></link> �Dz��⤷�Ƥ��ޤ���</para>
+      ���������ˤĤ��Ƥϡ�<xref linkend="quotas"/> �Dz��⤷�Ƥ��ޤ���</para>
 
     <para>����¾�Υ꥽���������¤Ȥϡ��桼��������Ǥ���
       CPU������ʤɤΥ꥽���������¤�����ʤΤ��ȤǤ���
diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.xml b/ja_JP.eucJP/books/handbook/x11/chapter.xml
index 4b977484a7..a2c61c1c23 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
@@ -304,11 +304,11 @@
   <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/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile
index 5b43c3b471..5c5a5acb52 100644
--- a/ja_JP.eucJP/books/porters-handbook/Makefile
+++ b/ja_JP.eucJP/books/porters-handbook/Makefile
@@ -22,9 +22,5 @@ INSTALL_ONLY_COMPRESSED?=
 # XML content
 SRCS=  book.xml
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index cb62bb58d5..a2635fce50 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.xml
+++ b/ja_JP.eucJP/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -4650,7 +4647,7 @@ USE_SDL+=   mixer
 	<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��򤹤٤�������ꤹ�٤��Ǥ�����
@@ -4803,8 +4800,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}
@@ -7587,7 +7584,7 @@ pre-install:
 
     <para>���Υǥ��쥯�ȥ깽¤�򿷤����ե��������¸���Ƥ���������</para>
 
-    <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+    <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
 
     <para>���� <filename>pkg-plist</filename>
       �ե������������Ƥ���������</para>
@@ -7598,11 +7595,11 @@ pre-install:
       ������ 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 | comm -13 OLD-DIRS - | sort -r | 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 | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
     <para>�Ǹ�˥ѥå��󥰥ꥹ�Ȥ���������ɬ�פ�����ޤ�;
       <emphasis>���٤�</emphasis>����ư������Ƥ���櫓�ǤϤ���ޤ���
diff --git a/ja_JP.eucJP/books/porters-handbook/freebsd.dsl b/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index d90bcb235c..0000000000
--- a/ja_JP.eucJP/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD Japanese Documentation Project
-
-     Original revision: 1.5
-     $FreeBSD$
--->
-
-<!-- Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files, 
-     rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE"> 
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      <![ %output.html; [ 
-	(define ($email-footer$)
-          (make sequence
-            (literal "FreeBSD ports �����ƥ�˴ؤ������ϡ�(�Ѹ��) <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal "> �ء�")
-            (make empty-element gi: "br")
-            (literal "����ʸ��θ�ʸ�˴ؤ��뤪�䤤��碌�ϡ�(�Ѹ��) <")
-             (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-               (literal "doc@FreeBSD.org"))
-	     (literal "> �ޤǤ��ꤤ���ޤ���")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ja_JP.eucJP/share/xml/authors.ent b/ja_JP.eucJP/share/xml/authors.ent
index 3aa7fc4d0c..5e1b8be541 100644
--- a/ja_JP.eucJP/share/xml/authors.ent
+++ b/ja_JP.eucJP/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/catalog b/ja_JP.eucJP/share/xml/catalog
index 3f6c44e4ce..2422c1740c 100644
--- a/ja_JP.eucJP/share/xml/catalog
+++ b/ja_JP.eucJP/share/xml/catalog
@@ -1,44 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
-        "authors.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
-        "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
-	"trademarks.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/ja_JP.eucJP/share/xml/catalog.xml b/ja_JP.eucJP/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/ja_JP.eucJP/share/xml/catalog.xml
+++ b/ja_JP.eucJP/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent
index 679ba28ec6..1450780b91 100644
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@@ -1,38 +1,45 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
+<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
+	"authors.ent">
 %authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA">
+<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
+	"teams.ent">
 %teams-ja;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
+<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
+	"mailing-lists.ent">
 %mailing-lists-ja;
 <!--
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
 -->
-<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA">
+<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
+	"newsgroups.ent">
 %newsgroups-ja;
 <!--
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
 -->
-<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
+<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
+	"trademarks.ent">
 %trademarks-ja;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	"nonexistent">
 %glossary;
diff --git a/ja_JP.eucJP/share/xml/freebsd.dsl b/ja_JP.eucJP/share/xml/freebsd.dsl
index 24287b9b34..30c745f542 100644
--- a/ja_JP.eucJP/share/xml/freebsd.dsl
+++ b/ja_JP.eucJP/share/xml/freebsd.dsl
@@ -2,46 +2,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %output.html; [
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "��ʸ�񡢤����¾��ʸ��� ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal " �������������ɤǤ��ޤ���")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "FreeBSD �˴ؤ�����䤬������ˤϡ�")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/ja/docs.html"))
-                  (literal "�ɥ������"))
-                (literal " ���ɤ����� <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal "> �ޤ� (�Ѹ��) Ϣ�����Ƥ���������")
-                (make empty-element gi: "br")
-                (literal "��ʸ��˴ؤ������ˤĤ��Ƥϡ�<")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal "> �ޤ��Żҥ᡼��� (�Ѹ��) ���äƤ���������")))))
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/ja_JP.eucJP/share/xml/mailing-lists.ent b/ja_JP.eucJP/share/xml/mailing-lists.ent
index e1f1643157..7846f33d9e 100644
--- a/ja_JP.eucJP/share/xml/mailing-lists.ent
+++ b/ja_JP.eucJP/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
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" -->
diff --git a/ja_JP.eucJP/share/xml/newsgroups.ent b/ja_JP.eucJP/share/xml/newsgroups.ent
index c61635ad19..577e49f89a 100644
--- a/ja_JP.eucJP/share/xml/newsgroups.ent
+++ b/ja_JP.eucJP/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/ja_JP.eucJP/share/xml/teams.ent b/ja_JP.eucJP/share/xml/teams.ent
index 341e8610c8..d70b8b0043 100644
--- a/ja_JP.eucJP/share/xml/teams.ent
+++ b/ja_JP.eucJP/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/ja_JP.eucJP/share/xml/trademarks.ent b/ja_JP.eucJP/share/xml/trademarks.ent
index 55b954d3b1..61a66d06af 100644
--- a/ja_JP.eucJP/share/xml/trademarks.ent
+++ b/ja_JP.eucJP/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/ja_JP.eucJP/share/xsl/freebsd-common.xsl b/ja_JP.eucJP/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-epub.xsl b/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-fo.xsl b/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..a9a8b154f1
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='euc-jp'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>��ʸ�񡢤����¾��ʸ���
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>
+    �������������ɤǤ��ޤ���</small></p>
+
+    <p align="center"><small>FreeBSD �˴ؤ�����䤬������ˤϡ�
+    <a href="http://www.FreeBSD.org/ja/docs.html">�ɥ������</a> ���ɤ�����
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt; �ޤ� (�Ѹ��) Ϣ�����Ƥ���������<br/>
+    ��ʸ��˴ؤ������ˤĤ��Ƥϡ�
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt; �ޤ��Żҥ᡼��� (�Ѹ��) ���äƤ���������</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl b/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/ja_JP.eucJP/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 040fab1286..7485ab93cd 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -43,7 +43,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -318,30 +317,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
index 3d31706e37..ab1b04e996 100644
--- a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -1737,7 +1737,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
 
 	  <para>Дараагийн алхам нь <application>hostapd</application>-г эхлүүлэх:</para>
 
-	  <screen>&prompt.root <userinput>service hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service hostapd forcestart</userinput></screen>
 
 	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -5587,7 +5587,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	IP-г хүчилж болох юм. Дараах тушаалыг <hostid>provider.example.org</hostid>
 	дээр ажиллуулах шаардлагатай:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>Хостод тохирох <devicename>carp</devicename> интерфэйс дээр
 	үүнийг хийх ёстой.</para>
diff --git a/mn_MN.UTF-8/books/handbook/audit/chapter.xml b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
index 60eb0e5076..772cfe350f 100644
--- a/mn_MN.UTF-8/books/handbook/audit/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/basics/chapter.xml b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
index f13560c945..70a5c29398 100644
--- a/mn_MN.UTF-8/books/handbook/basics/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -1131,7 +1131,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1149,7 +1149,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1175,7 +1175,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1199,7 +1199,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1225,7 +1225,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1517,7 +1517,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
index 029293b543..037fba34b3 100644
--- a/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/book.xml b/mn_MN.UTF-8/books/handbook/book.xml
index 370df68d54..0b43e34a57 100644
--- a/mn_MN.UTF-8/books/handbook/book.xml
+++ b/mn_MN.UTF-8/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/mn_MN.UTF-8/books/handbook/boot/chapter.xml b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
index 81521ec38d..74e296f265 100644
--- a/mn_MN.UTF-8/books/handbook/boot/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
index a5ced4aa37..074ee3577b 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -642,7 +642,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"/>
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -670,7 +670,7 @@ Loading /boot/defaults/loader.conf
 	    <keycap>Alt</keycap>
 	    <keycap>O</keycap>
 	    <keycap>F</keycap>
-	  </keycombo> товчлууруудыг  &apple биш гар дээр дарж хийнэ.
+	  </keycombo> товчлууруудыг  &apple; биш гар дээр дарж хийнэ.
 	  <prompt>0 ></prompt> гарч ирэхэд доорхийг бичнэ.</para>
 
 	<screen><userinput>boot cd:,\ppc\loader cd:0</userinput></screen>
@@ -705,14 +705,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  дарах юм уу эсвэл сериал консолоор <command>BREAK</command> илгээх хэрэгтэй.
 	  Иймэрхүү харагдах болно:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5"/>
-	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok    </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="bsdinstall-prompt-single">
@@ -725,7 +719,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		indicates the number of the active CPU.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>Энэ үед хөтөч дотроо CDROM-оо хийгээд <acronym>PROM</acronym>
 	  дээрээс <command>boot cdrom</command> гэж бичнэ.</para>
@@ -921,7 +914,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -964,7 +957,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -978,7 +971,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1005,7 +998,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1024,7 +1017,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1110,7 +1103,7 @@ 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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1128,7 +1121,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1152,7 +1145,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Зааварчилсан эсвэл Гар аргаар хуваах горимыг сонгох</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"/>
 	  </imageobject>
       </mediaobject>
       </figure>
@@ -1167,7 +1160,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1183,7 +1176,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Бүх диск эсвэл хуваалтыг сонгох</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1201,7 +1194,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1217,7 +1210,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Хуваалтуудыг гараар хийх нь</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create" format="PNG"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1232,7 +1225,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1306,7 +1299,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1480,7 +1473,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1509,7 +1502,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1522,7 +1515,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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1534,7 +1527,7 @@ 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"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1566,7 +1559,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1592,7 +1585,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1625,7 +1618,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1642,7 +1635,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1659,7 +1652,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1679,7 +1672,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1711,7 +1704,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1728,7 +1721,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1770,7 +1763,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1795,7 +1788,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1812,7 +1805,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1855,7 +1848,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1878,7 +1871,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1895,7 +1888,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1907,7 +1900,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1919,7 +1912,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1931,7 +1924,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1952,7 +1945,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1998,7 +1991,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2022,7 +2015,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2034,7 +2027,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2133,7 +2126,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2158,7 +2151,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2213,7 +2206,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2229,7 +2222,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/mn_MN.UTF-8/books/handbook/chapters.ent b/mn_MN.UTF-8/books/handbook/chapters.ent
index 0956278d0e..af58bdce2a 100644
--- a/mn_MN.UTF-8/books/handbook/chapters.ent
+++ b/mn_MN.UTF-8/books/handbook/chapters.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -16,235 +16,62 @@
 
 -->
 
-<!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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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/mn_MN.UTF-8/books/handbook/colophon.xml b/mn_MN.UTF-8/books/handbook/colophon.xml
index 69a5700b05..dff3fc7762 100644
--- a/mn_MN.UTF-8/books/handbook/colophon.xml
+++ b/mn_MN.UTF-8/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/config/chapter.xml b/mn_MN.UTF-8/books/handbook/config/chapter.xml
index a48d75dc87..86c94559a9 100644
--- a/mn_MN.UTF-8/books/handbook/config/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -756,7 +756,7 @@ sshd is running as pid 433.</screen>
     <para><filename>rc.d</filename> системийн талаар нэмэлт мэдээллийг &man.rc.8;
       болон &man.rc.subr.8; гарын авлагын хуудаснуудаас олж болно. Хэрэв та өөрийн
 	rc.d скриптүүд бичих эсвэл байгаагаа сайжруулахыг сонирхож байгаа бол танд бас
-	<ulink url="&url.articles.rc-scripting">энэ нийтлэл</ulink> хэрэгтэй байж
+	<ulink url="&url.articles.rc-scripting;">энэ нийтлэл</ulink> хэрэгтэй байж
 	болох юм.</para>
   </sect1>
 
diff --git a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
index d6c722dc67..331db39e75 100644
--- a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -1121,77 +1121,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>Пав</firstname>
-	    <surname>Лукистник</surname>
-	    <contrib>Мэдээллээр хангасан </contrib>
-	  </author>
-	</authorgroup>
-      </sect2info>
-
-      <title>Docsnap-ийг ашиглах нь</title>
-
-      <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
-      <indexterm>
-	<primary>Docsnap</primary>
-	<see>Updating and Upgrading</see>
-      </indexterm>
-
-      <para><application>Docsnap</application> нь &os;-ийн баримтуудыг
-	хялбар, хурдан аргаар шинэчлэхэд зориулагдсан &man.rsync.1;
-	репозитор юм. <quote><application>Docsnap</application> сервер</quote>
-	нь баримтын эхүүдийг дагаж тэдгээрийг цаг бүр HTML хэлбэрт бүтээж
-	байдаг. <filename role="package">textproc/docproj</filename> нь
-	<application>Docsnap</application>-д хэрэггүй байдаг. Учир нь
-	зөвхөн бүтээсэн баримтад зориулсан нөхөөсүүд байдаг болохоор тэр юм.</para>
-
-      <para>Энэ техникийг ашиглахад шаардлагатай цорын ганц зүйл нь
-	<filename role="package">net/rsync</filename> порт юм уу эсвэл багц
-	байдаг. Үүнийг нэмэхийн тулд дараах тушаалыг ашиглана:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-	<para><application>Docsnap</application> нь
-	  <filename class="directory">/usr/share/doc</filename>-д суулгагдсан
-	  баримтыг шинэчлэхэд зориулж анхлан хөгжүүлэгдсэн боловч дараах жишээнүүдийг
-	  бусад сангуудын хувьд тохируулан ашиглаж болно. Хэрэглэгчийн сангуудын
-	  хувьд энэ нь <username>root</username> эрхийг шаарддаггүй.</para>
-      </note>
-
-      <para>Баримтын цуглуулгыг шинэчлэхийн тулд дараах тушаалыг
-	ажиллуулна:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <note>
-	<para>Одоогоор зөвхөн нэг <application>Docsnap</application>
-	  сервер байгаа, <hostid>docsnap.sk.FreeBSD.org</hostid> дээр
-	  харуулагдсан байгаа.</para>
-      </note>
-
-      <para>Энд <option>--delete</option> тохируулыг ашиглах хэрэггүй,
-	учир нь <command>make installworld</command> тушаалын үеэр
-	<filename class="directory">/usr/share/doc</filename>
-	санд суулгагдсан зарим зүйлсийг санамсаргүйгээр устгаж болох юм.
-	Цэвэрлэхийн тулд энэ тушаалыг ашиглана:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <para>Хэрэв баримтын хэсгийг шинэчлэх шаардлагатай бол жишээ нь
-	Англи баримтыг зөвхөн шинэчлэх бол дараах тушаалыг ашиглах
-	шаардлагатай:</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/mn_MN.UTF-8/books/handbook/desktop/chapter.xml b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
index c8e695bbb7..93df24b3b2 100644
--- a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/disks/chapter.xml b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
index 172f5afa60..2d8aab61f7 100644
--- a/mn_MN.UTF-8/books/handbook/disks/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -2698,16 +2698,6 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	Сүйрэл эсвэл өгөгдлийн алдагдалд хүргэсэн тэр явдал дахин болж болох юм. Одоо зарцуулсан
 	нэг цаг таныг зовлонд учрахаас хожим аварч болох юм.</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* I Did Not Prepare for the Disaster, What Now?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
@@ -4401,7 +4391,7 @@ case "$1" in
 
 		# Wait for any "hastd secondary" processes to stop
 		for disk in ${resources}; do
-			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
 				sleep 1
 			done
 
@@ -4416,7 +4406,7 @@ case "$1" in
 		# Wait for the /dev/hast/* devices to appear
 		for disk in ${resources}; do
 			for I in $( jot 60 ); do
-				[ -c "/dev/hast/${disk}" ] && break
+				[ -c "/dev/hast/${disk}" ] &amp;&amp; break
 				sleep 0.5
 			done
 
@@ -4449,7 +4439,7 @@ case "$1" in
 				umount -f /hast/${disk}
 			fi
 			sleep $delay
-			hastctl role secondary ${disk} 2>&1
+			hastctl role secondary ${disk} 2>&amp;1
 			if [ $? -ne 0 ]; then
 				logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
 				exit 1
diff --git a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
index 6b8d54e2e2..dada064b30 100644
--- a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
index a5d8d425d6..334b5d7c3c 100644
--- a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!--
      The FreeBSD Mongolian Documentation Project
@@ -356,7 +356,7 @@
 
 	    <row>
 	      <entry>&a.mips.name;</entry>
-	      <entry>FreeBSD-г &mips рүү порт хийх;</entry>
+	      <entry>FreeBSD-г &mips; рүү порт хийх;</entry>
 	    </row>
 
 	    <row>
@@ -1514,7 +1514,7 @@
 		тухай чухал мэдээнүүд болон зааврууд</emphasis></para>
 
 	    <para><quote>Портын цуглуулгын</quote> (<filename
-		role="directory">/usr/ports</filename>) хөгжүүлэгчид, порт хийгчид
+		class="directory">/usr/ports</filename>) хөгжүүлэгчид, порт хийгчид
 	      болон хэрэглэгчдэд зориулсан архитектур/дэд бүтцийн өөрчлөлтүүд,
 	      шинэ боломжууд, маш чухал шинэчлэх зааврууд болон хувилбар
 	      инженерчлэлийн мэдээлэл зэрэг чухал мэдээнүүд. Энэ нь бага
@@ -2081,6 +2081,11 @@
 
     <sect2 id="eresources-web-mirrors">
       <title>Албан ёсны толин хуудаснууд</title>
+	  
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
index fcc0a71777..816ac8c640 100644
--- a/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -220,7 +220,7 @@ example      17547136       0 17547136     0%    /example</screen>
 	  шиг хандах боломжтой, үүн дээр файлууд үүсгэж хэрэглэгчид
 	  дараах жишээн дээрх шиг үзэх боломжтой байна:</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
index 6a3e5825d2..4816cab684 100644
--- a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.xml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
index de0b78d529..350a9763bf 100644
--- a/mn_MN.UTF-8/books/handbook/geom/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -392,13 +392,13 @@ Done.</screen>
       тушаалыг ашиглан хуулж болно.</para>
 
       <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput></screen>
 
       <para><filename>/mnt/etc/fstab</filename>-г шинэ толин 
       тусгал файлын систем рүү заагдсан байхаар засварлах 
@@ -639,15 +639,15 @@ BSD 8
       шаардагдаж магадгүйг санаарай.</para>
 
       <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt &amp;&amp; restore -rf -)</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 &amp;&amp; restore -rf -)</userinput></screen>
 
       <para><devicename>ada1</devicename>-с ачаалж 
       системийг дахин ачаална. Бүгд ажиллаж байгаа бол 
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index 71fcf69366..f9708964a8 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -965,7 +965,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1002,14 +1002,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  эсвэл &man.cu.1; дээр <command>~#</command>-г ашиглан) <command>BREAK</command>-г
 	  илгээх хэрэгтэй. Энэ нь иймэрхүү харагдах болно:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1022,7 +1016,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		тоо нь идэвхтэй байгаа CPU-ийн тоог илэрхийлдэг.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>Энэ хүрэхэд өөрийн хөтөчдөө CDROM-оо хийгээд PROM хүлээх мөрөөс
 	  <command>boot cdrom</command> тушаалыг бичих хэрэгтэй.</para>
@@ -1131,7 +1124,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1147,7 +1140,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1184,7 +1177,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1200,7 +1193,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1212,7 +1205,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1243,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1263,7 +1256,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1281,7 +1274,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1291,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1322,7 +1315,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1496,7 +1489,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1561,7 +1554,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1601,7 +1594,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1644,7 +1637,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1672,7 +1665,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1919,7 +1912,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1946,7 +1939,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1971,7 +1964,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1988,7 +1981,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2006,7 +1999,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2023,7 +2016,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2049,7 +2042,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2099,7 +2092,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2151,7 +2144,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2184,7 +2177,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2369,7 +2362,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2403,7 +2396,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2556,7 +2549,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2647,7 +2640,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2723,7 +2716,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2778,7 +2771,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2826,7 +2819,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2840,7 +2833,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2859,7 +2852,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2872,7 +2865,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2913,7 +2906,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2926,7 +2919,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2938,7 +2931,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2977,7 +2970,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2989,7 +2982,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3003,7 +2996,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3015,7 +3008,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3029,7 +3022,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3045,7 +3038,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3082,7 +3075,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3099,7 +3092,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3122,7 +3115,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3134,7 +3127,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3167,7 +3160,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3180,7 +3173,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3269,7 +3262,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3325,7 +3318,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3379,7 +3372,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3430,7 +3423,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3462,7 +3455,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3483,7 +3476,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
index aa98eef773..59c0d99b44 100644
--- a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/jails/chapter.xml b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
index 766dc86994..879a26e590 100644
--- a/mn_MN.UTF-8/books/handbook/jails/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
     The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
index a5fa3ac99e..d862fdb8f2 100644
--- a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/l10n/chapter.xml b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
index 87888a0498..7ccec9b377 100644
--- a/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
index 8b18ee7446..c3a36e1b3b 100644
--- a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -627,14 +627,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -905,7 +905,7 @@ exit 0</programlisting>
 		үүсгэнэ:</para>
 
 	  <programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/mn_MN.UTF-8/books/handbook/mac/chapter.xml b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
index c101012491..ea37718734 100644
--- a/mn_MN.UTF-8/books/handbook/mac/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
index dc0924a5e8..8fa6f74eff 100644
--- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -1600,11 +1600,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	<para>Дараах тушаалуудыг ажиллуулж <application>sendmail</application>-г дахин эмхэтгэнэ:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para><filename>/usr/src</filename> тийм ч ихээр өөрчлөгдөөгүй бөгөөд
 	хэрэгцээтэй хуваалцдаг сангууд байгаа тохиолдолд <application>sendmail</application>-ийн эмхэтгэлт
@@ -1863,7 +1863,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1875,7 +1875,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -1912,7 +1912,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -1961,7 +1961,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1980,7 +1980,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -1990,7 +1990,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2002,7 +2002,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2019,7 +2019,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
index cc0fbd7349..a46999b6ea 100644
--- a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -107,6 +107,10 @@
 	Сайт болгоны хувьд хандах аргууд нь хостын нэрийн дараа хаалтанд өгөгдсөн
 	байгаа болно.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+	
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -753,7 +757,7 @@ Certificate information:
       Түр зуурын сертификат нь сервертэй хийх нэг удаагийн 
       сессээр дуусгавар болох бөгөөд дараагийн удаа шалгах 
       алхам дахин хийгдэх болно. Сертификатыг бүрмөсөн зөвшөөрснөөр 
-      нэвтрэх эрхийг <filename role="directory">~/.subversion/auth/</filename>
+      нэвтрэх эрхийг <filename class="directory">~/.subversion/auth/</filename>
       санд хадгалж сертификатын хугацаа дуустал хэрэглэгчээс 
       хурууны хээг дахин шалгахыг асуудаггүй.</para>
 
@@ -1559,6 +1563,10 @@ usr.bin/</programlisting>
     <para>&os;-д зориулсан <link linkend="cvsup">CVSup</link> серверүүд дараах хаягууд дээр
 	ажиллаж байгаа:</para>
 
+    &chap.mirrors.cvsup.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
diff --git a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
index 3361fcb596..dc46c414ee 100644
--- a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -1556,7 +1556,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>
 
diff --git a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
index 13b31c9dd7..2af87a4de8 100644
--- a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
index 9fce65a91b..f0e6482cb1 100644
--- a/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/ports/chapter.xml b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
index f8d4dbd1f0..21ba16ff53 100644
--- a/mn_MN.UTF-8/books/handbook/ports/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
index d1566c0caf..8ce58bac70 100644
--- a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/preface/preface.xml b/mn_MN.UTF-8/books/handbook/preface/preface.xml
index 50743c5122..f90ee9e6c2 100644
--- a/mn_MN.UTF-8/books/handbook/preface/preface.xml
+++ b/mn_MN.UTF-8/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
     The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/printing/chapter.xml b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
index 8a218c2af4..14972bb5c5 100644
--- a/mn_MN.UTF-8/books/handbook/printing/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/security/chapter.xml b/mn_MN.UTF-8/books/handbook/security/chapter.xml
index 56a3a49555..8bf812605e 100644
--- a/mn_MN.UTF-8/books/handbook/security/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
index 0350b77a59..60227c8080 100644
--- a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -1349,7 +1349,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
 	</indexterm>
 
 	<para><filename>/etc/ttys</filename> файлын тохиргоо
-	<link linkend="ex-etc-ttys"></link> хэсэгт яригдсан байгаа.
+	<xref linkend="ex-etc-ttys"/> хэсэгт яригдсан байгаа.
 	Модемуудын тохиргоо төстэй боловч бид өөр терминалын төрлийг заахын тулд
 	<command>getty</command> уруу өөр нэмэлт өгөгдлүүдийг дамжуулах ёстой.
 	Түгжигдсэн хурдтай болон таарах хурдтай тохиргоонуудын ерөнхий хэлбэр нь
@@ -1999,7 +1999,7 @@ raisechar=^^</programlisting>
 	хүссэн системийн администраторууд болон цөм эсвэл төхөөрөмжийн драйверуудыг
 	дибаг хийхийг хүссэн хөгжүүлэгчид юм.</para>
 
-      <para><link linkend="boot"></link>-т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг
+      <para><xref linkend="boot"/>-т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг
 	хэрэглэдэг. Эхний хоёр шат нь ачаалах диск дээрх &os;-ийн зүсмэлийн эхлэл дээр
 	хадгалагддаг ачаалах блокийн кодод байдаг. Ачаалах блок нь ачаалагч дуудагчийг
 	(<filename>/boot/loader</filename>) гурав дахь шатны код болгон дуудаж
@@ -2059,7 +2059,7 @@ raisechar=^^</programlisting>
 
 	  <para>Танд null-модем кабель эсвэл стандарт цуваа кабель болон null-модем
 		хувиргагч хэрэгтэй болно. Цуваа кабелиудын тухай хэлэлцүүлгийг
-		<link linkend="serial-cables-ports"></link> хэсгээс үзнэ үү.</para>
+		<xref linkend="serial-cables-ports"/> хэсгээс үзнэ үү.</para>
 	</step>
 
 	<step>
@@ -2347,7 +2347,7 @@ boot:</screen>
       <para>Ачаалагч дуудагч дуудагдсаны дараа та ачаалах процессийн гурав дахь
 	шатанд байгаа бол ачаалагч дуудагчид зохих орчны хувьсагчуудыг тохируулж
 	дотоод консол болон цуваа консолын хооронд та шилжиж чадсан хэвээр байх
-	болно. <link linkend="serialconsole-loader"></link>-г үзнэ үү.</para>
+	болно. <xref linkend="serialconsole-loader"/>-г үзнэ үү.</para>
     </sect2>
 
   <sect2 id="serialconsole-summary">
@@ -2500,7 +2500,7 @@ boot:</screen>
 	    <para>Ачаалах блокуудыг консолын шинэ хурд заагдсан
 		<makevar>BOOT_COMCONSOLE_SPEED</makevar> хувьсагчтай цуг
 		дахин эмхэтгэнэ. Шинэ ачаалах блокуудыг бүтээж суулгах талаар
-		дэлгэрэнгүй заавруудыг <link linkend="serialconsole-com2"></link>-с
+		дэлгэрэнгүй заавруудыг <xref linkend="serialconsole-com2"/>-с
 		үзнэ үү.</para>
 
 	    <para>Хэрэв цуваа консол нь <option>-h</option> тохируулгатайгаар
@@ -2552,7 +2552,7 @@ console="comconsole,vidconsole"</programlisting>
 
 	<procedure>
 	  <step>
-	    <para>Цөмийн эхийг авна. (<link linkend="updating-upgrading"></link> бүлгийг үзнэ үү)</para>
+	    <para>Цөмийн эхийг авна. (<xref linkend="updating-upgrading"/> бүлгийг үзнэ үү)</para>
 	  </step>
 
 	  <step>
diff --git a/mn_MN.UTF-8/books/handbook/txtfiles.ent b/mn_MN.UTF-8/books/handbook/txtfiles.ent
index f37cdbb854..0cf7bab3e2 100644
--- a/mn_MN.UTF-8/books/handbook/txtfiles.ent
+++ b/mn_MN.UTF-8/books/handbook/txtfiles.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.xml b/mn_MN.UTF-8/books/handbook/users/chapter.xml
index f1b82b7320..b1171818c7 100644
--- a/mn_MN.UTF-8/books/handbook/users/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -570,7 +570,7 @@ Other information:</screen>
 	  &man.ypchfn.1;, болон &man.ypchsh.1; нартай ижилхэн холбоос.
 	  NIS дэмжлэг автоматаар хийгдсэн байгаа. Тийм болохоор тушаалын
 	  урд нь <literal>yp</literal> угтвар залгах шаардлагагүй.
-	  NIS хэрхэн тохируулах талаар <link linkend="network-servers"></link>
+	  NIS хэрхэн тохируулах талаар <xref linkend="network-servers"/>
 	  хэсэгт тайлбарлагдах болно.</para>
       </note>
     </sect2>
@@ -659,8 +659,8 @@ passwd: done</screen>
     <indexterm><primary>дискний хуваарилалт</primary></indexterm>
     <para>Дискийн хуваарилалт нь хэрэглэгчийн диск хэрэглэх хэмжээг
 	зааглаж өгдөг бөгөөд тухай бүрд уг хэмжээг тооцож бодолгүй
-	шуурхай шалгах боломж өгдөг. Хуваарилалт нь <link
-      linkend="quotas"></link> бүлэгт авч хэлэлцэгдсэн.</para>
+	шуурхай шалгах боломж өгдөг. Хуваарилалт нь <xref
+      linkend="quotas"/> бүлэгт авч хэлэлцэгдсэн.</para>
 
     <para>Бусад нөөцийн хязгаарлалтуудад Процессор,
 	санах ойн хэмжээ болон бусад хэрэглэгчийн хэрэглэх нөөцүүд
diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
index 535d3e22af..088946e90a 100644
--- a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 	The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index f4df3ae0c6..09895c5d96 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -270,8 +270,8 @@
 		ижил локал сүлжээнд виртуал машиныг холбохын тулд DHCP-г
 		ашиглах явдал юм. Үүнийг <filename>/etc/rc.conf</filename>
 		файлд <literal>ifconfig_ed0="DHCP"</literal> гэж
-		нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд <link
-		linkend="advanced-networking"></link>-д тайлбарлагдсан
+		нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд <xref
+		linkend="advanced-networking"/>-д тайлбарлагдсан
 		байгаа.</para>
 	    </step>
           </procedure>
@@ -765,7 +765,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 		DHCP-ийг ашиглах явдал юм. <literal>ifconfig_de0="DHCP"</literal>
 		мөрийг <filename>/etc/rc.conf</filename> файлд нэмж
 		үүнийг хийнэ. Сүлжээний илүү нарийн тохиргоонуудын
-		талаар <link linkend="advanced-networking"></link> дээр
+		талаар <xref linkend="advanced-networking"/> дээр
 		тайлбарласан байгаа болно.</para>
 	    </step>
           </procedure>
@@ -963,7 +963,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 		юм. <filename>/etc/rc.conf</filename> файлд
 		<literal>ifconfig_em0="DHCP"</literal> мөрийг нэмснээр
 		үүнийг хийж болно. Сүлжээний илүү дэлгэрэнгүй тохиргоонуудын
-		талаар <link linkend="advanced-networking"></link>-д тайлбарласан
+		талаар <xref linkend="advanced-networking"/>-д тайлбарласан
 		байгаа.</para>
 	    </step>
           </procedure>
@@ -1007,7 +1007,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	  role="package">emulators/virtualbox-ose-additions</filename> багц эсвэл портыг
 	&os; зочин дээр суулгана. Энэ нь портыг суулгах болно:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
 
       <para>Дараах мөрүүдийг <filename>/etc/rc.conf</filename>-д нэмнэ:</para>
 
diff --git a/mn_MN.UTF-8/books/handbook/x11/chapter.xml b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
index 277d838e2c..44ca67dd4a 100644
--- a/mn_MN.UTF-8/books/handbook/x11/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
@@ -306,7 +306,7 @@
       гүйцэтгэл юм.  <application>&xorg;</application> нь X.Org сангаас
       гаргасан Х цонхот системийн Х сервер.
 	  <application>&xorg;</application> нь
-      <application>&xfree86&nbsp;4.4RC2</application> болон X11R6.6
+      <application>&xfree86;&nbsp;4.4RC2</application> болон X11R6.6
 	  хоёрын эх бичлэг дээр үндэслэгдсэн билээ.
       &os;-н портын цуглуулга дотор байгаа
 	  <application>&xorg;</application>-н хувилбар нь &xorg.version; гэж буй.</para>
diff --git a/mn_MN.UTF-8/share/xml/catalog b/mn_MN.UTF-8/share/xml/catalog
index 5e9a47fac0..2422c1740c 100644
--- a/mn_MN.UTF-8/share/xml/catalog
+++ b/mn_MN.UTF-8/share/xml/catalog
@@ -1,42 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Mongolian specific ..................................................... --
-
-  -- ...................................................................... --
-  -- The FreeBSD Mongolian Documentation Project
-  -- ...................................................................... --
-  --
-  --
-  -- ...................................................................... --
-  -- Original revision: 1.5
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-        "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
-        "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-        "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
-        "newsgroups.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
-        "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
-        "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mongolian Translators Entities//MN"
-	"translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
-	"glossary.ent"
+       "freebsd.dsl"
diff --git a/mn_MN.UTF-8/share/xml/catalog.xml b/mn_MN.UTF-8/share/xml/catalog.xml
new file mode 100644
index 0000000000..0e9826192d
--- /dev/null
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//MN"
+        uri="translators.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+        uri="l10n.ent" />
+</catalog>
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index 3be4888484..a7528cc690 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -6,25 +6,27 @@
      $FreeBSD$
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
+	"glossary.ent">
 %glossary;
diff --git a/mn_MN.UTF-8/share/xml/freebsd.dsl b/mn_MN.UTF-8/share/xml/freebsd.dsl
index 10f299013f..1de7e806e1 100644
--- a/mn_MN.UTF-8/share/xml/freebsd.dsl
+++ b/mn_MN.UTF-8/share/xml/freebsd.dsl
@@ -8,56 +8,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % lang.mn.dsssl "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %output.html; [
-
-      <![ %lang.mn.dsssl; [
-        (define %gentext-language% "mn")
-      ]]>
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Энэ болон бусад баримтуудыг ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal " хаягаас татаж авч болно.")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "FreeBSD-ийн талаар <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal "> хаягтай холбоо барихаасаа өмнө ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "баримтыг"))
-                (literal " уншина уу.")
-                (make empty-element gi: "br")
-                (literal "Энэ бичиг баримттай холбоотой асуулт байвал <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal "> хаягаар цахим захидал явуулна уу.")
-                (make empty-element gi: "br")
-                (literal "Энэ  бичиг баримтын орчуулгатай холбоотой асуулт байвал <")
-		(create-link (list (list "HREF" "mailto:admin@mnbsd.org"))
-                  (literal "admin@mnbsd.org"))
-	        (literal "> хаягаар цахим захидал явуулна уу.")))))
-      ]]>
 
         (define (local-mn-label-title-sep)
         (list
diff --git a/mn_MN.UTF-8/share/xml/glossary.ent b/mn_MN.UTF-8/share/xml/glossary.ent
index 4f47b61551..4e17355b36 100644
--- a/mn_MN.UTF-8/share/xml/glossary.ent
+++ b/mn_MN.UTF-8/share/xml/glossary.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
     The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/share/xml/mirrors-local.xsl b/mn_MN.UTF-8/share/xml/mirrors-local.xsl
index c924a48cb8..e6340a1dd8 100644
--- a/mn_MN.UTF-8/share/xml/mirrors-local.xsl
+++ b/mn_MN.UTF-8/share/xml/mirrors-local.xsl
@@ -13,7 +13,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="utf-8"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- template: "mirrors-docbook-contact" -->
diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent
index 6d5f388174..173624eaee 100644
--- a/mn_MN.UTF-8/share/xml/trademarks.ent
+++ b/mn_MN.UTF-8/share/xml/trademarks.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      The FreeBSD Mongolian Documentation Project
 
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-common.xsl b/mn_MN.UTF-8/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl b/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl b/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..286e4b3657
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Энэ болон бусад баримтуудыг
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>
+    хаягаас татаж авч болно.</small></p>
+
+    <p align="center"><small>FreeBSD-ийн талаар
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;
+    хаягтай холбоо барихаасаа өмнө
+    <a href="http://www.FreeBSD.org/docs.html">баримтыг</a> уншина уу.<br/>
+    Энэ бичиг баримттай холбоотой асуулт байвал
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;
+    хаягаар цахим захидал явуулна уу.<br/>
+    Энэ бичиг баримтын орчуулгатай холбоотой асуулт байвал
+    &lt;<a href="mailto:admin@mnbsd.org">admin@mnbsd.org</a>&gt;
+    хаягаар цахим захидал явуулна уу.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl b/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/mn_MN.UTF-8/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
index 39c92a8352..f675648f3b 100644
--- a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      $FreeBSD$
diff --git a/nl_NL.ISO8859-1/articles/contributing/article.xml b/nl_NL.ISO8859-1/articles/contributing/article.xml
index 5491fd69b4..9ec92020d7 100644
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      $FreeBSD$
@@ -201,7 +197,7 @@
 	  <para>Verkrijg kopie�n van formele standaarden zoals
 	    &posix;.  Enkele links over deze standaarden staan op de
 	    website van het <ulink
-	      url="&url.base;/projects/c99/index.html">&os; C99 & POSIX
+	      url="&url.base;/projects/c99/index.html">&os; C99 &amp; POSIX
 	      Standards Conformance Project</ulink>.  Vergelijk het
 	    gedrag van &os; met dat wat de standaard voorschrijft.  Als
 	    het gedrag verschilt, met name in subtiele of obscure
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
index eed761f211..97c2636cdf 100644
--- a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      $FreeBSD$
@@ -257,7 +254,7 @@
       <listitem>
 	<para>De indruk heerst dat de BSD-projecten gefragmenteerd en
 	  oorlogvoerend zijn.  De <ulink
-	    url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
+	    url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall
 	    Street Journal</ulink> sprak van <quote>balkanizatie</quote> van de
 	  BSD-projecten.  Net als de rechtszaak is dit beeld
 	  voornamelijk op een oude geschiedenis gebaseerd.</para>
diff --git a/nl_NL.ISO8859-1/articles/problem-reports/article.xml b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
index ebddb2de3b..35359fcfe7 100644
--- a/nl_NL.ISO8859-1/articles/problem-reports/article.xml
+++ b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      $FreeBSD$
diff --git a/nl_NL.ISO8859-1/articles/solid-state/article.xml b/nl_NL.ISO8859-1/articles/solid-state/article.xml
index 409de08f05..cdbfa3e8d1 100644
--- a/nl_NL.ISO8859-1/articles/solid-state/article.xml
+++ b/nl_NL.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- Copyright (c) 2001 The FreeBSD Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index 77f17c1417..68d8975067 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -43,7 +43,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -318,30 +317,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # regels die lijsten met mirrors vanuit de XML-database genereren.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 4960156fb7..2600f5169b 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -6473,7 +6473,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	  Het volgende commando dient op
 	  <hostid>provider.example.org</hostid> gegeven te worden:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>Dit dient gedaan te worden op de
 	  <devicename>carp</devicename> interface die met de juiste
diff --git a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
index b3904836ac..d3f236c61e 100644
--- a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
      $FreeBSD$
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
index d4cae35492..511d19850a 100644
--- a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -1282,7 +1282,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir1" format="EPS"/>
+	<imagedata fileref="install/example-dir1"/>
       </imageobject>
 
       <textobject>
@@ -1303,7 +1303,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir2" format="EPS"/>
+	<imagedata fileref="install/example-dir2"/>
       </imageobject>
 
       <textobject>
@@ -1331,7 +1331,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir3" format="EPS"/>
+	<imagedata fileref="install/example-dir3"/>
       </imageobject>
 
       <textobject>
@@ -1359,7 +1359,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir4" format="EPS"/>
+	<imagedata fileref="install/example-dir4"/>
       </imageobject>
 
       <textobject>
@@ -1385,7 +1385,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01</screen>
 
     <mediaobject>
       <imageobject>
-	<imagedata fileref="install/example-dir5" format="EPS"/>
+	<imagedata fileref="install/example-dir5"/>
       </imageobject>
 
       <textobject>
@@ -1716,7 +1716,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/disk-layout" format="EPS"/>
+	  <imagedata fileref="install/disk-layout"/>
 	</imageobject>
 
 	<textobject>
diff --git a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
index 4af7e2d8b7..d0d5dec29c 100644
--- a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/book.xml b/nl_NL.ISO8859-1/books/handbook/book.xml
index ec12e7fd15..48d90635c4 100644
--- a/nl_NL.ISO8859-1/books/handbook/book.xml
+++ b/nl_NL.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!--
       $FreeBSD$
 
@@ -16,47 +13,6 @@
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
 %txtfiles;
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.install "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.virtualization "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
@@ -202,12 +158,12 @@
 	gelezen kan worden zonder bladeren.</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">
diff --git a/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
index 0081ef90a1..dd5e8d2d80 100644
--- a/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/chapters.ent b/nl_NL.ISO8859-1/books/handbook/chapters.ent
index 9fecb8afd0..74164a7748 100644
--- a/nl_NL.ISO8859-1/books/handbook/chapters.ent
+++ b/nl_NL.ISO8859-1/books/handbook/chapters.ent
@@ -14,235 +14,62 @@
      %SRCID%	39631
 -->
 
-<!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;
 
 <!-- Deel een -->
-<![%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">
-]]>
 
 <!-- Deel twee -->
-<![%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">
-]]>
 
 <!-- Deel drie -->
-<![%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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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">
-]]>
 
 <!-- Deel vier -->
-<![%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">
-]]>
 
 <!-- Deel vijf (appendices) -->
-<![%chap.mirrors;[
   <!ENTITY chap.mirrors		SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+  <!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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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 -->
-
-<!-- Deel een-->
-<!ENTITY chap.introduction	"">
-<!ENTITY chap.install		"">
-<!ENTITY chap.basics		"">
-<!ENTITY chap.ports		"">
-<!ENTITY chap.x11		"">
-
-<!-- Deel twee -->
-<!ENTITY chap.desktop		"">
-<!ENTITY chap.multimedia	"">
-<!ENTITY chap.kernelconfig	"">
-<!ENTITY chap.printing		"">
-<!ENTITY chap.linuxemu		"">
-
-<!-- Deel drie -->
-<!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		"">
-
-<!-- Deel vier -->
-<!ENTITY chap.serialcomms	"">
-<!ENTITY chap.ppp-and-slip	"">
-<!ENTITY chap.mail		"">
-<!ENTITY chap.network-servers	"">
-<!ENTITY chap.firewalls		"">
-<!ENTITY chap.advanced-networking	"">
-
-<!-- Deel vijf (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/nl_NL.ISO8859-1/books/handbook/colophon.xml b/nl_NL.ISO8859-1/books/handbook/colophon.xml
index 19035e82d4..e6e30896d5 100644
--- a/nl_NL.ISO8859-1/books/handbook/colophon.xml
+++ b/nl_NL.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/config/chapter.xml b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
index 0561f38579..14194e68ab 100644
--- a/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -825,7 +825,7 @@ sshd is running as pid 433.</screen>
       staat in &man.rc.8; en &man.rc.subr.8;.  Als u ge�nteresseerd
       bent in het schrijven van uw eigen
       <filename>rc.d</filename>-script of om de huidige scripts te
-      verbeteren is wellicht <ulink url="&url.articles.rc-scripting">dit
+      verbeteren is wellicht <ulink url="&url.articles.rc-scripting;">dit
 	artikel</ulink> interessant.</para>
   </sect1>
 
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 603daea3c3..f297267cee 100644
--- a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -1233,83 +1233,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>Gebaseerd op informatie geleverd door </contrib>
-	  </author>
-	</authorgroup>
-      </sect2info>
-
-      <title>Docsnap gebruiken</title>
-
-      <indexterm><primary>updaten en upgraden</primary></indexterm>
-
-      <indexterm>
-	<primary>Docsnap</primary>
-
-	<see>updaten en upgraden</see>
-      </indexterm>
-
-      <para><application>Docscnap</application> is een
-	&man.rsync.1;-reservoir voor het bijwerken van
-	ge�nstalleerde &os;-documentatie op een relatief
-	gemakkelijke en snelle manier.  Een
-	<quote><application>Docsnap</application> server</quote> volgt
-	de documentatiebroncode en bouwt ze elk uur in HTML-formaat.  De
-	port <filename role="package">textproc/docproj</filename> is
-	niet nodig met <application>Docsnap</application> aangezien er
-	alleen patches voor de gebouwde documentatie bestaan.</para>
-
-      <para>De enige benodigdheid om deze techniek te gebruiken is de
-	port of het pakket <filename
-	  role="package">net/rsync</filename>.  Gebruik het volgende
-	commando om het toe te voegen:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-	<para><application>Docsnap</application> is eigenlijk ontwikkeld
-	  om de documentatie die in <filename
-	    class="directory">/usr/share/doc</filename> is
-	  ge�nstalleerd bij te werken, maar de volgende voorbeelden
-	  kunnen ook voor andere mappen worden gebruikt.  Voor
-	  gebruikersmappen heeft het geen
-	  <username>root</username>-rechten nodig.</para>
-      </note>
-
-      <para>Geef het volgende commando om de documentatie bij te werken:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <note>
-	<para>Er is momenteel slechts ��n
-	  <application>Docsnap</application>-server; de bovengenoemde
-	  host <hostid>docsnap.sk.FreeBSD.org</hostid>.</para>
-      </note>
-
-      <para>Gebruik hier niet de vlag <option>--delete</option> omdat er
-	tijdens <command>make installworld</command> wat dingen in
-	<filename class="directory">/usr/share/doc</filename> worden
-	ge�nstalleerd, die dan per ongeluk verwijderd zouden
-	worden.  Gebruik in plaats daarvan dit commando om op te
-	ruimen:</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <para>Het volgende commando dient gebruikt te worden als er een
-	deelverzameling van de documentatie, bijvoorbeeld
-	alleen de Engelse documentatie, bijgewerkt moet worden:</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/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
index 86c41331bf..b88e8c9dc2 100644
--- a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
index e94f5237f7..29d84fc83c 100644
--- a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -2969,16 +2969,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	  Nu een extra uur investeren, kan later grote zorgen
 	  besparen.</para>
       </sect3>
-
-      <![ %not.published; [
-
-	<sect3>
-	  <title>* Er zijn geen voorbereidingen voor de ramp getroffen,
-	    wat nu?</title>
-
-	  <para></para>
-	</sect3>
-]]>
     </sect2>
   </sect1>
 
@@ -3817,7 +3807,7 @@ sector_size	=	2048
 	  <step>
 	    <title>Koppel de versleutelde partitie aan de kernel</title>
 
-	    <screen>&prompt.root <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
+	    <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	    <para>Er wordt om de wachtwoordzin gevraagd die gekozen is
 	      tijdens de initialisatie van de versleutelde partitie.  Het
@@ -3901,7 +3891,7 @@ Filesystem        Size   Used  Avail Capacity  Mounted on
 	  <step>
 	    <title>Koppel de gbde-partitie aan de kernel</title>
 
-	    <screen>&prompt.root <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
+	    <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	    <para>Er wordt om de wachtwoordzin gevraagd die gekozen is
 	      tijdens de initialisatie van de versleutelde
@@ -4862,7 +4852,7 @@ case "$1" in
 
 		# Wacht totdat de "hastd secondary" processen zijn gestopt
 		for disk in ${resources}; do
-			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2&gt;&amp;1 ); do
 				sleep 1
 			done
 
@@ -4877,7 +4867,7 @@ case "$1" in
 		# Wacht totdat de apparaten /dev/hast/* verschijnen
 		for disk in ${resources}; do
 			for I in $( jot 60 ); do
-				[ -c "/dev/hast/${disk}" ] && break
+				[ -c "/dev/hast/${disk}" ] &amp;&amp; break
 				sleep 0.5
 			done
 
@@ -4910,7 +4900,7 @@ case "$1" in
 				umount -f /hast/${disk}
 			fi
 			sleep $delay
-			hastctl role secondary ${disk} 2>&1
+			hastctl role secondary ${disk} 2&gt;&amp;1
 			if [ $? -ne 0 ]; then
 				logger -p $log -t $name "Omschakelen van rol naar secundair voor hulpbron ${disk} mislukt."
 				exit 1
diff --git a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
index b480136833..9fe1f9da56 100644
--- a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 Recently I suggested to myself that this should become a profiling
 and debugging chapter, which covers things like ktrace(1) and
diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
index 0f940acc85..b8afdd9e58 100644
--- a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -1761,7 +1761,7 @@
 
 	    <para>Belangrijk nieuws voor ontwikkelaars, porters en gebruikers
 	      van de <quote>Portscollectie</quote> (<filename
-		role="directory">/usr/ports</filename>), waaronder veranderingen
+		class="directory">/usr/ports</filename>), waaronder veranderingen
 	      aan de architectuur/infrastructuur, nieuwe mogelijkheden,
 	      kritische opwaardeerinstructies, en uitgave-informatie.  Dit is
 	      een mailinglijst met een laag volume, bedoeld voor
@@ -2362,6 +2362,10 @@
     <sect2 id="eresources-web-mirrors">
       <title>Offici�le spiegels</title>
 
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
index c811629786..223684a6c6 100644
--- a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
      $FreeBSD$
@@ -257,7 +257,7 @@ example      17547136       0 17547136     0%    /example</screen>
 	  bestanden op worden aangemaakt en gebruikers kunnen er op
 	  rondkijken zoals in het volgende voorbeeld:</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
index 7241d38950..2eed57da42 100644
--- a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -1171,7 +1171,7 @@ sh /etc/ipf.rules.script</programlisting>
       <para>De regelsyntaxis die hier wordt besproken is versimpeld
 	door alleen de moderne stateful regels en de <quote>eerste
 	  van toepassing zijnde regel wint</quote> te belichten.  De
-	complete regelsyntaxis is na te lezen in &man.ipf.8</para>
+	complete regelsyntaxis is na te lezen in &man.ipf.8;.</para>
 
       <para>Het karakter <literal>#</literal> wordt gebruikt om het
 	begin van een opmerking te markeren en zowel op een eigen
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
index 27514d5912..6a402409d4 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -397,13 +397,13 @@ Done.</screen>
 	&man.restore.8; naar de spiegel gekopieerd worden:</para>
 
       <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput></screen>
 
       <para><filename>/mnt/etc/fstab</filename> moet bewerkt worden om naar de
 	nieuwe bestandssystemen op de spiegel te wijzen:</para>
@@ -633,15 +633,15 @@ BSD 8
 	  -L</command> gedumpt is even kan duren.</para>
 
       <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /    | (cd /mnt &amp;&amp; restore -rf -)</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
 &prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 &amp;&amp; restore -rf -)</userinput></screen>
 
       <para>Start het systeem opnieuw op vanaf <devicename>ada1</devicename>.
 	Als alles werkt, zal het systeem opstarten vanaf
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index a66c9fc3f9..beb8925e23 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -1065,7 +1065,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"/>
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -1103,14 +1103,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  &man.tip.1; of &man.cu.1; te gebruiken) om bij de PROM-prompt
 	  te komen.  Het ziet er als volgt uit:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok    </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok    </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -1123,7 +1117,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		cijfer geeft het aantal actieve CPUs aan.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>Stop hier de CDROM in uw drive, en typ op de PROM-prompt
 	  <command>boot cdrom</command>.</para>
@@ -1234,7 +1227,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1250,7 +1243,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1291,7 +1284,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1308,7 +1301,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1320,7 +1313,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1351,7 +1344,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1374,7 +1367,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1391,7 +1384,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-options" format="PNG"/>
+	    <imagedata fileref="install/main-options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1401,7 +1394,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1437,7 +1430,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1623,7 +1616,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1696,7 +1689,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1744,7 +1737,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1790,7 +1783,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1821,7 +1814,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2090,7 +2083,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2120,7 +2113,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2147,7 +2140,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2165,7 +2158,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2183,7 +2176,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2201,7 +2194,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2224,7 +2217,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2279,7 +2272,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2334,7 +2327,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2366,7 +2359,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2570,7 +2563,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2615,7 +2608,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2791,7 +2784,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2888,7 +2881,7 @@ Do you wish to continue configuring anonymous FTP?
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2968,7 +2961,7 @@ Do you wish to continue configuring anonymous FTP?
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3027,7 +3020,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3078,7 +3071,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3092,7 +3085,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3113,7 +3106,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3127,7 +3120,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3172,7 +3165,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3185,7 +3178,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3198,7 +3191,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3266,7 +3259,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3280,7 +3273,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3297,7 +3290,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3311,7 +3304,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3326,7 +3319,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3341,7 +3334,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3384,7 +3377,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3407,7 +3400,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3437,7 +3430,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3452,7 +3445,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3495,7 +3488,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3508,7 +3501,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3614,7 +3607,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3682,7 +3675,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3759,7 +3752,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3831,7 +3824,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3889,7 +3882,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3916,7 +3909,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3993,7 +3986,7 @@ Retype new password :</screen>
       <title>&os; opstarten</title>
 
       <sect3 id="freebsdboot-i386">
-	<title>&os/&arch.i386; opstarten</title>
+	<title>&os;/&arch.i386; opstarten</title>
 
 	<para>Als alles goed is gegaan komen er berichten over het scherm
 	  rollen en komt dit uit bij de aanmeldprompt.  De inhoud van de
diff --git a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
index 1d7db00581..bb1698b662 100644
--- a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
index 43d716e211..51f8347831 100644
--- a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The FreeBSD Dutch Documentation Project
 
@@ -294,9 +294,9 @@
 	  beginpunt.  Hier zal de jail fysiek te vinden zijn binnen
 	  het bestandssysteem van het host systeem.  Een goede keuze
 	  kan <filename
-	    role="directory">/usr/jail<replaceable>jailnaam</replaceable></filename>
+	    class="directory">/usr/jail<replaceable>jailnaam</replaceable></filename>
 	  zijn, waar <replaceable>jailnaam</replaceable> de naam is van de
-	  jail.  Het <filename role="directory">/usr</filename>
+	  jail.  Het <filename class="directory">/usr</filename>
 	  bestandssysteem heeft meestal genoeg ruimte voor het jail
 	  bestandssysteem, wat voor een <quote>complete</quote> jail
 	  betekend dat het eigenlijk een replica is van elk bestand
@@ -321,10 +321,10 @@
 	  <application>make</application> installeert elk benodigd
 	  configuratie bestand.  In simpelere termen, het installeert
 	  alle installeerbare bestanden in
-	  <filename role="directory">/usr/src/etc</filename> naar de
-	  <filename role="directory">/etc</filename> directory van
+	  <filename class="directory">/usr/src/etc</filename> naar de
+	  <filename class="directory">/etc</filename> directory van
 	  de jail omgeving:
-	  <filename role="directory">$D/etc</filename>.</para>
+	  <filename class="directory">$D/etc</filename>.</para>
       </callout>
 
       <callout arearefs="jaildevfs">
@@ -671,11 +671,11 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	<itemizedlist>
 	  <listitem>
 	    <para>Elke jail zal gekopeld worden onder de <filename
-		role="directory">/home/j</filename> directory.</para>
+		class="directory">/home/j</filename> directory.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para><filename role="directory">/home/j/mroot</filename> is
+	    <para><filename class="directory">/home/j/mroot</filename> is
 	      de template voor elke jail en tevens de alleen-lezen
 	      partitie voor elke jail.</para>
 	  </listitem>
@@ -683,12 +683,12 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	  <listitem>
 	    <para>Voor elke jail zal een lege directory structuur
 	      gemaakt worden, welke valt onder de <filename
-		role="directory">/home/j</filename> directory.</para>
+		class="directory">/home/j</filename> directory.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>Elke jail heeft een <filename
-		role="directory">/s</filename> directory, welke
+		class="directory">/s</filename> directory, welke
 	      gekoppeld zal worden aan het beschrijfbare gedeelte van
 	      het systeem.</para>
 	  </listitem>
@@ -696,20 +696,20 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	  <listitem>
 	    <para>Elke jail zal zijn eigen beschrijfbaar systeem hebben
 	      welke gebaseerd is op <filename
-		role="directory">/home/j/skel</filename>.</para>
+		class="directory">/home/j/skel</filename>.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>Elke jail ruimte (het beschrijfbare gedeelte van de
 	      jail), wordt gecree�rd in de <filename
-		role="directory">/home/js</filename> directory.</para>
+		class="directory">/home/js</filename> directory.</para>
 	  </listitem>
 	</itemizedlist>
 
 	<note>
 	  <para>De voorbeelden gaan er vanuit dat de jails geplaatst
 	    worden in <filename
-	      role="directory">/home</filename> partitie.  Dit kan
+	      class="directory">/home</filename> partitie.  Dit kan
 	    uiteraard aangepast worden, maar dan moeten de
 	    voorbeelden hieronder ook worden aangepast naar de plek
 	    die gebruikt zal worden.</para>
@@ -792,7 +792,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	    <para>Nu moet er een symbolische link gemaakt worden tussen
 	      het beschrijfbare bestandssysteem en het alleen-lezen
 	      bestandssysteem, zorg ervoor dat de links gemaakt worden
-	      in de juiste <filename role="directory">/s</filename>
+	      in de juiste <filename class="directory">/s</filename>
 	      directory.  Als hier echte directories worden gemaakt
 	      of de directories worden op de verkeerde plak aangemaakt
 	      zal dit resulteren in een mislukte installatie:</para>
@@ -890,13 +890,13 @@ jail_www_devfs_enable="YES"</programlisting>
 	      <para>De reden dat de
 		<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
 		variabele verwijst naar de <filename
-		  role="directory">/usr/home</filename> directory in
+		  class="directory">/usr/home</filename> directory in
 		plaats van naar <filename
-		  role="directory">/home</filename> komt doordat het
+		  class="directory">/home</filename> komt doordat het
 		fysieke pad van de <filename
-		  role="directory">/home</filename> directory op een
+		  class="directory">/home</filename> directory op een
 		standaard &os; installatie verwijst naar <filename
-		  role="directory">/usr/home</filename>.  De
+		  class="directory">/usr/home</filename>.  De
 		<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
 		variabele mag <emphasis>niet</emphasis> ingesteld
 		worden op een symbolische link, omdat dan de jail
@@ -979,7 +979,7 @@ jail_www_devfs_enable="YES"</programlisting>
 	    <para>De eerste stap is het upgraden van het host systeem
 	      zelf, waarna een nieuwe alleen-lezen template gemaakt
 	      wordt in <filename
-		role="directory">/home/j/mroot2</filename>.</para>
+		class="directory">/home/j/mroot2</filename>.</para>
 
 	    <screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
@@ -1029,7 +1029,7 @@ jail_www_devfs_enable="YES"</programlisting>
 	    <note>
 	      <para>Het beschrijfbare gedeelte van de jail is
 		gekoppeld aan het alleen-lezen gedeelte
-		(<filename role="directory">/s</filename>) en moet
+		(<filename class="directory">/s</filename>) en moet
 		derhalve eerst ontkoppeld worden.</para>
 	    </note>
 	  </step>
diff --git a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 73cdcb431c..994aee8702 100644
--- a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
index ca9dbd51fa..bbede1b3e5 100644
--- a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
       The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
index e08a10dae3..dfaaeffe1c 100644
--- a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -251,7 +251,7 @@ Id Refs Address    Size     Name
 
 	<para>Als er toegang is tot een &linux; systeem kan gekeken
 	  worden welke gedeelde bibliotheken de applicatie nodig heeft
-	  en kunnen ze gekopieerd worden naar het &os systeem.  Dit
+	  en kunnen ze gekopieerd worden naar het &os; systeem.  Dit
 	  wordt toegelicht in het volgende voorbeeld:</para>
 
 	<informalexample>
@@ -506,7 +506,7 @@ done</programlisting>
 	programma <command>mathinfo</command> in de installatiemap om uw
 	<quote>machine-ID</quote> te verkrijgen.  Dit machine-ID is
 	alleen op het MAC-adres van uw eerste Ethernetkaart gebaseerd,
-	zodat u uw kopie van <application>&mathematica</application>
+	zodat u uw kopie van <application>&mathematica;</application>
 	niet op andere machines kunt draaien.</para>
 
       <para>Bij een registratie bij Wolfram, per email, telefoon of
@@ -699,14 +699,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -1005,7 +1005,7 @@ exit 0</programlisting>
 	    volgende bevat:</para>
 
 	  <programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
index 5bb5f2511c..03c15cd617 100644
--- a/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
index 7a7f364efd..cfb397a143 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -1679,11 +1679,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	  volgende opdrachten uit te voeren:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>Het compileren van <application>sendmail</application> zou
 	  geen problemen moeten geven indien <filename>/usr/src
@@ -1940,7 +1940,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1950,7 +1950,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -1986,7 +1986,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2038,7 +2038,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2057,7 +2057,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2068,7 +2068,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2081,7 +2081,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2100,7 +2100,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
index 72ddf79a43..43fa397e69 100644
--- a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -219,6 +219,10 @@
       toegangsmogelijkheden.  De toegangsmogelijkheden voor iedere site
       staan tussen haakjes achter de hostnaam.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2501,6 +2505,10 @@ doc/zh_*</programlisting>
       <para><link linkend="cvsup">CVSup</link> servers voor &os; draaien
 	op de onderstaande sites.</para>
 
+      &chap.mirrors.cvsup.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
index 710f197f43..f405a6172e 100644
--- a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
index e01431aa86..2024e00486 100644
--- a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 7aa0d2d19e..ceb2b3d734 100644
--- a/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
index 38ce1942c6..4daa0847fe 100644
--- a/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     The Dutch FreeBSD Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index a8bb8090b7..895273080d 100644
--- a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/preface/preface.xml b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
index 0fded72e25..73f2767dc4 100644
--- a/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
+++ b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
index 41d3eeac89..7c7854820e 100644
--- a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
index 095179ccd3..e4c907acf2 100644
--- a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
index f5ec3d194a..9d53ed0e9e 100644
--- a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/users/chapter.xml b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
index 308a5293af..afa449c677 100644
--- a/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
index 52108874b2..c5bb64c310 100644
--- a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      De Vinum Volume Manager
      Door Greg Lehey (grog at lemis dot com)
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
index 2fa5acfcb7..5cfe99dc0a 100644
--- a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1033,7 +1033,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	  role="package">emulators/virtualbox-ose-additions</filename> in de
 	&os;-gast.</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
 
       <para>Voeg deze regels toe aan <filename>/etc/rc.conf</filename>:</para>
 
diff --git a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
index 7b20a5a38f..ae71ff2b89 100644
--- a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
@@ -318,7 +318,7 @@
       de X11 server van de open source implementatie die is uitgebracht
       door de X.Org Foundation.  <application>&xorg;</application> is
       gebaseerd op de code van
-      <application>&xfree86&nbsp;4.4RC2</application> en X11R6.6.
+      <application>&xfree86;&nbsp;4.4RC2</application> en X11R6.6.
       De versie van <application>&xorg;</application> die momenteel
       beschikbaar is in de &os; Portscollectie is &xorg.version;.</para>
 
diff --git a/nl_NL.ISO8859-1/share/xml/bibliography.xml b/nl_NL.ISO8859-1/share/xml/bibliography.xml
index 9b36d497a9..3c9729bfa5 100644
--- a/nl_NL.ISO8859-1/share/xml/bibliography.xml
+++ b/nl_NL.ISO8859-1/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/share/xml/catalog b/nl_NL.ISO8859-1/share/xml/catalog
index a178f14c85..2422c1740c 100644
--- a/nl_NL.ISO8859-1/share/xml/catalog
+++ b/nl_NL.ISO8859-1/share/xml/catalog
@@ -1,52 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$ --
-
-  -- %SOURCE%	en_US.ISO8859-1/share/xml/catalog --
-  -- %SRCID%	39534 --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//NL"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//NL"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
-	"teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/nl_NL.ISO8859-1/share/xml/catalog.xml b/nl_NL.ISO8859-1/share/xml/catalog.xml
index e131737433..97309b72b9 100644
--- a/nl_NL.ISO8859-1/share/xml/catalog.xml
+++ b/nl_NL.ISO8859-1/share/xml/catalog.xml
@@ -11,6 +11,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent
index c71505e04a..d411d34cb3 100644
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@@ -6,27 +6,30 @@
      %SRCID%	39534
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
+	"glossary.ent">
 %glossary;
diff --git a/nl_NL.ISO8859-1/share/xml/freebsd.dsl b/nl_NL.ISO8859-1/share/xml/freebsd.dsl
index ef287dc3c0..75709a3ca0 100644
--- a/nl_NL.ISO8859-1/share/xml/freebsd.dsl
+++ b/nl_NL.ISO8859-1/share/xml/freebsd.dsl
@@ -8,12 +8,6 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
diff --git a/nl_NL.ISO8859-1/share/xml/glossary.ent b/nl_NL.ISO8859-1/share/xml/glossary.ent
index 7f0b1edfc9..ba94e26b02 100644
--- a/nl_NL.ISO8859-1/share/xml/glossary.ent
+++ b/nl_NL.ISO8859-1/share/xml/glossary.ent
@@ -1111,7 +1111,7 @@
       </glossterm>
       <acronym>MFS</acronym>
       <glossdef subject="FreeBSD">
-	<para>In het &os ontwikkelproces wordt een wijziging gecommit
+	<para>In het &os; ontwikkelproces wordt een wijziging gecommit
 	  in de -CURRENT tak om deze te testen voordat deze wordt
 	  samengevoegd naar -STABLE.  In bijzondere gevallen gaat een
 	  wijziging eerst naar -STABLE en wordt dan pas samengevoegd
diff --git a/nl_NL.ISO8859-1/share/xml/l10n.ent b/nl_NL.ISO8859-1/share/xml/l10n.ent
index 6db02c97cd..961f04f440 100644
--- a/nl_NL.ISO8859-1/share/xml/l10n.ent
+++ b/nl_NL.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (nl).
 
diff --git a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
index 7883715d5d..df0ee32e97 100644
--- a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
+++ b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Namen van FreeBSD mailinglijsten en gerelateerde software.
 
diff --git a/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl b/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
index f28a650665..2f1c293038 100644
--- a/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
@@ -11,7 +11,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- these params should be externally bound.  The values
diff --git a/nl_NL.ISO8859-1/share/xml/newsgroups.ent b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
index e18e8d626c..a7006af3ea 100644
--- a/nl_NL.ISO8859-1/share/xml/newsgroups.ent
+++ b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
      Namen van FreeBSD newsgroepen
diff --git a/nl_NL.ISO8859-1/share/xml/teams.ent b/nl_NL.ISO8859-1/share/xml/teams.ent
index 8df6d4f4eb..1b762236f8 100644
--- a/nl_NL.ISO8859-1/share/xml/teams.ent
+++ b/nl_NL.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index a2979f6d53..45842d500e 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Legenda van handelsmerken, zoals vereist door The Open Group, Sun,
      enzovoorts.
diff --git a/nl_NL.ISO8859-1/share/xml/translators.ent b/nl_NL.ISO8859-1/share/xml/translators.ent
index 99c1c391e0..b250b910c6 100644
--- a/nl_NL.ISO8859-1/share/xml/translators.ent
+++ b/nl_NL.ISO8859-1/share/xml/translators.ent
@@ -1,5 +1,5 @@
-<!--
-      The FreeBSD Documentation Project
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- The FreeBSD Documentation Project 
 
       Nederlandse vertalers
       $FreeBSD$
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..1a676215eb
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation"/>
+</xsl:stylesheet>
diff --git a/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/nl_NL.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
index 5a1592b351..358ea75876 100644
--- a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1246,7 +1246,7 @@ total 530
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS">
+            <imagedata fileref="install/disk-layout">
           </imageobject>
 
           <textobject>
diff --git a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
index 4dbe929258..f9cc93e36d 100644
--- a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The Norwegian FreeBSD Documentation Project
 
diff --git a/no_NO.ISO8859-1/books/handbook/install/chapter.xml b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
index 46c468a67d..1526c41475 100644
--- a/no_NO.ISO8859-1/books/handbook/install/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The Norwegian FreeBSD Documentation Project
 
@@ -825,7 +825,7 @@ Booting [kernel] in 9 seconds... _</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/userconfig" format="PNG">
+	    <imagedata fileref="install/userconfig">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -865,7 +865,7 @@ Booting [kernel] in 9 seconds... _</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/userconfig2" format="PNG">
+	    <imagedata fileref="install/userconfig2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -892,7 +892,7 @@ Booting [kernel] in 9 seconds... _</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="install/hdwrconf" format="PNG">
+		<imagedata fileref="install/hdwrconf">
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -961,7 +961,7 @@ Booting [kernel] in 9 seconds... _</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="install/probstart" format="PNG">
+		<imagedata fileref="install/probstart">
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -986,7 +986,7 @@ Booting [kernel] in 9 seconds... _</screen>
 
 	    <mediaobject>
 	      <imageobject>
-		<imagedata fileref="install/main1" format="PNG">
+		<imagedata fileref="install/main1">
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1090,7 +1090,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG">
+	    <imagedata fileref="install/sysinstall-exit">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1141,7 +1141,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG">
+	  <imagedata fileref="install/main1">
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1157,7 +1157,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG">
+	    <imagedata fileref="install/main-doc">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1169,7 +1169,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG">
+	    <imagedata fileref="install/docmenu1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1198,7 +1198,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG">
+	    <imagedata fileref="install/main-keymap">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1218,7 +1218,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG">
+	    <imagedata fileref="install/keymap">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1236,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG">
+	  <imagedata fileref="install/main-options">
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1246,7 +1246,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG">
+	    <imagedata fileref="install/options">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1278,7 +1278,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG">
+	    <imagedata fileref="install/main-std">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1802,7 +1802,7 @@ Mounting root from ufs:/dev/md0c
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS">
+            <imagedata fileref="install/disk-layout">
           </imageobject>
 
           <textobject>
@@ -1877,7 +1877,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG">
+	    <imagedata fileref="install/fdisk-drive1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1939,7 +1939,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG">
+	    <imagedata fileref="install/fdisk-edit1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1977,7 +1977,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG">
+	    <imagedata fileref="install/fdisk-edit2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2013,7 +2013,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG">
+	    <imagedata fileref="install/boot-mgr">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2037,7 +2037,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG">
+	    <imagedata fileref="install/fdisk-drive2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2261,7 +2261,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG">
+	    <imagedata fileref="install/disklabel-ed1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2287,7 +2287,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG">
+	    <imagedata fileref="install/disklabel-auto">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2311,7 +2311,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG">
+	    <imagedata fileref="install/disklabel-root1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2329,7 +2329,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG">
+	    <imagedata fileref="install/disklabel-root2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2346,7 +2346,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG">
+	    <imagedata fileref="install/disklabel-fs">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2362,7 +2362,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG">
+	    <imagedata fileref="install/disklabel-root3">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2383,7 +2383,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG">
+	    <imagedata fileref="install/disklabel-ed2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2442,7 +2442,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG">
+	    <imagedata fileref="install/dist-set">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2491,7 +2491,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG">
+	    <imagedata fileref="install/dist-set2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2524,7 +2524,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG">
+	  <imagedata fileref="install/media">
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2717,7 +2717,7 @@ installation menus to try and retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG">
+	    <imagedata fileref="install/ed0-conf">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2761,7 +2761,7 @@ installation menus to try and retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG">
+	    <imagedata fileref="install/ed0-conf2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2922,7 +2922,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG">
+	    <imagedata fileref="install/edit-inetd-conf">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2966,7 +2966,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG">
+	      <imagedata fileref="install/ftp-anon1">
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3016,7 +3016,7 @@ Upload subdirectory:
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG">
+	      <imagedata fileref="install/ftp-anon2">
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3071,7 +3071,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">
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3215,7 +3215,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/security" format="PNG">
+	    <imagedata fileref="install/security">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3295,7 +3295,7 @@ To change any of these settings later, edit /etc/rc.conf
 	<title>Systemets konsollopsjoner</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver1" format="PNG">
+	    <imagedata fileref="install/console-saver1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3309,7 +3309,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver2" format="PNG">
+	    <imagedata fileref="install/console-saver2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3329,7 +3329,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3" format="PNG">
+	    <imagedata fileref="install/console-saver3">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3343,7 +3343,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver4" format="PNG">
+	    <imagedata fileref="install/console-saver4">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3385,7 +3385,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG">
+	    <imagedata fileref="install/timezone1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3398,7 +3398,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG">
+	    <imagedata fileref="install/timezone2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3411,7 +3411,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG">
+	    <imagedata fileref="install/timezone3">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3476,7 +3476,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG">
+	    <imagedata fileref="install/mouse1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3489,7 +3489,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG">
+	    <imagedata fileref="install/mouse2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3504,7 +3504,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG">
+	    <imagedata fileref="install/mouse3">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3517,7 +3517,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG">
+	    <imagedata fileref="install/mouse4">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3531,7 +3531,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG">
+	    <imagedata fileref="install/mouse5">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3543,7 +3543,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG">
+	    <imagedata fileref="install/mouse6">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3598,7 +3598,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG">
+	    <imagedata fileref="install/xf86setup">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4109,7 +4109,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG">
+	    <imagedata fileref="install/desktop">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4146,7 +4146,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-cat" format="PNG">
+	    <imagedata fileref="install/pkg-cat">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4170,7 +4170,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-sel" format="PNG">
+	    <imagedata fileref="install/pkg-sel">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4197,7 +4197,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-install" format="PNG">
+	    <imagedata fileref="install/pkg-install">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4211,7 +4211,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-confirm" format="PNG">
+	    <imagedata fileref="install/pkg-confirm">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4249,7 +4249,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG">
+	    <imagedata fileref="install/adduser1">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4262,7 +4262,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG">
+	    <imagedata fileref="install/adduser2">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4360,7 +4360,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG">
+	    <imagedata fileref="install/adduser3">
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4422,7 +4422,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG">
+	    <imagedata fileref="install/mainexit">
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
index c4659893b7..2e7e0509ec 100644
--- a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
+++ b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/articles/new-users/article.xml b/pl_PL.ISO8859-2/articles/new-users/article.xml
index baa0b148b9..a74c6568af 100644
--- a/pl_PL.ISO8859-2/articles/new-users/article.xml
+++ b/pl_PL.ISO8859-2/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 8dab766f92..e1aaa878a6 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -35,7 +35,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -216,30 +215,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index bbced0dcd9..f175f2669e 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2877,7 +2877,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
 		<filename>pxeboot</filename>, not the kernel.  There are other
 		interesting possibilities, like loading
 		<filename>pxeboot</filename> from a &os; CD-ROM
-		<filename role="directory">/boot</filename> directory (as
+		<filename class="directory">/boot</filename> directory (as
 		&man.pxeboot.8; can load a <filename>GENERIC</filename> kernel,
 		this makes it possible to use <acronym>PXE</acronym> to boot
 		from a remote CD-ROM).</para>
diff --git a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
index 8cfdba4c90..d7ccb51e3f 100644
--- a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -167,7 +167,7 @@ requirements. -->
     <para>Support for Event Auditing is installed with
       the normal <maketarget>installworld</maketarget> process.  An
       administrator may confirm this by viewing the contents
-      of <filename role="directory">/etc/security</filename>.  Files
+      of <filename class="directory">/etc/security</filename>.  Files
       beginning with the word <emphasis>audit</emphasis> should be present.
       For example, <filename>audit_event</filename>.</para>
 
@@ -194,7 +194,7 @@ requirements. -->
     <title>Audit Configuration</title>
 
     <para>All configuration files for security audit are found in
-      <filename role="directory">/etc/security</filename>.  The following
+      <filename class="directory">/etc/security</filename>.  The following
       files must be present before the audit daemon is started:</para>
 
     <itemizedlist>
@@ -451,10 +451,10 @@ naflags:lo</programlisting>
 	  percentage of free space for audit file systems.  This
 	  relates to the file system where audit logs are stored.
 	  For example, if the <option>dir</option> specifies
-	  <filename role="directory">/var/audit</filename> and
+	  <filename class="directory">/var/audit</filename> and
 	  <option>minfree</option> is set to twenty (20), warning
 	  messages will be generated when the
-	  <filename role="directory">/var</filename> file system grows
+	  <filename class="directory">/var</filename> file system grows
 	  to eighty (80) percent full.</para>
 
 	<para>The <option>naflags</option> option specifies audit
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
index 8176f59732..c42ab01bea 100644
--- a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
@@ -987,7 +987,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1007,7 +1007,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1036,7 +1036,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1062,7 +1062,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1088,7 +1088,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1400,7 +1400,7 @@ total 530
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
index dbb1322f7b..bc55531844 100644
--- a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/book.xml b/pl_PL.ISO8859-2/books/handbook/book.xml
index ca90ff2ae6..292606aca6 100644
--- a/pl_PL.ISO8859-2/books/handbook/book.xml
+++ b/pl_PL.ISO8859-2/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
index 039c55b245..96f10dce02 100644
--- a/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/chapters.ent b/pl_PL.ISO8859-2/books/handbook/chapters.ent
index 9740b42942..ce6215bb29 100644
--- a/pl_PL.ISO8859-2/books/handbook/chapters.ent
+++ b/pl_PL.ISO8859-2/books/handbook/chapters.ent
@@ -11,228 +11,60 @@
      Original revision: 1.35
 -->
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "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.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.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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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/pl_PL.ISO8859-2/books/handbook/colophon.xml b/pl_PL.ISO8859-2/books/handbook/colophon.xml
index 23748e9c2c..b929981a7f 100644
--- a/pl_PL.ISO8859-2/books/handbook/colophon.xml
+++ b/pl_PL.ISO8859-2/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/config/chapter.xml b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
index 282b0899c3..4825f473e0 100644
--- a/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -390,7 +390,7 @@ stop)
         kill -9 `cat /var/run/utility.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" &gt;&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
diff --git a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index ae57257815..4e6c02ba0f 100644
--- a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
index 800bb11499..a46516e736 100644
--- a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
@@ -327,12 +327,12 @@
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>fetch http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff</userinput>
-&prompt.root; <userinput>patch < rtld_dlsym_hack.diff</userinput>
+&prompt.root; <userinput>patch &lt; rtld_dlsym_hack.diff</userinput>
 &prompt.root; <userinput>cd libexec/rtld-elf/</userinput>
 &prompt.root; <userinput>make clean</userinput>
 &prompt.root; <userinput>make obj</userinput>
 &prompt.root; <userinput>make depend</userinput>
-&prompt.root; <userinput>make && make install</userinput></screen>
+&prompt.root; <userinput>make &amp;&amp; make install</userinput></screen>
 
       <para>Po czym musimy ponownie uruchomi� komputer.</para>
 
diff --git a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
index 5726735f6a..cad085f1cd 100644
--- a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2601,7 +2601,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	<example>
 	  <title>A Script for Creating a Bootable Floppy</title>
 
-	<programlisting><![ CDATA [#!/bin/sh
+	<programlisting><![CDATA[#!/bin/sh
 #
 # create a restore floppy
 #
@@ -2813,16 +2813,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
 	  Whatever caused the crash or data loss may strike again.  Another
 	  hour spent now may save you from further distress later.</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* I Did Not Prepare for the Disaster, What Now?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
@@ -3808,7 +3798,7 @@ device crypto</screen>
 	  <para>The following example will describe how to generate a
 	    key file, which will be used as part of the Master Key for
 	    the encrypted provider mounted under
-	    <filename role="directory">/private</filename>.  The key
+	    <filename class="directory">/private</filename>.  The key
 	    file will provide some random data used to encrypt the
 	    Master Key.  The Master Key will be protected by a
 	    passphrase as well.  Provider's sector size will be 4kB big.
@@ -3880,7 +3870,7 @@ Filesystem     Size   Used  Avail Capacity  Mounted on
 	  <title>Unmounting and Detaching the Provider</title>
 
 	  <para>Once the work on the encrypted partition is done, and
-	    the <filename role="directory">/private</filename> partition
+	    the <filename class="directory">/private</filename> partition
 	    is no longer needed, it is prudent to consider unmounting
 	    and detaching the <command>geli</command> encrypted
 	    partition from the kernel.</para>
diff --git a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
index 0133045012..2997cbc32f 100644
--- a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1703,6 +1703,10 @@
   <sect1 id="eresources-web">
     <title>World Wide Web Servers</title>
 
+    &chap.eresources.www.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.eresources.www.inc;
   </sect1>
 
diff --git a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
index ee46955977..29bf44fccc 100644
--- a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
index 6d4721e2e4..49ab5b61f6 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -87,7 +87,7 @@
     <para>GEOM permits access and control to classes &mdash; Master Boot
       Records, <acronym>BSD</acronym> labels, etc &mdash; through the
       use of providers, or the special files in
-      <filename role="directory">/dev</filename>.  Supporting various
+      <filename class="directory">/dev</filename>.  Supporting various
       software <acronym>RAID</acronym> configurations, GEOM will
       transparently provide access to the operating system and
       operating system utilities.</para>
@@ -157,7 +157,7 @@
       <step><para>Ensure that a suitable mount point exists.  If this
         volume will become a root partition, then temporarily use
         another mount point such as <filename
-        role="directory">/mnt</filename>:</para>
+        class="directory">/mnt</filename>:</para>
 
         <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
@@ -186,7 +186,7 @@ XXX: What message?  Put it inside the screen output above.
       </step>
 
       <step><para>This process should have created two other devices
-        in the <filename role="directory">/dev/stripe</filename>
+        in the <filename class="directory">/dev/stripe</filename>
         directory in addition to the <devicename>st0</devicename> device.
         Those include <devicename>st0a</devicename> and
         <devicename>st0c</devicename>.  A file system must now be created
@@ -248,7 +248,7 @@ XXX: What message?  Put it inside the screen output above.
     <para>Begin by installing &os; on the first disk with only two
       partitions.  One should be a swap partition, double the
       <acronym>RAM</acronym> size and all remaining space devoted to
-      the root (<filename role="directory">/</filename>) file system.
+      the root (<filename class="directory">/</filename>) file system.
       It is possible to have separate partitions for other mount points;
       however, this will increase the difficulty level ten fold due to
       manual alteration of the &man.bsdlabel.8; and &man.fdisk.8;
@@ -277,7 +277,7 @@ Done.</screen>
     <note>
       <para>This command should have created the
 	<devicename>gm0</devicename>, device node under the
-	<filename role="directory">/dev/mirror</filename>
+	<filename class="directory">/dev/mirror</filename>
 	directory.</para>
     </note>
 
@@ -305,7 +305,7 @@ Done.</screen>
     <para>This should have caused the system to spit out some
       information and a bunch of numbers.  This is good.  Examine the
       screen for any error messages and mount the device to the
-      <filename role="directory">/mnt</filename> mount point:</para>
+      <filename class="directory">/mnt</filename> mount point:</para>
 
     <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
 
@@ -443,7 +443,7 @@ OK? <userinput>boot</userinput></screen>
     <screen>&prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
 
     <para>From here on, the device may be accessed through the
-      <filename role="directory">/mnt</filename> mount point.</para>
+      <filename class="directory">/mnt</filename> mount point.</para>
 
     <note>
       <para>It should be pointed out that this will fail if the device
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
index 3dada36626..d3bac689a7 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
@@ -1014,7 +1014,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1071,7 +1071,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1087,7 +1087,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1099,7 +1099,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1130,7 +1130,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1151,7 +1151,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1169,7 +1169,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1179,7 +1179,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1213,7 +1213,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1372,7 +1372,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1439,7 +1439,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1486,7 +1486,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1531,7 +1531,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1562,7 +1562,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1800,7 +1800,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1825,7 +1825,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1859,7 +1859,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1877,7 +1877,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1893,7 +1893,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1910,7 +1910,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1933,7 +1933,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1990,7 +1990,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2042,7 +2042,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2077,7 +2077,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2279,7 +2279,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2323,7 +2323,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2492,7 +2492,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2542,7 +2542,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2595,7 +2595,7 @@ Upload subdirectory:
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2656,7 +2656,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2806,7 +2806,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/security" format="PNG"/>
+	    <imagedata fileref="install/security"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2887,7 +2887,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver1" format="PNG"/>
+	    <imagedata fileref="install/console-saver1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2901,7 +2901,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver2" format="PNG"/>
+	    <imagedata fileref="install/console-saver2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2921,7 +2921,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3" format="PNG"/>
+	    <imagedata fileref="install/console-saver3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2935,7 +2935,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver4" format="PNG"/>
+	    <imagedata fileref="install/console-saver4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2981,7 +2981,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2994,7 +2994,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3007,7 +3007,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3070,7 +3070,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3083,7 +3083,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3099,7 +3099,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3112,7 +3112,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3127,7 +3127,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3142,7 +3142,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3202,7 +3202,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3266,7 +3266,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3316,7 +3316,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3337,7 +3337,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3442,7 +3442,7 @@ To change any of these settings later, edit /etc/rc.conf
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/xf86setup" format="PNG"/>
+	    <imagedata fileref="install/xf86setup"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3959,7 +3959,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/desktop" format="PNG"/>
+	    <imagedata fileref="install/desktop"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3995,7 +3995,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-cat" format="PNG"/>
+	    <imagedata fileref="install/pkg-cat"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4015,7 +4015,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-sel" format="PNG"/>
+	    <imagedata fileref="install/pkg-sel"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4041,7 +4041,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-install" format="PNG"/>
+	    <imagedata fileref="install/pkg-install"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4055,7 +4055,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-confirm" format="PNG"/>
+	    <imagedata fileref="install/pkg-confirm"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4095,7 +4095,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4108,7 +4108,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4206,7 +4206,7 @@ failed.  Would you like to try again?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4272,7 +4272,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
index 69aa7e1cb6..d9be249892 100644
--- a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index 6c768df12f..913853c9d6 100644
--- a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
index ff6c476814..6236701373 100644
--- a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
index ca61fabcea..4114d79a0a 100644
--- a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -410,7 +410,7 @@ multi on</programlisting>
       <para>The shell scripts that
 	<application>&mathematica;</application> created during
 	installation have to be modified before you can use them.  If
-	you chose <filename role="directory">/usr/local/bin</filename>
+	you chose <filename class="directory">/usr/local/bin</filename>
 	as the directory to place the
 	<application>&mathematica;</application> executables in, you
 	will find symlinks in this directory to files called
@@ -615,14 +615,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -901,7 +901,7 @@ exit 0</programlisting>
 	    contain the following:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
index bdda4845cb..d3f4e3c17c 100644
--- a/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
index 9822ff76a6..7edc1659c9 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1968,7 +1968,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1979,7 +1979,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2011,7 +2011,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2059,7 +2059,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2077,7 +2077,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2088,7 +2088,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2101,7 +2101,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2118,7 +2118,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
index 91da938cf3..552ef66f88 100644
--- a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -273,6 +273,10 @@
       methods available for each site are provided in parentheses
       after the hostname.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2326,6 +2330,10 @@ doc/zh_*</screen>
     <para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
       at the following sites:</para>
 
+    &chap.mirrors.cvsup.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
@@ -2425,7 +2433,7 @@ doc/zh_*</screen>
 
       <note>
 	<para>In the default installation
-	  <filename role="directory">/usr/ports</filename> is not
+	  <filename class="directory">/usr/ports</filename> is not
 	  created.  If you run &os;&nbsp;6.0-RELEASE, it should be created before
 	  <command>portsnap</command> is used.  On more recent
 	  versions of &os; or <application>Portsnap</application>,
diff --git a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
index 93d2cb6ee2..de21e19deb 100644
--- a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
index 89e7013096..af7d1a0fa7 100644
--- a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -3080,7 +3080,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<hostid>org.</hostid>, as <hostid>org.</hostid> is more specific
 	than the root zone.  The layout of each part of a hostname is
 	much like a file system: the
-	<filename role="directory">/dev</filename> directory falls
+	<filename class="directory">/dev</filename> directory falls
 	within the root, and so on.</para>
     </sect2>
 
@@ -3164,7 +3164,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	    </row>
 
 	    <row>
-	      <entry><filename role="directory">/etc/namedb</filename></entry>
+	      <entry><filename class="directory">/etc/namedb</filename></entry>
 	      <entry>Directory where BIND zone information resides.</entry>
 	    </row>
 
@@ -3178,10 +3178,10 @@ dhcpd_ifaces="dc0"</programlisting>
 
       <para>Depending on how a given zone is configured on the server,
 	the files related to that zone can be found in the <filename
-	role="directory">master</filename>, <filename
-	role="directory">slave</filename>, or <filename
-	role="directory">dynamic</filename> subdirectories of the
-	<filename role="directory">/etc/namedb</filename> directory.
+	class="directory">master</filename>, <filename
+	class="directory">slave</filename>, or <filename
+	class="directory">dynamic</filename> subdirectories of the
+	<filename class="directory">/etc/namedb</filename> directory.
 	These files contain the <acronym>DNS</acronym> information that
 	will be given out by the name server in response to queries.</para>
     </sect2>
@@ -3229,7 +3229,7 @@ dhcpd_ifaces="dc0"</programlisting>
 
       <para>Configuration files for <application>named</application>
 	currently reside in
-	<filename role="directory">/etc/namedb</filename> directory and
+	<filename class="directory">/etc/namedb</filename> directory and
 	will need modification before use, unless all that is needed is
 	a simple resolver.  This is where most of the configuration will
 	be performed.</para>
@@ -3238,7 +3238,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<title>Using <command>make-localhost</command></title>
 
 	<para>To configure a master zone for the localhost visit the
-	  <filename role="directory">/etc/namedb</filename> directory
+	  <filename class="directory">/etc/namedb</filename> directory
 	  and run the following command:</para>
 
 	<screen>&prompt.root; <userinput>sh make-localhost</userinput></screen>
diff --git a/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index 35b33145a9..56fa76c07f 100644
--- a/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
index a541195139..86bc19dbe9 100644
--- a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
@@ -624,7 +624,7 @@ docbook                     =
           CVSup</link>.</para>
 
 	<para>Bardzo wa�nym jest, aby upewni� si�, �e katalog
-          <filename role="directory">/usr/ports</filename> jest pusty
+          <filename class="directory">/usr/ports</filename> jest pusty
           nim po raz pierwszy uruchomimy <application>CVSup</application>!
           Je�li posiadamy ju� kolekcj� port�w pozyskan� z innego �r�d�a
           <application>CVSup</application> nie usunie nieu�ywanych
@@ -717,7 +717,7 @@ docbook                     =
             b�d� najnowsz� wersj� programu <application>Portsnap</application>.
             Przy pierwszym uruchomieniu programu &man.portsnap.8;  zostanie
             automatycznie utworzony katalog <filename
-	    role="directory">/usr/ports</filename>. W starszych wersjach programu
+	    class="directory">/usr/ports</filename>. W starszych wersjach programu
             wymagane jest w�asnor�czne utworzenie katalogu:</para>
 
 	  <screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
@@ -725,7 +725,7 @@ docbook                     =
 
 	<step>
           <para>Pobierz skompresowan� migawk� kolekcji port�w do katalogu
-            <filename role="directory">/var/db/portsnap</filename>. Mo�na nast�pnie
+            <filename class="directory">/var/db/portsnap</filename>. Mo�na nast�pnie
             zako�czy� po��czenie z Internetem, je�li jest taka potrzeba.</para>
 
 	  <screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
@@ -734,13 +734,13 @@ docbook                     =
 	<step>
           <para>Je�li uruchamiany <application>Portsnap</application> po raz
             pierwszy nale�y rozpakowa� migawk� do katalogu
-            <filename role="directory">/usr/ports</filename>:
+            <filename class="directory">/usr/ports</filename>:
 	  </para>
 
 	  <screen>&prompt.root; <userinput>portsnap extract</userinput></screen>
 
           <para>Je�li posiadamy ju� kolekcj� port�w w <filename
-	    role="directory">/usr/ports</filename> i jedynie j� aktualizujemy,
+	    class="directory">/usr/ports</filename> i jedynie j� aktualizujemy,
             wpisujemy polecenie:</para>
 
 	  <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
@@ -1250,7 +1250,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
           port�w jest <application>Portmanager</application>, dost�pny z portu
 	  <filename role="package">sysutils/portmanager</filename>:</para>
 
-	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/sysutils/portmanager</filename></userinput>
+	<screen>&prompt.root; <userinput>cd <filename class="directory">/usr/ports/sysutils/portmanager</filename></userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
 	<para>Wszystkie zainstalowane porty mog� zosta� zaktualizowane
diff --git a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index 39d4f88bf2..fe62c1eda2 100644
--- a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/preface/preface.xml b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
index a565e7fd2f..20ef5fd36f 100644
--- a/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
+++ b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
     The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
index 6c50560d6c..5e1736a3ac 100644
--- a/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
index 34d9592e35..3da3d06fc4 100644
--- a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
index ff89ce1eb0..b2337fbcf7 100644
--- a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/users/chapter.xml b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
index 2820678aa1..fdca469842 100644
--- a/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
index 3b3ade50a2..f25d496c46 100644
--- a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
 	The Vinum Volume Manager
 	By Greg Lehey (grog at lemis dot com)
diff --git a/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
index f65bf0ca0c..37c3ddb00e 100644
--- a/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/share/xml/catalog b/pl_PL.ISO8859-2/share/xml/catalog
index 61f86d1fe8..2422c1740c 100644
--- a/pl_PL.ISO8859-2/share/xml/catalog
+++ b/pl_PL.ISO8859-2/share/xml/catalog
@@ -1,27 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-     Original revision: 1.5
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-        "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
-	"newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
-	"teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
-	"trademarks.ent"
+       "freebsd.dsl"
diff --git a/pl_PL.ISO8859-2/share/xml/catalog.xml b/pl_PL.ISO8859-2/share/xml/catalog.xml
new file mode 100644
index 0000000000..d43f73af53
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xml/catalog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+        uri="l10n.ent" />
+</catalog>
diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent
index 06a3061827..8c3ea6368a 100644
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,30 @@
      Original revision: 1.2
 -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	"nonexistent">
 %glossary;
diff --git a/pl_PL.ISO8859-2/share/xml/freebsd.dsl b/pl_PL.ISO8859-2/share/xml/freebsd.dsl
index 24be6027d0..8877f4abc8 100644
--- a/pl_PL.ISO8859-2/share/xml/freebsd.dsl
+++ b/pl_PL.ISO8859-2/share/xml/freebsd.dsl
@@ -8,47 +8,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %output.html; [
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "Ten i inne dokumenty mo�na pobra� z ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "W przypadku pyta� o FreeBSD prosimy przeczyta� dost�pn� ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "dokumentacj�"))
-                (literal " przed kontaktem z <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "W sprawie zapyta� o t� dokumentacj� prosimy o kontakt z <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/pl_PL.ISO8859-2/share/xml/l10n.ent b/pl_PL.ISO8859-2/share/xml/l10n.ent
index 7747ee9a49..de4a4227a7 100644
--- a/pl_PL.ISO8859-2/share/xml/l10n.ent
+++ b/pl_PL.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (pl).
 
diff --git a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
index 5225fccdda..fb51733752 100644
--- a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
+++ b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      Names of FreeBSD mailing lists and related software.
 
diff --git a/pl_PL.ISO8859-2/share/xml/newsgroups.ent b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
index e47d2189a1..97f1cc297b 100644
--- a/pl_PL.ISO8859-2/share/xml/newsgroups.ent
+++ b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/share/xml/teams.ent b/pl_PL.ISO8859-2/share/xml/teams.ent
index a02f7d3e24..22a7b92716 100644
--- a/pl_PL.ISO8859-2/share/xml/teams.ent
+++ b/pl_PL.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index 65ab34d5bc..c0b954bcfe 100644
--- a/pt_BR.ISO8859-1/articles/building-products/article.xml
+++ b/pt_BR.ISO8859-1/articles/building-products/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-  "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" 
-  "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
@@ -455,7 +451,7 @@
         <title>Organiza��o do FreeBSD</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="freebsd-organization" format="PIC"/>
+            <imagedata fileref="freebsd-organization"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -514,7 +510,7 @@
         <title>Ramos de vers�es do FreeBSD</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="freebsd-branches" format="EPS"/>
+            <imagedata fileref="freebsd-branches"/>
           </imageobject>
         </mediaobject>
       </figure>
diff --git a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
index 4326701a7b..8bfdb6dbee 100644
--- a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -1011,7 +1008,7 @@
 	Banco de Dados de Relat�rios de Problemas</ulink>.</para>
 
     <para>O <ulink url="http://pointyhat.FreeBSD.org/">Pointyhat</ulink>
-      &eacute o cluster de compila��o do sistema de
+      � o cluster de compila��o do sistema de
       <literal>ports</literal>.  Voc� pode utilizar o Pointyhat
       para  verificar os logs de compila��o de um
       <literal>port</literal> em todas as arquiteturas e releases
diff --git a/pt_BR.ISO8859-1/articles/contributing/article.xml b/pt_BR.ISO8859-1/articles/contributing/article.xml
index 1be0165a20..d8fadee65e 100644
--- a/pt_BR.ISO8859-1/articles/contributing/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
index b5e8887f96..54dde6cc38 100644
--- a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
index b8edaafb0f..56a9dad85c 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
index 025d28a872..a4c5c39a62 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY fbus.ap "<application>Servidor de Atualiza��o do FreeBSD</application>">
 ]>
 
@@ -787,14 +785,14 @@ addextradocs () {
 
 	<screen>#Build the world
 log "Building world"
-cd /usr/src &&
-make -j 2 ${COMPATFLAGS} buildworld 2>&1
+cd /usr/src &amp;&amp;
+make -j 2 ${COMPATFLAGS} buildworld 2>&amp;1
 
 # Distribute the world
 log "Distributing world"
-cd /usr/src/release &&
-make -j 2 obj &&
-  make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+cd /usr/src/release &amp;&amp;
+make -j 2 obj &amp;&amp;
+  make ${COMPATFLAGS} release.1 release.2 2>&amp;1</screen>
       </listitem>
 
       <listitem>
diff --git a/pt_BR.ISO8859-1/articles/hubs/article.xml b/pt_BR.ISO8859-1/articles/hubs/article.xml
index 3070963f8f..d6ae971fbb 100644
--- a/pt_BR.ISO8859-1/articles/hubs/article.xml
+++ b/pt_BR.ISO8859-1/articles/hubs/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" 
-  "../../../share/xml/freebsd42.dtd" [
-  <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" 
-  "../../share/xml/entities.ent">
-  %entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/linux-users/article.xml b/pt_BR.ISO8859-1/articles/linux-users/article.xml
index 6d3192a5bc..79434631de 100644
--- a/pt_BR.ISO8859-1/articles/linux-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/new-users/article.xml b/pt_BR.ISO8859-1/articles/new-users/article.xml
index fd3c929b95..2034619675 100644
--- a/pt_BR.ISO8859-1/articles/new-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/portbuild/article.xml b/pt_BR.ISO8859-1/articles/portbuild/article.xml
index 00d09fb9c9..be0a7c0905 100644
--- a/pt_BR.ISO8859-1/articles/portbuild/article.xml
+++ b/pt_BR.ISO8859-1/articles/portbuild/article.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-  "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
-  "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
@@ -66,7 +62,7 @@
     <note>
       <para>Muitos dos detalhes deste artigo ser�o do interesse apenas
         dos membros da equipe que faz o <ulink
-	url="&url.base/portmgr">Gerenciamento da Cole��o de 
+	url="&url.base;/portmgr">Gerenciamento da Cole��o de 
 	<literal>Ports</literal></ulink></para>
     </note>
 
@@ -2841,7 +2837,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
       </listitem>
 
       <listitem>
-	<para><screen>cd .ssh && ssh-keygen</screen></para>
+	<para><screen>cd .ssh &amp;&amp; ssh-keygen</screen></para>
       </listitem>
 
       <listitem>
diff --git a/pt_BR.ISO8859-1/articles/problem-reports/article.xml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
index 89fa4e748d..ec1f919881 100644
--- a/pt_BR.ISO8859-1/articles/problem-reports/article.xml
+++ b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Documentation Project
@@ -561,7 +558,7 @@
 		  <para>O fato de que voc� leu o 
 		    <filename>src/UPDATING</filename> e que o seu 
 		    problema n�o est� listado ali
-		    (&eacute certeza que algu�m vai
+		    (� certeza que algu�m vai
 		    perguntar)</para>
 		</listitem>
 		<listitem>
@@ -599,7 +596,7 @@
 		  <para>O fato de que voc� leu o
 		    <filename>ports/UPDATING</filename> e que o seu
 		    problema n�o est� listado ali
-		    (&eacute certeza que algu�m vai
+		    (� certeza que algu�m vai
 		    perguntar)</para>
 		</listitem>
 	      </itemizedlist>
@@ -661,7 +658,7 @@
 	    voc� deve estar preparado para n�o somente
 	    disponibilizar um <literal>patch</literal>, como
 	    tamb�m para defender porque o seu
-	    <literal>patch</literal> &eacute <quote>a coisa certa a
+	    <literal>patch</literal> � <quote>a coisa certa a
 	    se fazer</quote>.  Como mencionado acima, realizar uma
 	    busca cuidadosa no hist�rico das <ulink
 	    url="http://www.FreeBSD.org/search/search.html#mailinglists">listas
@@ -1453,7 +1450,7 @@
 
       <para>Antes de pressionar o bot�o
      	<literal>submit</literal> para enviar o seu relat�rio,
-	voc� ter&aacute que preencher um campo com o texto 
+	voc� ter� que preencher um campo com o texto 
 	exibido na imagem de captcha exibida no final do 
 	formul�rio.  Infelizmente esta medida teve de ser 
 	adotada devido ao mau uso do mesmo por sistemas automatizados 
diff --git a/pt_BR.ISO8859-1/books/faq/book.xml b/pt_BR.ISO8859-1/books/faq/book.xml
index 7c194ccd9f..449d044c4b 100644
--- a/pt_BR.ISO8859-1/books/faq/book.xml
+++ b/pt_BR.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
 ]>
 
@@ -2381,7 +2379,7 @@ sectors/track: 63</screen>
 	    voc� ter� que instalar a
 	    distribui��o <quote>crypto</quote> via
 	    sysinstall ou apartir do c�digo fonte).  Instalando
-	    as bibliotecas crypto ser&aacute possivel utilizar outros
+	    as bibliotecas crypto ser� possivel utilizar outros
 	    tipos de criptografia, como o formato Blowfish, que
 	    � ainda mais seguro do que o MD5.  A
 	    defini��o de qual codifica��o
@@ -2957,7 +2955,7 @@ disk            wd2     at wdc1 drive 1 # change from wd3 to wd2</programlisting
 	  <para>O FreeBSD suporta ZIP Drives do tipo SCSI, �
 	    claro.  Essa unidade deve ser configurada apenas nos SCSI
 	    ID n�meros 5 ou 6, mas se a sua BIOS tem suporte
-	    &agrave inicializ��o(boot) pela unidade
+	    � inicializ��o(boot) pela unidade
 	    SCSI, essa caracter�stica pode ser usada sem
 	    problemas.  N�o est� claro exatamente quais
 	    adaptadores SCSI suportam a caracter�stica de
@@ -3505,11 +3503,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);
@@ -3520,7 +3518,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>Em vers�es posteriores � 3.2, o suporte
 	    deve funcionar.</para>
@@ -5026,7 +5024,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
@@ -6052,7 +6050,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	  <programlisting>options GPL_MATH_EMULATE</programlisting>
 
 	  <note>
-	    <para>Quando voc&ecirc fizer isto, ser�
+	    <para>Quando voc� fizer isto, ser�
 	      necess�rio remover a op��o
 	      <literal>MATH_EMULATE</literal></para>
 	  </note>
@@ -6120,7 +6118,7 @@ crw-rw-rw-  1 root  wheel   41,   1 Oct 15 22:14 spx</screen>
 	    �  <ulink
 	      url="http://www.cis.ohio-state.edu/~barr/INN.html">Dave
 	      Barr's INN Page</ulink> onde vo�e
-	    encontrar&aacute o <literal>FAQ</literal> do INN.
+	    encontrar� o <literal>FAQ</literal> do INN.
 	  </para>
 	</answer>
       </qandaentry>
@@ -6643,7 +6641,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
 	  <procedure>
 	    <step>
 	      <para>Crie um novo sistema de arquivos com o
-		&man.newfs.8 na nova parti��o.</para>
+		&man.newfs.8; na nova parti��o.</para>
 	    </step>
 
 	    <step>
@@ -6676,7 +6674,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
 &prompt.root; <userinput>dump 0af - / | restore xf -</userinput></screen>
 
 	  <para>Redefinir a estrutura das parti��es com
-	    o &man.dump.8 � um processo um pouco mais
+	    o &man.dump.8; � um processo um pouco mais
 	    trabalhoso.  Caso voc� queira, por exemplo, unir o
 	    conte�do da parti��o
 	    <filename>/var</filename> com as parti��es
@@ -7044,7 +7042,7 @@ use "disklabel -r" to install initial label</screen>
 	  <screen>&prompt.root; <userinput>disklabel ccd0 &gt; /tmp/disklabel.tmp</userinput>
 &prompt.root; <userinput>disklabel -Rr ccd0 /tmp/disklabel.tmp</userinput>
 &prompt.root; <userinput>disklabel -e ccd0</userinput>
-(agora ir&aacute funcionar)</screen>
+(agora ir� funcionar)</screen>
 	</answer>
       </qandaentry>
 
@@ -11526,7 +11524,7 @@ default            10.0.0.2           UGSc        0        0      tun0
 	  <para>Assume-se o uso do endere�o recomendado pelo
 	    &a.ptbr.p.handbook;, p�ginas de manual ou no
 	    arquivo ppp.conf.sample.  Se a rota padr�o
-	    n�o foi definida, &eacute poss�vel que a
+	    n�o foi definida, � poss�vel que a
 	    vers�o do &man.ppp.8; seja antiga, uma vez que
 	    n�o entendem a palavra <literal>HISADDR</literal>
 	    no arquivo ppp.conf.  Se a vers�o do seu FreeBSD
@@ -11768,7 +11766,7 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
 	    ent�o quando a proxima queda de link ocorrer, eles
 	    podem ser capazes de dizer porque o seu lado esta tendo
 	    problemas.  Sinta-se livre para enviar os detalhes para
-	    &a.brian ou pe�a para seu provedor
+	    &a.brian; ou pe�a para seu provedor
 	    contact�-lo diretamente.</para>
 	</answer>
       </qandaentry>
@@ -11920,7 +11918,7 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
 	    , CCP &amp; IPCP com suas requisi��es
 	    originais.  Como consequ�ncia, se uma
 	    implementa��o ppp � 6 segundos mais
-	    lenta do que o outro lado, esse lado emitir&aacute duas
+	    lenta do que o outro lado, esse lado emitir� duas
 	    requis�es adicionais de configura��o
 	    LCP.  Isto � fatal.</para>
 
@@ -13289,7 +13287,7 @@ device sio7 at isa? port 0x2b8 tty flags 0x781 irq 7 vector siointr</programlist
 tip57600|Disque para qualquer n�mero em 57600 bps:\
         :dv=/dev/cuaa0:br#57600:at=hayes:pa=none:du:</programlisting>
 
-	  <para>Depois voc&ecirc pode fazer algo como <command>tip
+	  <para>Depois voc� pode fazer algo como <command>tip
 	      -115200 5551234</command>.  Se preferir o &man.cu.1; ao
 	    inv�s do &man.tip.1;, utilize uma entrada
 	    gen�rica:</para>
@@ -13675,7 +13673,7 @@ raisechar=^^</programlisting>
 
 	  <para>O FreeBSD vem de tradi��o
 	    <quote>cl�ssica</quote> e por isso sempre usou o
-	    formado &man.a.out.5 que � uma tecnologia que foi
+	    formado &man.a.out.5; que � uma tecnologia que foi
 	    experimentada e aprovada por v�rias
 	    gera��es de sistemas BSD.  Apesar de,
 	    h� algum tempo tamb�m ser poss�vel
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/book.xml b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
index 2d4b53664e..b96fbef5c1 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/book.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!ENTITY % not.published "INCLUDE">
 ]>
 
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index cd66467abc..5218a3581b 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 2e5d6fa786..2b534cba53 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -74,7 +75,7 @@
     <example>
       <title>DocBook <sgmltag>book</sgmltag></title>
 
-      <programlisting><![ RCDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+      <programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
 <book>
   <bookinfo>
@@ -126,7 +127,7 @@
     <example>
       <title>DocBook <sgmltag>article</sgmltag></title>
 
-      <programlisting><![ RCDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+      <programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
 <article>
   <articleinfo>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index b97ed64711..d907e68ba0 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 1e830891ba..624ec3e8ff 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index c681654aa5..d79f096954 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index ec8bb39d10..b623738add 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -176,7 +177,7 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<h1>Primeira se��o</h1>
+	  <programlisting><![CDATA[<h1>Primeira se��o</h1>
 
 <!-- a introdu��o do documento entra aqui -->
 
@@ -210,7 +211,7 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<h1>Primeira se��o</h1>
+	  <programlisting><![CDATA[<h1>Primeira se��o</h1>
 
 <!-- Introdu��o do documento -->
 
@@ -231,7 +232,7 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Isto � um par�grafo.  Pode conter qualquer outro elemento</p>]]></programlisting>
+	  <programlisting><![CDATA[<p>Isto � um par�grafo.  Pode conter qualquer outro elemento</p>]]></programlisting>
 	</example>
       </sect3>
 
@@ -248,7 +249,7 @@
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Um pequeno trecho da constitui��o dos Estados Unidos:</p>
+	  <programlisting><![CDATA[<p>Um pequeno trecho da constitui��o dos Estados Unidos:</p>
 
 <blockquote>
 N�s, povo dos Estados Unidos, com o objetivo de fazer uma 
@@ -300,7 +301,7 @@ essa constitui
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Uma lista n�o ordenada.  Os itens ser�o provavelmente 
+	  <programlisting><![CDATA[<p>Uma lista n�o ordenada.  Os itens ser�o provavelmente 
 precedidos por uma esfera s�lida.</p>
 
 <ul>
@@ -332,7 +333,7 @@ ser
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<dl>
+	  <programlisting><![CDATA[<dl>
   <dt>Termo 1</dt>
 
   <dd><p>Par�grafo 1 da defini��o 1.</p>
@@ -369,7 +370,7 @@ ser
 	  <para>Voc� pode usar <sgmltag>pre</sgmltag> para 
 	    marcar uma mensagem de email;</para>
 
-	  <programlisting><![ RCDATA [<pre>  
+	  <programlisting><![CDATA[<pre>  
   From: nik@FreeBSD.org
   To: freebsd-doc@FreeBSD.org
   Subject: New documentation available
@@ -387,7 +388,7 @@ ser
 	  <para>Tenha em mente que o <literal>&lt;</literal> e o
 	    <literal>&amp;</literal> continuam sendo reconhecidos como
 	    caracteres especiais em um texto pr�-formatado.  
-	    &Eacute por isto que nos exemplos tivemos que utilizar
+	    � por isto que nos exemplos tivemos que utilizar
 	    <literal>&amp;lt;</literal> ao inv�s de
 	    <literal>&lt;</literal>.  Para manter a consist�ncia,
 	    o <literal>&amp;gt;</literal> tamb�m foi utilizado
@@ -428,7 +429,7 @@ ser
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Esta � uma simples tabela 2x2.</p>
+	  <programlisting><![CDATA[<p>Esta � uma simples tabela 2x2.</p>
 
 <table>
   <tr>
@@ -455,7 +456,7 @@ ser
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Uma c�lula comprida e estreita na esquerda e duas 
+	  <programlisting><![CDATA[<p>Uma c�lula comprida e estreita na esquerda e duas 
 c�lulas pequenas � direita.</p>
 
 <table>
@@ -476,7 +477,7 @@ c
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Uma c�lula longa em cima, duas c�lulas abaixo.</p>
+	  <programlisting><![CDATA[<p>Uma c�lula longa em cima, duas c�lulas abaixo.</p>
 
 <table>
   <tr>
@@ -497,7 +498,7 @@ c
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Numa tabela 3x3, o bloco superior esquerdo � um conjunto 
+	  <programlisting><![CDATA[<p>Numa tabela 3x3, o bloco superior esquerdo � um conjunto 
 2x2 fundidos em um.  As outras c�lulas s�o normais.</p>
 
 <table>
@@ -548,7 +549,7 @@ c
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p><em>Este</em> foi enfatizado
+	  <programlisting><![CDATA[<p><em>Este</em> foi enfatizado
 enquanto <strong>este</strong> foi fortemente enfatizado.</p>]]>
           </programlisting>
 	</example>
@@ -567,7 +568,7 @@ enquanto <strong>este</strong> foi fortemente enfatizado.</p>]]>
 	<example>
 	  <title><sgmltag>b</sgmltag> e <sgmltag>i</sgmltag></title>
 
-	  <programlisting><![ RCDATA [<p><b>Este</b> esta em negrito, 
+	  <programlisting><![CDATA[<p><b>Este</b> esta em negrito, 
 enquanto <i>este</i> est� em it�lico.</p>]]>
 	  </programlisting>
 	</example>
@@ -585,7 +586,7 @@ enquanto <i>este</i> est
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p> Este documento foi originalmente por
+	  <programlisting><![CDATA[<p> Este documento foi originalmente por
 Nik Clayton, que pode ser encontrado por email em
 <tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
 	</example>
@@ -634,7 +635,7 @@ Nik Clayton, que pode ser encontrado por email em
 
 	  <para>Todos os fragmentos fazem a mesma coisa.</para>
 
-	  <programlisting><![ RCDATA [<p>Este texto � <small>ligeiramente menor</small>. 
+	  <programlisting><![CDATA[<p>Este texto � <small>ligeiramente menor</small>. 
 Mas este texto � <big>ligeiramente maior</big>.</p>
 
 <p>Este texto � <font size="-1">ligeiramente menor</font>. 
@@ -674,7 +675,7 @@ Mas este texto 
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p>Maiores informa��es est�o dispon�veis no 
+	  <programlisting><![CDATA[<p>Maiores informa��es est�o dispon�veis no 
 <a href="http://www.FreeBSD.org/">web site do FreeBSD</a>.</p>]]></programlisting>
 	</example>
 
@@ -700,7 +701,7 @@ Mas este texto 
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<p><a name="para1">Este</a> par�grafo pode ser referenciado
+	  <programlisting><![CDATA[<p><a name="para1">Este</a> par�grafo pode ser referenciado
 em outros links com o nome<tt>para1</tt>.</p>]]></programlisting>
 	</example>
 
@@ -717,7 +718,7 @@ em outros links com o nome<tt>para1</tt>.</p>]]></programlisting>
 	    em um documento chamado <filename>foo.html</filename>.
 	    </para>
 
-	  <programlisting><![ RCDATA [<p>Mais informa��o no <a href="foo.html#para1">primeiro 
+	  <programlisting><![CDATA[<p>Mais informa��o no <a href="foo.html#para1">primeiro 
 par�grafo</a> de <tt>foo.html</tt>.</p>]]>
           </programlisting>
 	</example>
@@ -733,7 +734,7 @@ par
 
 	  <para>Suponha que o exemplo <literal>para1</literal> esteja neste documento</para>
 
-	  <programlisting><![ RCDATA [<p>Mais informa��o no <a href="#para1">primeiro 
+	  <programlisting><![CDATA[<p>Mais informa��o no <a href="#para1">primeiro 
 par�grafo</a> deste documento.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -744,7 +745,7 @@ par
     <title>DocBook</title>
 
     <para>O DocBook foi originalmente desenvolvido por HaL Computer 
-      Systems e O'Reilly & Associates como um DTD para escrever 
+      Systems e O'Reilly &amp; Associates como um DTD para escrever 
       documenta��o t�cnica
       <footnote><para>Uma pequena hist�ria sobre este assunto 
       pode ser encontrada em
@@ -992,7 +993,7 @@ par
 	<example>
 	  <title>Um cap�tulo simples</title>
 
-	  <programlisting><![ RCDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>T�tulo do cap�tulo</title>
 
   ...
@@ -1008,7 +1009,7 @@ par
 	<example>
 	  <title>Cap�tulos Vazios</title>
 
-	  <programlisting><![ RCDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>Isto � um cap�tulo vazio</title>
 
   <para></para>
@@ -1040,7 +1041,7 @@ par
 	<example>
 	  <title>Se��es em Cap�tulos</title>
 
-	  <programlisting><![ RCDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>Um exemplo de cap�tulo</title>
 
   <para>Algum texto dentro do cap�tulo</para>
@@ -1095,7 +1096,7 @@ par
 	  <sgmltag>part</sgmltag>s.  Isto n�o pode ser 
 	  feito em um <sgmltag>article</sgmltag>.</para>
 
-	<programlisting><![ RCDATA [<part>
+	<programlisting><![CDATA[<part>
   <title>Introdu��o</title>
 
   <chapter>
@@ -1142,7 +1143,7 @@ par
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<para>Isso � um par�grafo.  E pode conter quase 
+	  <programlisting><![CDATA[<para>Isso � um par�grafo.  E pode conter quase 
   qualquer outro elemento.</para> ]]></programlisting>
 
 	  <para>Apar�ncia:</para>
@@ -1171,7 +1172,7 @@ par
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<para>Um pequeno peda�o da Constitui��o dos Estados Unidos:</para>
+	  <programlisting><![CDATA[<para>Um pequeno peda�o da Constitui��o dos Estados Unidos:</para>
 	      
 <blockquote>
   <title>Pre�mbulo da constitui��o dos Estados Unidos.</title>
@@ -1263,7 +1264,7 @@ par
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<warning>
+	  <programlisting><![CDATA[<warning>
 <para>Instalar o FreeBSD talvez fa�a com que voc� queira
 desinstalar o Windows do seu Hard disk.</para>
 </warning>]]></programlisting>
@@ -1321,7 +1322,7 @@ desinstalar o Windows do seu Hard disk.</para>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<itemizedlist>
+	  <programlisting><![CDATA[<itemizedlist>
   <listitem>
     <para>Esse � o primeiro item enumerado.</para>
   </listitem>
@@ -1416,7 +1417,7 @@ desinstalar o Windows do seu Hard disk.</para>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA[<para>Quando voc� tiver terminado, seu programa deve estar assim:</para>
+	  <programlisting><![CDATA[<para>Quando voc� tiver terminado, seu programa deve estar assim:</para>
 
 <programlisting>#include &lt;stdio.h&gt;
 
@@ -1467,7 +1468,7 @@ main(void)
 	  <title><sgmltag>co</sgmltag> e
 	    <sgmltag>calloutlist</sgmltag></title>
 
-	  <programlisting><![ RCDATA[<para>Quando voc� tivert terminado, seu prograva deve estar assim;</para>
+	  <programlisting><![CDATA[<para>Quando voc� tivert terminado, seu prograva deve estar assim;</para>
 
 <programlisting>#include &lt;stdio.h&gt; <co id="co-ex-include"/>
 
@@ -1556,7 +1557,7 @@ main(void)
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<informaltable pgwide="1">
+	  <programlisting><![CDATA[<informaltable pgwide="1">
   <tgroup cols="2">
     <thead>
       <row>
@@ -1736,7 +1737,7 @@ main(void)
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+	  <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
 foo1
 foo2
 foo3
@@ -1798,7 +1799,7 @@ This is the file called 'foo2'</screen>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<para>O FreeBSD � sem d�vida <emphasis>o</emphasis> melhor sistema operacional tipo Unix
+	  <programlisting><![CDATA[<para>O FreeBSD � sem d�vida <emphasis>o</emphasis> melhor sistema operacional tipo Unix
 para a arquitetura Intel.</para>]]></programlisting>
 	
 	  <para>Apar�ncia:</para>
@@ -1823,7 +1824,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [<para>Entretanto, certifique-se que a busca n�o v� al�m do <quote>limite entre 
+	  <programlisting><![CDATA[<para>Entretanto, certifique-se que a busca n�o v� al�m do <quote>limite entre 
   a administra��o local e p�blica</quote> como diz o RFC 1535.</para>]]></programlisting>
 
 	  <para>Apar�ncia:</para>
@@ -1865,7 +1866,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<para>Para mudar para o segundo terminal virtual, digite 
+	  <programlisting><![CDATA[<para>Para mudar para o segundo terminal virtual, digite 
   <keycombo action="simul"><keycap>Alt</keycap>
     <keycap>F1</keycap></keycombo>.</para>
 
@@ -1991,7 +1992,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ CDATA [<para>O <application>Sendmail</application> � a aplica��o 
+	  <programlisting><![CDATA[<para>O <application>Sendmail</application> � a aplica��o 
   de email mais utilizada em Unix.</para>
 
 <para>O <application>Sendmail</application> inclui os programas 
@@ -2046,7 +2047,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<para>O fonte SGML do Handbook em Ingl�s pode ser encotrado em 
+	  <programlisting><![CDATA[<para>O fonte SGML do Handbook em Ingl�s pode ser encotrado em 
   <filename class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.  
   O primeiro arquivo neste diret�rio � chamado <filename>book.xml</filename>. 
   Voc� tamb�m deve ver o <filename>Makefile</filename> 
@@ -2092,7 +2093,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 
 	  <para>Use:</para>
 
-          <programlisting><![ RCDATA [<para>Instale o port <filename role="package">net/ethereal</filename>
+          <programlisting><![CDATA[<para>Instale o port <filename role="package">net/ethereal</filename>
 para ver o tr�fego na rede.</para>]]></programlisting>
 
 	  <para>Apar�ncia:</para>
@@ -2131,7 +2132,7 @@ para ver o tr
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para><devicename>sio</devicename> � usado para comunica��o
   serial no FreeBSD. <devicename>sio</devicename> se manifesta 
   atrav�s de entradas em <filename>/dev</filename>, incluindo 
@@ -2269,7 +2270,7 @@ para ver o tr
 	
 	  <para>Use:</para>
 	
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para>A m�quina local sempre pode ser referida pelo nome 
 <hostid>localhost</hostid>, que ter� o endere�o IP
 <hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -2339,7 +2340,7 @@ role="mac">08:00:20:87:ef:d0</hostid>).</para>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [<para>Para executar a maioria das fun��es administrativas voc� precisar� 
+	  <programlisting><![CDATA[<para>Para executar a maioria das fun��es administrativas voc� precisar� 
   ser <username>root</username>.</para>]]></programlisting>
 
 	  <para>Apar�ncia:</para>
@@ -2382,7 +2383,7 @@ role="mac">08:00:20:87:ef:d0</hostid>).</para>
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para>Dois alvos comuns em um <filename>Makefile</filename> s�o
 <maketarget>all</maketarget> e <maketarget>clean</maketarget>.</para>
 
@@ -2441,7 +2442,7 @@ muitas vari
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [ <para>A linha <literal>maxusers 10</literal> no arquivo de 
+	  <programlisting><![CDATA[ <para>A linha <literal>maxusers 10</literal> no arquivo de 
 configura��o do kernel determina o tamanho de muitas tabelas 
 do sistema, e diz aproximadamente quantos logins simult�neos
 o sistema ir� suportar.</para>
@@ -2479,7 +2480,7 @@ o sistema ir
 	
 	  <para>Uso:</para>
 	
-		<programlisting><![ CDATA [<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
+		<programlisting><![CDATA[<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
 
 	  <para>Apar�ncia:</para>
 	
@@ -2497,7 +2498,7 @@ o sistema ir
 	
 	  <para>Uso:</para>
 	
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para>A linha <literal>maxusers <replaceable>n</replaceable></literal> 
 no arquivo de configura��o do kernel determina o tamanho de muitas 
 tabelas do sistema, e diz aproximadamente quantos logins simult�neos
@@ -2533,7 +2534,7 @@ bom valor para <replaceable>n</replaceable>.</para>
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [ 
+	  <programlisting><![CDATA[ 
 <screen><errorname>Panic: cannot mount root</errorname></screen> ]]>
 </programlisting>
 
@@ -2665,7 +2666,7 @@ bom valor para <replaceable>n</replaceable>.</para>
 
 	<para>Um exemplo provavelmente ir� tornar as coisas 
 	  mais f�ceis de se entender.  Suponha que voc� 
-	  tenha uma imagem, chamada <filename>fig1</filename>, que 
+	  tenha uma imagem, chamada <filename>fig1.png</filename>, que 
 	  voc� queira incluir no documento.  Esta imagem 
 	  � um ret�ngulo com um A dentro dele.  A 
 	  marca��o para isso ser�:</para>
@@ -2849,7 +2850,7 @@ IMAGES=  chapter1/fig1.png
 	  <title>O atributo <literal>id</literal> em cap�tulos
 	    ou se��es</title>
 
-	  <programlisting><![ RCDATA [<chapter id="chapter1">
+	  <programlisting><![CDATA[<chapter id="chapter1">
   <title>Introdu��o</title>
 
   <para>Esta � a introdu��o.  Cont�m uma 
@@ -2881,7 +2882,7 @@ IMAGES=  chapter1/fig1.png
 	<example>
 	  <title><sgmltag>anchor</sgmltag></title>
 
-	  <programlisting><![ RCDATA [<para>
+	  <programlisting><![CDATA[<para>
 Este par�grafo tem um <anchor id="para1">alvo dentro dele. 
 O qual n�o ir� aparecer no documento
 </para>]]></programlisting>
@@ -2912,7 +2913,7 @@ O qual n
 	    lugar de um documento que inclua o <literal>id</literal> 
 	    do exemplo.</para>
 	
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para>Maiores informa��es podem ser encontradas
   em <xref linkend="chapter1"/></para>
 
@@ -2961,7 +2962,7 @@ O qual n
 	    um documento que inclui o <literal>id</literal> do 
 	    exemplo.</para>
 	  
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para>Maiores informa��es podem ser encontradas
 <link linkend="chapter1">no primeiro cap�tulo</link>.
 </para>
@@ -3021,7 +3022,7 @@ O qual n
 
 	  <para>Uso:</para>
 
-	  <programlisting><![ RCDATA [
+	  <programlisting><![CDATA[
 <para>� claro que voc� pode parar de ler este documento e ir para a
 <ulink url="&url.base;/index.html">P�gina principal do FreeBSD</ulink>
 </para>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 0e47df9f10..8d056ae206 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -128,7 +129,7 @@
     <para>O exemplo acima foi na verdade escrito neste documento
       como se segue:</para>
 
-    <programlisting><![ CDATA [
+    <programlisting><![CDATA[
 <para>Para remover <filename>/tmp/foo</filename> utilize &man.rm.1;.</para>
 
 <screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>]]></programlisting>
@@ -291,7 +292,7 @@
 	elemento possui ambas as tags de in�cio e de fim.
 	</para>
 
-      <programlisting><![ RCDATA [<p>Este � um par�grafo.  Ele inicia com a tag de inicio do 
+      <programlisting><![CDATA[<p>Este � um par�grafo.  Ele inicia com a tag de inicio do 
   elemento 'p', e ir� terminar com a tag de fim para o 
   elemento 'p'.</p>
 
@@ -315,7 +316,7 @@
 	n�o cont�m nenhum conte�do, assim ele 
 	possui apenas uma tag de inicio.</para>
 
-      <programlisting><![ RCDATA [<p>Este � um par�grafo.</p>
+      <programlisting><![CDATA[<p>Este � um par�grafo.</p>
 
 <hr>
 
@@ -333,7 +334,7 @@
       <title>Elementos contendo elementos; <sgmltag>em</sgmltag>
 	</title>
 
-      <programlisting><![ RCDATA [<p>Este � um <em>par�grafo</em> simples no qual 
+      <programlisting><![CDATA[<p>Este � um <em>par�grafo</em> simples no qual 
   algumas das <em>palavras</em> foram <em>enfatizadas</em>.</p>]]></programlisting>
     </example>
 
@@ -395,7 +396,7 @@
     <example>
       <title>Utilizando um elemento com um atributo</title>
 
-      <programlisting><![ RCDATA [<p align="left">A inclus�o de um atributo de alinhamento neste 
+      <programlisting><![CDATA[<p align="left">A inclus�o de um atributo de alinhamento neste 
   par�grafo foi sup�rfluo, uma vez que o alinhamento 
   padr�o � left (esquerda).</p>
 
@@ -413,7 +414,7 @@
     <example>
       <title>Aspas simples envolta de atributos</title>
 
-      <programlisting><![ RCDATA [<p align='right'>Eu estou a direita!</p>]]></programlisting>
+      <programlisting><![CDATA[<p align='right'>Eu estou a direita!</p>]]></programlisting>
     </example>
 
     <para>Algumas vezes voc� n�o precisa utilizar aspas 
@@ -504,7 +505,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATAL
 	  <para>Crie o arquivo <filename>example.xml</filename>, e 
 	    entre com o seguinte texto:</para>
 
-	  <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+	  <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
 <html>
   <head>	     
@@ -677,7 +678,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       documento escrito para conformar-se com a vers�o 4.0 
       do DTD HTML se parece com esta:</para>
 
-    <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
 
     <para>Esta linha cont�m diferentes componentes.</para>
 
@@ -941,7 +942,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>A sintaxe para isto � ligeiramente diferente:
 	</para>
 
-      <programlisting><![ RCDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+      <programlisting><![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
 
       <para>A palavra chave <literal>SYSTEM</literal> indica que o
 	processador SGML deve encontrar o DTD em um local 
@@ -1007,7 +1008,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <programlisting>&lt;!-- Teste de coment�rio --></programlisting>
 
-      <programlisting><![ RCDATA [
+      <programlisting><![CDATA[
 <!-- Este � o interior do coment�rio -->
 
 <!-- Este � outro coment�rio    -->
@@ -1019,29 +1020,6 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
   -- de fazer coment�rios de v�rias linhas -->]]></programlisting>
     </example>
 
-    <![ %output.print; [
-    <important>
-      <title>Utilize 2 tra�os</title>
-
-      <para>Existe um problema com a produ��o de 
-	vers�es Postscript e PDF deste documento.  O exemplo 
-	acima provavelmente mostra apenas um s�mbolo de 
-	h�fen, <literal>-</literal> depois do
-	<literal>&lt;!</literal> e antes do <literal>&gt;</literal>.
-	</para>
-
-      <para>Voc� <emphasis>deve</emphasis> utilizar dois
-      	<literal>-</literal> e <emphasis>n�o</emphasis> um.  
-	As vers�es Postscript e PDF traduzem os dois 
-	<literal>-</literal> do original para um mais longo, e mais 
-	profissional <emphasis>em-dash</emphasis>, e quebra este 
-	exemplo no processo.</para>
-
-      <para>As vers�es HTML, texto plano, e RTF deste 
-	documento n�o s�o afetadas.</para>
-    </important>
-    ]]>
-
     <para>Se voc� j� utilizou HTML antes, voc� pode ter 
       sido exposto a regras diferentes para coment�rios.  Em 
       particular, voc� pode pensar que o conjunto de caracteres
@@ -1059,7 +1037,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <example>
       <title>Coment�rios SGML errados</title>
 
-      <programlisting><![ RCDATA [
+      <programlisting><![CDATA[
 <!-- Este � o coment�rio --
 
      Isto est� fora do coment�rio!
@@ -1074,12 +1052,12 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>Isto n�o � um SGML v�lido, e pode 
 	dar mensagens de erro confusas.</para>
 
-      <programlisting><![ RCDATA [<!--------------- Isto � uma id�ia muito ruim --------------->]]></programlisting>
+      <programlisting><![CDATA[<!--------------- Isto � uma id�ia muito ruim --------------->]]></programlisting>
 
       <para>E como o exemplo sugere, <emphasis>n�o escreva
 	</emphasis> coment�rios como esse.</para>
 
-      <programlisting><![ RCDATA [<!--===================================================-->]]></programlisting>
+      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
 
       <para>Esta � uma abordagem (ligeiramente) melhor, mas 
 	ele ainda � potencialmente confuso para as pessoas 
@@ -1147,7 +1125,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	expande para a vers�o atual do seu produto.  
 	Voc� pode escrever:</para>
 
-      <programlisting><![ RCDATA [<para>A vers�o atual do nosso produto � &amp;current.version;.</para>]]></programlisting>
+      <programlisting><![CDATA[<para>A vers�o atual do nosso produto � &amp;current.version;.</para>]]></programlisting>
 
       <para>Quando o n�mero de vers�o mudar, 
 	voc� pode simplesmente alterar a defini��o
@@ -1180,7 +1158,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <example>
 	<title>Definindo uma entidade geral</title>
 
-	<programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY current.version    "3.0-RELEASE">
 <!ENTITY last.version       "2.2.7-RELEASE">
 ]>]]></programlisting>
@@ -1227,7 +1205,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <example>
 	<title>Definindo entidades de par�metros</title>
 	
-	<programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
@@ -1249,7 +1227,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <para>Adicione uma entidade geral ao 
 	    <filename>example.xml</filename>.</para>
 
-	  <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+	  <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY version "1.1">
 ]>	  
 
@@ -1362,7 +1340,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	<title>Utilizando entidades gerais para incluir
 	  arquivos</title>
 	
-	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
@@ -1424,7 +1402,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <filename>chapters.ent</filename>.  Este arquivo 
 	  cont�m o seguinte:</para>
 	
-	<programlisting><![ RCDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+	<programlisting><![CDATA[<!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
 
@@ -1435,7 +1413,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  dispon�veis para uso.  Feito isso, utilize as 
 	  entidades gerais como antes;</para>
 	
-	<programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!-- Define uma entidade de par�metro para carregar as entidades gerais de capitulo -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
 
@@ -1468,14 +1446,14 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	    <para>Coloque um conte�do similar ao seguinte em 
 	      cada arquivo:</para>
 
-	    <programlisting><![ RCDATA [<p>Este � o primeiro par�grafo.</p>]]></programlisting>
+	    <programlisting><![CDATA[<p>Este � o primeiro par�grafo.</p>]]></programlisting>
 	  </step>
 
 	  <step>
 	    <para>Edite o arquivo <filename>example.xml</filename>
 	      para que ele se pare�a com este:</para>
 
-	    <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
 <!ENTITY para1 SYSTEM "para1.xml">
 <!ENTITY para2 SYSTEM "para2.xml">
@@ -1532,7 +1510,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	      <filename>example.xml</filename> para que ele se
 	      pare�a com este:</para>
 	
-	    <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY % entities SYSTEM "entities.xml"> %entities;
 ]>
 
@@ -1556,7 +1534,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	      <filename>entities.xml</filename>, com este 
 	      conte�do:</para>
 
-	    <programlisting><![ RCDATA [<!ENTITY version "1.1">
+	    <programlisting><![CDATA[<!ENTITY version "1.1">
 <!ENTITY para1 SYSTEM "para1.xml">
 <!ENTITY para2 SYSTEM "para2.xml">
 <!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1601,7 +1579,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
     <para>Como voc� esperaria, sendo uma 
       constru��o SGML, uma sess�o
-      marcada inicia com um <literal>&lt!</literal>.</para>
+      marcada inicia com um <literal>&lt;!</literal>.</para>
 
     <para>O primeiro colchete come�a a limitar a sess�o
       marcada.</para>
@@ -1697,29 +1675,29 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <title>Utilizando uma sess�o marcada como 
 	    CDATA</title>
 	
-	  <programlisting>&lt;para>Aqui est� um exemplo de como voc� incluiria algum texto que contenha muitos 
-  s�mbolos &lt;literal>&amp;lt;&lt;/literal> e &lt;literal>&amp;amp;&lt;/literal>.  
+	  <programlisting>&lt;para&gt;Aqui est� um exemplo de como voc� incluiria algum texto que contenha muitos 
+  s�mbolos &lt;literal&gt;&lt;&lt;/literal&gt; e &lt;literal&gt;&gt;&lt;/literal&gt;.
   O texto de exemplo � um fragmento de HTML.  
-  O texto circunvizinho (&lt;para> e &lt;programlisting>) � do
-  DocBook.&lt;/para>
+  O texto circunvizinho (&lt;para&gt; e &lt;programlisting&gt;) � do
+  DocBook.&lt;/para&gt;
 	  
-&lt;programlisting>
-  &lt;![ CDATA [  <![ RCDATA [
-    <p>Esta � uma amostra que apresenta alguns elementos de HTML.
-       Uma vez que os s�mbolos de < e > s�o utilizados muitas vezes, �
+&lt;programlisting&gt;
+  &lt;![CDATA[&gt;![RCDATA[
+    &lt;p&gt;Esta � uma amostra que apresenta alguns elementos de HTML.
+       Uma vez que os s�mbolos de &lt; e &gt; s�o utilizados muitas vezes, �
        mais f�cil dizer que o exemplo todo � uma sess�o marcada do
        tipo CDATA, do que utilizar nomes de entidades para representar
-       estes s�mbolos ao longo de todo o texto.</p>
+       estes s�mbolos ao longo de todo o texto.&lt;/p&gt;
 
-    <ul>
-      <li>Este � um item de lista</li>
-      <li>Este � um segundo item de lista</li>
-      <li>Este � um terceiro item de lista</li>
-    </ul>
+    &lt;ul&gt;
+      &lt;li&gt;Este � um item de lista&lt;/li&gt;
+      &lt;li&gt;Este � um segundo item de lista&lt;/li&gt;
+      &lt;li&gt;Este � um terceiro item de lista&lt;/li&gt;
+    &lt;/ul&gt;
 
-    <p>Este � o final do exemplo.</p>]]>
+    &lt;p&gt;Este � o final do exemplo.&lt;/p&gt;]]&gt;
   ]]&gt;
-&lt;/programlisting></programlisting>
+&lt;/programlisting&gt;</programlisting>
 
 	  <para>Se voc� examinar o fonte deste documento 
 	    voc� ir� ver que esta t�cnica foi 
@@ -1833,7 +1811,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
   &lt;/head>
 
   &lt;body>	    
-    &lt;p>Este par�grafo &lt;![ CDATA [cont�m muitos caracteres &lt;
+    &lt;p>Este par�grafo &lt;![CDATA[cont�m muitos caracteres &lt;
       (&lt; &lt; &lt; &lt; &lt;) de forma que � mais simples utilizar
       uma sess�o marcada do tipo CDATA.]]&gt;&lt;/p>
 
@@ -1842,7 +1820,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       no output.&lt;/p>
     ]]&gt;
 
-    &lt;![ <![ CDATA [%text.output]]> [
+    &lt;![ <![CDATA[%text.output]]> [
     &lt;p>Este par�grafo pode ou n�o aparecer no output.&lt;/p>
 
     &lt;p>A sua ocorr�ncia � controlada pela entidade de par�metro <![CDATA[%text.output]]>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 8ea88855db..3fa3afbfc5 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -273,7 +274,7 @@
 	  <para>Por exemplo, se um dos arquivos de cap�tulos 
 	    contiver:</para>
 	
-	  <programlisting><![ CDATA [
+	  <programlisting><![CDATA[
 <chapter id="kernelconfig">
 ...
 </chapter>]]></programlisting>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index d95a8c4e5a..b7c995dcbb 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index a394aca615..bb06f9f16e 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 6443e1f55a..b52d29dfcd 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 37a505063e..43ab1fe556 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index b921a9c2b4..824e5e6284 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -212,7 +213,7 @@
 
 	<para>O texto que aparece em contextos do SGML � 
 	  escrito geralmente em caixa alta, 
-	  <literal>&lt!ENTITY&hellip;&gt;</literal>, e 
+	  <literal>&lt;!ENTITY&hellip;&gt;</literal>, e 
 	  <literal>&lt;!DOCTYPE&hellip;&gt;</literal>, 
 	  <emphasis>n�o</emphasis> 
 	  <literal>&lt;!entity&hellip;&gt;</literal> e 
@@ -266,7 +267,7 @@
 	<para>Por exemplo, o c�digo para esta 
 	  se��o seria algo como:</para>
 
-      <programlisting><![ CDATA [+--- This is column 0
+      <programlisting><![CDATA[+--- This is column 0
 V
 <chapter>
   <title>...</title>
@@ -319,7 +320,7 @@ augroup END</programlisting>
 	    que um Tag precedente n�o, observe:</para>
   
 	  <informalexample>
-	    <programlisting><![ CDATA [<article>
+	    <programlisting><![CDATA[<article>
   <articleinfo>
     <title>NIS</title>
 
@@ -431,13 +432,13 @@ augroup END</programlisting>
 	  <listitem> 
 	    <para>Entre n�meros e suas unidades:</para> 
 
-	    <programlisting><![ CDATA [57600&nbsp;bps]]></programlisting> 
+	    <programlisting><![CDATA[57600&nbsp;bps]]></programlisting> 
 	  </listitem> 
     
 	  <listitem> 
 	    <para>Entre os nomes dos programas e os seus 
 	      n�meros de vers�o:</para> 
-	    <programlisting><![ CDATA [FreeBSD&nbsp;4.7]]></programlisting> 
+	    <programlisting><![CDATA[FreeBSD&nbsp;4.7]]></programlisting> 
 	  </listitem> 
     
 	  <listitem> 
@@ -445,7 +446,7 @@ augroup END</programlisting>
 	      estiver lidando com nomes com mais de 3 ou 4 palavras, 
 	      como por exemplo, <quote>The FreeBSD Brazilian 
 	      Portuguese Documentation Project</quote>):</para> 
-	    <programlisting><![ CDATA [Sun&nbsp;Microsystems]]></programlisting> 
+	    <programlisting><![CDATA[Sun&nbsp;Microsystems]]></programlisting> 
 	  </listitem> 
 	</itemizedlist> 
       </sect2> 
diff --git a/pt_BR.ISO8859-1/books/handbook/Makefile b/pt_BR.ISO8859-1/books/handbook/Makefile
index eec5933db2..69946296b9 100644
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@@ -36,7 +36,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
diff --git a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index e2a07b58fe..c27c77d75a 100644
--- a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
index c502727cf0..f20e86067b 100644
--- a/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
index b6b7c23f60..2d69c1fca6 100644
--- a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/book.xml b/pt_BR.ISO8859-1/books/handbook/book.xml
index 5aac2b2eed..1ed47e2d5e 100644
--- a/pt_BR.ISO8859-1/books/handbook/book.xml
+++ b/pt_BR.ISO8859-1/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
index 5d4e863cda..51a9654664 100644
--- a/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/chapters.ent b/pt_BR.ISO8859-1/books/handbook/chapters.ent
index 75fef0877f..e493b62744 100644
--- a/pt_BR.ISO8859-1/books/handbook/chapters.ent
+++ b/pt_BR.ISO8859-1/books/handbook/chapters.ent
@@ -13,228 +13,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.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.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.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.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/pt_BR.ISO8859-1/books/handbook/colophon.xml b/pt_BR.ISO8859-1/books/handbook/colophon.xml
index 237398942b..5848f8b4dc 100644
--- a/pt_BR.ISO8859-1/books/handbook/colophon.xml
+++ b/pt_BR.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/config/chapter.xml b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
index 466ea783af..a8bf46fe2e 100644
--- a/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 2bbff9c222..355f38dee3 100644
--- a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
index 7f1c552a56..47695efceb 100644
--- a/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
index f9a62d0d66..6621d83deb 100644
--- a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/install/chapter.xml b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
index aead82cce5..ded98913c9 100644
--- a/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
index a693f70137..5b9f6d6b8c 100644
--- a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index bd2170fc06..9f8e3046b0 100644
--- a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
index 91aabd9820..fde853e358 100644
--- a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index a5f6a17610..938b7d83cd 100644
--- a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
index 4c43d1d5bf..f03ad119ad 100644
--- a/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 2b6e83cddc..158fb5953c 100644
--- a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
@@ -1168,7 +1168,7 @@
       <para>Configurar o &man.cvs.1; para utilizar um
 	reposit�rio CVS an�nimo requer, simplesmente,
 	uma atribui��o � vari�vel de ambiente
-	<envar>CVSROOT</envar> da localiza&ccedil�o de um dos
+	<envar>CVSROOT</envar> da localiza��o de um dos
 	servidores <emphasis>anoncvs</emphasis> do projeto FreeBSD.
 	No momento da prepara��o deste documento, os
 	seguintes servidores est�o dispon�veis:</para>
@@ -1590,7 +1590,7 @@
       <para>Voc� ir� precisar de duas coisas: O programa
 	<application>CTM</application>, e os deltas iniciais para
 	aliment�-lo (para alcan�ar os n�veis
-	&ldquo;correntes&rdquo).</para>
+	&ldquo;correntes&rdquo;).</para>
 
       <para>O programa <application>CTM</application> faz parte do
 	FreeBSD desde a vers�o 2.0 <literal>release</literal>,
@@ -1632,11 +1632,11 @@
 	saiba como se inscrever usando
 	<application>majordomo</application>, envie uma mensagem
 	primeiro contendo a palavra <literal>help</literal> &mdash;
-	ele enviar-lhe-� de volta instru&ccedil�es
+	ele enviar-lhe-� de volta instru��es
 	sobre o uso.)</para>
 
       <para>Quando come�ar a receber suas
-	atualiza&ccedil�es <application>CTM</application>
+	atualiza��es <application>CTM</application>
 	por e-mail, voc� pode utilizar o programa
 	<command>ctm_rmail</command> para desempacot�-las e
 	aplic�-las.  Na verdade, voc� pode usar o
@@ -1724,7 +1724,7 @@
       <para>A menos que <application>CTM</application> sinta-se
 	muito seguro a respeito de todo o processo, ele n�o
 	tocar� sua �rvore.  Pode-se usar a
-	op&ccedil�o <option>-c</option> e
+	op��o <option>-c</option> e
 	<application>CTM</application> n�o tocar� sua
 	�rvore; meramente verificar� a integridade
 	do delta e verificar� se ele aplicar-se-ia sem erros
@@ -1752,7 +1752,7 @@
       <para>Um desenvolvedor gostaria de experimentar e mudar arquivos
         na �rvore de c�digo fonte.
         <application>CTM</application> suporta
-        modifica&ccedil�es locais de maneira limitada: antes de
+        modifica��es locais de maneira limitada: antes de
         checar a exist�ncia de um arquivo
         <filename>foo</filename>, ele primeiro procura por
         <filename>foo.ctm</filename>. Se este arquivo existir, CTM
@@ -1984,7 +1984,7 @@
         puxar, cada cliente requisita atualiza��es ao
         servidor, se e quando desejam.  Ou seja, todas as
         atualiza��es s�o iniciadas pelo cliente.
-        O servidor jamais envia atualiza&ccedil�es n�o
+        O servidor jamais envia atualiza��es n�o
         solicitadas. Usu�rios devem ou executar o cliente
         <application>CVSup</application> manualmente para obter uma
         atualiza��o, ou criar um <literal>job</literal>
@@ -1999,7 +1999,7 @@
 	e o servidor <command>cvsupd</command> o qual executa em
 	cada s�tio espelho FreeBSD.</para>
 
-      <para>Ao ler a documenta&ccedil�o do FreeBSD e listas
+      <para>Ao ler a documenta��o do FreeBSD e listas
 	de discuss�o, voc� pode ver refer�ncias
 	a <application>sup</application>.  <application>Sup</application>
 	foi o predecessor de <application>CVSup</application>, e
@@ -2718,7 +2718,7 @@ src-all</programlisting>
 
       <para>onde
 	<filename><replaceable>supfile</replaceable></filename>
-	&eacute, na verdade, o nome do supfile que voc� acaba
+	�, na verdade, o nome do supfile que voc� acaba
 	de criar.  Assumindo que voc� est� executando
 	sob o X11, <command>cvsup</command> ir� exibir uma
 	janela GUI com bot�es para fazer as coisas usuais.
diff --git a/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 5d121705c0..92badc49fb 100644
--- a/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
index ee95e01f76..304c387f23 100644
--- a/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 2e227fe9bd..591bbc08d1 100644
--- a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/preface/preface.xml b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
index 28cee8a263..6c3454eea8 100644
--- a/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
+++ b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
index 74ff5d5a35..4e4d9137d0 100644
--- a/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/security/chapter.xml b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
index a958066dea..e2f55bbaf9 100644
--- a/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 4d1574a6c1..14728dc6ad 100644
--- a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/users/chapter.xml b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
index f99f50ea59..21e6e0e0a5 100644
--- a/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
index 100769dd2a..2e9df7af9d 100644
--- a/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/catalog b/pt_BR.ISO8859-1/share/xml/catalog
index 81fb8e8799..2422c1740c 100644
--- a/pt_BR.ISO8859-1/share/xml/catalog
+++ b/pt_BR.ISO8859-1/share/xml/catalog
@@ -1,48 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Portuguese Brazilian specific ........................................ --
-
-  -- The FreeBSD Documentation Project
-  -- The FreeBSD Brazilian Portuguese Documentation Project
-
-  -- Original revision: r38826
-
-  --
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
-        "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
-        "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
-        "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
-       "teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translators Entities//PT"
-        "translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
-	"trademarks.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
-        "words.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//PT"
-        "books.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//PT"
-        "articles.ent"
-
+       "freebsd.dsl"
diff --git a/pt_BR.ISO8859-1/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..d44a80dbca
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//PT"
+        uri="translators.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+        uri="l10n.ent" />
+</catalog>
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 87648dace0..6776d9dcae 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+	"translators.ent">
 %translators;
-<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT">
+<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
+	"words.ent">
 %words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+	"teams.ent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
diff --git a/pt_BR.ISO8859-1/share/xml/l10n.ent b/pt_BR.ISO8859-1/share/xml/l10n.ent
index d82aec6554..6d7f8aa948 100644
--- a/pt_BR.ISO8859-1/share/xml/l10n.ent
+++ b/pt_BR.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- -*- sgml -*-
      DocBook Language Specific Entities for Localization (pt_BR).
 
diff --git a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
index 321eb0194b..77039cc53b 100644
--- a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
     Nomes das listas de discuss�o do FreeBSD e dos softwares
     relacionados
diff --git a/pt_BR.ISO8859-1/share/xml/newsgroups.ent b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
index 2c06789b80..e55b43329b 100644
--- a/pt_BR.ISO8859-1/share/xml/newsgroups.ent
+++ b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Names of FreeBSD newsgroups
 
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 7476584e03..e1a4644091 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   Names and email address of teams of people working on specified
   tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
diff --git a/pt_BR.ISO8859-1/share/xml/trademarks.ent b/pt_BR.ISO8859-1/share/xml/trademarks.ent
index 66359ab3b6..4e457d3b42 100644
--- a/pt_BR.ISO8859-1/share/xml/trademarks.ent
+++ b/pt_BR.ISO8859-1/share/xml/trademarks.ent
@@ -1,4 +1,5 @@
-<!-- $FreeBSD -->
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $FreeBSD$ -->
 
 <!ENTITY legalnotice '
 <legalnotice id="legalnotice">
diff --git a/pt_BR.ISO8859-1/share/xml/translators.ent b/pt_BR.ISO8859-1/share/xml/translators.ent
index 99a9f543e7..d6ff0d4fb8 100644
--- a/pt_BR.ISO8859-1/share/xml/translators.ent
+++ b/pt_BR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/words.ent b/pt_BR.ISO8859-1/share/xml/words.ent
index 659d4513cb..e77f89d3f8 100644
--- a/pt_BR.ISO8859-1/share/xml/words.ent
+++ b/pt_BR.ISO8859-1/share/xml/words.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      Words that were deemed too controversial.  Which, therefore,
      would require several futher revisions.  Moreover, the use of
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..c3a42ead9b
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Este, e outros documentos, podem ser obtidos em
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>Para perguntas sobre FreeBSD, leia a
+    <a href="http://www.FreeBSD.org/docs.html">documenta��o</a> antes de contatar
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    Para perguntas sobre esta documenta��o, envie e-mail para
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.xml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
index 7152ea6a39..1ffa2e5984 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.xml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -257,17 +254,17 @@
       �����������, ������� ��������� ���������:</para>
 
       <itemizedlist>
-	<listitem><para>ncvs@ - ����������� <filename role="directory">
+	<listitem><para>ncvs@ - ����������� <filename class="directory">
 	    /home/ncvs</filename>, �������� �������� ������
 	  </para></listitem>
 
-	<listitem><para>pcvs@ - ����������� <filename role="directory">
+	<listitem><para>pcvs@ - ����������� <filename class="directory">
 	    /home/pcvs</filename>, �����</para></listitem>
 
-	<listitem><para>dcvs@ - ����������� <filename role="directory">
+	<listitem><para>dcvs@ - ����������� <filename class="directory">
 	    /home/dcvs</filename>, ������������</para></listitem>
 
-	<listitem><para>projcvs@ - ����������� <filename role="directory">
+	<listitem><para>projcvs@ - ����������� <filename class="directory">
 	    /home/projcvs</filename>, ������ �������</para></listitem>
       </itemizedlist>
     </note>
@@ -2453,7 +2450,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 	    </itemizedlist>
 
 	    <para>�� ������ ��������������� �������� <command>rmport</command>
-	      �� �������� <filename role="directory">ports/Tools/scripts</filename>.
+	      �� �������� <filename class="directory">ports/Tools/scripts</filename>.
 	      ���� ������ ������� &a.vd;, � �� �� ��� ������������, ��� ���
 	      �������, ����������� � ��������� �� ������  <command>rmport</command>
 	      ������� �������� ��������������� ���.</para>
diff --git a/ru_RU.KOI8-R/articles/console-server/article.xml b/ru_RU.KOI8-R/articles/console-server/article.xml
index 50e3756418..c34796f78f 100644
--- a/ru_RU.KOI8-R/articles/console-server/article.xml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -854,7 +851,7 @@ exit 0</programlisting>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="tk0231-9-1.png"/>
+	  <imagedata fileref="tk0231-9-1"/>
 	</imageobject>
 
 	<textobject>
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index 907f1cb23e..4789111ac8 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -192,7 +188,7 @@
 	  <para>������� ����� ����������� ����������, ��������, &posix;.  ��
 	    ������ ����� ��������� ������ �� ��� �� �������� Web-����� <ulink
 	    url="&url.base;/projects/c99/index.html">������� ������������
-	    FreeBSD ���������� C99 & POSIX</ulink>.  �������� ��������� FreeBSD
+	    FreeBSD ���������� C99 &amp; POSIX</ulink>.  �������� ��������� FreeBSD
 	    � ���, ��� ���������� ����������.  ���� ������� ����������,
 	    �������� � �������������� ��� ���������� �������� ������������,
 	    ��������� �� ���� PR.  ���� ������, �������, ��� ��������� ��� �
diff --git a/ru_RU.KOI8-R/articles/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml
index 536ce30df3..280c872dd0 100644
--- a/ru_RU.KOI8-R/articles/cups/article.xml
+++ b/ru_RU.KOI8-R/articles/cups/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
index b716cffe01..ab804dd1b3 100644
--- a/ru_RU.KOI8-R/articles/custom-gcc/article.xml
+++ b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Russian Documentation Project
@@ -83,7 +80,7 @@
 	<application>binutils</application> ��������� ��������� ������
 	&os;, ��������� ��������� �������:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils &amp;&amp; make install</userinput></screen>
     </sect2>
 
     <sect2 id="installing-gcc">
@@ -100,7 +97,7 @@
       <para>��� ��������� ������ �� �������������� ������
 	<application>GCC</application>, �������� ��������� �������:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> &amp;&amp; make install</userinput></screen>
     </sect2>
   </sect1>
 
@@ -118,7 +115,7 @@
       <para>�������� ��������� ������ � <filename>/etc/make.conf</filename>
 	(��� ��������� ������������):</para>
 
-      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
 CC=gcc44
 CXX=g++44
 CPP=cpp44
@@ -179,7 +176,7 @@ libstdc++.so.6  gcc44/libstdc++.so.6</programlisting>
 	<literal>CFLAGS</literal>, ���������
 	<filename>/etc/make.conf</filename> �������� ���������� �������:</para>
 
-      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
 CC=gcc44
 CXX=g++44
 CPP=cpp44
@@ -201,7 +198,7 @@ CFLAGS+=-mssse3
 	<filename>/etc/make.conf</filename> �������� ����������
 	�������:</para>
 
-      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+      <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
 .if empty(.CURDIR:M/usr/ports/net/openldap*)
 CC=gcc44
 CXX=g++44
@@ -214,7 +211,7 @@ CPP=cpp44
 	<filename role="package">net/openldap</filename>*.  �����
 	�������� ������� ������ ������ � ����� ������:</para>
 
-      <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+      <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) &amp;&amp; empty(.CURDIR:M/usr/ports/xxx/yyy) &amp;&amp; ...</programlisting>
     </sect2>
   </sect1>
 
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index d7a59a07dc..5667839049 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
index 08b343013d..0887d8da0a 100644
--- a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
+++ b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index 4b80843ba9..cd97842656 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
 ]>
 
@@ -14,7 +12,7 @@
      Original revision: r39632
 -->
 
-<article lang="ru">
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang="ru">
   <articleinfo>
     <title>FreeBSD "� ����"</title>
 
@@ -409,7 +407,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
       ����� ����������� ��������������.  � ������������ ������ ���������� ���������� � ���,
       ��� ���������� ��������.</para>
 
-    <programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+    </programlisting>
 
     <para>�������� <ulink url="stage_1.conf.default">
       <filename>stage_1.conf.default</filename></ulink>.</para>
@@ -517,7 +517,9 @@ news inn-stable       CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
       ������� �������������� �� ����� ��������� ���� ���������
       <filename>LOGDIR/category+port</filename>.</para>
 
-    <programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+    </programlisting>
 
     <para>�������� <ulink url="stage_2.conf.default">
       <filename>stage_2.conf.default</filename></ulink>.</para>
@@ -619,7 +621,9 @@ fi
       <filename>stage_1.sh</filename></ulink>, ������� �� �� ������
       ��������������.</para>
 
-    <programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+    </programlisting>
 
     <para>�������� <ulink
       url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -628,7 +632,9 @@ fi
       url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.  ��� �����
       ������������ �������� ���������� � ����� ������ �����.</para>
 
-    <programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/>
+    </programlisting>
 
     <para>�������� <ulink
       url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -637,7 +643,9 @@ fi
       url="stage_3.mk"><filename>stage_3.mk</filename></ulink>, ������� ����
       ��� ���� � ���, ��� ���������������� ��� ��������� ������������.</para>
 
-    <programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+    </programlisting>
 
     <para>�������� <ulink
       url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ru_RU.KOI8-R/articles/fonts/article.xml b/ru_RU.KOI8-R/articles/fonts/article.xml
index 52e97e42eb..9a4bf433c1 100644
--- a/ru_RU.KOI8-R/articles/fonts/article.xml
+++ b/ru_RU.KOI8-R/articles/fonts/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
index b327849529..f7d37ab2ad 100644
--- a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
+++ b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/geom-class/article.xml b/ru_RU.KOI8-R/articles/geom-class/article.xml
index 2e2c7fad12..44a5b96d59 100644
--- a/ru_RU.KOI8-R/articles/geom-class/article.xml
+++ b/ru_RU.KOI8-R/articles/geom-class/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
     The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
index a1d0c860e7..7db8724ea9 100644
--- a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
+++ b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-        "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   The FreeBSD Russian Documentation Project
@@ -256,7 +253,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel1.png"/>
+	  <imagedata fileref="disklabel1"/>
 	</imageobject>
       </mediaobject>
 
@@ -318,7 +315,7 @@
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="disklabel2.png"/>
+	  <imagedata fileref="disklabel2"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/ru_RU.KOI8-R/articles/hubs/article.xml b/ru_RU.KOI8-R/articles/hubs/article.xml
index 426d566fef..f80da758fd 100644
--- a/ru_RU.KOI8-R/articles/hubs/article.xml
+++ b/ru_RU.KOI8-R/articles/hubs/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/ipsec-must/article.xml b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
index 8aa916e4ae..7c90168c87 100644
--- a/ru_RU.KOI8-R/articles/ipsec-must/article.xml
+++ b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/laptop/article.xml b/ru_RU.KOI8-R/articles/laptop/article.xml
index 588e937328..cd04c6f422 100644
--- a/ru_RU.KOI8-R/articles/laptop/article.xml
+++ b/ru_RU.KOI8-R/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/linux-comparison/article.xml b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
index ee1f1b5267..0eb6309b2d 100644
--- a/ru_RU.KOI8-R/articles/linux-comparison/article.xml
+++ b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
 Copyright (c) 2005 Dru Lavigne
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
index f4eec2edac..fca28f7bcd 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/mh/article.xml b/ru_RU.KOI8-R/articles/mh/article.xml
index eb51be4d32..99b52c2911 100644
--- a/ru_RU.KOI8-R/articles/mh/article.xml
+++ b/ru_RU.KOI8-R/articles/mh/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/new-users/article.xml b/ru_RU.KOI8-R/articles/new-users/article.xml
index 91c244fd88..d756f4bddd 100644
--- a/ru_RU.KOI8-R/articles/new-users/article.xml
+++ b/ru_RU.KOI8-R/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index 47520aadac..718427da2b 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -852,8 +849,8 @@ sshd   password        required        pam_permit.so</programlisting>
     <section id="pam-config-breakdown">
       <title id="pam-config-breakdown.title">��������� ������ ���������</title>
 
-      <para>��� ��� ��������� � ������� <link linkend="pam-config-file"
-        endterm="pam-config-file.title"></link>, ������ ������ �����
+      <para>��� ��� ��������� � <xref linkend="pam-config-file"/>,
+        ������ ������ �����
         <filename>/etc/pam.conf</filename> ������� �� ����ң� ��� ��������
         ���������� �����: ����� �������, ����� ����������, ������������ �����,
         ����� ������ � �������������� ���������� ������, ������� �����
@@ -870,12 +867,11 @@ sshd   password        required        pam_permit.so</programlisting>
         ������ ���������� � �������� ����������.</para>
 
       <para>��� ���������� ������������ ����� ���� �� ����ң� �������� ����,
-        ��������� � ����� <link linkend="pam-facilities-primitives"
-        endterm="pam-facilities-primitives.title"></link>.</para>
+        ��������� � <xref linkend="pam-facilities-primitives"/>.</para>
 
       <para>����� ����� ����������� ���� �������� ����� �� ����ң� ��������
-        ����, ��������� � ������� <link linkend="pam-chains-policies"
-        endterm="pam-chains-policies.title"></link>, � ������� ����������, ���
+        ����, ��������� � <xref linkend="pam-chains-policies"/>,
+        � ������� ����������, ���
         ���������������� ������������ �� ������ ���.  � Linux-PAM
         �������������� �������������� ���������, ������� ��������� �������
         ��������, ��������� � ������ ��������� ����� ��������, �� �����
@@ -1271,12 +1267,13 @@ sshd   password        required        pam_permit.so</programlisting>
       ���� �� ����������� ������� ��� ���������� � ������� � ������
       ����������� PAM, ��� ���������� ����� ������� ����������� �������
       ��������������.  ����� ������� �������������� ���������� ������
-      ��������; ��, ��� ��������� � ���������� <link linkend="pam-sample-conv"
-      endterm="pam-sample-conv.title"></link>, ������ � �������� ���������
+      ��������; ��, ��� ��������� � <xref linkend="pam-sample-conv"/>,
+      ������ � �������� ���������
       �����, �� � �������� ����������� �������������� �� �����.</para>
 
-    <programlisting><inlinegraphic fileref="pam_app.c"
-      format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/su.c" parse="text"/>
+    </programlisting>
   </appendix>
 
   <appendix id="pam-sample-module">
@@ -1289,8 +1286,9 @@ sshd   password        required        pam_permit.so</programlisting>
       ������� &man.pam.get.authtok.3;, ������� ����������� ��������
       ����������� ����� ������ �������������.</para>
 
-    <programlisting><inlinegraphic fileref="pam_module.c"
-      format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/pam_unix.c" parse="text"/>
+    </programlisting>
   </appendix>
 
   <appendix id="pam-sample-conv">
@@ -1306,8 +1304,9 @@ sshd   password        required        pam_permit.so</programlisting>
       �����; �� ��������, ��� ��� ���������� ���� � �������� �������
       ��� �������������� � ������������� ������������.</para>
 
-    <programlisting><inlinegraphic fileref="pam_conv.c"
-      format="linespecific"/></programlisting>
+    <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/converse.c" parse="text"/>
+    </programlisting>
   </appendix>
 
   <bibliography id="pam-further">
diff --git a/ru_RU.KOI8-R/articles/portbuild/article.xml b/ru_RU.KOI8-R/articles/portbuild/article.xml
index 8122fef44a..25b6fd6c01 100644
--- a/ru_RU.KOI8-R/articles/portbuild/article.xml
+++ b/ru_RU.KOI8-R/articles/portbuild/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
index 234fcd216e..3fec54e1e9 100644
--- a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
+++ b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 ]>
diff --git a/ru_RU.KOI8-R/articles/problem-reports/article.xml b/ru_RU.KOI8-R/articles/problem-reports/article.xml
index 20dc8d3a34..df0c165964 100644
--- a/ru_RU.KOI8-R/articles/problem-reports/article.xml
+++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/relaydelay/article.xml b/ru_RU.KOI8-R/articles/relaydelay/article.xml
index 56ca8dc830..13351a86e6 100644
--- a/ru_RU.KOI8-R/articles/relaydelay/article.xml
+++ b/ru_RU.KOI8-R/articles/relaydelay/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/releng-packages/article.xml b/ru_RU.KOI8-R/articles/releng-packages/article.xml
index d39885c76e..65ac41be9a 100644
--- a/ru_RU.KOI8-R/articles/releng-packages/article.xml
+++ b/ru_RU.KOI8-R/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/releng/article.xml b/ru_RU.KOI8-R/articles/releng/article.xml
index 4803edde20..d7b388de0b 100644
--- a/ru_RU.KOI8-R/articles/releng/article.xml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
 ]>
 
diff --git a/ru_RU.KOI8-R/articles/solid-state/article.xml b/ru_RU.KOI8-R/articles/solid-state/article.xml
index 3befe7268b..230f0d2dba 100644
--- a/ru_RU.KOI8-R/articles/solid-state/article.xml
+++ b/ru_RU.KOI8-R/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/articles/vm-design/article.xml b/ru_RU.KOI8-R/articles/vm-design/article.xml
index bd9d6b0610..319b4d2ce6 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.xml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -210,7 +207,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig1" format="EPS"/>
+        <imagedata fileref="fig1"/>
       </imageobject>
 
       <textobject>
@@ -233,7 +230,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig2" format="EPS"/>
+        <imagedata fileref="fig2"/>
       </imageobject>
 
       <textobject>
@@ -254,7 +251,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig3" format="EPS"/>
+        <imagedata fileref="fig3"/>
       </imageobject>
 
       <textobject>
@@ -286,7 +283,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="fig4" format="EPS"/>
+        <imagedata fileref="fig4"/>
       </imageobject>
 
       <textobject>
diff --git a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
index 531ac00b72..5d67f59bca 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
index 2cd5a80a7b..74aebf6f30 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
index 0343bbcef3..5df63748fd 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/design-44bsd/Makefile b/ru_RU.KOI8-R/books/design-44bsd/Makefile
index 8321e550ad..d5b71befa2 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/Makefile
+++ b/ru_RU.KOI8-R/books/design-44bsd/Makefile
@@ -16,10 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 
 SRCS= book.xml
 
-# Use the local DSSSL file
-DSLHTML?=       ${.CURDIR}/freebsd.dsl
-DSLPRINT?=      ${.CURDIR}/freebsd.dsl
-
 DOC_PREFIX?= ${.CURDIR}/../../..
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index e537066c7d..66c4680856 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.xml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -604,7 +601,7 @@
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="fig1" format="EPS"/>
+	    <imagedata fileref="fig1"/>
 	  </imageobject>
 
 	  <textobject>
@@ -1381,7 +1378,7 @@
 
         <mediaobject>
           <imageobject>
-	    <imagedata fileref="fig2" format="EPS"/>
+	    <imagedata fileref="fig2"/>
           </imageobject>
 
 	  <textobject>
diff --git a/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl b/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl
deleted file mode 100644
index a50bb38cf0..0000000000
--- a/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-
-  The FreeBSD Russian Documentation Project
-
-  $FreeBSD$
-  $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/design-44bsd/freebsd.dsl,v 1.1 2001/07/11 19:27:16 phantom Exp $
-  Original revision: r38826
-
--->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      ;; Keep the legalnotice together with the rest of the text
-      (define %generate-legalnotice-link%
-        #f)
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ru_RU.KOI8-R/books/developers-handbook/book.xml b/ru_RU.KOI8-R/books/developers-handbook/book.xml
index f799f92b43..3abd465dd8 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
index a0859acebb..bdbf249a60 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
index 643c2ac33a..ac5541c3e7 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
index 8637dc82a1..3f4eee098b 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
index 26a1714ec0..1d5f380228 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/faq/book.xml b/ru_RU.KOI8-R/books/faq/book.xml
index e3028b6acc..ddf4d45c90 100644
--- a/ru_RU.KOI8-R/books/faq/book.xml
+++ b/ru_RU.KOI8-R/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
@@ -2839,7 +2837,7 @@ bindkey ^[[3~ delete-char # 
       <qandaentry>
 	<question id="pae">
 	  <para>������ &os; ���������� ������������ ���������� ������
-	    �� ���������� &i386?</para>
+	    �� ���������� &i386;?</para>
 	</question>
 
 	<answer>
@@ -3524,7 +3522,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
@@ -8689,7 +8687,7 @@ add 0 0 HISADDR</programlisting>
 
 	  <para>� ����������� ������� ���� ��������, ������������
 	    ���������������� � ��������� ������ �������.  ��������, �
-	    ������ &usrobotics;&nbsp;&sportster ��� ������������ ���������
+	    ������ &usrobotics;&nbsp;&sportster; ��� ������������ ���������
 	    �������� <literal>S10</literal> � ������� ����� �������.
 	    ����� ������� ����� ����� ����������, �������� ���������
 	    ������������������ �������-�������� � ������ ������:</para>
@@ -9588,7 +9586,7 @@ ATDT1234567</programlisting>
 	    url="http://support.microsoft.com/support/kb/articles/Q158/4/74.asp">
 	    Q158474 - Windows TCPIP Registry Entries</ulink> � <ulink
 	    url="http://support.microsoft.com/support/kb/articles/Q120/6/42.asp">
-	    Q120642 - TCPIP & NBT Configuration Parameters for
+	    Q120642 - TCPIP &amp; NBT Configuration Parameters for
 	    &windowsnt;</ulink> ��� ��������� ����� ������ ���������� ��
 	    ��������� MTU � &windows; ��� ������ � NAT-���������������.</para>
 
@@ -9658,9 +9656,9 @@ ATDT1234567</programlisting>
 
 	  <para>��� ������ ������ ������������� �������:</para>
 
-	  <programlisting>sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
+	  <programlisting>sio0: &lt;16550A-compatible COM port&gt; port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
 sio0: type 16550A
-sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
+sio1: &lt;16550A-compatible COM port&gt; port 0x2f8-0x2ff irq 3 on acpi0
 sio1: type 16550A</programlisting>
 
 	  <para>����� ������������ ��� ���������������� �����.  ������
@@ -9793,7 +9791,7 @@ hint.sio.7.irq="12"</programlisting>
 	</question>
 
 	<answer>
-	  <para>�������� ������ ����������� &os, �����ݣ���� <ulink
+	  <para>�������� ������ ����������� &os;, �����ݣ���� <ulink
 	    url="&url.books.handbook;/serial.html#SERIAL-HW-CONFIG">����������������
 	    �����������</ulink>.</para>
 	</answer>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/book.xml b/ru_RU.KOI8-R/books/fdp-primer/book.xml
index 52248aff97..ec7c536532 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/book.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
index 4e2f5cb036..b8d5ba90a0 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
index e760bbbf19..4569e530ab 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
index a4fbceb0ff..3237b4cf79 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index 1b0b87dcae..9b10080ff7 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -2409,7 +2409,7 @@ tion</replaceable>;</literal>
 	</itemizedlist>
 
 	<para>��������, ������ ������� ��������� ��������� �����.  �����������,
-	  ��� � ��� ���� ���� ����������� � ������ <filename>fig1</filename>,
+	  ��� � ��� ���� ���� ����������� � ������ <filename>fig1.png</filename>,
 	  ������� �� ������ �������� � ��������.  ��� ����������� ������������
 	  ����� ������������� � ������ A ������.  �������� ��� ����� ������
 	  ����� ������.</para>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
index d7a4302d4d..2f9e8f3157 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -98,7 +98,7 @@
       </step>
 
       <step>
-	<para>��������� � ������� <filename role="directory">www/en</filename>
+	<para>��������� � ������� <filename class="directory">www/en</filename>
           � ��������� ������� &man.make.1; <maketarget>all</maketarget> ���
           �������� Web-�������.</para>
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
index 4780afe4e3..b54aa51456 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
index dbc3071da2..691bc1d834 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 9ca76469cb..1cf517348f 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -38,7 +38,6 @@ DOC?= book
 FORMATS?= html-split
 
 #HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -269,30 +268,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index 8bcd0ad06a..90f2d7d972 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -1269,7 +1269,7 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
 
     <para>�������, �������� � ���������� ������ ��������:</para>
 
-    <screen>&prompt.root; <userinput>make && make install</userinput></screen>
+    <screen>&prompt.root; <userinput>make &amp;&amp; make install</userinput></screen>
 
     <para>��� ������������� �������� ���������� ��������� ���������������
       ������:</para>
@@ -2444,7 +2444,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
 		<filename>pxeboot</filename>, � �� ����.  ���������� ������
 		���������� �����������, ����� ��� ��������
 		<filename>pxeboot</filename> �� ��������
-		<filename role="directory">/boot</filename> &os; CD-ROM
+		<filename class="directory">/boot</filename> &os; CD-ROM
 		(��������� &man.pxeboot.8; ����� ���������
 		<filename>GENERIC</filename> ����, ��� ������ ���������
 		�������� � ���������� CD-ROM).</para>
diff --git a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
index 59a33b64d5..cacc58bdbf 100644
--- a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -237,7 +237,7 @@ requirements. -->
 
 
     <para>��� ���������������� ����� ������� ������ ��������� � ��������
-    <filename role="directory">/etc/security</filename>.   ����� ��������
+    <filename class="directory">/etc/security</filename>.   ����� ��������
     ������ ������ ��� ������ ���������� ��������� �����:</para>
 
     <itemizedlist>
@@ -518,10 +518,10 @@ naflags:lo</programlisting>
 	  �������� ���������� ��������� ������������ �� �������, �
 	  ������� ����������� ����� �������� ������.  ��������, ����
 	  �������� ��������� <option>dir</option> ����������� �
-	  <filename role="directory">/var/audit</filename>, � ��������
+	  <filename class="directory">/var/audit</filename>, � ��������
 	  <option>minfree</option> ����� �������� (20), �� ���������������
 	  ��������� ����� ������, ����� ������ <filename
-	  role="directory">/var</filename> ����� �������� ��
+	  class="directory">/var</filename> ����� �������� ��
 	  ����������� (80%) ���������.</para>
 
 	<para>�������� <option>naflags</option> ���������� ������
diff --git a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
index 9662774759..aa7b3d870e 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -1166,7 +1166,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1186,7 +1186,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1214,7 +1214,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1240,7 +1240,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1266,7 +1266,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1580,7 +1580,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disk-layout" format="EPS"/>
+	    <imagedata fileref="install/disk-layout"/>
 	  </imageobject>
 
 	  <textobject>
diff --git a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
index e8d1353b98..d234a87de2 100644
--- a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/book.xml b/ru_RU.KOI8-R/books/handbook/book.xml
index 5a05a91871..eaddecedc3 100644
--- a/ru_RU.KOI8-R/books/handbook/book.xml
+++ b/ru_RU.KOI8-R/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/ru_RU.KOI8-R/books/handbook/boot/chapter.xml b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
index 2f0d46912b..8346cc6885 100644
--- a/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
index f9db798236..e7aa56b42e 100644
--- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -670,7 +670,7 @@ Loading /boot/defaults/loader.conf
 	      <mediaobject>
 		<imageobject>
 		  <imagedata fileref="bsdinstall/bsdinstall-boot-loader-menu"
-		     format="PNG"/>
+		    />
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -743,14 +743,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  � &man.tip.1; ��� &man.cu.1;).  ����������� �������� �������
 	  ����������:</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5"/>
-	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok    </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="bsdinstall-prompt-single">
@@ -764,7 +758,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		�����������.</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>�� ���� ����� �������� CDROM � ������ � �������� <command>boot
 	    cdrom</command> � ����������� <acronym>PROM</acronym>.</para>
@@ -965,7 +958,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1009,7 +1002,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-keymap-select-default"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1025,7 +1018,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1055,7 +1048,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1076,7 +1069,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-components"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1163,7 +1156,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1182,7 +1175,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1209,7 +1202,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-manual"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1226,7 +1219,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-guided-disk"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1243,7 +1236,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-entire-part"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1264,7 +1257,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-review"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1281,7 +1274,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-create"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1297,7 +1290,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-partscheme"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1382,7 +1375,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-manual-addpart"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1555,7 +1548,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-final-confirmation"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1585,7 +1578,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1600,7 +1593,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-distfile-verifying"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1613,7 +1606,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-distfile-extracting"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1646,7 +1639,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-post-root-passwd"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1673,7 +1666,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-configure-network-interface"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1706,8 +1699,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-scan"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1728,8 +1720,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1748,8 +1739,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1770,7 +1760,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"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1803,7 +1793,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"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1822,7 +1812,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"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1865,8 +1855,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1892,7 +1881,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"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1911,7 +1900,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"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1956,8 +1945,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"/>
 	      </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1981,7 +1969,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-set-clock-local-utc"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2000,7 +1988,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2014,7 +2002,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-country"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2028,7 +2016,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2042,7 +2030,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-confirm"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2066,7 +2054,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-services"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2116,7 +2104,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-crashdump"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2140,7 +2128,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2152,7 +2140,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2255,7 +2243,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2282,7 +2270,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-finalconfiguration"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2339,7 +2327,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-final-modification-shell"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2356,7 +2344,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/ru_RU.KOI8-R/books/handbook/chapters.ent b/ru_RU.KOI8-R/books/handbook/chapters.ent
index 0196cfce06..213cd1c9a9 100644
--- a/ru_RU.KOI8-R/books/handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/handbook/chapters.ent
@@ -16,232 +16,61 @@
      ������� ������ ���� ������������� � ������� � ������� ��� ������������.
 -->
 
-<!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.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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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/ru_RU.KOI8-R/books/handbook/colophon.xml b/ru_RU.KOI8-R/books/handbook/colophon.xml
index fddc7f54dc..228c443b2f 100644
--- a/ru_RU.KOI8-R/books/handbook/colophon.xml
+++ b/ru_RU.KOI8-R/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The Russian FreeBSD Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/config/chapter.xml b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
index a99290ba37..0853766366 100644
--- a/ru_RU.KOI8-R/books/handbook/config/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -397,7 +397,7 @@ stop)
         kill -9 `cat /var/run/utility.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" &gt;&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
diff --git a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
index bbdf1b25d2..06f16c3d71 100644
--- a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
index cd457312d8..443e5b9f3d 100644
--- a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/disks/chapter.xml b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
index 21b0bd72c5..5e2ef323cd 100644
--- a/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -2949,16 +2949,6 @@ targetuser@targetmachine.example.com dd of=/mybigfiles/dump-usr-l0.gz</userinput
 	��������� �����.  �ݣ ���� ���, ����������� � ���� ������, �����
 	������ ��� �� ������������� � �������.</para>
     </sect3>
-
-<![ %not.published; [
-
-    <sect3>
-      <title>* � �� ��� ����� � ����������, � ��� ������?</title>
-
-      <para></para>
-    </sect3>
-]]>
-
     </sect2>
   </sect1>
 
diff --git a/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
index 2b8cc70f0a..ab75145080 100644
--- a/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
index 4b6d2ec664..a44606af50 100644
--- a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
      $FreeBSD$
@@ -227,7 +227,7 @@ example      17547136       0 17547136     0%    /example</screen>
 	  ��������� �����, � ������������ ����� ������������� ��� ����������,
 	  ��������:</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
index 1b3e8556b1..82b504bfb4 100644
--- a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
index d804ad63f0..7e6939a30b 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
      $FreeBSD$
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index 5ceee477dd..d66301ddc6 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -1001,7 +1001,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1038,14 +1038,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       (��������, ������ <command>~#</command> � &man.tip.1; ��� &man.cu.1;).
       ����������� PROM �������� ������� ����������:</para>
 
-    <screenco>
-      <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
-      </areaspec>
-
-      <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+      <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
       <calloutlist>
 	<callout arearefs="prompt-single">
@@ -1057,7 +1051,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	    ����� ���������� ����� ��������� ����������.</para>
 	</callout>
       </calloutlist>
-    </screenco>
 
     <para>�� ���� ������ ���������� �������� CDROM � ������ � �������
       <command>boot cdrom</command> � ����������� PROM.</para>
@@ -1165,7 +1158,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1181,7 +1174,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1218,7 +1211,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1234,7 +1227,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1246,7 +1239,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1276,7 +1269,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1297,7 +1290,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1315,7 +1308,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1325,7 +1318,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1361,7 +1354,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1539,7 +1532,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1607,7 +1600,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1652,7 +1645,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1695,7 +1688,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1725,7 +1718,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1974,7 +1967,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2002,7 +1995,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2028,7 +2021,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2045,7 +2038,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2062,7 +2055,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2079,7 +2072,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2101,7 +2094,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2151,7 +2144,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2204,7 +2197,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2237,7 +2230,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2427,7 +2420,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2473,7 +2466,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2644,7 +2637,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2738,7 +2731,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2817,7 +2810,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2876,7 +2869,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2926,7 +2919,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2941,7 +2934,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2961,7 +2954,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2975,7 +2968,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3019,7 +3012,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3032,7 +3025,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3045,7 +3038,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3088,7 +3081,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3102,7 +3095,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3118,7 +3111,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3132,7 +3125,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3146,7 +3139,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3161,7 +3154,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3205,7 +3198,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3226,7 +3219,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3254,7 +3247,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3268,7 +3261,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3309,7 +3302,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3322,7 +3315,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3424,7 +3417,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3486,7 +3479,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3563,7 +3556,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3633,7 +3626,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3687,7 +3680,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3713,7 +3706,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
index 4949c64566..148f51a85d 100644
--- a/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
index 8d9a06945a..6d06cc5f1b 100644
--- a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
index 287c0bc9d4..5a7963065d 100644
--- a/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
index 2746707174..647d255b93 100644
--- a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -444,7 +444,7 @@ multi on</programlisting>
 	<application>&mathematica;</application> ������� ��
 	����� ���������, ������ ���� �������� ����� ���, ���
 	�� ������� ������������ ��.  ���� �� �������
-	<filename role="directory">/usr/local/bin</filename> �
+	<filename class="directory">/usr/local/bin</filename> �
 	�������� ���������� ��� ��������� ����������� ������
 	<application>&mathematica;</application>, �� �� ����������
 	� ���� �������� ������ �� ����� <filename>math</filename>,
@@ -648,14 +648,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-        lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+        lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
         echo -n " lmgrd"
         ;;
 stop)
-        lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+        lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+        echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
         exit 64
         ;;
 esac
@@ -922,7 +922,7 @@ exit 0</programlisting>
 	    ��������� ��������� ������:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/ru_RU.KOI8-R/books/handbook/mac/chapter.xml b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
index eeb197962e..5b034e17b1 100644
--- a/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -1681,7 +1681,7 @@ mac_partition_load="YES"</programlisting>
 	&man.vi.1;.  ��������� ������ <command>sh</command>
 	������� ��� �����������:</para>
 
-      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
 	<userinput>/etc/passwd`; do pw usermod $x -L insecure; done;</userinput></screen>
 
       <para>����� ����� ��������� ���������� ��������� �������
@@ -1863,7 +1863,7 @@ round-trip min/avg/max/stddev = 204.455/204.455/204.455/0.000 ms</screen>
 test1: biba/equal,mls/equal
 &prompt.root; <userinput>setfmac biba/low test1 test2; setfmac biba/high test4 test5; \
   setfmac mls/low test1 test3; setfmac mls/high test2 test4</userinput>
-&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
+&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 &amp;&amp; getfmac test?</userinput>
 test1: biba/low,mls/low
 test2: biba/low,mls/high
 test3: biba/equal,mls/equal
@@ -1948,7 +1948,7 @@ cat: test4: Permission denied</screen>
       <para>������� ������������ ���������� ��������� � ����� ��
 	���������; ����� �������:</para>
 
-      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
 	<userinput>/etc/passwd`; do pw usermod $x -L default; done;</userinput></screen>
 
       <para>������ ����� ��� ������.</para>
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index 478e951850..4e0a56613e 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -2008,7 +2008,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2019,7 +2019,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2052,7 +2052,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2102,7 +2102,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2120,7 +2120,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2130,7 +2130,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2142,7 +2142,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2158,7 +2158,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
index 8473d65ce3..bfdd56ed9e 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -2413,7 +2413,7 @@ doc/zh_*</screen>
 
       <note>
 	<para>� ������������ ��������� �� ��������� �������
-	  <filename role="directory">/usr/ports</filename> �� ������.
+	  <filename class="directory">/usr/ports</filename> �� ������.
 	  ���� �� ����������� &os; 6.0-RELEASE,
 	  �������� ��� �������������� ����� ������ ��������
 	  ������� <command>portsnap</command>.
@@ -2473,7 +2473,7 @@ doc/zh_*</screen>
 	������ ������ �� ���������� ������������� ������� ��������
 	� ��� ���� <filename>/etc/crontab</filename> ������</para>
 
-      <programlisting>0 3 * * * root portsnap -I cron update && pkg_version -vIL=</programlisting>
+      <programlisting>0 3 * * * root portsnap -I cron update &amp;&amp; pkg_version -vIL=</programlisting>
 
       <note>
 	<para>���� ��������� ���� �� ����������� � ��������� �����,
diff --git a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
index d2d867a31c..573cff7252 100644
--- a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
index 84ec47cf31..21375238ea 100644
--- a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
index 3a3dbacd6f..ddd532f271 100644
--- a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/ports/chapter.xml b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
index 85f70a957b..dfec70926b 100644
--- a/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -1290,7 +1290,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 	  ���������� ����������.  ��� ��������� ������� ���������
 	  ���������:</para>
 
-	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmaster</filename></userinput>
+	<screen>&prompt.root; <userinput>cd <filename class="directory">/usr/ports/ports-mgmt/portmaster</filename></userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
 	<para><application>Portmaster</application> ����� �����
diff --git a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
index e4ee10c1d2..c9df9b7196 100644
--- a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -1724,7 +1724,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
@@ -1745,7 +1745,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/ru_RU.KOI8-R/books/handbook/preface/preface.xml b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
index ef6286e299..6ecbeee24f 100644
--- a/ru_RU.KOI8-R/books/handbook/preface/preface.xml
+++ b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/printing/chapter.xml b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
index eb0e773b6f..00317e157c 100644
--- a/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/security/chapter.xml b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
index 8168ae79f6..59d47db0f4 100644
--- a/ru_RU.KOI8-R/books/handbook/security/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
index c2b8c0ce87..8cd834ae8e 100644
--- a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/users/chapter.xml b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
index f0762b869b..bdf5fb318c 100644
--- a/ru_RU.KOI8-R/books/handbook/users/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
index d942e95974..a15938582d 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
 	The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/books/handbook/x11/chapter.xml b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
index 8e742aa887..d3c91f2730 100644
--- a/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -331,7 +331,7 @@
       <application>&xorg;</application>.  <application>&xorg;</application>
       ��� ������ X ������������ �������� ���������� X Window System,
       ���������� X.Org Foundation.  <application>&xorg;</application> ������� �� ����
-      <application>&xfree86&nbsp;4.4RC2</application> � X11R6.6.
+      <application>&xfree86;&nbsp;4.4RC2</application> � X11R6.6.
       ������ <application>&xorg;</application>, ��������� �� ������ ������
       �� ��������� ������ &os;: &xorg.version;.</para>
 
diff --git a/ru_RU.KOI8-R/books/porters-handbook/Makefile b/ru_RU.KOI8-R/books/porters-handbook/Makefile
index 1dbd9c19ad..c9c08fd9e7 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/porters-handbook/Makefile
@@ -31,9 +31,5 @@ SRCS=  book.xml
 # Entities
 #SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
index 0b6aa7bc4c..6537f7538f 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -3484,7 +3481,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	<para>��� �� �����, �������� ���������� ����� ���������� �����������
 	  ������� ���������� ����������, �� �������� �
 	  <makevar>BUILD_DEPENDS</makevar> ��������� �����.
-	  ����� ��������� ��-�� �������� ���������� � &man.make.1
+	  ����� ��������� ��-�� �������� ���������� � &man.make.1;
 	  ������������� ����������.  ����������� <filename>Makefile</filename>
 	  � ����������� <makevar>USE_<replaceable>*</replaceable></makevar>,
 	  ������� �������������� � <filename>ports/Mk/bsd.*.mk</filename>
@@ -3899,8 +3896,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_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
        @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
        @${FALSE}
@@ -4645,7 +4642,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+	(cd ${WRKSRC}/examples/ &amp;&amp; ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
 
 	<para>� ���� ������� ��������������� ���������� ��������
 	  <filename>examples</filename> �� ������������ ������ �������������
@@ -4653,7 +4650,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${DATADIR}/summer
-	(cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+	(cd ${WRKSRC}/temperatures/ &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
 
 	<para>� � ���� ������� ����� ����������� ������ ������ ������� �
 	  ���������� <filename>summer</filename> ��������
@@ -4667,7 +4664,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && \
+	(cd ${WRKSRC}/examples/ &amp;&amp; \
 		${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
 
 	<para>�������� ��������, ��� ��� ������� �� ���������� ����������
@@ -6355,7 +6352,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
 	<programlisting>HAS_CONFIGURE=	yes
 
 do-configure:
-        @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+        @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
                 ${QMAKE} PREFIX=${PREFIX} texmaker.pro</programlisting>
 
 	<para>�������� �������� �� �������� �� ������� <command>qmake</command>
@@ -9152,7 +9149,7 @@ CFLAGS+=        -DLUA_VERSION_STRING="${VER_STR}"
 	url="&url.books.handbook;/configtuning-rcd.html">����� rc.d
 	�����������</ulink>.  ��������� ���������� ��������� ������
 	��������� � &man.rc.8; � &man.rc.subr.8;.  �������, ���� <ulink
-	url="&url.articles.rc-scripting">������</ulink>� ������������
+	url="&url.articles.rc-scripting;">������</ulink>� ������������
 	�������� ��������� ��������� <filename>rc.d</filename>.</para>
 
       <para>���������� ����� ���� ��� ����� ���������
@@ -9736,7 +9733,7 @@ etc/orbit.conf.sample
 
     <para>��������� ��������� ��������� � ����� �����.</para>
 
-    <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+    <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
 
     <para>�������� ������ ���� <filename>pkg-plist</filename>:</para>
 
@@ -9747,12 +9744,12 @@ etc/orbit.conf.sample
       ��������.</para>
 
     <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
 
     <para>����� ����, � ������ �������� �� ������ �������� ��� �����
       ��������� ��������.</para>
 
-    <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+    <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
     <para>� �������, ��� ����� ������� ����������� ������ ��������; ���
       �������� ���������������� <emphasis>�� ���������</emphasis>.  ��������
@@ -13373,7 +13370,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 	    <row>
 	      <entry>700016</entry>
 	      <entry>22 ������ 2006</entry>
-	      <entry>7.0-CURRENT ����� ���������� &man.fcloseall.3
+	      <entry>7.0-CURRENT ����� ���������� &man.fcloseall.3;
 		� libc.</entry>
 	    </row>
 
@@ -15483,7 +15480,7 @@ CFLAGS= -Wall -Werror
       <sect1 id="dads-pthread">
 	<title>���������� �������</title>
 
-	<para>�� &os ���������� ������� ������� ���� ������������ �
+	<para>�� &os; ���������� ������� ������� ���� ������������ �
 	  ������������ ������� � �������������� ������������ �����
 	  ������������ <literal>-pthread</literal>.  ���� ���� ����������
 	  �� ������ ���������� � <literal>-lpthread</literal> ���
diff --git a/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl b/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 768cd759b7..0000000000
--- a/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl,v 1.6 2006/09/08 13:59:56 den Exp $
-
-     Original revision: r10492
--->
-
-<!-- Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files, 
-     rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE">
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      <![ %output.html; [ 
-	(define ($email-footer$)
-          (make sequence
-            (literal "�� �������� ��������� � �������� ������ ��� FreeBSD, ������ �� ������ <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal ">.")
-            (make empty-element gi: "br")
-            (literal "�� ��������, ��������� � ���� �������������, ������ �� ������ <")
-            (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-              (literal "doc@FreeBSD.org"))
-            (literal ">.")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/ru_RU.KOI8-R/share/xml/catalog b/ru_RU.KOI8-R/share/xml/catalog
index 70dd5a8d35..2422c1740c 100644
--- a/ru_RU.KOI8-R/share/xml/catalog
+++ b/ru_RU.KOI8-R/share/xml/catalog
@@ -1,59 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- ...................................................................... --
-  -- Russian specific ..................................................... --
-
-  -- ...................................................................... --
-  -- The FreeBSD Russian Documentation Project
-  -- ...................................................................... --
-  -- $FreeBSD$
-  -- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/xml/catalog,v 1.13 2004/08/13 07:07:53 den Exp $
-  -- ...................................................................... --
-  -- Original revision: r17819
-  -- ...................................................................... --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
-	"newsgroups.ent"
-
-PUBLIC	"-//FreeBSD//ENTITIES DocBook Team Entities//RU"
-	"teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Russian Translators Entities//RU"
-	"translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
-	"urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/ru_RU.KOI8-R/share/xml/catalog.xml b/ru_RU.KOI8-R/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/ru_RU.KOI8-R/share/xml/catalog.xml
+++ b/ru_RU.KOI8-R/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent
index f52abd7694..ee50a6be6e 100644
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@@ -7,27 +7,30 @@
      Original revision: 1.1 (doc/share/xml)
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
+	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU">
+<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
+	"urls.ent">
 %urls-ru;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
+	"glossary.ent">
 %glossary;
diff --git a/ru_RU.KOI8-R/share/xml/freebsd.dsl b/ru_RU.KOI8-R/share/xml/freebsd.dsl
index 2ee520e26f..4ae7a0880a 100644
--- a/ru_RU.KOI8-R/share/xml/freebsd.dsl
+++ b/ru_RU.KOI8-R/share/xml/freebsd.dsl
@@ -9,65 +9,12 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % lang.ru.dsssl "IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
 
-      <![ %output.html; [
-
-      <![ %lang.ru.dsssl; [
-        (define %gentext-language% "ru")
-      ]]>
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "����, � ������ ���������, ����� ���� ������� � ")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "�� ��������, ��������� � FreeBSD, ���������� ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/ru/docs.html"))
-                  (literal "������������"))
-                (literal " ������ ��� ������ � <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "�� ��������, ��������� � ���� �������������, ������ <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")
-                (make empty-element gi: "br")
-                (literal "�� ��������, ��������� � ������� ��������� ������������, ������ � �������� <")
-		(create-link (list (list "HREF" "mailto:frdp@FreeBSD.org.ua"))
-                  (literal "frdp@FreeBSD.org.ua"))
-	        (literal ">.")
-                (make empty-element gi: "br")
-                (literal "���������� �� �������� �� ��� �������� ��������� �� ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org.ua/resources.html"))
-                  (literal "����� ������� ��������"))
-                (literal ".")))))
-      ]]>
-
       <!-- Convert " ... " to '' ... '' in the HTML output. -->
       (element quote
 	(make sequence
diff --git a/ru_RU.KOI8-R/share/xml/mailing-lists.ent b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
index d70d70647b..0876938c78 100644
--- a/ru_RU.KOI8-R/share/xml/mailing-lists.ent
+++ b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/mirrors-local.xsl b/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
index 2ce9eb4828..862d15076d 100644
--- a/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
+++ b/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
@@ -14,7 +14,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="koi8-r"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- template: "mirrors-docbook-contact" -->
diff --git a/ru_RU.KOI8-R/share/xml/newsgroups.ent b/ru_RU.KOI8-R/share/xml/newsgroups.ent
index 5bd404da20..20ab5d4032 100644
--- a/ru_RU.KOI8-R/share/xml/newsgroups.ent
+++ b/ru_RU.KOI8-R/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/teams.ent b/ru_RU.KOI8-R/share/xml/teams.ent
index 9347d7aaa8..c5ad0159dc 100644
--- a/ru_RU.KOI8-R/share/xml/teams.ent
+++ b/ru_RU.KOI8-R/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index 83bbfc794e..c9dae8b297 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/translators.ent b/ru_RU.KOI8-R/share/xml/translators.ent
index a20272f125..718b2f7e58 100644
--- a/ru_RU.KOI8-R/share/xml/translators.ent
+++ b/ru_RU.KOI8-R/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xml/urls.ent b/ru_RU.KOI8-R/share/xml/urls.ent
index 644605a719..d7112a8543 100644
--- a/ru_RU.KOI8-R/share/xml/urls.ent
+++ b/ru_RU.KOI8-R/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
     The FreeBSD Russian Documentation Project
 
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-common.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..a97eec4fb7
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='koi8-r'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>����, � ������ ���������, ����� ���� ������� �
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>.</small></p>
+
+    <p align="center"><small>�� ��������, ��������� � FreeBSD, ����������
+    <a href="http://www.FreeBSD.org/ru/docs.html">������������</a> ������ ��� ������ �
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    �� ��������, ��������� � ���� �������������, ������
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.<br/>
+    �� ��������, ��������� � ������� ��������� ������������, ������ � ��������
+    &lt;<a href="mailto:frdp@FreeBSD.org.ua">frdp@FreeBSD.org.ua</a>&gt;.<br/>
+    ���������� �� �������� �� ��� �������� ��������� ��
+    <a href="http://www.freebsd.org.ua/resources.html">����� ������� ��������</a>.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/ru_RU.KOI8-R/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/share/misc/docbook.css b/share/misc/docbook.css
index 22a430f2dd..8c1bf85571 100644
--- a/share/misc/docbook.css
+++ b/share/misc/docbook.css
@@ -26,17 +26,84 @@
  * $FreeBSD$
  */
 
+/*
+ * General DocBook styles from the DocBook XSL distribution
+ */
+
+.formalpara-title {
+  font-weight: bold;
+}
+
+div.blockquote-title {
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgmain-title {
+  font-weight: bold;
+}
+
+span.msgsub-title {
+  font-weight: bold;
+}
+
+span.msgrel-title {
+  font-weight: bold;
+}
+
+div.msglevel, div.msgorig, div.msgaud {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msglevel-title, span.msgorig-title, span.msgaud-title {
+  font-weight: bold;
+}
+
+div.msgexplan {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+span.msgexplan-title {
+  font-weight: bold;
+}
+
+div.figure-title {
+  font-weight: bold;
+}
+
+div.example-title {
+  font-weight: bold;
+}
+
+div.equation-title {
+  font-weight: bold;
+}
+
+div.table-title {
+  font-weight: bold;
+}
+
+div.sidebar-title {
+  font-weight: bold;
+}
+
+div.synopsis {
+  white-space: pre;
+  font-family: monospace;
+}
+
+/*
+ * FreeBSD-specific formatting
+ */
+
 body address {
 	line-height: 1.3;
 	margin: .6em 0;
 }
 
-body blockquote {
-	margin-top: .75em;
-	line-height: 1.3;
-	margin-bottom: .75em;
-}
-
 html body {
 	margin: 1em 8% 1em 10%;
 	line-height: 1.2;
@@ -70,7 +137,6 @@ body form {
 	margin: .6em 0;
 }
 
-h1, h2, h3, h4, h5, h6,
 div.example p b,
 .question,
 div.table p b,
@@ -78,24 +144,33 @@ div.procedure p b {
 	color: #990000;
 }
 
-body h1, body h2, body h3, body h4, body h5, body h6 {
+h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-weight: bold;
 	line-height: 1.3;
+	margin-top: 1em;
 	margin-left: 0;
+	color: #990000;
 }
 
-body h1, body h2 {
+h1.title, h2.title {
 	margin: .8em 0 0 -4%;
 }
 
-body h3, body h4 {
+h3.title, h4.title {
 	margin: .8em 0 0 -3%;
 }
 
-body h5 {
+h5.title {
 	margin: .8em 0 0 -2%;
 }
 
-body h6 {
+h6.title {
 	margin: .8em 0 0 -1%;
 }
 
@@ -135,15 +210,11 @@ html {
 	padding: 0;
 }
 
-body p b.application {
-	color: #000000;
-}
-
 .filename {
 	color: #007a00;
 }
 
-svnref {
+.svnref {
 	color: #007a00;
 }
 
@@ -163,14 +234,19 @@ svnref {
 	text-decoration: underline;
 }
 
-.screen {
+div.screen {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 }
 
-.programlisting {
+div.programlisting {
+	white-space: pre;
+	font-family: monospace;
 	padding: 1ex;
 	background-color: #eee;
 	border: 1px solid #ccc;
+	border-radius: 6px;
 	line-height: 1.1;
 }
 
@@ -183,42 +259,41 @@ svnref {
 	text-align: left;
 }
 
-blockquote, .example, .programlisting {
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
 	border-radius: 6px;
+	padding: 2ex 2ex;
+	margin: .75em 3em .75em 3em;
+        line-height: 1.3;
 }
 
-blockquote {
-	padding: 0 2ex;
-}
-
-blockquote.note {
+.note, div.procedure {
 	color: #222;
 	background: #eee;
 	border: 1px solid #ccc;
 	width: 85%;
 }
 
-blockquote.tip {
+.tip {
 	color: #004F00;
 	background: #d8ecd6;
 	border: 1px solid green;
 	width: 85%;
 }
 
-blockquote.important {
+.important {
 	font-style:italic;
 	border: 1px solid #a00;
 	border-left: 12px solid #c00;
 }
 
-blockquote.warning {
+.warning {
 	color: #9F1313;
 	background: #f8e8e8;
 	border: 1px solid #e59595;
 	width: 85%;
 }
 
-blockquote.caution {
+.caution {
 	color: #3E3535;
 	background: #FFC;
 	border: 1px solid #e59595;
@@ -233,7 +308,39 @@ blockquote.caution {
 	width: 90%;
 }
 
+.admontitle {
+	display: inline;
+	line-height: 1;
+	margin-right: 0;
+}
+
+.procedure-title {
+	font-weight: bold;
+        line-height: 1;
+        margin-right: 0;
+}
+
+.note p, .tip p, .important p, .warning p, .caution p, .example p {
+	display: inline;
+}
+
 .informaltable table.calstable tr td {
         padding-left: 1em;
         padding-right: 1em;
 }
+
+.authorgroup {
+	font-style: italic;
+}
+
+.application {
+	font-weight: bold;
+}
+
+.userinput {
+	font-weight: normal;
+}
+
+pre.screen strong {
+	font-weight: normal;
+}
diff --git a/share/misc/svn_props.txt b/share/misc/svn_props.txt
new file mode 100644
index 0000000000..a0293097ff
--- /dev/null
+++ b/share/misc/svn_props.txt
@@ -0,0 +1,72 @@
+# Make sure you have a ~/.subversion/config.  Simply using it (svn --help)
+# will cause a default one to be created if you don't already have one.
+# Add the following changes to ~/.subversion/config:
+#
+#
+# Set:
+# enable-auto-props = yes
+#
+#
+# Append/edit auto-props section:
+#
+
+[auto-props]
+*.c     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.h     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.s     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.S     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cc    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cpp   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cxx   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.in    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sh    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pl    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pm    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.py    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.rb    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.awk   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sed   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.txt   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.log   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.conf  = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+Makefile* = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.1     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.2     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.3     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.4     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.5     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.6     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.7     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.8     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.9     = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+
+*.css   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/css
+*.docbook = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.dtd   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.ent   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.html  = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html
+*.mml   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/mathml+xml
+*.js    = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/javascript
+*.rss   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/rss+xml
+*.sgml   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.xhtml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html+xml
+*.xml   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsd   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsl   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xslt  = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xul   = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xul
+
+*.bin   = svn:mime-type=application/octet-stream
+*.eps   = svn:mime-type=application/postscript
+*.exe   = svn:mime-type=application/octet-stream
+*.gz    = svn:mime-type=application/gzip
+*.pdf   = svn:mime-type=application/pdf
+*.ps    = svn:mime-type=application/postscript
+
+*.gif   = svn:mime-type=image/gif
+*.ico   = svn:mime-type=image/vnd.microsoft.icon
+*.jpeg  = svn:mime-type=image/jpeg
+*.jpg   = svn:mime-type=image/jpeg
+*.png   = svn:mime-type=image/png
+*.svg   = svn:mime-type=image/svg+xml
+*.tiff  = svn:mime-type=image/tiff
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
new file mode 100644
index 0000000000..0bf81f3905
--- /dev/null
+++ b/share/mk/doc.commands.mk
@@ -0,0 +1,171 @@
+#
+# $FreeBSD$
+#
+
+#
+# General commands
+#
+
+AWK?=		/usr/bin/awk
+CP?=		/bin/cp
+CAT?=		/bin/cat
+ECHO_CMD?=	echo
+FETCH?=		/usr/bin/fetch
+FIND?=		/usr/bin/find
+GREP?=		/usr/bin/grep
+LN?=		/bin/ln
+MKDIR?=		/bin/mkdir
+MV?=		/bin/mv
+RM?=		/bin/rm
+ISPELL?=	ispell
+ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
+.if exists(/usr/bin/perl)
+PERL?=		/usr/bin/perl
+.elif exists(/usr/local/bin/perl)
+PERL?=		/usr/local/bin/perl
+.else
+PERL?=		perl
+.endif
+PKG_CREATE?=	/usr/sbin/pkg_create
+REALPATH?=	/bin/realpath
+SED?=		/usr/bin/sed
+SETENV?=	/usr/bin/env
+SH?=		/bin/sh
+SORT?=		/usr/bin/sort
+TOUCH?=		/usr/bin/touch
+TRUE?=		/usr/bin/true
+XARGS?=		/usr/bin/xargs
+
+#
+# Compession and decompression
+#
+
+BUNZIP2?=	/usr/bin/bunzip2
+BZIP2?=		bzip2
+BZIPOPTS?=	-qf9
+GZIP?=		gzip
+GZIPOPTS?=	-qf9
+TAR?=		/usr/bin/tar
+ZIP?=		${PREFIX}/bin/zip
+ZIPOPTS?=	-9X
+
+#
+# Rendering and format conversion
+#
+
+DVIPS?=		${PREFIX}/bin/dvips
+.if defined(PAPERSIZE)
+DVIPSOPTS?=	-t ${PAPERSIZE:L}
+.endif
+DVIPSOPTS+=	${DVIPSFLAGS}
+
+FOP?=		${PREFIX}/bin/fop
+FOPOPTS?=
+
+GROFF?=		groff
+
+HTML2PDB?=	${PREFIX}/bin/iSiloBSD
+HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
+HTML2TXT?=	${PREFIX}/bin/w3m
+HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
+
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADE?=		${ENV} SP_ENCODING=XML ${PREFIX}/bin/jade
+.else
+JADE?=		${ENV} SP_ENCODING=XML ${PREFIX}/bin/openjade
+JADEFLAGS+=	-V openjade
+.endif
+
+XMLLINT?=	${PREFIX}/bin/xmllint
+XSLTPROC?=	${PREFIX}/bin/xsltproc
+
+#
+# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
+# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
+# due to incompatibility of the format file.  Since the teTeX 3.0
+# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
+# it is checked here to determine which TeX engine should be used.
+.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
+TEX_CMD?=	${PREFIX}/bin/etex
+PDFTEX_CMD?=	${PREFIX}/bin/pdfetex
+.else
+TEX_CMD?=	${PREFIX}/bin/tex
+PDFTEX_CMD?=	${PREFIX}/bin/pdftex
+.endif
+LATEX_CMD?=	${PREFIX}/bin/latex
+JADETEX_CMD?=	${PDFTEX_CMD} "&jadetex"
+JADETEX_PREPROCESS?=	/bin/cat
+PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
+PDFJADETEX_PREPROCESS?= /bin/cat
+PS2PDF?=	${PREFIX}/bin/ps2pdf
+FOP_CMD?=	${PREFIX}/share/fop/fop.sh
+XEP_CMD?=	sh ${HOME}/XEP/xep.sh
+JAVA_CMD?=	${PREFIX}/bin/javavm
+SAXON_CMD?=	${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
+
+#
+# Currently, we have to use the FixRTF utility available as textproc/fixrtf
+# to apply several RTF fixups:
+#
+# 1. Embed PNGs into RTF. (Option: -p)
+# 2. Embed FreeBSD-specific information into RTF, such as organization name,
+#    building time. But unfortunately, so far only Microsoft Word can read
+#    them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
+#    this kind of information from RTF created by Microsoft Word and
+#    OpenOffice. (Option: -i)
+# 3. Do some locale-specific fixing. (Option: -e <encoding>)
+#
+# This is a transitional solution before Jade/OpenJade provides these features.
+#
+FIXRTF?=	${PREFIX}/bin/fixrtf
+FIXRTFOPTS?=	-i -p
+.if defined(SP_ENCODING)
+FIXRTFOPTS+=	-e ${SP_ENCODING}
+.endif
+
+#
+# Image processing
+#
+
+SCR2PNG?=	${PREFIX}/bin/scr2png
+SCR2PNGOPTS?=	${SCR2PNGFLAGS}
+SCR2TXT?=	${PREFIX}/bin/scr2txt
+SCR2TXTOPTS?=	-l ${SCR2TXTFLAGS}
+EPS2PNM?=	${PREFIX}/bin/gs
+EPS2PNMOPTS?=	-q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
+		-dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
+		-dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
+#
+# epsgeom is a perl script for 1) extracting geometry information
+# from a .eps file and 2) arrange it for ghostscript's pnm driver.
+#
+EPSGEOM?=	${PERL} ${DOC_PREFIX}/share/misc/epsgeom
+EPSGEOMOPTS?=	${EPS2PNM_RES} ${EPS2PNM_RES}
+PNMTOPNG?=	${PREFIX}/bin/pnmtopng
+PNMTOPNGOPTS?=	${PNGTOPNGFLAGS}
+PNGTOPNM?=	${PREFIX}/bin/pngtopnm
+PNGTOPNMOPTS?=	${PNGTOPNMFLAGS}
+PPMTOPGM?=	${PREFIX}/bin/ppmtopgm
+PPMTOPGMOPTS?=	${PPMTOPGMFLAGS}
+PNMTOPS?=	${PREFIX}/bin/pnmtops
+PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
+EPSTOPDF?=	${PREFIX}/bin/epstopdf
+EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
+#
+PIC2PS?=	${GROFF} -p -S -Wall -mtty-char -man
+#
+PS2EPS?=	${PREFIX}/bin/gs
+PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
+		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+PS2BBOX?=	${PREFIX}/bin/gs
+PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
+		-sOutputFile=/dev/null ${PS2BBOXFLAGS}
+
+#
+# Spell checking
+#
+
+ISPELL?=	ispell
+ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index 6985f9e796..a5c0723111 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -5,14 +5,6 @@
 # documents commonly used in doc/ and www/ tree.
 #
 
-AWK?=		/usr/bin/awk
-GREP?=		/usr/bin/grep
-REALPATH?=	/bin/realpath
-SED?=		/usr/bin/sed
-# a hack to keep tidy from converting tabs to spaces
-# replace them with &#09; before calling tidy
-REINPLACE_TABS_CMD?=	${SED} -i "" -e 's/	/\&\#09;/g'
-
 # ------------------------------------------------------------------------
 #
 # Work out the language and encoding used for this document.
@@ -28,20 +20,8 @@ DOC_PREFIX_NAME?=	head
 .endif
 
 .if (!defined(LANGCODE) || empty(LANGCODE))
-# Calculate _LANGCODE.
-_LANGCODE:=	${.CURDIR}
-. for _ in 1 2 3 4 5 6 7 8 9 10
-.  if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
-_LANGCODE:=	${_LANGCODE:H}
-.  endif
-. endfor
-_LANGCODE:=	${_LANGCODE:T}
-.else # (!defined(LANGCODE) || empty(LANGCODE))
-# when LANGCODE is defined, use the value.
-_LANGCODE?=	${LANGCODE}
-.endif # (!defined(LANGCODE) || empty(LANGCODE))
-
-LANGCODE?=	${_LANGCODE}
+LANGCODE!=	echo ${.CURDIR} | grep -o '[a-z]*_[A-Z]*\.[-A-Za-z0-9]*' || true
+.endif
 
 # normalize DOC_PREFIX
 DOC_PREFIX!=	${REALPATH} ${DOC_PREFIX}
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index b36258c9e5..a0d8571214 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -40,14 +40,9 @@
 #			used to set additional variables, such as
 #			"%generate-article-toc%".
 #
-#	TIDYFLAGS	Additional flags to pass to Tidy.  Typically
-#			used to set "-raw" flag to handle 8bit characters.
-#
 #	EXTRA_CATALOGS	Additional catalog files that should be used by
 #			any XML processing applications.
 #
-#	NO_TIDY		If you do not want to use tidy, set this to "YES".
-#
 #       GEN_INDEX       If this document has an index (HAS_INDEX) and this
 #                       variable is defined, then index.xml will be added 
 #                       to the list of dependencies for source files, and 
@@ -62,45 +57,6 @@
 #			spellchecker.  For example, PGP keys and filenames
 #			will be omitted from this output.
 #
-# Print-output options :
-#
-#       NICE_HEADERS    If defined, customized chapter headers will be created
-#			that you may find more aesthetically pleasing.	Note
-#			that this option only effects print output formats for
-#			English language books.
-#
-#       MIN_SECT_LABELS If defined, do not display the section number for 4th
-#                       and 5th level section titles.  This would change 
-#                       "N.N.N.N Section title" into "Section Title" while
-#                       higher level sections are still printed with numbers.
-#
-#       TRACE={1,2}     Trace TeX's memory usage.  Set this to 1 for minimal
-#                       tracing or 2 for maximum tracing.  TeX memory 
-#                       statistics will be written out to <filename>.log.
-#                       For more information see the TeXbook, p301.
-#
-#       TWO_SIDE        If defined, two sided output will be created.  This 
-#                       means that new chapters will only start on odd 
-#                       numbered (aka right side, aka recto) pages and the 
-#                       headers and footers will be aligned appropriately 
-#                       for double sided paper.  Blank pages may be added as
-#                       needed.
-#
-#       JUSTIFY         If defined, text will be right justified so that the
-#                       right edge is smooth.  Words may be hyphenated using
-#                       the default TeX hyphenation rules for this purpose.
-#
-#       BOOK_OUTPUT     A collection of options are set suitable for printing
-#                       a book.  This option may be an order of magnitude more
-#                       CPU intensive than the default build.
-#
-#       RLE             Use Run-Length Encoding for EPS files, this will
-#                       result in significantly smaller PostScript files, 
-#                       but may take longer for a printer to process.
-#
-#       GREYSCALE_IMAGES Convert the screenshots to greyscale before
-#                        embedding them into the PostScript output.
-#
 # Package building options:
 # 
 #       BZIP2_PACKAGE  Use bzip2(1) utility to compress package tarball
@@ -115,115 +71,56 @@
 
 MASTERDOC?=	${.CURDIR}/${DOC}.xml
 
-# List of supported SP_ENCODINGs
-SP_ENCODING_LIST?=	ISO-8859-2 KOI8-R
+# Either jade or fop
+RENDERENGINE?=	jade
 
-# Which stylesheet type to use.  'dsssl' or 'xsl'
-STYLESHEET_TYPE?=	dsssl
-
-.if defined(SPELLCHECK)
-DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
-.endif
-
-XMLLINT?=	/usr/local/bin/xmllint
 XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
 
-.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?=		${PREFIX}/bin/jade
-JADECATALOG?=	${PREFIX}/share/sgml/jade/catalog
-SX?=		${PREFIX}/bin/sx
-.else
-JADE?=		${PREFIX}/bin/openjade
-JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
-JADEFLAGS+=	-V openjade
-SX?=		${PREFIX}/bin/osx
-.endif
-
-.if defined(SP_ENCODING)
-JADE_ENV+=	SP_ENCODING=${SP_ENCODING}
-.endif
-JADE_CMD=	${SETENV} ${JADE_ENV} ${JADE}
-
-DSLHTML?=	${DOC_PREFIX}/share/xml/default.dsl
+DSLHTML?=	${DOC_PREFIX}/share/xml/spellcheck.dsl
 DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
 DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
-FREEBSDCATALOG=	${DOC_PREFIX}/share/xml/catalog
-LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
 
-ISO8879CATALOG=	${PREFIX}/share/sgml/iso8879/catalog
+XSLPROF?=	/usr/local/share/xsl/docbook/profiling/profile.xsl
+XSLXHTML?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
+XSLXHTMLCHUNK?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
+XSLEPUB?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
+XSLFO?=		${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-fo.xsl
 
-.if ${STYLESHEET_TYPE} == "dsssl"
-DOCBOOKCATALOG=	${PREFIX}/share/sgml/docbook/catalog
-.elif ${STYLESHEET_TYPE} == "xsl"
-DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
-.endif
-
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-
-DSSSLCATALOG=	${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
-COLLATEINDEX=	${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-
-XSLTPROCFLAGS?=	--nonet
-XSLHTML?=	${DOC_PREFIX}/share/xsl/freebsd-html.xsl
-XSLHTMLCHUNK?=	${DOC_PREFIX}/share/xsl/freebsd-html-chunk.xsl
-XSLFO?=		${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
-INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
+XSLSCH?=	/usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl
 
 IMAGES_LIB?=
 
-.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${ISO8879CATALOG} ${DOCBOOKCATALOG} ${JADECATALOG} ${EXTRA_CATALOGS} ${CATALOG_PORTS_SGML}
+SCHEMATRONS?=	${DOC_PREFIX}/share/xml/freebsd.sch
+
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADECATALOG?=	${PREFIX}/share/sgml/jade/catalog
+.else
+JADECATALOG?=	${PREFIX}/share/sgml/openjade/catalog
+.endif
+FREEBSDCATALOG=	${DOC_PREFIX}/share/xml/catalog
+LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
+DSSSLCATALOG=	${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
+.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${JADECATALOG}
 .if exists(${c})
 CATALOGS+=	-c ${c}
 .endif
 .endfor
-XMLFLAGS+=	-D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
-JADEOPTS=	${JADEFLAGS} ${XMLFLAGS} ${CATALOGS}
-XSLTPROCOPTS=	${XSLTPROCFLAGS}
+
+JADEOPTS?=	-ijade.compat -w no-valid ${JADEFLAGS} \
+		-D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} \
+		${CATALOGS}
+XSLTPROCOPTS?=	--nonet
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
-		txt rtf ps pdf tex dvi tar pdb
+		epub txt rtf ps pdf tex dvi tar pdb
 
 CSS_SHEET?=	${DOC_PREFIX}/share/misc/docbook.css
-PDFTEX_DEF?=	${DOC_PREFIX}/share/web2c/pdftex.def
-
-HTMLOPTS?=	-ioutput.html -d ${DSLHTML} ${HTMLFLAGS}
-
-HTMLTXTOPTS?=	-ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS}
 
 PRINTOPTS?=	-ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
 
-.if defined(BOOK_OUTPUT)
-NICE_HEADERS=1
-MIN_SECT_LABELS=1
-TWO_SIDE=1
-JUSTIFY=1
-#WITH_FOOTNOTES=1
-#GEN_INDEX=1
-.endif
-.if defined(JUSTIFY)
-TEX_CMDSEQ+=	\RequirePackage{url}
-PRINTOPTS+=	-ioutput.print.justify
-.endif
-.if defined(TWO_SIDE)
-PRINTOPTS+=	-V %two-side% -ioutput.print.twoside
-TEX_CMDSEQ+=	\def\PageTwoSide{1}
-.endif
-.if defined(NICE_HEADERS)
-PRINTOPTS+=    -ioutput.print.niceheaders
-.endif
-.if defined(MIN_SECT_LABELS)
-PRINTOPTS+=    -V minimal-section-labels
-.endif
-.if defined(TRACE)
-TEX_CMDSEQ+=	\tracingstats=${TRACE}
-.endif
-.if defined(RLE)
-PNMTOPSFLAGS+=	-rle
-.endif
 .if defined(WWWFREEBSDORG)
 HTMLFLAGS+=	-V %html-header-script%
 .endif
-
 .if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE)
 HTMLFLAGS+=	-V %generate-legalnotice-link%
 .endif
@@ -245,63 +142,19 @@ HTMLFLAGS+=	-V %show-all-trademark-symbols%
 PRINTFLAGS+=	-V %show-all-trademark-symbols%
 .endif
 
-PERL?=		/usr/bin/perl
-PKG_CREATE?=	/usr/sbin/pkg_create
-SORT?=		/usr/bin/sort
-TAR?=		/usr/bin/tar
-TOUCH?=		/usr/bin/touch
-XARGS?=		/usr/bin/xargs
-
-GROFF?=		groff
-TIDY_VER!=	${TIDY} -v 2>&1
-.if ${TIDY_VER} == "HTML Tidy for FreeBSD released on 7 December 2008"
-TIDYOPTS?=	-wrap 90 -m -raw --preserve-entities yes -f /dev/null -asxml ${TIDYFLAGS}
-.else
-TIDYOPTS?=	-wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
-.endif
-HTML2TXT?=	${PREFIX}/bin/links
-HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
-HTML2PDB?=	${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
-DVIPS?=		${PREFIX}/bin/dvips
-.if defined(PAPERSIZE)
-DVIPSOPTS?=	-t ${PAPERSIZE:L}
-.endif
-DVIPSOPTS+=	${DVIPSFLAGS}
-
-#
-# Currently, we have to use the FixRTF utility available as textproc/fixrtf
-# to apply several RTF fixups:
-#
-# 1. Embed PNGs into RTF. (Option: -p)
-# 2. Embed FreeBSD-specific information into RTF, such as organization name,
-#    building time. But unfortunately, so far only Microsoft Word can read
-#    them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
-#    this kind of information from RTF created by Microsoft Word and
-#    OpenOffice. (Option: -i)
-# 3. Do some locale-specific fixing. (Option: -e <encoding>)
-# 
-# This is a transitional solution before Jade/OpenJade provides these features.
-#
-FIXRTF?=	${PREFIX}/bin/fixrtf
-FIXRTFOPTS?=	-i -p
-.if defined(SP_ENCODING)
-FIXRTFOPTS+=	-e ${SP_ENCODING}
-.endif
-
-GZIP?=	-9
-GZIP_CMD?=	gzip -qf ${GZIP}
-BZIP2?=	-9
-BZIP2_CMD?=	bzip2 -qf ${BZIP2}
-ZIP?=	-9
-ZIP_CMD?=	${PREFIX}/bin/zip -j ${ZIP}
-
 #
 # Instruction for bsd.subdir.mk to not to process SUBDIR directive.
 # It is not necessary since doc.docbook.mk do it too.
 #
 NO_SUBDIR=      YES
 
+#
+# Index generation
+#
+
+.if defined(GEN_INDEX)
+XSLTPROCOPTS+= --param generate.index "1"
+.endif
 
 # ------------------------------------------------------------------------
 #
@@ -351,6 +204,8 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
 LOCAL_CSS_SHEET= ${CSS_SHEET:T}
 .endif
 
+CLEANFILES+= ${DOC}.parsed.xml ${DOC}.parsed.print.xml
+
 .for _curformat in ${FORMATS}
 _cf=${_curformat}
 
@@ -369,6 +224,10 @@ CLEANFILES+= PLIST.${_curformat}
 CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \
 		HTML.manifest ln*.html
 
+.elif ${_cf} == "epub"
+CLEANFILES+= ${DOC}.epub mimetype
+CLEANDIRS+= META-INF OEBPS
+
 .elif ${_cf} == "html.tar"
 CLEANFILES+= ${DOC}.html
 
@@ -385,17 +244,15 @@ CLEANFILES+= ${DOC}.rtf-nopng
 CLEANFILES+= ${DOC}.aux ${DOC}.log
 
 .elif ${_cf} == "ps"
-CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps ${DOC}.tex ${DOC}.tex-tmp
+CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
+	${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor
 
 .elif ${_cf} == "pdf"
 CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
-		${DOC}.tex
-.for _curimage in ${IMAGES_PDF:M*share*}
-CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
-.endfor
+		${DOC}.tex ${DOC}.fo
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor
@@ -407,10 +264,6 @@ CLEANFILES+= ${.CURDIR:T}.pdb
 .endif
 .endif
 
-.if (${STYLESHEET_TYPE} == "xsl")
-CLEANFILES+= ${DOC}.xml .sxerr
-.endif
-
 .if (${LOCAL_CSS_SHEET} != ${CSS_SHEET}) && \
     (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
      ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
@@ -420,7 +273,6 @@ CLEANFILES+= ${LOCAL_CSS_SHEET}
 .if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) && \
     (${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
      ${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
-CLEANFILES+= LEGALNOTICE.html trademarks.html
 .endif
 
 .endfor		# _curformat in ${FORMATS} #
@@ -438,7 +290,7 @@ CLEANFILES+= LEGALNOTICE.html trademarks.html
 _cf=${_curformat}
 .for _curcomp in ${INSTALL_COMPRESSED}
 
-.if ${_cf} != "html-split" && ${_cf} != "html"
+.if ${_cf} != "html-split" && ${_cf} != "html" && ${_cf} != "epub"
 _curinst+= install-${_curformat}.${_curcomp}
 _docs+= ${DOC}.${_curformat}.${_curcomp}
 CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
@@ -453,28 +305,9 @@ CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp}
 .endfor
 .endif
 
-#
-# Index generation
-#
-
-.if defined(GEN_INDEX) && defined(HAS_INDEX)
-JADEFLAGS+=		-i chap.index
-HTML_SPLIT_INDEX?=	html-split.index
-HTML_INDEX?=		html.index
-PRINT_INDEX?=		print.index
-INDEX_SGML?=		index.xml
-
-CLEANFILES+= 		${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
-
-INIT_INDEX_SGML_CMD?=	${PERL} ${COLLATEINDEX} -i doc-index -N -o ${INDEX_SGML}
-GEN_INDEX_SGML_CMD?=	${PERL} ${COLLATEINDEX} -i doc-index -g -o ${INDEX_SGML} ${.ALLSRC:M*.index}
-.else
-GEN_INDEX_SGML_CMD?=	@${ECHO} "Index is disabled or no index to generate."
-.endif
-
 .MAIN: all
 
-all: ${_docs}
+all: ${SRCS} ${_docs}
 
 # put languages which have a problem on rendering printable formats
 # by using TeX to NO_TEX_LANG.
@@ -500,62 +333,46 @@ NO_RTF=		yes
 .endif
 .endfor
 
-# HTML-SPLIT -------------------------------------------------------------
+.if defined(SCHEMATRONS)
+.for sch in ${SCHEMATRONS}
+schxslts+=	${sch}.xsl
 
-.if ${STYLESHEET_TYPE} == "dsssl"
-index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
-			  ${LOCAL_IMAGES_TXT} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
-	${GEN_INDEX_SGML_CMD}
-	${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \
-		${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC}
-.elif ${STYLESHEET_TYPE} == "xsl"
-index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${sch}.xsl: ${sch}
+	${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
+.endfor
+.endif
+
+# Parsed XML  -------------------------------------------------------
+
+${DOC}.parsed.xml: ${SRCS}
+	${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${.TARGET}.tmp
+.if ${DOC} == "book"
+	${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
+.else
+	${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${.TARGET}.tmp
+.endif
+	@${ECHO} "==> Basic validation"
+	${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
+	${GREP} -v '^<?xml version=.*?>' >> ${.TARGET}.tmp
+.if defined(PROFILING)
+	@${ECHO} "==> Profiling"
+	${XSLTPROC} ${PROFILING} ${XSLPROF} ${.TARGET}.tmp > ${.TARGET}
+	${RM} ${.TARGET}.tmp
+.else
+	${MV} ${.TARGET}.tmp ${.TARGET}
+	${SED} 's|@@URL_RELPREFIX@@|http://www.FreeBSD.org|g' < ${.TARGET} > ${DOC}.parsed.print.xml
+	${SED} -i '' 's|@@URL_RELPREFIX@@|../../../..|g' ${.TARGET}
+.endif
+
+# XHTML -------------------------------------------------------------
+
+index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
 	${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
-	${GEN_INDEX_SGML_CMD}
-	${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTMLCHUNK} \
-		${DOC}.xml
-.endif
-.if !defined(NO_TIDY)
-	${REINPLACE_TABS_CMD} $$(${XARGS} < HTML.manifest)
-	-${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest)
-.endif
+	${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml
 
-# HTML -------------------------------------------------------------------
-
-.if ${STYLESHEET_TYPE} == "dsssl"
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
-	     ${LOCAL_IMAGES_TXT} ${HTML_INDEX} ${LOCAL_CSS_SHEET}
-	${GEN_INDEX_SGML_CMD}
-	${JADE_CMD} -V nochunks ${HTMLOPTS} -ioutput.html.images \
-		${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \
-		(${RM} -f ${.TARGET} && false)
-.elif ${STYLESHEET_TYPE} == "xsl"
-${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
 	${LOCAL_CSS_SHEET}     
-	${GEN_INDEX_SGML_CMD}
-	${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTML} \
-		${DOC}.xml > ${.TARGET}
-.endif
-.if !defined(NO_TIDY)
-	${REINPLACE_TABS_CMD} ${.TARGET}
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-# HTML-TEXT --------------------------------------------------------------
-
-# Special target to produce HTML with no images in it.
-.if ${STYLESHEET_TYPE} == "dsssl"
-${DOC}.html-text: ${SRCS} ${HTML_INDEX} ${LOCAL_IMAGES_TXT}
-	${GEN_INDEX_SGML_CMD}
-	${JADE_CMD} -V nochunks ${HTMLTXTOPTS} \
-		${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \
-		(${RM} -f ${.TARGET} && false)
-.elif ${STYLESHEET_TYPE} == "xsl"
-${DOC}.html-text: ${DOC}.xml ${HTML_INDEX}
-	${GEN_INDEX_SGML_CMD}
-	${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'0'" ${XSLHTML} \
-		${DOC}.xml > ${.TARGET}
-.endif
+	${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET}
 
 ${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \
 		       ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
@@ -573,11 +390,24 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMAGES_LIB} \
 	${TAR} rf ${.TARGET} -C ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} ${_curimage:S|${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}/||}
 .endfor
 
+# EPUB -------------------------------------------------------------
+
+${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+	${CSS_SHEET}
+	${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
+	${ECHO} "application/epub+zip" > mimetype
+	${CP} ${CSS_SHEET} OEBPS/
+.if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
+	${CP} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} OEBPS/
+.endif
+	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype
+	${ZIP} ${ZIPOPTS} -Dr ${DOC}.epub OEBPS META-INF
+
 # TXT --------------------------------------------------------------------
 
 .if !target(${DOC}.txt)
 .if !defined(NO_PLAINTEXT)
-${DOC}.txt: ${DOC}.html-text
+${DOC}.txt: ${DOC}.html
 	${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
 .else
 ${DOC}.txt:
@@ -604,11 +434,11 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
 
 .if !target(${DOC}.rtf)
 .if !defined(NO_RTF)
-${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
+${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
 		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG}
-	${GEN_INDEX_SGML_CMD}
-	${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
-		${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} ${MASTERDOC}
+	${JADE} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
+		${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \
+		${DOC}.parsed.xml
 	${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET}
 .else
 ${DOC}.rtf:
@@ -618,32 +448,16 @@ ${DOC}.rtf:
 
 # PS/PDF -----------------------------------------------------------------
 
+.if ${RENDERENGINE} == "jade"
 .if !defined(NO_TEX)
-#
-# This sucks, but there's no way round it.  The PS and PDF formats need
-# to use different image formats, which are chosen at the .tex stage.  So,
-# we need to create a different .tex file depending on our eventual output
-# format, which will then lead on to a different .dvi file as well.
-#
-
 ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
-		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN}
-	${GEN_INDEX_SGML_CMD}
-	${JADE_CMD} -V tex-backend ${PRINTOPTS} \
-		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${MASTERDOC}
-
-${DOC}.tex-ps: ${DOC}.tex
-	${LN} -f ${.ALLSRC} ${.TARGET}
-
-.if !target(${DOC}.tex-pdf)
-${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \
-		${LOCAL_IMAGES_TXT}
-	${GEN_INDEX_SGML_CMD}
-	${RM} -f ${.TARGET}
-	${CAT} ${PDFTEX_DEF} > ${.TARGET}
-	${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
-		${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${MASTERDOC} >> ${.TARGET}
-.endif
+		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
+		${DOC}.parsed.xml
+	${JADE} -V tex-backend ${PRINTOPTS} \
+		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.print.xml
+	${SED} -i '' -e 's|{1}\\def\\ScaleY%|{0.5}\\def\\ScaleY%|g' \
+		-e 's|{1}\\def\\EntitySystemId%|{0.5}\\def\\EntitySystemId%|g' \
+		${.TARGET}
 
 .if !target(${DOC}.dvi)
 ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
@@ -660,41 +474,35 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
 .endif
 
 .if !target(${DOC}.pdf)
-.if !defined(USE_PS2PDF)
-${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
-.else
 ${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF}
-.endif
-.for _curimage in ${IMAGES_PDF:M*share*}
-	${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-.if !defined(USE_PS2PDF)
-	${PDFJADETEX_PREPROCESS} < ${DOC}.tex-pdf > ${DOC}.tex-pdf-tmp
-	@${ECHO} "==> PDFTeX pass 1/3"
-	-${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}'
-	@${ECHO} "==> PDFTeX pass 2/3"
-	-${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}'
-	@${ECHO} "==> PDFTeX pass 3/3"
-	-${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}'
-.else
 	${PS2PDF} ${DOC}.ps ${.TARGET}
 .endif
-.endif
 
 ${DOC}.ps: ${DOC}.dvi
 	${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC}
 .else
 #  NO_TEX
-${DOC}.tex ${DOC}.tex-ps ${DOC}.dvi ${DOC}.ps:
+${DOC}.tex ${DOC}.dvi ${DOC}.ps:
 	${TOUCH} ${.TARGET}
 .if !target(${DOC}.pdf)
 ${DOC}.pdf:
 	${TOUCH} ${.TARGET}
 .endif
-.if !target(${DOC}.tex-pdf)
-${DOC}.tex-pdf:
-	${TOUCH} ${.TARGET}
 .endif
+
+.elif ${RENDERENGINE} == "fop"
+${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml
+	${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.print.xml > ${.TARGET}
+
+${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
 .endif
 
 ${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
@@ -722,37 +530,33 @@ ${DOC}.${_curformat}:
 # having to convert it to any other formats
 #
 
-lint validate:
-	@${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
-
-# ------------------------------------------------------------------------
 #
-# Index targets
+# XXX: There is duplicated code below. In general, we want to see what
+# is actually run but when validation is executed, it is better to
+# silence the command invocation so that only error messages appear.
 #
 
-#
-# Generate a different .index file based on the format name
-#
-# If we're not generating an index (the default) then we need to create
-# an empty index.xml file so that we can reference index.xml in book.sgml
-#
-
-
-${HTML_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
-	${INIT_INDEX_SGML_CMD}
-	${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \
-		${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null
-
-${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
-	${INIT_INDEX_SGML_CMD}
-	${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \
-		${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null
-
-.if !target(${PRINT_INDEX})
-${PRINT_INDEX}: ${HTML_INDEX}
-	${CP} -p ${HTML_INDEX} ${.TARGET}
-.endif	
-
+lint validate: ${SRCS} ${schxslts}
+	@${GREP} '^<?xml version=.*?>' ${DOC}.xml > ${DOC}.parsed.xml
+.if ${DOC} == "book"
+	@${ECHO_CMD} '<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${DOC}.parsed.xml
+.else
+	@${ECHO_CMD} '<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN" "../../../share/xml/freebsd45.dtd">' >> ${DOC}.parsed.xml
+.endif
+	@${ECHO} "==> Basic validation"
+	@${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \
+	${GREP} -v '^<?xml version=.*?>' >>${DOC}.parsed.xml
+.if defined(schxslts)
+	@${ECHO} "==> Validating with Schematron constraints"
+.for sch in ${schxslts}
+	@( out=`${XSLTPROC} ${sch} ${DOC}.parsed.xml`; \
+	  if [ -n "$${out}" ]; then \
+		echo "$${out}" | ${GREP} -v '^<?xml'; \
+		false; \
+	  fi )
+.endfor
+.endif
+	@${RM} -rf ${CLEANFILES} ${CLEANDIRS} ${DOC}.parsed.xml
 
 # ------------------------------------------------------------------------
 #
@@ -775,13 +579,13 @@ KNOWN_COMPRESS=	gz bz2 zip
 #
 
 _PROG_COMPRESS_gz: .USE
-	${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
+	${GZIP} ${GZIPOPTS} < ${.ALLSRC} > ${.TARGET}
 
 _PROG_COMPRESS_bz2: .USE
-	${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
+	${BZIP2} ${BZIP2OPTS} < ${.ALLSRC} > ${.TARGET}
 
 _PROG_COMPRESS_zip: .USE
-	${ZIP_CMD} ${.TARGET} ${.ALLSRC}
+	${ZIP} ${ZIPOPTS} ${.TARGET} ${.ALLSRC}
 
 #
 # Build a list of targets for each compression scheme and output format.
@@ -862,12 +666,6 @@ spellcheck-${_curformat}:
 
 spellcheck: ${FORMATS:C/^/spellcheck-/}
 
-indexreport:
-.for _entry in ${SRCS:M*.xml}
-	@echo "indexreport ${_entry}"
-	@${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry}
-.endfor
-
 #
 # Build a list of install-format targets to be installed. These will be
 # dependencies for the "realinstall" target.
@@ -907,7 +705,11 @@ install-${_curformat}: ${DOC}.${_curformat}
 .endif
 	@[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
 .if ${_cf} == "html-split"
-	${INSTALL_DOCS} $$(${XARGS} < HTML.manifest) ${DESTDIR}
+.for f in ${_html_docs}
+.if exists(${f})
+	${INSTALL_DOCS} ${f} ${DESTDIR}
+.endif
+.endfor
 .else
 	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
 .endif
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
deleted file mode 100644
index d7559fd1f7..0000000000
--- a/share/mk/doc.html.mk
+++ /dev/null
@@ -1,372 +0,0 @@
-#
-# $FreeBSD$
-#
-# This include file <doc.html.mk> handles building and installing of
-# HTML documentation in the FreeBSD Documentation Project.
-#
-# Documentation using DOCFORMAT=html is expected to be marked up
-# according to the HTML DTD
-#
-
-# ------------------------------------------------------------------------
-#
-# Document-specific variables
-#
-#	DOC		This should be set to the name of the HTML
-#			marked-up file, without the .sgml suffix.
-#			
-#			It also determins the name of the output files -
-#			${DOC}.html.
-#
-#	DOCBOOKSUFFIX	The suffix of your document, defaulting to .sgml
-#
-#	SRCS		The names of all the files that are needed to
-#			build this document - This is useful if any of
-#			them need to be generated.  Changing any file in
-#			SRCS causes the documents to be rebuilt.
-#
-
-# ------------------------------------------------------------------------
-#
-# Variables used by both users and documents:
-#
-#	EXTRA_CATALOGS	Additional catalog files that should be used by
-#			any SGML processing applications.
-#
-# Documents should use the += format to access these.
-#
-
-MASTERDOC?=	${.CURDIR}/${DOC}.sgml
-
-KNOWN_FORMATS=	html txt tar pdb
-
-CSS_SHEET?=
-
-HTMLCATALOG=	${PREFIX}/share/xml/html/catalog
-
-IMAGES_LIB?=
-
-if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-NSGMLS?=	${PREFIX}/bin/nsgmls
-SGMLNORM?=	${PREFIX}/bin/sgmlnorm
-.else
-NSGMLS?=	${PREFIX}/bin/onsgmls
-SGMLNORM?=	${PREFIX}/bin/osgmlnorm
-.endif
- 
-PKG_CREATE?=	/usr/sbin/pkg_create
-TAR?=		/usr/bin/tar
-XARGS?=		/usr/bin/xargs
-
-HTML2PDB?=	${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
-
-GZIP?=	-9
-GZIP_CMD?=	gzip -qf ${GZIP}
-BZIP2?=	-9
-BZIP2_CMD?=	bzip2 -qf ${BZIP2}
-ZIP?=	-9
-ZIP_CMD?=	${PREFIX}/bin/zip -j ${ZIP}
-
-
-# ------------------------------------------------------------------------
-#
-
-.if ${.OBJDIR} != ${.CURDIR}
-LOCAL_CSS_SHEET=	${.OBJDIR}/${CSS_SHEET:T}
-CLEANFILES+=		${LOCAL_CSS_SHEET}
-.else
-LOCAL_CSS_SHEET=	${CSS_SHEET:T}
-.endif
-
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-
-# Create a 'bogus' doc for any format we support or not.  This is so
-# that we can fake up a target for it later on, and this target can print
-# the warning message about the unsupported format. 
-_docs+= ${DOC}.${_curformat}
-CLEANFILES+= ${DOC}.${_curformat}
-CLEANFILES+= PLIST.${_curformat}
-
-.if ${_cf} == "txt"
-.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
-CLEANFILES+= ${LOCAL_CSS_SHEET}
-.endif
-
-.elif ${_cf} == "txt"
-CLEANFILES+= ${DOC}.html
-
-.elif ${_cf} == "pdb"
-_docs+= ${.CURDIR:T}.pdb
-CLEANFILES+= ${.CURDIR:T}.pdb
-
-.endif
-.endfor
-
-#
-# Build a list of install-${format}.${compress_format} targets to be
-# by "make install". Also, add ${DOC}.${format}.${compress_format} to
-# ${_docs} and ${CLEANFILES} so they get built/cleaned by "all" and
-# "clean".
-#
-
-.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-.for _curcomp in ${INSTALL_COMPRESSED}
-
-.if ${_cf} != "html-split"
-_curinst+= install-${_curformat}.${_curcomp}
-_docs+= ${DOC}.${_curformat}.${_curcomp}
-CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
-
-.if  ${_cf} == "pdb"
-_docs+= ${.CURDIR:T}.${_curformat}.${_curcomp}
-CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp}
-
-.endif
-.endif
-.endfor
-.endfor
-.endif
-
-.MAIN: all
-
-all: ${_docs}
-
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
-	${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET}
-
-${DOC}.txt: ${DOC}.html
-	${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
-
-${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET}
-
-${.CURDIR:T}.pdb: ${DOC}.pdb
-	${LN} -f ${.ALLSRC} ${.TARGET}
-
-.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
-.for _curcomp in ${INSTALL_COMPRESSED}
-${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
-	${LN} -f ${.ALLSRC} ${.TARGET}
-.endfor
-.endif
-
-${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
-	${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \
-		-C ${.OBJDIR} ${IMAGES} ${CSS_SHEET:T}
-
-#
-# Build targets for any formats we've missed that we don't handle.
-#
-.for _curformat in ${ALL_FORMATS}
-.if !target(${DOC}.${_curformat})
-${DOC}.${_curformat}:
-	@${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-.endif
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Validation targets
-#
-
-#
-# Lets you quickly check that the document conforms to the DTD without
-# having to convert it to any other formats
-#
-
-lint validate:
-	${NSGMLS} -s -c ${HTMLCATALOG} ${MASTERDOC}
-
-
-# ------------------------------------------------------------------------
-#
-# Compress targets
-#
-
-#
-# The list of compression extensions this Makefile knows about. If you
-# add new compression schemes, add to this list (which is a list of
-# extensions, hence bz2, *not* bzip2) and extend the _PROG_COMPRESS_*
-# targets.
-#
-
-KNOWN_COMPRESS=	gz bz2 zip
-
-#
-# You can't build suffix rules to do compression, since you can't
-# wildcard the source suffix. So these are defined .USE, to be tacked on
-# as dependencies of the compress-* targets.
-#
-
-_PROG_COMPRESS_gz: .USE
-	${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
-
-_PROG_COMPRESS_bz2: .USE
-	${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
-
-_PROG_COMPRESS_zip: .USE
-	${ZIP_CMD} ${.TARGET} ${.ALLSRC}
-
-#
-# Build a list of targets for each compression scheme and output format.
-# Don't compress the html-split output format.
-#
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-.for _curcompress in ${KNOWN_COMPRESS}
-${DOC}.${_cf}.${_curcompress}: ${DOC}.${_cf} _PROG_COMPRESS_${_curcompress}
-.endfor
-.endfor
-
-#
-# Build targets for any formats we've missed that we don't handle.
-#
-.for _curformat in ${ALL_FORMATS}
-.for _curcompress in ${KNOWN_COMPRESS}
-.if !target(${DOC}.${_curformat}.${_curcompress})
-${DOC}.${_curformat}.${_curcompress}:
-	@${ECHO_CMD} \"${_curformat}.${_curcompress}\" is not a valid output format for this document.
-.endif
-.endfor
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Install targets
-#
-# Build install-* targets, one per allowed value in FORMATS.
-#
-# "beforeinstall" and "afterinstall" are hooks in to this process.
-# Redefine them to do things before and after the files are installed,
-# respectively.
-
-#
-# Build a list of install-format targets to be installed. These will be
-# dependencies for the "realinstall" target.
-#
-
-.if !defined(INSTALL_ONLY_COMPRESSED) || empty(INSTALL_ONLY_COMPRESSED)
-_curinst+= ${FORMATS:S/^/install-/g}
-.endif
-
-realinstall: ${_curinst}
-
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-.if !target(install-${_cf})
-install-${_curformat}: ${DOC}.${_curformat}
-	@[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
-	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
-.if !empty(CSS_SHEET)
-	${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}
-.endif
-.for _curimage in ${IMAGES_LIB}
-	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] || \
-		${MKDIR} -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
-	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
-			${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
-.endfor
-# Install the images.  First, loop over all the image names that contain a
-# directory separator, make the subdirectories, and install.  Then loop over
-# the ones that don't contain a directory separator, and install them in the
-# top level.
-.for _curimage in ${IMAGES_PNG:M*/*:M*share*}
-	${MKDIR} -p ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-	${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-.for _curimage in ${IMAGES_PNG:N*/*}
-	${INSTALL_DOCS} ${.CURDIR}/${_curimage} ${DESTDIR}
-.endfor
-.if ${_cf} == "pdb"
-	${LN} -f ${DESTDIR}/${.ALLSRC} ${DESTDIR}/${.CURDIR:T}.${_curformat}
-.endif
-
-.for _compressext in ${KNOWN_COMPRESS}
-install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}
-	@[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
-	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
-.endfor
-.endif
-.endfor
-
-#
-# Build install- targets for any formats we've missed that we don't handle.
-#
-
-.for _curformat in ${ALL_FORMATS}
-.if !target(install-${_curformat})
-install-${_curformat}:
-	@${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-
-.for _compressext in ${KNOWN_COMPRESS}
-install-${_curformat}.${_compressext}:
-	@${ECHO_CMD} \"${_curformat}.${_compressext}\" is not a valid output format for this document.
-.endfor
-.endif
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Package building
-#
-
-#
-# realpackage is what is called in each subdirectory when a package
-# target is called, or, rather, package calls realpackage in each
-# subdirectory as it goes.
-#
-# packagelist returns the list of targets that would be called during
-# package building.
-#
-
-realpackage: ${FORMATS:S/^/package-/}
-packagelist:
-	@${ECHO_CMD} ${FORMATS:S/^/package-/}
-
-#
-# Build a list of package targets for each output target.  Each package
-# target depends on the corresponding install target running.
-#
-
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-PLIST.${_curformat}: ${DOC}.${_curformat}
-	@${ECHO_CMD} ${DOC}.${_curformat} > PLIST.${_curformat}
-.if ${_cf} == "html" && \
-    (!empty(LOCAL_IMAGES_LIB) || !empty(IMAGES_PNG) || !empty(CSS_SHEET))
-	@${ECHO_CMD} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${CSS_SHEET} | \
-		${XARGS} -n1 >> PLIST.${_curformat}
-.elif ${_cf} == "pdb"
-	@${ECHO_CMD} ${.CURDIR:T}.${_curformat} >> PLIST.${_curformat}
-.endif
-
-${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz: PLIST.${_curformat}
-	@${PKG_CREATE} -v -f PLIST.${_curformat} -p ${DESTDIR} -s ${.OBJDIR} \
-		-c -"FDP ${.CURDIR:T} ${_curformat} package" \
-		-d -"FDP ${.CURDIR:T} ${_curformat} package" ${.TARGET}
-
-package-${_curformat}: ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz
-.endfor
-
-#
-# Build install- targets for any formats we've missed that we don't handle.
-#
-
-.for _curformat in ${ALL_FORMATS}
-.if !target(package-${_curformat})
-package-${_curformat}:
-	@${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-.endif
-.endfor
-
-.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
-${LOCAL_CSS_SHEET}: ${CSS_SHEET}
-	${CP} -p ${.ALLSRC} ${.TARGET}
-.endif
diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk
index 7c3386dfa1..0066d6d3d3 100644
--- a/share/mk/doc.images.mk
+++ b/share/mk/doc.images.mk
@@ -71,33 +71,20 @@ _IMAGES_TXT+= ${LOCAL_IMAGES_EN:M*.txt}
 _IMAGES_PIC= ${IMAGES:M*.pic}
 _IMAGES_PIC+= ${LOCAL_IMAGES_EN:M*.pic}
 
-IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/}
-IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/}
-IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/}
-IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/}
-IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/}
-IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/}
-IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/}
-IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/}
-IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/}
-IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/}
-IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF}
+IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/} ${_IMAGES_SCR:S/.scr$/.png/} ${_IMAGES_PIC:S/.pic$/.png/}
+IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/} ${_IMAGES_SCR:S/.scr$/.eps/} ${_IMAGES_PIC:S/.pic$/.eps/}
 
-CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF}
-CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT}
-CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/}
+CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS}
 
-IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
-IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
-IMAGES_TXT= ${_IMAGES_TXT} ${IMAGES_SCR_TXT}
+IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG}
+IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS}
 
 LOCAL_IMAGES= ${IMAGES}
 LOCAL_IMAGES_PNG= ${_IMAGES_PNG}
 LOCAL_IMAGES_EPS= ${_IMAGES_EPS}
 LOCAL_IMAGES_TXT= ${_IMAGES_TXT}
-LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG}
-LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS}
-LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT}
+LOCAL_IMAGES_PNG+= ${IMAGES_GEN_PNG}
+LOCAL_IMAGES_EPS+= ${IMAGES_GEN_EPS}
 
 # The default resolution eps2png (82) assumes a 640x480 monitor, and is too
 # low for the typical monitor in use today. The resolution of 100 looks
@@ -105,46 +92,6 @@ LOCAL_IMAGES_TXT+= ${IMAGES_SCR_TXT}
 # a 640x480 monitor.
 EPS2PNM_RES?=	100
 
-# We need to list ${_IMAGES_PNG} here since the images might be in a
-# shared image directory.
-IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
-
-SCR2PNG?=	${PREFIX}/bin/scr2png
-SCR2PNGOPTS?=	${SCR2PNGFLAGS}
-SCR2TXT?=	${PREFIX}/bin/scr2txt
-SCR2TXTOPTS?=	-l ${SCR2TXTFLAGS}
-SED?=		/usr/bin/sed
-EPS2PNM?=	${PREFIX}/bin/gs
-EPS2PNMOPTS?=	-q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
-		-dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
-		-dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
-#
-# epsgeom is a perl script for 1) extracting geometry information
-# from a .eps file and 2) arrange it for ghostscript's pnm driver.
-#
-EPSGEOM?=	${PERL} ${DOC_PREFIX}/share/misc/epsgeom
-EPSGEOMOPTS?=	${EPS2PNM_RES} ${EPS2PNM_RES}
-PNMTOPNG?=	${PREFIX}/bin/pnmtopng
-PNMTOPNGOPTS?=	${PNGTOPNGFLAGS}
-PNGTOPNM?=	${PREFIX}/bin/pngtopnm
-PNGTOPNMOPTS?=	${PNGTOPNMFLAGS}
-PPMTOPGM?=	${PREFIX}/bin/ppmtopgm
-PPMTOPGMOPTS?=	${PPMTOPGMFLAGS}
-PNMTOPS?=	${PREFIX}/bin/pnmtops
-PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
-EPSTOPDF?=	${PREFIX}/bin/epstopdf
-EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
-#
-PIC2PS?=	${GROFF} -p -S -Wall -mtty-char -man
-#
-PS2EPS?=	${PREFIX}/bin/gs
-PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
-		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
-		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
-PS2BBOX?=	${PREFIX}/bin/gs
-PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
-		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
-		-sOutputFile=/dev/null ${PS2BBOXFLAGS}
 #
 # Use suffix rules to convert .scr files to other formats
 .SUFFIXES:	.scr .pic .png .ps .eps .txt
@@ -214,25 +161,20 @@ PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
 # vice versa, leading to a loop in the dependency graph.  Instead, build
 # the targets on the fly.
 
-.for _curimage in ${IMAGES_GEN_PNG}
-${_curimage}: ${_curimage:S/.png$/.eps/}
+.for _curimage in ${_IMAGES_EPS:S/.eps$/.png/}
+${_curimage}: ${_curimage:S/.png/.eps/}
 	${EPSGEOM} -offset ${EPSGEOMOPTS} ${.ALLSRC} \
 		| ${EPS2PNM} ${EPS2PNMOPTS} \
 		-g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.ALLSRC}` - \
 		| ${PNMTOPNG} > ${.TARGET}
 .endfor
 
-.for _curimage in ${IMAGES_GEN_EPS}
+.for _curimage in ${_IMAGES_PNG:S/.png$/.eps/}
 ${_curimage}: ${_curimage:S/.eps$/.png/}
 	${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \
 		${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET}
 .endfor
 
-.for _curimage in ${IMAGES_GEN_PDF}
-${_curimage}: ${_curimage:S/.pdf$/.eps/}
-	${EPSTOPDF} ${EPSTOPDFOPTS} --outfile=${.TARGET} ${.ALLSRC}
-.endfor
-
 .if ${.OBJDIR} != ${.CURDIR}
 .for _curimage in ${IMAGES}
 ${.OBJDIR}/${_curimage}: ${_curimage}
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk
index 502055c820..244195bcbc 100644
--- a/share/mk/doc.project.mk
+++ b/share/mk/doc.project.mk
@@ -66,62 +66,13 @@ MAINTAINER?=	doc@FreeBSD.org
 # formats
 ALL_FORMATS=	html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
 
+.include "doc.commands.mk"
+
 # User-modifiable
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 PRI_LANG?=	en_US.ISO8859-1
 
-CP?=		/bin/cp
-CAT?=		/bin/cat
-ECHO_CMD?=	echo
-LN?=		/bin/ln
-MKDIR?=		/bin/mkdir
-RM?=		/bin/rm
-MV?=		/bin/mv
-HTML2TXT?=	${PREFIX}/bin/links
-HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
-ISPELL?=	ispell
-ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-.if exists(/usr/bin/perl)
-PERL?=		/usr/bin/perl
-.elif exists(/usr/local/bin/perl)
-PERL?=		/usr/local/bin/perl
-.else
-PERL?=		perl
-.endif
-REALPATH?=	/bin/realpath
-SETENV?=	/usr/bin/env
-XSLTPROC?=	${PREFIX}/bin/xsltproc
-TIDY?=		${PREFIX}/bin/tidy
-XMLLINT?=	${PREFIX}/bin/xmllint
-#
-# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
-# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
-# due to incompatibility of the format file.  Since the teTeX 3.0
-# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
-# it is checked here to determine which TeX engine should be used.
-.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
-TEX_CMD?=	${PREFIX}/bin/etex
-PDFTEX_CMD?=	${PREFIX}/bin/pdfetex
-.else
-TEX_CMD?=	${PREFIX}/bin/tex
-PDFTEX_CMD?=	${PREFIX}/bin/pdftex
-.endif
-LATEX_CMD?=	${PREFIX}/bin/latex
-.if exists(${PREFIX}/share/texmf-dist/README)
-JADETEX_CMD?=	${PDFTEX_CMD} "&jadetex"
-.else
-JADETEX_CMD?=	${TEX_CMD} "&jadetex"
-.endif
-JADETEX_PREPROCESS?=	/bin/cat
-PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
-PDFJADETEX_PREPROCESS?=	/bin/cat
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-FOP_CMD?=	${PREFIX}/share/fop/fop.sh
-XEP_CMD?=	sh ${HOME}/XEP/xep.sh
-JAVA_CMD?=	${PREFIX}/bin/javavm
-SAXON_CMD?=	${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
-
 # Image processing (contains code used by the doc.<format>.mk files, so must
 # be listed first).
 .include "doc.images.mk"
@@ -149,9 +100,6 @@ DOC_LOCAL_MK=	${DOC_PREFIX}/${LANGCODE}/share/mk/doc.local.mk
 .if ${DOCFORMAT} == "slides"
 .include "doc.slides.mk"
 .endif
-.if ${DOCFORMAT} == "html"
-.include "doc.html.mk"
-.endif
 .endif
 
 # Subdirectory glue.
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index a749ae9b93..67a79a64a9 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -6,6 +6,9 @@ XML_CATALOG_FILES=	file://${.OBJDIR}/catalog-cwd.xml \
 			file://${DOC_PREFIX}/share/xml/catalog.xml \
 			file://${DOC_PREFIX}/share/xml/catalog-common.xml \
 			file://${LOCALBASE}/share/xml/catalog
+.if defined(EXTRA_CATALOGS)
+XML_CATALOG_FILES+=	${EXTRA_CATALOGS}
+.endif
 
 .if exists(${DOC_PREFIX}/share/xml/catalog-cwd.xml)
 XML_CATALOG_CWD=	${DOC_PREFIX}/share/xml/catalog-cwd.xml
@@ -273,26 +276,17 @@ XML_NOTICES=		${DOC_PREFIX}/share/xml/notices.xml
 #   The ${TARGET.<id>} file will not be listed in $DATA if defined.
 #   NO_DATA.DEFAULT is the setting for all <id>s.
 #
-XSLTPROC_ENV+=	SGML_CATALOG_FILES=
 XSLTPROC_ENV+=	XML_CATALOG_FILES="${XML_CATALOG_FILES}"
 
 XSLTPROCOPTS=	${XSLTPROCFLAGS}
-XSLTPROCOPTS+=	--xinclude
-XSLTPROCOPTS+=	--stringparam LOCALBASE ${LOCALBASE}
-XSLTPROCOPTS+=	--stringparam DOC_PREFIX ${DOC_PREFIX}
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+=	--nonet --catalogs
-.endif
+XSLTPROCOPTS+=	--xinclude --nonet
 .if defined(WWWFREEBSDORG)
 XSLTPROCOPTS+=	--param "html.header.script.google" "'INCLUDE'"
 .endif
 XSLTPROC=	env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
 
 XMLLINTOPTS=	${XMLLINTFLAGS}
-XMLLINTOPTS+=	--xinclude --valid --noout
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+=	--nonet --catalogs
-.endif
+XMLLINTOPTS+=	--xinclude --valid --noout --nonet
 XMLLINT=	env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
 
 .for D in ${XMLDOCS}
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index bb4cde735d..2f6e5eff9f 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -11,6 +11,8 @@
 # clean -- remove anything generated by processing
 #
 
+.include "doc.commands.mk"
+
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
@@ -38,52 +40,12 @@ CGIGRP?=	www
 .endif
 CGIMODE?=	775
 
-BUNZIP2?=	/usr/bin/bunzip2
-CP?=		/bin/cp
-CVS?=		/usr/bin/cvs
-ECHO_CMD?=	echo
-FETCH?=		/usr/bin/fetch
-FIND?=		/usr/bin/find
-SETENV?=	/usr/bin/env
-LN?=		/bin/ln
-MKDIR?=		/bin/mkdir
-MV?=		/bin/mv
-PERL?=		/usr/bin/perl5
-.if !exists(${PERL}) && exists(/usr/local/bin/perl5)
-PERL=		/usr/local/bin/perl5
-.endif
-RM?=		/bin/rm
-SED?=		/usr/bin/sed
-SH?=		/bin/sh
-SORT?=		/usr/bin/sort
-TOUCH?=		/usr/bin/touch
-TRUE?=		/usr/bin/true
-
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 
-.if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-SGMLNORM?=	${PREFIX}/bin/sgmlnorm
-.else
-SGMLNORM?=	${PREFIX}/bin/osgmlnorm
-.endif
-SGMLNORMOPTS?=	-d ${SGMLNORMFLAGS} ${CATALOG:S,^,-c ,} -D ${.CURDIR}
-
-XSLTPROC?=	${PREFIX}/bin/xsltproc
 XSLTPROCOPTS?=	${XSLTPROCFLAGS}
-
-XMLLINT?=	${PREFIX}/bin/xmllint
 XMLLINTOPTS?=	${XMLLINTFLAGS}
 
-HTML2TXT?=	${PREFIX}/bin/w3m
-HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
-ISPELL?=	ispell
-ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-
-.if defined(WWWFREEBSDORG)
-SGMLNORMOPTS+=	-i html.header.script.google
-.endif
-
 WEBCHECK?=	${PREFIX}/bin/webcheck
 WEBCHECKOPTS?=	-ab ${WEBCHECKFLAGS}
 WEBCHECKDIR?=	/webcheck
@@ -134,32 +96,6 @@ NO_SUBDIR=	YES
 .include "${DOC_PREFIX}/share/mk/doc.common.mk"
 .include "${DOC_PREFIX}/share/mk/doc.xml.mk"
 
-_INCLIST=	navibar.ent \
-		navibar.l10n.ent \
-		common.ent \
-		header.ent \
-		header.l10n.ent \
-		iso8879.ent \
-		l10n.ent \
-		release.ent
-_SGML_INCLUDES=	${SGML_INCLUDES}
-
-.for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
-.endif
-.if exists(${DOC_PREFIX}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/share/xml/${F}
-.endif
-.endfor
-
-CATALOG?=	${PREFIX}/share/xml/html/catalog \
-		${PREFIX}/share/xml/catalog
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/catalog)
-CATALOG+=	${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-.endif
-CATALOG+=	${DOC_PREFIX}/share/xml/catalog
-
 ##################################################################
 # Transformation rules
 
diff --git a/share/pgpkeys/decke.key b/share/pgpkeys/decke.key
index 298ce6adb8..d47cdde113 100644
--- a/share/pgpkeys/decke.key
+++ b/share/pgpkeys/decke.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh decke CF5840D4;
diff --git a/share/pgpkeys/pgj.key b/share/pgpkeys/pgj.key
index 02f88b19b7..bdda6e7006 100644
--- a/share/pgpkeys/pgj.key
+++ b/share/pgpkeys/pgj.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 sh ./addkey.sh pgj 9E3F9BE6;
diff --git a/share/pgpkeys/rene.key b/share/pgpkeys/rene.key
index e5fb80f20b..3ef8f5f691 100644
--- a/share/pgpkeys/rene.key
+++ b/share/pgpkeys/rene.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 sh ./addkey.sh rene 0A3789B7;
diff --git a/share/pgpkeys/scop.key b/share/pgpkeys/scop.key
index d50d58850a..11d170aa5f 100644
--- a/share/pgpkeys/scop.key
+++ b/share/pgpkeys/scop.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh scop BCD241CB;
diff --git a/share/pgpkeys/thomas.key b/share/pgpkeys/thomas.key
index 80b9aa9ebb..ca80563a51 100644
--- a/share/pgpkeys/thomas.key
+++ b/share/pgpkeys/thomas.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh thomas 393D2469;
diff --git a/share/xml/bibliography.xml b/share/xml/bibliography.xml
index d8d9e6c45f..140202702a 100644
--- a/share/xml/bibliography.xml
+++ b/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   $FreeBSD$
 -->
diff --git a/share/xml/catalog b/share/xml/catalog
index a88f2bd23e..f01953c0cf 100644
--- a/share/xml/catalog
+++ b/share/xml/catalog
@@ -4,15 +4,8 @@
   -- $FreeBSD$
   --
 
-  -- ...................................................................... --
-  -- Language neutral ..................................................... --
-
-  -- These identifiers are shared across all translations of the FreeBSD
-     documentation, even though the listed language is "EN"
-  --
-
-PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"freebsd42.dtd"
+PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"freebsd45.dtd"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
@@ -20,12 +13,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
 	"freebsd.dsl"
 
-PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Stylesheet//EN"
-	"freebsd-html.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Lanugage Neutral Stylesheet//EN"
-	"freebsd-html.dsl"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Stylesheet//EN"
 	"freebsd-print.dsl"
 
@@ -37,89 +24,3 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
 	"freebsd-common.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
-	"entities.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"man-refs.ent"
-
-PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
-	"freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
-	"urls.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN"
-       "html401-freebsd.dtd"
-
-PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN"
-       "iso8879.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-       "common.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-       "developers.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-       "release.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
-       "header.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
-       "navibar.ent"
-
-  -- ...................................................................... --
-  -- English specific ..................................................... --
-
-  -- These identifiers should only be used by English language versions of
-     the FreeBSD Documentation.
-
-     All other translations should base their FPIs on these, but change the
-     final parameter in the FPI to represent the target language, as
-     appropriate.  Do not change the rest of the FPI
-  --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/authors.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
-	"../../en_US.ISO8859-1/share/xml/glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/mailing-lists.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
-        "../../en_US.ISO8859-1/share/xml/newsgroups.ent"
diff --git a/share/xml/catalog.xml b/share/xml/catalog.xml
index 7dd342c033..7b14607ae2 100644
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@@ -15,8 +15,8 @@
               rewritePrefix="../../"/>
 
   <public
-	publicId="-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	uri="freebsd42.dtd"/>
+	publicId="-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	uri="freebsd45.dtd"/>
 
 <!--
   <public
@@ -37,7 +37,7 @@
         uri="common.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        uri="l10n.ent" />
+        uri="l10n-common.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
@@ -65,6 +65,9 @@
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
         uri="multimedia.dtd"/>
+  <public
+        publicId="-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+        uri="mirrors.dtd" />
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
         uri="events.dtd" />
@@ -77,4 +80,32 @@
   <public
 publicId="-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 uri="xhtml10-freebsd.dtd" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	uri="man-refs.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	uri="freebsd.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	uri="trademarks.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	uri="urls.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	uri="authors.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/teams.ent"/>
+
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/>
 </catalog>
diff --git a/share/xml/entities.ent b/share/xml/entities.ent
deleted file mode 100644
index e02fd438f9..0000000000
--- a/share/xml/entities.ent
+++ /dev/null
@@ -1,22 +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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
diff --git a/share/xml/freebsd-common.dsl b/share/xml/freebsd-common.dsl
index 7a98397c4e..b3ef17e96f 100644
--- a/share/xml/freebsd-common.dsl
+++ b/share/xml/freebsd-common.dsl
@@ -1,14 +1,6 @@
 <!-- $FreeBSD$ -->
 
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
-]>
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN">
 
 <style-sheet>
   <style-specification>
@@ -153,9 +145,7 @@
 
       (element errorname
         (make sequence
-          <![ %output.html;  [ (literal "&#8220;") ]]>
           ($mono-seq$ (process-children))
-          <![ %output.html;  [ (literal "&#8221;") ]]>
           ))
 
       <!-- John Fieber's 'instant' translation specification had
diff --git a/share/xml/freebsd-html.dsl b/share/xml/freebsd-html.dsl
deleted file mode 100644
index c10a01047b..0000000000
--- a/share/xml/freebsd-html.dsl
+++ /dev/null
@@ -1,410 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % output.html		"IGNORE">
-<!ENTITY % output.html.images 	"IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
-]>
-
-<style-sheet>
-  <style-specification>
-    <style-specification-body>
-
-      (declare-flow-object-class formatting-instruction
-        "UNREGISTERED::James Clark//Flow Object Class::formatting-instruction")
-
-      <!-- HTML only .................................................... -->
-
-      <![ %output.html; [
-        <!-- Configure the stylesheet using documented variables -->
-
-        (define %hyphenation% #f)        <!-- Silence a warning -->
-
-	<!--
-	  Redefine $user-html-header$ to put </script> in a single line.
-	  This is an ugly hack but it should work.
-	-->
-	(define ($user-html-header$ #!optional
-	                            (home (empty-node-list))
-	                            (up (empty-node-list))
-	                            (prev (empty-node-list))
-	                            (next (empty-node-list)))
-	  ;; Add additional header tags.
-	  (let loop ((tl %html-header-tags%))
-	    (if (or (null? tl) (null? (car tl)))
-	      (empty-sosofo)
-	      (make sequence
-		(cond
-		  ((equal? (normalize "SCRIPT") (car (car tl)))
-		    (make sequence
-		      (make empty-element gi: (car (car tl))
-		                          attributes: (cdr (car tl)))
-		      (htmlnewline)
-		      (make formatting-instruction data: "</")
-		      (make formatting-instruction data: "SCRIPT>")))
-		  (else
-		    (make sequence
-		      (make empty-element gi: (car (car tl))
-					  attributes: (cdr (car tl))))))
-		(loop (cdr tl))))))
-
-        <!-- Use javascript for google analytics -->
-        (define %html-header-script-googlejs%
-		"http://www.FreeBSD.org/layout/js/google.js")
-        (define %html-header-script%
-		#f)
-
-        (define %html-header-tags%
-	  (list (quote ("META"
-			("HTTP-EQUIV" "Content-Type")
-			("CONTENT" "text/html; charset=&doc.html.charset;")))
-		(if %html-header-script%
-		    (list "SCRIPT"
-			  (list "TYPE" "text/javascript")
-			  (list "SRC" %html-header-script-googlejs%))
-		    '())))
-
-        (define %gentext-nav-use-tables%
-          ;; Use tables to build the navigation headers and footers?
-          #t)
-
-        (define %html-ext%
-          ;; Default extension for HTML output files
-          ".html")
-
-        (define %shade-verbatim%
-          ;; Should verbatim environments be shaded?
-          #f)
-
-        (define %use-id-as-filename%
-          ;; Use ID attributes as name for component HTML files?
-          #t)
-
-        (define %root-filename%
-          ;; Name for the root HTML document
-          "index")
-
-        (define html-manifest
-          ;; Write a manifest?
-          #f)
-
-        (define %generate-legalnotice-link%
-          ;; Should legal notices be a link to a separate file?
-          ;;
-          ;; Naturally, this has no effect if you're building one big
-          ;; HTML file.
-          #f)
-
-        (define %generate-docformat-navi-link%
-          ;; Create docformat navi link for HTML output?
-          #f)
-
-;; Taken from Norm's stylesheets; modified to add support for TITLE so
-;; that we get a mouse over definition for acronyms in HTML output.
-
-	(define ($acronym-seq$ #!optional (sosofo (process-children)))
-	  (let* ((acronym-remark (select-elements
-				  (children (current-node))
-				  (normalize "remark"))))
-	    (let* ((title (if (and acronym-remark
-				   (equal? (attribute-string (normalize "role") acronym-remark) "acronym"))
-			      (data acronym-remark)
-			      "")))
-	      (make element gi: "ACRONYM"
-		    attributes: (list
-				 (list "CLASS" (gi))
-				 (list "TITLE" title))
-		    sosofo))))
-
-        (define (book-titlepage-recto-elements)
-          (list (normalize "title")
-                (normalize "subtitle")
-                (normalize "graphic")
-                (normalize "mediaobject")
-                (normalize "corpauthor")
-                (normalize "authorgroup")
-                (normalize "author")
-                (normalize "editor")
-                (normalize "copyright")
-                (normalize "abstract")
-                (normalize "legalnotice")
-                (normalize "isbn")))
-
-        ;; Create a simple navigation link
-        ;; if %generate-docformat-navi-link% defined.
-        (define (make-docformat-navi tlist)
-          (let ((rootgi (gi (sgml-root-element))))
-            (make element gi: "DIV"
-                  attributes: '(("CLASS" "DOCFORAMTNAVI"))
-                  (literal "[ ")
-                  (make-docformat-navi-link rootgi tlist)
-                  (literal " ]"))))
-
-        (define (make-docformat-navi-link rootgi tlist)
-          (make sequence
-            (cond
-             ((null? tlist)               (empty-sosofo))
-             ((null? (car tlist))         (empty-sosofo))
-             ((not (symbol? (car tlist))) (empty-sosofo))
-             ((equal? (car tlist) 'html-split)
-              (make sequence
-                (create-link (list (list "href" "./index.html"))
-                             (literal "&docnavi.split-html;"))
-                (if (not (null? (cdr tlist)))
-                    (make sequence
-                      (literal " / ")
-                      (make-docformat-navi-link rootgi (cdr tlist)))
-                    (empty-sosofo))))
-             ((equal? (car tlist) 'html-single)
-              (make sequence
-                (create-link (list (list "href"
-                                         (string-append "./" (case-fold-down rootgi) ".html")))
-                             (literal "&docnavi.single-html;"))
-                (if (not (null? (cdr tlist)))
-                    (make sequence
-                      (literal " / ")
-                      (make-docformat-navi-link rootgi (cdr tlist)))
-                    (empty-sosofo))))
-             (else (empty-sosofo)))))
-
-        (define (article-titlepage-separator side)
-          (make sequence
-            (if %generate-docformat-navi-link%
-                (make-docformat-navi '(html-split html-single))
-                (empty-sosofo))
-            (make empty-element gi: "HR")))
-
-        (define (book-titlepage-separator side)
-          (if (equal? side 'recto)
-              (make sequence
-                (if %generate-docformat-navi-link%
-                    (make-docformat-navi '(html-split html-single))
-                    (empty-sosofo))
-                (make empty-element gi: "HR"))
-              (empty-sosofo)))
-
-        <!-- This is the text to display at the bottom of each page.
-             Defaults to nothing.  The individual stylesheets should
-             redefine this as necessary. -->
-        (define ($email-footer$)
-          (empty-sosofo))
-
-	(define html-index-filename
-	  (if nochunks
-	    "html.index"
-	    "html-split.index"))
-
-	(define %stylesheet%
-	  "docbook.css")
-
-        <!-- This code handles displaying $email-footer$ at the bottom
-             of each page.
-
-             If "nochunks" is turned on then we make sure that an <hr>
-             is shown first.
-
-             Then create a centered paragraph ("<p>"), and reduce the font
-             size ("<small>").  Then run $email-footer$, which should
-             create the text and links as necessary. -->
-	(define ($html-body-end$)
-          (if (equal? $email-footer$ (normalize ""))
-            (empty-sosofo)
-            (make sequence
-              (if nochunks
-                  (make empty-element gi: "hr")
-                  (empty-sosofo))
-              ($email-footer$))))
-
-        (define %refentry-xref-link%
-          ;; REFENTRY refentry-xref-link
-          ;; PURP Generate URL links when cross-referencing RefEntrys?
-          ;; DESC
-          ;; If true, a web link will be generated, presumably
-          ;; to an online man->HTML gateway.  The text of the link is
-          ;; generated by the $create-refentry-xref-link$ function.
-          ;; /DESC
-          ;; AUTHOR N/A
-          ;; /REFENTRY
-          #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "amp;" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "amp;" "manpath=FreeBSD+9-current"))
-              (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.7.0"))
-              (("xorg")    (string-append u "&" "amp;" "manpath=X11R7.4"))
-              (("netbsd")  (string-append u "&" "amp;" "manpath=NetBSD+5.1"))
-              (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.7"))
-              (("ports")   (string-append u "&" "amp;" "manpath=FreeBSD+8.2-RELEASE+and+Ports"))
-              (else u))))
-
-	<!-- Specify how to generate the link HREF to SVN revision commit page -->
-	<!-- http://svnweb.freebsd.org/base?view=revision&revision=222741 -->
-	(element svnref
-	      (let ((svnurl	(string-append
-	          "http://svnweb.freebsd.org/base?view=revision" "&" "amp;" "revision="
-		       (data (current-node)))))
-		(create-link (list (list "HREF" svnurl)) ($mono-seq$))))
-
-        (element application ($bold-seq$))
-
-        (element citerefentry
-          (let ((href          ($create-refentry-xref-link$)))
-            (if %refentry-xref-link%
-              (create-link (list (list "HREF" href))
-                (if %refentry-xref-italic%
-                  ($italic-seq$)
-                  ($charseq$)))
-              (if %refentry-xref-italic%
-                ($italic-seq$)
-                ($charseq$)))))
-
-	(element filename
-	  (let*	((class		(attribute-string (normalize "role"))))
-	    (cond
-	     ((equal? class "package")
-	      (let* ((urlurl	"http://svnweb.FreeBSD.org/")
-		     (href	(string-append urlurl "ports/head/"
-					       (data (current-node))
-					       "/pkg-descr?revision=HEAD")))
-		(create-link (list (list "HREF" href)) ($mono-seq$))))
-	     (else ($mono-seq$)))))
-
-	;; Do not render email with mailto: when nolink role attribute
-	;; is used or when the email address matches
-	;; @example.{com|net|org}
-	(element email
-	  (let* ((class		(attribute-string (normalize "role"))))
-	    (cond
-	     ((or (equal? class "nolink")
-		  (and (> (string-length (data (current-node)))
-			  11)
-		       (string=?
-			(substring (data (current-node))
-				   (- (string-length (data (current-node))) 11)
-				   (- (string-length (data (current-node))) 4))
-			"example")))
-	      ($code-seq$
-	       (make sequence
-		 (literal "&#60;")
-		 (process-children)
-		 (literal "&#62;"))))
-	     (else
-	      (next-match)))))
-
-	;; Ensure that we start with no preferred mediaobject notations,
-	;; so that in the text-only case we don't choose any of the
-	;; possible images, and fallback to the most appropriate
-	;; textobject
-        (define preferred-mediaobject-notations
-	  '())
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "&#8220;")
-	    (process-children)
-	    (literal "&#8221;")))
-
-	;; The special FreeBSD version of the trademark tag handling.
-	;; This function was more or less taken from the DocBook DSSSL
-	;; stylesheets by Norman Walsh.
-	(element trademark
-	  (if (show-tm-symbol? (current-node))
-	      (make sequence
-		($charseq$)
-		(cond
-		 ((equal? (attribute-string "class") (normalize "copyright"))
-		  (make entity-ref name: "copy"))
-		 ((equal? (attribute-string "class") (normalize "registered"))
-		  (make entity-ref name: "reg"))
-		 ((equal? (attribute-string "class") (normalize "service"))
-		  (make element gi: "SUP"
-			(literal "SM")))
-		 (else
-		  (make entity-ref name: "#8482"))))
-	      ($charseq$)))
-
-	;; multiple copyright holders should be separated.
-	(element (copyright holder)
-	  (make sequence
-	    ($charseq$)
-	    (if (not (last-sibling? (current-node)))
-	        (literal ", ")
-	        (empty-sosofo))))
-      ]]>
-
-      <!-- HTML with images  ............................................ -->
-
-      <![ %output.html.images [
-
-; The new Cascading Style Sheets for the HTML output are very confused
-; by our images when used with div class="mediaobject".  We can
-; clear up the confusion by ignoring the whole mess and just
-; displaying the image.
-
-        (element mediaobject
-          (make element gi: "P"
-            ($mediaobject$)))
-
-        (define %graphic-default-extension%
-          "png")
-
-        (define %callout-graphics%
-          ;; Use graphics in callouts?
-          #t)
-
-        (define %callout-graphics-ext%
-          ;; The extension to use for callout images.  This is an extension
-          ;; to the stylesheets, they do not support this functionality
-          ;; natively.
-          ".png")
-
-        (define %callout-graphics-number-limit%
-          ;; Number of largest callout graphic
-          30)
-
-        (define %callout-graphics-path%
-          ;; Path to callout graphics
-          "./imagelib/callouts/")
-
-        ;; Redefine $callout-bug$ to support the %callout-graphic-ext%
-        ;; variable.
-        (define ($callout-bug$ conumber)
-	  (let ((number (if conumber (format-number conumber "1") "0")))
-	    (if conumber
-		(if %callout-graphics%
-	            (if (<= conumber %callout-graphics-number-limit%)
-		        (make empty-element gi: "IMG"
-			      attributes: (list (list "SRC"
-				                      (root-rel-path
-					               (string-append
-						        %callout-graphics-path%
-							number
-	                                                %callout-graphics-ext%)))
-		                                (list "HSPACE" "0")
-			                        (list "VSPACE" "0")
-				                (list "BORDER" "0")
-					        (list "ALT"
-						      (string-append
-	                                               "(" number ")"))))
-		        (make element gi: "B"
-			      (literal "(" (format-number conumber "1") ")")))
-	            (make element gi: "B"
-		          (literal "(" (format-number conumber "1") ")")))
-	        (make element gi: "B"
-	       (literal "(??)")))))
-      ]]>
-
-    </style-specification-body>
-  </style-specification>
-</style-sheet>
diff --git a/share/xml/freebsd-print.dsl b/share/xml/freebsd-print.dsl
index ec691517d6..495c02ac06 100644
--- a/share/xml/freebsd-print.dsl
+++ b/share/xml/freebsd-print.dsl
@@ -3,15 +3,6 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY % output.rtf.images 	"IGNORE">
 <!ENTITY % output.print 	"IGNORE">
-<!ENTITY % output.print.pdf 	"IGNORE">
-<!ENTITY % output.print.justify	"IGNORE">
-<!ENTITY % output.print.twoside	"IGNORE">
-<!ENTITY % output.print.niceheaders	"IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
 ]>
 
 <style-sheet>
@@ -33,310 +24,6 @@
 	  #f)
       ]]>
 
-      <!-- Two-sided Print output ....................................... -->
-      <![ %output.print.twoside; [
-
-      ;; From an email by Ian Castle to the DocBook-apps list
-
-      (define ($component$)
-        (make simple-page-sequence
-          page-n-columns: %page-n-columns%
-          page-number-restart?: (or %page-number-restart%
-;			      (book-start?)
-				    (first-chapter?))
-          page-number-format: ($page-number-format$)
-          use: default-text-style
-          left-header:   ($left-header$)
-          center-header: ($center-header$)
-          right-header:  ($right-header$)
-          left-footer:   ($left-footer$)
-          center-footer: ($center-footer$)
-          right-footer:  ($right-footer$)
-          start-indent: %body-start-indent%
-          input-whitespace-treatment: 'collapse
-          quadding: %default-quadding%
-          (make sequence
-	    ($component-title$)
-	    (process-children))
-          (make-endnotes)))
-
-      ;; From an email by Ian Castle to the DocBook-apps list
-
-      (define (first-part?)
-        (let* ((book (ancestor (normalize "book")))
-	       (nd   (ancestor-member (current-node)
-				      (append
-				       (component-element-list)
-				       (division-element-list))))
-	       (bookch (children book)))
-        (let loop ((nl bookch))
-	  (if (node-list-empty? nl)
-	      #f
-	      (if (equal? (gi (node-list-first nl)) (normalize "part"))
-		  (if (node-list=? (node-list-first nl) nd)
-		      #t
-		      #f)
-		  (loop (node-list-rest nl)))))))
-
-
-      ;; From an email by Ian Castle to the DocBook-apps list
-
-      (define (first-chapter?)
-      ;; Returns #t if the current-node is in the first chapter of a book
-        (if (has-ancestor-member? (current-node) (division-element-list))
-          #f
-         (let* ((book (ancestor (normalize "book")))
-                (nd   (ancestor-member (current-node)
-				       (append (component-element-list)
-					       (division-element-list))))
-		(bookch (children book))
-		(bookcomp (expand-children bookch (list (normalize "part")))))
-	   (let loop ((nl bookcomp))
-	     (if (node-list-empty? nl)
-		 #f
-		 (if (equal? (gi (node-list-first nl)) (normalize "chapter"))
-		     (if (node-list=? (node-list-first nl) nd)
-			 #t
-			 #f)
-		     (loop (node-list-rest nl))))))))
-
-
-      ; By default, the Part I title page will be given a roman numeral,
-      ; which is wrong so we have to fix it
-
-      (define (part-titlepage elements #!optional (side 'recto))
-        (let ((nodelist (titlepage-nodelist
-			 (if (equal? side 'recto)
-			     (part-titlepage-recto-elements)
-			     (part-titlepage-verso-elements))
-			 elements))
-	      ;; partintro is a special case...
-	      (partintro (node-list-first
-			  (node-list-filter-by-gi elements (list (normalize "partintro"))))))
-          (if (part-titlepage-content? elements side)
-	      (make simple-page-sequence
-		page-n-columns: %titlepage-n-columns%
-		;; Make sure that page number format is correct.
-		page-number-format: ($page-number-format$)
-		;; Make sure that the page number is set to 1 if this is the first part
-		;; in the book
-		page-number-restart?: (first-part?)
-		input-whitespace-treatment: 'collapse
-		use: default-text-style
-
-		;; This hack is required for the RTF backend. If an
-		;; external-graphic is the first thing on the page,
-		;; RTF doesn't seem to do the right thing (the graphic
-		;; winds up on the baseline of the first line of the
-		;; page, left justified).  This "one point rule" fixes
-		;; that problem.
-
-		(make paragraph
-		  line-spacing: 1pt
-		  (literal ""))
-
-		(let loop ((nl nodelist) (lastnode (empty-node-list)))
-		  (if (node-list-empty? nl)
-		      (empty-sosofo)
-		      (make sequence
-			(if (or (node-list-empty? lastnode)
-				(not (equal? (gi (node-list-first nl))
-					     (gi lastnode))))
-			    (part-titlepage-before (node-list-first nl) side)
-			    (empty-sosofo))
-			(cond
-			 ((equal? (gi (node-list-first nl)) (normalize "subtitle"))
-			  (part-titlepage-subtitle (node-list-first nl) side))
-			 ((equal? (gi (node-list-first nl)) (normalize "title"))
-			  (part-titlepage-title (node-list-first nl) side))
-			 (else
-			  (part-titlepage-default (node-list-first nl) side)))
-			(loop (node-list-rest nl) (node-list-first nl)))))
-		(if (and %generate-part-toc%
-			 %generate-part-toc-on-titlepage%
-			 (equal? side 'recto))
-		    (make display-group
-		      (build-toc (current-node)
-				 (toc-depth (current-node))))
-		    (empty-sosofo))
-
-		;; PartIntro is a special case
-		(if (and (equal? side 'recto)
-			 (not (node-list-empty? partintro))
-			 %generate-partintro-on-titlepage%)
-		    ($process-partintro$ partintro #f)
-		    (empty-sosofo)))
-	      (empty-sosofo))))
-
-      ]]>
-
-      <!-- Print with justification ..................................... -->
-      <![ %output.print.justify; [
-
-        (define %default-quadding%
-          'justify)
-
-        (define %hyphenation%
-          #t)
-
-
-        ;; The url.sty package is making all of the links purple/pink.
-        ;; Someone please fix this!
-
-        (define (urlwrap)
-          (let ((%factor% (if %verbatim-size-factor%
-			      %verbatim-size-factor%
-			      1.0)))
-          (make sequence
-	    font-family-name: %mono-font-family%
-	    font-size: (* (inherited-font-size) %factor%)
-	    (make formatting-instruction data:
-		  (string-append
-		   "\\url|"
-		   (data (current-node))
-		   "|")))))
-
-        (define (pathwrap)
-          (let ((%factor% (if %verbatim-size-factor%
-			      %verbatim-size-factor%
-			      1.0)))
-          (make sequence
-	    font-family-name: %mono-font-family%
-	    font-size: (* (inherited-font-size) %factor%)
-	    (make formatting-instruction data:
-		  (string-append
-		   "\\path|"
-		   (data (current-node))
-		   "|")))))
-
-        ;; Some others may check the value of %hyphenation% and be
-        ;; specified below
-
-;        (element email
-;          (make sequence
-;            (literal "<")
-;            (urlwrap)
-;            (literal ">")))
-
-        (element filename
-	    (pathwrap))
-
-        (element varname
-	    (pathwrap))
-
-      ]]>
-
-      <![ %output.print.niceheaders; [
-
-      (define niceheader-rule-spacebefore (* (HSIZE 5) %head-before-factor%))
-      (define niceheader-rule-spaceafter 0pt)
-
-      (define ($component-title$)
-	(let* ((info (cond
-		((equal? (gi) (normalize "appendix"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "article"))
-		 (node-list-filter-by-gi (children (current-node))
-					 (list (normalize "artheader")
-					       (normalize "articleinfo"))))
-		((equal? (gi) (normalize "bibliography"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "chapter"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "dedication"))
-		 (empty-node-list))
-		((equal? (gi) (normalize "glossary"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "index"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "preface"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "reference"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		((equal? (gi) (normalize "setindex"))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		(else
-		 (empty-node-list))))
-	 (exp-children (if (node-list-empty? info)
-			   (empty-node-list)
-			   (expand-children (children info)
-					    (list (normalize "bookbiblio")
-						  (normalize "bibliomisc")
-						  (normalize "biblioset")))))
-	 (parent-titles (select-elements (children (current-node)) (normalize "title")))
-	 (info-titles   (select-elements exp-children (normalize "title")))
-	 (titles        (if (node-list-empty? parent-titles)
-			    info-titles
-			    parent-titles))
-	 (subtitles     (select-elements exp-children (normalize "subtitle"))))
-    (make sequence
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-size: (HSIZE 4)
-	line-spacing: (* (HSIZE 4) %line-spacing-factor%)
-	space-before: (* (HSIZE 4) %head-before-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-title-quadding%
-	heading-level: (if %generate-heading-level% 1 0)
-	keep-with-next?: #t
-
-	(if (string=? (element-label) "")
-	    (empty-sosofo)
-	    (literal (gentext-element-name-space (current-node))
-		     (element-label)
-		     (gentext-label-title-sep (gi)))))
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-posture: 'italic
-	font-size: (HSIZE 6)
-	line-spacing: (* (HSIZE 6) %line-spacing-factor%)
-;	space-before: (* (HSIZE 5) %head-before-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-title-quadding%
-	heading-level: (if %generate-heading-level% 1 0)
-	keep-with-next?: #t
-
-	(if (node-list-empty? titles)
-	    (element-title-sosofo) ;; get a default!
-	    (with-mode component-title-mode
-	      (make sequence
-		(process-node-list titles)))))
-
-      (make paragraph
-	font-family-name: %title-font-family%
-	font-weight: 'bold
-	font-posture: 'italic
-	font-size: (HSIZE 3)
-	line-spacing: (* (HSIZE 3) %line-spacing-factor%)
-	space-before: (* 0.5 (* (HSIZE 3) %head-before-factor%))
-	space-after: (* (HSIZE 4) %head-after-factor%)
-	start-indent: 0pt
-	first-line-start-indent: 0pt
-	quadding: %component-subtitle-quadding%
-	keep-with-next?: #t
-
-	(with-mode component-title-mode
-	  (make sequence
-	    (process-node-list subtitles))))
-
-      (if (equal? (gi) (normalize "index"))
-	(empty-sosofo)
-	(make rule
-	  length: %body-width%
-	  display-alignment: 'start
-	  space-before: niceheader-rule-spacebefore
-	  space-after: niceheader-rule-spaceafter
-	  line-thickness: 0.5pt)))))
-
-      (element authorgroup
-        (empty-sosofo))
-
-      ]]>
-
       <!-- Print only ................................................... -->
       <![ %output.print; [
         (define withpgpkeys
@@ -475,18 +162,10 @@
                        (notation (attribute-string (normalize "format") objdata)))
                   (node-list-first nl)))))
 
-        ;; When selecting a filename to use, don't append the default
-        ;; extension, instead, just use the bare filename, and let TeX
-        ;; work it out.  jadetex will use the .eps file, while pdfjadetex
-        ;; will use the .png file automatically.
-        (define (graphic-file filename)
-          (let ((ext (file-extension filename)))
-            (if (or tex-backend   ;; TeX can work this out itself
-                    (not filename)
-                    (not %graphic-default-extension%)
-                    (member ext %graphic-extensions%))
-                 filename
-                 (string-append filename "." %graphic-default-extension%))))
+        ;; Printed formats always use .eps images.
+        (define %graphic-default-extension%
+          "eps")
+
 
         ;; Including bitmaps in the PS and PDF output tends to scale them
         ;; horribly.  The solution is to scale them down by 50%.
@@ -705,10 +384,6 @@
 						    (process-node-list c)))))))))))
       ]]>
 
-      <![ %output.print.pdf; [
-
-      ]]>
-
     </style-specification-body>
   </style-specification>
 </style-sheet>
diff --git a/share/xml/freebsd.dsl b/share/xml/freebsd.dsl
index ee0bda0923..01b4a3149b 100644
--- a/share/xml/freebsd.dsl
+++ b/share/xml/freebsd.dsl
@@ -1,23 +1,8 @@
 <!-- $FreeBSD$ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY % output.html		"IGNORE">
-<!ENTITY % output.print 	"IGNORE">
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-<!ENTITY % freebsd.l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%freebsd.l10n-common;
-
-<![ %output.html; [
-<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
-<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
-]]>
-<![ %output.print; [
 <!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
-]]>
-
 <!ENTITY freebsd-common.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN" CDATA DSSSL>
 ]>
 
diff --git a/share/xml/freebsd.dtd b/share/xml/freebsd.dtd
index ee4b6f8b7c..1d51d54f7f 100644
--- a/share/xml/freebsd.dtd
+++ b/share/xml/freebsd.dtd
@@ -20,7 +20,6 @@
 <!ENTITY % output.html  "IGNORE">    <!-- HTML output is being generated   -->
 <!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
 <!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
-<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
 
 <!-- ..................................................................... -->
 <!-- Entities for element classes and mixtures ........................... -->
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
new file mode 100644
index 0000000000..5c5cd0075a
--- /dev/null
+++ b/share/xml/freebsd.sch
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- $FreeBSD$ -->
+
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <pattern name="Check file reference validity">
+    <rule context="//imagedata|//graphic">
+      <report test="contains(@fileref, '.')">Image reference (<xsl:value-of select="@fileref"/>) cannot have an extension; the proper format is inferred by the output type to generate.</report>
+      <report test="@format">Image reference (<xsl:value-of select="@fileref"/>) format must not be specified; it is inferred by the output type to generate.</report>
+    </rule>
+  </pattern>
+
+  <pattern name="Check filenames">
+    <rule context="//filename">
+      <report test="@role = 'directory'">Filename (<xsl:value-of select="."/>) has role="directory"; use class="directory"</report>
+    </rule>
+  </pattern>
+
+  <pattern name="Check cross-reference validity">
+    <rule context="//link">
+      <assert test="* or normalize-space()">Link (<xsl:value-of select="@linkend"/>) element must have a content; or use xref to auto-generate the linking text.</assert>
+    </rule>
+  </pattern>
+
+  <pattern name="Check callout validity">
+    <rule context="/">
+      <report test="//screenco">Callouts with screenco are not supported; use screen and co instead.</report>
+      <report test="//programlistingco">Callouts with programlistingco are not supported; use programlisting and co instead.</report>
+      <report test="//graphicco">Callouts on graphics are not supported.</report>
+    </rule>
+  </pattern>
+
+  <pattern name="Check profiling attributes">
+    <rule context="//*/@edition">
+      <assert test="(. = 'online') or (. = 'print')">Invalid edition value (<xsl:value-of select="."/>); must be either 'online' or "print".</assert>
+    </rule>
+    <rule context="//*/@os">
+      <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">Invalid os value (<xsl:value-of select="."/>); must be either 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
+    </rule>
+  </pattern>
+
+<!--
+	Backported constraints from DocBook 5.0
+-->
+
+   <pattern name="Glossary 'firstterm' type constraint">
+      <rule context="firstterm[@linkend]">
+         <assert test="name(//*[@id=current()/@linkend]) = 'glossentry'">@linkend on firstterm must point to a glossentry.</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Footnote reference type constraint">
+      <rule context="footnoteref">
+         <assert test="name(//*[@id=current()/@linkend]) = 'footnote'">@linkend on footnoteref must point to a footnote.</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Glossary 'glossterm' type constraint">
+      <rule context="glossterm[@linkend]">
+         <assert test="name(//*[@id=current()/@linkend]) = 'glossentry'">@linkend on glossterm must point to a glossentry.</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Synopsis fragment type constraint">
+      <rule context="synopfragmentref">
+         <assert test="name(//*[@id=current()/@linkend]) = 'synopfragment'">@linkend on synopfragmentref must point to a synopfragment.</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Glosssary 'see' type constraint">
+      <rule context="glosssee[@otherterm]">
+         <assert test="name(//*[@id=current()/@otherterm]) = 'glossentry'">@otherterm on glosssee must point to a glossentry.</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Glossary 'seealso' type constraint">
+      <rule context="glossseealso[@otherterm]">
+         <assert test="name(//*[@id=current()/@otherterm]) = 'glossentry'">@otherterm on glossseealso must point to a glossentry.</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Glossary term definition constraint">
+      <rule context="termdef">
+         <assert test="count(firstterm) = 1">A termdef must contain exactly one firstterm</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Cardinality of segments and titles">
+      <rule context="seglistitem">
+         <assert test="count(seg) = count(../segtitle)">The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist</assert>
+      </rule>
+   </pattern>
+
+   <pattern name="Element exclusion">
+      <rule context="annotation">
+         <assert test="not(.//annotation)">annotation must not occur in the descendants of annotation</assert>
+      </rule>
+      <rule context="caution">
+         <assert test="not(.//caution)">caution must not occur in the descendants of caution</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of caution</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of caution</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of caution</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of caution</assert>
+      </rule>
+      <rule context="important">
+         <assert test="not(.//caution)">caution must not occur in the descendants of important</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of important</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of important</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of important</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of important</assert>
+      </rule>
+      <rule context="note">
+         <assert test="not(.//caution)">caution must not occur in the descendants of note</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of note</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of note</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of note</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of note</assert>
+      </rule>
+      <rule context="tip">
+         <assert test="not(.//caution)">caution must not occur in the descendants of tip</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of tip</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of tip</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of tip</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of tip</assert>
+      </rule>
+      <rule context="warning">
+         <assert test="not(.//caution)">caution must not occur in the descendants of warning</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of warning</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of warning</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of warning</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of warning</assert>
+      </rule>
+      <rule context="caption">
+         <assert test="not(.//caution)">caution must not occur in the descendants of caption</assert>
+         <assert test="not(.//equation)">equation must not occur in the descendants of caption</assert>
+         <assert test="not(.//example)">example must not occur in the descendants of caption</assert>
+         <assert test="not(.//figure)">figure must not occur in the descendants of caption</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of caption</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of caption</assert>
+         <assert test="not(.//sidebar)">sidebar must not occur in the descendants of caption</assert>
+         <assert test="not(.//table)">table must not occur in the descendants of caption</assert>
+         <assert test="not(.//task)">task must not occur in the descendants of caption</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of caption</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of caption</assert>
+      </rule>
+      <rule context="equation">
+         <assert test="not(.//caution)">caution must not occur in the descendants of equation</assert>
+         <assert test="not(.//equation)">equation must not occur in the descendants of equation</assert>
+         <assert test="not(.//example)">example must not occur in the descendants of equation</assert>
+         <assert test="not(.//figure)">figure must not occur in the descendants of equation</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of equation</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of equation</assert>
+         <assert test="not(.//table)">table must not occur in the descendants of equation</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of equation</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of equation</assert>
+      </rule>
+      <rule context="example">
+         <assert test="not(.//caution)">caution must not occur in the descendants of example</assert>
+         <assert test="not(.//equation)">equation must not occur in the descendants of example</assert>
+         <assert test="not(.//example)">example must not occur in the descendants of example</assert>
+         <assert test="not(.//figure)">figure must not occur in the descendants of example</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of example</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of example</assert>
+         <assert test="not(.//table)">table must not occur in the descendants of example</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of example</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of example</assert>
+      </rule>
+      <rule context="figure">
+         <assert test="not(.//caution)">caution must not occur in the descendants of figure</assert>
+         <assert test="not(.//equation)">equation must not occur in the descendants of figure</assert>
+         <assert test="not(.//example)">example must not occur in the descendants of figure</assert>
+         <assert test="not(.//figure)">figure must not occur in the descendants of figure</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of figure</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of figure</assert>
+         <assert test="not(.//table)">table must not occur in the descendants of figure</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of figure</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of figure</assert>
+      </rule>
+      <rule context="table">
+         <assert test="not(.//caution)">caution must not occur in the descendants of table</assert>
+         <assert test="not(.//equation)">equation must not occur in the descendants of table</assert>
+         <assert test="not(.//example)">example must not occur in the descendants of table</assert>
+         <assert test="not(.//figure)">figure must not occur in the descendants of table</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of table</assert>
+         <assert test="not(.//informaltable)">informaltable must not occur in the descendants of table</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of table</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of table</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of table</assert>
+      </rule>
+      <rule context="footnote">
+         <assert test="not(.//caution)">caution must not occur in the descendants of footnote</assert>
+         <assert test="not(.//epigraph)">epigraph must not occur in the descendants of footnote</assert>
+         <assert test="not(.//equation)">equation must not occur in the descendants of footnote</assert>
+         <assert test="not(.//example)">example must not occur in the descendants of footnote</assert>
+         <assert test="not(.//figure)">figure must not occur in the descendants of footnote</assert>
+         <assert test="not(.//footnote)">footnote must not occur in the descendants of footnote</assert>
+         <assert test="not(.//important)">important must not occur in the descendants of footnote</assert>
+         <assert test="not(.//indexterm)">indexterm must not occur in the descendants of footnote</assert>
+         <assert test="not(.//note)">note must not occur in the descendants of footnote</assert>
+         <assert test="not(.//sidebar)">sidebar must not occur in the descendants of footnote</assert>
+         <assert test="not(.//table)">table must not occur in the descendants of footnote</assert>
+         <assert test="not(.//task)">task must not occur in the descendants of footnote</assert>
+         <assert test="not(.//tip)">tip must not occur in the descendants of footnote</assert>
+         <assert test="not(.//warning)">warning must not occur in the descendants of footnote</assert>
+      </rule>
+      <rule context="sidebar">
+         <assert test="not(.//sidebar)">sidebar must not occur in the descendants of sidebar</assert>
+      </rule>
+   </pattern>
+</schema>
diff --git a/share/xml/freebsd42.dtd b/share/xml/freebsd42.dtd
deleted file mode 100644
index e86f9cc16b..0000000000
--- a/share/xml/freebsd42.dtd
+++ /dev/null
@@ -1,59 +0,0 @@
-<!ENTITY % output.html  "IGNORE">    <!-- HTML output is being generated   -->
-<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
-<!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
-<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
-
-<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref">
-
-<!ENTITY % filename.element "IGNORE">
-
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-	"/usr/local/share/xml/docbook/4.2/docbookx.dtd">
-%orig-docbook;
-
-<!ELEMENT hostid (%cptr.char.mix;)*>
-<!ATTLIST hostid
-                role    (hostname
-                        |domainname
-                        |fqdn
-                        |ipaddr
-                        |ip6addr
-                        |netmask
-                        |mac)      #IMPLIED
-                %common.attrib;
->
-
-<!ELEMENT username (%cptr.char.mix;)*>
-<!ATTLIST username
-                %common.attrib;
->
-
-<!ELEMENT groupname (%cptr.char.mix;)*>
-<!ATTLIST groupname
-                %common.attrib;
->
-
-<!ELEMENT devicename (%cptr.char.mix;)*>
-<!ATTLIST devicename
-                %common.attrib;
->
-
-<!ELEMENT maketarget (%cptr.char.mix;)*>
-<!ATTLIST maketarget
-                %common.attrib;
->
-
-<!ELEMENT makevar (%cptr.char.mix;)*>
-<!ATTLIST makevar
-                %common.attrib;
->
-
-<!ELEMENT svnref (%cptr.char.mix;)*>
-<!ATTLIST svnref
-		%common.attrib;
->
-
-<!ELEMENT filename (%cptr.char.mix;)*>
-
-<!ENTITY prompt.root		"<prompt>#</prompt>">
-<!ENTITY prompt.user		"<prompt>&#x25;</prompt>">
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
new file mode 100644
index 0000000000..4261864bac
--- /dev/null
+++ b/share/xml/freebsd45.dtd
@@ -0,0 +1,121 @@
+<!ENTITY % output.html  "IGNORE">    <!-- HTML output is being generated   -->
+<!ENTITY % output.html.images "IGNORE"> <!-- HTML with images -->
+<!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
+
+<!--  XXX: Jade is given a totally parsed document with XML tools
+      so it does not need to pull in entity sets and catalogs
+      are only provided in XML format, yet this compatibility
+      nit is necessary otherwise it would look for the entity sets
+      and fail, lacking SGML catalogs.
+-->
+<!ENTITY % jade.compat "IGNORE">
+<![%jade.compat;[
+<!ENTITY % freebsd.entities "IGNORE">
+]]>
+<!ENTITY % freebsd.entities "INCLUDE">
+
+<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref|xi:include">
+
+<!ENTITY % filename.element "IGNORE">
+
+<!ENTITY % ISOgrk4.module "IGNORE">
+
+<!ENTITY % xmlns.attrib
+	"xmlns		CDATA		#IMPLIED">
+
+<!ENTITY % xmlns.xi.attrib
+	"xmlns:xi	CDATA		#IMPLIED">
+
+<!ENTITY % local.common.attrib "%xmlns.attrib;
+				%xmlns.xi.attrib;">
+
+<!ENTITY % edition.attrib
+	"edition	CDATA		#IMPLIED">
+
+<!ENTITY % releasetype.attrib
+	"releasetype	CDATA		#IMPLIED">
+
+<!ENTITY % local.effectivity.attrib "%edition.attrib;
+				     %releasetype.attrib;">
+
+<!ELEMENT xi:include (xi:fallback?)>
+
+<!ATTLIST xi:include
+    xmlns:xi        CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
+    href            CDATA       #IMPLIED
+    parse           (xml|text)  "xml"
+    xpointer        CDATA       #IMPLIED
+    encoding        CDATA       #IMPLIED
+    accept          CDATA       #IMPLIED
+    accept-language CDATA       #IMPLIED
+>
+
+<!ELEMENT xi:fallback ANY>
+<!ATTLIST xi:fallback
+    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude"
+>
+
+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+	"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
+%orig-docbook;
+
+<![%freebsd.entities;[
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"authors.ent">
+%authors;
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	"man-refs.ent">
+%man;
+
+<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+	"entities.ent">
+%orig-entities;
+]]>
+
+<!ELEMENT hostid (%cptr.char.mix;)*>
+<!ATTLIST hostid
+                role    (hostname
+                        |domainname
+                        |fqdn
+                        |ipaddr
+                        |ip6addr
+                        |netmask
+                        |mac)      #IMPLIED
+                %common.attrib;
+>
+
+<!ELEMENT username (%cptr.char.mix;)*>
+<!ATTLIST username
+                %common.attrib;
+>
+
+<!ELEMENT groupname (%cptr.char.mix;)*>
+<!ATTLIST groupname
+                %common.attrib;
+>
+
+<!ELEMENT devicename (%cptr.char.mix;)*>
+<!ATTLIST devicename
+                %common.attrib;
+>
+
+<!ELEMENT maketarget (%cptr.char.mix;)*>
+<!ATTLIST maketarget
+                %common.attrib;
+>
+
+<!ELEMENT makevar (%cptr.char.mix;)*>
+<!ATTLIST makevar
+                %common.attrib;
+>
+
+<!ELEMENT svnref (%cptr.char.mix;)*>
+<!ATTLIST svnref
+		%common.attrib;
+>
+
+<!ELEMENT filename (%cptr.char.mix;)*>
+
+<!ENTITY prompt.root		"<prompt>#</prompt>">
+<!ENTITY prompt.user		"<prompt>&#x25;</prompt>">
diff --git a/share/xml/mirrors-local.xsl b/share/xml/mirrors-local.xsl
index bc2b37d047..f21a45de01 100644
--- a/share/xml/mirrors-local.xsl
+++ b/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
   <xsl:import href="./mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
 </xsl:stylesheet>
diff --git a/share/xml/mirrors-master.xsl b/share/xml/mirrors-master.xsl
index 4eed64c5a1..ec2c73b6a2 100644
--- a/share/xml/mirrors-master.xsl
+++ b/share/xml/mirrors-master.xsl
@@ -4,7 +4,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- these params should be externally bound. The values
@@ -13,8 +12,6 @@
   <xsl:param name="proto" select="''" />
   <xsl:param name="target" select="''" />
 
-  <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
-
   <xsl:variable name="date">
     <xsl:value-of xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
                   select="normalize-space(//cvs:keyword[@name='freebsd'])"/>
@@ -32,16 +29,22 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
+      <xsl:when test="$target = 'lastmod'">
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
+      </xsl:when>
+
+      <xsl:when test="$target = 'index'">
+	<xsl:call-template name="mirrors-docbook-country-index-all" />
+      </xsl:when>
+
+      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-variablelist" />
       </xsl:when>
+
       <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
-	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-itemizedlist" />
       </xsl:when>
+
       <xsl:otherwise>
 	<xsl:value-of select="'*** processing error ***'" />
       </xsl:otherwise>
@@ -91,7 +94,7 @@
     <xsl:param name="mirrors-docbook-country-index-without-period" />
     <link>
       <xsl:attribute name="linkend">
-	<xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	<xsl:value-of select="concat(@id, '-', $type)" />
       </xsl:attribute>
       <xsl:value-of select="country" />
     </link>
@@ -126,7 +129,7 @@
       <term>
 	<anchor>
 	  <xsl:attribute name="id">
-	    <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	    <xsl:value-of select="concat(@id, '-', $type)" />
 	  </xsl:attribute>
 	</anchor>
 	<xsl:value-of select="country" />
@@ -211,7 +214,7 @@
     <listitem>
       <anchor>
 	<xsl:attribute name="id">
-	  <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	  <xsl:value-of select="concat(@id, '-', $type)" />
 	</xsl:attribute>
       </anchor>
 
diff --git a/share/xml/mirrors.dtd b/share/xml/mirrors.dtd
new file mode 100644
index 0000000000..e40058511b
--- /dev/null
+++ b/share/xml/mirrors.dtd
@@ -0,0 +1,26 @@
+<!-- $FreeBSD$ -->
+
+<!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+%cvs;
+
+<!ELEMENT mirrors (cvs:keyword, entry+)>
+
+<!ELEMENT entry (country, host+, email?)>
+<!ELEMENT country (#PCDATA)>
+<!ELEMENT host (name, url*)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
+<!ELEMENT email (#PCDATA)>
+
+<!ATTLIST entry id ID #REQUIRED>
+<!ATTLIST host type (cvsup|ftp|rsync|www) #REQUIRED>
+<!ATTLIST url proto (ftp|ftpv6|http|httpv6|rsync|rsyncv6) #REQUIRED>
+<!ATTLIST country
+	sortkey CDATA #REQUIRED
+	role CDATA #IMPLIED>
+
+<!ENTITY % iso8879.ent
+ PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
+        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+%iso8879.ent;
diff --git a/share/xml/mirrors.xml b/share/xml/mirrors.xml
index cfe36a19ae..66138f579e 100644
--- a/share/xml/mirrors.xml
+++ b/share/xml/mirrors.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE mirrors PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+	"http://www.FreeBSD.org/XML/www/share/xml/mirrors.dtd">
 <mirrors>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
       $FreeBSD$
diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent
index 5de65f0371..e35f5843c9 100644
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@@ -426,6 +426,8 @@ Coverity, Inc.</para>">
 
 <!ENTITY legalnotice '
 <legalnotice id="legalnotice">
+  <title>Copyright</title>
+
   <para>Redistribution and use in source (XML DocBook) and &apos;compiled&apos;
     forms (XML, HTML, PDF, PostScript, RTF and so forth) with or without
     modification, are permitted provided that the following conditions are
@@ -466,6 +468,7 @@ Coverity, Inc.</para>">
 
 <!ENTITY trademarks '
 <legalnotice id="trademarks" role="trademarks">
+  <title>Legal Notice</title>
 
   <para>FreeBSD is a registered trademark of The FreeBSD Foundation.</para>
 
diff --git a/share/xml/urls.ent b/share/xml/urls.ent
index 0e309e2890..5887fe6c55 100644
--- a/share/xml/urls.ent
+++ b/share/xml/urls.ent
@@ -1,46 +1,12 @@
 <!-- $FreeBSD$ -->
 
 <!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
 
 <!-- Do not edit: start here -->
 
-<![%freebsd.urls.relprefix.1;[
-	<!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
-	<!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
-	<!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
-	<!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
-	<!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
-	<!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
-	<!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
-	<!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY url.relprefix "../../../..">
 
-<![ %freebsd.urls.absolute; [
-<!ENTITY url.base "http://www.FreeBSD.org">
-]]>
-<!ENTITY url.base "&url.relprefix;">
+<!ENTITY url.base "@@URL_RELPREFIX@@">
 
 <!-- XXX: This will be removed soon -->
 <!ENTITY url.main "&url.base;">
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index d4f067e2ec..94fce635d8 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -3,19 +3,28 @@
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                exclude-result-prefixes="#default">
+                version='1.0'>
 
   <!-- Global customisation -->
 
   <!-- Redefine variables, and replace templates as necessary here -->
-  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
+  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar|userinput|command">
     <xsl:call-template name="inline.monoseq"/>
   </xsl:template>
 
+  <xsl:template name="svnweb.link">
+    <xsl:param name="repo" select="'base'"/>
+    <xsl:param name="rev"/>
+
+    <xsl:value-of select="concat('http://svnweb.freebsd.org/', $repo,
+      '?view=revision&amp;revision=', $rev)"/>
+  </xsl:template>
+
   <xsl:param name="toc.section.depth" select="1"/>
   <xsl:param name="section.autolabel" select="1"/>
   <xsl:param name="section.label.includes.component.label" select="1"/>
 
+  <xsl:param name="generate.index" select="0"/>
+
+  <xsl:param name="graphic.default.extension">png</xsl:param>
 </xsl:stylesheet>
diff --git a/share/xsl/freebsd-html-chunk.xsl b/share/xsl/freebsd-epub.xsl
similarity index 58%
rename from share/xsl/freebsd-html-chunk.xsl
rename to share/xsl/freebsd-epub.xsl
index b274add9d5..1a48cb7164 100644
--- a/share/xsl/freebsd-html-chunk.xsl
+++ b/share/xsl/freebsd-epub.xsl
@@ -8,10 +8,11 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/html/chunk.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook/epub/docbook.xsl"/>
 
-  <!-- Redefine variables, and replace templates as necessary here -->
+  <!-- Pull in common XHTML customizations -->
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
 
-  <xsl:include href="freebsd-common.xsl"/>
+  <xsl:param name="generate.legalnotice.link" select="'1'"/>
 </xsl:stylesheet>
 
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl
index 4b3ced1abb..a21ff9080b 100644
--- a/share/xsl/freebsd-fo.xsl
+++ b/share/xsl/freebsd-fo.xsl
@@ -3,29 +3,75 @@
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:fo="http://www.w3.org/1999/XSL/Format"
+		xmlns="http://www.w3.org/TR/xhtml1/transitional"
                 version='1.0'
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
   <xsl:import href="/usr/local/share/xsl/docbook/fo/docbook.xsl"/>
 
-  <!-- Redefine variables, and replace templates as necessary here -->
-
-  <xsl:param name="freebsd.output.print"
-             select="'0'"/>
-  <xsl:param name="freebsd.output.print.pdf"
-             select="'0'"/>
-  <xsl:param name="freebsd.output.print.justify"
-             select="'0'"/>
-  <xsl:param name="freebsd.output.print.twoside"
-             select="'0'"/>
-
-  <!-- Include the common stylesheets -->
-
+  <!-- Include the common customizations -->
   <xsl:include href="freebsd-common.xsl"/>
 
+  <!-- Redefine variables, and replace templates as necessary here -->
+
   <!-- FO specific customisation goes here -->
 
+  <xsl:param name="use.extensions" select="1"/>
+  <xsl:param name="fop1.extensions" select="1"/>
+
+<!--
+  <xsl:param name="hyphenate.verbatim" select="1"/>
+-->
+  <xsl:param name="header.column.widths">1 5 1</xsl:param>
+
+
+<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>
+
+<xsl:attribute-set name="abstract.title.properties">
+  <xsl:attribute name="font-size">
+    <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of>
+    <xsl:text>pt</xsl:text>
+  </xsl:attribute>
+  <xsl:attribute name="text-align">left</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="abstract.properties">
+  <xsl:attribute name="margin-left">0</xsl:attribute>
+  <xsl:attribute name="margin-right">0</xsl:attribute>
+  <xsl:attribute name="padding-left">0</xsl:attribute>
+  <xsl:attribute name="padding-right">0</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="toc.margin.properties">
+  <xsl:attribute name="margin-left">
+    <xsl:value-of select="'0'"/>
+  </xsl:attribute>
+  <xsl:attribute name="margin-right">
+    <xsl:value-of select="'0'"/>
+  </xsl:attribute>
+  <xsl:attribute name="padding-left">
+    <xsl:value-of select="'0'"/>
+  </xsl:attribute>
+  <xsl:attribute name="padding-right">
+    <xsl:value-of select="'0'"/>
+  </xsl:attribute>
+</xsl:attribute-set>
+
+<!--
+<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
+  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" font-family="{$body.fontset}">
+    <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+  </fo:block>
+</xsl:template>
+-->
+
+<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</fo:block>
+</xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/share/xsl/freebsd-html.xsl b/share/xsl/freebsd-html.xsl
deleted file mode 100644
index f493e29fb4..0000000000
--- a/share/xsl/freebsd-html.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- $FreeBSD$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                exclude-result-prefixes="#default">
-
-  <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/html/docbook.xsl"/>
-
-  <!-- Redefine variables, and replace templates as necessary here -->
-  <xsl:param name="freebsd.output.html" select="'0'"/>
-  <xsl:param name="freebsd.output.html.images" select="'0'"/>
-
-  <!-- HTML specific customisation goes here -->
-
-  <xsl:param name="html.stylesheet" select="'docbook.css'"/>
-  <xsl:param name="user.id.as.filename" select="'1'"/>
-  <xsl:param name="generate.legalnotice.link" select="'1'"/>
-  <xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
-  <xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
-
-  <xsl:template name="user.footer.content">
-    <p align="center"><small>This, and other documents, can be downloaded
-    from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
-
-    <p align="center"><small>For questions about FreeBSD, read the
-    <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
-    contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
-    For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
-  </xsl:template>
-</xsl:stylesheet>
-
diff --git a/share/xsl/freebsd-xhtml-chunk.xsl b/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..b3485ffb11
--- /dev/null
+++ b/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the base stylesheets -->
+  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/>
+
+  <!-- Pull in common XHTML customizations -->
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
+
+  <xsl:param name="generate.manifest" select="'1'"/>
+  <xsl:param name="generate.legalnotice.link" select="'1'"/>
+</xsl:stylesheet>
+
diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..fb8b9bc866
--- /dev/null
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,308 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+		xmlns:str="http://exslt.org/strings"
+		extension-element-prefixes="str"
+                exclude-result-prefixes="#default">
+
+  <!-- Include the common customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Include customized XHTML titlepage -->
+  <xsl:import href="freebsd-xhtml-titlepage.xsl"/>
+
+  <!-- Redefine variables, and replace templates as necessary here -->
+
+  <xsl:param name="use.id.as.filename" select="1"/>
+  <xsl:param name="html.stylesheet" select="'docbook.css'"/>
+  <xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
+  <xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
+  <xsl:param name="citerefentry.link" select="1"/>
+  <xsl:param name="admon.style"/>
+  <xsl:param name="make.year.ranges" select="1"/>
+  <xsl:param name="make.single.year.ranges" select="1"/>
+  <xsl:param name="docbook.css.source" select="''"/>
+
+  <xsl:param name="make.valid.html" select="1"/>
+  <xsl:param name="html.cleanup" select="1"/>
+  <xsl:param name="make.clean.html" select="1"/>
+
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+  <i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+    <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en">
+      <l:gentext key="Lastmodified" text="Last modified"/>
+      <l:gentext key="on" text="on"/>
+    </l:l10n>
+  </i18n>
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>This, and other documents, can be downloaded
+    from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>For questions about FreeBSD, read the
+    <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
+    contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+
+  <xsl:template name="docformatnav">
+    <xsl:variable name="single.fname">
+      <xsl:choose>
+        <xsl:when test="/book">book.html</xsl:when>
+        <xsl:when test="/article">article.html</xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+
+    <div class="docformatnavi">
+      [ <a href="index.html">Split HTML</a> /
+      <a href="{$single.fname}">Single HTML</a> ]
+    </div>
+  </xsl:template>
+
+  <xsl:template match="citerefentry" mode="no.anchor.mode">
+    <xsl:apply-templates select="*" mode="no.anchor.mode"/>
+  </xsl:template>
+
+  <xsl:template match="refentrytitle" mode="no.anchor.mode">
+    <xsl:value-of select="."/>
+  </xsl:template>
+
+  <!-- Add title class to emitted hX -->
+  <xsl:template match="bridgehead">
+    <xsl:variable name="container" select="(ancestor::appendix|ancestor::article|ancestor::bibliography|
+      ancestor::chapter|ancestor::glossary|ancestor::glossdiv|ancestor::index|ancestor::partintro|
+      ancestor::preface|ancestor::refsect1|ancestor::refsect2|ancestor::refsect3|ancestor::sect1|
+      ancestor::sect2|ancestor::sect3|ancestor::sect4|ancestor::sect5|ancestor::section|ancestor::setindex|
+      ancestor::simplesect)[last()]"/>
+
+    <xsl:variable name="clevel">
+      <xsl:choose>
+        <xsl:when test="local-name($container) = 'appendix'
+	  or local-name($container) = 'chapter'
+	  or local-name($container) = 'article'
+	  or local-name($container) = 'bibliography'
+	  or local-name($container) = 'glossary'
+	  or local-name($container) = 'index'
+	  or local-name($container) = 'partintro'
+	  or local-name($container) = 'preface'
+	  or local-name($container) = 'setindex'">1</xsl:when>
+        <xsl:when test="local-name($container) = 'glossdiv'">
+          <xsl:value-of select="count(ancestor::glossdiv)+1"/>
+        </xsl:when>
+        <xsl:when test="local-name($container) = 'sect1'
+	  or local-name($container) = 'sect2'
+	  or local-name($container) = 'sect3'
+	  or local-name($container) = 'sect4'
+	  or local-name($container) = 'sect5'
+	  or local-name($container) = 'refsect1'
+	  or local-name($container) = 'refsect2'
+	  or local-name($container) = 'refsect3'
+	  or local-name($container) = 'section'
+	  or local-name($container) = 'simplesect'">
+          <xsl:variable name="slevel">
+            <xsl:call-template name="section.level">
+              <xsl:with-param name="node" select="$container"/>
+            </xsl:call-template>
+          </xsl:variable>
+          <xsl:value-of select="$slevel + 1"/>
+        </xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <!-- HTML H level is one higher than section level -->
+    <xsl:variable name="hlevel">
+      <xsl:choose>
+        <xsl:when test="@renderas = 'sect1'">2</xsl:when>
+        <xsl:when test="@renderas = 'sect2'">3</xsl:when>
+        <xsl:when test="@renderas = 'sect3'">4</xsl:when>
+        <xsl:when test="@renderas = 'sect4'">5</xsl:when>
+        <xsl:when test="@renderas = 'sect5'">6</xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$clevel + 1"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
+      <xsl:attribute name="class">title</xsl:attribute>
+      <xsl:call-template name="anchor">
+        <xsl:with-param name="conditional" select="0"/>
+      </xsl:call-template>
+      <xsl:apply-templates/>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template name="svnref.genlink">
+    <xsl:param name="rev" select="."/>
+    <xsl:param name="repo" select="'base'"/>
+
+    <a>
+      <xsl:attribute name="href">
+	<xsl:call-template name="svnweb.link">
+	  <xsl:with-param name="repo" select="$repo"/>
+	  <xsl:with-param name="rev" select="$rev"/>
+	</xsl:call-template>
+      </xsl:attribute>
+
+      <span class="svnref">
+	<xsl:value-of select="$rev"/>
+      </span>
+    </a>
+  </xsl:template>
+
+  <xsl:template match="svnref">
+    <xsl:call-template name="svnref.genlink"/>
+  </xsl:template>
+
+  <xsl:template name="generate.citerefentry.link">
+    <xsl:text>http://www.FreeBSD.org/cgi/man.cgi?query=</xsl:text>
+    <xsl:value-of select="refentrytitle"/>
+    <xsl:text>&#38;amp;sektion=</xsl:text>
+    <xsl:value-of select="manvolnum"/>
+  </xsl:template>
+
+  <xsl:template name="nongraphical.admonition">
+    <div>
+      <xsl:call-template name="common.html.attributes">
+        <xsl:with-param name="inherit" select="1"/>
+      </xsl:call-template>
+      <xsl:if test="$admon.style">
+        <xsl:attribute name="style">
+          <xsl:value-of select="$admon.style"/>
+        </xsl:attribute>
+      </xsl:if>
+
+      <xsl:if test="$admon.textlabel != 0 or title or info/title">
+        <h3 class="admontitle">
+          <xsl:call-template name="anchor"/>
+          <xsl:apply-templates select="." mode="object.title.markup"/>
+	  <xsl:text>: </xsl:text>
+        </h3>
+      </xsl:if>
+
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="freebsd.authorgroup">
+    <span class="authorgroup">
+
+      <!-- XXX: our docs use a quirky semantics for this -->
+      <xsl:if test="(contrib|author/contrib)[1]">
+	<xsl:apply-templates select="(contrib|author/contrib)[1]"/>
+      </xsl:if>
+
+      <xsl:for-each select="author">
+	<xsl:apply-templates select="."/>
+
+	<xsl:choose>
+	  <xsl:when test="position() &lt; (last() - 1)">
+	    <xsl:text>, </xsl:text>
+	  </xsl:when>
+
+	  <xsl:when test="position() = (last() - 1)">
+	    <xsl:call-template name="gentext.space"/>
+	    <xsl:call-template name="gentext">
+	      <xsl:with-param name="key" select="'and'"/>
+	    </xsl:call-template>
+	    <xsl:call-template name="gentext.space"/>
+	  </xsl:when>
+	</xsl:choose>
+      </xsl:for-each>
+      <xsl:text>. </xsl:text>
+    </span>
+  </xsl:template>
+
+  <xsl:template match="contrib">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template name="freebsd.author">
+    <xsl:if test="contrib">
+      <xsl:apply-templates select="contrib"/>
+      <xsl:text> </xsl:text>
+    </xsl:if>
+    <xsl:apply-templates select="*[not(self::contrib)]"/>
+  </xsl:template>
+
+  <xsl:template name="chapter.authorgroup">
+    <xsl:call-template name="freebsd.authorgroup"/>
+  </xsl:template>
+
+  <xsl:template name="section.authorgroup">
+    <xsl:call-template name="freebsd.authorgroup"/>
+  </xsl:template>
+
+  <xsl:template name="chapter.author">
+    <xsl:call-template name="freebsd.author"/>
+  </xsl:template>
+
+  <xsl:template name="section.author">
+    <xsl:call-template name="freebsd.author"/>
+  </xsl:template>
+
+  <xsl:template name="titlepage.releaseinfo">
+    <xsl:variable name="rev" select="str:split(., ' ')[3]"/>
+
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'Revision'"/>
+    </xsl:call-template>
+    <xsl:text>:</xsl:text>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="svnref.genlink">
+      <xsl:with-param name="repo" select="'doc'"/>
+      <xsl:with-param name="rev" select="$rev"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="titlepage.pubdate">
+    <xsl:variable name="pubdate">
+      <xsl:choose>
+	<xsl:when test="contains(., '$FreeBSD')">
+	  <xsl:value-of select="str:split(., ' ')[4]"/>
+	</xsl:when>
+
+	<xsl:otherwise>
+	  <xsl:value-of select="."/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="committer">
+      <xsl:if test="contains(., '$FreeBSD')">
+	 <xsl:value-of select="str:split(., ' ')[6]"/>
+      </xsl:if>
+    </xsl:variable>
+
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'Lastmodified'"/>
+    </xsl:call-template>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:call-template name="gentext">
+      <xsl:with-param name="key" select="'on'"/>
+    </xsl:call-template>
+    <xsl:call-template name="gentext.space"/>
+    <xsl:value-of select="$pubdate"/>
+    <xsl:if test="$committer">
+      <xsl:call-template name="gentext.space"/>
+      <xsl:call-template name="gentext">
+	<xsl:with-param name="key" select="'by'"/>
+      </xsl:call-template>
+      <xsl:call-template name="gentext.space"/>
+      <xsl:value-of select="$committer"/>
+    </xsl:if>
+    <xsl:text>.</xsl:text>
+  </xsl:template>
+
+  <!-- Hook in format navigation at the end of the titlepage -->
+  <xsl:template name="book.titlepage.separator">
+    <xsl:call-template name="docformatnav"/>
+
+    <hr/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/share/xsl/freebsd-xhtml-titlepage.xsl b/share/xsl/freebsd-xhtml-titlepage.xsl
new file mode 100644
index 0000000000..9b8446a50e
--- /dev/null
+++ b/share/xsl/freebsd-xhtml-titlepage.xsl
@@ -0,0 +1,3865 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
+
+<!-- This stylesheet was created by template/titlepage.xsl-->
+
+<xsl:template name="article.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="articleinfo/title">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
+    </xsl:when>
+    <xsl:when test="artheader/title">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="articleinfo/subtitle">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="artheader/subtitle">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/othercredit"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/othercredit"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
+  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="article.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="article.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="article.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="article.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="article.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="article.titlepage.before.recto"/>
+      <xsl:call-template name="article.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="article.titlepage.before.verso"/>
+      <xsl:call-template name="article.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="article.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="article.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="article.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="set.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="setinfo/title">
+      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="setinfo/subtitle">
+      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/othercredit"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/releaseinfo"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/copyright"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/legalnotice"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/pubdate"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revision"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revhistory"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/abstract"/>
+  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="set.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="set.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="set.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="set.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="set.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="set.titlepage.before.recto"/>
+      <xsl:call-template name="set.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="set.titlepage.before.verso"/>
+      <xsl:call-template name="set.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="set.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="set.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="set.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="set.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
+<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="book.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="bookinfo/title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="bookinfo/subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
+  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="book.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="book.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="book.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="book.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="book.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="book.titlepage.before.recto"/>
+      <xsl:call-template name="book.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="book.titlepage.before.verso"/>
+      <xsl:call-template name="book.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="book.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="book.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="book.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="book.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
+<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="part.titlepage.recto">
+  <div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:call-template name="division.title">
+<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="partinfo/subtitle">
+      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/corpauthor"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/authorgroup"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/author"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/othercredit"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/releaseinfo"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/copyright"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/legalnotice"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/pubdate"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revision"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revhistory"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/abstract"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="part.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="part.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="part.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="part.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="part.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="part.titlepage.before.recto"/>
+      <xsl:call-template name="part.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="part.titlepage.before.verso"/>
+      <xsl:call-template name="part.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="part.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="part.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="part.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="part.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
+<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="partintroinfo/title">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="partintroinfo/subtitle">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/othercredit"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="partintro.titlepage">
+  <div>
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="partintro.titlepage.before.recto"/>
+      <xsl:call-template name="partintro.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="partintro.titlepage.before.verso"/>
+      <xsl:call-template name="partintro.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="partintro.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="partintro.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="partintro.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="partintro.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="reference.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="referenceinfo/title">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="referenceinfo/subtitle">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/othercredit"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="reference.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="reference.titlepage.separator"><hr/>
+</xsl:template>
+
+<xsl:template name="reference.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="reference.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="reference.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="reference.titlepage.before.recto"/>
+      <xsl:call-template name="reference.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="reference.titlepage.before.verso"/>
+      <xsl:call-template name="reference.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="reference.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="reference.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="reference.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="reference.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
+<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.recto">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="refentry.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="refentry.titlepage.before.recto"/>
+      <xsl:call-template name="refentry.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="refentry.titlepage.before.verso"/>
+      <xsl:call-template name="refentry.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="refentry.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="refentry.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="refentry.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.recto">
+  <div xsl:use-attribute-sets="dedication.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="dedicationinfo/subtitle">
+      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="dedication.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="dedication.titlepage.before.recto"/>
+      <xsl:call-template name="dedication.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="dedication.titlepage.before.verso"/>
+      <xsl:call-template name="dedication.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="dedication.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="dedication.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="dedication.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="dedication.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="dedication.titlepage.recto.style">
+<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.recto">
+  <div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::acknowledgements[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="acknowledgementsinfo/subtitle">
+      <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="acknowledgementsinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="acknowledgements.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="acknowledgements.titlepage.before.recto"/>
+      <xsl:call-template name="acknowledgements.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="acknowledgements.titlepage.before.verso"/>
+      <xsl:call-template name="acknowledgements.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="acknowledgements.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="acknowledgements.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="acknowledgements.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="acknowledgements.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+<xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="preface.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="prefaceinfo/title">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="prefaceinfo/subtitle">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="preface.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="preface.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="preface.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="preface.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="preface.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="preface.titlepage.before.recto"/>
+      <xsl:call-template name="preface.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="preface.titlepage.before.verso"/>
+      <xsl:call-template name="preface.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="preface.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="preface.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="preface.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="preface.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
+<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="chapterinfo/title">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="chapterinfo/subtitle">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/othercredit"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="chapter.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="chapter.titlepage.before.recto"/>
+      <xsl:call-template name="chapter.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="chapter.titlepage.before.verso"/>
+      <xsl:call-template name="chapter.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="chapter.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="chapter.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="chapter.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="chapter.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="chapter.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="chapter.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="appendixinfo/title">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="appendixinfo/subtitle">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/othercredit"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="appendix.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="appendix.titlepage.before.recto"/>
+      <xsl:call-template name="appendix.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="appendix.titlepage.before.verso"/>
+      <xsl:call-template name="appendix.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="appendix.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="appendix.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="appendix.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="appendix.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="section.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sectioninfo/title">
+      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sectioninfo/subtitle">
+      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/othercredit"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/releaseinfo"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/copyright"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/legalnotice"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/pubdate"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revision"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revhistory"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/abstract"/>
+  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="section.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="section.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="section.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="section.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="section.titlepage.before.recto"/>
+      <xsl:call-template name="section.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="section.titlepage.before.verso"/>
+      <xsl:call-template name="section.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="section.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="section.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="section.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="section.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
+<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sect1info/title">
+      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sect1info/subtitle">
+      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/othercredit"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/releaseinfo"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/copyright"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/legalnotice"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/pubdate"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revision"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revhistory"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/abstract"/>
+  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect1.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect1.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="sect1.titlepage.before.recto"/>
+      <xsl:call-template name="sect1.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="sect1.titlepage.before.verso"/>
+      <xsl:call-template name="sect1.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="sect1.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect1.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect1.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect1.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sect2info/title">
+      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sect2info/subtitle">
+      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/othercredit"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/releaseinfo"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/copyright"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/legalnotice"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/pubdate"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revision"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revhistory"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/abstract"/>
+  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect2.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect2.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="sect2.titlepage.before.recto"/>
+      <xsl:call-template name="sect2.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="sect2.titlepage.before.verso"/>
+      <xsl:call-template name="sect2.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="sect2.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect2.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect2.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect2.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sect3info/title">
+      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sect3info/subtitle">
+      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/othercredit"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/releaseinfo"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/copyright"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/legalnotice"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/pubdate"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revision"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revhistory"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/abstract"/>
+  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect3.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect3.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="sect3.titlepage.before.recto"/>
+      <xsl:call-template name="sect3.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="sect3.titlepage.before.verso"/>
+      <xsl:call-template name="sect3.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="sect3.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect3.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect3.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect3.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sect4info/title">
+      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sect4info/subtitle">
+      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/othercredit"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/releaseinfo"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/copyright"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/legalnotice"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/pubdate"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revision"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revhistory"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/abstract"/>
+  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect4.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect4.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="sect4.titlepage.before.recto"/>
+      <xsl:call-template name="sect4.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="sect4.titlepage.before.verso"/>
+      <xsl:call-template name="sect4.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="sect4.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect4.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect4.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect4.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sect5info/title">
+      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sect5info/subtitle">
+      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/othercredit"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/releaseinfo"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/copyright"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/legalnotice"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/pubdate"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revision"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revhistory"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/abstract"/>
+  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sect5.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sect5.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="sect5.titlepage.before.recto"/>
+      <xsl:call-template name="sect5.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="sect5.titlepage.before.verso"/>
+      <xsl:call-template name="sect5.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="sect5.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sect5.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sect5.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="sect5.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="simplesectinfo/title">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="simplesectinfo/subtitle">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/corpauthor"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/authorgroup"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/othercredit"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/othercredit"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/releaseinfo"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/copyright"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/legalnotice"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revision"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revhistory"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
+  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/abstract"/>
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="simplesect.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="simplesect.titlepage.before.recto"/>
+      <xsl:call-template name="simplesect.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="simplesect.titlepage.before.verso"/>
+      <xsl:call-template name="simplesect.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="simplesect.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="simplesect.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="simplesect.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="corpauthor" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:call-template name="section.authorgroup">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:call-template name="section.author">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="othercredit" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:call-template name="titlepage.releaseinfo">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="copyright" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="legalnotice" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:call-template name="titlepage.pubdate">
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="revision" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="revhistory" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template match="abstract" mode="simplesect.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.recto">
+  <div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="bibliographyinfo/subtitle">
+      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="bibliography.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="bibliography.titlepage.before.recto"/>
+      <xsl:call-template name="bibliography.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="bibliography.titlepage.before.verso"/>
+      <xsl:call-template name="bibliography.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="bibliography.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.recto">
+  <div xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="glossaryinfo/subtitle">
+      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="glossary.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="glossary.titlepage.before.recto"/>
+      <xsl:call-template name="glossary.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="glossary.titlepage.before.verso"/>
+      <xsl:call-template name="glossary.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="glossary.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="glossary.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="glossary.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="index.titlepage.recto">
+  <div xsl:use-attribute-sets="index.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="indexinfo/subtitle">
+      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="index.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="index.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="index.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="index.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="index.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="index.titlepage.before.recto"/>
+      <xsl:call-template name="index.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="index.titlepage.before.verso"/>
+      <xsl:call-template name="index.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="index.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="index.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="index.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="index.titlepage.recto.style">
+<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.recto">
+  <div xsl:use-attribute-sets="setindex.titlepage.recto.style">
+<xsl:call-template name="component.title">
+<xsl:with-param name="node" select="ancestor-or-self::setindex[1]"/>
+</xsl:call-template></div>
+  <xsl:choose>
+    <xsl:when test="setindexinfo/subtitle">
+      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="setindexinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="setindex.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="setindex.titlepage.before.recto"/>
+      <xsl:call-template name="setindex.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="setindex.titlepage.before.verso"/>
+      <xsl:call-template name="setindex.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="setindex.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="setindex.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="setindex.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="setindex.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="setindex.titlepage.recto.style">
+<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.recto">
+  <xsl:choose>
+    <xsl:when test="sidebarinfo/title">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/title"/>
+    </xsl:when>
+    <xsl:when test="docinfo/title">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/title"/>
+    </xsl:when>
+    <xsl:when test="info/title">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/title"/>
+    </xsl:when>
+    <xsl:when test="title">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="title"/>
+    </xsl:when>
+  </xsl:choose>
+
+  <xsl:choose>
+    <xsl:when test="sidebarinfo/subtitle">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="docinfo/subtitle">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    </xsl:when>
+    <xsl:when test="info/subtitle">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/subtitle"/>
+    </xsl:when>
+    <xsl:when test="subtitle">
+      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="subtitle"/>
+    </xsl:when>
+  </xsl:choose>
+
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.verso">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.separator">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.before.recto">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage.before.verso">
+</xsl:template>
+
+<xsl:template name="sidebar.titlepage">
+  <div class="titlepage">
+    <xsl:variable name="recto.content">
+      <xsl:call-template name="sidebar.titlepage.before.recto"/>
+      <xsl:call-template name="sidebar.titlepage.recto"/>
+    </xsl:variable>
+    <xsl:variable name="recto.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$recto.content"/></div>
+    </xsl:if>
+    <xsl:variable name="verso.content">
+      <xsl:call-template name="sidebar.titlepage.before.verso"/>
+      <xsl:call-template name="sidebar.titlepage.verso"/>
+    </xsl:variable>
+    <xsl:variable name="verso.elements.count">
+      <xsl:choose>
+        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
+          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
+      <div><xsl:copy-of select="$verso.content"/></div>
+    </xsl:if>
+    <xsl:call-template name="sidebar.titlepage.separator"/>
+  </div>
+</xsl:template>
+
+<xsl:template match="*" mode="sidebar.titlepage.recto.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="*" mode="sidebar.titlepage.verso.mode">
+  <!-- if an element isn't found in this mode, -->
+  <!-- try the generic titlepage.mode -->
+  <xsl:apply-templates select="." mode="titlepage.mode"/>
+</xsl:template>
+
+<xsl:template match="title" mode="sidebar.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<xsl:call-template name="formal.object.heading">
+<xsl:with-param name="object" select="ancestor-or-self::sidebar[1]"/>
+</xsl:call-template>
+</div>
+</xsl:template>
+
+<xsl:template match="subtitle" mode="sidebar.titlepage.recto.auto.mode">
+<div xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
+</div>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/share/xsl/default.xsl b/share/xsl/freebsd-xhtml.xsl
similarity index 65%
rename from share/xsl/default.xsl
rename to share/xsl/freebsd-xhtml.xsl
index 29122aadc4..9b5a37fe8e 100644
--- a/share/xsl/default.xsl
+++ b/share/xsl/freebsd-xhtml.xsl
@@ -8,9 +8,8 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="freebsd.xsl"/>
-
-  <!-- Redefine variables, and replace templates as necessary here -->
+  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/docbook.xsl"/>
 
+  <!-- Pull in common XHTML customizations -->
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
 </xsl:stylesheet>
-
diff --git a/share/xsl/freebsd.xsl b/share/xsl/freebsd.xsl
deleted file mode 100644
index 0d0e09fa1c..0000000000
--- a/share/xsl/freebsd.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- $FreeBSD$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'
-                xmlns="http://www.w3.org/TR/xhtml1/transitional"
-                exclude-result-prefixes="#default">
-
-  <!-- Pull in the base stylesheets -->
-  <!-- XXX hardcoded path.  Very bad.  Should be turned in to a paramater -->
-  <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
-
-  <!-- Redefine variables, and replace templates as necessary here -->
-  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
-    <xsl:call-template name="inline.monoseq"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/share/xsl/titlepage.templates.xml b/share/xsl/titlepage.templates.xml
new file mode 100644
index 0000000000..af592b0552
--- /dev/null
+++ b/share/xsl/titlepage.templates.xml
@@ -0,0 +1,718 @@
+<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!-- ==================================================================== -->
+
+<!-- $FreeBSD$ -->
+
+<!--
+	Use this template to generate freebsd-xhtml-titlepage.xsl by
+	running:
+
+	 xsltproc /usr/local/share/xsl/docbook/template/titlepage.xsl titlepage.templates.xml > freebsd-xhtml-titlepage.xsl
+
+-->
+
+<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="division.title"
+           param:node="ancestor-or-self::part[1]"/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="partintro" t:wrapper="div">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <hr/>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+<!-- uncomment this if you want refentry titlepages
+    <title t:force="1"
+           t:named-template="refentry.title"
+           param:node="ancestor-or-self::refentry[1]"/>
+-->
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator/>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+  <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
+    <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::dedication[1]"/>
+    <subtitle/>
+    </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
+    <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::acknowledgements[1]"/>
+    <subtitle/>
+    </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="chapter.authorgroup"/>
+    <author t:named-template="chapter.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup/>
+    <author/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title/>
+    <subtitle/>
+    <corpauthor/>
+    <authorgroup t:named-template="section.authorgroup"/>
+    <author t:named-template="section.author"/>
+    <othercredit/>
+    <releaseinfo t:named-template="titlepage.releaseinfo"/>
+    <copyright/>
+    <legalnotice/>
+    <pubdate t:named-template="titlepage.pubdate"/>
+    <revision/>
+    <revhistory/>
+    <abstract/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+    <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::bibliography[1]"/>
+    <subtitle/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::glossary[1]"/>
+    <subtitle/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::index[1]"/>
+    <subtitle/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::setindex[1]"/>
+    <subtitle/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:named-template="formal.object.heading"
+           param:object="ancestor-or-self::sidebar[1]"/>
+    <subtitle/>
+  </t:titlepage-content>
+
+  <t:titlepage-content t:side="verso">
+  </t:titlepage-content>
+
+  <t:titlepage-separator>
+  </t:titlepage-separator>
+
+  <t:titlepage-before t:side="recto">
+  </t:titlepage-before>
+
+  <t:titlepage-before t:side="verso">
+  </t:titlepage-before>
+</t:titlepage>
+
+<!-- ==================================================================== -->
+
+</t:templates>
diff --git a/sr_YU.ISO8859-2/share/xml/catalog b/sr_YU.ISO8859-2/share/xml/catalog
index 161058647e..2422c1740c 100644
--- a/sr_YU.ISO8859-2/share/xml/catalog
+++ b/sr_YU.ISO8859-2/share/xml/catalog
@@ -1,11 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-  --
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-        "l10n.ent"
+       "freebsd.dsl"
diff --git a/sr_YU.ISO8859-2/share/xml/entities.ent b/sr_YU.ISO8859-2/share/xml/entities.ent
index 1e953d7362..04c582d0f3 100644
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
diff --git a/sr_YU.ISO8859-2/share/xml/freebsd.dsl b/sr_YU.ISO8859-2/share/xml/freebsd.dsl
index 9b13aea7c8..1a35d82243 100644
--- a/sr_YU.ISO8859-2/share/xml/freebsd.dsl
+++ b/sr_YU.ISO8859-2/share/xml/freebsd.dsl
@@ -2,8 +2,6 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 <!ENTITY % lang.sr.dsssl "IGNORE">
 ]>
 
@@ -15,36 +13,6 @@
         (define %gentext-language% "sr")
       ]]>
 
-      <![ %output.html; [
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "This, and other documents, can be downloaded from ")
-	        (make element gi: "a"
-                      attributes: (list (list "href" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc"))
-                  (literal "ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "For questions about FreeBSD, read the ")
-                (make element gi: "a"
-                      attributes: (list (list "href" "http://www.freebsd.org/docs.html"))
-                  (literal "documentation"))
-                (literal " before contacting <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "For questions about this documentation, e-mail <")
-                (make element gi: "a"
-                      attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
index abb4171564..1540da870f 100644
--- a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
+++ b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-9" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Turkish Documentation Project
diff --git a/tr_TR.ISO8859-9/share/xml/catalog b/tr_TR.ISO8859-9/share/xml/catalog
deleted file mode 100644
index bae3bb06c0..0000000000
--- a/tr_TR.ISO8859-9/share/xml/catalog
+++ /dev/null
@@ -1,12 +0,0 @@
---
- $FreeBSD$
---
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
diff --git a/tr_TR.ISO8859-9/share/xml/catalog.xml b/tr_TR.ISO8859-9/share/xml/catalog.xml
index 12c0f02504..a3feec86ca 100644
--- a/tr_TR.ISO8859-9/share/xml/catalog.xml
+++ b/tr_TR.ISO8859-9/share/xml/catalog.xml
@@ -9,4 +9,8 @@
                  rewritePrefix="../../"/>
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
+
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
 </catalog>
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index 1e953d7362..04c582d0f3 100644
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"nonexistent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks;
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/tr_TR.ISO8859-9/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/articles/contributing/article.xml b/zh_CN.GB2312/articles/contributing/article.xml
index 214091369e..4309e0c9bc 100644
--- a/zh_CN.GB2312/articles/contributing/article.xml
+++ b/zh_CN.GB2312/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/cvs-freebsd/article.xml b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
index 92929ac908..406c9c9c26 100644
--- a/zh_CN.GB2312/articles/cvs-freebsd/article.xml
+++ b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/linux-users/article.xml b/zh_CN.GB2312/articles/linux-users/article.xml
index 8bbaa904cb..4d0cf09a68 100644
--- a/zh_CN.GB2312/articles/linux-users/article.xml
+++ b/zh_CN.GB2312/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -149,7 +146,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
       <title>Ports</title>
 
       <para>&os; �ĵڶ��ְ�װӦ�ó���ķ�������ʹ�� Ports �׼��ˡ�
-        Ports �׼��� &os �ϵ�һ������ <filename>Makefile</filename>
+        Ports �׼��� &os; �ϵ�һ������ <filename>Makefile</filename>
         ��һЩ�����ļ����ض���Դ�붨�ư�װ������������Ŀ�ܡ�
         ����װһ�� port ʱϵͳ���ȡ����Դ�룬
         Ӧ���κ�����Ҫ�IJ���������Դ�룬
diff --git a/zh_CN.GB2312/articles/nanobsd/article.xml b/zh_CN.GB2312/articles/nanobsd/article.xml
index aea6323d71..6ad4ed1002 100644
--- a/zh_CN.GB2312/articles/nanobsd/article.xml
+++ b/zh_CN.GB2312/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/rc-scripting/article.xml b/zh_CN.GB2312/articles/rc-scripting/article.xml
index b5c73861b9..9a3e890f9d 100644
--- a/zh_CN.GB2312/articles/rc-scripting/article.xml
+++ b/zh_CN.GB2312/articles/rc-scripting/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -911,8 +908,8 @@ start_precmd="${name}_prestart"
 
 mumbled_prestart()
 {
-	if ! checkyesno frotz_enable && \
-	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
+	if ! checkyesno frotz_enable &amp;&amp; \
+	    ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&amp;1; then
 		force_depend frotz || return 1<co id="rcng-hookup-force"/>
 	fi
 	return 0
diff --git a/zh_CN.GB2312/articles/remote-install/article.xml b/zh_CN.GB2312/articles/remote-install/article.xml
index 7045b94dfa..0df5aecb0e 100644
--- a/zh_CN.GB2312/articles/remote-install/article.xml
+++ b/zh_CN.GB2312/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/book.xml b/zh_CN.GB2312/books/arch-handbook/book.xml
index ad0d0fac92..5300306982 100644
--- a/zh_CN.GB2312/books/arch-handbook/book.xml
+++ b/zh_CN.GB2312/books/arch-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % mac-entities SYSTEM "mac.ent">
diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
index 99d683bef0..162da2b684 100644
--- a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 The FreeBSD Documentation Project
 The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/chapters.ent b/zh_CN.GB2312/books/arch-handbook/chapters.ent
index 03de4f95ce..2a1dc3bdeb 100644
--- a/zh_CN.GB2312/books/arch-handbook/chapters.ent
+++ b/zh_CN.GB2312/books/arch-handbook/chapters.ent
@@ -34,7 +34,7 @@
 <!ENTITY chap.pccard			SYSTEM "pccard/chapter.xml">
 
 <!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
   <!ENTITY chap.index			SYSTEM "index.xml">
 ]]>
 <!ENTITY chap.index			"">
diff --git a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
index c7e1491049..5b5e8a7817 100644
--- a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
index 70c31231cc..b24b960685 100644
--- a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
index a6a5fc85f4..c06f9badd2 100644
--- a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
index 5416e829d1..50484936bf 100644
--- a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
index 4103839c43..4bd187862e 100644
--- a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
index 9202891559..e9ec8cf8e2 100644
--- a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
     Copyright (c) 2002-2005 Networks Associates Technology, Inc.
     All rights reserved.
@@ -2770,8 +2770,8 @@
             </tgroup>
           </informaltable>
 
-          <para>���� &man.listen.2 �׽��� <parameter>oldsocket</parameter>��
-            Ϊ�½� &man.accept.2 ���׽��� <parameter>newsocket</parameter>�����ñ�ǡ�</para>
+          <para>���� &man.listen.2; �׽��� <parameter>oldsocket</parameter>��
+            Ϊ�½� &man.accept.2; ���׽��� <parameter>newsocket</parameter>�����ñ�ǡ�</para>
         </sect4>
 
         <sect4 id="mac-mpo-relabel-pipe">
diff --git a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
index 7a0e466ead..f25293bf72 100644
--- a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 	The FreeBSD Documentation Project
 	The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
index 5df8822a87..c27a32e244 100644
--- a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
index 750529c06e..c3aa94e1c3 100644
--- a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
index f5d43263b2..be793ee339 100644
--- a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
index 373e8b166f..c2369c60a9 100644
--- a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
index 2390a70454..c2c97f1803 100644
--- a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
index e38fe038ed..f62316c6e4 100644
--- a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
index 93653e6404..eaa9e5a813 100644
--- a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
index 7a0d44d10f..89ce63e11b 100644
--- a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index 631ed2bfca..2163726fd9 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -41,7 +41,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -317,30 +316,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
index c228ec0036..c4b8385eb2 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -640,7 +640,7 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
 	  <acronym>DVMRP</acronym> �ಥ·��Э�飬
 	  ��������öಥ�ij��ϣ�
 	  ���ѱ� &man.pim.4; ȡ���� &man.mrouted.8; �Լ���ص�
-          &man.map-mbone.8; �� &man.mrinfo.8 ���߿����� &os; �� Ports&nbsp;Collection
+          &man.map-mbone.8; �� &man.mrinfo.8; ���߿����� &os; �� Ports&nbsp;Collection
           <filename role="package">net/mrouted</filename> ���ҵ���</para>
       </note>
     </sect2>
@@ -1874,7 +1874,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
 	  <para>��������һ����������
 	    <application>hostapd</application>��</para>
 
-	  <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
 
 	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -5670,7 +5670,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	  �ص�ԭ�����ݷ������� ������������
 	  <hostid>provider.example.org</hostid> ��ʹ����������</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>���������Ҫ������������������Ӧ���Ǹ� <devicename>carp</devicename>
 	  �ӿ��Ͻ��С�</para>
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.xml b/zh_CN.GB2312/books/handbook/audit/chapter.xml
index ee06a423a2..f175d4267d 100644
--- a/zh_CN.GB2312/books/handbook/audit/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -163,7 +163,7 @@ requirements. -->
 
     <para>�����¼���Ƶ�֧�֣� �Ѿ����׼�� <maketarget>installworld</maketarget>
       ������ɡ� ����Ա����ͨ���鿴
-      <filename role="directory">/etc/security</filename> ��������ȷ����һ�㡣
+      <filename class="directory">/etc/security</filename> ��������ȷ����һ�㡣
       ��Ӧ�ܿ���һЩ������ <emphasis>audit</emphasis> ��ͷ���ļ���
       ���� <filename>audit_event</filename>��</para>
 
@@ -463,7 +463,7 @@ www:fc,+ex:no</programlisting>
       <para>��Ƽ������� BSM �����Ƹ�ʽ����ģ� ��˱���ʹ�ù�������������޸ģ�
 	����ת��Ϊ�ı��� &man.praudit.1;
 	�����ܹ��������ļ�ת��Ϊ�򵥵��ı���ʽ�� ��
-	&man.auditreduce.1 ���������Ϊ������ �浵���ӡĿ����Ũ�������־�ļ���
+	&man.auditreduce.1; ���������Ϊ������ �浵���ӡĿ����Ũ�������־�ļ���
 	<command>auditreduce</command> ֧��һϵ��ɸѡ������ �����¼����͡� �¼��ࡢ
 	�û��� �¼������ں�ʱ�䣬 �Լ��ļ�·�����������</para>
 
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.xml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
index ec6461b153..455095761c 100644
--- a/zh_CN.GB2312/books/handbook/basics/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -1049,7 +1049,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1069,7 +1069,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1102,7 +1102,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1128,7 +1128,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1153,7 +1153,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1445,7 +1445,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
index 641b6cd24a..03140328a5 100644
--- a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Chinese Documentation Project
 
@@ -58,7 +58,7 @@
       </listitem>
 
       <listitem>
-	<para>FreeBSD & Windows ��������ʵ�� ���������ģ���
+	<para>FreeBSD &amp; Windows ��������ʵ�� ���������ģ���
 	  <ulink url="http://www.tdpress.com/">�����������</ulink>��
 	    ISBN 7-113-03845-X��</para>
       </listitem>
diff --git a/zh_CN.GB2312/books/handbook/book.xml b/zh_CN.GB2312/books/handbook/book.xml
index fefd875a69..0840e315f9 100644
--- a/zh_CN.GB2312/books/handbook/book.xml
+++ b/zh_CN.GB2312/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/zh_CN.GB2312/books/handbook/boot/chapter.xml b/zh_CN.GB2312/books/handbook/boot/chapter.xml
index 27c2838788..67e51f1240 100644
--- a/zh_CN.GB2312/books/handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Project
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index b407640a85..5798715c08 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -583,7 +583,7 @@ Loading /boot/defaults/loader.conf
 		<imageobject>
 		  <imagedata
 		    fileref="bsdinstall/bsdinstall-boot-loader-menu"
-		    format="PNG"/>
+		   />
 		</imageobject>
 	      </mediaobject>
 	    </figure>
@@ -645,14 +645,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  <acronym role="Programmable Read Only Memory">PROM</acronym> ��ʾ����
 	  ��Ӧ��������ʾ��</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="bsdinstall-prompt-single" coords="1 5"/>
-	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="bsdinstall-prompt-single"/>
+<prompt>ok {0} </prompt><co id="bsdinstall-prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="bsdinstall-prompt-single">
@@ -664,7 +658,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		���е����ֱ�ʾ���õ� CPU ������</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>���ڣ� ���� CDROM ���� <acronym>PROM</acronym> ��ʾ��������
 	  <command>boot cdrom</command>��</para>
@@ -856,7 +849,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-choose-mode"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -900,7 +893,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-keymap-select-default"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -913,7 +906,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -940,7 +933,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-hostname"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -962,7 +955,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-config-components"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1035,7 +1028,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-netinstall-files"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1052,7 +1045,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-netinstall-mirrorselect"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1077,7 +1070,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-part-guided-manual"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1093,7 +1086,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-guided-disk"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1112,7 +1105,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-entire-part"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1130,7 +1123,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-part-review"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1148,7 +1141,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-manual-create"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1164,7 +1157,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-manual-partscheme"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1245,7 +1238,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-part-manual-addpart"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1399,7 +1392,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-final-confirmation"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1427,7 +1420,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       <mediaobject>
 	<imageobject>
 	  <imagedata fileref="bsdinstall/bsdinstall-distfile-fetching"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1442,7 +1435,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-distfile-verifying"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1456,7 +1449,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<imageobject>
 	  <imagedata
 	    fileref="bsdinstall/bsdinstall-distfile-extracting"
-	    format="PNG"/>
+	   />
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1486,7 +1479,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-post-root-passwd"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1512,7 +1505,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-configure-network-interface"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1544,8 +1537,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-scan"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-scan"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1565,8 +1557,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-accesspoints"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1584,8 +1575,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <mediaobject>
 	    <imageobject>
 	      <imagedata
-		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"
-		format="PNG"/>
+		fileref="bsdinstall/bsdinstall-configure-wireless-wpa2setup"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1605,8 +1595,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"/>
+		fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1637,7 +1626,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1655,7 +1644,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv4-static"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1696,8 +1685,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"/>
+		fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1724,7 +1712,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-slaac"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1742,7 +1730,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	      <imageobject>
 		<imagedata
 		  fileref="bsdinstall/bsdinstall-configure-network-interface-ipv6-static"
-		  format="PNG"/>
+		 />
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -1785,8 +1773,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"/>
+		fileref="bsdinstall/bsdinstall-configure-network-ipv4-dns"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -1809,7 +1796,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-set-clock-local-utc"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1826,7 +1813,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-region"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1840,7 +1827,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-timezone-country"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1853,7 +1840,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-timezone-zone"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1867,7 +1854,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-timezone-confirm"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1888,7 +1875,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-config-services"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1935,7 +1922,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-config-crashdump"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1958,7 +1945,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-adduser1"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1971,7 +1958,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-adduser2"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2064,7 +2051,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-adduser3"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2088,7 +2075,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-finalconfiguration"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2144,7 +2131,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <imageobject>
 	    <imagedata
 	      fileref="bsdinstall/bsdinstall-final-modification-shell"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2161,7 +2148,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<mediaobject>
 	  <imageobject>
 	    <imagedata fileref="bsdinstall/bsdinstall-mainexit"
-	      format="PNG"/>
+	     />
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/zh_CN.GB2312/books/handbook/chapters.ent b/zh_CN.GB2312/books/handbook/chapters.ent
index 0743b39db8..f2ec296043 100644
--- a/zh_CN.GB2312/books/handbook/chapters.ent
+++ b/zh_CN.GB2312/books/handbook/chapters.ent
@@ -11,235 +11,62 @@
      $FreeBSD$
 -->
 
-<!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.install;[
   <!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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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/zh_CN.GB2312/books/handbook/colophon.xml b/zh_CN.GB2312/books/handbook/colophon.xml
index 6dbf3c543c..913048bb21 100644
--- a/zh_CN.GB2312/books/handbook/colophon.xml
+++ b/zh_CN.GB2312/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/config/chapter.xml b/zh_CN.GB2312/books/handbook/config/chapter.xml
index 0e9f07d5c2..dcb84dd2bd 100644
--- a/zh_CN.GB2312/books/handbook/config/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -674,7 +674,7 @@ sshd is running as pid 433.</screen>
       &man.rc.8; �� &man.rc.subr.8; �����ֲ����ҵ���
       ���������׫д�Լ��� <filename>rc.d</filename> �ű���
       ������еĽű�����һЩ�Ľ��� Ҳ���Բο�
-      <ulink url="&url.articles.rc-scripting">��ƪ����</ulink>��</para>
+      <ulink url="&url.articles.rc-scripting;">��ƪ����</ulink>��</para>
   </sect1>
 
   <sect1 id="config-network-setup">
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
index f055a6f82a..111054dd17 100644
--- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -1064,72 +1064,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	<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>ԭ���� </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> ��һ��ͨ�� &man.rsync.1;
-        �ֿ�����Ѱ�װ�� &os; �ĵ��򵥿��ٵķ�����
-        һ̨ <quote><application>Docsnap</application> ������</quote>
-        �����ĵ�ԭ���룬 ��ÿ��Сʱ�����Զ��� HTML ��ʽ�� ʹ��
-        <application>Docsnap</application> ������Ҫ
-        <filename role="package">textproc/docproj</filename>��
-        �е�ֻ�Ƕ��ѱ����ĵ����ɵIJ�����</para>
-
-      <para>ʹ�������Ψһ��Ҫ�ľ���
-        <filename role="package">net/rsync</filename> port
-        ���߶�Ӧ�Ķ����ư��� ��ʹ�����µ����װ��</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
-      <note>
-        <para><application>Docsnap</application> ԭ���DZ��������°�װ��
-          <filename class="directory">/usr/share/doc</filename>
-          ���ĵ��� �������µ�����ͬ��������������Ŀ¼�� �����û���Ŀ¼��
-          �����Ͳ���Ҫ <username>root</username> Ȩ���ˡ�</para>
-      </note>
-
-      <para>�����ĵ��� �������µ����</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <note>
-        <para>Ŀǰ��ֻ����������ʾ�� <hostid>docsnap.sk.FreeBSD.org</hostid>
-          ��һ̨ <application>Docsnap</application> ��������</para>
-      </note>
-
-      <para>�˴���Ҫʹ�� <option>--delete</option> ��־��
-        ��Ϊ����Щ <command>make installworld</command> ʱ��װ��
-        <filename class="directory">/usr/share/doc</filename>
-        �µ��ļ����ܻᱻ������Ƴ��� ��ʹ�����µ�����������õ��ļ���</para>
-
-      <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
-      <para>���ֻ�������ĵ���ijһ�Ӽ��� ���磬
-        ����ʹ�����µ����������ĵ���Ӣ�IJ��֣�</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">
@@ -1201,7 +1135,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	  </listitem>
 
 	  <listitem>
-	    <para>�޸���©�Ŀ�ݷ�ʽ���κ� &os.current
+	    <para>�޸���©�Ŀ�ݷ�ʽ���κ� &os.current;
 	      �ļȶ��汾���޸���֪��©��ͬʱ�ֿ��ܻ�����µĴ�©��</para>
 	  </listitem>
 
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.xml b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
index ba0f4f8f52..b06e480b45 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/disks/chapter.xml b/zh_CN.GB2312/books/handbook/disks/chapter.xml
index 4184075bc5..2038e9b711 100644
--- a/zh_CN.GB2312/books/handbook/disks/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -293,7 +293,7 @@
 
 	<para>�������û�а�װ�����IJ���ϵͳ������ʹ�� <literal>dedicated</literal>
 	  ģʽ����ס����ģʽ���ܻ�Ū�� Microsoft �IJ���ϵͳ����������������ƻ���
-	  ����ʶ���ҵ��� IBM &os2 �� <quote>appropriate</quote> ������</para>
+	  ����ʶ���ҵ��� IBM &os2; �� <quote>appropriate</quote> ������</para>
 
 	<screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput>
 &prompt.root; <userinput>bsdlabel -Bw da1 auto</userinput>
@@ -2431,16 +2431,6 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	  �κ�������ݶ�ʧ�ĵ����Ѷ������ٴη����� ���ڻ�һЩʱ�䣬
 	  Ҳ���������´η�������ʱ����һ�ѡ�</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* I Did Not Prepare for the Disaster, What Now?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
@@ -3993,7 +3983,7 @@ case "$1" in
 
 		# Wait for any "hastd secondary" processes to stop
 		for disk in ${resources}; do
-			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+			while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
 				sleep 1
 			done
 
@@ -4008,7 +3998,7 @@ case "$1" in
 		# Wait for the /dev/hast/* devices to appear
 		for disk in ${resources}; do
 			for I in $( jot 60 ); do
-				[ -c "/dev/hast/${disk}" ] && break
+				[ -c "/dev/hast/${disk}" ] &amp;&amp; break
 				sleep 0.5
 			done
 
@@ -4041,7 +4031,7 @@ case "$1" in
 				umount -f /hast/${disk}
 			fi
 			sleep $delay
-			hastctl role secondary ${disk} 2>&1
+			hastctl role secondary ${disk} 2>&amp;1
 			if [ $? -ne 0 ]; then
 				logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
 				exit 1
diff --git a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
index feb7b222ae..d240e98bf5 100644
--- a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 Recently I suggested to myself that this should become a profiling
 and debugging chapter, which covers things like ktrace(1) and
diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.xml b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
index e96e47e3c3..dad45a4574 100644
--- a/zh_CN.GB2312/books/handbook/eresources/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -1831,6 +1831,11 @@
 
     <sect2 id="eresources-web-mirrors">
       <title>Official Mirrors</title>
+
+      &chap.eresources.www.index.inc;
+
+      &chap.mirrors.lastmod.inc;
+
       &chap.eresources.www.inc;
     </sect2>
   </sect1>
diff --git a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
index d9c4d8d7bc..d33b6c1c6f 100644
--- a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      Original Revision: r37255
@@ -200,7 +200,7 @@ example      17547136       0 17547136     0%    /example</screen>
           �������������ͨ���ļ�ϵͳ������������
           ����������������ʾ���������û��ܹ������洴���ļ��������</para>
 
-	<screen>&prompt.root <userinput>cd /example</userinput>
+	<screen>&prompt.root; <userinput>cd /example</userinput>
 &prompt.root; <userinput>ls</userinput>
 &prompt.root; <userinput>touch testfile</userinput>
 &prompt.root; <userinput>ls -al</userinput>
diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
index 6fa8b5e64e..2e0c3be2be 100644
--- a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.xml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
index 0f97ecf17d..cbf6ca6033 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index 063d6e65d2..ae349ee96d 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -863,7 +863,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -902,14 +902,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  <command>~#</command>) �Ա���� PROM ��ʾ����
 	  ��Ӧ������������������</para>
 
-	<screenco>
-	  <areaspec>
-	    <area id="prompt-single" coords="1 5"/>
-	    <area id="prompt-smp" coords="2 5"/>
-	  </areaspec>
-
-	  <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	  <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	  <calloutlist>
 	    <callout arearefs="prompt-single">
@@ -922,7 +916,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		��ϵͳ�п��õ� CPU ������</para>
 	    </callout>
 	  </calloutlist>
-	</screenco>
 
 	<para>��ʱ�� �� CDROM ������������ ���� PROM ��ʾ�����棬
 	  ���� <command>boot cdrom</command>��</para>
@@ -1028,7 +1021,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1043,7 +1036,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-keymap" format="PNG"/>
+	    <imagedata fileref="install/config-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1053,7 +1046,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1099,7 +1092,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1115,7 +1108,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1127,7 +1120,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1155,7 +1148,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1174,7 +1167,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1192,7 +1185,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1202,7 +1195,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1233,7 +1226,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1371,7 +1364,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1428,7 +1421,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1466,7 +1459,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1507,7 +1500,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1534,7 +1527,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1760,7 +1753,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1785,7 +1778,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1810,7 +1803,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1827,7 +1820,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1842,7 +1835,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1858,7 +1851,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1878,7 +1871,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1922,7 +1915,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1971,7 +1964,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2001,7 +1994,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2174,7 +2167,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2213,7 +2206,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2376,7 +2369,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2468,7 +2461,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2543,7 +2536,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2595,7 +2588,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2641,7 +2634,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2655,7 +2648,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2673,7 +2666,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2686,7 +2679,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2726,7 +2719,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2738,7 +2731,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2750,7 +2743,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2812,7 +2805,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2825,7 +2818,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2840,7 +2833,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2853,7 +2846,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2867,7 +2860,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2881,7 +2874,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2921,7 +2914,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2940,7 +2933,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2966,7 +2959,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2981,7 +2974,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3020,7 +3013,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3033,7 +3026,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3125,7 +3118,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3185,7 +3178,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3252,7 +3245,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3314,7 +3307,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3362,7 +3355,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3384,7 +3377,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.xml b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
index 81d81c0351..6e9731cac5 100644
--- a/zh_CN.GB2312/books/handbook/introduction/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.xml b/zh_CN.GB2312/books/handbook/jails/chapter.xml
index 4294b556be..3ad9849513 100644
--- a/zh_CN.GB2312/books/handbook/jails/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
     The FreeBSD Documentation Project
     The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
index 93a2be60e3..6d0832e9df 100644
--- a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/l10n/chapter.xml b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
index ef80573db9..2975100ce9 100644
--- a/zh_CN.GB2312/books/handbook/l10n/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
index b6635ede8e..01e9ee260f 100644
--- a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -542,14 +542,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -797,7 +797,7 @@ exit 0</programlisting>
 	    contain the following:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/zh_CN.GB2312/books/handbook/mac/chapter.xml b/zh_CN.GB2312/books/handbook/mac/chapter.xml
index e66c3e3408..e1ee68c5b7 100644
--- a/zh_CN.GB2312/books/handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -505,7 +505,7 @@ test: biba/high</screen>
 	  ע�⵽����Ǵ�������ġ� ������˵������Ҫ�������üƻ���
 	  ��Ϊ������������ʮ�����ѡ�</para>
 
-	<para>�� &os �Ժ�İ汾�У� ������һ�ֽ��û�ӳ�䵽��ǩ���·�ʽ��
+	<para>�� &os; �Ժ�İ汾�У� ������һ�ֽ��û�ӳ�䵽��ǩ���·�ʽ��
           ������ˣ� ��ҲҪ�� &os;&nbsp;5.3 ֮���ij��ʱ�����ʵ�֡�</para>
       </sect3>
 
@@ -1610,7 +1610,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/rc.d/nagios.sh forcestart</userinput></s
       �������Ѿ��޸����ض��� <command>sysctl</command> ����ֹ�����û��ķ��ʡ�</para>
 
     <note>
-      <para>���������û�ʱ�� ���ǵ� &man.mac.bsdextended.4
+      <para>���������û�ʱ�� ���ǵ� &man.mac.bsdextended.4;
 	���򲻻��Զ������ڹ��򼯱��С� ҪѸ�ٸ��¹��򼯣�
 	ֻ��򵥵�ʹ�� &man.kldunload.8; �� &man.kldload.8;
 	������ж�ز����¼��ذ�ȫ����ģ�顣</para>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index ad6ab161de..ad7284ae93 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -1470,11 +1470,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	<para>���±��� <application>sendmail</application> �����������</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>��� <filename>/usr/src</filename>
 	  �͹�����û�д�ı仯�������Ƕ�������ã�<application>sendmail</application>
@@ -1713,7 +1713,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1723,7 +1723,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -1756,7 +1756,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -1801,7 +1801,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1819,7 +1819,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -1829,7 +1829,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -1840,7 +1840,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -1856,7 +1856,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
index 364a4f6046..a018bdcba5 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
@@ -243,6 +243,10 @@
       ���ʶ���Щվ��Ҳ�ṩ�����ķ��ʷ�ʽ����ÿ��վ����õķ��ʷ�ʽ
       ����������������˵����</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2233,6 +2237,11 @@ doc/zh_*</screen>
     <para>&os; �� <link linkend="cvsup">CVSup</link> ������������
       ����վ�㣺</para>
 
+
+    &chap.mirrors.cvsup.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
index fab90aaa9e..2d8f3a1340 100644
--- a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
index 8f479e4d00..ab71f2b27e 100644
--- a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
index 6035219136..2bd9483642 100644
--- a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.xml b/zh_CN.GB2312/books/handbook/ports/chapter.xml
index 004c3e6aca..47d72ede5b 100644
--- a/zh_CN.GB2312/books/handbook/ports/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
index 9e779afdf7..55bf7c23b6 100644
--- a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/preface/preface.xml b/zh_CN.GB2312/books/handbook/preface/preface.xml
index b0750be60a..ccb1345260 100644
--- a/zh_CN.GB2312/books/handbook/preface/preface.xml
+++ b/zh_CN.GB2312/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Chinese Documentation Project
 
diff --git a/zh_CN.GB2312/books/handbook/printing/chapter.xml b/zh_CN.GB2312/books/handbook/printing/chapter.xml
index e1823646a7..d4688e72fc 100644
--- a/zh_CN.GB2312/books/handbook/printing/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/security/chapter.xml b/zh_CN.GB2312/books/handbook/security/chapter.xml
index 15cbc64a70..2775406861 100644
--- a/zh_CN.GB2312/books/handbook/security/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
index fec296d2a7..ba51638920 100644
--- a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/users/chapter.xml b/zh_CN.GB2312/books/handbook/users/chapter.xml
index 9225139d4e..efc457cf32 100644
--- a/zh_CN.GB2312/books/handbook/users/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Chinese Documentation Project
 
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.xml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
index 958ca661aa..9accce3d03 100644
--- a/zh_CN.GB2312/books/handbook/vinum/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
 	The Vinum Volume Manager
 	By Greg Lehey (grog at lemis dot com)
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
index ebff811ba3..8565f6db12 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -732,8 +732,8 @@ xenbr1          8000.feffffffffff   no                  vif0.1
     <sect2 id="virtualization-guest-vmware">
       <title>������ MacOS �� VMware</title>
 
-      <para>&mac �汾�� <application>VMware Fusion</application>
-	��һ����ҵ�����������ڻ��� &intel �� &apple; &mac �������
+      <para>&mac; �汾�� <application>VMware Fusion</application>
+	��һ����ҵ�����������ڻ��� &intel; �� &apple; &mac; �������
 	&macos; 10.4.9 ����汾�IJ���ϵͳ�ϡ� &os;
 	��һ����ȫ��֧�ֵĿͻ�����ϵͳ�� �� &macos; X �ϰ�װ��
 	<application>VMware Fusion</application> ֮��
@@ -909,7 +909,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
     <title>������ OS �� &os;</title>
 
     <para>�ڹ�ȥ�ļ����� &os; ��û���κο��õIJ����ٷ�֧�ֵ����⻯���������
-      һЩ�û���ʱʹ�ù����� &linux �����Ƽ��ݲ����е�
+      һЩ�û���ʱʹ�ù����� &linux; �����Ƽ��ݲ����е�
       <application>VMware</application> �¾ɲ�����ѹ�ʱ�İ汾 (����
       <filename role="package">emulators/vmware3</filename>)��
       �� &os;&nbsp;7.2 �������ã� Sun ��Դ�汾 (Open Source Edition
diff --git a/zh_CN.GB2312/books/handbook/x11/chapter.xml b/zh_CN.GB2312/books/handbook/x11/chapter.xml
index 0b4c08bfea..3fbf2e3b72 100644
--- a/zh_CN.GB2312/books/handbook/x11/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
@@ -268,7 +268,7 @@
       �ϵ�Ĭ�� X11 ʵ�֡� <application>&xorg;</application>
       ���� X.Org ����ᷢ�еĿ���Դ���� X Window ϵͳʵ���е� X ����
       <application>&xorg;</application> ����
-      <application>&xfree86&nbsp;4.4RC2</application> �� X11R6.6 �Ĵ��롣
+      <application>&xfree86;&nbsp;4.4RC2</application> �� X11R6.6 �Ĵ��롣
       �� &os; Ports �׼����԰�װ <application>&xorg;</application>
       �� &xorg.version; �汾��</para>
 
@@ -1002,7 +1002,7 @@ EndSection</programlisting>
         ֻҪ�������¼�û�����������������֤��Ϣ��</para>
 
       <para>��Ҳ���԰� <application>XDM</application> �������
-        &man.getty.8 ����һ��(see <xref linkend="term-config"/> for
+        &man.getty.8; ����һ��(see <xref linkend="term-config"/> for
           details)��Ϊ�û��ṩ��ͬ�����ܡ����������ϵͳ�ĵ�¼����
           Ȼ��Ϊ�û�����һ���Ự������
           (ͨ����һ�� X �Ӵ�������)�������� <application>XDM</application>
@@ -1272,7 +1272,7 @@ DisplayManager.requestPort:     0</screen>
         <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
 
         <para>�� <filename>/etc/fstab</filename> �Ա���ϵͳ����ʱ�Զ�����
-          &man.procfs.5��</para>
+          &man.procfs.5;��</para>
 
         <para>һ��װ���� <application>GNOME</application>��
           �ͱ������ X server ����
diff --git a/zh_CN.GB2312/books/porters-handbook/Makefile b/zh_CN.GB2312/books/porters-handbook/Makefile
index a565d9c5e0..203fe22fdb 100644
--- a/zh_CN.GB2312/books/porters-handbook/Makefile
+++ b/zh_CN.GB2312/books/porters-handbook/Makefile
@@ -25,10 +25,6 @@ INSTALL_ONLY_COMPRESSED?=
 # XML content
 SRCS=  book.xml
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 # Images from the cross-document image library
 IMAGES_LIB+=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index 7c2f4d8026..e4c533738f 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.xml
+++ b/zh_CN.GB2312/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -105,7 +102,7 @@
 	  ע����Щ�ļ�ʹ���˷DZ�׼���Ʊ�����
 	  <application>Emacs</application> ��
 	  <application>Vim</application> Ӧ�����ڴ��ļ���ʱ���Զ�ʶ������
-	  �� &man.vi.1; �� &man.ex.1 ����Ҫ�ڴ��ļ���ʱ��ͨ��
+	  �� &man.vi.1; �� &man.ex.1; ����Ҫ�ڴ��ļ���ʱ��ͨ��
 	  <command>:set tabstop=4</command> ������Ĭ�ϵ����á�</para>
       </note>
 
@@ -3567,8 +3564,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_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
        @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
        @${FALSE}
@@ -4120,14 +4117,14 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+	(cd ${WRKSRC}/examples/ &amp;&amp; ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
 
 	<para>������ӽ�ԭ�����ṩ������
 	  <filename>examples</filename> Ŀ¼���Ƶ��� port ָ���İ�װʾ���ļ���λ�á�</para>
 
 	<programlisting>post-install:
 	${MKDIR} ${DATADIR}/summer
-	(cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+	(cd ${WRKSRC}/temperatures/ &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
 
 	<para>������ӽ����ļ��������µ����ݣ� ���Ƶ�
 	  <filename><makevar>DATADIR</makevar></filename> �е�
@@ -4140,7 +4137,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && \
+	(cd ${WRKSRC}/examples/ &amp;&amp; \
 		${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
 
 	<para>��Ҫע����ǣ� ��Щ�겢�����Զ�������װ���ļ��ӵ�
@@ -5659,7 +5656,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
 	<programlisting>HAS_CONFIGURE=	yes
 
 do-configure:
-        @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+        @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
                 ${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
 
 	<para>��ע�⣬ ����ϵͳ�ṩ�� <filename>BUILD.sh</filename>
@@ -8288,7 +8285,7 @@ CFLAGS+=        -DLUA_VERSION_STRING="${VER_STR}"
 	<ulink url="&url.books.handbook;/configtuning-rcd.html">ʹ���ֲ�� rc.d
 	�½�</ulink> �ҵ��� ���ڿ����������ϸ���ͣ� �������
 	&man.rc.8; �� &man.rc.subr.8; �ҵ��� ��� �����Բ���
-	<ulink url="&url.articles.rc-scripting">��ƪ����</ulink>
+	<ulink url="&url.articles.rc-scripting;">��ƪ����</ulink>
 	�˽�׫д <filename>rc.d</filename> �ű������ʵ����</para>
 
       <para>���԰�װһ���� <filename>rc.d</filename> �ű���</para>
@@ -8645,7 +8642,7 @@ etc/orbit.conf.sample
 
       <para>��Ŀ¼�ṹ���浽һ���ļ��С�</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
 
       <para>����һ�հ� <filename>pkg-plist</filename> �ļ���</para>
 
@@ -8655,11 +8652,11 @@ etc/orbit.conf.sample
 	�������Ӧ��װ�� port ������װ�䵥��</para>
 
       <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
 
       <para>���⻹Ӧ���½�����Ŀ¼����װ�䵥��</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
       <para>�����Ҫ�ֹ����� packing list�� ��һ���̲���
 	<emphasis>��ȫ</emphasis> �Զ��ġ� �����ֲ�Ӧ���� port
@@ -9702,7 +9699,7 @@ as .putsy.conf and edit it.</programlisting>
 	    Ȼ�������¼�¼���뵽 VuXML ���ݿ��С� ��������
 	    �������������������Ƿ�����﷨��</para>
 
-	  <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+	  <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml &amp;&amp; make validate</userinput></screen>
 
 	  <note>
 	    <para>����Ҫ��װ���� package �е�����һ����
diff --git a/zh_CN.GB2312/books/porters-handbook/freebsd.dsl b/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index 148e39a6ac..0000000000
--- a/zh_CN.GB2312/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-	The FreeBSD Simplified Chinese Project
-
-	Original Revision: 1.5
-	$FreeBSD$
--->
-
-<!-- Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files, 
-     rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE"> 
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      <![ %output.html; [ 
-	(define ($email-footer$)
-          (make sequence
-            (literal "�����й��� FreeBSD ports ϵͳ�����⣬ �뷢�͵����ʼ��� <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal ">��")
-            (make empty-element gi: "br")
-            (literal "���ڴ��ĵ����κ����⣬ ���º� <")
-            (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-              (literal "doc@FreeBSD.org"))
-            (literal ">��")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "��")
-	    (process-children)
-	    (literal "��")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
index 793b9a0bdf..ddd53cb661 100644
--- a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
+++ b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Simplified Chinese Documentation Project
 
diff --git a/zh_CN.GB2312/share/xml/authors.ent b/zh_CN.GB2312/share/xml/authors.ent
index cdfd441f37..efd44a5ebf 100644
--- a/zh_CN.GB2312/share/xml/authors.ent
+++ b/zh_CN.GB2312/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/catalog b/zh_CN.GB2312/share/xml/catalog
index fe5be38b29..2422c1740c 100644
--- a/zh_CN.GB2312/share/xml/catalog
+++ b/zh_CN.GB2312/share/xml/catalog
@@ -1,48 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- Original Revision: 1.5 --
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
-	"authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
-	"authors-in-author-tag.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
-	"teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/zh_CN.GB2312/share/xml/catalog.xml b/zh_CN.GB2312/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/zh_CN.GB2312/share/xml/catalog.xml
+++ b/zh_CN.GB2312/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent
index b025010020..ac85e86b8c 100644
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@@ -1,28 +1,32 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+	"authors.ent">
 %authors.cn;
-<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
+<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
+	"authors-in-author-tag.ent">
 %authors.in.author.tag.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
+	"teams.ent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	"nonexistent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+	"glossary.ent">
 %glossary;
diff --git a/zh_CN.GB2312/share/xml/freebsd.dsl b/zh_CN.GB2312/share/xml/freebsd.dsl
index 5d1ac551d0..055fded769 100644
--- a/zh_CN.GB2312/share/xml/freebsd.dsl
+++ b/zh_CN.GB2312/share/xml/freebsd.dsl
@@ -7,329 +7,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%freebsd.l10n;
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %output.html; [
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "���ĵ��������ĵ��ɴ��������أ�")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal ".")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "�������FreeBSD�����⣬�����Ķ�")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "�ĵ�"))
-                (literal "���粻�ܽ������ϵ<")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">.")
-                (make empty-element gi: "br")
-                (literal "���ڱ��ĵ��������뷢����ϵ <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">.")))))
-
-;; ���¼�������ɲ���������ϰ�ߵ��½ںš�
-;; ����֣���֪��������
-;; /usr/local/share/xml/docbook/dsssl/modular/common/dbl1zhcn.dsl
-;; �е�zhcn-xref-stringsΪʲô�������á�
-;; ��Google�����������������Է����ߴ��౧Թ�����¡�
-
-;; toc-entry
-;; �޸��� /usr/local/share/xml/docbook/dsssl/modular/html/dbautoc.dsl
-;; Id: dbautoc.dsl,v 1.3 2003/01/15 08:24:13 adicarlo Exp
-;; ��Ŀ¼����ʾ��
-;; �� 1 ��  XXXXXX
-;;    1.1  XXXXXX (��)
-;;    1.2  XXXXXX (��)
-;; ��¼ A XXXXXXX
-;;    A.1 XXXXXXX (��)
-;;    A.2 XXXXXXX (��)
-
-(define (toc-entry tocentry)
-  (make element gi: "DT"
-	(make sequence
-	  (if (equal? (element-label tocentry) "")
-	      (empty-sosofo)
-	      (if (member (gi tocentry) (list (normalize "part") (normalize "chapter")))
-	        (make sequence
-                  (literal "��")
-		  (literal (element-label tocentry))
-		  (literal (gentext-element-name tocentry))
-		  (literal (gentext-label-title-sep (gi tocentry)))
-	        )
-	        (if (equal? (gi tocentry) (normalize "appendix"))
-	          (make sequence
-	            (literal (gentext-element-name tocentry))
-		    (literal (element-label tocentry))
-		    (literal (gentext-label-title-sep (gi tocentry)))
-	          )
-	          (make sequence
-		    (literal (element-label tocentry))
-		    (literal (gentext-label-title-sep (gi tocentry)))
-	          )
-                )
-	      )
-	  )
-
-	  ;; If the tocentry isn't in its own
-	  ;; chunk, don't make a link...
-	  (if (and #f (not (chunk? tocentry)))
-	      (element-title-sosofo tocentry)
-	      (make element gi: "A"
-		    attributes: (list
-				 (list "HREF"
-				       (href-to tocentry)))
-		    (element-title-sosofo tocentry)))
-
-	  ;; Maybe annotate...
-	  (if (and %annotate-toc%
-		   (equal? (gi tocentry) (normalize "refentry")))
-	      (make sequence
-		(dingbat-sosofo "nbsp");
-		(dingbat-sosofo "em-dash");
-		(dingbat-sosofo "nbsp");
-		(toc-annotation tocentry))
-	      (empty-sosofo)))))
-
-;; lot-entry
-;; �޸��� /usr/local/share/xml/docbook/dsssl/modular/html/dbautoc.dsl
-;; Id: dbautoc.dsl,v 1.3 2003/01/15 08:24:13 adicarlo Exp
-;; �ڱ����嵥����ʾ��
-;; �� xx-xx. ....
-;; �ڲ�ͼ�嵥����ʾ��
-;; ͼ xx-xx. ....
-;; �ڷ����嵥����ʾ��
-;; �� xx-xx. ....
-
-
-(define (lot-entry tocentry)
-  (make element gi: "DT"
-	(make sequence
-	  (if (equal? (element-label tocentry) "")
-	      (empty-sosofo)
-	      (make sequence
-		(literal (gentext-element-name tocentry))
-		(literal (element-label tocentry))
-		(literal (gentext-label-title-sep
-			  (gi tocentry)))))
-
-	  ;; If the tocentry isn't in its own
-	  ;; chunk, don't make a link...
-	  (if (and #f (not (chunk? tocentry)))
-	      (element-title-sosofo tocentry)
-	      (make element gi: "A"
-		    attributes: (list
-				 (list "HREF"
-				       (href-to tocentry)))
-		    (element-title-sosofo tocentry))))))
-
-;; �޸��� /usr/local/share/xml/docbook/dsssl/modular/html/dbttlpg.dsl
-;; Id: dbttlpg.dsl,v 1.10 2004/10/10 11:55:10 petere78 Exp
-;; ʹÿ���ֵĿ�ͷҳ(��ΪTitle Page)��ʾ����xx���֡�
-
-(mode part-titlepage-recto-mode
-  (element title
-    (let ((division (ancestor-member (current-node) (division-element-list))))
-      (make element gi: "H1"
-	    attributes: (list (list "CLASS" (gi)))
-	    (if (string=? (element-label division) "")
-		(empty-sosofo)
-		(literal "��"
-                         (element-label division)
-                         (gentext-element-name division)
-			 (gentext-label-title-sep (gi division))))
-	    (with-mode title-mode
-	      (process-children)))))
-)
-
-
-;; �޸���/usr/local/share/xml/docbook/dsssl/modular/html/dbcompon.dsl
-;; Id: dbcompon.dsl,v 1.8 2003/04/29 05:49:21 adicarlo Exp
-;; ʹÿ�µ�һҳ����ʾ����xx�¡�
-
-(define ($component-title$ #!optional (titlegi "H1") (subtitlegi "H2"))
-  (let* ((info (cond
-		((equal? (gi) (normalize "article"))
-		 (node-list-filter-by-gi (children (current-node))
-					 (list (normalize "artheader")
-					       (normalize "articleinfo"))))
-		((or
-                  (equal? (gi) (normalize "appendix"))
-                  (equal? (gi) (normalize "bibliography"))
-                  (equal? (gi) (normalize "chapter"))
-                  (equal? (gi) (normalize "glossary"))
-                  (equal? (gi) (normalize "index"))
-                  (equal? (gi) (normalize "preface"))
-                  (equal? (gi) (normalize "reference"))
-                  (equal? (gi) (normalize "setindex")))
-		 (select-elements (children (current-node)) (normalize "docinfo")))
-		(else
-		 (empty-node-list))))
-	 (exp-children (if (node-list-empty? info)
-			   (empty-node-list)
-			   (expand-children (children info)
-					    (list (normalize "bookbiblio")
-						  (normalize "bibliomisc")
-						  (normalize "biblioset")))))
-	 (parent-titles (select-elements (children (current-node)) (normalize "title")))
-	 (titles	(if (node-list-empty? parent-titles)
-			    (select-elements exp-children (normalize "title"))
-			    parent-titles))
-	 (parent-subttl (select-elements (children (current-node)) (normalize "subtitle")))
-	 (subtitles	(if (node-list-empty? parent-subttl)
-			    (select-elements exp-children (normalize "subtitle"))
-			    parent-subttl)))
-    (make sequence
-      (make element gi: titlegi
-	    (make sequence
-	      (make element gi: "A"
-		  attributes: (list (list "NAME" (element-id)))
-		  (empty-sosofo))
-	      (if (and %chapter-autolabel%
-		       (or (equal? (gi) (normalize "chapter"))
-			   (equal? (gi) (normalize "appendix"))))
-		  (if (equal? (gi) (normalize "chapter"))
-		      (literal "��"
-			   (element-label (current-node))
-                           (gentext-element-name-space (gi))
-			   (gentext-label-title-sep (gi))
- 		      )
-		      (literal (gentext-element-name-space (gi))
-			   (element-label (current-node))
-			   (gentext-label-title-sep (gi))
-		      )
-		  )
-		  (empty-sosofo))
-	      (if (node-list-empty? titles)
-		  (element-title-sosofo) ;; get a default!
-		  (with-mode title-mode
-		    (process-node-list titles)))))
-      (if (node-list-empty? subtitles)
-	  (empty-sosofo)
-	  (with-mode subtitle-mode
-	    (make element gi: subtitlegi
-		  (process-node-list subtitles)))))))
-
-;; �޸���/usr/local/share/xml/docbook/dsssl/modular/html/dbnavig.dsl
-;; Id: dbnavig.dsl,v 1.3 2001/07/05 12:08:42 nwalsh Exp
-;; ʹҳü����ʾ����xx�¡��ȵȡ�
-
-(define (nav-context-sosofo elemnode)
-  (let* ((component     (ancestor-member elemnode
-					 (append (book-element-list)
-						 (division-element-list)
-						 (component-element-list))))
-	 (context-text  (inherited-dbhtml-value elemnode "context-text")))
-    (if (and context-text (not (string=? context-text "")))
-	(literal context-text)
-	(if (equal? (element-label component) "")
-	    (make sequence
-	      (element-title-sosofo component))
-	    (make sequence
-	      ;; Special case.  This is a bit of a hack.
-	      ;; I need to revisit this aspect of
-	      ;; appendixes.
-	      (if (and (equal? (gi component) (normalize "appendix"))
-		       (or (equal? (gi elemnode) (normalize "sect1"))
-			   (equal? (gi elemnode) (normalize "section")))
-		       (equal? (gi (parent component)) (normalize "article")))
-		  (element-label-sosofo component)
-		  (if (equal? (gi component) (normalize "chapter"))
-		    (make sequence
-                      (literal "��")
-                      (element-label-sosofo component)
-                      (literal (gentext-element-name-space (gi component)))
-                    )
-	            (make sequence
-	              (literal (gentext-element-name-space (gi component)))
-	              (element-label-sosofo component)
-	            )
-	          )
-	      )
-	      (literal (gentext-label-title-sep (gi component)))
-	      (element-title-sosofo component))))))
-
-<!--
-   �޸��� /usr/local/share/xml/docbook/dsssl/modular/html/dbhtml.dsl
-   Id: dbhtml.dsl,v 1.5 2004/10/10 11:55:10 petere78 Exp
-   ��������дϰ�ߣ�ÿ�ο�ͷ�������
-   ������ע�͡��б����ض�λ�ã���ȻҲʹ����SGML��<para></para>��ǣ�ȴ��Ӧ������
-   ��ֻ��<para></para>����������һ��λ��ʱ������Ҫ������
--->
-
-(define ($paragraph$ #!optional (para-wrapper "P"))
-  (let ((footnotes (select-elements (descendants (current-node))
-				    (normalize "footnote")))
-	(tgroup (have-ancestor? (normalize "tgroup"))))
-    (make sequence
-      (make element gi: para-wrapper
-	    attributes: (append
-			 (if %default-quadding%
-			     (list (list "ALIGN" %default-quadding%))
-			     '()))
-            (if (equal? (gi) (normalize "para"))
-                (if (member (gi (parent (current-node)))
-                        (list (normalize "article")
-                              (normalize "book")
-                              (normalize "abstract")
-                              (normalize "chapter")
-                              (normalize "sect1")
-                              (normalize "sect2")
-                              (normalize "sect3")
-                              (normalize "sect4")
-                              (normalize "sect5")
-                        )
-                    )
-                 (literal "����")
-                 (empty-sosofo)
-                )
-                (empty-sosofo)
-            )
-	    (process-children))
-      (if (or %footnotes-at-end% tgroup (node-list-empty? footnotes))
-	  (empty-sosofo)
-	  (make element gi: "BLOCKQUOTE"
-		attributes: (list
-			     (list "CLASS" "FOOTNOTES"))
-		(with-mode footnote-mode
-		  (process-node-list footnotes)))))))
-
-;; ����Ҫǿ���IJ��֣�����ϰ����ֻ�ô��壬б���ֲ�����Ŀ
-;; �޸���/usr/local/share/xml/docbook/dsssl/modular/html/dbinline.dsl
-;; Id: dbinline.dsl,v 1.11 2004/09/14 14:47:10 petere78 Exp
-
-(element emphasis
-  (let* ((class (if (and (attribute-string (normalize "role"))
-			 %emphasis-propagates-style%)
-		    (attribute-string (normalize "role"))
-		    "emphasis")))
-    (make element gi: "SPAN"
-	  attributes: (list (list "CLASS" class))
-	      ($bold-seq$))))
-
-      ]]>
-
-
-      <![ %output.print; [
 
 ;; �޸���/usr/local/share/xml/docbook/dsssl/modular/print/dbcompon.dsl
 ;; Id: dbcompon.dsl,v 1.5 2003/04/29 06:33:10 adicarlo Exp
@@ -600,10 +282,6 @@
       ($bold-seq$)
 )
 
-      ]]>
-
-      <!-- Both sets of stylesheets ..................................... -->
-
       (define (local-zhcn-label-title-sep)
         (list
           (list (normalize "warning")		": ")
diff --git a/zh_CN.GB2312/share/xml/mailing-lists.ent b/zh_CN.GB2312/share/xml/mailing-lists.ent
index fd8b8b177c..b19148ecd8 100644
--- a/zh_CN.GB2312/share/xml/mailing-lists.ent
+++ b/zh_CN.GB2312/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      Names of FreeBSD mailing lists and related software.
      The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/mirrors-local.xsl b/zh_CN.GB2312/share/xml/mirrors-local.xsl
index 0da5fc058a..c6cdef50f3 100644
--- a/zh_CN.GB2312/share/xml/mirrors-local.xsl
+++ b/zh_CN.GB2312/share/xml/mirrors-local.xsl
@@ -8,7 +8,6 @@
   <xsl:import href="../../../share/xml/mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="gb2312"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- template: "mirrors-docbook-contact" -->
diff --git a/zh_CN.GB2312/share/xml/teams.ent b/zh_CN.GB2312/share/xml/teams.ent
index 0b4ef1c3d8..3fd0be0c2a 100644
--- a/zh_CN.GB2312/share/xml/teams.ent
+++ b/zh_CN.GB2312/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index 3b43bdbacd..89fa13f59c 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
@@ -446,13 +447,10 @@ Coverity Extend
       DAMAGE.</para>
   </important>
 
-<![%output.for.print;[
-
   <important><para><emphasis>�� FreeBSD �� FreeBSD ���Ļ���Ŀ�ٷ���վ��ȡ�ı��ĵ�
     PostScript&reg; �� PDF ��ʽ�ļ�����Ƕ���������壬���Ķ��Ƽ������ɷ����޹�˾��
     ���Ķ�������Ȩ�顷��Ȩ�ṩ��</emphasis></para></important>
 
-<!-- Start of ARPHIC PUBLIC LICENSE -->
 <para>�Ķ�������Ȩ��</para>
 <para></para>
 <para>��Ȩ����(C) 1999 �Ķ��Ƽ������ɷ����޹�˾</para>
@@ -558,8 +556,6 @@ Coverity Extend
      ����������ʹ�û���ʹ�ñ����ͣ������������������Ʒ�����IJɹ���
      ʹ�á� ���ݻ�����֮��ʧ�� ����Ӫҵ������ �����µ��κ�ֱ�ӡ� ��ӡ� ��Ȼ��
      żȻ�� �����ͷ�����ʧ���� ��ʹ��Ȩ�˻���������֪����ʧ�Ŀ�����ʱ�಻���⡣</para>
-<!-- End of ARPHIC PUBLIC LICENSE -->
-]]>
 </legalnotice>
 '>
 
diff --git a/zh_CN.GB2312/share/xsl/freebsd-common.xsl b/zh_CN.GB2312/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-epub.xsl b/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-fo.xsl b/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..81f340d7e4
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='gb2312'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>���ĵ��������ĵ��ɴ��������أ�
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>.</small></p>
+
+    <p align="center"><small>�������FreeBSD�����⣬�����Ķ�
+    <a href="http://www.FreeBSD.org/docs.html">�ĵ�</a>���粻�ܽ������ϵ
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    ���ڱ��ĵ��������뷢����ϵ
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl b/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/zh_CN.GB2312/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/articles/contributing/article.xml b/zh_TW.Big5/articles/contributing/article.xml
index fccd4e2de2..d372acf288 100644
--- a/zh_TW.Big5/articles/contributing/article.xml
+++ b/zh_TW.Big5/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/articles/cvs-freebsd/article.xml b/zh_TW.Big5/articles/cvs-freebsd/article.xml
index dd5faf36de..6fb33d3a2f 100644
--- a/zh_TW.Big5/articles/cvs-freebsd/article.xml
+++ b/zh_TW.Big5/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
@@ -81,7 +78,7 @@
         <screen>&prompt.user; <userinput>cvs -d <replaceable>path-to-repository</replaceable> init</userinput></screen>
 
       <para>�o�R�O�i�D <application>CVS</application> �إ�
-        <filename role="directory">CVSROOT</filename> ���ؿ��A�o�ӥؿ��̩�m�F�Ҧ����պA�ɡC</para>
+        <filename class="directory">CVSROOT</filename> ���ؿ��A�o�ӥؿ��̩�m�F�Ҧ����պA�ɡC</para>
     </sect2>
 
     <sect2>
@@ -103,27 +100,27 @@
     <sect2>
       <title>���^��l�ɮ�</title>
 
-      <para>�{�b�A�ݭn�q FreeBSD �x�s�w�����^ <filename role="directory">CVSROOT</filename> �ؿ��A
+      <para>�{�b�A�ݭn�q FreeBSD �x�s�w�����^ <filename class="directory">CVSROOT</filename> �ؿ��A
         �q FreeBSD �ΦW�� CVS �M�g���Ө��^�|�O��²�檺��k�C�Ьd�\ <ulink
           url="&url.books.handbook;/anoncvs.html">�b handbook �����������`</ulink>��
         ��o��h��T�C�ڭ̰��]���^���ɮצs��b�ۦP�ؿ��U��
-        <filename role="directory">CVSROOT-freebsd</filename> �ؿ����C</para>
+        <filename class="directory">CVSROOT-freebsd</filename> �ؿ����C</para>
     </sect2>
 
     <sect2>
       <title>�ƻs FreeBSD ���R�O�Z</title>
 
-      <para>���U�ӧڭ̭n�ƻs FreeBSD <filename role="directory">CVSROOT</filename> �̪��ɮר�A
+      <para>���U�ӧڭ̭n�ƻs FreeBSD <filename class="directory">CVSROOT</filename> �̪��ɮר�A
         ���x�s�w���C�p�G�A�O�E�x�� <application>CVS</application>�A�A�]�\�|�Q�A
         �i�H�����פJ�o�ǩR�O�Z�A�չϧ�e�����P�ɩM��s�������P�B�F���L�A�ƹ�O
         <application>CVS</application> �b�o�ӳ��������I�G���פJ�ɮר�
-        <filename role="directory">CVSROOT</filename> �ɡA���ä��|��s�պA�ɡC���F�n�{�X�o���ɮ�
+        <filename class="directory">CVSROOT</filename> �ɡA���ä��|��s�պA�ɡC���F�n�{�X�o���ɮ�
         �A�A�ٻݭn�b�פJ���̫�@�@���s����A�o�N���h�F
         <literal>cvs import</literal> �����ȡC�]���A��ij����k�O�Ƚƻs�o�ǩR�O
         �Z�L�h�C</para>
 
       <para>�Y�W�z���e��A�S���N�q�O�����n��&mdash;�]���̫᪺���G���O�@�˪��C
-        �����ץX�A�� <filename role="directory">CVSROOT</filename>�A�M��ƻs�����^�� FreeBSD
+        �����ץX�A�� <filename class="directory">CVSROOT</filename>�A�M��ƻs�����^�� FreeBSD
         �ɮר쥻�a���ؿ����]�|���ܰʹL�^�G</para>
 
         <screen>&prompt.user; <userinput>cvs -d <replaceable>path-to-your-repository</replaceable> checkout CVSROOT</userinput>
@@ -243,7 +240,7 @@
             �A�]���O &dollar;FreeBSD&dollar;�^�C�b���ɮפ��Ҧ��ŦX�@��@�Ӫ���
             �צW�ٱN���|�Q�ˬd�C�A�i�H�b���ɮפ������ݭn�ץ������Y���ɮ׷s�W�@
             �ӥ��W�B�⦡�C���F�w�˳o�ǩR�O�Z�A�̦n����k�O�ư�
-            <filename role="directory">CVSROOT/</filename> �|������Y���ˬd�C</para>
+            <filename class="directory">CVSROOT/</filename> �|������Y���ˬd�C</para>
         </listitem>
 
         <listitem>
@@ -392,7 +389,7 @@
               <listitem>
                 <para><literal>@LOG_FILE_MAP</literal> - �H�A�һݭn���ӭק�o��
                   �}�C�A�C�ӳ]�w�����ӲŦX�Q���檺�ؿ��A�Ӵ��檺��x�T���|�H
-                  <filename role="directory">commitlogs</filename> ���W���x�s�b�C�ӳQ�]�w���ؿ��U�C</para>
+                  <filename class="directory">commitlogs</filename> ���W���x�s�b�C�ӳQ�]�w���ؿ��U�C</para>
               </listitem>
 
               <listitem>
@@ -416,7 +413,7 @@
             �z�]�p�H <literal>^ports/</literal> ���}�Y���C�@�浥�^�C���~�A����
             ���H <literal>^CVSROOT/</literal> ���}�Y����C�A�M��s�W�@��u��
             <literal>^CVSROOT/</literal>�C��������r�i�}���R�O�Z�w�˦n��A�A�i
-            �H�b <filename role="directory">CVSROOT</filename> �ؿ������ɮ׸̥[�W���Y�A�M��A��
+            �H�b <filename class="directory">CVSROOT</filename> �ؿ������ɮ׸̥[�W���Y�A�M��A��
             �_�����Ѫ���C�A���b�A�٨S������e�h�u�O���o�ˡC</para>
         </step>
 
@@ -457,7 +454,7 @@
       </procedure>
 
       <para>�{�b�A�b�Ӥߪ��˵��L��A�A�i�H����A���ק�F�C�T�w�A���e���b
-        <filename>avail</filename> �����\�A�ۤv�s�� <filename role="directory">CVSROOT</filename>
+        <filename>avail</filename> �����\�A�ۤv�s�� <filename class="directory">CVSROOT</filename>
         �ؿ��A�]���p�G�S���o�˰����ܧA�|��A�ۤv��b�~���C����T�{�L��а���U
         �C�R�O�G</para>
 
@@ -482,7 +479,7 @@
     <title>FreeBSD ���S���]�w</title>
 
     <para>FreeBSD �M�צۤv�ϥΤ@�Ӧ��I���P���]�w�A���N�O�P�ɤ]�ϥ� FreeBSD
-      <filename role="directory">CVSROOT</filename> ���� <filename>freebsd</filename> �l�ؿ��C�]
+      <filename class="directory">CVSROOT</filename> ���� <filename>freebsd</filename> �l�ؿ��C�]
       ���j�q������̥����b�ۦP���s�դ��A�]���M�׼g�F�@��²�檺 wrapper �ӽT�{��
       ��̥i�H���T������A�ó]�w�x�s�w���s�զW�١C</para>
 
@@ -540,7 +537,7 @@
 
         <step>
           <para>���U�ӬO�إ� wrapper �ӽT�{�A�b����ɬO�b���T���s�դ��C
-            �b�A�� <filename role="directory">CVSROOT</filename> ����
+            �b�A�� <filename class="directory">CVSROOT</filename> ����
             <filename>cvswrap.c</filename> �n����ϥΡC</para>
 
           <para>�b�A�����s��å[�J���T�����|��ڭ̭n�ӽsĶ��l�X�G</para>
diff --git a/zh_TW.Big5/articles/freebsd-questions/article.xml b/zh_TW.Big5/articles/freebsd-questions/article.xml
index 62870543c4..b1af0d52c7 100644
--- a/zh_TW.Big5/articles/freebsd-questions/article.xml
+++ b/zh_TW.Big5/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
   Original revision: 1.24
diff --git a/zh_TW.Big5/articles/hubs/article.xml b/zh_TW.Big5/articles/hubs/article.xml
index f684c31476..871b281dca 100644
--- a/zh_TW.Big5/articles/hubs/article.xml
+++ b/zh_TW.Big5/articles/hubs/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Documentation Project -->
diff --git a/zh_TW.Big5/articles/mailing-list-faq/article.xml b/zh_TW.Big5/articles/mailing-list-faq/article.xml
index ba7647983e..8daac69625 100644
--- a/zh_TW.Big5/articles/mailing-list-faq/article.xml
+++ b/zh_TW.Big5/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!-- $FreeBSD$ -->
 
diff --git a/zh_TW.Big5/articles/nanobsd/article.xml b/zh_TW.Big5/articles/nanobsd/article.xml
index d6b819eeee..15ee953eea 100644
--- a/zh_TW.Big5/articles/nanobsd/article.xml
+++ b/zh_TW.Big5/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -105,22 +102,22 @@
 
 	<listitem>
 	  <para>�@�ӳ]�w�ɤ��ΰϡA�b�B�����Ҥ��A
-	    �i�H�N�䱾��(mount)�� <filename role="directory">/cfg</filename> �ؿ��U�C</para>
+	    �i�H�N�䱾��(mount)�� <filename class="directory">/cfg</filename> �ؿ��U�C</para>
 	</listitem>
       </itemizedlist>
 
       <para>�o�Ǥ��ΰϡA�b�w�]���p�U�O�H��Ū�覡�����C</para>
 
-      <para><filename role="directory">/etc</filename> �M
-	<filename role="directory">/var</filename> �ؿ�����
+      <para><filename class="directory">/etc</filename> �M
+	<filename class="directory">/var</filename> �ؿ�����
 	&man.md.4;(malloc)�ϺСC</para>
 
       <para>�]�w�ɪ����ΰϫh�O�b
-	<filename role="directory">/cfg</filename> �ؿ��C
-	���]�t�F�� <filename role="directory">/etc</filename>
+	<filename class="directory">/cfg</filename> �ؿ��C
+	���]�t�F�� <filename class="directory">/etc</filename>
 	�ؿ����ɮסA�b�Ұʤ���ȮɥH��Ū�覡�����C �]���A�Y�Q�n���}���O�d�s���]�w�A
-	����n�O�o�q <filename role="directory">/etc</filename> ���L���ɮ׽ƻs�^
-	<filename role="directory">/cfg</filename> �ؿ��~��C</para>
+	����n�O�o�q <filename class="directory">/etc</filename> ���L���ɮ׽ƻs�^
+	<filename class="directory">/cfg</filename> �ؿ��~��C</para>
 
       <example>
 	<title>��ק�L <filename>/etc/resolv.conf</filename> �]�w�O�s�_��</title>
@@ -134,9 +131,9 @@
 
       <note>
 	<para>�u���b�t�αҰʹL�{���A�H�λݭn�ק�]�w�ɪ��ɭԡA�~�ݭn�����t��
-	  <filename role="directory">/cfg</filename> �����Ӥ��ΰϡC</para>
+	  <filename class="directory">/cfg</filename> �����Ӥ��ΰϡC</para>
 
-	<para>�@�������� <filename role="directory">/cfg</filename>
+	<para>�@�������� <filename class="directory">/cfg</filename>
 	  ���O�@�Ӧn�D�N�A�S�O�O���z�� <application>NanoBSD</application>
 	  ��b���A�X�i��j�q�g�J�ʧ@�����ΰϮ�
 	 (��p�G�ѩ��ɮרt�Ϊ��P�B�Ʒ|�w���b�t�κФ��g�J���)�C</para>
@@ -148,7 +145,7 @@
 
       <para><application>NanoBSD</application> �M���ɬO�z�L�ϥΫD�`²�檺
 	<filename>nanobsd.sh</filename> shell  script �ӥ��y���A�o�� script �i�H�b
-	<filename role="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>
+	<filename class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>
 	�ؿ������C �o�� script �إߪ��M���ɡA�i�H�� &man.dd.1; �u��ӽƻs���H���ФW�C</para>
 
       <para>���y
@@ -265,7 +262,7 @@
 customize_cmd cust_foo</programlisting>
 
         <para>�U���|�����I���Ҥl�A���|��w�]��
-          <filename role="directory">/etc</filename> �ؿ��j�p�A�q 5MB �վ㬰 30MB�G</para>
+          <filename class="directory">/etc</filename> �ؿ��j�p�A�q 5MB �վ㬰 30MB�G</para>
 
 	<programlisting>cust_etc_size()(
 	cd &dollar;{NANO_WORLDDIR}/conf
@@ -288,7 +285,7 @@ customize_cmd cust_etc_size</programlisting>
 
 	  <listitem>
 	    <para><literal>cust_install_files</literal> &mdash;
-	      �q <filename role="directory">nanobsd/Files</filename>
+	      �q <filename class="directory">nanobsd/Files</filename>
 	      �ؿ����w���ɮסA�o�]�t�@�ǹ�Ϊ��t�κ޲z script �C</para>
 	  </listitem>
 	</itemizedlist>
@@ -388,7 +385,7 @@ customize_cmd cust_nobeastie</programlisting>
 
       <para>�n�b���b�B�檺
 	<application>NanoBSD</application> �t�Τ��w�˷s���M���ɡA�i�H�ϥΦ��
-	<filename role="directory">/root</filename> �ؿ���
+	<filename class="directory">/root</filename> �ؿ���
 	<filename>updatep1</filename> ��
 	<filename>updatep2</filename>  script �A
 	��ڤW�n�έ��@�� script�A�h���M�󥿦b�B�檺�t�άO�����Ӥ��ΰϦөw�C</para>
diff --git a/zh_TW.Big5/articles/pr-guidelines/article.xml b/zh_TW.Big5/articles/pr-guidelines/article.xml
index 5e6a5dccff..9018f4bfa9 100644
--- a/zh_TW.Big5/articles/pr-guidelines/article.xml
+++ b/zh_TW.Big5/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 ]>
diff --git a/zh_TW.Big5/articles/problem-reports/article.xml b/zh_TW.Big5/articles/problem-reports/article.xml
index 0eca52284e..bdb7d37812 100644
--- a/zh_TW.Big5/articles/problem-reports/article.xml
+++ b/zh_TW.Big5/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <article lang='zh_tw'>
   <articleinfo>
diff --git a/zh_TW.Big5/articles/remote-install/article.xml b/zh_TW.Big5/articles/remote-install/article.xml
index dacfbf8da3..d52b23f939 100644
--- a/zh_TW.Big5/articles/remote-install/article.xml
+++ b/zh_TW.Big5/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -204,10 +201,10 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
 	image �ɪ��L�{�۷�²��C</para>
 
       <para>�����O�� &os; �w�˥��ЩΪ̦w�˥Ϊ� <acronym>ISO</acronym> image
-	�ɥ�� <filename role="directory">/cdrom</filename>�C
+	�ɥ�� <filename class="directory">/cdrom</filename>�C
 	�������Ҧ��Ҥl���@�P�A���尲�]���O�� &os; 7.0-RELEASE
 	<acronym>ISO</acronym>�C  �ӧ� ISO image �ɱ����� <filename
-	role="directory">/cdrom</filename> �ؿ��۷�²��A
+	class="directory">/cdrom</filename> �ؿ��۷�²��A
 	�N�O�� &man.mdconfig.8;�G</para>
 
       <screen>&prompt.root; <userinput>mdconfig -a -t vnode -u 10 -f <replaceable>7.0-RELEASE-amd64-disc1.iso</replaceable></userinput>
@@ -221,7 +218,7 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
       <note>
 	<para>�W�z�� <command>make</command> ���O�n�b
 	  <application>mfsBSD</application> ���̤W�h�ؿ�����A��軡 <filename
-	  role="directory">~/mfsbsd-1.0-beta1/</filename>�C</para>
+	  class="directory">~/mfsbsd-1.0-beta1/</filename>�C</para>
       </note>
     </sect2>
 
@@ -279,9 +276,9 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
 	&os;</ulink> ���`���۷��Ժɪ����СA�ҥH�o��D�n�n���Ъ��O�p��إ�
 	RAID-1 �t�ΥH�� <application>ZFS</application>�C
 	�o��|���ЫإߥH &man.gmirror.8; �������p�� mirrored �ɮרt�ΡG
-	<filename role="directory">/</filename> (�ڥؿ�), <filename
-	role="directory">/usr</filename> �H�� <filename
-	role="directory">/var</filename>�A�ӵw�Ъ���l�Ѿl�Ŷ��h�q�q�H
+	<filename class="directory">/</filename> (�ڥؿ�), <filename
+	class="directory">/usr</filename> �H�� <filename
+	class="directory">/var</filename>�A�ӵw�Ъ���l�Ѿl�Ŷ��h�q�q�H
 	&man.zpool.8; ���� <application>ZFS</application> �� mirrored �ɮרt��
 	�C  �Ъ`�N�G�����n���� &os; �@�~�t�θ˦n�ö}������A�~��i��]�w
 	<application>ZFS</application> �ɮרt�ΡC</para>
@@ -318,10 +315,10 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
 	  <para>�{�b��ʭק�ӵw�Ъ� label�A�ܩ�p��إߤ��ΰ�(partitions)
 	    �аѾ\ &man.bsdlabel.8; �����C
 	    ���ΰϤ��O�إߡG<literal>a</literal> �O�� <filename
-	    role="directory">/</filename> (�ڥؿ�)�A
+	    class="directory">/</filename> (�ڥؿ�)�A
 	    <literal>b</literal> �� swap�A
-	    <literal>d</literal> �� <filename role="directory">/var</filename>�A
-	    <literal>e</literal> �� <filename role="directory">/usr</filename>�A
+	    <literal>d</literal> �� <filename class="directory">/var</filename>�A
+	    <literal>e</literal> �� <filename class="directory">/usr</filename>�A
 	    �̫�A�|�b�y��B�J�� <literal>f</literal> ��
 	    <application>ZFS</application> �ϥΡC</para>
 	</callout>
@@ -366,7 +363,7 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
 	<guimenuitem>Options</guimenuitem> �� <keycap>Enter</keycap>�C
 	�M��H��V�䲾�ʨ� <literal>Install Root</literal> �B�A��
 	<keycap>Space</keycap> ��M��אּ <filename
-	role="directory">/mnt</filename>�A�A�� <keycap>Enter</keycap>
+	class="directory">/mnt</filename>�A�A�� <keycap>Enter</keycap>
 	��H�N�ק�Ȧs�_�ӡA�M��� <keycap>q</keycap> ��Y�i���}�o��
 	<guimenuitem>Options</guimenuitem> �e���C</para>
 
@@ -412,7 +409,7 @@ ifconfig_re0="inet 192.168.0.2 netmask 255.255.255.0"</programlisting>
       <itemizedlist>
 	<listitem>
 	  <para>�� <literal>GENERIC</literal> kernel �ƻs��
-	    <filename role="directory">/boot/kernel</filename>
+	    <filename class="directory">/boot/kernel</filename>
 	    �ؿ��G</para>
 
 	  <screen>&prompt.root; <userinput>cp -Rp /boot/GENERIC/* /boot/kernel</userinput></screen>
diff --git a/zh_TW.Big5/books/Makefile b/zh_TW.Big5/books/Makefile
index 45eb550a9a..176ffedb82 100644
--- a/zh_TW.Big5/books/Makefile
+++ b/zh_TW.Big5/books/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SUBDIR = developers-handbook
-SUBDIR+= faq
+#SUBDIR+= faq
 SUBDIR+= fdp-primer
 SUBDIR+= handbook
 SUBDIR+= porters-handbook
diff --git a/zh_TW.Big5/books/developers-handbook/book.xml b/zh_TW.Big5/books/developers-handbook/book.xml
index 7ed723cb4b..2253090f85 100644
--- a/zh_TW.Big5/books/developers-handbook/book.xml
+++ b/zh_TW.Big5/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
index ce285c8329..342a47c2dc 100644
--- a/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -67,7 +67,7 @@
 
      </itemizedlist>
 
-     <para>�H�W�K�� Scheifler & Gettys �� "X Window System" �פ�</para>
+     <para>�H�W�K�� Scheifler &amp; Gettys �� "X Window System" �פ�</para>
 
   </sect1>
 
diff --git a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
index 10baf4285a..ac166db725 100644
--- a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
index 6d5f27874f..2062206e1c 100644
--- a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
index 29ab547c4b..a75577a8c7 100644
--- a/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/policies/chapter.xml b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
index 73582f13b1..16d63c7663 100644
--- a/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/secure/chapter.xml b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
index ec1904c301..928f05da21 100644
--- a/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
index 3b118fabe4..aa2eed2c9f 100644
--- a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/testing/chapter.xml b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
index 256702d217..e187e8d0be 100644
--- a/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/tools/chapter.xml b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
index 48313dbfe5..486176ac32 100644
--- a/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/developers-handbook/x86/chapter.xml b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
index 181c94dbf0..cb8c6cbd96 100644
--- a/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/faq/book.xml b/zh_TW.Big5/books/faq/book.xml
index b68defa3a0..774de27d1c 100644
--- a/zh_TW.Big5/books/faq/book.xml
+++ b/zh_TW.Big5/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 ]>
 
@@ -1945,7 +1943,7 @@ File: +DESC (ignored)</screen>
           <para>�����o�I�A�b FreeBSD �Q�װϤW�ɱ`���H�Q�סC���M�w��O���t�׫ܧ֡A
 	    �i���H�ɦ��s�W��B�s���~�X�{�A�M�ӳo�dz��b�ڭ̷N�Ƥ����A
 	    �ڭ� <emphasis>���M</emphasis> �j�P��ij�G�b�߰ݦ����̷s�W��w�骺�䴩���D���e�A
-	    �Х��Ѿ\ &os
+	    �Х��Ѿ\ &os;
 	    <ulink url="&rel.current.hardware;">&rel.current;</ulink>
 	    ��
 	    <ulink url="&rel2.current.hardware;">&rel2.current;</ulink>���䴩�w��C���A
@@ -2667,11 +2665,11 @@ device card 1</programlisting>
 # When a USB keyboard arrives, attach it as the console keyboard.
 #attach 100 {
 #       device-name "ukbd0";
-#       action "kbdcontrol -k /dev/ukbd0 < /dev/console && /etc/rc.d/syscons restart";
+#       action "kbdcontrol -k /dev/ukbd0 &lt; /dev/console &amp;&amp; /etc/rc.d/syscons restart";
 #};
 #detach 100 {
 #       device-name "ukbd0";
-#       action "kbdcontrol -k /dev/kbd0 < /dev/console";
+#       action "kbdcontrol -k /dev/kbd0 &lt; /dev/console";
 #};
 </programlisting>
               </listitem>
diff --git a/zh_TW.Big5/books/fdp-primer/book.xml b/zh_TW.Big5/books/fdp-primer/book.xml
index 51d3920a02..6f40f1e56a 100644
--- a/zh_TW.Big5/books/fdp-primer/book.xml
+++ b/zh_TW.Big5/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
 
diff --git a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
index c6eac0880e..de649ee875 100644
--- a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/examples/appendix.xml b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
index 729da18ccc..afdd162607 100644
--- a/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
+++ b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -55,7 +55,7 @@
     <example>
       <title>DocBook <sgmltag>book</sgmltag></title>
 
-      <programlisting><![ CDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+      <programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
 <book lang='zh_tw'>
   <bookinfo>
@@ -106,7 +106,7 @@
     <example>
       <title>DocBook <sgmltag>article</sgmltag></title>
 
-      <programlisting><![ CDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+      <programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
 <article lang='zh_tw'>
   <articleinfo>
diff --git a/zh_TW.Big5/books/fdp-primer/overview/chapter.xml b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
index cc24a302dd..62c34a11ec 100644
--- a/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
index e3de3809db..1b2f97992c 100644
--- a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
index 09133c3d9a..d6fc136474 100644
--- a/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index be49ae8445..fa33335ce8 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -148,7 +148,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<h1>First section</h1>
+	  <programlisting><![CDATA[<h1>First section</h1>
 
 <!-- Document introduction goes here -->
 
@@ -179,7 +179,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<h1>First section</h1>
+	  <programlisting><![CDATA[<h1>First section</h1>
 
 <!-- Document introduction -->
 
@@ -200,7 +200,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>This is a paragraph.  It can contain just about any
+	  <programlisting><![CDATA[<p>This is a paragraph.  It can contain just about any
   other element.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -216,7 +216,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>A small excerpt from the US Constitution:</p>
+	  <programlisting><![CDATA[<p>A small excerpt from the US Constitution:</p>
 
 <blockquote>We the People of the United States, in Order to form
   a more perfect Union, establish Justice, insure domestic
@@ -259,7 +259,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>An unordered list.  Listitems will probably be
+	  <programlisting><![CDATA[<p>An unordered list.  Listitems will probably be
   preceded by bullets.</p>
 
 <ul>
@@ -291,7 +291,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<dl>
+	  <programlisting><![CDATA[<dl>
   <dt>Term 1</dt>
 
   <dd><p>Paragraph 1 of definition 1.</p>
@@ -326,7 +326,7 @@
 	  <para>You could use <sgmltag>pre</sgmltag> to mark up an email
 	    message:</para>
 
-	  <programlisting><![ CDATA [<pre>  From: nik@FreeBSD.org
+	  <programlisting><![CDATA[<pre>  From: nik@FreeBSD.org
   To: freebsd-doc@FreeBSD.org
   Subject: New documentation available
 
@@ -376,7 +376,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>This is a simple 2x2 table.</p>
+	  <programlisting><![CDATA[<p>This is a simple 2x2 table.</p>
 
 <table>
   <tr>
@@ -402,7 +402,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>One tall thin cell on the left, two short cells next to
+	  <programlisting><![CDATA[<p>One tall thin cell on the left, two short cells next to
   it on the right.</p>
 
 <table>
@@ -423,7 +423,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>One long cell on top, two short cells below it.</p>
+	  <programlisting><![CDATA[<p>One long cell on top, two short cells below it.</p>
 
 <table>
   <tr>
@@ -444,7 +444,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>On a 3x3 grid, the top left block is a 2x2 set of
+	  <programlisting><![CDATA[<p>On a 3x3 grid, the top left block is a 2x2 set of
   cells merged into one.  The other cells are normal.</p>
 
 <table>
@@ -494,7 +494,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p><em>This</em> has been emphasized, while
+	  <programlisting><![CDATA[<p><em>This</em> has been emphasized, while
   <strong>this</strong> has been strongly emphasized.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -510,7 +510,7 @@
 	<example>
 	  <title><sgmltag>b</sgmltag> and <sgmltag>i</sgmltag></title>
 
-	  <programlisting><![ CDATA [<p><b>This</b> is in bold, while <i>this</i> is
+	  <programlisting><![CDATA[<p><b>This</b> is in bold, while <i>this</i> is
   in italics.</p>]]></programlisting>
 	</example>
       </sect3>
@@ -527,7 +527,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>This document was originally written by
+	  <programlisting><![CDATA[<p>This document was originally written by
   Nik Clayton, who can be reached by email as
   <tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
 	</example>
@@ -568,7 +568,7 @@
 
 	  <para>The following fragments all do the same thing.</para>
 
-	  <programlisting><![ CDATA [<p>This text is <small>slightly smaller</small>.  But
+	  <programlisting><![CDATA[<p>This text is <small>slightly smaller</small>.  But
   this text is <big>slightly bigger</big>.</p>
 
 <p>This text is <font size="-1">slightly smaller</font>.  But
@@ -605,7 +605,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p>More information is available at the
+	  <programlisting><![CDATA[<p>More information is available at the
   <a href="http://www.FreeBSD.org/">FreeBSD web site</a>.</p>]]></programlisting>
 	</example>
 
@@ -629,7 +629,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<p><a name="para1">This</a> paragraph can be referenced
+	  <programlisting><![CDATA[<p><a name="para1">This</a> paragraph can be referenced
   in other links with the name <tt>para1</tt>.</p>]]></programlisting>
 	</example>
 
@@ -643,7 +643,7 @@
 	  <para>Assume that the <literal>para1</literal> example resides in a
 	    document called <filename>foo.html</filename>.</para>
 
-	  <programlisting><![ CDATA [<p>More information can be found in the
+	  <programlisting><![CDATA[<p>More information can be found in the
   <a href="foo.html#para1">first paragraph</a> of
   <tt>foo.html</tt>.</p>]]></programlisting>
 	</example>
@@ -658,7 +658,7 @@
 	  <para>Assume that the <literal>para1</literal> example resides in
 	    this document:</para>
 
-	  <programlisting><![ CDATA [<p>More information can be found in the
+	  <programlisting><![CDATA[<p>More information can be found in the
   <a href="#para1">first paragraph</a> of this
   document.</p>]]></programlisting>
 	</example>
@@ -881,7 +881,7 @@
 	<example>
 	  <title>A simple chapter</title>
 
-	  <programlisting><![ CDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>The chapter's title</title>
 
   ...
@@ -895,7 +895,7 @@
 	<example>
 	  <title>Empty chapters</title>
 
-	  <programlisting><![ CDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>This is an empty chapter</title>
 
   <para></para>
@@ -922,7 +922,7 @@
 	<example>
 	  <title>Sections in chapters</title>
 
-	  <programlisting><![ RCDATA [<chapter>
+	  <programlisting><![CDATA[<chapter>
   <title>A sample chapter</title>
 
   <para>Some text in the chapter.</para>
@@ -971,7 +971,7 @@
 	  more <sgmltag>part</sgmltag>s.  This cannot be done in an
 	  <sgmltag>article</sgmltag>.</para>
 
-	<programlisting><![ CDATA [<part>
+	<programlisting><![CDATA[<part>
   <title>Introduction</title>
 
   <chapter>
@@ -1016,7 +1016,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>This is a paragraph.  It can contain just about any
+	  <programlisting><![CDATA[<para>This is a paragraph.  It can contain just about any
   other element.</para> ]]></programlisting>
 
 	  <para>Appearance:</para>
@@ -1041,7 +1041,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>A small excerpt from the US Constitution:</para>
+	  <programlisting><![CDATA[<para>A small excerpt from the US Constitution:</para>
 
 <blockquote>
   <title>Preamble to the Constitution of the United States</title>
@@ -1116,7 +1116,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<warning>
+	  <programlisting><![CDATA[<warning>
   <para>Installing FreeBSD may make you want to delete Windows from your
     hard disk.</para>
 </warning>]]></programlisting>
@@ -1165,7 +1165,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<itemizedlist>
+	  <programlisting><![CDATA[<itemizedlist>
   <listitem>
     <para>This is the first itemized item.</para>
   </listitem>
@@ -1258,7 +1258,7 @@
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA[<para>When you have finished, your program should look like
+	  <programlisting><![CDATA[<para>When you have finished, your program should look like
   this:</para>
 
 <programlisting>#include &lt;stdio.h&gt;
@@ -1307,7 +1307,7 @@ main(void)
 	  <title><sgmltag>co</sgmltag> and
 	    <sgmltag>calloutlist</sgmltag></title>
 
-	  <programlisting><![ CDATA[<para>When you have finished, your program should look like
+	  <programlisting><![CDATA[<para>When you have finished, your program should look like
   this:</para>
 
 <programlisting>#include &lt;stdio.h&gt; <co id="co-ex-include"/>
@@ -1392,7 +1392,7 @@ main(void)
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<informaltable frame="none" pgwide="1">
+	  <programlisting><![CDATA[<informaltable frame="none" pgwide="1">
   <tgroup cols="2">
     <thead>
       <row>
@@ -1552,7 +1552,7 @@ main(void)
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+	  <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
 foo1
 foo2
 foo3
@@ -1610,7 +1610,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>FreeBSD is without doubt <emphasis>the</emphasis>
+	  <programlisting><![CDATA[<para>FreeBSD is without doubt <emphasis>the</emphasis>
   premiere Unix like operating system for the Intel architecture.</para>]]></programlisting>
 
 	  <para>Appearance:</para>
@@ -1633,7 +1633,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>However, make sure that the search does not go beyond the
+	  <programlisting><![CDATA[<para>However, make sure that the search does not go beyond the
   <quote>boundary between local and public administration</quote>,
   as RFC 1535 calls it.</para>]]></programlisting>
 
@@ -1671,7 +1671,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>To switch to the second virtual terminal, press
+	  <programlisting><![CDATA[<para>To switch to the second virtual terminal, press
   <keycombo action="simul"><keycap>Alt</keycap>
     <keycap>F1</keycap></keycombo>.</para>
 
@@ -1775,7 +1775,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para><application>Sendmail</application> is the most
+	  <programlisting><![CDATA[<para><application>Sendmail</application> is the most
   widely used Unix mail application.</para>
 
 <para><application>Sendmail</application> includes the
@@ -1834,7 +1834,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>The SGML source for the Handbook in English can be
+	  <programlisting><![CDATA[<para>The SGML source for the Handbook in English can be
   found in <filename>/usr/doc/en/handbook/</filename>.  The first
   file is called <filename>handbook.xml</filename> in that
   directory.  You should also see a <filename>Makefile</filename>
@@ -1876,7 +1876,7 @@ This is the file called 'foo2'</screen>
 
           <para>Use:</para>
 
-          <programlisting><![ CDATA [<para>Install the <filename role="package">net/ethereal</filename> port to view network traffic.</para>]]></programlisting>
+          <programlisting><![CDATA[<para>Install the <filename role="package">net/ethereal</filename> port to view network traffic.</para>]]></programlisting>
 
           <para>Appearance:</para>
 
@@ -1909,7 +1909,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para><devicename>sio</devicename> is used for serial
+	  <programlisting><![CDATA[<para><devicename>sio</devicename> is used for serial
   communication in FreeBSD.  <devicename>sio</devicename> manifests
   through a number of entries in <filename>/dev</filename>, including
   <filename>/dev/ttyd0</filename> and <filename>/dev/cuaa0</filename>.</para>
@@ -2032,7 +2032,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>The local machine can always be referred to by the
+	  <programlisting><![CDATA[<para>The local machine can always be referred to by the
   name <hostid>localhost</hostid>, which will have the IP address
   <hostid role="ipaddr">127.0.0.1</hostid>.</para>
 
@@ -2093,7 +2093,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>To carry out most system administration functions you
+	  <programlisting><![CDATA[<para>To carry out most system administration functions you
   will need to be <username>root</username>.</para>]]></programlisting>
 
 	  <para>Appearance:</para>
@@ -2130,7 +2130,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>Two common targets in a <filename>Makefile</filename>
+	  <programlisting><![CDATA[<para>Two common targets in a <filename>Makefile</filename>
   are <maketarget>all</maketarget> and <maketarget>clean</maketarget>.</para>
 
 <para>Typically, invoking <maketarget>all</maketarget> will rebuild the
@@ -2180,7 +2180,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>The <literal>maxusers 10</literal> line in the kernel
+	  <programlisting><![CDATA[<para>The <literal>maxusers 10</literal> line in the kernel
   configuration file determines the size of many system tables, and is
   a rough guide to how many simultaneous logins the system will
   support.</para>]]></programlisting>
@@ -2212,7 +2212,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<informalexample>
+	  <programlisting><![CDATA[<informalexample>
   <screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
 </informalexample>]]></programlisting>
 
@@ -2230,7 +2230,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>The <literal>maxusers <replaceable>n</replaceable></literal>
+	  <programlisting><![CDATA[<para>The <literal>maxusers <replaceable>n</replaceable></literal>
   line in the kernel configuration file determines the size of many system
   tables, and is a rough guide to how many simultaneous logins the system will
   support.</para>
@@ -2262,7 +2262,7 @@ This is the file called 'foo2'</screen>
 
           <para>Use:</para>
 
-	  <programlisting><![ CDATA [
+	  <programlisting><![CDATA[
 <screen><errorname>Panic: cannot mount root</errorname></screen> ]]>
 </programlisting>
 
@@ -2370,7 +2370,7 @@ This is the file called 'foo2'</screen>
 	</itemizedlist>
 
 	<para>An example will probably make things easier to understand.
-	  Suppose you have an image, called <filename>fig1</filename>, that
+	  Suppose you have an image, called <filename>fig1.png</filename>, that
 	  you want to include in the document.  This image is of a rectangle
 	  with an A inside it.  The markup for this would be as
 	  follows.</para>
@@ -2536,7 +2536,7 @@ IMAGES=  chapter1/fig1.png
 	<example>
 	  <title><literal>id on chapters and sections</literal></title>
 
-	  <programlisting><![ CDATA [<chapter id="chapter1">
+	  <programlisting><![CDATA[<chapter id="chapter1">
   <title>Introduction</title>
 
   <para>This is the introduction.  It contains a subsection,
@@ -2565,7 +2565,7 @@ IMAGES=  chapter1/fig1.png
 	<example>
 	  <title><sgmltag>anchor</sgmltag></title>
 
-	  <programlisting><![ CDATA [<para>This paragraph has an embedded
+	  <programlisting><![CDATA[<para>This paragraph has an embedded
   <anchor id="para1">link target in it.  It will not show up in
   the document.</para>]]></programlisting>
 	</example>
@@ -2590,7 +2590,7 @@ IMAGES=  chapter1/fig1.png
 	  <para>Assume that this fragment appears somewhere in a document that
 	    includes the <literal>id</literal> example:</para>
 
-	  <programlisting><![ CDATA [<para>More information can be found
+	  <programlisting><![CDATA[<para>More information can be found
   in <xref linkend="chapter1">.</para>
 
 <para>More specific information can be found
@@ -2631,7 +2631,7 @@ IMAGES=  chapter1/fig1.png
 	  <para>Assume that this fragment appears somewhere in a document that
 	    includes the <literal>id</literal> example.</para>
 
-	  <programlisting><![ CDATA [<para>More information can be found in
+	  <programlisting><![CDATA[<para>More information can be found in
   <link linkend="chapter1">the first chapter</link>.</para>
 
 <para>More specific information can be found in
@@ -2681,7 +2681,7 @@ IMAGES=  chapter1/fig1.png
 
 	  <para>Use:</para>
 
-	  <programlisting><![ CDATA [<para>Of course, you could stop reading this document and
+	  <programlisting><![CDATA[<para>Of course, you could stop reading this document and
   go to the <ulink url="&url.base;/index.html">FreeBSD
   home page</ulink> instead.</para>]]></programlisting>
 
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
index a6d2030e97..238c3a4d66 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -98,7 +98,7 @@
     <para>The previous example is actually represented in this document like
       this:</para>
 
-    <programlisting><![ CDATA [
+    <programlisting><![CDATA[
 <para>To remove <filename>/tmp/foo</filename> use &man.rm.1;.</para>
 
 <screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>]]></programlisting>
@@ -215,7 +215,7 @@
 	the element is a paragraph, called <literal>p</literal>.  This
 	element has both start and end tags.</para>
 
-      <programlisting><![ CDATA [<p>This is a paragraph.  It starts with the start tag for
+      <programlisting><![CDATA[<p>This is a paragraph.  It starts with the start tag for
   the 'p' element, and it will end with the end tag for the 'p'
   element.</p>
 
@@ -234,7 +234,7 @@
 	<literal>hr</literal>.  This element does not wrap content, so only
 	has a start tag.</para>
 
-      <programlisting><![ CDATA [<p>This is a paragraph.</p>
+      <programlisting><![CDATA[<p>This is a paragraph.</p>
 
 <hr>
 
@@ -250,7 +250,7 @@
     <example>
       <title>Elements within elements; <sgmltag>em</sgmltag></title>
 
-      <programlisting><![ CDATA [<p>This is a simple <em>paragraph</em> where some
+      <programlisting><![CDATA[<p>This is a simple <em>paragraph</em> where some
   of the <em>words</em> have been <em>emphasized</em>.</p>]]></programlisting>
     </example>
 
@@ -300,7 +300,7 @@
     <example>
       <title>Using an element with an attribute</title>
 
-      <programlisting><![ CDATA [<p align="left">The inclusion of the align attribute
+      <programlisting><![CDATA[<p align="left">The inclusion of the align attribute
   on this paragraph was superfluous, since the default is left.</p>
 
 <p align="center">This may appear in the center.</p>]]></programlisting>
@@ -315,7 +315,7 @@
     <example>
       <title>Single quotes around attributes</title>
 
-      <programlisting><![ CDATA [<p align='right'>I am on the right!</p>]]></programlisting>
+      <programlisting><![CDATA[<p align='right'>I am on the right!</p>]]></programlisting>
     </example>
 
     <para>Sometimes you do not need to use quotes around attribute values at
@@ -391,7 +391,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATAL
 	  <para>Create <filename>example.xml</filename>, and enter the
             following text:</para>
 
-	  <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+	  <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
 <html>
   <head>
@@ -539,7 +539,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <para>A typical declaration for a document written to conform with version
       4.0 of the HTML DTD looks like this:</para>
 
-    <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
 
     <para>That line contains a number of different components.</para>
 
@@ -764,7 +764,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <para>The syntax for this is slightly different:</para>
 
-      <programlisting><![ CDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+      <programlisting><![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
 
       <para>The <literal>SYSTEM</literal> keyword indicates that the SGML
 	processor should locate the DTD in a system specific fashion.  This
@@ -818,7 +818,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <programlisting>&lt;!-- ���յ��� --></programlisting>
 
-      <programlisting><![ CDATA [
+      <programlisting><![CDATA[
 <!-- �o�O���� -->
 
 <!-- �o�]�O����    -->
@@ -830,7 +830,8 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
   -- �]�i�H�o�ˤl�� -->]]></programlisting>
     </example>
 
-    <![ %output.print; [
+<!--
+    <![%output.print;[
     <important>
       <title>Use 2 dashes</title>
 
@@ -849,6 +850,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	affected.</para>
     </important>
     ]]>
+-->
 
     <para>If you have used HTML before you may have been shown different rules
       for comments.  In particular, you may think that the string
@@ -863,7 +865,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     <example>
       <title>Erroneous SGML comments</title>
 
-      <programlisting><![ CDATA [
+      <programlisting><![CDATA[
 <!-- This is in the comment --
 
      THIS IS OUTSIDE THE COMMENT!
@@ -877,12 +879,12 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>This is not valid SGML, and may give confusing error
 	messages.</para>
 
-      <programlisting><![ CDATA [<!--------------- This is a very bad idea --------------->]]></programlisting>
+      <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
 
       <para>As the example suggests, <emphasis>do not</emphasis> write
 	comments like that.</para>
 
-      <programlisting><![ CDATA [<!--===================================================-->]]></programlisting>
+      <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
 
       <para>That is a (slightly) better approach, but it still potentially
 	confusing to people new to SGML.</para>
@@ -938,7 +940,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	<literal>current.version</literal> which expanded to the current
 	version number of your product.  You could write:</para>
 
-      <programlisting><![ CDATA [<para>The current version of our product is
+      <programlisting><![CDATA[<para>The current version of our product is
   &current.version;.</para>]]></programlisting>
 
       <para>When the version number changes you can simply change the
@@ -966,7 +968,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <example>
 	<title>Defining general entities</title>
 
-	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY current.version    "3.0-RELEASE">
 <!ENTITY last.version       "2.2.7-RELEASE">
 ]>]]></programlisting>
@@ -1005,7 +1007,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <example>
 	<title>Defining parameter entities</title>
 
-	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY % param.some "some">
 <!ENTITY % param.text "text">
 <!ENTITY % param.new  "%param.some more %param.text">
@@ -1025,7 +1027,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <para>Add a general entity to
 	    <filename>example.xml</filename>.</para>
 
-	  <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+	  <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY version "1.1">
 ]>
 
@@ -1123,7 +1125,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <example>
 	<title>Using general entities to include files</title>
 
-	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">
@@ -1177,7 +1179,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <filename>chapters.ent</filename>.  This file contains the
 	  following:</para>
 
-	<programlisting><![ CDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+	<programlisting><![CDATA[<!ENTITY chapter.1 SYSTEM "chapter1.xml">
 <!ENTITY chapter.2 SYSTEM "chapter2.xml">
 <!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
 
@@ -1186,7 +1188,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  document, which will then make all the general entities available
 	  for use.  Then use the general entities as before:</para>
 
-	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!-- Define a parameter entity to load in the chapter general entities -->
 <!ENTITY % chapters SYSTEM "chapters.ent">
 
@@ -1216,14 +1218,14 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	    <para>Put content similar to the following in each file:</para>
 
-	    <programlisting><![ CDATA [<p>This is the first paragraph.</p>]]></programlisting>
+	    <programlisting><![CDATA[<p>This is the first paragraph.</p>]]></programlisting>
 	  </step>
 
 	  <step>
 	    <para>Edit <filename>example.xml</filename> so that it looks like
 	      this:</para>
 
-	    <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
 <!ENTITY para1 SYSTEM "para1.xml">
 <!ENTITY para2 SYSTEM "para2.xml">
@@ -1273,7 +1275,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	    <para>Edit <filename>example.xml</filename> so that it looks like
 	      this:</para>
 
-	    <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY % entities SYSTEM "entities.xml"> %entities;
 ]>
 
@@ -1296,7 +1298,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	    <para>Create a new file, <filename>entities.xml</filename>, with
 	      this content:</para>
 
-	    <programlisting><![ CDATA [<!ENTITY version "1.1">
+	    <programlisting><![CDATA[<!ENTITY version "1.1">
 <!ENTITY para1 SYSTEM "para1.xml">
 <!ENTITY para2 SYSTEM "para2.xml">
 <!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1336,7 +1338,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
     </example>
 
     <para>As you would expect, being an SGML construct, a marked section
-      starts with <literal>&lt!</literal>.</para>
+      starts with <literal>&lt;!</literal>.</para>
 
     <para>The first square bracket begins to delimit the marked
       section.</para>
@@ -1418,7 +1420,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
   &lt;programlisting>) are from DocBook.&lt;/para>
 
 &lt;programlisting>
-  &lt;![ CDATA [  <![ CDATA [
+  &lt;![CDATA[<![CDATA[
     <p>This is a sample that shows you some of the elements within
       HTML.  Since the angle brackets are used so many times, it is
       simpler to say the whole example is a CDATA marked section
@@ -1532,16 +1534,16 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
   &lt;/head>
 
   &lt;body>
-    &lt;p>This paragraph &lt;![ CDATA [contains many &lt;
+    &lt;p>This paragraph &lt;![CDATA[contains many &lt;
       characters (&lt; &lt; &lt; &lt; &lt;) so it is easier
       to wrap it in a CDATA marked section ]]&gt;&lt;/p>
 
-    &lt;![ IGNORE [
+    &lt;![IGNORE[
     &lt;p>This paragraph will definitely not be included in the
       output.&lt;/p>
     ]]&gt;
 
-    &lt;![ <![ CDATA [%text.output]]> [
+    &lt;![<![CDATA[%text.output]]> [
     &lt;p>This paragraph might appear in the output, or it
       might not.&lt;/p>
 
diff --git a/zh_TW.Big5/books/fdp-primer/structure/chapter.xml b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
index 658a93ec39..8c22d28519 100644
--- a/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -222,7 +222,7 @@
 
 	  <para>For example, if one of the chapter files contains:</para>
 
-	  <programlisting><![ CDATA [
+	  <programlisting><![CDATA[
 <chapter id="kernelconfiguration">
 ...
 </chapter>]]></programlisting>
diff --git a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
index 2ed9a117bb..785f566f4b 100644
--- a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
index 9a55bd17d3..d0b27f568b 100644
--- a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -85,7 +85,7 @@
       </step>
 
       <step>
-	<para>���� <filename role="directory">www/en</filename> �ؿ��A�M�ᥴ
+	<para>���� <filename class="directory">www/en</filename> �ؿ��A�M�ᥴ
 	  &man.make.1; <maketarget>all</maketarget> �Ӳ��ͺ����C</para>
 
 	<screen>&prompt.root; <userinput>cd en</userinput>
diff --git a/zh_TW.Big5/books/fdp-primer/tools/chapter.xml b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
index a15d80b543..eb7cfe411f 100644
--- a/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/translations/chapter.xml b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
index 8eab03e45c..2a19c41ee7 100644
--- a/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
index a936251da5..ffb5b6a2c0 100644
--- a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
 
      Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -172,7 +172,7 @@
 	�A<emphasis>�ӫD</emphasis> <literal>&lt;PARA&gt;</literal>�C</para>
 
       <para>�� SGML ����h�O�Τj�g�r�����ܡA���O�G
-	<literal>&lt!ENTITY&hellip;&gt;</literal> ��
+	<literal>&lt;!ENTITY&hellip;&gt;</literal> ��
 	<literal>&lt;!DOCTYPE&hellip;&gt;</literal>�A
 	<emphasis>�Ӥ��O</emphasis>
 	<literal>&lt;!entity&hellip;&gt;</literal> ��
@@ -209,7 +209,7 @@
 
       <para>�|�ӨҤl�A�o�`�ҥΪ��g�k�j�P�O�U���o�ˡG</para>
 
-      <programlisting><![ CDATA [+--- �o�O 0 �a�C
+      <programlisting><![CDATA[+--- �o�O 0 �a�C
 V
 <chapter>
   <title>...</title>
@@ -256,7 +256,7 @@ augroup END</programlisting>
 	  ��p�G</para>
 
 	<informalexample>
-	  <programlisting><![ CDATA [<article lang='zh_tw'>
+	  <programlisting><![CDATA[<article lang='zh_tw'>
   <articleinfo>
     <title>NIS</title>
 
@@ -340,19 +340,19 @@ GB.  Hardware compression &hellip;</literallayout>
       <itemizedlist>
 	<listitem>
 	  <para>�b�Ʀr�P��줧���G</para>
-	  <programlisting><![ CDATA [57600&nbsp;bps]]></programlisting>
+	  <programlisting><![CDATA[57600&nbsp;bps]]></programlisting>
 	</listitem>
 
 	<listitem>
 	  <para>�b�{���W�ٻP���������G</para>
-	  <programlisting><![ CDATA [FreeBSD&nbsp;4.7]]></programlisting>
+	  <programlisting><![CDATA[FreeBSD&nbsp;4.7]]></programlisting>
 	</listitem>
 
 	<listitem>
 	  <para>multiword ���� (�ϥήɽФp�ߡA���O <quote>The FreeBSD Brazilian
 	    Portuguese Documentation Project</quote> �o���ѤT��|�Ӧr�Ҳզ����A
 	    �h���Υ[�C)�G</para>
-	  <programlisting><![ CDATA [Sun&nbsp;Microsystems]]></programlisting>
+	  <programlisting><![CDATA[Sun&nbsp;Microsystems]]></programlisting>
 	</listitem>
       </itemizedlist>
     </sect2>
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index c7a3585dc2..a86b5c2c8f 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -34,7 +34,6 @@ DOC?= book
 FORMATS?= html-split
 
 HAS_INDEX= true
-USE_PS2PDF=	yes
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
@@ -260,30 +259,43 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+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
-
-CLEANFILES+=	mirrors.xml.ftp.inc \
-		mirrors.xml.cvsup.inc \
-		eresources.xml.www.inc
+		mirrors.xml.cvsup.index.inc \
+		eresources.xml.www.inc \
+		eresources.xml.www.index.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
index 1ad1706ea8..8b16140908 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
+++ b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1954,7 +1954,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
 	  <para>The next step is to start
 	    <application>hostapd</application>:</para>
 
-	  <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
 
 	<screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
   ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -3647,7 +3647,7 @@ subnet 192.168.4.0 netmask 255.255.255.0 {
 		<filename>pxeboot</filename>, not the kernel.  There are other
 		interesting possibilities, like loading
 		<filename>pxeboot</filename> from a &os; CD-ROM
-		<filename role="directory">/boot</filename> directory (as
+		<filename class="directory">/boot</filename> directory (as
 		&man.pxeboot.8; can load a <filename>GENERIC</filename> kernel,
 		this makes it possible to use <acronym>PXE</acronym> to boot
 		from a remote CD-ROM).</para>
@@ -5533,7 +5533,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
 	  should be issued on
 	  <hostid>provider.example.org</hostid>:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
 
 	<para>This should be done on the <devicename>carp</devicename>
 	  interface which corresponds to the correct host.</para>
diff --git a/zh_TW.Big5/books/handbook/audit/chapter.xml b/zh_TW.Big5/books/handbook/audit/chapter.xml
index 79179f96ac..24ef97a465 100644
--- a/zh_TW.Big5/books/handbook/audit/chapter.xml
+++ b/zh_TW.Big5/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -168,7 +168,7 @@ requirements. -->
     <para>Support for Event Auditing is installed with
       the normal <maketarget>installworld</maketarget> process.  An
       administrator may confirm this by viewing the contents
-      of <filename role="directory">/etc/security</filename>.  Files
+      of <filename class="directory">/etc/security</filename>.  Files
       beginning with the word <emphasis>audit</emphasis> should be present.
       For example, <filename>audit_event</filename>.</para>
 
@@ -195,7 +195,7 @@ requirements. -->
     <title>Audit Configuration</title>
 
     <para>All configuration files for security audit are found in
-      <filename role="directory">/etc/security</filename>.  The following
+      <filename class="directory">/etc/security</filename>.  The following
       files must be present before the audit daemon is started:</para>
 
     <itemizedlist>
@@ -452,10 +452,10 @@ naflags:lo</programlisting>
 	  percentage of free space for audit file systems.  This
 	  relates to the file system where audit logs are stored.
 	  For example, if the <option>dir</option> specifies
-	  <filename role="directory">/var/audit</filename> and
+	  <filename class="directory">/var/audit</filename> and
 	  <option>minfree</option> is set to twenty (20), warning
 	  messages will be generated when the
-	  <filename role="directory">/var</filename> file system grows
+	  <filename class="directory">/var</filename> file system grows
 	  to eighty (80) percent full.</para>
 
 	<para>The <option>naflags</option> option specifies audit
diff --git a/zh_TW.Big5/books/handbook/basics/chapter.xml b/zh_TW.Big5/books/handbook/basics/chapter.xml
index 520d95adbd..1237319f9d 100644
--- a/zh_TW.Big5/books/handbook/basics/chapter.xml
+++ b/zh_TW.Big5/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -808,7 +808,7 @@ total 530
 	      <entry>�s��U�إγ~�� log �ɡB�{�ɩμȮɦs��B�C�L�ζl��
 		spool �ɮסC���ɭԡAmemory-based �ɮרt�Τ]�|�����b
 		<filename class="directory">/var</filename>�C
-		�o�Ǻ��ƥi�z�L varmfs ������ &man.rc.conf.5
+		�o�Ǻ��ƥi�z�L varmfs ������ &man.rc.conf.5;
 		�����ܼƨӦ۰ʧ����C(�άO�b
 		<filename>/etc/fstab</filename> �����]�w�A�����Ӹ`�аѾ\
 		&man.mdmfs.8;�C)</entry>
@@ -906,7 +906,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -926,7 +926,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -954,7 +954,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -980,7 +980,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1005,7 +1005,7 @@ total 530
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1083,7 +1083,7 @@ total 530
       </itemizedlist>
 
       <para>�ɮרt�Υ]�t�b���ΰϸ̭��C
-	�]�� &os; ��ŧ &unix �[�c�A�o���������ΰϩM�@�봣�쪺���ΰ�
+	�]�� &os; ��ŧ &unix; �[�c�A�o���������ΰϩM�@�봣�쪺���ΰ�
 	(�Ҧp &ms-dos; ���ΰ�) ���P�C �C�@�Ӥ��ΰϥѤ@�ӥN��(�r��)���ܡA�q
 	<literal>a</literal> �� <literal>h</literal>�C
 	�C�Ӥ��ΰϥu��]�t�@���ɮרt�ΡC
@@ -1292,7 +1292,7 @@ total 530
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/zh_TW.Big5/books/handbook/bibliography/chapter.xml b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
index 367ed55a18..5f8fd5d824 100644
--- a/zh_TW.Big5/books/handbook/bibliography/chapter.xml
+++ b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/book.xml b/zh_TW.Big5/books/handbook/book.xml
index 272f315b40..f41b68b982 100644
--- a/zh_TW.Big5/books/handbook/book.xml
+++ b/zh_TW.Big5/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/zh_TW.Big5/books/handbook/boot/chapter.xml b/zh_TW.Big5/books/handbook/boot/chapter.xml
index 9147e51406..5400fc8b2c 100644
--- a/zh_TW.Big5/books/handbook/boot/chapter.xml
+++ b/zh_TW.Big5/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/chapters.ent b/zh_TW.Big5/books/handbook/chapters.ent
index 8868fe9a40..177bf80f5b 100644
--- a/zh_TW.Big5/books/handbook/chapters.ent
+++ b/zh_TW.Big5/books/handbook/chapters.ent
@@ -11,231 +11,61 @@
      Original revision: 1.33
 -->
 
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "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.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.virtualization;[
   <!ENTITY chap.virtualization	SYSTEM "virtualization/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.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">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+  <!ENTITY chap.mirrors.cvsup.index.inc	SYSTEM "mirrors.xml.cvsup.index.inc">
   <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
   <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
   <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+  <!ENTITY chap.eresources.www.index.inc	SYSTEM "eresources.xml.www.index.inc">
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
   <!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/zh_TW.Big5/books/handbook/colophon.xml b/zh_TW.Big5/books/handbook/colophon.xml
index 3eedb9aed1..62f4bb0b8d 100644
--- a/zh_TW.Big5/books/handbook/colophon.xml
+++ b/zh_TW.Big5/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/config/chapter.xml b/zh_TW.Big5/books/handbook/config/chapter.xml
index d21c12bc31..51b9f8a55e 100644
--- a/zh_TW.Big5/books/handbook/config/chapter.xml
+++ b/zh_TW.Big5/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -352,7 +352,7 @@ stop)
         kill -9 `cat /var/run/utility.pid`
         ;;
 *)
-        echo "Usage: `basename $0` {start|stop}" &gt;&2
+        echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
         exit 64
         ;;
 esac
diff --git a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
index 4163460677..11534ff2c8 100644
--- a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
+++ b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/desktop/chapter.xml b/zh_TW.Big5/books/handbook/desktop/chapter.xml
index c6b809d735..25aa903c5f 100644
--- a/zh_TW.Big5/books/handbook/desktop/chapter.xml
+++ b/zh_TW.Big5/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/disks/chapter.xml b/zh_TW.Big5/books/handbook/disks/chapter.xml
index 0a3fc849fa..97816e5541 100644
--- a/zh_TW.Big5/books/handbook/disks/chapter.xml
+++ b/zh_TW.Big5/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -416,7 +416,7 @@ ad3: 29333MB &lt;WDC WD307AA&gt; [59598/16/63] at ata1-slave UDMA33</programlist
 	      �C</para></note>
 
 	  <para>���U�ӡA�Ҽ{�p��N�����ܦ��ɮרt�Ϊ��@�����C�z�i�H�Ѧ�
-	    &man.vinum.8;(<xref linkend="vinum-vinum"/>) �� &man.ccd.4�C
+	    &man.vinum.8;(<xref linkend="vinum-vinum"/>) �� &man.ccd.4;�C
 	    �b���ڭ̿�� &man.ccd.4;�C</para>
 	</sect4>
 
@@ -2524,7 +2524,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	<example>
 	  <title>A Script for Creating a Bootable Floppy</title>
 
-	<programlisting><![ CDATA [#!/bin/sh
+	<programlisting><![CDATA[#!/bin/sh
 #
 # create a restore floppy
 #
@@ -2736,16 +2736,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
 	  Whatever caused the crash or data loss may strike again.  Another
 	  hour spent now may save you from further distress later.</para>
       </sect3>
-
-<![ %not.published; [
-
-      <sect3>
-	<title>* I Did Not Prepare for the Disaster, What Now?</title>
-
-	<para></para>
-      </sect3>
-]]>
-
     </sect2>
   </sect1>
 
@@ -3693,7 +3683,7 @@ device crypto</screen>
 	  <para>The following example will describe how to generate a
 	    key file, which will be used as part of the Master Key for
 	    the encrypted provider mounted under
-	    <filename role="directory">/private</filename>.  The key
+	    <filename class="directory">/private</filename>.  The key
 	    file will provide some random data used to encrypt the
 	    Master Key.  The Master Key will be protected by a
 	    passphrase as well.  Provider's sector size will be 4kB big.
@@ -3765,7 +3755,7 @@ Filesystem     Size   Used  Avail Capacity  Mounted on
 	  <title>Unmounting and Detaching the Provider</title>
 
 	  <para>Once the work on the encrypted partition is done, and
-	    the <filename role="directory">/private</filename> partition
+	    the <filename class="directory">/private</filename> partition
 	    is no longer needed, it is prudent to consider unmounting
 	    and detaching the <command>geli</command> encrypted
 	    partition from the kernel.</para>
diff --git a/zh_TW.Big5/books/handbook/eresources/chapter.xml b/zh_TW.Big5/books/handbook/eresources/chapter.xml
index a48da1f8fb..104be5ccc5 100644
--- a/zh_TW.Big5/books/handbook/eresources/chapter.xml
+++ b/zh_TW.Big5/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1633,6 +1633,10 @@
   <sect1 id="eresources-web">
     <title>World Wide Web Servers</title>
 
+    &chap.eresources.www.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.eresources.www.inc;
   </sect1>
 
diff --git a/zh_TW.Big5/books/handbook/firewalls/chapter.xml b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
index 8fa7476433..ac4dcd058f 100644
--- a/zh_TW.Big5/books/handbook/firewalls/chapter.xml
+++ b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.xml b/zh_TW.Big5/books/handbook/geom/chapter.xml
index 1672ae11f8..d9acaa869d 100644
--- a/zh_TW.Big5/books/handbook/geom/chapter.xml
+++ b/zh_TW.Big5/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 	  $FreeBSD$
@@ -78,7 +78,7 @@
   <sect1 id="GEOM-intro">
     <title>GEOM �ɽ�</title>
 
-	<para>GEOM �z�L privoder(�Y <filename role="directory">/dev/</filename>
+	<para>GEOM �z�L privoder(�Y <filename class="directory">/dev/</filename>
 	�U���S���˸m�ɮ�) �Ӿޱ� classes(�p Master Boot Records�B
 	<acronym>BSD</acronym> labels ��) �CGEOM �䴩�h�سn��
 	<acronym>RAID</acronym> �t�m�A�z�L GEOM �s���ɡA
@@ -142,9 +142,9 @@
 	</step>
 
       <step><para>�T�w�����I(mount point)�s�b�C
-	  �p�G�Q�Τ����s��(striping)���Ŷ������ڥؿ�(root partition�A�Y <filename role="directory">/</filename> )�A
+	  �p�G�Q�Τ����s��(striping)���Ŷ������ڥؿ�(root partition�A�Y <filename class="directory">/</filename> )�A
 	  �h���έӼȮɪ������I�A�p
-	  <filename role="directory">/mnt</filename>�G</para>
+	  <filename class="directory">/mnt</filename>�G</para>
 
         <screen>&prompt.root; <userinput>mkdir /mnt</userinput></screen>
       </step>
@@ -173,7 +173,7 @@ XXX: What message?  Put it inside the screen output above.
       </step>
 
       <step><para>���F���e�إߪ� <devicename>st0</devicename> �A�o�ӨB�J�ٷ|�b
-	  <filename role="directory">/dev/stripe</filename> �U�s�W��Ӹ˸m�G
+	  <filename class="directory">/dev/stripe</filename> �U�s�W��Ӹ˸m�G
 	  <devicename>st0a</devicename> �M <devicename>st0c</devicename>�C
 	  �Q�� <command>newfs</command> ���O�i�H�b
 	  <devicename>st0a</devicename> �إ��ɮרt�ΡG</para>
@@ -224,7 +224,7 @@ XXX: What message?  Put it inside the screen output above.
 
     <para>�����ڭ̰��] &os; �w�˦b�Ĥ@�ӺϺФW�A�B�u����Ӥ��ΰ�(partition)�C
 	�䤤�@�ӬO�洫���ΰ�(swap partition�A�j�p�� <acronym>RAM</acronym>
-	���⭿)�A�ӳѤU�����Ω�ڥؿ�(�Y <filename role="directory">/</filename>�A
+	���⭿)�A�ӳѤU�����Ω�ڥؿ�(�Y <filename class="directory">/</filename>�A
 	root file system)�C���M�n�b���P�����I(mount point) ���X��h���ΰ�
 	(partition) �]�i�H�A���L���׷|�j�T���ɡA�]��������ʾާ@ &man.bsdlabel.8;
 	�M &man.fdisk.8; �u��C</para>
@@ -248,7 +248,7 @@ Done.</screen>
     <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
 
     <note>
-      <para>�o�ʧ@���ӷ|�b <filename role="directory">/dev/mirror</filename>
+      <para>�o�ʧ@���ӷ|�b <filename class="directory">/dev/mirror</filename>
 	  �U�إ� <devicename>gm0</devicename> �˸m���I(device node)�C</para>
     </note>
 
@@ -274,12 +274,12 @@ Done.</screen>
 
     <para>�t�η|�L�X�\�h��T�M�@�j��Ʀr�A�o�O���`���C
 	�T�{�O�_���{����~�A���۴N�i�H�N�o�Ӹ˸m������
-      <filename role="directory">/mnt</filename> �����I(mount mount)�G</para>
+      <filename class="directory">/mnt</filename> �����I(mount mount)�G</para>
 
     <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput></screen>
 
     <para>���۱N�쥻�}���ϺЪ���Ʒh����s���ɮרt��
-	 (<filename role="directory">/mnt</filename>)�C�d�ҬO��
+	 (<filename class="directory">/mnt</filename>)�C�d�ҬO��
       &man.dump.8; �M &man.restore.8; �A���L�� &man.dd.1; �]�i�H�C</para>
 
 	<screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt &amp;&amp; restore -r -v -f-)</userinput></screen>
diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml
index 287f376a5a..431f1f1215 100644
--- a/zh_TW.Big5/books/handbook/install/chapter.xml
+++ b/zh_TW.Big5/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -864,7 +864,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"/>
 	      </imageobject>
 	    </mediaobject>
 	  </figure>
@@ -951,14 +951,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	  ������ <command>~#</command> ������) �e�X <command>BREAK</command>
 	  ���O�Ӷi�J PROM prompt�C  �j���|���U���G</para>
 
-	  <screenco>
-	    <areaspec>
-	      <area id="prompt-single" coords="1 5"/>
-	      <area id="prompt-smp" coords="2 5"/>
-	    </areaspec>
-
-	    <screen><prompt>ok     </prompt>
-<prompt>ok {0} </prompt></screen>
+	    <screen><prompt>ok     </prompt><co id="prompt-single"/>
+<prompt>ok {0} </prompt><co id="prompt-smp"/></screen>
 
 	    <calloutlist>
 	      <callout arearefs="prompt-single">
@@ -970,7 +964,6 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 		  �s���C</para>
 	      </callout>
 	    </calloutlist>
-	  </screenco>
 
 	  <para>���ɽЧ�w�˥��Щ�J���о����A�M��b PROM prompt ��
 	    <command>boot cdrom</command> �Y�i�C</para>
@@ -1079,7 +1072,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1089,7 +1082,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1138,7 +1131,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1154,7 +1147,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1166,7 +1159,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1195,7 +1188,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1215,7 +1208,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1233,7 +1226,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1243,7 +1236,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1273,7 +1266,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1417,7 +1410,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1474,7 +1467,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1509,7 +1502,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1548,7 +1541,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1575,7 +1568,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1793,7 +1786,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1815,7 +1808,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1848,7 +1841,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1864,7 +1857,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1879,7 +1872,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1895,7 +1888,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1914,7 +1907,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1957,7 +1950,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1989,7 +1982,7 @@ Mounting root from ufs:/dev/md0c
  The Ports Collection is a very valuable resource and well worth having
  on your /usr partition, so it is advisable to say Yes to this option.
 
- For more information on the Ports Collection & the latest ports,
+ For more information on the Ports Collection &amp; the latest ports,
  visit:
      http://www.FreeBSD.org/ports
 
@@ -2004,7 +1997,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2034,7 +2027,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2207,7 +2200,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2249,7 +2242,7 @@ installation menus to retry whichever operations have failed.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2421,7 +2414,7 @@ use the current settings.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2489,7 +2482,7 @@ use the current settings.
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon1" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon1"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2539,7 +2532,7 @@ Upload subdirectory:
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2596,7 +2589,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"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -2646,7 +2639,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2660,7 +2653,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2680,7 +2673,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2694,7 +2687,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2738,7 +2731,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2751,7 +2744,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2764,7 +2757,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2824,7 +2817,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2837,7 +2830,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2852,7 +2845,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2865,7 +2858,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2879,7 +2872,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2895,7 +2888,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2940,7 +2933,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2961,7 +2954,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2988,7 +2981,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3002,7 +2995,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"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3042,7 +3035,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3055,7 +3048,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3155,7 +3148,7 @@ Press [Enter] now to invoke an editor on /etc/exports
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3221,7 +3214,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3288,7 +3281,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3355,7 +3348,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3409,7 +3402,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3435,7 +3428,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/zh_TW.Big5/books/handbook/introduction/chapter.xml b/zh_TW.Big5/books/handbook/introduction/chapter.xml
index 008865a193..4f922856af 100644
--- a/zh_TW.Big5/books/handbook/introduction/chapter.xml
+++ b/zh_TW.Big5/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/jails/chapter.xml b/zh_TW.Big5/books/handbook/jails/chapter.xml
index a82c543e54..65c05c16f8 100644
--- a/zh_TW.Big5/books/handbook/jails/chapter.xml
+++ b/zh_TW.Big5/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
     The FreeBSD Documentation Project
 
@@ -217,9 +217,9 @@
       <callout arearefs="jailpath">
 	<para>�����N�O���� jail ��Ӯa�C  �Ӹ��|�O�b host �t�Τ��� jail
 	  �����m�C  �ߺD�O��b <filename
-	  role="directory">/usr/jail/<replaceable>jailname</replaceable></filename>�A
+	  class="directory">/usr/jail/<replaceable>jailname</replaceable></filename>�A
 	  <replaceable>jailname</replaceable> ������� jail �� hostname
-	  �H�K��O�C  �q�` <filename role="directory">/usr</filename>
+	  �H�K��O�C  �q�` <filename class="directory">/usr</filename>
 	  �|�������Ŷ��Ӧs�� jail �ɮרt�ΡA��� <quote>complete</quote> jail
 	  �Ө��A���q�`�]�A�F &os; �w�]�w�� base system �Ҧ��ɮת������ɡC</para>
       </callout>
@@ -234,9 +234,9 @@
 	<para>�ϥ� <maketarget>distribution</maketarget> �o��
 	  <application>make</application> target �Ӹ˩Ҧ��|�Ψ쪺�]�w�ɡC
 	  ²��ӻ��Ӱʧ@�N�O�� <filename
-	  role="directory">/usr/src/etc/</filename> �ƻs�� jail ���Ҥ���
-	  <filename role="directory">/etc</filename>�A�]�N�O
-	  <filename role="directory">$D/etc/</filename>�C</para>
+	  class="directory">/usr/src/etc/</filename> �ƻs�� jail ���Ҥ���
+	  <filename class="directory">/etc</filename>�A�]�N�O
+	  <filename class="directory">$D/etc/</filename>�C</para>
       </callout>
 
       <callout arearefs="jaildevfs">
@@ -497,35 +497,35 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	<itemizedlist>
 	  <listitem>
 	    <para>�C�� jail ���|������ <filename
-	      role="directory">/home/j</filename> ���U���䤤�@�ӥؿ��C</para>
+	      class="directory">/home/j</filename> ���U���䤤�@�ӥؿ��C</para>
 	  </listitem>
 	  <listitem>
-	    <para><filename role="directory">/home/j/mroot</filename> �h�O�C��
+	    <para><filename class="directory">/home/j/mroot</filename> �h�O�C��
 	      jail �@�Ϊ��Ҫ��A�ù��Ҧ� jail �Ө����O��Ū�C</para>
 	  </listitem>
 	  <listitem>
-	    <para>�C�� jail �b <filename role="directory">/home/j</filename>
+	    <para>�C�� jail �b <filename class="directory">/home/j</filename>
 	      ���U�����@�Ӭ۹������ťؿ��C</para>
 	  </listitem>
 	  <listitem>
 	    <para>�C�� jail ���|�� <filename
-	      role="directory">/s</filename> �ؿ��A
+	      class="directory">/s</filename> �ؿ��A
 	      �ӥؿ��|�s��t�Ϊ��iŪ�g�����C</para>
 	  </listitem>
 	  <listitem>
 	    <para>�C�� jail ���|�b <filename
-	      role="directory">/home/j/skel</filename> �ؿ��إߦ��ݪ��iŪ�g�Ŷ�
+	      class="directory">/home/j/skel</filename> �ؿ��إߦ��ݪ��iŪ�g�Ŷ�
 	      �C</para>
 	  </listitem>
 	  <listitem>
 	    <para>�C�� jailspace (�U jail �iŪ�g������) ���ئb <filename
-	      role="directory">/home/js</filename>>�C</para>
+	      class="directory">/home/js</filename>>�C</para>
 	  </listitem>
 	</itemizedlist>
 
 	<note>
 	  <para>�o�䰲�]�Ҧ� jail ����b
-	    <filename role="directory">/home</filename> ���ΰϡC  ���M�A
+	    <filename class="directory">/home</filename> ���ΰϡC  ���M�A
 	    �]�i�H�̦ۨ��ݨD���A�����U�Ӫ��Ҥl���A
 	    �]�n�O�o�ק�۹������a��C</para>
 	</note>
@@ -588,7 +588,7 @@ jail_<replaceable>www</replaceable>_devfs_ruleset="<replaceable>www_ruleset</rep
 	  <step>
 	    <para>�{�b��iŪ�g���ɮרt�ΥH symlink �覡�s���Ū���ɮרt�ΡC
 	      �нT�{ symbolic link �O�_�����T�s�� <filename
-	      role="directory">s/</filename> �ؿ��A�Y�ؿ��إߤ覡����A
+	      class="directory">s/</filename> �ؿ��A�Y�ؿ��إߤ覡����A
 	      �Ϋ��V��m����A�i��|�ɭP�w�˥��ѡC</para>
 
 	    <screen>&prompt.root; <userinput>cd /home/j/mroot</userinput>
@@ -671,11 +671,11 @@ jail_www_devfs_enable="YES"</programlisting>
 	    <warning>
 	      <para>���ҥH�n��
 		<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
-		�q <filename role="directory">/home</filename> �אּ <filename
-		role="directory">/usr/home</filename> ����]�b�� &os;
+		�q <filename class="directory">/home</filename> �אּ <filename
+		class="directory">/usr/home</filename> ����]�b�� &os;
 		�w�]�w�˪� <filename
-		role="directory">/home</filename> �ؿ����u�O���V <filename
-		role="directory">/usr/home</filename> �� symbolic link�C  ��
+		class="directory">/home</filename> �ؿ����u�O���V <filename
+		class="directory">/usr/home</filename> �� symbolic link�C  ��
 		<varname>jail_<replaceable>name</replaceable>_rootdir</varname>
 		�ܼƶ��� <emphasis>����ؿ�</emphasis> �ӫD symbolic link�A
 		�_�h jail �|�ڵ��ҰʡC  �i�H�� &man.realpath.1;
@@ -740,7 +740,7 @@ jail_www_devfs_enable="YES"</programlisting>
 	<procedure>
 	  <step>
 	    <para>�����O�Ӥ@��覡�Ӥɯ� host system�A�A�s�W�{�ɪ���Ū�Ҫ�
-	      <filename role="directory">/home/j/mroot2</filename>�G</para>
+	      <filename class="directory">/home/j/mroot2</filename>�G</para>
 
 	    <screen>&prompt.root; <userinput>mkdir /home/j/mroot2</userinput>
 &prompt.root; <userinput>cd /usr/src</userinput>
@@ -785,7 +785,7 @@ jail_www_devfs_enable="YES"</programlisting>
 &prompt.root; <userinput>umount /home/j/www</userinput></screen>
 
 	    <note>
-	      <para>�iŪ�g�Ŷ�(<filename role="directory">/s</filename>)
+	      <para>�iŪ�g�Ŷ�(<filename class="directory">/s</filename>)
 		�O�����b��Ū�ɮרt�Ω��U�A�G�n�������C</para>
 	    </note>
 	  </step>
diff --git a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
index 565f01e21a..d53d51a270 100644
--- a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
+++ b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -306,7 +306,7 @@ ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 
       <step>
 	<para>������ <filename
-	  role="directory">/usr/src</filename> �ؿ��G</para>
+	  class="directory">/usr/src</filename> �ؿ��G</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
       </step>
@@ -404,7 +404,7 @@ ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
       <para>�Y���F���աA�ӻݭn�@���t���Ҧ��i�γ]�w���]�w�ɡA����ХH
 	<username>root</username> �����U�G</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf && make LINT</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf &amp;&amp; make LINT</userinput></screen>
     </note>
 
     <indexterm>
@@ -1036,7 +1036,7 @@ device          re         # RealTek 8139C+/8169/8169S/8110S
 device          rl         # RealTek 8129/8139
 device          sf         # Adaptec AIC-6915 (<quote>Starfire</quote>)
 device          sis        # Silicon Integrated Systems SiS 900/SiS 7016
-device          sk         # SysKonnect SK-984x & SK-982x gigabit Ethernet
+device          sk         # SysKonnect SK-984x &amp; SK-982x gigabit Ethernet
 device          ste        # Sundance ST201 (D-Link DFE-550TX)
 device          stge       # Sundance/Tamarack TC9021 gigabit Ethernet
 device          ti         # Alteon Networks Tigon I/II gigabit Ethernet
diff --git a/zh_TW.Big5/books/handbook/l10n/chapter.xml b/zh_TW.Big5/books/handbook/l10n/chapter.xml
index f6d7e448f9..4029f6e690 100644
--- a/zh_TW.Big5/books/handbook/l10n/chapter.xml
+++ b/zh_TW.Big5/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
index 8adac61fe3..ace2aea85b 100644
--- a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
+++ b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -395,7 +395,7 @@ multi on</programlisting>
       <para>The shell scripts that
 	<application>&mathematica;</application> created during
 	installation have to be modified before you can use them.  If
-	you chose <filename role="directory">/usr/local/bin</filename>
+	you chose <filename class="directory">/usr/local/bin</filename>
 	as the directory to place the
 	<application>&mathematica;</application> executables in, you
 	will find symlinks in this directory to files called
@@ -600,14 +600,14 @@ LOG=/var/log/lmgrd.log
 
 case "$1" in
 start)
-	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	echo -n " lmgrd"
 	;;
 stop)
-	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+	lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+	echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
 	exit 64
 	;;
 esac
@@ -886,7 +886,7 @@ exit 0</programlisting>
 	    contain the following:</para>
 
 	  <programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
 exit 0</programlisting>
 	</step>
 
diff --git a/zh_TW.Big5/books/handbook/mac/chapter.xml b/zh_TW.Big5/books/handbook/mac/chapter.xml
index 54fb1b8cec..cfca14a62a 100644
--- a/zh_TW.Big5/books/handbook/mac/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
@@ -1766,7 +1766,7 @@ mac_partition_load="YES"</programlisting>
 	The following <command>sh</command> script should do the
 	trick:</para>
 
-      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
 	<userinput>/etc/passwd`; do pw usermod $x -L insecure; done;</userinput></screen>
 
       <para>The <command>cap_mkdb</command> command will need to be
@@ -1949,7 +1949,7 @@ round-trip min/avg/max/stddev = 204.455/204.455/204.455/0.000 ms</screen>
 test1: biba/equal,mls/equal
 &prompt.root; <userinput>setfmac biba/low test1 test2; setfmac biba/high test4 test5; \
   setfmac mls/low test1 test3; setfmac mls/high test2 test4</userinput>
-&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
+&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 &amp;&amp; getfmac test?</userinput>
 test1: biba/low,mls/low
 test2: biba/low,mls/high
 test3: biba/equal,mls/equal
@@ -2038,7 +2038,7 @@ cat: test4: Permission denied</screen>
       <para>Every user should now be placed in the default class;
 	a command such as:</para>
 
-      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+      <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
 	<userinput>/etc/passwd`; do pw usermod $x -L default; done;</userinput></screen>
 
       <para>will accomplish this task in a few moments.</para>
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.xml b/zh_TW.Big5/books/handbook/mail/chapter.xml
index cdbd8183db..5fba76a507 100644
--- a/zh_TW.Big5/books/handbook/mail/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -1699,11 +1699,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
 	<para>Recompile <application>sendmail</application> by executing the following commands:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
 &prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
 
 	<para>The compile of <application>sendmail</application> should not have any problems
 	  if <filename>/usr/src</filename> has not been changed extensively
@@ -1956,7 +1956,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -1967,7 +1967,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2003,7 +2003,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2052,7 +2052,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2070,7 +2070,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2081,7 +2081,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2094,7 +2094,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2111,7 +2111,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/zh_TW.Big5/books/handbook/mirrors/chapter.xml b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
index 8c525d3737..18b1f0e0ce 100644
--- a/zh_TW.Big5/books/handbook/mirrors/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -270,6 +270,10 @@
       methods available for each site are provided in parentheses
       after the hostname.</para>
 
+    &chap.mirrors.ftp.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.ftp.inc;
   </sect1>
 
@@ -2323,6 +2327,10 @@ doc/zh_*</screen>
     <para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
       at the following sites:</para>
 
+    &chap.mirrors.cvsup.index.inc;
+
+    &chap.mirrors.lastmod.inc;
+
     &chap.mirrors.cvsup.inc;
     </sect2>
   </sect1>
@@ -2422,7 +2430,7 @@ doc/zh_*</screen>
 
       <note>
 	<para>In the default installation
-	  <filename role="directory">/usr/ports</filename> is not
+	  <filename class="directory">/usr/ports</filename> is not
 	  created.  If you run &os;&nbsp;6.0-RELEASE, it should be created before
 	  <command>portsnap</command> is used.  On more recent
 	  versions of &os; or <application>Portsnap</application>,
diff --git a/zh_TW.Big5/books/handbook/multimedia/chapter.xml b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
index 5f4e5ff04f..1d0756d4d9 100644
--- a/zh_TW.Big5/books/handbook/multimedia/chapter.xml
+++ b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/network-servers/chapter.xml b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
index db5c8a9d23..92a98f24de 100644
--- a/zh_TW.Big5/books/handbook/network-servers/chapter.xml
+++ b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
index 76a9b52ab0..048980e0fc 100644
--- a/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
+++ b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/ports/chapter.xml b/zh_TW.Big5/books/handbook/ports/chapter.xml
index 2f02e8dc4f..f803f44cf6 100644
--- a/zh_TW.Big5/books/handbook/ports/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -267,7 +267,7 @@ lsof: /usr/ports/sysutils/lsof</screen>
 	<screen>&prompt.root; <userinput>echo /usr/ports/*/*lsof*</userinput>
 /usr/ports/sysutils/lsof</screen>
 
-	<para>�Ъ`�N�A�o�]�|��� <filename role="directory">/usr/ports/distfiles</filename> �ؿ������ŦX�ɦW���ɮסC</para>
+	<para>�Ъ`�N�A�o�]�|��� <filename class="directory">/usr/ports/distfiles</filename> �ؿ������ŦX�ɦW���ɮסC</para>
       </listitem>
 
       <listitem>
@@ -559,7 +559,7 @@ docbook                     =
 	</note>
 
 	<para>�Ĥ@���] <application>CVSup</application> ���e�A�Х��T�{
-	  <filename role="directory">/usr/ports</filename>
+	  <filename class="directory">/usr/ports</filename>
 	  �O���b���I �Y�A�w�g�ˤF Ports Collection �A���S�ۦ�[�W��L patch
 	  �ɡA���� <application>CVSup</application>
 	  �ä��|�R���A�ۦ�[�W�� patch �ɡA�o�˥i��|�ɭP�n�w�ˬY�dzn��ɡA
@@ -643,7 +643,7 @@ docbook                     =
 
 	<step>
 	  <para>�Y <filename
-	    role="directory">/usr/ports</filename> �ؿ����s�b���ܡA
+	    class="directory">/usr/ports</filename> �ؿ����s�b���ܡA
 	    �N�إߤ@�U�a�G</para>
 
 	  <screen>&prompt.root; <userinput>mkdir /usr/ports</userinput></screen>
@@ -651,7 +651,7 @@ docbook                     =
 
 	<step>
 	  <para>���U�ӡA�U�����Y�� Ports Collection �w����s�ɨ�
-	    <filename role="directory">/var/db/portsnap</filename> �ؿ��C
+	    <filename class="directory">/var/db/portsnap</filename> �ؿ��C
 	    �����U����A�n�_�u�P�_���i�H�C</para>
 
 	  <screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
@@ -659,13 +659,13 @@ docbook                     =
 
 	<step>
 	  <para>�Y�O�Ĥ@���] <application>Portsnap</application> ���ܡA
-	    �h�ݭn�������� <filename role="directory">/usr/ports</filename>�G
+	    �h�ݭn�������� <filename class="directory">/usr/ports</filename>�G
 	  </para>
 
 	  <screen>&prompt.root; <userinput>portsnap extract</userinput></screen>
 
 	  <para>�Y�w�� <filename
-	    role="directory">/usr/ports</filename> �ӥB�u�O�Q��s�Ӥw�A
+	    class="directory">/usr/ports</filename> �ӥB�u�O�Q��s�Ӥw�A
 	    ����N�ӤU���@�G</para>
 
 	  <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
@@ -1133,7 +1133,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 	  �]�i�H�Ψӻ��P�ɯŤw�˪��n��C  �Ӥu��i�q <filename
 	  role="package">ports-mgmt/portmanager</filename> port �w�ˡG</para>
 
-	<screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmanager</filename></userinput>
+	<screen>&prompt.root; <userinput>cd <filename class="directory">/usr/ports/ports-mgmt/portmanager</filename></userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
 	<para>�Ҧ��w�˪��n��A���i�H���P�������U�C���O�ӤɯšG</para>
diff --git a/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
index 63f249fff9..234cd31fd2 100644
--- a/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -394,7 +394,7 @@
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Line 6 & 7:</term>
+	      <term>Line 6 &amp; 7:</term>
 
 	      <listitem>
 		<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>
@@ -474,7 +474,7 @@
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Line 13 & 14:</term>
+	      <term>Line 13 &amp; 14:</term>
 
 	      <listitem>
 		<para>Identifies the user name and password.  When
@@ -1705,7 +1705,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
@@ -1726,7 +1726,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/zh_TW.Big5/books/handbook/preface/preface.xml b/zh_TW.Big5/books/handbook/preface/preface.xml
index d0e0df49fb..5c0bfca6e1 100644
--- a/zh_TW.Big5/books/handbook/preface/preface.xml
+++ b/zh_TW.Big5/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      $FreeBSD$
      Original revision: 1.30
diff --git a/zh_TW.Big5/books/handbook/printing/chapter.xml b/zh_TW.Big5/books/handbook/printing/chapter.xml
index 70a39ed58a..acec03c739 100644
--- a/zh_TW.Big5/books/handbook/printing/chapter.xml
+++ b/zh_TW.Big5/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Traditional Chinese Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/security/chapter.xml b/zh_TW.Big5/books/handbook/security/chapter.xml
index 46de8b93d5..bc48598f6d 100644
--- a/zh_TW.Big5/books/handbook/security/chapter.xml
+++ b/zh_TW.Big5/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -4771,7 +4771,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_html</programlisting>
     <para>To begin using <application>Portaudit</application>, one
       must install it from the Ports Collection:</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit &amp;&amp; make install clean</userinput></screen>
 
     <para>During the install process, the configuration files for
       &man.periodic.8; will be updated, permitting
diff --git a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
index 69baac15f3..5725f9b081 100644
--- a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
+++ b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/users/chapter.xml b/zh_TW.Big5/books/handbook/users/chapter.xml
index 602de85923..39c1f2b237 100644
--- a/zh_TW.Big5/books/handbook/users/chapter.xml
+++ b/zh_TW.Big5/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
diff --git a/zh_TW.Big5/books/handbook/vinum/chapter.xml b/zh_TW.Big5/books/handbook/vinum/chapter.xml
index ced70471b0..1e8a1cc888 100644
--- a/zh_TW.Big5/books/handbook/vinum/chapter.xml
+++ b/zh_TW.Big5/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
 	The Vinum Volume Manager
 	By Greg Lehey (grog at lemis dot com)
diff --git a/zh_TW.Big5/books/handbook/virtualization/chapter.xml b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
index 953e60f87c..5601b4b410 100644
--- a/zh_TW.Big5/books/handbook/virtualization/chapter.xml
+++ b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/books/handbook/x11/chapter.xml b/zh_TW.Big5/books/handbook/x11/chapter.xml
index dde7754e40..1e50725cc1 100644
--- a/zh_TW.Big5/books/handbook/x11/chapter.xml
+++ b/zh_TW.Big5/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
 
@@ -276,7 +276,7 @@
     <para><application>&xorg;</application> �O &os; �w�]�� X11 ��@�C
       <application>&xorg;</application> �O�� X.Org ����|�ҵo�椧�}�񷽽X�n��
       X Window �t�ι�@�� X server�C  <application>&xorg;</application>
-      �D�O�H <application>&xfree86&nbsp;4.4RC2</application> �H�� X11R6.6
+      �D�O�H <application>&xfree86;&nbsp;4.4RC2</application> �H�� X11R6.6
       ����¦�Ҳ��ͪ��C  �ثe &os; Ports Collection ����
       <application>&xorg;</application> ������ &xorg.version;�C</para>
 
diff --git a/zh_TW.Big5/books/porters-handbook/Makefile b/zh_TW.Big5/books/porters-handbook/Makefile
index 7d3466c14b..50b8633a0b 100644
--- a/zh_TW.Big5/books/porters-handbook/Makefile
+++ b/zh_TW.Big5/books/porters-handbook/Makefile
@@ -21,10 +21,6 @@ INSTALL_ONLY_COMPRESSED?=
 # XML content
 SRCS=  book.xml
 
-# Use the local DSSSL file
-DSLHTML?= 	${.CURDIR}/freebsd.dsl
-DSLPRINT?= 	${.CURDIR}/freebsd.dsl
-
 # Images from the cross-document image library
 IMAGES_LIB+=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
diff --git a/zh_TW.Big5/books/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml
index e77cf24e87..5906438a2b 100644
--- a/zh_TW.Big5/books/porters-handbook/book.xml
+++ b/zh_TW.Big5/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+	"../../../share/xml/freebsd45.dtd">
 
 <!--
      The FreeBSD Documentation Project
@@ -3512,8 +3509,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_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
        @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
        @${FALSE}
@@ -4053,7 +4050,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+	(cd ${WRKSRC}/examples/ &amp;&amp; ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
 
 	<para>This example will install the contents of
 	  <filename>examples</filename> directory in the vendor distfile to the
@@ -4061,7 +4058,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${DATADIR}/summer
-	(cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+	(cd ${WRKSRC}/temperatures/ &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
 
 	<para>And this example will install the data of summer months to the
 	  <filename>summer</filename> subdirectory of a
@@ -4074,7 +4071,7 @@ PORTVERSION=   1.0</programlisting>
 
 	<programlisting>post-install:
 	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples/ && \
+	(cd ${WRKSRC}/examples/ &amp;&amp; \
 		${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
 
 	<para>Note that these macros does not add the installed files to
@@ -5662,7 +5659,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
 	<programlisting>HAS_CONFIGURE=  yes
 
 do-configure:
-        @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+        @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
 	        ${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
 
 	<para>Note the similarity to the <command>qmake</command> line
@@ -8092,7 +8089,7 @@ CFLAGS+=        -DLUA_VERSION_STRING="${VER_STR}"
 	chapter</ulink>.  Detailed explanation of available commands is
 	provided in
 	&man.rc.8; and &man.rc.subr.8;.  Finally, there is
-	<ulink url="&url.articles.rc-scripting.en">an article</ulink>
+	<ulink url="&url.articles.rc-scripting.en;">an article</ulink>
 	on practical aspects of <filename>rc.d</filename> scripting.</para>
 
       <para>One or more rc scripts can be installed:</para>
@@ -8421,7 +8418,7 @@ etc/orbit.conf.sample
 
       <para>��o�ؿ��[�c�s��s�ɮסC</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
 
       <para>�s�W�Ū� <filename>pkg-plist</filename> �ɮסG</para>
 
@@ -8431,11 +8428,11 @@ etc/orbit.conf.sample
 	���۴N�i�H�w�˸� port �ò����ɮײM��C</para>
 
       <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/$(make -V PORTNAME)</userinput>
-&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
 
       <para>�o�ɭn�O�o��s�ت��ؿ��A�]�[���ɮײM�椺�C</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
       <para>�̫�A�z���Ӥ�ʾ�z�ɮײM��]�o���O�����۰ʤƳB�z���^�CMan page �h���ӧQ�� <makevar>MAN<replaceable>n</replaceable></makevar> ���覡
 	�g�b port �� <filename>Makefile</filename> �Ӥ��O�g�b�ɮײM�椤�C
@@ -9408,7 +9405,7 @@ as .putsy.conf and edit it.</programlisting>
 	    add your new entry to the VuXML database.  Please verify
 	    its syntax after that as follows:</para>
 
-	  <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+	  <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml &amp;&amp; make validate</userinput></screen>
 
 	  <note>
 	    <para>You will need at least one of the following packages
diff --git a/zh_TW.Big5/books/porters-handbook/freebsd.dsl b/zh_TW.Big5/books/porters-handbook/freebsd.dsl
deleted file mode 100644
index f5e26338e4..0000000000
--- a/zh_TW.Big5/books/porters-handbook/freebsd.dsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!-- Local DSSSL file for the Porter's Handbook.  This is so we can include
-     a link to the -ports mailing list at the bottom of the HTML files, 
-     rather than the -questions mailing list. -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
-<!ENTITY % output.html  "IGNORE"> 
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
- 
-      <![ %output.html; [ 
-	(define ($email-footer$)
-          (make sequence
-            (literal "For questions about the FreeBSD ports system, e-mail <")
-            (create-link (list (list "HREF" "mailto:ports@FreeBSD.org"))
-              (literal "ports@FreeBSD.org"))
-            (literal ">.")
-            (make empty-element gi: "br")
-            (literal "For questions about this documentation, e-mail <")
-            (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-              (literal "doc@FreeBSD.org"))
-            (literal ">.")))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-      ]]>
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="freebsd.dsl">
-</style-sheet>
diff --git a/zh_TW.Big5/share/xml/authors.ent b/zh_TW.Big5/share/xml/authors.ent
index 6041504d22..8b8e7316f8 100644
--- a/zh_TW.Big5/share/xml/authors.ent
+++ b/zh_TW.Big5/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/catalog b/zh_TW.Big5/share/xml/catalog
index 1fc13ef076..2422c1740c 100644
--- a/zh_TW.Big5/share/xml/catalog
+++ b/zh_TW.Big5/share/xml/catalog
@@ -1,44 +1,2 @@
-  -- ...................................................................... --
-  -- FreeBSD SGML Public Identifiers ...................................... --
-
-  -- $FreeBSD$
-  --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
-	"entities.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-	"freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
-	"mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
-        "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
-	"trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
-	"urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
-	"glossary.ent"
-
-  -- ...................................................................... --
-  -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-       "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-       "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-       "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-       "navibar.l10n.ent"
+       "freebsd.dsl"
diff --git a/zh_TW.Big5/share/xml/catalog.xml b/zh_TW.Big5/share/xml/catalog.xml
index 91a24be917..dd54826205 100644
--- a/zh_TW.Big5/share/xml/catalog.xml
+++ b/zh_TW.Big5/share/xml/catalog.xml
@@ -10,6 +10,9 @@
   <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
               rewritePrefix="../../"/>
 
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
   <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
   <public
diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent
index f457e0dd94..3bf1002aee 100644
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@@ -1,28 +1,32 @@
 <!-- $FreeBSD$ -->
 
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent">
 %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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	"nonexistent">
 %freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+	"authors.ent">
 %authors.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	"nonexistent">
 %teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+	"mailing-lists.ent">
 %mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	"nonexistent">
 %newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+	"trademarks.ent">
 %trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	"nonexistent">
 %trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
+	"urls.ent">
 %urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+	"glossary.ent">
 %glossary;
diff --git a/zh_TW.Big5/share/xml/freebsd.dsl b/zh_TW.Big5/share/xml/freebsd.dsl
index 918a41390c..30c745f542 100644
--- a/zh_TW.Big5/share/xml/freebsd.dsl
+++ b/zh_TW.Big5/share/xml/freebsd.dsl
@@ -2,59 +2,11 @@
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-
-<!ENTITY % output.html  "IGNORE">
-<!ENTITY % output.print "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %output.html; [
-
-	(define ($email-footer$)
-          (make sequence
-	    (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "����Ψ�L���A�i�Ѧ��U���G")
-		(create-link
-		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                  (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
-                (literal "�C")))
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"
-                (literal "�Y�� FreeBSD �譱�ðݡA�Х��\Ū ")
-		(create-link
-		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
-                  (literal "FreeBSD �������"))
-                (literal "�A�p����ѨM���ܡA�A���� <")
-		(create-link
-		  (list (list "HREF" "mailto:questions@FreeBSD.org"))
-                  (literal "questions@FreeBSD.org"))
-                (literal ">�C")
-                (make empty-element gi: "br")
-                (literal "���󥻤�󪺰��D�A�Ь��� <")
-		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
-                  (literal "doc@FreeBSD.org"))
-	        (literal ">�C")))))
-
-;; ���n�j�ժ������A����D�β���A�������r�������ءA�B��ê�\Ū�A
-;; �ק�� /usr/local/share/xml/docbook/dsssl/modular/html/dbinline.dsl
-;; Id: dbinline.dsl,v 1.11 2004/09/14 14:47:10 petere78 Exp
-;; chinsan: �o�q���� zh_CN ���G :p
-
-(element emphasis
-  (let* ((class (if (and (attribute-string (normalize "role"))
-			 %emphasis-propagates-style%)
-		    (attribute-string (normalize "role"))
-		    "emphasis")))
-    (make element gi: "SPAN"
-	  attributes: (list (list "CLASS" class))
-	      ($bold-seq$))))
-
-      ]]>
     </style-specification-body>
   </style-specification>
 
diff --git a/zh_TW.Big5/share/xml/mailing-lists.ent b/zh_TW.Big5/share/xml/mailing-lists.ent
index ce5c33db0d..55ba56e118 100644
--- a/zh_TW.Big5/share/xml/mailing-lists.ent
+++ b/zh_TW.Big5/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!--
      Names of FreeBSD �l���׾�s and related software.
      The FreeBSD Traditional-Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 4c8f711c85..6adf8a275f 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
 <!--
      Trademark Legend, as required by The Open Group, Sun, etc..
 
diff --git a/zh_TW.Big5/share/xml/urls.ent b/zh_TW.Big5/share/xml/urls.ent
index 29e8b5eff2..d712a047fa 100644
--- a/zh_TW.Big5/share/xml/urls.ent
+++ b/zh_TW.Big5/share/xml/urls.ent
@@ -1,45 +1,16 @@
+<?xml version="1.0" encoding="big5"?>
 <!-- $FreeBSD$ -->
 
 <!--
   The FreeBSD Traditional Chinese Project
   Original revision: 1.13
 -->
-<!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
 
 <!-- Do not edit: start here -->
 
-<![%freebsd.urls.relprefix.1;[
-	<!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
-	<!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
-	<!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
-	<!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
-	<!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
-	<!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
-	<!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
-	<!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY % freebsd.urls.absolute "IGNORE">
+
+<!ENTITY url.relprefix "../../../..">
 
 <![ %freebsd.urls.absolute; [
 <!ENTITY url.base "http://www.FreeBSD.org">
diff --git a/zh_TW.Big5/share/xsl/freebsd-common.xsl b/zh_TW.Big5/share/xsl/freebsd-common.xsl
new file mode 100644
index 0000000000..25f2b6a3a9
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-common.xsl
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-epub.xsl b/zh_TW.Big5/share/xsl/freebsd-epub.xsl
new file mode 100644
index 0000000000..7309b5fc24
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-epub.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-epub.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-fo.xsl b/zh_TW.Big5/share/xsl/freebsd-fo.xsl
new file mode 100644
index 0000000000..cbc743b04b
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-fo.xsl
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-fo.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..3dfe2db188
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml-chunk.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
new file mode 100644
index 0000000000..5f12fe294c
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml-common.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='big5'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>����Ψ�L���A�i�Ѧ��U���G
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a>�C</small></p>
+
+    <p align="center"><small>�Y�� FreeBSD �譱�ðݡA�Х��\Ū
+    <a href="http://www.FreeBSD.org/docs.html">FreeBSD �������</a>�A�p����ѨM���ܡA�A����
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;�C<br/>
+    ���󥻤�󪺰��D�A�Ь���
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;�C</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl b/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3e3d7cb6b2
--- /dev/null
+++ b/zh_TW.Big5/share/xsl/freebsd-xhtml.xsl
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <!-- Pull in the language-independent stylesheet -->
+  <xsl:import href="http://www.FreeBSD.org/XML/doc/share/xsl/freebsd-xhtml.xsl"/>
+
+  <!-- Language-specific general customizations -->
+  <xsl:import href="freebsd-common.xsl"/>
+
+  <!-- Language-specific common XHTML customizations -->
+  <xsl:import href="freebsd-xhtml-common.xsl"/>
+</xsl:stylesheet>