Initial conversion to XML format from SGML.

Note this is a work-in-progress.  It compiles cleanly, but I am not yet
submitting compiled HTML and text.
There is one notable problem: nsgmls barfs on the <imagedata> tag in
database.sgml during validation.  openjade handles it fine. Weird.

7 files changed, 81 insertions, 81 deletions

diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index 8f2136bd8..6d49d9be8 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [
 
 <!-- Include macros -->
 <!ENTITY about SYSTEM "about.sgml">
@@ -148,16 +148,16 @@ try to avoid clutter and feel free to waste space in the code to make it more re
 	Bugzilla is an enterprise-class set of software utilities
 	that, when used together, power issue-tracking for hundreds of
 	organizations around the world, tracking millions of bugs.
-	While it is easy to use and quite flexible, it is very
+	While it is easy to use and quite flexible, it is
 	difficult for a novice to install and maintain.  Although we
 	have provided step-by-step directions, Bugzilla is not always
 	easy to get working.  Please be sure the person responsible
 	for installing and maintaining this software is a qualified
-	professional on operating system upon which you install
+	professional for the operating system upon which you install
 	Bugzilla.
       </para>
       <para>
-	THIS DOCUMENTATION IS MAINTAINED IN DOCBOOK 4.1 SGML FORMAT.
+	THIS DOCUMENTATION IS MAINTAINED IN DOCBOOK 4.1.2 XML FORMAT.
 	IF YOU WISH TO MAKE CORRECTIONS, PLEASE MAKE THEM IN PLAIN
 	TEXT OR SGML DIFFS AGAINST THE SOURCE.  I CANNOT ACCEPT
 	ADDITIONS TO THE GUIDE WRITTEN IN HTML!
@@ -165,18 +165,18 @@ try to avoid clutter and feel free to waste space in the code to make it more re
     </abstract>
 
 
-    <KEYWORDSET>
-      <KEYWORD>Bugzilla</KEYWORD>
-      <KEYWORD>Guide</KEYWORD>
-      <KEYWORD>installation</KEYWORD>
-      <KEYWORD>FAQ</KEYWORD>
-      <KEYWORD>administration</KEYWORD>
-      <KEYWORD>integration</KEYWORD>
-      <KEYWORD>MySQL</KEYWORD>
-      <KEYWORD>Mozilla</KEYWORD>
-      <KEYWORD>webtools</KEYWORD>
-    </KEYWORDSET>
-  </BOOKINFO>
+    <keywordset>
+      <keyword>Bugzilla</keyword>
+      <keyword>Guide</keyword>
+      <keyword>installation</keyword>
+      <keyword>FAQ</keyword>
+      <keyword>administration</keyword>
+      <keyword>integration</keyword>
+      <keyword>MySQL</keyword>
+      <keyword>Mozilla</keyword>
+      <keyword>webtools</keyword>
+    </keywordset>
+  </bookinfo>
 
 <!-- About This Guide -->
 &about;
@@ -203,7 +203,7 @@ try to avoid clutter and feel free to waste space in the code to make it more re
 &faq;
 
 <!-- Appendix: Required Bugzilla Software Links -->
-&requiredsoftware
+&requiredsoftware;
 
 <!-- Appendix: The Database Schema -->
 &database;
diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index 98e726312..39e80c650 100644
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -8,7 +8,7 @@
   </subtitle>
   
   <para>
-    So you followed <quote><xref linkend="installation"></quote> to the
+    So you followed <quote><xref linkend="installation" /></quote> to the
     letter, and logged into Bugzilla for the very first time with your
     super-duper god account.  You sit, contentedly staring at the
     Bugzilla Query Screen, the worst of the whole mad business of
@@ -623,7 +623,7 @@
       <subtitle>Formerly, and in some spots still, called
 	"Programs"</subtitle>
       <para>
-	<glossterm linkend="gloss_product" baseform="product">Products</glossterm> are
+	<glossterm linkend="gloss-product" baseform="product">Products</glossterm> are
 	the broadest category in Bugzilla, and you should have the
 	least of these. If your company makes computer games, you
 	should have one product per game, and possibly a few special
diff --git a/docs/en/xml/gfdl.xml b/docs/en/xml/gfdl.xml
index 7d8d9967f..5351b41d2 100644
--- a/docs/en/xml/gfdl.xml
+++ b/docs/en/xml/gfdl.xml
@@ -18,7 +18,7 @@ Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.</para>
     </blockquote>
 
-  <sect1 label="0" id="gfdl_0">
+  <sect1 label="0" id="gfdl-0">
     <title>PREAMBLE</title>
 
     <para>The purpose of this License is to make a manual, textbook,
@@ -45,7 +45,7 @@ of this license document, but changing it is not allowed.</para>
     whose purpose is instruction or reference.</para>
   </sect1>
 
-  <sect1 label="1" id="gfdl_1">
+  <sect1 label="1" id="gfdl-1">
     <title>APPLICABILITY AND DEFINITIONS</title>
 
     <para>This License applies to any manual or other work that
@@ -113,7 +113,7 @@ of this license document, but changing it is not allowed.</para>
     text.</para>
   </sect1>
 
-  <sect1 label="2" id="gfdl_2">
+  <sect1 label="2" id="gfdl-2">
     <title>VERBATIM COPYING</title>
 
     <para>You may copy and distribute the Document in any medium,
@@ -131,7 +131,7 @@ of this license document, but changing it is not allowed.</para>
     above, and you may publicly display copies.</para>
   </sect1>
 
-  <sect1 label="3" id="gfdl_3">
+  <sect1 label="3" id="gfdl-3">
     <title>COPYING IN QUANTITY</title>
 
     <para>If you publish printed copies of the Document numbering more
@@ -173,7 +173,7 @@ of this license document, but changing it is not allowed.</para>
     updated version of the Document.</para>
   </sect1>
 
-  <sect1 label="4" id="gfdl_4">
+  <sect1 label="4" id="gfdl-4">
     <title>MODIFICATIONS</title>
 
     <para>You may copy and distribute a Modified Version of the
@@ -304,7 +304,7 @@ of this license document, but changing it is not allowed.</para>
     or to assert or imply endorsement of any Modified Version.</para>
   </sect1>
 
-  <sect1 label="5" id="gfdl_5">
+  <sect1 label="5" id="gfdl-5">
     <title>COMBINING DOCUMENTS</title>
 
     <para>You may combine the Document with other documents released
@@ -331,7 +331,7 @@ of this license document, but changing it is not allowed.</para>
     must delete all sections entitled "Endorsements."</para>
   </sect1>
 
-  <sect1 label="6" id="gfdl_6">
+  <sect1 label="6" id="gfdl-6">
     <title>COLLECTIONS OF DOCUMENTS</title>
 
     <para>You may make a collection consisting of the Document and
@@ -348,7 +348,7 @@ of this license document, but changing it is not allowed.</para>
     copying of that document.</para>
   </sect1>
 
-  <sect1 label="7" id="gfdl_7">
+  <sect1 label="7" id="gfdl-7">
     <title>AGGREGATION WITH INDEPENDENT WORKS</title>
     
     <para>A compilation of the Document or its derivatives with other
@@ -369,7 +369,7 @@ of this license document, but changing it is not allowed.</para>
     aggregate.</para>
   </sect1>
 
-  <sect1 label="8" id="gfdl_8">
+  <sect1 label="8" id="gfdl-8">
     <title>TRANSLATION</title>
 
     <para>Translation is considered a kind of modification, so you may
@@ -385,7 +385,7 @@ of this license document, but changing it is not allowed.</para>
     prevail.</para>
   </sect1>
 
-  <sect1 label="9" id="gfdl_9">
+  <sect1 label="9" id="gfdl-9">
     <title>TERMINATION</title>
     
     <para>You may not copy, modify, sublicense, or distribute the
@@ -398,7 +398,7 @@ of this license document, but changing it is not allowed.</para>
     compliance.</para>
   </sect1>
 
-  <sect1 label="10" id="gfdl_10">
+  <sect1 label="10" id="gfdl-10">
     <title>FUTURE REVISIONS OF THIS LICENSE</title>
 
     <para>The Free Software Foundation may publish new, revised
@@ -419,7 +419,7 @@ of this license document, but changing it is not allowed.</para>
     Free Software Foundation.</para>
   </sect1>
 
-  <sect1 label="" id="gfdl_howto">
+  <sect1 label="" id="gfdl-howto">
     <title>How to use this License for your documents</title>
 
     <para>To use this License in a document you have written, include
diff --git a/docs/en/xml/glossary.xml b/docs/en/xml/glossary.xml
index faa4d1781..0ba9d87b5 100644
--- a/docs/en/xml/glossary.xml
+++ b/docs/en/xml/glossary.xml
@@ -23,7 +23,7 @@
       </glossentry>
     </glossdiv>
     
-    <glossdiv id="gloss_a">
+    <glossdiv id="gloss-a">
       <title>A</title>
       <glossentry>
 	<glossterm>Apache</glossterm>
@@ -40,7 +40,7 @@
       </glossentry>
     </glossdiv>
     
-    <glossdiv id="gloss_b">
+    <glossdiv id="gloss-b">
       <title>B</title>
       <glossentry>
 	<glossterm>Bug</glossterm>
@@ -89,9 +89,9 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_c">
+    <glossdiv id="gloss-c">
       <title></title>
-      <glossentry id="gloss_component">
+      <glossentry id="gloss-component">
 	<glossterm>Component</glossterm>
 	<glossdef>
 	  <para>
@@ -103,7 +103,7 @@
 	  </para>
 	</glossdef>
       </glossentry>
-      <glossentry id="gloss_cpan">
+      <glossentry id="gloss-cpan">
 	<glossterm><acronym>CPAN</acronym></glossterm>
 	<glossdef>
 	  <para><acronym>CPAN</acronym> stands for the
@@ -117,7 +117,7 @@
       </glossentry>
     </glossdiv>
     
-    <glossdiv id="gloss_d">
+    <glossdiv id="gloss-d">
       <title>D</title>
       <glossentry>
 	<glossterm>daemon</glossterm>
@@ -132,7 +132,7 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_g">
+    <glossdiv id="gloss-g">
       <title></title>
       <glossentry>
 	<glossterm>Groups</glossterm>
@@ -148,9 +148,9 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_i">
+    <glossdiv id="gloss-i">
       <title>I</title>
-      <glossentry id="gloss_infiniteloop">
+      <glossentry id="gloss-infiniteloop">
 	<glossterm>Infinite Loop</glossterm>
 	<glossdef>
 	  <para>A loop of information that never ends; see recursion.</para>
@@ -158,7 +158,7 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_m">
+    <glossdiv id="gloss-m">
       <title>M</title>
       <glossentry>
 	<glossterm>mysqld</glossterm>
@@ -173,10 +173,10 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_p">
+    <glossdiv id="gloss-p">
       <title>P</title>
       <glossentry>
-	<glossterm id="gloss_product">Product</glossterm>
+	<glossterm id="gloss-product">Product</glossterm>
 	<glossdef>
 	  <para>A Product is a broad category of types of bugs.  In
 	    general, there are several Components to a Product.  A
@@ -212,7 +212,7 @@
       </glossentry>
     </glossdiv>
     
-    <glossdiv id="gloss_q">
+    <glossdiv id="gloss-q">
       <title>Q</title>
       <glossentry>
 	<glossterm>QA</glossterm>
@@ -229,9 +229,9 @@
       </glossentry>
     </glossdiv>
     
-    <glossdiv id="gloss_r">
+    <glossdiv id="gloss-r">
       <title>R</title>
-      <glossentry id="gloss_recursion" xreflabel="Recursion">
+      <glossentry id="gloss-recursion" xreflabel="Recursion">
 	<glossterm>Recursion</glossterm>
 	<glossdef>
 	  <para>The property of a function looking back at itself for
@@ -243,7 +243,7 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_s">
+    <glossdiv id="gloss-s">
       <title>S</title>
       <glossentry>
 	<glossterm><acronym>SGML</acronym></glossterm>
@@ -266,9 +266,9 @@
       </glossentry>
     </glossdiv>
 
-    <glossdiv id="gloss_t">
+    <glossdiv id="gloss-t">
       <title>T</title>
-      <glossentry id="gloss_target_milestone" xreflabel="Target Milestone">
+      <glossentry id="gloss-target-milestone" xreflabel="Target Milestone">
 	<glossterm>Target Milestone</glossterm>
 	<glossdef>
 	  <para>
@@ -285,7 +285,7 @@
       </glossentry>
     </glossdiv>
     
-    <glossdiv id="gloss_z">
+    <glossdiv id="gloss-z">
       <title>Z</title>
       <glossentry id="zarro-boogs-found" xreflabel="Zarro Boogs Found">
 	<glossterm>Zarro Boogs Found</glossterm>
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 7e4db1eb6..37d339e93 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -92,7 +92,7 @@
 	Bugzilla has been successfully installed under Solaris, Linux,
 	and Win32. The peculiarities of installing on Win32 (Microsoft
 	Windows) are not included in this section of the Guide; please
-	check out the <xref linkend="win32"> for further advice
+	check out the <xref linkend="win32" /> for further advice
 	on getting Bugzilla to work on Microsoft Windows.
       </para>
       
@@ -109,7 +109,7 @@
 	  the CPAN dependencies listed below, and are running the very
 	  most recent version of Perl and MySQL (both the executables
 	  and development libraries) on your system, check out
-	  Bundle::Bugzilla in <xref linkend="bundlebugzilla"></para>
+	  Bundle::Bugzilla in <xref linkend="bundlebugzilla" /></para>
       </note>
       <para>
 	The software packages necessary for the proper running of bugzilla are:
@@ -286,7 +286,7 @@
 	<para>
 	  You can skip the following Perl module installation steps by
 	  installing <productname>Bundle::Bugzilla</productname> from
-	  <glossterm linkend="gloss_cpan">CPAN</glossterm>, which
+	  <glossterm linkend="gloss-cpan">CPAN</glossterm>, which
 	  includes them. All Perl module installation steps require
 	  you have an active Internet connection.  If you wish to use
 	  Bundle::Bugzilla, however, you must be using the latest
@@ -319,7 +319,7 @@
 	Like almost all Perl modules DBI can be found on the Comprehensive Perl
 	Archive Network (CPAN) at http://www.cpan.org.  The CPAN servers have a
 	real tendency to bog down, so please use mirrors.  The current location
-	at the time of this writing can be found in <xref linkend="downloadlinks">.
+	at the time of this writing can be found in <xref linkend="downloadlinks" />.
       </para>
       <para>
 	Quality, general Perl module installation instructions can be found on
@@ -397,7 +397,7 @@
       </para>
       <para>
 	Data::Dumper is used by the MySQL-related Perl modules.  It
-	can be found on CPAN (see <xref linkend="downloadlinks">) and
+	can be found on CPAN (see <xref linkend="downloadlinks" />) and
 	can be
 	installed by following the same four step make sequence used
 	for the DBI module.
@@ -445,7 +445,7 @@
 	  Many of the more common date/time/calendar related Perl
 	modules have been grouped into a bundle similar to the MySQL
 	modules bundle. This bundle is stored on the CPAN under the
-	name TimeDate (see link: <xref linkend="downloadlinks">). The
+	name TimeDate (see link: <xref linkend="downloadlinks" />). The
 	component module we're most interested in is the Date::Format
 	module, but installing all of them is probably a good idea
 	anyway.  The standard Perl module installation instructions
@@ -467,7 +467,7 @@
 	  Actually bugzilla uses the Graph module which relies on GD
 	itself.  Isn't that always the way with object-oriented
 	programming?  At any rate, you can find the GD library on CPAN
-	in <xref linkend="downloadlinks">.  
+	in <xref linkend="downloadlinks" />.  
 	</para>
 	<note>
 	  <para>
@@ -488,7 +488,7 @@
 	  The Chart module provides bugzilla with on-the-fly charting
 	abilities.  It can be installed in the usual fashion after it
 	has been fetched from CPAN where it is found as the
-	Chart-x.x... tarball, linked in <xref linkend="downloadlinks">. Note that
+	Chart-x.x... tarball, linked in <xref linkend="downloadlinks" />. Note that
 	as with the GD perl module, only the version listed above, or
 	newer, will work. Earlier versions used GIF's, which are no
 	longer supported by the latest versions of GD.
@@ -555,7 +555,7 @@ Options ExecCGI
 	  and the <quote>localconfig</quote> file. You should
 	  configure your HTTP server to not serve content from these
 	  files. Failure to do so will expose critical passwords and
-	  other data. Please see <xref linkend="htaccess"> for details
+	  other data. Please see <xref linkend="htaccess" /> for details
 	  on how to do this for Apache.  I appreciate notes on how to
 	  get this same functionality using other webservers.
 	  </para>
@@ -597,8 +597,8 @@ Options ExecCGI
 	location of your perl executable (probably
 	<filename>/usr/bin/perl</filename>). Otherwise you must hack
 	all the .cgi files to change where they look for perl, or use
-	<xref linkend="setperl">, found in
-	<xref linkend="patches">.  I suggest using the symlink
+	<xref linkend="setperl" />, found in
+	<xref linkend="patches" />.  I suggest using the symlink
 	approach for future release compatability.
 	<example>
 	  <title>Setting up bonsaitools symlink</title>
@@ -630,8 +630,8 @@ perl -pi -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' *cgi *pl Bug.pm
 	  <para>
 	    If you don't have root access to set this symlink up,
 	    check out the
-	    <xref linkend="setperl">, listed in <xref
-						      linkend="patches">. It will change the path to perl in all your Bugzilla files for you.
+	    <xref linkend="setperl" />, listed in <xref
+						      linkend="patches" />. It will change the path to perl in all your Bugzilla files for you.
 	  </para>
 	  </tip>
 	</para>
@@ -773,7 +773,7 @@ perl -pi -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' *cgi *pl Bug.pm
 	You should also install .htaccess files that the Apache
 	webserver will use  to restrict access to Bugzilla data files.
 	See <xref
-		  linkend="htaccess">.
+		  linkend="htaccess" />.
       </para>
       <para>
 	Once you are happy with the settings, re-run
@@ -993,7 +993,7 @@ bash# ./checksetup.pl
       </para>
       <para>
 	Use .htaccess files with the Apache webserver to secure your
-	bugzilla install. See <xref linkend="htaccess">
+	bugzilla install. See <xref linkend="htaccess" />
       </para>
       <para>
 	Consider also:
@@ -1136,7 +1136,7 @@ bash# ./checksetup.pl
     <title>BSD Installation Notes</title>
     <para>
       For instructions on how to set up Bugzilla on FreeBSD, NetBSD, OpenBSD, BSDi, etc. please
-      consult <xref linkend="osx">.
+      consult <xref linkend="osx" />.
     </para>
   </section>
   
@@ -1213,7 +1213,7 @@ bash# ./checksetup.pl
       </para>
     </section>
 
-    <section id="mod_throttle" xreflabel="Using mod_throttle to prevent Denial of Service attacks">
+    <section id="mod-throttle" xreflabel="Using mod_throttle to prevent Denial of Service attacks">
     	<title><filename>mod_throttle</filename> and Security</title>
       <para>
 	It is possible for a user, by mistake or on purpose, to access
@@ -1226,7 +1226,7 @@ bash# ./checksetup.pl
 	       url="http://www.snert.com/Software/Throttle/">http://www.snert.com/Software/Throttle/</ulink>. Follow the instructions to install into your Apache install.  <emphasis>This module only functions with the Apache web server!</emphasis>. You may use the <command>ThrottleClientIP</command> command provided by this module  to accomplish this goal. See the <ulink url="http://www.snert.com/Software/Throttle/">Module Instructions</ulink> for more  information. </para>
     </section>
     
-    <section id="content_type" xreflabel="Preventing untrusted Bugzilla contentfrom executing malicious Javascript code">
+    <section id="content-type" xreflabel="Preventing untrusted Bugzilla contentfrom executing malicious Javascript code">
       <title>Preventing untrusted Bugzilla content from executing malicious Javascript code</title>
       <para>It is possible for a Bugzilla to execute malicious
 	Javascript code.  Due to internationalization concerns, we are
@@ -1260,7 +1260,7 @@ bash# cd $BUGZILLA_HOME; for i in `ls *.cgi`; \
       <para>
 	The February 25, 1999 re-write of this page was done by Ry4an
 	Brase &lt;ry4an@ry4an.org&gt;, with some edits by Terry
-	Weissman, Bryce Nesbitt, Martin Pool, & Dan Mosedale (But
+	Weissman, Bryce Nesbitt, Martin Pool, &amp; Dan Mosedale (But
 	don't send bug reports to them; report them using bugzilla, at <ulink
 	url="http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla">http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla</ulink> ).
       </para>
@@ -1306,7 +1306,7 @@ bash# cd $BUGZILLA_HOME; for i in `ls *.cgi`; \
 	<para>
 	  You should be familiar with, and cross-reference, the rest
 	  of the  
-	  <xref linkend="installation"> section while performing your
+	  <xref linkend="installation" /> section while performing your
 	  Win32 installation.
 	</para>
 	<para>  Making Bugzilla work on Microsoft Windows is no
@@ -1318,7 +1318,7 @@ bash# cd $BUGZILLA_HOME; for i in `ls *.cgi`; \
 	  requires hacking source code and implementing some advanced
 	  utilities.  What follows is the recommended installation
 	  procedure for Win32; additional suggestions are provided in
-	  <xref linkend="faq">.
+	  <xref linkend="faq" />.
 	</para>
       </note>
       
@@ -1328,7 +1328,7 @@ bash# cd $BUGZILLA_HOME; for i in `ls *.cgi`; \
 	    Install <ulink url="http://www.apache.org/">Apache Web
 	      Server</ulink> for Windows, and copy the Bugzilla files
 	    somewhere Apache can serve them.  Please follow all the
-	    instructions referenced in <xref linkend="installation">
+	    instructions referenced in <xref linkend="installation" />
 	    regarding your Apache configuration, particularly
 	    instructions regarding the <quote>AddHandler</quote>
 	    parameter and <quote>ExecCGI</quote>.
@@ -1339,7 +1339,7 @@ bash# cd $BUGZILLA_HOME; for i in `ls *.cgi`; \
 	      Web Server for this purpose.  However, setup is quite
 	      different.  If ActivePerl doesn't seem to handle your
 	      file associations correctly (for .cgi and .pl files),
-	      please consult <xref linkend="faq">.
+	      please consult <xref linkend="faq" />.
 	    </para>
 	    <para>
 	      If you are going to use IIS, if on Windows NT you must
@@ -1521,7 +1521,7 @@ my $webservergid = 'Administrators'
 	<step>
 	  <para>Edit <filename>localconfig</filename> to suit your
 	    requirements.  Set <varname>$db_pass</varname> to your
-	    <quote>bugs_password</quote> from <xref linkend="ntbugs-password">, and <varname>$webservergroup</varname> to <quote>8</quote>.</para>
+	    <quote>bugs_password</quote> from <xref linkend="ntbugs-password" />, and <varname>$webservergroup</varname> to <quote>8</quote>.</para>
 	  <note>
 	    <para>Not sure on the <quote>8</quote> for
 	      <varname>$webservergroup</varname> above.  If it's
@@ -1696,7 +1696,7 @@ exit;
 	    calls that use a perl script as an argument.  This may
 	    take you a while. There is a <quote>setperl.csh</quote>
 	    utility to speed part of this procedure, available in the
-	    <xref linkend="patches"> section of The Bugzilla Guide.
+	    <xref linkend="patches" /> section of The Bugzilla Guide.
 	    However, it requires the Cygwin GNU-compatible environment
 	    for Win32 be set up in order to work.  See <ulink url="http://www.cygwin.com/">http://www.cygwin.com/</ulink> for details on obtaining Cygwin.
 	  </para>
diff --git a/docs/en/xml/integration.xml b/docs/en/xml/integration.xml
index 36cc617e2..dd1729761 100644
--- a/docs/en/xml/integration.xml
+++ b/docs/en/xml/integration.xml
@@ -8,7 +8,7 @@
   <section id="bonsai" xreflabel="Bonsai, the Mozilla automated CVS management system">
     <title>Bonsai</title>
     <para>Bonsai is a web-based tool for managing <xref
-							linkend="cvs">
+							linkend="cvs" />
       .  Using Bonsai, administrators can control open/closed status
       of trees, query a fast relational database back-end for change,
       branch, and comment information, and view changes made since the
@@ -16,7 +16,7 @@
       engineer responsible to be <quote>on the hook</quote> (include
       cool URL link here for Hook policies at mozilla.org).  Bonsai
       also includes gateways to <xref
-								       linkend="tinderbox"> and Bugzilla </para>
+								       linkend="tinderbox" /> and Bugzilla </para>
   </section>
 
   <section id="cvs" xreflabel="CVS, the Concurrent Versioning System">
diff --git a/docs/en/xml/using.xml b/docs/en/xml/using.xml
index 934817081..e0c61740b 100644
--- a/docs/en/xml/using.xml
+++ b/docs/en/xml/using.xml
@@ -31,7 +31,7 @@ Chapter: Using Bugzilla
 <title>Using Bugzilla</title>
   <epigraph>
     <para>
-      What, Why, How, & Where?
+      What, Why, How, &amp; Where?
     </para>
   </epigraph>
 
@@ -612,7 +612,7 @@ system against which all others are measured.
 	<para>And all this time, I thought we were taking bugs <emphasis>out</emphasis>...</para>
       </epigraph>
       
-      <section id="bug_writing">
+      <section id="bug-writing">
 	<title>Writing a Great Bug Report</title>
 	<para>
 	  Before we plunge into writing your first bug report, I
@@ -701,7 +701,7 @@ system against which all others are measured.
 	</para>
       </section>
 
-      <section id="bug_manage">
+      <section id="bug-manage">
 	<title>Managing your Bug Reports</title>
 	<para>
 	  OK, you should have a link to the bug you just created near
@@ -812,7 +812,7 @@ system against which all others are measured.
 	  their flow charts and know when it is time to pull the bug
 	  onto a quality assurance platform for inspection.  Other
 	  people set up email gateways to
-	    <xref linkend="bonsai"> or <xref linkend="tinderbox">, and
+	    <xref linkend="bonsai" /> or <xref linkend="tinderbox" />, and
 	  restrict which types of Bugzilla information are fed to
 	  these systems..
 	</para>