From 29d36c4c90c7be2f0c90b7225edb504d66064e62 Mon Sep 17 00:00:00 2001
From: "jake%bugzilla.org" <>
Date: Fri, 14 Jan 2005 20:08:47 +0000
Subject: [PATCH] Bug 275595 - The bz-devel ENTITY  no longer exists in the
 Bugzilla Guide. It should now be possible to compile this version with either
 Jade or xmlto. Patch by Colin S. Ogilvie <colin.ogilvie@gmail.com> r=jake

---
 docs/xml/Bugzilla-Guide.xml  | 7 +++----
 docs/xml/about.xml           | 8 +++-----
 docs/xml/troubleshooting.xml | 9 +++------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index 806622de53..d24c238d0d 100644
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/docs/xml/Bugzilla-Guide.xml
@@ -23,11 +23,10 @@
      * bz-ver to current stable
      * bz-nexver to next stable
      * bz-date to the release date
-     * bz-devel to "IGNORE"
+     * Remove the BZ-DEVEL comments
      - 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
 -->
@@ -35,7 +34,6 @@
 <!ENTITY bz-ver "2.19.1">
 <!ENTITY bz-nextver "2.20">
 <!ENTITY bz-date "2004-10-24">
-<!ENTITY % bz-devel "INCLUDE">
 <!ENTITY current-year "2004">
 
 <!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
@@ -98,7 +96,8 @@
 
   <bookinfo>
     <title>The Bugzilla Guide - &bz-ver; 
-    <![%bz-devel;[Development ]]>Release</title>
+    <!-- BZ-DEVEL -->Development <!-- /BZ-DEVEL -->
+    Release</title>
 
     <authorgroup>
       <corpauthor>The Bugzilla Team</corpauthor>
diff --git a/docs/xml/about.xml b/docs/xml/about.xml
index 2fdc4c66ac..a6f51d7e06 100644
--- a/docs/xml/about.xml
+++ b/docs/xml/about.xml
@@ -1,6 +1,6 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
 <!ENTITY conventions SYSTEM "conventions.xml"> ] > -->
-<!-- $Id: about.xml,v 1.18 2004/12/13 03:27:24 jake%bugzilla.org Exp $ -->
+<!-- $Id: about.xml,v 1.19 2005/01/14 12:08:47 jake%bugzilla.org Exp $ -->
 
 <chapter id="about">
 <title>About This Guide</title>
@@ -65,10 +65,8 @@
     <para>
       This is the &bz-ver; version of The Bugzilla Guide. It is so named 
       to match the current version of Bugzilla. 
-      <![%bz-devel;[
-        This version of the guide, like its associated Bugzilla version, is a
-        development version. 
-      ]]>
+      <!-- BZ-DEVEL --> This version of the guide, like its associated Bugzilla version, is a
+      development version.<!-- /BZ-DEVEL --> 
     </para>
     <para>
       The latest version of this guide can always be found at <ulink
diff --git a/docs/xml/troubleshooting.xml b/docs/xml/troubleshooting.xml
index 5b09209f1d..844f06c50c 100644
--- a/docs/xml/troubleshooting.xml
+++ b/docs/xml/troubleshooting.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: troubleshooting.xml,v 1.3 2004/12/21 20:57:39 jake%bugzilla.org Exp $ -->
+<!-- $Id: troubleshooting.xml,v 1.4 2005/01/14 12:08:47 jake%bugzilla.org Exp $ -->
 
 <appendix id="troubleshooting">
 <title>Troubleshooting</title>
@@ -257,9 +257,7 @@ at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 233.</programlisting>
     past and need to set it to something more restrictive
     (i.e. <quote>/bugzilla/</quote>), you can safely do this without
     requiring users to delete their Bugzilla-related cookies in their
-    browser (this is true starting with 
-    <!-- Need OR logic here for bz-devel logic here --> 
-    Bugzilla 2.18<![%bz-devel;[, Bugzilla 2.17.7,]]> and Bugzilla 2.16.5).
+    browser (this is true starting with Bugzilla 2.18 and Bugzilla 2.16.5).
     </para>
   </section>
 
@@ -277,8 +275,7 @@ at /usr/lib/perl5/site_perl/5.6.0/File/Temp.pm line 233.</programlisting>
      log in again.
      </para>
 
-     <para>If you are using 2.18
-     <![%bz-devel[(or 2.17.1 in the development series)]]>, there is a
+     <para>If you are using 2.18 (or later), there is a
      parameter called <quote>loginnetmask</quote>, which you can use to set
      the number of bits of the user's IP address to require to be matched when
      authenticating the cookies. If you set this to something less than 32,
-- 
2.47.3