Making version numbers match checksetup.pl and the release notes

diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index 421faf11861d684b66e30fbe8d21d66f848ae320..aee8b790e8e641378471e30cd5709dda1a35e481 100644 (file)
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [
 
 <!-- Include macros -->
 <!ENTITY about SYSTEM "about.xml">
@@ -9,12 +9,10 @@
 <!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">
@@ -23,52 +21,47 @@
      * bz-ver to current stable
      * bz-nexver to next stable
      * bz-date to the release date
-     * Remove the BZ-DEVEL comments
+     * bz-devel to "IGNORE"
      - COMPILE DOCS AND CHECKIN -
        Also, tag and tarball before completing
      * bz-ver to devel version
+     * bz-devel to "INCLUDE"
  
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "2.21.1">
-<!ENTITY bz-nextver "2.22">
-<!ENTITY bz-date "2005-09-30">
-<!ENTITY current-year "2005">
+<!ENTITY bz-ver "2.18rc1">
+<!ENTITY bz-nextver "2.18">
+<!ENTITY bz-date "2004-07-10">
+<!ENTITY % bz-devel "IGNORE">
 
-<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
+<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-2.18-branch/">
 <!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/">
+<!ENTITY newest-perl-ver "5.8.3">
 
 <!-- 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-mysql-ver "3.23.41">
+<!ENTITY min-perl-ver "5.6.0">
 <!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-file-spec-ver "0.82">
 <!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-dbd-mysql-ver "2.1010">
+<!ENTITY min-dbi-ver "1.32">
 <!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-mime-parser-ver "any">
 <!ENTITY min-patchreader-ver "0.9.4">
-<!ENTITY min-image-magick-ver "any">
 
 ]>
 
@@ -101,8 +94,7 @@
 
   <bookinfo>
     <title>The Bugzilla Guide - &bz-ver; 
-    <!-- BZ-DEVEL -->Development <!-- /BZ-DEVEL -->
-    Release</title>
+    <![%bz-devel;[Development ]]>Release</title>
 
     <authorgroup>
       <corpauthor>The Bugzilla Team</corpauthor>
@@ -149,9 +141,6 @@
 <!-- Administering Bugzilla -->
 &administration;
 
-<!-- Securing Bugzilla -->
-&security;
-
 <!-- Customizing Bugzilla -->
 &customization;
 
@@ -161,9 +150,6 @@
 <!-- Appendix: The Frequently Asked Questions -->
 &faq;
 
-<!-- Appendix: Troubleshooting -->
-&troubleshooting;
-
 <!-- Appendix: Custom Patches -->
 &patches;
 
@@ -202,4 +188,3 @@ sgml-shorttag:t
 sgml-tag-region-if-active:t
 End:
 -->
-