Backout bug 232378, as it doesn't appear to be working correctly.

1 files changed, 74 insertions, 19 deletions

diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index 72db6e7fa..58a75448e 100644
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/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>