diff --git a/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml b/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml
index 72db6e7fae3..58a75448e29 100644
--- a/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml
@@ -1,9 +1,23 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+
+<!-- Include macros -->
+<!ENTITY about SYSTEM "about.xml">
+<!ENTITY conventions SYSTEM "conventions.xml">
+<!ENTITY doc-index SYSTEM "index.xml">
+<!ENTITY faq SYSTEM "faq.xml">
+<!ENTITY gfdl SYSTEM "gfdl.xml">
+<!ENTITY glossary SYSTEM "glossary.xml">
+<!ENTITY installation SYSTEM "installation.xml">
+<!ENTITY administration SYSTEM "administration.xml">
+<!ENTITY security SYSTEM "security.xml">
+<!ENTITY using SYSTEM "using.xml">
+<!ENTITY integration SYSTEM "integration.xml">
+<!ENTITY index SYSTEM "index.xml">
+<!ENTITY customization SYSTEM "customization.xml">
+<!ENTITY troubleshooting SYSTEM "troubleshooting.xml">
+<!ENTITY patches SYSTEM "patches.xml">
+<!ENTITY introduction SYSTEM "introduction.xml">
+<!ENTITY modules SYSTEM "modules.xml">
 
 <!-- Things to change for a stable release:
      * bz-ver to current stable
@@ -17,6 +31,47 @@
      For a devel release, simple bump bz-ver and bz-date
 -->
 
+<!ENTITY bz-ver "2.22rc1">
+<!ENTITY bz-nextver "2.22">
+<!ENTITY bz-date "2006-02-20">
+<!ENTITY current-year "2006">
+
+<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
+<!ENTITY bz "http://www.bugzilla.org/">
+<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
+<!ENTITY mysql "http://www.mysql.com/">
+
+<!-- For minimum versions -->
+<!ENTITY min-mysql-ver "4.0.14">
+<!ENTITY min-pg-ver "7.3.x">
+<!ENTITY min-perl-ver "5.6.1">
+<!ENTITY min-perl-ver-win "5.8.1">
+<!ENTITY min-template-ver "2.08">
+<!ENTITY min-file-temp-ver "any">
+<!ENTITY min-appconfig-ver "1.52">
+<!ENTITY min-text-wrap-ver "2001.0131">
+<!ENTITY min-file-spec-ver "0.84">
+<!ENTITY min-data-dumper-ver "any">
+<!ENTITY min-dbd-mysql-ver "2.9003">
+<!ENTITY min-dbd-pg-ver "1.31">
+<!ENTITY min-dbi-ver "1.38">
+<!ENTITY min-date-format-ver "2.21">
+<!ENTITY min-cgi-ver "2.93">
+<!ENTITY min-mail-mailer-ver "1.67">
+<!ENTITY min-mime-base64-ver "3.01">
+<!ENTITY min-mime-parser-ver "5.406">
+<!ENTITY min-storable-ver "any">
+<!-- Optional modules -->
+<!ENTITY min-gd-ver "1.20">
+<!ENTITY min-gd-graph-ver "any">
+<!ENTITY min-gd-text-align-ver "any">
+<!ENTITY min-chart-base-ver "1.0">
+<!ENTITY min-xml-parser-ver "any">
+<!ENTITY min-patchreader-ver "0.9.4">
+<!ENTITY min-image-magick-ver "any">
+
+]>
+
 
 <!-- Coding standards for this document 
 
@@ -86,43 +141,43 @@
   </bookinfo>
 
 <!-- About This Guide -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="about.xml" /> 
+&about;
 
 <!-- Installing Bugzilla -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml" />
+&installation;
 
 <!-- Administering Bugzilla -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="administration.xml" />
+&administration;
 
 <!-- Securing Bugzilla -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security.xml" />
+&security;
 
 <!-- Customizing Bugzilla -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="customization.xml" />
+&customization;
 
 <!-- Using Bugzilla -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="using.xml" />
+&using;
 
 <!-- Appendix: The Frequently Asked Questions -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faq.xml" />
+&faq;
 
 <!-- Appendix: Troubleshooting -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="troubleshooting.xml" />
+&troubleshooting;
 
 <!-- Appendix: Custom Patches -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patches.xml" />
+&patches;
 
 <!-- Appendix: Manually Installing Perl Modules -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules.xml" />
+&modules;
 
 <!-- Appendix: GNU Free Documentation License -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gfdl.xml" />
+&gfdl;
 
 <!-- Glossary -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glossary.xml" />
+&glossary;
 
 <!-- Index -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="index.xml" />
+&index;
 
 
 </book>
diff --git a/mozilla/webtools/bugzilla/docs/xml/about.xml b/mozilla/webtools/bugzilla/docs/xml/about.xml
index b1dab24f685..0cb8fcd426f 100644
--- a/mozilla/webtools/bugzilla/docs/xml/about.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/about.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY conventions SYSTEM "conventions.xml"> ] > -->
+<!-- $Id: about.xml,v 1.21 2006-02-21 21:50:45 mozilla%colinogilvie.co.uk Exp $ -->
 
 <chapter id="about">
 <title>About This Guide</title>
@@ -212,9 +209,9 @@
     </para>
   </section>
 
-<!-- conventions used here (didn't want to give it a chapter of its own) -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="conventions.xml" /> 
-</chapter> 
+  <!-- conventions used here (didn't want to give it a chapter of its own) -->
+&conventions;
+ </chapter> 
 
 <!-- Keep this comment at the end of the file 
 Local variables: 
diff --git a/mozilla/webtools/bugzilla/docs/xml/administration.xml b/mozilla/webtools/bugzilla/docs/xml/administration.xml
index 99fd98c88c4..a32a61a59ec 100644
--- a/mozilla/webtools/bugzilla/docs/xml/administration.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/administration.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <chapter id="administration">
   <title>Administering Bugzilla</title>
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/bugzilla.ent b/mozilla/webtools/bugzilla/docs/xml/bugzilla.ent
deleted file mode 100755
index ee539d15aa0..00000000000
--- a/mozilla/webtools/bugzilla/docs/xml/bugzilla.ent
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- While Using OpenJade to Process the files this section is needed in the
-entity file -->
-
-<!ELEMENT xi:include (xi:fallback?) >
-<!ATTLIST xi:include
-    xmlns:xi   CDATA       #FIXED    "http://www.w3.org/2001/XInclude"
-    href       CDATA       #REQUIRED
-    parse      (xml|text)  "xml"
-    encoding   CDATA       #IMPLIED >
-
-<!ELEMENT xi:fallback ANY>
-<!ATTLIST xi:fallback
-    xmlns:xi   CDATA   #FIXED   "http://www.w3.org/2001/XInclude" >
-<!ENTITY % local.chapter.class "| xi:include"> 
-<!-- inside chapter or section elements -->
-<!ENTITY % local.divcomponent.mix "| xi:include">
-<!-- inside para, programlisting, literallayout, etc. -->   
-<!ENTITY % local.para.char.mix "| xi:include">
-<!-- inside bookinfo, chapterinfo, etc. -->      
-<!ENTITY % local.info.class "| xi:include">         
-
-
-<!-- Things to change for a stable release:
-     * bz-ver to current stable
-     * bz-nexver to next stable
-     * bz-date to the release date
-     * Remove the BZ-DEVEL comments
-     - COMPILE DOCS AND CHECKIN -
-       Also, tag and tarball before completing
-     * bz-ver to devel version
- 
-     For a devel release, simple bump bz-ver and bz-date
--->
-
-<!ENTITY bz-ver "2.22rc1">
-<!ENTITY bz-nextver "2.22">
-<!ENTITY bz-date "2006-02-20">
-<!ENTITY current-year "2006">
-
-<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
-<!ENTITY bz "http://www.bugzilla.org/">
-<!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
-<!ENTITY mysql "http://www.mysql.com/">
-
-<!-- For minimum versions -->
-<!ENTITY min-mysql-ver "4.0.14">
-<!ENTITY min-pg-ver "7.3.x">
-<!ENTITY min-perl-ver "5.6.1">
-<!ENTITY min-perl-ver-win "5.8.1">
-<!ENTITY min-template-ver "2.08">
-<!ENTITY min-file-temp-ver "any">
-<!ENTITY min-appconfig-ver "1.52">
-<!ENTITY min-text-wrap-ver "2001.0131">
-<!ENTITY min-file-spec-ver "0.84">
-<!ENTITY min-data-dumper-ver "any">
-<!ENTITY min-dbd-mysql-ver "2.9003">
-<!ENTITY min-dbd-pg-ver "1.31">
-<!ENTITY min-dbi-ver "1.38">
-<!ENTITY min-date-format-ver "2.21">
-<!ENTITY min-cgi-ver "2.93">
-<!ENTITY min-mail-mailer-ver "1.67">
-<!ENTITY min-mime-base64-ver "3.01">
-<!ENTITY min-mime-parser-ver "5.406">
-<!ENTITY min-storable-ver "any">
-<!-- Optional modules -->
-<!ENTITY min-gd-ver "1.20">
-<!ENTITY min-gd-graph-ver "any">
-<!ENTITY min-gd-text-align-ver "any">
-<!ENTITY min-chart-base-ver "1.0">
-<!ENTITY min-xml-parser-ver "any">
-<!ENTITY min-patchreader-ver "0.9.4">
-<!ENTITY min-image-magick-ver "any">
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/docs/xml/conventions.xml b/mozilla/webtools/bugzilla/docs/xml/conventions.xml
index 9f92a4755a2..24986d66b4c 100644
--- a/mozilla/webtools/bugzilla/docs/xml/conventions.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/conventions.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <section id="conventions">
   <title>Document Conventions</title>
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/customization.xml b/mozilla/webtools/bugzilla/docs/xml/customization.xml
index b677ce80486..37c64cca0d4 100644
--- a/mozilla/webtools/bugzilla/docs/xml/customization.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/customization.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <chapter id="customization">
   <title>Customising Bugzilla</title>
 
@@ -1099,8 +1093,8 @@ this. But you need to know this stuff anyway, right?
     </section>
   </section>
 
-<!-- Integrating Bugzilla with Third-Party Tools -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration.xml" />
+  <!-- Integrating Bugzilla with Third-Party Tools -->
+  &integration;
 
 </chapter>
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/faq.xml b/mozilla/webtools/bugzilla/docs/xml/faq.xml
index c87d86fbbc1..816508839ab 100644
--- a/mozilla/webtools/bugzilla/docs/xml/faq.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/faq.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 
 <appendix id="faq">
   <title>The Bugzilla FAQ</title>
diff --git a/mozilla/webtools/bugzilla/docs/xml/gfdl.xml b/mozilla/webtools/bugzilla/docs/xml/gfdl.xml
index 0de66acd3c8..1d84d125598 100644
--- a/mozilla/webtools/bugzilla/docs/xml/gfdl.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/gfdl.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <appendix id="gfdl">
   <title>GNU Free Documentation License</title>
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/glossary.xml b/mozilla/webtools/bugzilla/docs/xml/glossary.xml
index 98083505391..79fb2baebd4 100644
--- a/mozilla/webtools/bugzilla/docs/xml/glossary.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/glossary.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook V4.1//EN" > -->
 <glossary id="glossary">
   <glossdiv>
     <title>0-9, high ascii</title>
diff --git a/mozilla/webtools/bugzilla/docs/xml/index.xml b/mozilla/webtools/bugzilla/docs/xml/index.xml
index e8a22849351..7fc1a4c14d3 100644
--- a/mozilla/webtools/bugzilla/docs/xml/index.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/index.xml
@@ -18,3 +18,4 @@ sgml-shorttag:t
 sgml-tag-region-if-active:t
 End:
 -->
+
diff --git a/mozilla/webtools/bugzilla/docs/xml/installation.xml b/mozilla/webtools/bugzilla/docs/xml/installation.xml
index e6d35544f3d..74b4d15a29f 100644
--- a/mozilla/webtools/bugzilla/docs/xml/installation.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/installation.xml
@@ -1,10 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
+<!-- $Id: installation.xml,v 1.109 2006-02-21 21:50:45 mozilla%colinogilvie.co.uk Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/modules.xml b/mozilla/webtools/bugzilla/docs/xml/modules.xml
index ac5040f0217..59c58530eb6 100644
--- a/mozilla/webtools/bugzilla/docs/xml/modules.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/modules.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <appendix id="install-perlmodules-manual">
   <title>Manual Installation of Perl Modules</title>
   
diff --git a/mozilla/webtools/bugzilla/docs/xml/patches.xml b/mozilla/webtools/bugzilla/docs/xml/patches.xml
index f3e17290c54..11a5ecf112c 100644
--- a/mozilla/webtools/bugzilla/docs/xml/patches.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/patches.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <appendix id="patches" xreflabel="Useful Patches and Utilities for Bugzilla">
   <title>Contrib</title>
 
diff --git a/mozilla/webtools/bugzilla/docs/xml/security.xml b/mozilla/webtools/bugzilla/docs/xml/security.xml
index a1f2f577058..a160bbd8b98 100644
--- a/mozilla/webtools/bugzilla/docs/xml/security.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/security.xml
@@ -1,9 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
+<!-- $Id: security.xml,v 1.10 2006-02-21 21:50:45 mozilla%colinogilvie.co.uk Exp $ -->
 
 <chapter id="security">
 <title>Bugzilla Security</title>
diff --git a/mozilla/webtools/bugzilla/docs/xml/troubleshooting.xml b/mozilla/webtools/bugzilla/docs/xml/troubleshooting.xml
index 10ad59f1cd5..aad796e8476 100644
--- a/mozilla/webtools/bugzilla/docs/xml/troubleshooting.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/troubleshooting.xml
@@ -1,9 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
+<!-- $Id: troubleshooting.xml,v 1.8 2006-02-21 21:50:45 mozilla%colinogilvie.co.uk Exp $ -->
 
 <appendix id="troubleshooting">
 <title>Troubleshooting</title>
diff --git a/mozilla/webtools/bugzilla/docs/xml/using.xml b/mozilla/webtools/bugzilla/docs/xml/using.xml
index 8f50cfa446a..dc56e4f0608 100644
--- a/mozilla/webtools/bugzilla/docs/xml/using.xml
+++ b/mozilla/webtools/bugzilla/docs/xml/using.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 
 <chapter id="using">
   <title>Using Bugzilla</title>