Big checkin of docs to resolve every

known outstanding doc bug! Yay release.
Still many things to fix. Aren't there always?

11 files changed, 2066 insertions, 1848 deletions

diff --git a/docs/sgml/Bugzilla-Guide.sgml b/docs/sgml/Bugzilla-Guide.sgml
index 30deb5c4a..59befaf0a 100644
--- a/docs/sgml/Bugzilla-Guide.sgml
+++ b/docs/sgml/Bugzilla-Guide.sgml
@@ -23,7 +23,7 @@
 <!ENTITY bz-ver "2.14">
 <!ENTITY bz-cvs-ver "2.15">
 <!ENTITY bzg-date "August 10, 2001">
-<!ENTITY bzg-ver "2.14.0">
+<!ENTITY bzg-ver "2.14">
 <!ENTITY bzg-cvs-ver "2.15.0">
 <!ENTITY bzg-auth "Matthew P. Barnson">
 <!ENTITY bzg-auth-email "<email>barnboy@NOSPAM.trilobyte.net</email>">
@@ -137,15 +137,6 @@ try to avoid clutter and feel free to waste space in the code to make it more re
 	</affiliation>
       </collab>
 
-      <editor>
-	<firstname>I.</firstname>
-	<surname>Freely</surname>
-	<othername>P.</othername>
-	<affiliation>
-	  <address><email>ipfreely@freely.eye-p.net</email></address>
-	</affiliation>
-      </editor>
-
     </authorgroup>
 
     <abstract>
@@ -165,6 +156,12 @@ try to avoid clutter and feel free to waste space in the code to make it more re
 	professional on operating system upon which you install
 	Bugzilla.
       </para>
+      <para>
+	THIS DOCUMENTATION IS MAINTAINED IN DOCBOOK 4.1 SGML 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!
+      </para>
     </abstract>
 
 
diff --git a/docs/sgml/about.sgml b/docs/sgml/about.sgml
index d92fa9b30..89f7bb127 100644
--- a/docs/sgml/about.sgml
+++ b/docs/sgml/about.sgml
@@ -14,11 +14,10 @@
       document you see today.
     </para>
     <para>
-      Despite the lack of updates, Bugzilla is simply the best piece
-      of bug-tracking software the world has ever seen.  This document
-      is intended to be the comprehensive guide to  the installation,
-      administration, maintenance, and use of the Bugzilla
-      bug-tracking system.
+      Bugzilla is simply the best piece of bug-tracking software the
+      world has ever seen.  This document is intended to be the
+      comprehensive guide to  the installation, administration,
+      maintenance, and use of the Bugzilla bug-tracking system.
     </para>
     <para>
       This release of the Bugzilla Guide is the
diff --git a/docs/sgml/administration.sgml b/docs/sgml/administration.sgml
index 0f290da31..54f984fbc 100644
--- a/docs/sgml/administration.sgml
+++ b/docs/sgml/administration.sgml
@@ -8,18 +8,21 @@
   </subtitle>
   
   <para>
-    So you followed the installation instructions to the letter, and
-    just logged into bugzilla with your super-duper god account and
-    you are sitting at the query screen. Yet, you have nothing to
-    query. Your first act of business needs to be to setup the
-    operating parameters for bugzilla.
+    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
+    installing this terrific program behind you. It seems, though, you
+    have nothing yet to query! Your first act of business should be to
+    setup the operating parameters for Bugzilla so you can get busy
+    getting data into your bug tracker.
   </para>
 
   <section id="postinstall-check">
     <title>Post-Installation Checklist</title>
     <para>
-      After installation, follow the checklist below to ensure that
-      you have a successful installation. If you do not see a
+      After installation, follow the checklist below to help ensure
+      that you have a successful installation. If you do not see a
       recommended setting for a parameter, consider leaving it at the
       default while you perform your initial tests on your Bugzilla
       setup.
@@ -30,47 +33,80 @@
     <procedure>
       <step>
 	<para>
-	  Bring up "editparams.cgi" in your web browser.  For
-	  instance, to edit parameters at mozilla.org, the URL would
-	  be <ulink url="http://bugzilla.mozilla.org/editparams.cgi">
-	    http://bugzilla.mozilla.org/editparams.cgi</ulink>, also
-	  available under the "edit parameters" link on your query
-	  page.
+	  Bring up <filename>editparams.cgi</filename> in your web
+	  browser.  This should be available as the <quote>edit
+	    parameters</quote> link from any Bugzilla screen once you
+	  have logged in.
 	</para>
       </step>
       <step>
+	<para>The <quote>maintainer</quote> is the email address of
+	  the person responsible for maintaining this Bugzilla
+	  installation.  The maintainer need not be a valid Bugzilla
+	  user.  Error pages, error emails, and administrative mail
+	  will be sent with the maintainer as the return email
+	  address.</para>
 	<para>
-	  Set "maintainer" to <emphasis>your</emphasis> email address.
+	  Set <quote>maintainer</quote> to <emphasis>your</emphasis> email address.
 	  This allows Bugzilla's error messages to display your email
 	  address and allow people to contact you for help.
 	</para>
       </step>
       <step>
+	<para>The <quote>urlbase</quote> parameter defines the fully
+	  qualified domain name and web server path to your Bugzilla
+	  installation.</para>
 	<para>
-	  Set "urlbase" to the URL reference for your Bugzilla
-	  installation. If your bugzilla query page is at
-	  http://www.foo.com/bugzilla/query.cgi, your url base is
-	  http://www.foo.com/bugzilla/
+	  For example, if your bugzilla query page is
+	  http://www.foo.com/bugzilla/query.cgi, set your
+	  <quote>urlbase</quote> is http://www.foo.com/bugzilla/.  
 	</para>
       </step>
       <step>
+	<para><quote>usebuggroups</quote> dictates whether or not to
+	  implement group-based security for Bugzilla.  If set,
+	  Bugzilla bugs can have an associated groupmask defining
+	  which groups of users are allowed to see and edit the
+	  bug.</para>
 	<para>
 	  Set "usebuggroups" to "on" <emphasis>only</emphasis> if you
-	  need to restrict access to products. I suggest leaving this
-	  parameter <emphasis>off</emphasis> while initially testing
-	  your Bugzilla.
+	  may wish to restrict access to products. I suggest leaving
+	  this parameter <emphasis>off</emphasis> while initially
+	  testing your Bugzilla.  
 	</para>
       </step>
       <step>
 	<para>
-	  Set "usebuggroupsentry" to "on" if you want to restrict
-	  access to products. Once again, if you are simply testing
+	  <quote>usebuggroupsentry</quote>, when set to
+	  <quote>on</quote>, requires that all bugs have an associated
+	  groupmask when submitted.  This parameter is made for those
+	  installations where product isolation is a necessity.
+	</para>
+	<para>
+	  Set "usebuggroupsentry" to "on" if you absolutely need to
+	  restrict access to bugs from the moment they are submitted
+	  through resolution. Once again, if you are simply testing
 	  your installation, I suggest against turning this parameter
 	  on; the strict security checking may stop you from being
 	  able to modify your new entries.
 	</para>
       </step>
       <step>
+	<para>
+	  You run into an interesting problem when Bugzilla reaches a
+	  high level of continuous activity.  MySQL supports only
+	  table-level write locking.  What this means is that if
+	  someone needs to make a change to a bug, they will lock the
+	  entire table until the operation is complete.  Locking for
+	  write also blocks reads until the write is complete.  The
+	  <quote>shadowdb</quote> parameter was designed to get around
+	  this limitation.  While only a single user is allowed to
+	  write to a table at a time, reads can continue unimpeded on
+	  a read-only shadow copy of the database.  Although your
+	  database size will double, a shadow database can cause an
+	  enormous performance improvement when implemented on
+	  extremely high-traffic Bugzilla databases.
+	</para>
         <para>
 	  Set "shadowdb" to "bug_shadowdb" if you will be running a
 	  *very* large installation of Bugzilla. The shadow database
@@ -79,15 +115,19 @@
 	  <note>
 	    <para>
 	      Enabling "shadowdb" can adversely affect the stability
-	      of your installation of Bugzilla. You may frequently
-	      need to manually synchronize your databases, or schedule
-	      nightly syncs via "cron"
+	      of your installation of Bugzilla. You should regularly
+	      check that your database is in sync.  It is often
+	      advisable to force a shadow database sync nightly via
+	      <quote>cron</quote>.
 	    </para>
 	  </note> Once again, in testing you should avoid this option
 	  -- use it if or when you <emphasis>need</emphasis> to use
 	  it, and have repeatedly run into the problem it was designed
 	  to solve -- very long wait times while attempting to commit
-	  a change to the database.
+	  a change to the database.  Mozilla.org began needing
+	  <quote>shadowdb</quote> when they reached around 40,000
+	  Bugzilla users with several hundred Bugzilla bug changes and
+	  comments per day.
         </para>
 	<para>
 	  If you use the "shadowdb" option, it is only natural that
@@ -97,6 +137,18 @@
 	</para>
       </step>
       <step>
+	<para><quote>headerhtml</quote>, <quote>footerhtml</quote>,
+	  <quote>errorhtml</quote>, <quote>bannerhtml</quote>, and
+	  <quote>blurbhtml</quote> are all templates which control
+	  display of headers, footers, errors, banners, and additional
+	  data.  We could go into some detail regarding the usage of
+	  these, but it is really best just to monkey around with them
+	  a bit to see what they do.  I strongly recommend you copy
+	  your <filename>data/params</filename> file somewhere safe
+	  before playing with these values, though.  If they are
+	  changed dramatically, it may make it impossible for you to
+	  display Bugzilla pages to fix the problem until you have
+	  restored your <filename>data/params</filename> file.</para>
         <para>
 	  If you have custom logos or HTML you must put in place to
 	  fit within your site design guidelines, place the code in
@@ -105,15 +157,20 @@
 	  <note>
 	    <para>
 	      The "headerhtml" text box is the HTML printed out
-	      <emphasis>before</emphasis> any other code on the page.
-	      If you have a special banner, put the code for it in
-	      "bannerhtml". You may want to leave these settings at
-	      the defaults initially.
+	      <emphasis>before</emphasis> any other code on the page,
+	      except the CONTENT-TYPE header sent by the Bugzilla
+	      engine. If you have a special banner, put the code for
+	      it in "bannerhtml". You may want to leave these settings
+	      at the defaults initially.
 	    </para>
 	  </note>
 	</para>
       </step>
       <step>
+	<para><quote>passwordmail</quote> is rather simple.  Every
+	  time a user creates an account, the text of this parameter
+	  is read as the text to send to the new user along with their
+	  password message.</para>
         <para>
 	  Add any text you wish to the "passwordmail" parameter box.
 	  For instance, many people choose to use this box to give a
@@ -121,20 +178,32 @@
         </para>
       </step>
       <step>
-        <para>
-	  Ensure "newemailtech" is "on". Your users will thank you.
-	  This is the default in the post-2.12 world, and is only an
-	  issue if you are upgrading.
-	</para>
-      </step>
-      <step>
+	<para><quote>useqacontact</quote> allows you to define an
+	  email address for each component, in addition to that of the
+	  default owner, who will be sent carbon copies of incoming
+	  bugs.  The critical difference between a QA Contact and an
+	  Owner is that the QA Contact follows the component.  If you
+	  reassign a bug from component A to component B, the QA
+	  Contact for that bug will change with the reassignment,
+	  regardless of owner.</para>
+	<para><quote>usestatuswhiteboard</quote> defines whether you
+	  wish to have a free-form, overwritable field associated with
+	  each bug.  The advantage of the Status Whiteboard is that it
+	  can be deleted or modified with ease, and provides an
+	  easily-searchable field for indexing some bugs that have
+	  some trait in common.  Many people will put <quote>help
+	    wanted</quote>, <quote>stalled</quote>, or <quote>waiting
+	    on reply from somebody</quote> messages into the Status
+	  Whiteboard field so those who peruse the bugs are aware of
+	  their status even more than that which can be indicated by
+	  the Resolution fields.</para>
 	<para>
 	  Do you want to use the QA Contact ("useqacontact") and
 	  status whiteboard ("usestatuswhiteboard") fields? These
 	  fields are useful because they allow for more flexibility,
 	  particularly when you have an existing Quality Assurance
 	  and/or Release Engineering team,  but they may not be needed
-	  for smaller installations.
+	  for many smaller installations.
 	</para>
       </step>
       <step>
@@ -144,14 +213,22 @@
 	  they have untouched new bugs.  If you do not plan to use
 	  this feature, simply do not set up the whining cron job
 	  described in the installation instructions, or set this
-	  value to "0".
+	  value to "0" (never whine).
 	</para>
       </step>
       <step>
+	<para><quote>commenton</quote> fields allow you to dictate
+	  what changes can pass without comment, and which must have a
+	  comment from the person who changed them.  Often,
+	  administrators will allow users to add themselves to the CC
+	  list, accept bugs, or change the Status Whiteboard without
+	  adding a comment as to their reasons for the change, yet
+	  require that most other changes come with an
+	  explanation.</para>
 	<para>
 	  Set the "commenton" options according to your site policy.
 	  It is a wise idea to require comments when users resolve,
-	  reassign, or reopen bugs.
+	  reassign, or reopen bugs at the very least.
 	  <note>
 	    <para>
 	      It is generally far better to require a developer
@@ -164,12 +241,28 @@
 	</para>
       </step>
       <step>
+	<para>The <quote>supportwatchers</quote> option can be an
+	  exceptionally powerful tool in the hands of a power Bugzilla
+	  user.  By enabling this option, you allow users to receive
+	  email updates whenever other users receive email updates.
+	  This is, of course, subject to the groupset restrictions on
+	  the bug; if the <quote>watcher</quote> would not normally be
+	  allowed to view a bug, the watcher cannot get around the
+	  system by setting herself up to watch the bugs of someone
+	  with bugs outside her priveleges.  She would still only
+	  receive email updates for those bugs she could normally
+	  view.</para>
+	<para>For Bugzilla sites which require strong inter-Product
+	  security to prevent snooping, watchers are not a good
+	  idea.</para>
 	<para>
-	  Set "supportwatchers" to "On".  This feature is helpful for
-	  team leads to monitor progress in their respective areas,
-	  and can offer many other benefits, such as allowing a
-	  developer to pick up a former engineer's bugs without
-	  requiring her to change all the information in the bug.
+	  However, for most sites you should set
+	  <quote>supportwatchers</quote> to "On".  This feature is
+	  helpful for team leads to monitor progress in their
+	  respective areas, and can offer many other benefits, such as
+	  allowing a developer to pick up a former engineer's bugs
+	  without requiring her to change all the information in the
+	  bug.
 	</para>
       </step>
     </procedure>
@@ -205,6 +298,9 @@
 	    groupset=0x7ffffffffffffff where login_name = "(user's
 	    login name)"; </command>
 	</para>
+	<para>Yes, that is <emphasis>fourteen</emphasis>
+	  <quote>f</quote>'s.  A whole lot of f-ing going on if you
+	  want to create a new administator.</para>
       </tip>
     </section>
 
@@ -269,11 +365,11 @@
 		right-hand side of the text entry box. You can match
 		what you type as a case-insensitive substring (the
 		default) of all users on your system, a case-sensitive
-		regular expression (please see the "man regexp" manual
-		page for details on regular expression syntax), or a
-		<emphasis>reverse</emphasis> regular expression match,
-		where every user name which does NOT match the regular
-		expression is selected.
+		regular expression (please see the <command>man
+		  regexp</command> manual page for details on regular
+		expression syntax), or a <emphasis>reverse</emphasis>
+		regular expression match, where every user name which
+		does NOT match the regular expression is selected.
 	      </para>
 	    </tip>
 	  </listitem>
@@ -292,10 +388,14 @@
 	      <para>
 		Adding a user this way will <emphasis>not</emphasis>
 		send an email informing them of their username and
-		password. In general, it is preferable to log out and
-		use the "New Account" button to create users, as it
-		will pre-populate all the required fields and also
-		notify  the user of her account name and password.
+		password. While useful for creating dummy accounts
+		(watchers which shuttle mail to another system, for
+		instance, or email addresses which are a mailing
+		list), in general it is preferable to log out and use
+		the <quote>New Account</quote> button to create users,
+		as it will pre-populate all the required fields and
+		also notify  the user of her account name and
+		password.
 	      </para>
 	    </note>
 	  </listitem>
@@ -317,6 +417,11 @@
 	      Don't disable your own administrative account, or you
 	      will hate life!
 	    </para>
+	    <para>At this time, <quote>Disabled Text</quote> does not
+	      prevent a user from using the email interface.  If you
+	      have the email interface enabled, they can still
+	      continue to submit bugs and comments that way.  We need
+	      a patch to fix this.</para>
 	  </warning>
 	</para>
       </section>
@@ -350,9 +455,8 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      <emphasis>Password</emphasis>: You will only see
-	      asterisks in versions of Bugzilla newer than 2.10 or
-	      early 2.11.  You can change the user password here.
+	      <emphasis>Password</emphasis>:  You can change the user
+	      password here.  It is normal to only see asterisks.
 	    </para>
 	  </listitem>
 	  <listitem>
diff --git a/docs/sgml/faq.sgml b/docs/sgml/faq.sgml
index f01b43053..34b952b01 100644
--- a/docs/sgml/faq.sgml
+++ b/docs/sgml/faq.sgml
@@ -1,6 +1,6 @@
 <!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 
-<appendix id="faq" xreflabel="The Bugzilla FAQ">
+<appendix id="faq">
   <title>The Bugzilla FAQ</title>
 
   <qandaset>
@@ -17,8 +17,8 @@
 	<answer>
 	  <para>
 	    You can stay up-to-date with the latest Bugzilla
-	    information at <ulink
-				  url="http://www.mozilla.org/projects/bugzilla/"> http://www.mozilla.org/projects/bugzilla/</ulink>
+	    information at <ulink url="http://www.mozilla.org/projects/bugzilla/">
+	    http://www.mozilla.org/projects/bugzilla/</ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -31,9 +31,9 @@
 	</question>
 	<answer>
 	  <para>
-	    Bugzilla is covered by the Mozilla Public License. See
-	    details at <ulink url="http://www.mozilla.org/MPL/">
-	      http://www.mozilla.org/MPL/</ulink>
+	    Bugzilla is covered by the Mozilla Public License.
+	    See details at <ulink url="http://www.mozilla.org/MPL/">
+	    http://www.mozilla.org/MPL/</ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -46,17 +46,16 @@
 	</question>
 	<answer>
 	  <para>
-	    <ulink url="http://www.collab.net/">www.collab.net</ulink>
-	    offers Bugzilla as part of their standard offering to
-	    large projects. They do have some minimum fees that are
-	    pretty hefty, and generally aren't interested in small
-	    projects.
+	    <ulink url="http://www.collab.net/">www.collab.net</ulink> offers
+	    Bugzilla as part of their standard offering to large projects.
+	    They do have some minimum fees that are pretty hefty, and generally
+	    aren't interested in small projects.
 	  </para>
 	  <para>
-	    There are several experienced Bugzilla hackers on the
-	    mailing list/newsgroup who are willing to whore themselves
-	    out for generous compensation. Try sending a message to
-	    the mailing list asking for a volunteer.
+	    There are several experienced
+	    Bugzilla hackers on the mailing list/newsgroup who are willing
+	    to whore themselves out for generous compensation.
+	    Try sending a message to the mailing list asking for a volunteer.
 	  </para>
 	</answer>
       </qandaentry>
@@ -64,15 +63,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    What major companies or projects are currently using
-	    Bugzilla for bug-tracking?
+	    What major companies or projects are currently using Bugzilla
+	    for bug-tracking?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    There are <emphasis>dozens</emphasis> of major comapanies
-	    with public Bugzilla sites to track bugs in their
-	    products.  A few include:
+	    There are <emphasis>dozens</emphasis> of major comapanies with public
+	    Bugzilla sites to track bugs in their products.  A few include:
 	    <simplelist>
 	      <member>Netscape/AOL</member>
 	      <member>Mozilla.org</member>
@@ -94,9 +92,8 @@
 	    </simplelist>
 	  </para>
 	  <para>
-	    Suffice to say, there are more than enough huge projects
-	    using Bugzilla that we can safely say it's extremely
-	    popular.
+	    Suffice to say, there are more than enough huge projects using Bugzilla
+	    that we can safely say it's extremely popular.
 	  </para>
 	</answer>
       </qandaentry>
@@ -109,16 +106,9 @@
 	</question>
 	<answer>
 	  <para>
-	    There are many, many contributors from around the world
-	    maintaining Bugzilla. The designated "Maintainer" is Tara
-	    Hernandez, with QA support by Matthew Tuck. Dan Mosedale
-	    and Dawn Endico are employees of Mozilla.org responsible
-	    for the installation of Bugzilla there, and are very
-	    frequent code contributors. Terry Weissman originally
-	    ported Bugzilla, but "these days, Terry just hangs around
-	    and heckles."  The rest of us are mostly transient
-	    developers; Bugzilla suits our needs, and we contribute
-	    code as we have needs for updates.
+	    Bugzilla maintenance has been in a state of flux recently.
+	    Please check <ulink
+				    url="http://www.mozilla.org/projects/bugzilla/">the Bugzilla Project Page for the latest details. </ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -126,8 +116,7 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How does Bugzilla stack up against other bug-tracking
-	    databases?
+	    How does Bugzilla stack up against other bug-tracking databases?
 	  </para>
 	</question>
 	<answer>
@@ -143,7 +132,7 @@
 	    flexibility, and superior ease-of-use.
 	  </para>
 	  <para>
-	    If you happen to be a commercial Bugzilla vendor, please
+	    If you happen to be a commercial bug-tracker vendor, please
 	    step forward with a rebuttal so I can include it in the
 	    FAQ.  We're not in pursuit of Bugzilla ueber alles; we
 	    simply love having a powerful, open-source tool to get our
@@ -160,9 +149,8 @@
 	</question>
 	<answer>
 	  <para>
-	    You can't.  However, the administrative account can, by
-	    simply opening your user account in editusers.cgi and
-	    changing the login name.
+	    You can't.  However, the administrative account can, by simply opening
+	    your user account in editusers.cgi and changing the login name.
 	  </para>
 	</answer>
       </qandaentry>
@@ -170,26 +158,24 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Why doesn't Bugzilla offer this or that feature or
-	    compatability with this other tracking software?
+	    Why doesn't Bugzilla offer this or that feature or compatability
+	    with this other tracking software?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    It may be that the support has not been built yet, or that
-	    you have not yet found it.  Bugzilla is making tremendous
-	    strides in usability, customizability, scalability, and
-	    user interface.  It is widely considered the most complete
-	    and popular open-source bug-tracking software in
-	    existence.
+	    It may be that the support has not been built yet, or that you
+	    have not yet found it.  Bugzilla is making tremendous strides in
+	    usability, customizability, scalability, and user interface.  It
+	    is widely considered the most complete and popular open-source
+	    bug-tracking software in existence.
 	  </para>
 	  <para>
-	    That doesn't mean it can't use improvement! You can help
-	    the project along by either hacking a patch yourself that
-	    supports the functionality you require, or else submitting
-	    a "Request for Enhancement" (RFE) using the bug submission
-	    interface at <ulink
-				url="http://bugzilla.mozilla.org/">bugzilla.mozilla.org</ulink>.
+	    That doesn't mean it can't use improvement!
+	    You can help the project along by either hacking a patch yourself
+	    that supports the functionality you require, or else submitting a
+	    "Request for Enhancement" (RFE) using the bug submission interface
+	    at <ulink url="http://bugzilla.mozilla.org/">bugzilla.mozilla.org</ulink>.
 	  </para>
 	</answer>
       </qandaentry>
@@ -205,40 +191,37 @@
 	  <para>Terry Weissman answers,
 	  <blockquote>
 	    <para>
-	      You're not the only one. But <emphasis>I</emphasis> am
-		not very interested. I'm not a real SQL or database
-		person. I just wanted to make a useful tool, and build
-		it on top of free software. So, I picked MySQL, and
-		learned SQL by staring at the MySQL manual and some
-		code lying around here, and wrote Bugzilla. I didn't
-		know that Enum's were non-standard SQL. I'm not sure
-		if I would have cared, but I didn't even know. So, to
-		me, things are "portable" because it uses MySQL, and
-		MySQL is portable enough. I fully understand (now)
-		that people want to be portable to other databases,
-		but that's never been a real concern of mine.
+	      You're not the only one. But <emphasis>I</emphasis> am not very interested. I'm not
+	      a real SQL or database person. I just wanted to make a useful tool,
+	      and build it on top of free software. So, I picked MySQL, and
+	      learned SQL by staring at the MySQL manual and some code lying
+	      around here, and
+	      wrote Bugzilla. I didn't know that Enum's were non-standard SQL.
+	      I'm not sure if I would have cared, but I didn't even know. So, to
+	      me, things are "portable" because it uses MySQL, and MySQL is
+	      portable enough. I fully understand (now) that people want to be
+	      portable to other databases, but that's never been a real concern
+	      of mine.
 	    </para>
 	  </blockquote>
 	  </para>
 	  <para>
-	    Things aren't quite that grim these days, however.  Terry
-	    pretty much sums up much of the thinking many of us have
-	    for Bugzilla, but there is light on the horizon for
-	    database-independence!  Here are some options:
+	    Things aren't quite that grim these days, however.  Terry pretty much
+	    sums up much of the thinking many of us have for Bugzilla, but there
+	    is light on the horizon for database-independence!  Here are some options:
 	  </para>
 	  <simplelist>
 	    <member>
-	      <emphasis><ulink url="http://bugzilla.redhat.com/">Red
-		  Hat Bugzilla</ulink></emphasis>: Runs a modified
-	      Bugzilla 2.8 atop an Oracle database.
+	      <emphasis><ulink url="http://bugzilla.redhat.com/">Red Hat Bugzilla</ulink></emphasis>:
+	      Runs a modified Bugzilla 2.8 atop an Oracle database.
 	    </member>
 	    <member>
-	      <emphasis><ulink
-			       url="http://sourceforge.net/projects/interzilla">Interzilla</ulink></emphasis>: A project to run Bugzilla on Interbase.  No code released yet, however.
+	      <emphasis><ulink url="http://sourceforge.net/projects/interzilla">Interzilla</ulink></emphasis>:
+	      A project to run Bugzilla on Interbase.  No code released yet, however.
 	    </member>
 	    <member>
-	      <emphasis>Bugzilla 3.0</emphasis>: One of the primary
-	      stated goals is multiple database support.
+	      <emphasis>Bugzilla 3.0</emphasis>: One of the primary stated goals
+	      is multiple database support.
 	    </member>
 	  </simplelist>
 	</answer>
@@ -247,40 +230,36 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead
-	    of "/usr/bin/perl" or something else?
+	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
+	    "/usr/bin/perl" or something else?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	     Mozilla.org uses /usr/bonsaitools/bin/perl. The prime
-	    rule in making submissions is "don't break
-	    bugzilla.mozilla.org". If it breaks it, your patch will be
-	    reverted faster than you can do a diff.
+	     Mozilla.org uses /usr/bonsaitools/bin/perl. The prime rule in making
+	    submissions is "don't break bugzilla.mozilla.org". If it breaks it, your
+	    patch will be reverted faster than you can do a diff.
 	  </para>
 	  <para>
-	    Here's Terry Weissman's comment, for some historical
-	    context:
+	    Here's Terry Weissman's comment, for some historical context:
 	    <blockquote>
 	      <para>
-		[This was] purely my own convention. I wanted a place
-		to put a version of Perl and other tools that was
-		strictly under my control for the various webtools,
-		and not subject to anyone else. Edit it to point to
-		whatever you like.
+		[This was] purely my own convention. I wanted a place to put a version of
+		Perl and other tools that was strictly under my control for the
+		various webtools, and not subject to anyone else. Edit it to point
+		to whatever you like.
 	      </para>
 	      <note>
 		<para>
-		  We always recommend that, if possible, you keep the
-		  path as /usr/bonsaitools/bin/perl, and simply add a
-		  /usr/bonsaitools and /usr/bonsaitools/bin directory,
-		  then symlink your version of perl to
-		  /usr/bonsaitools/bin/perl.  This will make upgrading
+		  We always recommend that, if possible, you keep the path
+		  as /usr/bonsaitools/bin/perl, and simply add a /usr/bonsaitools
+		  and /usr/bonsaitools/bin directory, then symlink your version
+		  of perl to /usr/bonsaitools/bin/perl.  This will make upgrading
 		  your Bugzilla much easier in the future.
 		</para>
 		<para>
-		  Obviously, if you do not have root access to your
-		  Bugzilla box, our suggestion is irrelevant.
+		  Obviously, if you do not have root access to your Bugzilla
+		  box, our suggestion is irrelevant.
 		</para>
 	      </note>
 	    </blockquote>
@@ -297,8 +276,7 @@
 	<note>
 	  <para>
 	    <emphasis>This section is no longer up-to-date.</emphasis>
-	    Please see the section on "Red Hat Bugzilla" under
-	    "Variants" in The Bugzilla Guide.
+	    Please see the section on "Red Hat Bugzilla" under "Variants" in The Bugzilla Guide.
 	  </para>
 	</note>
       </para>
@@ -310,29 +288,27 @@
 	</question>
 	<answer>
 	  <para>
-	    Red Hat Bugzilla is arguably more user-friendly,
-	    customizable, and scalable than stock Bugzilla. Check it
-	    out at http://bugzilla.redhat.com and the sources at
-	    ftp://people.redhat.com/dkl/. They've set their Bugzilla
-	    up to work with Oracle out of the box. Note that Redhat
-	    Bugzilla is based upon the 2.8 Bugzilla tree; Bugzilla has
-	    made some tremendous advances since the 2.8 release. Why
-	    not download both Bugzillas to check out the differences
-	    for yourself?
+	    Red Hat Bugzilla is arguably more user-friendly, customizable, and scalable
+	    than stock Bugzilla. Check it out at
+	    http://bugzilla.redhat.com and the sources at ftp://people.redhat.com/dkl/.
+	    They've set their Bugzilla up to work with Oracle out of the box.
+	    Note that Redhat Bugzilla is based upon the 2.8 Bugzilla tree;
+	    Bugzilla has made some tremendous advances since the 2.8 release.
+	    Why not download both Bugzillas to check out the differences for
+	    yourself?
 	  </para>
 	  <para>
-	    Dave Lawrence, the original Red Hat Bugzilla maintainer,
-	    mentions:
+	    Dave Lawrence, the original Red Hat Bugzilla maintainer, mentions:
 	    <blockquote>
 	      <para>
-		Somebody needs to take the ball and run with it.  I'm
-		the only maintainer and am very pressed for time.
+		Somebody needs to take the ball and run with it.  I'm the only
+		maintainer and am very pressed for time.
 	      </para>
-	    </blockquote> If you, or someone you know, has the time
-	    and expertise to do the integration work so main-tree
-	    Bugzilla 2.12 and higher integrates the Red Hat Bugzilla
-	    Oracle modifications, please donate your time to
-	    supporting the Bugzilla project.
+	    </blockquote>
+	    If you, or someone you know, has the time and expertise to do the integration
+	    work so main-tree Bugzilla 2.12 and higher integrates the Red
+	    Hat Bugzilla Oracle modifications, please donate your
+	    time to supporting the Bugzilla project.
 	  </para>
 	</answer>
       </qandaentry>
@@ -348,123 +324,102 @@
 	    <emphasis>Dave Lawrence</emphasis>:
 	    <blockquote>
 	      <para>
-		For the record, we are not using any template type
-		implementation for the cosmetic changes maded to
-		Bugzilla.  It is just alot of html changes in the code
-		itself.  I admit I may have gotten a little carried
-		away with it but the corporate types asked for a more
-		standardized interface to match up with other projects
-		relating to Red Hat web sites.  A lot of other web
-		based internal tools I am working on also look like
-		Bugzilla.
+		For the record, we are not using any template type implementation for
+		the cosmetic changes maded to Bugzilla.  It is just alot of html changes
+		in the code itself.  I admit I may have gotten a little carried away with it
+		but the corporate types asked for a more standardized interface to match up
+		with other projects relating to Red Hat web sites.  A lot of other web based
+		internal tools I am working on also look like Bugzilla.
 	      </para>
 	      <para>
-		I do want to land the changes that I have made to
-		Bugzilla but I may have to back out a good deal and
-		make a different version of Red Hat's Bugzilla for
-		checking in to CVS. Especially the cosmetic changes
-		because it seems they may not fit the general public.
-		I will do that as soon as I can. I also still do my
-		regular QA responsibilities along with Bugzilla so
-		time is difficult sometimes to come by.
+		I do want to land the changes that I have made to Bugzilla but I may
+		have to back out a good deal and make a different version of Red Hat's
+		Bugzilla for checking in to CVS. Especially the cosmetic changes because it
+		seems they may not fit the general public.  I will do that as soon as I can.
+		I also still do my regular QA responsibilities along with Bugzilla so time
+		is difficult sometimes to come by.
 	      </para>
 	      <para>
-		There are also a good deal of other changes that were
-		requested by management for things like support
-		contracts and different permission groups for making
-		bugs private. Here is a short list of the major
+		There are also a good deal of other changes that were requested by
+		management for things like support contracts and different permission
+		groups for making bugs private. Here is a short list of the major
 		changes that have been made:
 	      </para>
 	      <orderedlist>
 		<listitem>
 		  <para>
-		    No enum types. All old enum types are now separate
-		    smaller tables.
+		    No enum types. All old enum types are now separate smaller tables.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    No bit wise operations. Not all databases support
-		    this so they were changed to a more generic way of
-		    doing this task
+		    No bit wise operations. Not all databases support this so they were
+		    changed to a more generic way of doing this task
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Bug reports can only be altered by the reporter,
-		    assignee, or a privileged bugzilla user. The rest
-		    of the world can see the bug but in a
-		    non-changeable format (unless the bug has been
-		    marked private).  They can however add comments,
-		    add and remove themselves from the CC list
+		    Bug reports can only be altered by the reporter, assignee, or a
+		    privileged bugzilla user. The rest of the world can see the bug but in
+		    a non-changeable format (unless the bug has been marked private).  They
+		    can however add comments, add and remove themselves from the CC list
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Different group scheme. Each group has an id
-		    number related to it. There is a user_group table
-		    which contains userid to groupid mappings to
-		    determine which groups each user belongs to.
-		    Additionally there is a bug_group table that has
-		    bugid to groupid mappings to show which groups can
-		    see a particular bug. If there are no entries for
-		    a bug in this table then the bug is public.
+		    Different group scheme. Each group has an id number related to it.
+		    There is a user_group table which contains userid to groupid mappings
+		    to determine which groups each user belongs to.  Additionally there is
+		    a bug_group table that has bugid to groupid mappings to show which
+		    groups can see a particular bug. If there are no entries for a bug in
+		    this table then the bug is public.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Product groups. product_table created to only
-		    allow certain products to be visible for certain
-		    groups in both bug entry and query. This was
+		    Product groups. product_table created to only allow certain products to
+		    be visible for certain groups in both bug entry and query. This was
 		    particulary helpful for support contracts.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Of course many (too many) changes to Bugzilla code
-		    itself to allow use with Oracle and still allow
-		    operation with Mysql if so desired. Currently if
-		    you use Mysql it is set to use Mysql's old
-		    permission scheme to keep breakage to a minimum.
-		    Hopefully one day this will standardize on one
-		    style which may of course be something completely
+		    Of course many (too many) changes to Bugzilla code itself to allow use
+		    with Oracle and still allow operation with Mysql if so desired.
+		    Currently if you use Mysql it is set to use Mysql's old permission
+		    scheme to keep breakage to a minimum. Hopefully one day this will
+		    standardize on one style which may of course be something completely
 		    different.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Uses Text::Template perl module for rendering of
-		    the dynamic HTML pages such as enter_bug.cgi,
-		    query.cgi, bug_form.pl, and for the header and
-		    footer parts of the page. This allows the html to
-		    be separate from the perl code for customizing the
-		    look and feel of the page to one's preference.
+		    Uses Text::Template perl module for rendering of the dynamic HTML pages
+		    such as enter_bug.cgi, query.cgi, bug_form.pl, and for the header and
+		    footer parts of the page. This allows the html to be separate from the
+		    perl code for customizing the look and feel of the page to one's
+		    preference.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    There are many other smaller changes. There is
-		    also a port to Oracle that I have been working on
-		    as time permits but is not completely finished but
-		    somewhat usable. I will merge it into our standard
-		    code base when it becomes production quality.
-		    Unfortunately there will have to be some
-		    conditionals in the code to make it work with
-		    other than Oracle due to some differences between
-		    Oracle and Mysql.
+		    There are many other smaller changes. There is also a port to Oracle
+		    that I have been working on as time permits but is not completely
+		    finished but somewhat usable. I will merge it into our standard code
+		    base when it becomes production quality. Unfortunately there will have
+		    to be some conditionals in the code to make it work with other than
+		    Oracle due to some differences between Oracle and Mysql.
 		  </para>
 		</listitem>
 	      </orderedlist>
 	      <para>
-		Both the Mysql and Oracle versions of our current code
-		base are available from ftp://people.redhat.com/dkl.
-		If Terry/Tara wants I can submit patch files for all
-		of the changes I have made and he can determine what
-		is suitable for addition to the main bugzilla cade
-		base. But for me to commit changes to the actual CVS I
-		will need to back out alot of things that are not
-		suitable for the rest of the Bugzilla community. I am
-		open to suggestions.
+		Both the Mysql and Oracle versions of our current code base are
+		available from ftp://people.redhat.com/dkl. If Terry/Tara wants I can submit
+		patch files for all of the changes I have made and he can determine what is
+		suitable for addition to the main bugzilla cade base. But for me to commit
+		changes to the actual CVS I will need to back out alot of things that are
+		not suitable for the rest of the Bugzilla community. I am open to
+		suggestions.
 	      </para>
 	    </blockquote>
 	  </para>
@@ -482,66 +437,57 @@
 	    <note>
 	      <para>
 		This information is somewhat dated; I last updated it
-		7 June 2000.  Please see the "Variants" section of
-		"The Bugzilla Guide" for more up-to-date information
-		regarding Red Hat Bugzilla.
+		7 June 2000.  Please see the "Variants" section of "The Bugzilla Guide"
+		for more up-to-date information regarding Red Hat Bugzilla.
 	      </para>
-	    </note> <emphasis>Dave Lawrence</emphasis>:
+	    </note>
+	    <emphasis>Dave Lawrence</emphasis>:
 	    <blockquote>
 	      <para>
-		     I suppose the current thread warrants an update
-		on the status of Oracle and bugzilla ;) We have now
-		been running Bugzilla 2.8 on Oracle for the last two
-		days in our production environment. I tried to do as
-		much testing as possible with it before going live
-		which is some of the reason for the long delay. I did
-		not get enough feedback as I would have liked from
-		internal developers to help weed out any bugs still
-		left so I said "Fine, i will take it live and then I
-		will get the feedback I want :)" So it is now starting
-		to stabilize and it running quite well after working
-		feverishly the last two days fixing problems as soon
-		as they came in from the outside world. The current
-		branch in cvs is up2date if anyone would like to grab
-		it and try it out. The oracle _setup.pl is broken
-		right now due to some last minute changes but I will
-		update that soon. Therefore you would probably need to
-		create the database tables the old fashioned way using
-		the supplied sql creation scripts located in the
-		./oracle directory. We have heavy optimizations in the
-		database it self thanks to the in-house DBA here at
-		Red Hat so it is running quite fast. The database
-		itself is located on a dual PII450 with 1GB ram and 14
-		high voltage differential raided scsi drives. The
-		tables and indexes are partitioned in 4 chuncks across
-		the raided drive which is nice because when ever you
-		need to do a full table scan, it is actually starting
-		in 4 different locations on 4 different drives
-		simultaneously. And the indexes of course are on
-		separate drives from the data so that speeds things up
-		tremendously. When  I can find the time I will
-		document all that we have done to get this thing going
-		to help others that may need it.
+		     I suppose the current thread warrants an update on the status of
+		Oracle and bugzilla ;) We have now been running Bugzilla 2.8 on
+		Oracle for the last two days in our production environment. I
+		tried to do as much testing as possible with it before going live
+		which is some of the reason for the long delay. I did not get
+		enough feedback as I would have liked from internal developers to
+		help weed out any bugs still left so I said "Fine, i will take it
+		live and then I will get the feedback I want :)" So it is now
+		starting to stabilize and it running quite well after working
+		feverishly the last two days fixing problems as soon as they came
+		in from the outside world. The current branch in cvs is up2date if
+		anyone would like to grab it and try it out. The oracle _setup.pl
+		is broken right now due to some last minute changes but I will
+		update that soon. Therefore you would probably need to create the
+		database tables the old fashioned way using the supplied sql
+		creation scripts located in the ./oracle directory. We have heavy
+		optimizations in the database it self thanks to the in-house DBA
+		here at Red Hat so it is running quite fast. The database itself
+		is located on a dual PII450 with 1GB ram and 14 high voltage
+		differential raided scsi drives. The tables and indexes are
+		partitioned in 4 chuncks across the raided drive which is nice
+		because when ever you need to do a full table scan, it is actually
+		starting in 4 different locations on 4 different drives
+		simultaneously. And the indexes of course are on separate drives
+		from the data so that speeds things up tremendously. When  I can
+		find the time I will document all that we have done to get this
+		thing going to help others that may need it.
 	      </para>
 	      <para>
-		As Matt has mentioned it is still using out-dated code
-		and with a little help I would like to bring
-		everything up to date for eventual  incorporation with
-		the main cvs tree. Due to other duties I have with the
-		company any help with this wiould be appreciated. What
-		we are using  now is what I call a best first effort.
-		It definitely can be improved on and may even need
-		complete rewrites in a lot of areas. A lot of changes
-		may have to be made in the way Bugzilla does things
-		currently  to make this transition to a more generic
-		database interface.  Fortunately when making the
-		Oracle changes I made sure I didn't do  anything that
-		I would consider Oracle specific and could not be
-		easily done with other databases. Alot of the sql
-		statements need to be broken up into smaller utilities
-		that themselves would need to make decisions on what
-		database they are using but the majority of the code
-		can be made database neutral.
+		As Matt has mentioned it is still using out-dated code and with a
+		little help I would like to bring everything up to date for
+		eventual  incorporation with the main cvs tree. Due to other
+		duties I have with the company any help with this wiould be
+		appreciated. What we are using  now is what I call a best first
+		effort. It definitely can be improved on and may even need
+		complete rewrites in a lot of areas. A lot of changes may have to
+		be made in the way Bugzilla does things currently  to make this
+		transition to a more generic database interface.  Fortunately when
+		making the Oracle changes I made sure I didn't do  anything that I
+		would consider Oracle specific and could not be easily done with
+		other databases. Alot of the sql statements need to be broken up
+		into smaller utilities that themselves would need to make
+		decisions on what database they are using but the majority of the
+		code can be made database neutral.
 	      </para>
 	    </blockquote>
 	  </para>
@@ -552,78 +498,21 @@
 
     <qandadiv id="faq_loki">
       <title>Loki Bugzilla (AKA Fenris)</title>
-      <para>
-	<note>
-	  <para>
-	    Loki's "Fenris" Bugzilla is based upon the (now ancient)
-	    Bugzilla 2.8 tree, and is no longer actively maintained.
-	    It works well enough for Loki.  Additionally, the major
-	    differences in Fenris have now been integrated into the
-	    main source tree of Bugzilla, so there's not much reason
-	    to go grab the source.  I leave this section of the FAQ
-	    principally for historical interest, but unless Loki has
-	    further input into Bugzilla's future, it will be
-	    deprecated in future versions of the Guide.
-	  </para>
-	</note>
-      </para>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    What about Loki Bugzilla?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    Loki Games has a customized version of Bugzilla available
-	    at http://fenris.lokigames.com.  From that page,
-	    <blockquote>
-	      <para>
-		     You may have noticed that Fenris is a fork from
-		Bugzilla-- our patches weren't suitable for
-		integration --and a few people have expressed interest
-		in the code. Fenris has one major  improvement over
-		Bugzilla, and that is individual comments are not
-		appended onto a string blob, they are stored as a
-		record in a separate table. This allows you to, for
-		instance, separate comments out according to privilege
-		levels in case your bug database could contain
-		sensitive information not for public eyes. We also
-		provide things like email hiding to protect user's
-		privacy, additional fields such as 'user_affected' in
-		case someone enters someone else's bug, comment
-		editing and deletion, and more conditional system
-		variables than Bugzilla does (turn off attachments,
-		qacontact, etc.).
-	      </para>
-	    </blockquote>
-	  </para>
-	</answer>
-      </qandaentry>
 
       <qandaentry>
 	<question>
 	  <para>
-	    Who maintains Fenris (Loki Bugzilla) now?
+	    What is Loki Bugzilla (Fenris)?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Raphael Barrerro &lt;raistlin@lokigames.com&gt;. Michael
-	    Vance created the initial fork, but no longer maintains
-	    the project.
+	    Loki Games has a customized version of Bugzilla available at
+	    <ulink url="http://fenris.lokigames.com/">http://fenris.lokigames.com</ulink>.  There are some advantages to using Fenris, chief being separation of comments based upon user privacy level, data hiding, forced login for any data retrieval, and some additional fields.  Loki has mainted their code, originally a fork from the Bugzilla 2.8 code base, and it is quite a bit different than stock Bugzilla at this point.  I recommend you stick with official Bugzilla version &bz-ver; rather than using a fork, but it's up to you.
 	  </para>
 	</answer>
       </qandaentry>
 
-      <qandaentry>
-	<question>
-	  <para>
-	    
-	  </para>
-	</question>
-      </qandaentry>
     </qandadiv>
 
     <qandadiv id="faq_phb">
@@ -631,9 +520,8 @@
       <para>
 	<note>
 	  <para>
-	    The title of this section doesn't mean you're a PHB -- it
-	    just means you probably HAVE a PHB who wants to know this
-	    :)
+	    The title of this section doesn't mean you're a PHB -- it just means
+	    you probably HAVE a PHB who wants to know this :)
 	  </para>
 	</note>
       </para>
@@ -641,15 +529,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Is Bugzilla web-based or do you have to have specific
-	    software or specific operating system on your machine?
+	    Is Bugzilla web-based or do you have to have specific software or
+	    specific operating system on your machine?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    It is web and e-mail based.  You can edit bugs by sending
-	    specially formatted email to a properly configured
-	    Bugzilla, or control via the web.
+	    It is web and e-mail based.  You can edit bugs by sending specially
+	    formatted email to a properly configured Bugzilla, or control via the web.
 	  </para>
 	</answer>
       </qandaentry>
@@ -657,18 +544,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Has anyone you know of already done any Bugzilla
-	    integration with Perforce (SCM software)?
+	    Has anyone you know of already done any Bugzilla integration with
+	    Perforce (SCM software)?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Yes!  You can find more information elsewhere in "The
-	    Bugzilla Guide" in the "Integration with Third-Party
-	    Products" section. The section on Perforce isn't very
-	    large, but as the maintainer of the Guide is charged with
-	    Perforce/Bugzilla integration by his company, you can
-	    expect this section to grow.
+	    Yes!  You can find more information elsewhere in "The Bugzilla
+	    Guide" in the "Integration with Third-Party Products" section.
 	  </para>
 	</answer>
       </qandaentry>
@@ -684,8 +567,8 @@
 	    Absolutely!  You can track up to a "soft-limit" of around
 	    64 individual "Products", that can each be composed of as
 	    many "Components" as you want.  Check the Administration
-	    section of the Bugzilla Guide for more information
-	    regarding setting up Products and Components.
+	    section of the Bugzilla Guide for more information regarding
+	    setting up Products and Components.
 	  </para>
 	</answer>
       </qandaentry>
@@ -693,9 +576,8 @@
       <qandaentry>
 	<question>
 	  <para>
-	    If I am on many projects, and search for all bugs assigned
-	    to me, will Bugzilla list them for me and allow me to sort
-	    by project, severity etc?
+	    If I am on many projects, and search for all bugs assigned to me, will
+	    Bugzilla list them for me and allow me to sort by project, severity etc?
 	  </para>
 	</question>
 	<answer>
@@ -708,20 +590,18 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Does Bugzilla allow attachments (text, screenshots, urls
-	    etc)? If yes, are there any that are NOT allowed?
+	    Does Bugzilla allow attachments (text, screenshots, urls etc)? If yes,
+	    are there any that are NOT allowed?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Yes.  There are many specific MIME-types that are
-	    pre-defined by Bugzilla, but you may specify any arbitrary
-	    MIME-type you need when you upload the file.  Since all
-	    attachments are stored in the database, however, I
-	    recommend storing large binary attachments elsewhere in
-	    the web server's file system and providing a hyperlink as
-	    a comment, or in the provided "URL" field in the bug
-	    report.
+	    Yes.  There are many specific MIME-types that are pre-defined by Bugzilla,
+	    but you may specify any arbitrary MIME-type you need when you
+	    upload the file.  Since all attachments are stored in the database,
+	    however, I recommend storing large binary attachments elsewhere
+	    in the web server's file system and providing a hyperlink
+	    as a comment, or in the provided "URL" field in the bug report.
 	  </para>
 	</answer>
       </qandaentry>
@@ -729,17 +609,16 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Does Bugzilla allow us to define our own priorities and
-	    levels? Do we have complete freedom to change the labels
-	    of fields and format of them, and the choice of acceptable
-	    values?
+	    Does Bugzilla allow us to define our own priorities and levels? Do we
+	    have complete freedom to change the labels of fields and format of them, and
+	    the choice of acceptable values?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Yes.  However, modifying some fields, notably those
-	    related to bug progression states, also require adjusting
-	    the program logic to compensate for the change.
+	    Yes.  However, modifying some fields, notably those related to bug
+	    progression states, also require adjusting the program logic to
+	    compensate for the change.
 	  </para>
 	</answer>
       </qandaentry>
@@ -748,65 +627,70 @@
       <qandaentry>
 	<question>
 	  <para>
-	    The index.html page doesn't show the footer.  It's really
-	    annoying to have to go to the querypage just to check my
-	    "my bugs" link.  How do I get a footer on static HTML
-	    pages?
+	    The index.html page doesn't show the footer.  It's really annoying to have
+	    to go to the querypage just to check my "my bugs" link.  How do I get a footer
+	    on static HTML pages?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    This was a late-breaking question for the Guide, so I just
-	    have to quote the relevant newsgroup thread on it.
+	    This was a late-breaking question for the Guide, so I just have to
+	    quote the relevant newsgroup thread on it.
 	  </para>
 	  <literallayout>
-> AFAIK, most sites (even if they have SSI enabled) won't have #exec
-	    cmd > enabled.  Perhaps what would be better is a #include
-	    virtual and a > footer.cgi the basically has the "require
-	    'CGI.pl' and PutFooter command. > > Please note that under
-	    most configurations, this also requires naming > the file
-	    from index.html to index.shtml (and making sure that it
-	    will > still be reconized as an index).  Personally, I
-	    think this is better on > a per-installation basis
-	    (perhaps add something to the FAQ that says how > to do
-	    this). Good point.  Yeah, easy enough to do, that it
-	    shouldn't be a big deal for someone to take it on if they
-	    want it.  FAQ is a good place for it. > Dave Miller wrote:
-	    > >> I did a little experimenting with getting the command
-	    menu and footer on >> the end of the index page while
-	    leaving it as an HTML file... >> >> I was successful. :)
-	    >> >> I added this line: >> >> <!--#exec
-	    cmd="/usr/bin/perl -e &quot;require 'CGI.pl';
-	    >>PutFooter();&quot;" --> >> >> Just before the
-	    &lt;/BODY&gt; &lt;/HTML&gt; at the end of the file.  And
-	    it worked. >> >> Thought I'd toss that out there.  Should
-	    I check this in?  For those that >> have SSI disabled,
-	    it'll act like a comment, so I wouldn't think it would >>
-	    break anything.
+> AFAIK, most sites (even if they have SSI enabled) won't have #exec cmd
+> enabled.  Perhaps what would be better is a #include virtual and a
+> footer.cgi the basically has the "require 'CGI.pl' and PutFooter command.
+>
+> Please note that under most configurations, this also requires naming
+> the file from index.html to index.shtml (and making sure that it will
+> still be reconized as an index).  Personally, I think this is better on
+> a per-installation basis (perhaps add something to the FAQ that says how
+> to do this).
+
+Good point.  Yeah, easy enough to do, that it shouldn't be a big deal for
+someone to take it on if they want it.  FAQ is a good place for it.
+
+> Dave Miller wrote:
+>
+>> I did a little experimenting with getting the command menu and footer on
+>> the end of the index page while leaving it as an HTML file...
+>>
+>> I was successful. :)
+>>
+>> I added this line:
+>>
+>> <!--#exec cmd="/usr/bin/perl -e &quot;require 'CGI.pl';
+>>PutFooter();&quot;" -->
+>>
+>> Just before the &lt;/BODY&gt; &lt;/HTML&gt; at the end of the file.  And it worked.
+>>
+>> Thought I'd toss that out there.  Should I check this in?  For those that
+>> have SSI disabled, it'll act like a comment, so I wouldn't think it would
+>> break anything.
 	  </literallayout>
 	</answer>
       </qandaentry>
       <qandaentry>
 	<question>
 	  <para>
-	    Does Bugzilla provide any reporting features, metrics,
-	    graphs, etc? You know, the type of stuff that management
-	    likes to see. :)
+	    Does Bugzilla provide any reporting features, metrics, graphs, etc? You
+	    know, the type of stuff that management likes to see. :)
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Yes.  Look at <ulink
-				 url="http://bugzilla.mozilla.org/reports.cgi"> http://bugzilla.mozilla.org/reports.cgi</ulink> for basic reporting facilities.
+	    Yes.  Look at <ulink url="http://bugzilla.mozilla.org/reports.cgi">
+	    http://bugzilla.mozilla.org/reports.cgi</ulink> for basic reporting
+	    facilities.
 	  </para>
 	  <para>
-	    For more advanced reporting, I recommend hooking up a
-	    professional reporting package, such as Crystal Reports,
-	    and use ODBC to access the MySQL database.  You can do a
-	    lot through the Query page of Bugzilla as well, but right
-	    now Advanced Reporting is much better accomplished through
-	    third-party utilities that can interface with the database
-	    directly.
+	    For more advanced reporting, I recommend hooking up a professional
+	    reporting package, such as Crystal Reports, and use ODBC to access
+	    the MySQL database.  You can do a lot through the Query page of
+	    Bugzilla as well, but right now Advanced Reporting is much
+	    better accomplished through third-party utilities that can
+	    interface with the database directly.
 	  </para>
 	  <para>
 	    Advanced Reporting is a Bugzilla 3.X proposed feature.
@@ -817,16 +701,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Is there email notification and if so, what do you see
-	    when you get an email? Do you see bug number and title or
-	    is it only the number?
+	    Is there email notification and if so, what do you see when you get an
+	    email? Do you see bug number and title or is it only the number?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Email notification is user-configurable.  The bug id and
-	    Topic of the bug report accompany each email notification,
-	    along with a list of the changes made.
+	    Email notification is user-configurable.  The bug id and Topic
+	    of the bug report accompany each email notification, along with
+	    a list of the changes made.
 	  </para>
 	</answer>
       </qandaentry>
@@ -848,24 +731,22 @@
       <qandaentry>
 	<question>
 	  <para>
-	    If there is email notification, do users have to have any
-	    particular type of email application?
+	    If there is email notification, do users have to have any particular
+	    type of email application?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Bugzilla email is sent in plain text, the most compatible
-	    mail format on the planet.
+	    Bugzilla email is sent in plain text, the most compatible mail format
+	    on the planet.
 	    <note>
 	      <para>
-		If you decide to use the bugzilla_email integration
-		features to allow Bugzilla to record responses to mail
-		with the associated bug, you may need to caution your
-		users to set their mailer to "respond to messages in
-		the format in which they were sent".  For security
-		reasons Bugzilla ignores HTML tags in comments, and if
-		a user sends HTML-based email into Bugzilla the
-		resulting comment looks downright awful.
+		If you decide to use the bugzilla_email integration features
+		to allow Bugzilla to record responses to mail with the associated bug,
+		you may need to caution your users to set their mailer to "respond
+		to messages in the format in which they were sent".  For security reasons
+		Bugzilla ignores HTML tags in comments, and if a user sends HTML-based
+		email into Bugzilla the resulting comment looks downright awful.
 	      </para>
 	    </note>
 	  </para>
@@ -875,19 +756,17 @@
       <qandaentry>
 	<question>
 	  <para>
-	     If I just wanted to track certain bugs, as they go
-	    through life, can I set it up to alert me via email
-	    whenever that bug changes, whether it be owner, status or
-	    description etc.?
+	     If I just wanted to track certain bugs, as they go through life, can I
+	    set it up to alert me via email whenever that bug changes, whether it be
+	    owner, status or description etc.?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Yes.  Place yourself in the "cc" field of the bug you wish
-	    to monitor. Then change your "Notify me of changes to"
-	    field in the Email Settings tab of the User Preferences
-	    screen in Bugzilla to the "Only those bugs which I am
-	    listed on the CC line" option.
+	    Yes.  Place yourself in the "cc" field of the bug you wish to monitor.
+	    Then change your "Notify me of changes to" field in the Email Settings
+	    tab of the User Preferences screen in Bugzilla to the "Only those
+	    bugs which I am listed on the CC line" option.
 	  </para>
 	</answer>
       </qandaentry>
@@ -895,34 +774,32 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Does Bugzilla allow data to be imported and exported? If I
-	    had outsiders write up a bug report using a MS Word bug
-	    template, could that template be imported into "matching"
-	    fields? If I wanted to take the results of a query and
-	    export that data to MS Excel, could I do that?
+	    Does Bugzilla allow data to be imported and exported? If I had outsiders
+	    write up a bug report using a MS Word bug template, could that template be
+	    imported into "matching" fields? If I wanted to take the results of a query
+	    and export that data to MS Excel, could I do that?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Mozilla allows data export through a custom DTD in XML
-	    format. It does not, however, export to specific formats
-	    other than the XML Mozilla DTD.  Importing the data into
-	    Excel or any other application is left as an exercise for
-	    the reader.
+	    Mozilla allows data export through a custom DTD in XML format.
+	    It does not, however, export to specific formats other than the
+	    XML Mozilla DTD.  Importing the data into Excel or any other application
+	    is left as an exercise for the reader.
 	  </para>
 	  <para>
-	    If you create import filters to other applications from
-	    Mozilla's XML, please submit your modifications for
-	    inclusion in future Bugzilla distributions.
+	    If you create import filters to other applications from Mozilla's XML,
+	    please submit your modifications for inclusion in future Bugzilla
+	    distributions.
 	  </para>
 	  <para>
-	    As for data import, any application can send data to
-	    Bugzilla through the HTTP protocol, or through Mozilla's
-	    XML API.  However, it seems kind of silly to put another
-	    front-end in front of Bugzilla; it makes more sense to
-	    create a simplified bug submission form in HTML.  You can
-	    find an excellent example at <ulink
-						url="http://www.mozilla.org/quality/help/bugzilla-helper.html"> http://www.mozilla.org/quality/help/bugzilla-helper.html</ulink>
+	    As for data import, any application can send data to Bugzilla through
+	    the HTTP protocol, or through Mozilla's XML API.  However, it seems
+	    kind of silly to put another front-end in front of Bugzilla;
+	    it makes more sense to create a simplified bug submission form in
+	    HTML.  You can find an excellent example at
+	    <ulink url="http://www.mozilla.org/quality/help/bugzilla-helper.html">
+	    http://www.mozilla.org/quality/help/bugzilla-helper.html</ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -930,9 +807,9 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Does Bugzilla allow fields to be added, changed or
-	    deleted? If I want to customize the bug submission form to
-	    meet our needs, can I do that using our terminology?
+	    Does Bugzilla allow fields to be added, changed or deleted? If I want to
+	    customize the bug submission form to meet our needs, can I do that using our
+	    terminology?
 	  </para>
 	</question>
 	<answer>
@@ -945,16 +822,16 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Has anyone converted Bugzilla to another language to be
-	    used in other countries? Is it localizable?
+	    Has anyone converted Bugzilla to another language to be used in other
+	    countries? Is it localizable?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Currently, no.  Internationalization support for Perl did
-	    not exist in a robust fashion until the recent release of
-	    version 5.6.0; Bugzilla is, and likely will remain (until
-	    3.X) completely non-localized.
+	    Currently, no.  Internationalization support for Perl did not
+	    exist in a robust fashion until the recent release of version 5.6.0;
+	    Bugzilla is, and likely will remain (until 3.X) completely
+	    non-localized.
 	  </para>
 	</answer>
       </qandaentry>
@@ -962,8 +839,8 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Can a user create and save reports? Can they do this in
-	    Word format? Excel format?
+	    Can a user create and save reports? Can they do this in Word format?
+	    Excel format?
 	  </para>
 	</question>
 	<answer>
@@ -989,15 +866,13 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Can a user modify an existing report and then save it into
-	    another name?
+	    Can a user modify an existing report and then save it into another name?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    You can save an unlimited number of queries in Bugzilla.
-	    You are free to modify them and rename them to your
-	    heart's desire.
+	    You can save an unlimited number of queries in Bugzilla.  You are free
+	    to modify them and rename them to your heart's desire.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1005,15 +880,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Does Bugzilla have the ability to search by word, phrase,
-	    compound search?
+	    Does Bugzilla have the ability to search by word, phrase, compound
+	    search?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    You have no idea.  Bugzilla's query interface,
-	    particularly with the advanced Boolean operators, is
-	    incredibly versatile.
+	    You have no idea.  Bugzilla's query interface, particularly with the
+	    advanced Boolean operators, is incredibly versatile.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1021,8 +895,8 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Can the admin person establish separate group and
-	    individual user privileges?
+	    Can the admin person establish separate group and individual user
+	    privileges?
 	  </para>
 	</question>
 	<answer>
@@ -1035,17 +909,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	     Does Bugzilla provide record locking when there is
-	    simultaneous access to the same bug? Does the second
-	    person get a notice that the bug is in use or how are they
-	    notified?
+	     Does Bugzilla provide record locking when there is simultaneous access
+	    to the same bug? Does the second person get a notice that the bug is in use
+	    or how are they notified?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Bugzilla does not lock records.  It provides mid-air
-	    collision detection, and offers the offending user a
-	    choice of options to deal with the conflict.
+	    Bugzilla does not lock records.  It provides mid-air collision detection,
+	    and offers the offending user a choice of options to deal with the conflict.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1058,10 +930,10 @@
 	</question>
 	<answer>
 	  <para>
-	    MySQL, the database back-end for Bugzilla, allows
-	    hot-backup of data. You can find strategies for dealing
-	    with backup considerations at <ulink
-						 url="http://www.mysql.com/doc/B/a/Backup.html"> http://www.mysql.com/doc/B/a/Backup.html</ulink>
+	    MySQL, the database back-end for Bugzilla, allows hot-backup of data.
+	    You can find strategies for dealing with backup considerations
+	    at <ulink url="http://www.mysql.com/doc/B/a/Backup.html">
+	    http://www.mysql.com/doc/B/a/Backup.html</ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -1074,8 +946,8 @@
 	</question>
 	<answer>
 	  <para>
-	    Yes.  However, commits to the database must wait until the
-	    tables are unlocked.  Bugzilla databases are typically
+	    Yes.  However, commits to the database must wait
+	    until the tables are unlocked.  Bugzilla databases are typically
 	    very small, and backups routinely take less than a minute.
 	  </para>
 	</answer>
@@ -1084,33 +956,29 @@
       <qandaentry>
 	<question>
 	  <para>
-	    What type of human resources are needed to be on staff to
-	    install and maintain Bugzilla? Specifically, what type of
-	    skills does the person need to have? I need to find out if
-	    we were to go with Bugzilla, what types of individuals
-	    would we need to hire and how much would that cost vs
-	    buying an "Out-of-the-Box" solution.
+	    What type of human resources are needed to be on staff to install and
+	    maintain Bugzilla? Specifically, what type of skills does the person need to
+	    have? I need to find out if we were to go with Bugzilla, what types of
+	    individuals would we need to hire and how much would that cost vs buying an
+	    "Out-of-the-Box" solution.
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    If Bugzilla is set up correctly from the start, continuing
-	    maintenance needs are minimal and can be completed by
-	    unskilled labor.  Things like rotate backup tapes and
-	    check log files for the word "error".
+	    If Bugzilla is set up correctly from the start, continuing maintenance needs
+	    are minimal and can be completed by unskilled labor.  Things like rotate
+	    backup tapes and check log files for the word "error".
 	  </para>
 	  <para>
-	    Commercial Bug-tracking software typically costs somewhere
-	    upwards of $20,000 or more for 5-10 floating licenses.
-	    Bugzilla consultation is available from skilled members of
-	    the newsgroup.
+	    Commercial Bug-tracking software typically costs somewhere upwards
+	    of $20,000 or more for 5-10 floating licenses.  Bugzilla consultation
+	    is available from skilled members of the newsgroup.
 	  </para>
 	  <para>
-	    As an example, as of this writing I typically charge $115
-	    for the first hour, and $89 each hour thereafter for
-	    consulting work.  It takes me three to five hours to make
-	    Bugzilla happy on a Development installation of
-	    Linux-Mandrake.
+	    As an example, as of this writing I typically charge
+	     $115 for the first hour, and $89 each hour thereafter
+	    for consulting work.  It takes me three to five hours to make Bugzilla
+	    happy on a Development installation of Linux-Mandrake.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1118,22 +986,20 @@
       <qandaentry>
 	<question>
 	  <para>
-	    What time frame are we looking at if we decide to hire
-	    people to install and maintain the Bugzilla? Is this
-	    something that takes hours or weeks to install and a
-	    couple of hours per week to maintain and customize or is
-	    this a multi-week install process, plus a full time job
-	    for 1 person, 2 people, etc?
+	    What time frame are we looking at if we decide to hire people to install
+	    and maintain the Bugzilla? Is this something that takes hours or weeks to
+	    install and a couple of hours per week to maintain and customize or is this
+	    a multi-week install process, plus a full time job for 1 person, 2 people,
+	    etc?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    It all depends on your level of commitment.  Someone with
-	    much Bugzilla experience can get you up and running in
-	    less than a day, and your Bugzilla install can run
-	    untended for years.  If your Bugzilla strategy is critical
-	    to your business workflow, hire somebody with reasonable
-	    UNIX or Perl skills to handle your process management and
+	    It all depends on your level of commitment.  Someone with much Bugzilla
+	    experience can get you up and running in less than a day, and
+	    your Bugzilla install can run untended for years.  If your
+	    Bugzilla strategy is critical to your business workflow, hire somebody
+	    with reasonable UNIX or Perl skills to handle your process management and
 	    bug-tracking maintenance & customization.
 	  </para>
 	</answer>
@@ -1142,16 +1008,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Is there any licensing fee or other fees for using
-	    Bugzilla? Any out-of-pocket cost other than the bodies
-	    needed as identified above?
+	    Is there any licensing fee or other fees for using Bugzilla? Any
+	    out-of-pocket cost other than the bodies needed as identified above?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    No.  MySQL asks, if you find their product valuable, that
-	    you purchase a support contract from them that suits your
-	    needs.
+	    No.  MySQL asks, if you find their product valuable, that you purchase
+	    a support contract from them that suits your needs.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1167,8 +1031,9 @@
 	</question>
 	<answer>
 	  <para>
-	    Check <ulink
-			 url="http://www.mozilla.org/projects/bugzilla/"> http://www.mozilla.org/projects/bugzilla/</ulink> for details. Once you download it, untar it, read the Bugzilla Guide.
+	    Check <ulink url="http://www.mozilla.org/projects/bugzilla/">
+	    http://www.mozilla.org/projects/bugzilla/</ulink> for details.
+	    Once you download it, untar it, read the Bugzilla Guide.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1181,8 +1046,8 @@
 	</question>
 	<answer>
 	  <para>
-	    Installation on Windows NT has its own section in "The
-	    Bugzilla Guide".
+	    Installation on Windows NT has its own section in
+	    "The Bugzilla Guide".
 	  </para>
 	</answer>
       </qandaentry>
@@ -1208,19 +1073,16 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How do I completely disable MySQL security if it's giving
-	    me problems (I've followed the instructions in the
-	    installation section of this guide!)?
+	    How do I completely disable MySQL security if it's giving me problems
+	    (I've followed the instructions in the installation section of this guide!)?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Run mysql like this: "mysqld --skip-grant-tables".  Please
-	    remember <emphasis>this makes mysql as secure as taping a
-	      $100 to the floor of a football stadium bathroom for
-	      safekeeping.</emphasis>  Please read the Security
-	    section of the Administration chapter of "The Bugzilla
-	    Guide" before proceeding.
+	    Run mysql like this: "mysqld --skip-grant-tables".  Please remember <emphasis>this
+	    makes mysql as secure as taping a $100 to the floor of a football stadium
+	    bathroom for safekeeping.</emphasis>  Please read the Security section of the
+	    Administration chapter of "The Bugzilla Guide" before proceeding.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1233,11 +1095,10 @@
 	</question>
 	<answer>
 	  <para>
-	    The Bugzilla code has not undergone a complete security
-	    audit. It is recommended that you closely examine
-	    permissions on your Bugzilla installation, and follow the
-	    recommended security guidelines found in The Bugzilla
-	    Guide.
+	    The Bugzilla code has not undergone a complete security audit.
+	    It is recommended that you closely examine permissions on your Bugzilla
+	    installation, and follow the recommended security guidelines found
+	    in The Bugzilla Guide.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1246,17 +1107,16 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I've implemented the security fixes mentioned in Chris
-	    Yeh's security advisory of 5/10/2000 advising not to run
-	    MySQL as root, and am running into problems with MySQL no
-	    longer working correctly.
+	    I've implemented the security fixes mentioned in Chris Yeh's security
+	    advisory of 5/10/2000 advising not to run MySQL as root, and am running into
+	    problems with MySQL no longer working correctly.
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    This is a common problem, related to running out of file
-	    descriptors. Simply add "ulimit -n unlimited" to the
-	    script which starts mysqld.
+	    This is a common problem, related to running out of file descriptors.
+	    Simply add "ulimit -n unlimited" to the script which starts
+	    mysqld.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1268,14 +1128,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I have a user who doesn't want to receive any more email
-	    from Bugzilla. How do I stop it entirely for this user?
+	    I have a user who doesn't want to receive any more email from Bugzilla.
+	    How do I stop it entirely for this user?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    With the email changes to 2.12, the user should be able to
-	    set this in user email preferences.
+	    With the email changes to 2.12, the user should be able to set
+	    this in user email preferences.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1283,15 +1143,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I'm evaluating/testing Bugzilla, and don't want it to send
-	    email to anyone but me. How do I do it?
+	    I'm evaluating/testing Bugzilla, and don't want it to send email to
+	    anyone but me. How do I do it?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Edit the param for the mail text. Replace "To:" with
-	    "X-Real-To:", replace "Cc:" with "X-Real-CC:", and add a
-	    "To: (myemailaddress)".
+	    Edit the param for the mail text. Replace "To:" with "X-Real-To:",
+	    replace "Cc:" with "X-Real-CC:", and add a "To: (myemailaddress)".
 	  </para>
 	</answer>
       </qandaentry>
@@ -1299,15 +1158,17 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I want whineatnews.pl to whine at something more, or other
-	    than, only new bugs. How do I do it?
+	    I want whineatnews.pl to whine at something more, or other than, only new
+	    bugs. How do I do it?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Try Klaas Freitag's excellent patch for "whineatassigned"
-	    functionality. You can find it at<ulink url="
-						    http://bugzilla.mozilla.org/show_bug.cgi?id=6679"> http://bugzilla.mozilla.org/show_bug.cgi?id=6679</ulink>. This patch is against an older version of Bugzilla, so you must apply the diffs manually.
+	    Try Klaas Freitag's excellent patch for "whineatassigned" functionality.
+	    You can find it at<ulink url=" http://bugzilla.mozilla.org/show_bug.cgi?id=6679">
+	      http://bugzilla.mozilla.org/show_bug.cgi?id=6679</ulink>. This
+	    patch is against an older version of Bugzilla, so you must apply
+	    the diffs manually.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1315,23 +1176,22 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I don't like/want to use Procmail to hand mail off to
-	    bug_email.pl. What alternatives do I have?
+	    I don't like/want to use Procmail to hand mail off to bug_email.pl.
+	    What alternatives do I have?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    You can call bug_email.pl directly from your aliases file,
-	    with an entry like this:
+	    You can call bug_email.pl directly from your aliases file, with
+	    an entry like this:
 	    <blockquote>
 	      <para>
-		bugzilla-daemon:
-		"|/usr/local/bin/bugzilla/contrib/bug_email.pl"
+		bugzilla-daemon: "|/usr/local/bin/bugzilla/contrib/bug_email.pl"
 	      </para>
-	    </blockquote> However, this is fairly nasty and subject to
-	    problems; you also need to set up your smrsh (sendmail
-	    restricted shell) to allow it.  In a pinch, though, it can
-	    work.
+	    </blockquote>
+	    However, this is fairly nasty and subject to problems; you also
+	    need to set up your smrsh (sendmail restricted shell) to allow
+	    it.  In a pinch, though, it can work.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1339,15 +1199,13 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How do I set up the email interface to submit/change bugs
-	    via email?
+	    How do I set up the email interface to submit/change bugs via email?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    You can find an updated README.mailif file in the contrib/
-	    directory of your Bugzilla distribution that walks you
-	    through the setup.
+	    You can find an updated README.mailif file in the contrib/ directory
+	    of your Bugzilla distribution that walks you through the setup.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1355,29 +1213,28 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Email takes FOREVER to reach me from bugzilla -- it's
-	    extremely slow. What gives?
+	    Email takes FOREVER to reach me from bugzilla -- it's extremely slow.
+	    What gives?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    If you are using an alternate Mail Transport Agent (MTA
-	    other than sendmail), make sure the options given in the
-	    "processmail" script for all instances of "sendmail" are
-	    correct for your MTA. If you are using Sendmail, you may
-	    wish to delete the "-ODeliveryMode=deferred" option in the
-	    "processmail" script for every invocation of "sendmail".
-	    (Be sure and leave the "-t" option, though!)
+	    If you are using an alternate Mail Transport Agent (MTA other than
+	    sendmail), make sure the options given in the "processmail" script for all
+	    instances of "sendmail" are correct for your MTA. If you are using Sendmail,
+	    you may wish to delete the "-ODeliveryMode=deferred" option in the
+	    "processmail" script for every invocation of "sendmail". (Be sure and leave
+	    the "-t" option, though!)
 	  </para>
 	  <para>
 	    A better alternative is to change the "-O" option to
-	    "-ODeliveryMode=background".  This prevents Sendmail from
-	    hanging your Bugzilla Perl processes if the domain to
-	    which it must send mail is unavailable.
+	    "-ODeliveryMode=background".  This prevents Sendmail from hanging your
+	    Bugzilla Perl processes if the domain to which it must send mail
+	    is unavailable.
 	  </para>
 	  <para>
-	    This is now a configurable parameter called "sendmailnow",
-	    available from editparams.cgi.
+	    This is now a configurable parameter called "sendmailnow", available
+	    from editparams.cgi.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1390,16 +1247,15 @@
 	</question>
 	<answer>
 	  <para>
-	    Double-check that you have not turned off email in your
-	    user preferences. Confirm that Bugzilla is able to send
-	    email by visiting the "Log In" link of your Bugzilla
-	    installation and clicking the "Email me a password" button
-	    after entering your email address.
+	    Double-check that you have not turned off email in your user preferences.
+	    Confirm that Bugzilla is able to send email by visiting the "Log In"
+	    link of your Bugzilla installation and clicking the "Email me a password"
+	    button after entering your email address.
 	  </para>
 	  <para>
-	    If you never receive mail from Bugzilla, chances you do
-	    not have sendmail in "/usr/lib/sendmail".  Ensure sendmail
-	    lives in, or is symlinked to, "/usr/lib/sendmail".
+	    If you never receive mail from Bugzilla, chances you do not have
+	    sendmail in "/usr/lib/sendmail".  Ensure sendmail lives in, or is symlinked
+	    to, "/usr/lib/sendmail".
 	  </para>
 	</answer>
       </qandaentry>
@@ -1416,11 +1272,10 @@
 	</question>
 	<answer>
 	  <para>
-	    Red Hat Bugzilla, mentioned above, works with Oracle.  The
-	    current version from Mozilla.org does not have this
-	    capability.  Unfortunately, though you will sacrifice a
-	    lot of the really great features available in Bugzilla
-	    2.10 and 2.12 if you go with the 2.8-based Redhat version.
+	    Red Hat Bugzilla, mentioned above, works with Oracle.  The current version
+	    from Mozilla.org does not have this capability.  Unfortunately, though
+	    you will sacrifice a lot of the really great features available in
+	    Bugzilla 2.10 and 2.12 if you go with the 2.8-based Redhat version.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1428,30 +1283,25 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Bugs are missing from queries, but exist in the database
-	    (and I can pull them up by specifying the bug ID). What's
-	    wrong?
+	    Bugs are missing from queries, but exist in the database (and I can pull
+	    them up by specifying the bug ID). What's wrong?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	     You've almost certainly enabled the "shadow database",
-	    but for some reason it hasn't been updated for all your
-	    bugs. This is the database against which queries are run,
-	    so that really complex or slow queries won't lock up
-	    portions of the database for other users. You can turn off
-	    the shadow database in editparams.cgi. If you wish to
-	    continue using the shadow database, then as your "bugs"
-	    user run "./syncshadowdb -syncall" from the command line
-	    in the bugzilla installation directory to recreate your
-	    shadow database. After it finishes, be sure to check the
-	    params and make sure that "queryagainstshadowdb" is still
-	    turned on. The syncshadowdb program turns it off if it was
-	    on, and is supposed to turn it back on when completed;
-	    that way, if it crashes in the middle of recreating the
-	    database, it will stay off forever until someone turns it
-	    back on by hand. Apparently, it doesn't always do that
-	    yet.
+	     You've almost certainly enabled the "shadow database", but for some
+	    reason it hasn't been updated for all your bugs. This is the database
+	    against which queries are run, so that really complex or slow queries won't
+	    lock up portions of the database for other users. You can turn off the
+	    shadow database in editparams.cgi. If you wish to continue using the shadow
+	    database, then as your "bugs" user run "./syncshadowdb -syncall" from the
+	    command line in the bugzilla installation directory to recreate your shadow
+	    database. After it finishes, be sure to check the params and make sure that
+	    "queryagainstshadowdb" is still turned on. The syncshadowdb program turns it
+	    off if it was on, and is supposed to turn it back on when completed; that
+	    way, if it crashes in the middle of recreating the database, it will stay
+	    off forever until someone turns it back on by hand. Apparently, it doesn't
+	    always do that yet.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1459,20 +1309,18 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I think my database might be corrupted, or contain invalid
-	    entries. What do I do?
+	    I think my database might be corrupted, or contain invalid entries. What
+	    do I do?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Run the "sanity check" utility (./sanitycheck.cgi in the
-	    bugzilla_home directory) to see! If it all comes back,
-	    you're OK.  If it doesn't come back OK (i.e. any red
-	    letters), there are certain things Bugzilla can recover
-	    from and certain things it can't.  If it can't
-	    auto-recover, I hope you're familiar with mysqladmin
-	    commands or have installed another way to manage your
-	    database...
+	    Run the "sanity check" utility (./sanitycheck.cgi in the bugzilla_home
+	    directory) to see! If it all comes back, you're OK.  If it doesn't come back
+	    OK (i.e. any red letters), there are certain things Bugzilla can recover
+	    from and certain things it can't.  If it can't auto-recover, I hope you're
+	    familiar with mysqladmin commands or have installed another way to manage
+	    your database...
 	  </para>
 	</answer>
       </qandaentry>
@@ -1485,14 +1333,12 @@
 	</question>
 	<answer>
 	  <para>
-	     There is no facility in Bugzilla itself to do this. It's
-	    also generally not a smart thing to do if you don't know
-	    exactly what you're doing. However, if you understand SQL
-	    you can use the mysqladmin utility to manually insert,
-	    delete, and modify table information. Personally, I use
-	    "phpMyAdmin". You have to compile a PHP module with MySQL
-	    support to make it work, but it's very clean and easy to
-	    use.
+	     There is no facility in Bugzilla itself to do this. It's also generally
+	    not a smart thing to do if you don't know exactly what you're doing.
+	    However, if you understand SQL you can use the mysqladmin utility to
+	    manually insert, delete, and modify table information. Personally, I
+	    use "phpMyAdmin". You have to compile a PHP module with MySQL
+	    support to make it work, but it's very clean and easy to use.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1500,17 +1346,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I try to add myself as a user, but Bugzilla always tells
-	    me my password is wrong.
+	    I try to add myself as a user, but Bugzilla always tells me my password is wrong.
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Certain version of MySQL (notably, 3.23.29 and 3.23.30)
-	    accidentally disabled the "crypt()" function.  This
-	    prevented MySQL from storing encrypted passwords. Upgrade
-	    to the "3.23 stable" version of MySQL and you should be
-	    good to go.
+	    Certain version of MySQL (notably, 3.23.29 and 3.23.30) accidentally disabled
+	    the "crypt()" function.  This prevented MySQL from storing encrypted passwords.
+	    Upgrade to the "3.23 stable" version of MySQL and you should be good to go.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1518,18 +1361,17 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I think I've set up MySQL permissions correctly, but
-	    bugzilla still can't connect.
+	    I think I've set up MySQL permissions correctly, but bugzilla still can't
+	    connect.
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Try running MySQL from its binary: "mysqld
-	    --skip-grant-tables". This will allow you to completely
-	    rule out grant tables as the cause of your frustration.
-	    However, I do not recommend you run it this way on a
-	    regular basis, unless you really want your web site
-	    defaced and your machine cracked.
+	    Try running MySQL from its binary: "mysqld --skip-grant-tables". This
+	    will allow you to completely rule out grant tables as the cause of your
+	    frustration. However, I do not recommend you run it this way on a regular
+	    basis, unless you really want your web site defaced and your machine
+	    cracked.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1537,28 +1379,26 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How do I synchronize bug information among multiple
-	    different Bugzilla databases?
+	    How do I synchronize bug information among multiple different Bugzilla
+	    databases?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Well, you can synchronize or you can move bugs.
-	    Synchronization will only work one way -- you can create a
-	    read-only copy of the database at one site, and have it
-	    regularly updated at intervals from the main database.
+	    Well, you can synchronize or you can move bugs.  Synchronization will
+	    only work one way -- you can create a read-only copy of the database
+	    at one site, and have it regularly updated at intervals from the main
+	    database.
 	  </para>
 	  <para>
-	    MySQL has some synchronization features builtin to the
-	    latest releases. It would be great if someone looked into
-	    the possibilities there and provided a report to the
-	    newsgroup on how to effectively synchronize two Bugzilla
-	    installations.
+	    MySQL has some synchronization features builtin to the latest releases.
+	    It would be great if someone looked into the possibilities there
+	    and provided a report to the newsgroup on how to effectively
+	    synchronize two Bugzilla installations.
 	  </para>
 	  <para>
-	    If you simply need to transfer bugs from one Bugzilla to
-	    another, checkout the "move.pl" script in the Bugzilla
-	    distribution.
+	    If you simply need to transfer bugs from one Bugzilla to another,
+	    checkout the "move.pl" script in the Bugzilla distribution.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1566,16 +1406,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Why do I get bizarre errors when trying to submit data,
-	    particularly problems with "groupset"?
+	    Why do I get bizarre errors when trying to submit data, particularly problems
+	    with "groupset"?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    If you're sure your MySQL parameters are correct, you
-	    might want turn "strictvaluechecks" OFF in editparams.cgi.
-	    If you have "usebugsentry" set "On", you also cannot
-	    submit a bug as readable by more than one group with
+	    If you're sure your MySQL parameters are correct, you might want turn
+	    "strictvaluechecks" OFF in editparams.cgi.  If you have "usebugsentry" set
+	    "On", you also cannot submit a bug as readable by more than one group with
 	    "strictvaluechecks" ON.
 	  </para>
 	</answer>
@@ -1584,17 +1423,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How come even after I delete bugs, the long descriptions
-	    show up?
+	    How come even after I delete bugs, the long descriptions show up?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Delete everything from $BUZILLA_HOME/shadow.  Bugzilla
-	    creates shadow files there, with each filename
-	    corresponding to a bug number.  Also be sure to run
-	    syncshadowdb to make sure, if you are using a shadow
-	    database, that the shadow database is current.
+	    Delete everything from $BUZILLA_HOME/shadow.  Bugzilla creates shadow
+	    files there, with each filename corresponding to a
+	    bug number.  Also be sure to run syncshadowdb to make sure, if you are using
+	    a shadow database, that the shadow database is current.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1607,14 +1444,13 @@
       <qandaentry>
 	<question>
 	  <para>
-	    What is the easiest way to run Bugzilla on Win32
-	    (Win98+/NT/2K)?
+	    What is the easiest way to run Bugzilla on Win32 (Win98+/NT/2K)?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Remove Windows. Install Linux. Install Bugzilla. The boss
-	    will never know the difference.
+	    Remove Windows. Install Linux. Install Bugzilla.
+	    The boss will never know the difference.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1627,10 +1463,9 @@
 	</question>
 	<answer>
 	  <para>
-	    Not currently.  Bundle::Bugzilla enormously simplifies
-	    Bugzilla installation on UNIX systems.  If someone can
-	    volunteer to create a suitable PPM bundle for Win32, it
-	    would be appreciated.
+	    Not currently.  Bundle::Bugzilla enormously simplifies Bugzilla
+	    installation on UNIX systems.  If someone can volunteer to
+	    create a suitable PPM bundle for Win32, it would be appreciated.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1638,34 +1473,29 @@
       <qandaentry>
 	<question>
 	  <para>
-	    CGI's are failing with a "something.cgi is not a valid
-	    Windows NT application" error. Why?
+	    CGI's are failing with a "something.cgi is not a valid Windows NT
+	    application" error. Why?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Depending on what Web server you are using, you will have
-	    to configure the Web server to treat *.cgi files as CGI
-	    scripts. In IIS, you do this by adding *.cgi to the App
-	    Mappings with the &lt;path&gt;\perl.exe %s %s as the
+	    Depending on what Web server you are using, you will have to configure
+	    the Web server to treat *.cgi files as CGI scripts. In IIS, you do this by
+	    adding *.cgi to the App Mappings with the &lt;path&gt;\perl.exe %s %s as the
 	    executable.
 	  </para>
 	  <para>
 	    Microsoft has some advice on this matter, as well:
 	    <blockquote>
 	      <para>
-		"Set application mappings. In the ISM, map the
-		extension for the script file(s) to the executable for
-		the script interpreter. For example, you might map the
-		extension .py to Python.exe, the executable for the
-		Python script interpreter. Note For the ActiveState
-		Perl script interpreter, the extension .pl is
-		associated with PerlIS.dll by default. If you want to
-		change the association of .pl to perl.exe, you need to
-		change the application mapping. In the mapping, you
-		must add two percent (%) characters to the end of the
-		pathname for perl.exe, as shown in this example:
-		c:\perl\bin\perl.exe %s %s"
+		"Set application mappings. In the ISM, map the extension for the script
+		file(s) to the executable for the script interpreter. For example, you might
+		map the extension .py to Python.exe, the executable for the Python script
+		interpreter. Note For the ActiveState Perl script interpreter, the extension
+		.pl is associated with PerlIS.dll by default. If you want to change the
+		association of .pl to perl.exe, you need to change the application mapping.
+		In the mapping, you must add two percent (%) characters to the end of the
+		pathname for perl.exe, as shown in this example: c:\perl\bin\perl.exe %s %s"
 	      </para>
 	    </blockquote>
 	  </para>
@@ -1675,69 +1505,108 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Can I have some general instructions on how to make
-	    Bugzilla on Win32 work?
-	  </para>
-	</question>
+	    Can I have some general instructions on how to make Bugzilla on Win32 work?
+	  </para>
+	</question>
 	<answer>
 	  <para>
-	    The following couple entries are deprecated in favor of
-	    the Windows installation instructions available in the
-	    "Administration" portion of "The Bugzilla Guide". However,
-	    they are provided here for historical interest and
-	    insight. <literallayout> 1. #!C:/perl/bin/perl had to be
-	      added to every perl file. 2. Converted to Net::SMTP to
-	      handle mail messages instead of /usr/bin/sendmail. 3.
-	      The crypt function isn't available on Windows NT (at
-	      least none that I am aware), so I made encrypted
-	      passwords = plaintext passwords. 4. The system call to
-	      diff had to be changed to the Cygwin diff. 5. This was
-	      just to get a demo running under NT, it seems to be
-	      working good, and I have inserted almost 100 bugs from
-	      another bug tracking system. Since this work was done
-	      just to get an in-house demo, I am NOT planning on
-	      making a patch for submission to Bugzilla. If you would
-	      like a zip file, let me know. Q: Hmm, couldn't figure it
-	      out from the general instructions above.  How about
-	      step-by-step? A: Sure! Here ya go! 1. Install IIS 4.0
-	      from the NT Option Pack #4. 2. Download and install
-	      Active Perl. 3. Install the Windows GNU tools from
-	      Cygwin. Make sure to add the bin directory to your
-	      system path. (Everyone should have these, whether they
-	      decide to use Bugzilla or not. :-) ) 4. Download
-	      relevant packages from ActiveState at
-	      http://www.activestate.com/packages/zips/. +
-	      DBD-Mysql.zip 5. Extract each zip file with WinZip, and
-	      install each ppd file using the notation: ppm install
-	      &lt;module&gt;.ppd 6. Install Mysql.  *Note: If you move
-	      the default install from c:\mysql, you must add the
-	      appropriate startup parameters to the NT service. (ex.
-	      -b e:\\programs\\mysql) 7. Download any Mysql client.
-	      http://www.mysql.com/download_win.html 8. Setup MySql.
-	      (These are the commands that I used.) I. Cleanup default
-	      database settings. C:\mysql\bin\mysql -u root mysql
-	      mysql> DELETE FROM user WHERE Host='localhost' AND
-	      User=''; mysql> quit C:\mysql\bin\mysqladmin reload II.
-	      Set password for root. C:\mysql\bin\mysql -u root mysql
-	      mysql> UPDATE user SET Password=PASSWORD('new_password')
-	      WHERE user='root'; mysql> FLUSH PRIVILEGES; mysql> quit
-	      C:\mysql\bin\mysqladmin -u root reload III. Create bugs
-	      user. C:\mysql\bin\mysql -u root -p mysql> insert into
-	      user (host,user,password) values('localhost','bugs','');
-	      mysql> quit C:\mysql\bin\mysqladmin -u root reload IV.
-	      Create the bugs database. C:\mysql\bin\mysql -u root -p
-	      mysql> create database bugs; V. Give the bugs user
-	      access to the bugs database. mysql> insert into db
-	      (host,db,user,select_priv,insert_priv,update_priv,delete_priv,create_priv,drop_priv) values('localhost','bugs','bugs','Y','Y','Y','Y','Y','N') mysql> quit C:\mysql\bin\mysqladmin -u root reload 9. Run the table scripts to setup the bugs database. 10. Change CGI.pm to use the following regular expression because of differing backslashes in NT versus UNIX. o $0 =~ m:[^\\]*$:; 11. Had to make the crypt password = plain text password in the database. (Thanks to Andrew Lahser" &lt;andrew_lahser@merck.com&gt;" on this one.) The files that I changed were: o globals.pl o CGI.pl o alternately, you can try commenting all references to 'crypt' string and replace them with similar lines but without encrypt() or crypr() functions insida all files. 12. Replaced sendmail with Windmail. Basically, you have to come up with a sendmail substitute for NT. Someone said that they used a Perl module (Net::SMTP), but I was trying to save time and do as little Perl coding as possible. 13. Added "perl" to the beginning of all Perl system calls that use a perl script as an argument and renamed processmail to processmail.pl. 14. In processmail.pl, I added binmode(HANDLE) before all read() calls. I'm not sure about this one, but the read() under NT wasn't counting the EOLs without the binary read." </literallayout>
+	    The following couple entries are deprecated in favor of the Windows installation
+	    instructions available in the "Administration" portion of "The Bugzilla Guide".
+	    However, they are provided here for historical interest and insight.
+	    <literallayout>
+  1. #!C:/perl/bin/perl had to be added to every perl file.
+  2. Converted to Net::SMTP to handle mail messages instead of
+     /usr/bin/sendmail.
+  3. The crypt function isn't available on Windows NT (at least none that I
+     am aware), so I made encrypted passwords = plaintext passwords.
+  4. The system call to diff had to be changed to the Cygwin diff.
+  5. This was just to get a demo running under NT, it seems to be working
+     good, and I have inserted almost 100 bugs from another bug tracking
+     system. Since this work was done just to get an in-house demo, I am NOT
+     planning on making a patch for submission to Bugzilla. If you would
+     like a zip file, let me know.
+
+Q: Hmm, couldn't figure it out from the general instructions above.  How
+about step-by-step?
+A: Sure! Here ya go!
+
+  1. Install IIS 4.0 from the NT Option Pack #4.
+  2. Download and install Active Perl.
+  3. Install the Windows GNU tools from Cygwin. Make sure to add the bin
+     directory to your system path. (Everyone should have these, whether
+     they decide to use Bugzilla or not. :-) )
+  4. Download relevant packages from ActiveState at
+     http://www.activestate.com/packages/zips/. + DBD-Mysql.zip
+  5. Extract each zip file with WinZip, and install each ppd file using the
+     notation: ppm install &lt;module&gt;.ppd
+  6. Install Mysql.  *Note: If you move the default install from c:\mysql,
+     you must add the appropriate startup parameters to the NT service. (ex.
+     -b e:\\programs\\mysql)
+  7. Download any Mysql client. http://www.mysql.com/download_win.html
+  8. Setup MySql. (These are the commands that I used.)
+
+          I. Cleanup default database settings.
+           C:\mysql\bin\mysql -u root mysql
+           mysql> DELETE FROM user WHERE Host='localhost' AND User='';
+           mysql> quit
+          C:\mysql\bin\mysqladmin reload
+
+          II. Set password for root.
+           C:\mysql\bin\mysql -u root mysql
+           mysql> UPDATE user SET Password=PASSWORD('new_password')
+           WHERE user='root';
+           mysql> FLUSH PRIVILEGES;
+           mysql> quit
+           C:\mysql\bin\mysqladmin -u root reload
+
+          III. Create bugs user.
+           C:\mysql\bin\mysql -u root -p
+           mysql> insert into user (host,user,password)
+          values('localhost','bugs','');
+           mysql> quit
+           C:\mysql\bin\mysqladmin -u root reload
+
+          IV. Create the bugs database.
+           C:\mysql\bin\mysql -u root -p
+           mysql> create database bugs;
+
+          V. Give the bugs user access to the bugs database.
+           mysql> insert into db
+          (host,db,user,select_priv,insert_priv,update_priv,delete_priv,create_priv,drop_priv)
+          values('localhost','bugs','bugs','Y','Y','Y','Y','Y','N')
+           mysql> quit
+           C:\mysql\bin\mysqladmin -u root reload
+  9. Run the table scripts to setup the bugs database.
+ 10. Change CGI.pm to use the following regular expression because of
+     differing backslashes in NT versus UNIX.
+        o $0 =~ m:[^\\]*$:;
+ 11. Had to make the crypt password = plain text password in the database.
+     (Thanks to Andrew Lahser" &lt;andrew_lahser@merck.com&gt;" on this one.) The
+     files that I changed were:
+        o globals.pl
+        o CGI.pl
+        o alternately, you can try commenting all references to 'crypt'
+          string and replace them with similar lines but without encrypt()
+          or crypr() functions insida all files.
+ 12. Replaced sendmail with Windmail. Basically, you have to come up with a
+     sendmail substitute for NT. Someone said that they used a Perl module
+     (Net::SMTP), but I was trying to save time and do as little Perl coding
+     as possible.
+ 13. Added "perl" to the beginning of all Perl system calls that use a perl
+     script as an argument and renamed processmail to processmail.pl.
+ 14. In processmail.pl, I added binmode(HANDLE) before all read() calls. I'm
+     not sure about this one, but the read() under NT wasn't counting the
+     EOLs without the binary read."
+	    </literallayout>
 	  </para>
 	</answer>
       </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    I'm having trouble with the perl modules for NT not being
-	    able to talk to to the database.
+
+      <qandaentry>
+	<question>
+	  <para>
+	    I'm having trouble with the perl modules for NT not being able to talk to
+	    to the database.
 	  </para>
 	</question>
 	<answer>
@@ -1766,14 +1635,14 @@
 	      </listitem>
 	      <listitem>
 		<para>
-		  <prompt>PPM></prompt> <command>install DBI DBD-mysql
-		    GD</command>
+		  <prompt>PPM></prompt> <command>install DBI DBD-mysql GD</command>
 		</para>
 	      </listitem>
-	    </orderedlist> I reckon TimeDate and Data::Dumper come
-	    with the activeperl. You can check the ActiveState site
-	    for packages for installation through PPM. <ulink url="
-							      http://www.activestate.com/Packages/"> http://www.activestate.com/Packages/</ulink>
+	    </orderedlist>
+	    I reckon TimeDate and Data::Dumper come with the activeperl. You can check
+	    the ActiveState site for packages for installation through PPM.
+	    <ulink url=" http://www.activestate.com/Packages/">
+	      http://www.activestate.com/Packages/</ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -1786,15 +1655,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	    The query page is very confusing.  Isn't there a simpler
-	    way to query?
+	    The query page is very confusing.  Isn't there a simpler way to query?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    We are developing in that direction.  You can follow
-	    progress on this at <ulink
-				       url="http://bugzilla.mozilla.org/show_bug.cgi?id=16775"> http://bugzilla.mozilla.org/show_bug.cgi?id=16775</ulink>.  Some functionality is available in Bugzilla 2.12, and is available as "quicksearch.html"
+	    We are developing in that direction.  You can follow progress on this
+	    at <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=16775">
+	      http://bugzilla.mozilla.org/show_bug.cgi?id=16775</ulink>.  Some functionality
+	    is available in Bugzilla 2.12, and is available as "quicksearch.html"
 	  </para>
 	</answer>
       </qandaentry>
@@ -1802,24 +1671,23 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I'm confused by the behavior of the "accept" button in the
-	    Show Bug form. Why doesn't it assign the bug to me when I
-	    accept it?
+	    I'm confused by the behavior of the "accept" button in the Show Bug form.
+	    Why doesn't it assign the bug to me when I accept it?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    The current behavior is acceptable to bugzilla.mozilla.org
-	    and most users.  I personally don't like it.  You have
-	    your choice of patches to change this behavior, however.
+	    The current behavior is acceptable to bugzilla.mozilla.org and most
+	    users.  I personally don't like it.  You have your choice of patches
+	    to change this behavior, however.
 	    <simplelist>
-	      <member><ulink
-			     url="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=8029"> Add a "and accept bug" radio button</ulink></member>
-	      <member><ulink
-			     url="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=8153"> "Accept" button automatically assigns to you</ulink></member>
-	    </simplelist> Note that these patches are somewhat dated.
-	    You will need to do the find and replace manually to apply
-	    them.  They are very small, though.  It is easy.
+	      <member><ulink url="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=8029">
+		Add a "and accept bug" radio button</ulink></member>
+	      <member><ulink url="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=8153">
+		"Accept" button automatically assigns to you</ulink></member>
+	    </simplelist>
+	    Note that these patches are somewhat dated.  You will need to do the find
+	    and replace manually to apply them.  They are very small, though.  It is easy.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1827,16 +1695,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	    I can't upload anything into the database via the "Create
-	    Attachment" link.  What am I doing wrong?
+	    I can't upload anything into the database via the "Create Attachment"
+	    link.  What am I doing wrong?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    The most likely cause is a very old browser or a browser
-	    that is incompatible with file upload via POST.  Download
-	    the latest Netscape, Microsoft, or Mozilla browser to
-	    handle uploads correctly.
+	    The most likely cause is a very old browser or a browser that is
+	    incompatible with file upload via POST.  Download the latest Netscape,
+	    Microsoft, or Mozilla browser to handle uploads correctly.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1844,16 +1711,15 @@
       <qandaentry>
 	<question>
 	  <para>
-	    Email submissions to Bugzilla that have attachments end up
-	    asking me to save it as a "cgi" file.
+	    Email submissions to Bugzilla that have attachments end up asking me to
+	    save it as a "cgi" file.
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    Yup.  Just rename it once you download it, or save it
-	    under a different filename.  This will not be fixed
-	    anytime too soon, because it would cripple some other
-	    functionality.
+	    Yup.  Just rename it once you download it, or save it under a different
+	    filename.  This will not be fixed anytime too soon, because it would
+	    cripple some other functionality.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1861,16 +1727,14 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How do I change a keyword in Bugzilla, once some bugs are
-	    using it?
+	    How do I change a keyword in Bugzilla, once some bugs are using it?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    In the Bugzilla administrator UI, edit the keyword and it
-	    will let you replace the old keyword name with a new one.
-	    This will cause a problem with the keyword cache.  Run
-	    sanitycheck.cgi to fix it.
+	    In the Bugzilla administrator UI, edit the keyword and it will let you
+	    replace the old keyword name with a new one.  This will cause a problem
+	    with the keyword cache.  Run sanitycheck.cgi to fix it.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1888,12 +1752,19 @@
 	</question>
 	<answer>
 	  <para>
-	    Try <ulink
-		       url="http://bugzilla.mozilla.org/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;product=Webtools&amp;component=Bugzilla"> this link</ulink> to view current bugs or requests for enhancement for Bugzilla.
+	    Try <ulink url="http://bugzilla.mozilla.org/buglist.cgi?bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;product=Webtools&amp;component=Bugzilla">
+	    this link</ulink> to view current bugs or requests for
+	    enhancement for Bugzilla.
 	  </para>
 	  <para>
-	    You can view bugs marked for 2.14 release <ulink
-							     url="http://bugzilla.mozilla.org/buglist.cgi?product=Webtools&amp;component=Bugzilla&amp;target_milestone=Bugzilla+2.14">here</ulink>. This list includes bugs for the 2.14 release that have already been fixed and checked into CVS.  Please consult the <ulink url="http://www.mozilla.org/projects/bugzilla/"> Bugzilla Project Page</ulink> for details on how to check current sources out of CVS so you can have these bug fixes early!
+	    You can view bugs marked for 2.14 release
+	    <ulink url="http://bugzilla.mozilla.org/buglist.cgi?product=Webtools&amp;component=Bugzilla&amp;target_milestone=Bugzilla+2.14">here</ulink>.
+	    This list includes bugs for the 2.14 release that have already
+	    been fixed and checked into CVS.  Please consult the
+	    <ulink url="http://www.mozilla.org/projects/bugzilla/">
+	      Bugzilla Project Page</ulink> for details on how to
+	    check current sources out of CVS so you can have these
+	    bug fixes early!
 	  </para>
 	</answer>
       </qandaentry>
@@ -1901,15 +1772,19 @@
       <qandaentry>
 	<question>
 	  <para>
-	    How can I change the default priority to a null value?
-	    For instance, have the default priority be "---" instead
-	    of "P2"?
+	    How can I change the default priority to a null value?  For instance, have the default
+	    priority be "---" instead of "P2"?
 	  </para>
 	</question>
 	<answer>
 	  <para>
-	    This is well-documented here: <ulink
-						 url="http://bugzilla.mozilla.org/show_bug.cgi?id=49862"> http://bugzilla.mozilla.org/show_bug.cgi?id=49862</ulink>.  Ultimately, it's as easy as adding the "---" priority field to your localconfig file in the appropriate area, re-running checksetup.pl, and then changing the default priority in your browser using "editparams.cgi".  Hmm, now that I think about it, that is kind of a klunky way to handle it, but for now it's what we have!  Although the bug has been closed "resolved wontfix", there may be a better way to handle this...
+	    This is well-documented here: <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=49862">
+	    http://bugzilla.mozilla.org/show_bug.cgi?id=49862</ulink>.  Ultimately, it's as easy
+	    as adding the "---" priority field to your localconfig file in the appropriate area,
+	    re-running checksetup.pl, and then changing the default priority in your browser using
+	    "editparams.cgi".  Hmm, now that I think about it, that is kind of a klunky way to handle
+	    it, but for now it's what we have!  Although the bug has been closed "resolved wontfix",
+	    there may be a better way to handle this...
 	  </para>
 	</answer>
       </qandaentry>
@@ -1917,8 +1792,7 @@
       <qandaentry>
 	<question>
 	  <para>
-	    What's the best way to submit patches?  What guidelines
-	    should I follow?
+	    What's the best way to submit patches?  What guidelines should I follow?
 	  </para>
 	</question>
 	<answer>
@@ -1926,47 +1800,42 @@
 	    <orderedlist>
 	      <listitem>
 		<para>
-		  Enter a bug into bugzilla.mozilla.org for the
-		  "Webtools" product, "Bugzilla" component.
+		  Enter a bug into bugzilla.mozilla.org for the "Webtools" product,
+		  "Bugzilla" component.
 		</para>
 	      </listitem>
 	      <listitem>
 		<para>
-		  Upload your patch as a unified DIFF (having used
-		  "diff -u" against the <emphasis>current
-		    sources</emphasis> checked out of CVS), or new
-		  source file by clicking "Create a new attachment"
-		  link on the bug page you've just created, and
-		  include any descriptions of database changes you may
-		  make, into the bug ID you submitted in step #1.  Be
-		  sure and click the "Patch" radio button to indicate
-		  the text you are sending is a patch!
+		  Upload your patch as a unified DIFF (having used "diff -u" against
+		  the <emphasis>current sources</emphasis> checked out of CVS),
+		  or new source file by clicking
+		  "Create a new attachment" link on the bug page you've just created, and
+		  include any descriptions of database changes you may make, into the bug
+		  ID you submitted in step #1.  Be sure and click the "Patch" radio
+		  button to indicate the text you are sending is a patch!
 		</para>
 	      </listitem>
 	      <listitem>
 		<para>
 		  Announce your patch and the associated URL
-		  (http://bugzilla.mozilla.org/show_bug.cgi?id=XXXX)
-		  for discussion in the newsgroup
-		  (netscape.public.mozilla.webtools).  You'll get a
-		  really good, fairly immediate reaction to the
-		  implications of your patch, which will also give us
-		  an idea how well-received the change would be.
+		  (http://bugzilla.mozilla.org/show_bug.cgi?id=XXXX) for discussion in
+		  the newsgroup (netscape.public.mozilla.webtools).  You'll get a really
+		  good, fairly immediate reaction to the implications of your patch,
+		  which will also give us an idea how well-received the change would
+		  be.
 		</para>
 	      </listitem>
 	      <listitem>
 		<para>
-		  If it passes muster with minimal modification, the
-		  person to whom the bug is assigned in Bugzilla is
-		  responsible for seeing the patch is checked into
-		  CVS.
+		  If it passes muster with minimal modification, the person to whom
+		  the bug is assigned in Bugzilla is responsible for seeing the patch
+		  is checked into CVS.
 		</para>
 	      </listitem>
 	      <listitem>
 		<para>
-		  Bask in the glory of the fact that you helped write
-		  the most successful open-source bug-tracking
-		  software on the planet :)
+		  Bask in the glory of the fact that you helped write the most successful
+		  open-source bug-tracking software on the planet :)
 		</para>
 	      </listitem>
 	    </orderedlist>
diff --git a/docs/sgml/future.sgml b/docs/sgml/future.sgml
index 2e048dc5e..1f4681a31 100644
--- a/docs/sgml/future.sgml
+++ b/docs/sgml/future.sgml
@@ -3,11 +3,13 @@
 <chapter id="future">
   <title>The Future of Bugzilla</title>
   <synopsis>Bugzilla's Future.  Much of this is the present, now.</synopsis>
-  <para>The future of Bugzilla is Bugzilla 3.0.  Unfortunately, I do
+  <para>
+    The future of Bugzilla is Bugzilla 3.0.  Unfortunately, I do
     not have more information about it right now, and most of what
     went into the "future" section is now present.  That stuff was
     blue-sky a year ago; MattyT should have me a new document
-    sometime...</para>
+    sometime...
+  </para>
 </chapter>
 
 <!-- Keep this comment at the end of the file
diff --git a/docs/sgml/glossary.sgml b/docs/sgml/glossary.sgml
index 71ba2dd36..faa4d1781 100644
--- a/docs/sgml/glossary.sgml
+++ b/docs/sgml/glossary.sgml
@@ -26,9 +26,16 @@
     <glossdiv id="gloss_a">
       <title>A</title>
       <glossentry>
-	<glossterm>There are no entries for A</glossterm>
+	<glossterm>Apache</glossterm>
 	<glossdef>
-	  <para></para>
+	  <para>In this context, Apache is the web server most
+	    commonly used for serving up
+	    <glossterm>Bugzilla</glossterm> pages.  Contrary to
+	    popular belief, the apache web server has nothing to do
+	    with the ancient and noble Native American tribe, but
+	    instead derived its name from the fact that it was
+	    <quote>a patchy</quote> version of the original
+	    <acronym>NCSA</acronym> world-wide-web server.</para>
 	</glossdef>
       </glossentry>
     </glossdiv>
@@ -70,8 +77,77 @@
 	    the needs of the organization using it, though.</para>
 	</glossdef>
       </glossentry>
+
+      <glossentry>
+	<glossterm>Bugzilla</glossterm>
+	<glossdef>
+	  <para>
+	    Bugzilla is the industry-standard bug tracking system.  It
+	    is quite popular among Open Source enthusiasts.
+	  </para>
+	</glossdef>
+      </glossentry>
+    </glossdiv>
+
+    <glossdiv id="gloss_c">
+      <title></title>
+      <glossentry id="gloss_component">
+	<glossterm>Component</glossterm>
+	<glossdef>
+	  <para>
+	    A Component is a subsection of a Product.  It should be a
+	    narrow category, tailored to your organization.  All
+	    Products must contain at least one Component (and, as a
+	    matter of fact, creating a Product with no Components will
+	    create an error in Bugzilla).
+	  </para>
+	</glossdef>
+      </glossentry>
+      <glossentry id="gloss_cpan">
+	<glossterm><acronym>CPAN</acronym></glossterm>
+	<glossdef>
+	  <para><acronym>CPAN</acronym> stands for the
+	    <quote>Comprehensive Perl Archive Network</quote>.  CPAN
+	    maintains a large number of extremely useful
+	    <glossterm>Perl</glossterm> modules.  By themselves, Perl
+	    modules generally do nothing, but when used as part of a
+	    larger program, they provide much-needed algorithms and
+	    functionality.</para>
+	</glossdef>
+      </glossentry>
     </glossdiv>
     
+    <glossdiv id="gloss_d">
+      <title>D</title>
+      <glossentry>
+	<glossterm>daemon</glossterm>
+	<glossdef>
+	  <para>A daemon is a computer program which runs in the
+	    background.  In general, most daemons are started at boot
+	    time via System V init scripts, or through RC scripts on
+	    BSD-based systems.  <glossterm>mysqld</glossterm>, the
+	    MySQL server, and <glossterm>apache</glossterm>, a web
+	    server, are generally run as daemons.</para>
+	</glossdef>
+      </glossentry>
+    </glossdiv>
+
+    <glossdiv id="gloss_g">
+      <title></title>
+      <glossentry>
+	<glossterm>Groups</glossterm>
+	<glossdef>
+	  <para>The word <quote>Groups</quote> has a very special
+	    meaning to Bugzilla.  Bugzilla's main security mechanism
+	    comes by lumping users into groups, and assigning those
+	    groups certain privileges to
+	    <glossterm>Products</glossterm> and
+	    <glossterm>Components</glossterm> in the
+	    <glossterm>Bugzilla</glossterm> database.</para>
+	</glossdef>
+      </glossentry>
+    </glossdiv>
+
     <glossdiv id="gloss_i">
       <title>I</title>
       <glossentry id="gloss_infiniteloop">
@@ -81,7 +157,22 @@
 	</glossdef>
       </glossentry>
     </glossdiv>
-    
+
+    <glossdiv id="gloss_m">
+      <title>M</title>
+      <glossentry>
+	<glossterm>mysqld</glossterm>
+	<glossdef>
+	  <para>mysqld is the name of the
+	    <glossterm>daemon</glossterm> for the MySQL database.  In
+	    general, it is invoked automatically through the use of
+	    the System V init scripts on GNU/Linux and AT&amp;T System
+	    V-based systems, such as Solaris and HP/UX, or through the
+	    RC scripts on BSD-based systems.</para>
+	</glossdef>
+      </glossentry>
+    </glossdiv>
+
     <glossdiv id="gloss_p">
       <title>P</title>
       <glossentry>
@@ -108,6 +199,17 @@
 	  </example>
 	</glossdef>
       </glossentry>
+      <glossentry>
+	<glossterm>Perl</glossterm>
+	<glossdef>
+	  <para>First written by Larry Wall, Perl is a remarkable
+	    program language.  It has the benefits of the flexibility
+	    of an interpreted scripting language (such as shell
+	    script), combined with the speed and power of a compiled
+	    language, such as C.  <glossterm>Bugzilla</glossterm> is
+	    maintained in Perl.</para>
+	</glossdef>
+      </glossentry>
     </glossdiv>
     
     <glossdiv id="gloss_q">
@@ -129,8 +231,8 @@
     
     <glossdiv id="gloss_r">
       <title>R</title>
-      <glossentry>
-	<glossterm id="gloss_recursion">Recursion</glossterm>
+      <glossentry id="gloss_recursion" xreflabel="Recursion">
+	<glossterm>Recursion</glossterm>
 	<glossdef>
 	  <para>The property of a function looking back at itself for
 	    something.  <quote>GNU</quote>, for instance, stands for
@@ -140,10 +242,52 @@
 	</glossdef>
       </glossentry>
     </glossdiv>
+
+    <glossdiv id="gloss_s">
+      <title>S</title>
+      <glossentry>
+	<glossterm><acronym>SGML</acronym></glossterm>
+	<glossdef>
+	  <para><acronym>SGML</acronym> stands for <quote>Standard
+	      Generalized Markup Language</quote>.  Created in the
+	    1980's to provide an extensible means to maintain
+	    documentation based upon content instead of presentation,
+	    <acronym>SGML</acronym> has withstood the test of time as
+	    a robust, powerful language.
+	    <glossterm><acronym>XML</acronym></glossterm> is the
+	    <quote>baby brother</quote> of SGML; any valid
+	    <acronym>XML</acronym> document it, by definition, a valid
+	    <acronym>SGML</acronym> document.  The document you are
+	    reading is written and maintained in
+	    <acronym>SGML</acronym>, and is also valid
+	    <acronym>XML</acronym> if you modify the Document Type
+	    Definition.</para>
+	</glossdef>
+      </glossentry>
+    </glossdiv>
+
+    <glossdiv id="gloss_t">
+      <title>T</title>
+      <glossentry id="gloss_target_milestone" xreflabel="Target Milestone">
+	<glossterm>Target Milestone</glossterm>
+	<glossdef>
+	  <para>
+	    Target Milestones are Product goals.  They are
+	    configurable on a per-Product basis.  Most software
+	    development houses have a concept of
+	    <quote>milestones</quote> where the people funding a
+	    project expect certain functionality on certain dates.
+	    Bugzilla facilitates meeting these milestones by giving
+	    you the ability to declare by which milestone a bug will be
+	    fixed, or an enhancement will be implemented.
+	  </para>
+	</glossdef>
+      </glossentry>
+    </glossdiv>
     
     <glossdiv id="gloss_z">
       <title>Z</title>
-      <glossentry>
+      <glossentry id="zarro-boogs-found" xreflabel="Zarro Boogs Found">
 	<glossterm>Zarro Boogs Found</glossterm>
 	<glossdef>
 	  <para>This is the cryptic response sent by Bugzilla when a
diff --git a/docs/sgml/installation.sgml b/docs/sgml/installation.sgml
index dfbc35071..547d466ba 100644
--- a/docs/sgml/installation.sgml
+++ b/docs/sgml/installation.sgml
@@ -1,6 +1,6 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 
-  <chapter id="installation">
+  <chapter id="installation" xreflabel="Bugzilla Installation">
     <title>Installation</title>
     <para>
       These installation instructions are presented assuming you are
@@ -50,6 +50,7 @@
 	refer to these documents when  installing, configuring, and
 	maintaining your Bugzilla installation.
       </member>
+
     </simplelist>
     
     <warning>
@@ -108,8 +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:
@@ -185,39 +185,64 @@
 	    attack.
 	  </para>
 	</warning>
+	<note>
+	  <para>Linux-Mandrake 8.0, the author's test system, includes
+	    every required and optional library for Bugzilla.  The
+	    easiest way to install them is by using the
+	    <filename>urpmi</filename> utility.  If you follow these
+	    commands, you should have everything you need for
+	    Bugzilla, and <filename>checksetup.pl</filename> should
+	    not complain about any missing libraries.  You may already
+	    have some of these installed.</para>
+	  <simplelist>
+	    <member><prompt>bash#</prompt><command> urpmi
+		perl-mysql</command></member>
+	    <member><prompt>bash#</prompt><command> urpmi
+		perl-chart</command></member>
+	    <member><prompt>bash#</prompt><command> urpmi
+		perl-gd</command></member>
+	    <member><prompt>bash#</prompt><command> urpmi
+		perl-MailTools</command> (for Bugzilla email
+	      integration)</member>
+	    <member><prompt>bash#</prompt><command> urpmi
+		apache-modules</command></member>
+	  </simplelist>
+	</note>
 	
       </para>
     </section>
     <section id="install-mysql">
       <title>Installing MySQL Database</title>
       <para>
-	Visit MySQL homepage at http://www.mysql.com/ and grab the
-	latest stable release of the server.  Both binaries and source
-	are available and which you get shouldn't matter.  Be aware
-	that many of the binary versions of MySQL store their data
-	files in /var which on many installations (particularly common
-	with linux installations) is part of a smaller root partition.
-	If you decide to build from sources you can easily set the
-	dataDir as an option to configure.
+	Visit MySQL homepage at <ulink
+				       url="http://www.mysql.com">www.mysql.com</ulink> and grab the latest stable release of the server.  Many of the binary versions of MySQL store their data files in <filename>/var</filename> which is often part of a smaller root partition. If you decide to build from sources you can easily set the dataDir as an option to <filename>configure</filename>.
       </para>
       <para>
-	If you've installed from source or non-package (RPM, deb,
-	etc.) binaries you'll want to make sure to add mysqld to your
+	If you install from source or non-package (RPM, deb, etc.)
+	binaries you need to add
+	<firstterm>mysqld</firstterm> to your
 	init scripts so the server daemon will come back up whenever
-	your machine reboots. You also may want to edit those init
-	scripts, to make sure that mysqld will accept large packets.
-	By default, mysqld is set up to only accept packets up to 64K
-	long.  This limits the size of attachments you may put on
-	bugs.  If you add something like "-O max_allowed_packet=1M" to
-	the command that starts mysqld (or safe_mysqld), then you will
-	be able to have attachments up to about 1 megabyte.
+	your machine reboots. Further discussion of UNIX init
+	sequences are beyond the scope of this guide.
+	<note>
+	  <para>You should have your init script start
+	    <glossterm>mysqld</glossterm> with the ability to accept
+	    large packets. By default, <filename>mysqld</filename>
+	    only accepts packets up to 64K long. This limits the size
+	    of attachments you may put on bugs. If you add <option>-O
+	    max_allowed_packet=1M</option> to the command that starts
+	    <filename>mysqld</filename> (or
+	    <filename>safe_mysqld</filename>), then you will be able
+	    to have attachments up to about 1 megabyte.</para>
+	</note>
+
       </para>
       <note>
 	<para>
 	  If you plan on running Bugzilla and MySQL on the same
-	  machine, consider using the "--skip-networking" option in
-	  the init script. This enhances security by preventing
-	  network access to MySQL.
+	  machine, consider using the <option>--skip-networking</option>
+	  option in the init script. This enhances security by
+	  preventing network access to MySQL.
 	</para>
       </note>
     </section>
@@ -260,9 +285,10 @@
       <tip id="bundlebugzilla" xreflabel="Using Bundle::Bugzilla instead of manually installing Perl modules">
 	<para>
 	  You can skip the following Perl module installation steps by
-	  installing "Bundle::Bugzilla" from CPAN, which includes
-	  them. All Perl module installation steps require you have an
-	  active Internet connection.  If you wish to use
+	  installing <productname>Bundle::Bugzilla</productname> from
+	  <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
 	  version of Perl (at this writing, version &perl-ver;)
 	</para>
@@ -293,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 (02/17/99) can be found in Appendix A.
+	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
@@ -370,9 +396,11 @@
 	hurt anything.
       </para>
       <para>
-	Data::Dumper is used by the MySQL-related Perl modules.  It can be
-	found on CPAN (link in Appendix A) and can be installed by following
-	the same four step make sequence used for the DBI module.
+	Data::Dumper is used by the MySQL-related Perl modules.  It
+	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.
       </para>
     </section>
     
@@ -414,37 +442,42 @@
       <section>
 	<title>TimeDate Perl Module Collection</title>
 	<para>
-	  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.  A link 
-	  link may be found in Appendix B, Software Download Links.
-	  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 should work perfectly for this simple package.
+	  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
+	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
+	should work perfectly for this simple package.
 	</para>
       </section>
       <section>
 	<title>GD Perl Module (1.8.3)</title>
 	<para>
-	  The GD library was written by Thomas Boutell a long while ago to
-	  programatically generate images in C.  Since then it's become almost a
-	  defacto standard for programatic image construction.  The Perl bindings
-	  to it found in the GD library are used on a million web pages to generate
-	  graphs on the fly.  That's what bugzilla will be using it for so you'd
-	  better install it if you want any of the graphing to work.
+	  The GD library was written by Thomas Boutell a long while
+	ago to programatically generate images in C.  Since then it's
+	become the defacto standard for programatic image
+	construction.  The Perl bindings to it found in the GD library
+	are used on millions of web pages to generate graphs on the
+	fly. That's what bugzilla will be using it for so you must
+	install it if you want any of the graphing to work.
 	</para>
 	<para>
-	  Actually bugzilla uses the Graph module which relies on GD itself,
-	  but isn't that always the way with OOP.  At any rate, you can find the
-	  GD library on CPAN (link in Appendix B, Software Download Links).  
+	  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">.  
 	</para>
 	<note>
 	  <para>
-	    The Perl GD library requires some other libraries that may or may not be
-	    installed on your system, including "libpng" and "libgd".  The full requirements
-	    are listed in the Perl GD library README.  Just realize that if compiling GD fails,
-	    it's probably because you're missing a required library.
+	    The Perl GD library requires some other libraries that may
+	  or may not be installed on your system, including
+	  <classname>libpng</classname> and
+	  <classname>libgd</classname>.  The full requirements are
+	  listed in the Perl GD library README.  Just realize that if
+	  compiling GD fails, it's probably because you're missing a
+	  required library.
 	  </para>
 	</note>
       </section>
@@ -453,62 +486,78 @@
 	<title>Chart::Base Perl Module (0.99c)</title>
 	<para>
 	  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 in a
-	  directory to be listed in Appendix B, "Software Download Links".
-	  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.
+	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
+	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.
 	</para>
       </section>
 
       <section>
 	<title>DB_File Perl Module</title>
 	<para>
-	  DB_File is a module which allows Perl programs to make use of the facilities provided by 
-	  Berkeley DB version 1.x. This module is required by collectstats.pl which is used for 
-	  bug charting. If you plan to make use of bug charting, you must install this module.
+	  DB_File is a module which allows Perl programs to make use
+	of the facilities provided by  Berkeley DB version 1.x. This
+	module is required by collectstats.pl which is used for  bug
+	charting. If you plan to make use of bug charting, you must
+	install this module.
 	</para>
       </section>
 
       <section>
 	<title>HTTP Server</title>
 	<para>
-	  You have a freedom of choice here - Apache, Netscape or any other
-	  server on UNIX would do.  You can easily run the web server on a different
-	  machine than MySQL, but need to adjust the MySQL "bugs" user permissions
-	  accordingly.
+	  You have a freedom of choice here - Apache, Netscape or any
+	other server on UNIX would do.  You can easily run the web
+	server on a different machine than MySQL, but need to adjust
+	the MySQL <quote>bugs</quote> user permissions accordingly.
+	<note>
+	  <para>I strongly recommend Apache as the web server to use.
+	    The Bugzilla Guide installation instructions, in general,
+	    assume you are using Apache.  As more users use different
+	    webservers and send me information on the peculiarities of
+	    installing using their favorite webserver, I will provide
+	    notes for them.</para>
+	</note>
 	</para>
 	<para>
-	  You'll want to make sure that your web server will run any file
-	  with the .cgi extension as a cgi and not just display it.  If you're using
-	  apache that means uncommenting the following line in the srm.conf file:
-	  <computeroutput>AddHandler cgi-script .cgi</computeroutput>
+	  You'll want to make sure that your web server will run any
+	file with the .cgi extension as a cgi and not just display it.
+	If you're using apache that means uncommenting the following
+	line in the srm.conf file:
+	<programlisting>
+AddHandler cgi-script .cgi
+	</programlisting>
 	</para>
 	<para>
-	  With apache you'll also want to make sure that within the access.conf
-	  file the line:
-	  <computeroutput>
-	    Options ExecCGI
-	  </computeroutput>
-	  is in the stanza that covers the directories you intend to put the bugzilla
-	  .html and .cgi files into.
+	  With apache you'll also want to make sure that within the
+	access.conf file the line:
+ <programlisting>
+Options ExecCGI
+</programlisting>
+	is in the stanza that covers the directories into which
+	you intend to put the bugzilla .html and .cgi files.
 	</para>
+      <note>
 	<para>
-	  If you are using a newer version of Apache, both of the above lines will be
-	  (or will need to be) in the httpd.conf file, rather than srm.conf or
-	  access.conf.
+	  Users of newer versions of Apache will generally find both
+	  of the above lines will be in the httpd.conf file, rather
+	  than srm.conf or access.conf.
 	</para>
+      </note>
 	<warning>
 	  <para>
-	    There are two critical directories and a file that should not be a served by
-	    the HTTP server. These are the <quote>data</quote> and <quote>shadow</quote> 
-	    directories 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.
+	    There are important files and directories that should not
+	  be a served by the HTTP server. These are most files in the
+	  <quote>data</quote> and <quote>shadow</quote>  directories
+	  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
+	  on how to do this for Apache.  I appreciate notes on how to
+	  get this same functionality using other webservers.
 	  </para>
 	</warning>
       </section>
@@ -516,59 +565,65 @@
       <section>
 	<title>Installing the Bugzilla Files</title>
 	<para>
-	  You should untar the Bugzilla files into a directory that you're
-	  willing to make writable by the default web server user (probably
-	  <quote>nobody</quote>).  You may decide to put the files off of the main web space
-	  for your web server or perhaps off of /usr/local with a symbolic link
-	  in the web space that points to the bugzilla directory.  At any rate,
-	  just dump all the files in the same place (optionally omitting the CVS
-	  directories if they were accidentally tarred up with the rest of Bugzilla)
-	  and make sure you can access the files in that directory through your
-	  web server.
+	  You should untar the Bugzilla files into a directory that
+	you're willing to make writable by the default web server user
+	(probably <quote>nobody</quote>).  You may decide to put the
+	files off of the main web space for your web server or perhaps
+	off of <filename>/usr/local</filename> with a symbolic link in
+	the web space that points to the Bugzilla directory.  At any
+	rate, just dump all the files in the same place, and make sure
+	you can access the files in that directory through your web
+	server.
 	</para>
 	<tip>
 	  <para>
 	    If you symlink the bugzilla directory into your Apache's
-	    HTML heirarchy, you may receive "Forbidden" errors unless you
-	    add the "FollowSymLinks" directive to the &lt;Directory&gt; entry
-	    for the HTML root.
+	  HTML heirarchy, you may receive
+	  <errorname>Forbidden</errorname> errors unless you add the
+	  <quote>FollowSymLinks</quote> directive to the
+	  &lt;Directory&gt; entry for the HTML root.
 	  </para>
 	</tip>
 	<para>
-	  Once all the files are in a web accessible directory, make that
-	  directory writable by your webserver's user (which may require just
-	  making it world writable).  This is a temporary step until you run
-	  the post-install <quote>checksetup.pl</quote> script, which locks down your
-	  installation.
-	</para>
-	<para>
-	  Lastly, you'll need to set up a symbolic link to /usr/bonsaitools/bin/perl
-	  for the correct location of your perl executable (probably /usr/bin/perl).
-	  Otherwise you must hack all the .cgi files to change where they look
-	  for perl.  To make future upgrades easier, you should use the symlink
-	  approach.
-	  <example>
-	    <title>Setting up bonsaitools symlink</title>
-	    <para>
-	      Here's how you set up the Perl symlink on Linux to make Bugzilla work.
-	      Your mileage may vary; if you are running on Solaris, you probably need to subsitute
-	      <quote>/usr/local/bin/perl</quote> for <quote>/usr/bin/perl</quote> 
-	      below; if on certain other UNIX systems,
-	      Perl may live in weird places like <quote>/opt/perl</quote>.  As root, run these commands:
-	      <programlisting>
-bash# mkdir /usr/bonsaitools
-bash# mkdir /usr/bonsaitools/bin
+	  Once all the files are in a web accessible directory, make
+	that directory writable by your webserver's user.  This is a
+	temporary step until you run the post-install
+	<filename>checksetup.pl</filename> script, which locks down your
+	installation.
+      </para>
+      <para>
+	Lastly, you'll need to set up a symbolic link to
+	<filename>/usr/bonsaitools/bin/perl</filename> for the correct
+	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
+	approach for future release compatability.
+	<example>
+	  <title>Setting up bonsaitools symlink</title>
+	  <para>
+	      Here's how you set up the Perl symlink on Linux to make
+	    Bugzilla work. Your mileage may vary.  For some UNIX
+	    operating systems, you probably need to subsitute
+	    <quote>/usr/local/bin/perl</quote> for
+	    <quote>/usr/bin/perl</quote>  below; if on certain other
+	    UNIX systems, Perl may live in weird places like
+	    <quote>/opt/perl</quote>.  As root, run these commands:
+	    <programlisting>
+bash# mkdir /usr/bonsaitools  
+bash# mkdir /usr/bonsaitools/bin 
 bash# ln -s /usr/bin/perl /usr/bosaitools/bin/perl
-	      </programlisting>
-	    </para>
-	  </example>
-	  <tip>
-	    <para>
-	      If you don't have root access to set this symlink up,
+	    </programlisting>
+	  </para>
+	</example>
+	<tip>
+	  <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.
-	    </para>
+	    <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>
       </section>
@@ -581,10 +636,11 @@ bash# ln -s /usr/bin/perl /usr/bosaitools/bin/perl
 	  quality bug tracker.
 	</para>
 	<para>
-	  First, you'll want to fix MySQL permissions to allow access from
-	  Bugzilla.  For the purpose of this Installation section, the Bugzilla username
-	  will be "bugs", and will have minimal permissions.
-
+	  First, you'll want to fix MySQL permissions to allow access
+	from Bugzilla.  For the purpose of this Installation section,
+	the Bugzilla username will be <quote>bugs</quote>, and will
+	have minimal permissions.
+	
 	<warning>
 	  <para>
 	    Bugzilla has not undergone a thorough security audit. It
@@ -594,199 +650,190 @@ bash# ln -s /usr/bin/perl /usr/bosaitools/bin/perl
 	  </para>
 	  <para>That would be bad.</para>
 	</warning>
-	</para>
-
-	<para>
-	  Give the MySQL root user a password.  MySQL passwords are
-	  limited to 16 characters.
-	  <simplelist>
-	    <member>
-	      <computeroutput>
-		<prompt>bash#</prompt>
-		<command>mysql -u root mysql</command>
-	      </computeroutput>
-	    </member>
-	    <member>
-	      <computeroutput>
-		<prompt>mysql></prompt>
-		<command>
-		  UPDATE user SET Password=PASSWORD ('new_password')
-		  WHERE user='root';
-		</command>
-	      </computeroutput>
-	    </member>
-	    <member>
-	      <computeroutput>
-		<prompt>mysql></prompt>
-		<command>FLUSH PRIVILEGES;</command>
-	      </computeroutput>
-	    </member>
-	  </simplelist>
-	  From this point on, if you need to access MySQL as the
-	  MySQL root user, you will need to use "mysql -u root -p" and
-	  enter your new_password.  Remember that MySQL user names have
-	  nothing to do with Unix user names (login names).	  
-	</para>
-	<para>
-	  Next, we create the "bugs" user, and grant sufficient
-	  permissions for checksetup.pl, which we'll use later, to work
-	  its magic.  This also restricts the "bugs" user to operations
-	  within a database called "bugs", and only allows the account
-	  to connect from "localhost".  Modify it to reflect your setup
-	  if you will be connecting from another machine or as a different
-	  user.
-	</para>
-	<para>
-	  Remember to set bugs_password to some unique password.
-	  <simplelist>
-	    <member>
-	      <computeroutput>
-		<prompt>mysql></prompt>
-		<command>GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,
-		  ALTER,CREATE,DROP,REFERENCES 
-		  ON bugs.* TO bugs@localhost
-		  IDENTIFIED BY 'bugs_password';</command>
-	      </computeroutput>
-	    </member>
-	    <member>
-	      <computeroutput>
-		<prompt>
-		  mysql>
-		</prompt>
-		<command>
-		  FLUSH PRIVILEGES;
-		</command>
-	      </computeroutput>
-	    </member>
-	  </simplelist>
-	</para>
-	<para>
-	  Next, run the magic checksetup.pl script.  (Many thanks to Holger
-	  Schurig &lt;holgerschurig@nikocity.de&gt; for writing this script!)
-	  It will make sure Bugzilla files and directories have reasonable
-	  permissions, set up the "data" directory, and create all the MySQL
-	  tables.
-	  <simplelist>
-	    <member>
-	      <computeroutput>
-		<prompt>bash#</prompt>
-		<command>./checksetup.pl</command>
-	      </computeroutput>
-	    </member>
-	  </simplelist>
-	  The first time you run it, it will create a file called "localconfig".
-	</para>
-      </section>
-
-      <section>
-	<title>Tweaking "localconfig"</title>
-	<para>
-	  This file contains a variety of settings you may need to tweak including
-	  how Bugzilla should connect to the MySQL database.
-	</para>
-	<para>
-	  The connection settings include:
-	  <orderedlist>
-	    <listitem>
-	      <para>
-		server's host: just use "localhost" if the MySQL server is
-                local
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		database name: "bugs" if you're following these directions
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		MySQL username: "bugs" if you're following these directions
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Password for the "bugs" MySQL account above
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-		You may also install .htaccess files that the Apache webserver will use 
-	to restrict access to Bugzilla data files. See <xref linkend="htaccess">.
-	</para>
-	<para>
-	  Once you are happy with the settings, re-run checksetup.pl.  On this
-	  second run, it will create the database and an administrator account
-	  for which you will be prompted to provide information.
-	</para>
-	<para>
-	  When logged into an administrator account once Bugzilla is running,
-	  if you go to the query page (off of the bugzilla main menu), you'll
-	  find an 'edit parameters' option that is filled with editable treats.
-	</para>
-	<para>
-	  Should everything work, you should have a nearly empty copy of the bug
-	  tracking setup.
-	</para>
-	<para>
-	  The second time around, checksetup.pl will stall if it is on a
-	  filesystem that does not fully support file locking via flock(), such as
-	  NFS mounts.  This support is required for Bugzilla to operate safely with
-	  multiple instances. If flock() is not fully supported, it will stall at:
-	  <errorcode>Now regenerating the shadow database for all bugs.</errorcode>
-	  <note>
+      </para>
+      
+      <para>
+	Give the MySQL root user a password.  MySQL passwords are
+	limited to 16 characters.
+	<simplelist>
+	  <member>
+	    <computeroutput> <prompt>bash#</prompt> <command>mysql
+		-u root mysql</command> </computeroutput>
+	  </member>
+	  <member>
+	    <computeroutput> <prompt>mysql></prompt> <command>
+		UPDATE user SET Password=PASSWORD ('new_password')
+		WHERE user='root'; </command> </computeroutput>
+	  </member>
+	  <member>
+	    <computeroutput> <prompt>mysql></prompt> <command>FLUSH
+		PRIVILEGES;</command> </computeroutput>
+	  </member>
+	</simplelist> From this point on, if you need to access
+	MySQL as the MySQL root user, you will need to use
+	<command>mysql -u root -p</command> and enter your
+	new_password.  Remember that MySQL user names have nothing to
+	do with Unix user names (login names).	  
+      </para>
+      <para>
+	Next, we create the <quote>bugs</quote> user, and grant
+	sufficient permissions for checksetup.pl, which we'll use
+	later, to work its magic.  This also restricts the
+	<quote>bugs</quote> user to operations within a database
+	called <quote>bugs</quote>, and only allows the account to
+	connect from <quote>localhost</quote>.  Modify it to reflect
+	your setup if you will be connecting from another machine or
+	as a different user.
+      </para>
+      <para>
+	Remember to set bugs_password to some unique password.
+	<simplelist>
+	  <member>
+	    <computeroutput>
+	      <prompt>mysql></prompt>
+	      <command>GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,
+		ALTER,CREATE,DROP,REFERENCES 
+		ON bugs.* TO bugs@localhost
+		IDENTIFIED BY 'bugs_password';</command>
+	    </computeroutput>
+	  </member>
+	  <member>
+	    <computeroutput>
+	      <prompt>
+		mysql>
+	      </prompt>
+	      <command>
+		FLUSH PRIVILEGES;
+	      </command>
+	    </computeroutput>
+	  </member>
+	</simplelist>
+      </para>
+      <para>
+	Next, run the magic checksetup.pl script.  (Many thanks to
+	Holger Schurig &lt;holgerschurig@nikocity.de&gt; for writing
+	this script!) It will make sure Bugzilla files and directories
+	have reasonable permissions, set up the
+	<filename>data</filename> directory, and create all the MySQL
+	tables.
+	<simplelist>
+	  <member>
+	    <computeroutput> <prompt>bash#</prompt>
+	      <command>./checksetup.pl</command> </computeroutput>
+	  </member>
+	</simplelist> The first time you run it, it will create a
+	file called <filename>localconfig</filename>.
+      </para>
+    </section>
+    
+    <section>
+      <title>Tweaking <filename>localconfig</filename></title>
+      <para>
+	This file contains a variety of settings you may need to tweak including
+	how Bugzilla should connect to the MySQL database.
+      </para>
+      <para>
+	The connection settings include:
+	<orderedlist>
+	  <listitem>
 	    <para>
-	      The second time you run checksetup.pl, you should become the
-	      user your web server runs as, and that you ensure that you set the
-	      "webservergroup" parameter in localconfig to match the web 
-	      server's group
-	      name, if any.  I believe, for the next release of Bugzilla,
-	      this will
-	      be fixed so that Bugzilla supports a "webserveruser" parameter
-	      in localconfig
-	      as well.
-	      <example>
-		<title>Running checksetup.pl as the web user</title>
-		<para>
-		  Assuming your web server runs as user "apache",
-		  and Bugzilla is installed in
-		  "/usr/local/bugzilla", here's one way to run checksetup.pl
-		  as the web server user.
-		  As root, for the <emphasis>second run</emphasis>
-		  of checksetup.pl, do this:
-		  <programlisting>
-bash# chown -R apache:apache /usr/local/bugzilla
-bash# su - apache
-bash# cd /usr/local/bugzilla
-bash# ./checksetup.pl
-		  </programlisting>
-		</para>
-	      </example>
+	      server's host: just use <quote>localhost</quote> if the
+	      MySQL server is local
 	    </para>
-	  </note>
-	</para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      database name: <quote>bugs</quote> if you're following
+	      these directions
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      MySQL username: <quote>bugs</quote> if you're following
+	      these directions
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Password for the <quote>bugs</quote> MySQL account above
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+      <para>
+	You should also install .htaccess files that the Apache
+	webserver will use  to restrict access to Bugzilla data files.
+	See <xref
+		  linkend="htaccess">.
+      </para>
+      <para>
+	Once you are happy with the settings, re-run
+	<filename>checksetup.pl</filename>. On this second run, it will
+	  create the database and an administrator account for which
+	  you will be prompted to provide information.
+      </para>
+      <para>
+	When logged into an administrator account once Bugzilla is
+	running, if you go to the query page (off of the Bugzilla main
+	menu), you'll find an <quote>edit parameters</quote> option
+	that is filled with editable treats.
+      </para>
+      <para>
+	Should everything work, you will have a nearly empty Bugzilla
+	database and a newly-created <filename>localconfig</filename>
+	file in your Bugzilla root directory.
+      </para>
+      <para>
 	<note>
 	  <para>
-	    The checksetup.pl script is designed so that you can run
-	  it at any time without causing harm.  You should run it
-	  after any upgrade to Bugzilla.
+	    The second time you run checksetup.pl, you should become
+	    the user your web server runs as, and that you ensure that
+	    you set the <quote>webservergroup</quote> parameter in localconfig to
+	    match the web  server's group name, if any.  I believe,
+	    for the next release of Bugzilla, this will be fixed so
+	    that Bugzilla supports a <quote>webserveruser</quote> parameter in
+	    localconfig as well.
+	    <example>
+	      <title>Running checksetup.pl as the web user</title>
+	      <para>
+		  Assuming your web server runs as user "apache", and
+		Bugzilla is installed in "/usr/local/bugzilla", here's
+		one way to run checksetup.pl as the web server user.
+		As root, for the <emphasis>second run</emphasis> of
+		checksetup.pl, do this: 
+		<programlisting> 
+bash# chown -R apache:apache /usr/local/bugzilla 
+bash# su - apache 
+bash# cd /usr/local/bugzilla 
+bash# ./checksetup.pl 
+		</programlisting>
+	      </para>
+	    </example>
 	  </para>
 	</note>
-      </section>
-
-      <section>
-	<title>Setting Up Maintainers Manually (Optional)</title>
+      </para>
+      <note>
 	<para>
-	  If you want to add someone else to every group by hand, you
+	  The checksetup.pl script is designed so that you can run
+	  it at any time without causing harm.  You should run it
+	  after any upgrade to Bugzilla.
+	</para>
+      </note>
+    </section>
+    
+    <section>
+      <title>Setting Up Maintainers Manually (Optional)</title>
+      <para>
+	If you want to add someone else to every group by hand, you
 	can do it by typing the appropriate MySQL commands.  Run
-	'<computeroutput> mysql -u root -p bugs</computeroutput>' You
+	<command> mysql -u root -p bugs</command> You
 	may need different parameters, depending on your security
 	settings. Then:
 	  <simplelist>
 	    <member>
 	      <computeroutput> <prompt>mysql></prompt> <command>update
 		profiles set groupset=0x7fffffffffffffff where
-		login_name = 'XXX';</command> </computeroutput>
+		login_name = 'XXX';</command> </computeroutput> (yes, that's <emphasis>fifteen</emphasis><quote>f</quote>'s.
 	    </member>
 	  </simplelist> replacing XXX with the Bugzilla email address.
 	</para>
@@ -1156,33 +1203,74 @@ bash# ./checksetup.pl
 	<parameter>0</parameter>.
       </para>
     </section>
+
+    <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
+	the database many times in a row which can result in very slow
+	access speeds for other users.  If your Bugzilla installation
+	is experiencing this problem , you may install  the Apache
+	module <filename>mod_throttle</filename> which can limit
+	connections by ip-address. You may download this module at
+	<ulink
+	       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">
+      <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
+	unable to incorporate the code changes necessary to fulfill
+	the CERT advisory requirements mentioned in <ulink
+							   url="http://www.cet.org/tech_tips/malicious_code_mitigation.html/#3">http://www.cet.org/tech_tips/malicious_code_mitigation.html/#3</ulink>.  Executing the following code snippet from a UNIX command shell will rectify the problem if your Bugzilla installation is intended for an English-speaking audience.  As always, be sure your Bugzilla installation has a good backup before making changes, and I recommend you understand what the script is doing before executing it. </para>
+	<para><programlisting>
+bash# cd $BUGZILLA_HOME; for i in `ls *.cgi`; \
+	  do cat $i | sed 's/Content-type\: text\/html/Content-Type: text\/html\; charset=ISO-8859-1/' >$i.tmp; \
+	  mv $i.tmp $i; done
+	</programlisting></para>
+      <para>
+	All this one-liner command does is search for all instances of
+	<quote>Content-type: text/html</quote> and replaces it with
+	<quote>Content-Type: text/html; charset=ISO-8859-1</quote>.
+	This specification prevents possible Javascript attacks on the
+	browser, and is suggested for all English-speaking sites.  For
+	non-english-speaking Bugzilla sites, I suggest changing
+	<quote>ISO-8859-1</quote>, above, to <quote>UTF-8</quote>.
+      </para>
+    </section>
+
     
     <section>
       <title>UNIX Installation Instructions History</title>
       <para>
-	This document was originally adapted from the Bonsai installation
-	instructions by Terry Weissman &lt;terry@mozilla.org&gt;.
+	This document was originally adapted from the Bonsai
+	installation instructions by Terry Weissman
+	&lt;terry@mozilla.org&gt;.
       </para>
       <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 don't send bug reports to them;
-	report them using bugzilla, at http://bugzilla.mozilla.org/enter_bug.cgi ,
-	project Webtools, component Bugzilla).
+	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
+	don't send bug reports to them; report them using bugzilla, at
+	http://bugzilla.mozilla.org/enter_bug.cgi , project Webtools,
+	component Bugzilla).
       </para>
       <para>
-	This document was heavily modified again Wednesday, March 07 2001 to
-	reflect changes for Bugzilla 2.12 release by Matthew P. Barnson.  The
-	securing MySQL section should be changed to become standard procedure
-	for Bugzilla installations.
+	This document was heavily modified again Wednesday, March 07
+	2001 to reflect changes for Bugzilla 2.12 release by Matthew
+	P. Barnson.  The securing MySQL section should be changed to
+	become standard procedure for Bugzilla installations.
       </para>
       <para>
-	Finally, the README in its entirety was marked up in SGML and included into
-	the Guide on April 24, 2001 by Matt Barnson.  Since that time, it's undergone
-	extensive modification as Bugzilla grew.
+	Finally, the README in its entirety was marked up in SGML and
+	included into the Guide on April 24, 2001 by Matt Barnson.
+	Since that time, it's undergone extensive modification as
+	Bugzilla grew.
       </para>
       <para>
-	Comments from people using this Guide for the first time are particularly welcome.
+	Comments from people using this Guide for the first time are
+	particularly welcome.
       </para>
     </section>
   </section>
@@ -1217,27 +1305,33 @@ bash# ./checksetup.pl
 	  picnic.  Support for Win32 has improved dramatically in the
 	  last few releases, but, if you choose to proceed, you should
 	  be a <emphasis>very</emphasis> skilled Windows Systems
-	  Administrator with both strong troubleshooting abilities and
-	  a high tolerance for pain. Bugzilla on NT 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">.
+	  Administrator with strong troubleshooting abilities, a high
+	  tolerance for pain, and moderate perl skills. Bugzilla on NT
+	  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">.
 	</para>
       </note>
       
       <procedure>
 	<step>
 	  <para>
-	    Install <ulink url="http://www.apache.org/">Apache Web Server</ulink>
-	    for Windows.
+	    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">
+	    regarding your Apache configuration, particularly
+	    instructions regarding the <quote>AddHandler</quote>
+	    parameter and <quote>ExecCGI</quote>.
 	  </para>
 	  <note>
 	    <para>
-	      You may also use Internet Information Server or Personal Web
-	      Server for this purpose.  However, setup is slightly more
-	      difficult.  If ActivePerl doesn't seem to handle your file
-	      associations correctly (for .cgi and .pl files), please
-	      consult <xref linkend="faq">.
+	      You may also use Internet Information Server or Personal
+	      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">.
 	    </para>
 	    <para>
 	      If you are going to use IIS, if on Windows NT you must
@@ -1299,8 +1393,7 @@ bash# ./checksetup.pl
 	    Install MySQL for NT.
 	    <note>
 	      <para>
-		You can download MySQL for Windows NT from <ulink
-								  url="http://www.mysql.com/">MySQL.com</ulink>.  Some find it helpful to use the WinMySqlAdmin utility, included with the download, to set up the database.
+		You can download MySQL for Windows NT from <ulink url="http://www.mysql.com/">MySQL.com</ulink>.  Some find it helpful to use the WinMySqlAdmin utility, included with the download, to set up the database.
 	      </para>
 	    </note>
 	  </para>
@@ -1393,13 +1486,21 @@ bash# ./checksetup.pl
 	    this line:
 	  </para>
 	  <para>
-	    "my $webservergid = getgrnam($my_webservergroup); "
+	    <programlisting>
+my $webservergid = getgrnam($my_webservergroup);
+	    </programlisting>
 	  </para>
 	  <para>
 	    to
 	  </para>
 	  <para>
-	    "my $webservergid = $my_webservergroup; "
+	    <programlisting>
+my $webservergid = $my_webservergroup;
+	    </programlisting>
+or the name of the group you wish to own the files explicitly:
+	    <programlisting>
+my $webservergid = 'Administrators'
+	    </programlisting>
 	  </para>
 	</step>
 
@@ -1412,8 +1513,7 @@ bash# ./checksetup.pl
 	<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
@@ -1455,8 +1555,7 @@ bash# ./checksetup.pl
 	  <procedure>
 	    <step>
 	      <para>
-		Download NTsendmail, available from<ulink
-							  url="http://www.ntsendmail.com/"> www.ntsendmail.com</ulink>. You must have a "real" mail server which allows you to relay off it in your $ENV{"NTsendmail"} (which you should probably place in globals.pl)
+		Download NTsendmail, available from<ulink url="http://www.ntsendmail.com/"> www.ntsendmail.com</ulink>. You must have a "real" mail server which allows you to relay off it in your $ENV{"NTsendmail"} (which you should probably place in globals.pl)
 	      </para>
 	    </step>
 
@@ -1503,7 +1602,15 @@ $mail->send($from,$to,$subject,$msg);
 		</programlisting>
 	      </para>
 	      <note>
-		<para>The code above needs testing as well to make sure it is correct.</para>
+		<para>
+		  Some have found success using the commercial product, 
+		  <productname>Windmail</productname>.
+		  You could try replacing your sendmail calls with:
+		  <programlisting>
+open SENDMAIL, "|\"C:/General/Web/tools/Windmail 4.0 Beta/windmail\" -t > mail.log";
+		  </programlisting>
+		or something to that effect.
+		</para>
 	      </note>
 	    </step>
 	  </procedure>
@@ -1568,9 +1675,9 @@ exit;
 	<step>
 	  <note>
 	    <para>
-	      This step is completely optional if you are using IIS or
-	      another web server which only decides on an interpreter
-	      based upon the file extension (.pl), rather than the
+	      This step is optional if you are using IIS or another
+	      web server which only decides on an interpreter based
+	      upon the file extension (.pl), rather than the
 	      <quote>shebang</quote> line (#/usr/bonsaitools/bin/perl)
 	    </para>
 	  </note>
@@ -1583,8 +1690,7 @@ exit;
 	    utility to speed part of this procedure, available in the
 	    <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.
+	    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>
 	</step>
 
@@ -1604,10 +1710,11 @@ system ("perl processmail.pl",@ARGLIST);
 
       <tip>
 	<para>
-	  If you are using IIS 5.0 or higher, you must add cgi
+	  If you are using IIS or Personal Web Server, you must add cgi
 	  relationships to Properties -> Home directory (tab) ->
 	  Application Settings (section) -> Configuration (button),
-	  such as: <programlisting> 
+	  such as: 
+	  <programlisting> 
 .cgi to: &lt;perl install directory&gt;\perl.exe %s %s
 .pl to: &lt;perl install directory&gt;\perl.exe %s %s
 GET,HEAD,POST
@@ -1625,11 +1732,10 @@ GET,HEAD,POST
 	  From Andrew Pearson:
 	  <blockquote>
 	    <para>
-	      "You can make Bugzilla work with Personal Web Server for
-	      Windows 98 and higher, as well as for IIS 4.0.  Microsoft has
-	      information available at
-	      <ulink url=" http://support.microsoft.com/support/kb/articles/Q231/9/98.ASP">
-		http://support.microsoft.com/support/kb/articles/Q231/9/98.ASP</ulink>
+	      You can make Bugzilla work with Personal Web Server for
+	      Windows 98 and higher, as well as for IIS 4.0.
+	      Microsoft has information available at <ulink url="
+							    http://support.microsoft.com/support/kb/articles/Q231/9/98.ASP"> http://support.microsoft.com/support/kb/articles/Q231/9/98.ASP</ulink>
 	    </para>
 	    <para>
 	      Basically you need to add two String Keys in the
@@ -1651,119 +1757,28 @@ GET,HEAD,POST
 	</para>
       </tip>
       <tip>
-	<para>"Brian" had this to add, about upgrading to Bugzilla 2.12 from previous versions:</para>
-	<blockquote>
-	  <para>
-	    Hi - I am updating bugzilla to 2.12 so I can tell you what I did (after I
-	    deleted the current dir and copied the files in).
-	  </para>
-	  <para>
-	    In checksetup.pl, I did the following...
-	  </para>
-	  <procedure>
-	    <step>
-	      <programlisting>
-my $webservergid = getgrnam($my_webservergroup);
+	<para>
+	  If attempting to run Bugzilla 2.12 or older, you will need
+	  to remove encrypt() calls from the Perl source. This is
+	  <emphasis>not necessary</emphasis> for Bugzilla 2.13 and
+	  later.
+	  <example>
+	    <title>Removing encrypt() for Windows NT Bugzilla version
+	      2.12 or earlier</title>
+	    <para>
+	      Replace this:  
+	      <programlisting> 
+SendSQL("SELECT encrypt(" . SqlQuote($enteredpwd) . ", " . SqlQuote(substr($realcryptpwd, 0, 2)) . ")"); 
+my $enteredcryptpwd = FetchOneColumn(); 
 	      </programlisting>
-	      <para>to</para>
-	      <programlisting>
-my $webservergid = 'Administrators'		
+	      with this:  
+	      <programlisting> 
+my $enteredcryptpwd = $enteredpwd  
 	      </programlisting>
-	    </step>
-	    <step>
-	      <para>
-		I then ran checksetup.pl
-	      </para>
-	    </step>
-	    <step>
-	      <para>
-		I removed all the encrypt()
-		<example>
-		  <title>Removing encrypt() for Windows NT installations</title>
-		  <para>
-		    Replace this:
-		    <programlisting>
-SendSQL("SELECT encrypt(" . SqlQuote($enteredpwd) . ", " .
-    SqlQuote(substr($realcryptpwd, 0, 2)) . ")");
-my $enteredcryptpwd = FetchOneColumn();
-		    </programlisting>
-		    with this:
-		    <programlisting>
-my $enteredcryptpwd = $enteredpwd
-		    </programlisting>
-		    in cgi.pl.
-		  </para>
-		</example>
-	      </para>
-	    </step>
-	    <step>
-	      <para>
-		I renamed processmail to processmail.pl
-	      </para>
-	    </step>
-	    <step>
-	      <para>
-		I altered the sendmail statements to windmail:
-		<programlisting>  
-open SENDMAIL, "|\"C:/General/Web/tools/Windmail 4.0 Beta/windmail\" -t > mail.log";
-		</programlisting>
-	      </para>
-	      <para>
-		The quotes around the dir is for the spaces. mail.log is for the output
-	      </para>
-	    </step>
-	  </procedure>
-	</blockquote>
-      </tip>
-      <tip>
-	<para>
-	  This was some late breaking information from Jan Evert.  Sorry for the lack of formatting.
+	      in cgi.pl.
+	    </para>
+	  </example>
 	</para>
-	<literallayout>
-I'm busy installing bugzilla on a WinNT machine and I thought I'd notify you
-at this moment of the commments I have to section 2.2.1 of the bugzilla
-guide (at http://www.trilobyte.net/barnsons/html/).
-
-Step 1:
-I've used apache, installation is really straightforward.
-After reading the Unix installation instructions, I found that it is
-necessary to add the ExecCGI option to the bugzilla directory. Also the
-'AddHandler' line for .cgi is by default commented out.
-
-Step 3: although just a detail, 'ppm install &lt;module%gt;' will also work
-(without .ppd). And, it can also download these automatically from
-ActiveState.
-
-Step 4: although I have cygwin installed, it seems that it is not necessary.
-On my machine cygwin is not in the PATH and everything seems to work as
-expected.
-However, I've not used everything yet.
-
-Step 6: the 'bugs_password' given in SQL command d needs to be edited into
-localconfig later on (Step 7) if the password is not empty. I've also edited
-it into globals.pl, but I'm not sure that is needed. In both places, the
-variable is named db_pass.
-
-Step 8: all the sendmail replacements mentioned are not as simple as
-described there. Since I am not familiar (yet) with perl, I don't have any
-mail working yet.
-
-Step 9: in globals.pl the encrypt() call can be replaced by just the
-unencrypted password. In CGI.pl, the complete SQL command can be removed.
-
-Step 11: I've only changed the #! lines in *.cgi. I haven't noticed problems
-with the system() call yet.
-There seem to be only four system() called programs: processmail.pl (handled
-by step 10), syncshadowdb (which should probably get the same treatment as
-processmail.pl), diff and mysqldump. The last one is only needed with the
-shadowdb feature (which I don't use).
-
-There seems to be one step missing: copying the bugzilla files somehwere
-that apache can serve them.
-
-Just noticed the updated guide... Brian's comment is new. His first comment
-will work, but opens up a huge security hole.
-	</literallayout>
       </tip>
     </section>
   </section>
diff --git a/docs/sgml/integration.sgml b/docs/sgml/integration.sgml
index c7aa78f82..e0547c365 100644
--- a/docs/sgml/integration.sgml
+++ b/docs/sgml/integration.sgml
@@ -5,49 +5,59 @@
 <chapter id="integration">
   <title>Integrating Bugzilla with Third-Party Tools</title>
 
-  <section id="bonsai">
+  <section id="bonsai" xreflabel="Bonsai, the Mozilla automated CVS management system">
     <title>Bonsai</title>
-    <para>We need Bonsai integration information.</para>
+    <para>Bonsai is a web-based tool for managing <xref
+							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
+      last time the tree was closed.  These kinds of changes cause the
+      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>
   </section>
 
-  <section id="cvs">
+  <section id="cvs" xreflabel="CVS, the Concurrent Versioning System">
     <title>CVS</title>
-    <para>CVS integration is best accomplished, at this point, using the Bugzilla Email Gateway.</para>
+    <para>CVS integration is best accomplished, at this point, using
+      the Bugzilla Email Gateway.  There have been some files
+      submitted to allow greater CVS integration, but we need to make
+      certain that Bugzilla is not tied into one particular software
+      management package.</para>
+    <para>
+      Follow the instructions in the FAQ for enabling Bugzilla e-mail
+      integration.  Ensure that your check-in script sends an email to
+      your Bugzilla e-mail gateway with the subject of <quote>[Bug
+	XXXX]</quote>, and you can have CVS check-in comments append
+      to your Bugzilla bug.  If you have your check-in script include
+      an @resolution field, you can even change the Bugzilla bug
+      state.
+    </para>
   </section>
 
-  <section id="scm">
+  <section id="scm" xreflabel="Perforce SCM (Fast Software Configuration Management System, a powerful commercial alternative to CVS">
     <title>Perforce SCM</title>
     <para>
-      You can find the project page for Bugzilla and Teamtrack Perforce integration at:
-      <ulink url="http://www.ravenbrook.com/project/p4dti/">
-	http://www.ravenbrook.com/project/p4dti</ulink>.  "p4dti" is now an officially
-      supported product from Perforce, and you can find the "Perforce Public Depot"
-      p4dti page at <ulink url="http://public.perforce.com/public/perforce/p4dti/index.html">
-	http://public.perforce.com/public/perforce/p4dti/index.html</ulink>.
-    </para>
-    <para>
-      Integration of Perforce with Bugzilla, once patches are applied, is fairly seamless.  However,
-      p4dti is a patch against the Bugzilla 2.10 release, not the current 2.12 release.  I anticipate
-      patches for 2.12 will be out shortly.  Check the project page regularly for updates, or
-      take the given patches and patch it manually.  p4dti is designed to support multiple defect
-      trackers, and maintains its own documentation for it.  Please consult the pages linked
-      above for further information.
+      You can find the project page for Bugzilla and Teamtrack
+      Perforce integration (p4dti) at: <ulink
+					      url="http://www.ravenbrook.com/project/p4dti/"> http://www.ravenbrook.com/project/p4dti</ulink> .  <quote>p4dti</quote> is now an officially supported product from Perforce, and you can find the "Perforce Public Depot" p4dti page at <ulink url="http://public.perforce.com/public/perforce/p4dti/index.html"> http://public.perforce.com/public/perforce/p4dti/index.html</ulink>.
     </para>
     <para>
-      Right now, there is no way to synchronize the Bug ID and the Perforce Transaction Number, or
-      to change the Bug ID to read (PRODUCT).bugID unless you hack it in.  Additionally, if you
-      have synchronization problems, the easiest way to avoid them is to only put the bug
-      information, comments, etc. into Bugzilla, and not into the Perforce change records.
-      They will link anyway; merely reference the bug ID fixed in your change description,
-      and put a comment into Bugzilla
-      giving the change ID that fixed the Bugzilla bug.  It's a process issue, not a technology
-      question.
+      Integration of Perforce with Bugzilla, once patches are applied,
+      is seamless.  Perforce replication information will appear below
+      the comments of each bug.  Be certain you have a matching set of
+      patches for the Bugzilla version you are installing.  p4dti is
+      designed to support multiple defect trackers, and maintains its
+      own documentation for it. Please consult the pages linked above
+      for further information.
     </para>
   </section>
 
-  <section id="tinderbox">
-    <title>Tinderbox</title>
-    <para>We need Tinderbox integration information</para>
+  <section id="tinderbox" xreflabel="Tinderbox, the Mozilla automated build management system">
+    <title>Tinderbox/Tinderbox2</title>
+    <para>We need Tinderbox integration information.</para>
   </section>
 
 </chapter>
diff --git a/docs/sgml/patches.sgml b/docs/sgml/patches.sgml
index 8ebfdee15..3a1ce90d2 100644
--- a/docs/sgml/patches.sgml
+++ b/docs/sgml/patches.sgml
@@ -3,6 +3,40 @@
 <appendix id="patches" xreflabel="Useful Patches and Utilities for Bugzilla">
   <title>Useful Patches and Utilities for Bugzilla</title>		
 
+  <para>Are you looking for a way to put your Bugzilla into overdrive?  Catch some of the niftiest tricks here in this section.</para>
+
+  <section id="rewrite" xreflabel="Apache mod_rewrite magic">
+    <title>Apache <filename>mod_rewrite</filename> magic</title>
+    <para>Apache's <filename>mod_rewrite</filename> module lets you do some truly amazing things with URL rewriting.  Here are a couple of examples of what you can do.</para>
+    <orderedlist>
+      <listitem>
+	<para>
+	  Make it so if someone types
+	  <computeroutput>http://www.foo.com/12345</computeroutput>,
+	  Bugzilla spits back
+	  http://www.foo.com/show_bug.cgi?id=12345. Try setting up
+	  your VirtualHost section for Bugzilla with a rule like
+	  this:</para>
+	<programlisting>
+<![CDATA[
+<VirtualHost 12.34.56.78>
+RewriteEngine On
+RewriteRule ^/([0-9]+)$ http://foo.bar.com/show_bug.cgi?id=$1 [L,R]
+</VirtualHost>
+]]>
+	</programlisting>
+
+      </listitem>
+      <listitem>
+	<para>There are many, many more things you can do with
+	  mod_rewrite.  As time goes on, I will include many more in
+	  the Guide.  For now, though, please refer to the mod_rewrite
+	  documentation at <ulink
+				  url="http://www.apache.org">http://www.apache.org</ulink></para>
+      </listitem>
+    </orderedlist>
+  </section>
+
 <section id="setperl" xreflabel="The setperl.csh Utility">
     <title>The setperl.csh Utility</title>
     <para>	 You can use the "setperl.csh" utility to quickly and
diff --git a/docs/sgml/using.sgml b/docs/sgml/using.sgml
index fd5901196..91a7658cd 100644
--- a/docs/sgml/using.sgml
+++ b/docs/sgml/using.sgml
@@ -31,7 +31,7 @@ Chapter: Using Bugzilla
 <title>Using Bugzilla</title>
   <epigraph>
     <para>
-      What, Why, How, & What's in it for me?
+      What, Why, How, & Where?
     </para>
   </epigraph>
 
@@ -92,8 +92,10 @@ system against which all others are measured.
 	</listitem>
 	<listitem>
 	  <para>
-	    available integration with automated software configuration management systems, including
-	    Perforce and CVS
+	    available integration with automated software
+	    configuration management systems, including Perforce and
+	    CVS (through the Bugzilla email interface and
+	    checkin/checkout scripts)
 	  </para>
 	</listitem>
 	<listitem>
@@ -104,23 +106,28 @@ system against which all others are measured.
       </itemizedlist>
     </para>
     <para>
-      Despite its current robustness and popularity, however, Bugzilla
-      faces some near-term challenges, such as reliance on a single database, a lack of
-      abstraction of the user interface and program logic, verbose email bug
-      notifications, a powerful but daunting query interface, little reporting configurability,
-      problems with extremely large queries, some unsupportable bug resolution options,
-      no internationalization, and dependence on some nonstandard libraries.
+      Despite its current robustness and popularity, Bugzilla faces
+      some near-term challenges, such as reliance on a single
+      database, a lack of abstraction of the user interface and
+      program logic, verbose email bug notifications, a powerful but
+      daunting query interface, little reporting configurability,
+      problems with extremely large queries, some unsupportable bug
+      resolution options, little internationalization (although non-US
+      character sets are accepted for comments), and dependence on
+      some nonstandard libraries.
     </para>
     <para>
-      Some recent headway has been made on the query front, however.  If you are using the latest
-      version of Bugzilla, you should see a "simple search" form on the default front page of
-      your Bugzilla install.  Type in two or three search terms and you should pull up some
-      relevant information.  This is also available as "queryhelp.cgi".
+      Some recent headway has been made on the query front, however.
+      If you are using the latest version of Bugzilla, you should see
+      a <quote>simple search</quote> form on the default front page of
+      your Bugzilla install.  Type in two or three search terms and
+      you should pull up some relevant information.  This is also
+      available as "queryhelp.cgi".
     </para>
     <para>
-      Despite these small problems, Bugzilla is very hard to beat.  It is under <emphasis>very</emphasis>
-      active development to address the current issues, and a long-awaited overhaul in the form
-      of Bugzilla 3.0 is expected sometime later this year.
+      Despite these small problems, Bugzilla is very hard to beat.  It
+      is under <emphasis>very</emphasis> active development to address
+      the current issues, and continually gains new features.
     </para>
   </section>
   
@@ -132,50 +139,57 @@ system against which all others are measured.
       </para>
     </epigraph>
     <para>
-      For many years, defect-tracking software has remained principally the domain
-      of large software development houses.  Even then, most shops never bothered
-      with bug-tracking software, and instead simply relied on shared lists and
-      email to monitor the status of defects.  This procedure is error-prone and
-      tends to cause those bugs judged least significant by developers to be
+      For many years, defect-tracking software has remained
+      principally the domain of large software development houses.
+      Even then, most shops never bothered with bug-tracking software,
+      and instead simply relied on shared lists and email to monitor
+      the status of defects.  This procedure is error-prone and tends
+      to cause those bugs judged least significant by developers to be
       dropped or ignored.
     </para>
     <para>
-      These days, many companies are finding that integrated defect-tracking
-      systems reduce downtime, increase productivity, and raise customer 
-      satisfaction with their systems.  Along with full disclosure, an open
-      bug-tracker allows manufacturers to keep in touch with their clients
-      and resellers, to communicate about problems effectively throughout
-      the data management chain.  Many corporations have also discovered that
-      defect-tracking helps reduce costs by providing IT support accountability,
-      telephone support knowledge bases, and a common, well-understood system
-      for accounting for unusual system or software issues.
+      These days, many companies are finding that integrated
+      defect-tracking systems reduce downtime, increase productivity,
+      and raise customer  satisfaction with their systems.  Along with
+      full disclosure, an open bug-tracker allows manufacturers to
+      keep in touch with their clients and resellers, to communicate
+      about problems effectively throughout the data management chain.
+      Many corporations have also discovered that defect-tracking
+      helps reduce costs by providing IT support accountability,
+      telephone support knowledge bases, and a common, well-understood
+      system for accounting for unusual system or software issues.
     </para>
     <para>
       But why should <emphasis>you</emphasis> use Bugzilla?
     </para>
     <para>
-      Bugzilla is very adaptable to various situations.  Known uses currently
-      include IT support queues, Systems Administration deployment management,
-      chip design and development problem tracking (both pre-and-post fabrication),
-      and software and hardware bug tracking for luminaries such as Redhat, Loki software,
-      Linux-Mandrake, and VA Systems.  Combined with systems such as CVS, Bonsai,
-      or Perforce SCM, Bugzilla provides a powerful, easy-to-use  solution to
-      configuration management and replication problems
+      Bugzilla is very adaptable to various situations.  Known uses
+      currently include IT support queues, Systems Administration
+      deployment management, chip design and development problem
+      tracking (both pre-and-post fabrication), and software and
+      hardware bug tracking for luminaries such as Redhat, Loki
+      software, Linux-Mandrake, and VA Systems.  Combined with systems
+      such as CVS, Bonsai, or Perforce SCM, Bugzilla provides a
+      powerful, easy-to-use  solution to configuration management and
+      replication problems
     </para>
     <para>
-      Bugzilla can dramatically increase the productivity and accountability
-      of individual employees by providing a documented workflow and positive
-      feedback for good performance.  How many times do you wake up in the
-      morning, remembering that you were supposed to do *something* today,
-      but you just can't quite remember?  Put it in Bugzilla, and you have a record
-      of it from which you can extrapolate milestones, predict product versions
-      for integration, and by using Bugzilla's e-mail integration features
-      be able to follow the discussion trail that led to critical decisions.
+      Bugzilla can dramatically increase the productivity and
+      accountability of individual employees by providing a documented
+      workflow and positive feedback for good performance.  How many
+      times do you wake up in the morning, remembering that you were
+      supposed to do <emphasis>something</emphasis> today, but you
+      just can't quite remember?  Put it in Bugzilla, and you have a
+      record of it from which you can extrapolate milestones, predict
+      product versions for integration, and by using Bugzilla's e-mail
+      integration features be able to follow the discussion trail that
+      led to critical decisions.
     </para>
     <para>
-      Ultimately, Bugzilla puts the power in your hands to improve your value
-      to your employer or business while providing a usable framework for your natural
-      attention to detail and knowledge store to flourish.
+      Ultimately, Bugzilla puts the power in your hands to improve
+      your value to your employer or business while providing a usable
+      framework for your natural attention to detail and knowledge
+      store to flourish.
     </para>
   </section>
   
@@ -189,46 +203,45 @@ system against which all others are measured.
     
     <para>
       Bugzilla is a large, complex system.  Describing how to use it
-      requires some time.  If you are only interested in installing or administering
-      a Bugzilla installation, please consult the Installing and Administering
-      Bugzilla portions of this Guide.  This section is principally aimed towards
-      developing end-user mastery of Bugzilla, so you may fully enjoy the benefits
-      afforded by using this reliable open-source bug-tracking software.
+      requires some time.  If you are only interested in installing or
+      administering a Bugzilla installation, please consult the
+      Installing and Administering Bugzilla portions of this Guide.
+      This section is principally aimed towards developing end-user
+      mastery of Bugzilla, so you may fully enjoy the benefits
+      afforded by using this reliable open-source bug-tracking
+      software.
     </para>
     <para>
-      Throughout this portion of the Guide, we will refer to user account
-      options available at the Bugzilla test installation,
+      Throughout this portion of the Guide, we will refer to user
+      account options available at the Bugzilla test installation,
       <ulink url="http://landfill.tequilarista.org/">
-      landfill.tequilarista.org</ulink>.
+	landfill.tequilarista.org</ulink>.
       <note>
 	<para>
-	  Some people have run into difficulties completing this tutorial.  If
-	  you run into problems, please check the updated, online documentation available
-	  at <ulink url="http://www.trilobyte.net/barnsons/">http://www.trilobyte.net/barnsons</ulink>.
-	  If you're still stumped, please subscribe to the newsgroup and provide details of exactly
-	  what's stumping you!  If enough people complain, I'll have to fix it in the next
-	  version of this Guide.  You can subscribe to the newsgroup at
-	  <ulink url="news://news.mozilla.org/netscape.public.mozilla.webtools">
-	  news://news.mozilla.org/netscape.public.mozilla.webtools</ulink>
+	  Some people have run into difficulties completing this
+	  tutorial.  If you run into problems, please check the
+	  updated online documentation available at <ulink
+							    url="http://www.trilobyte.net/barnsons/">http://www.trilobyte.net/barnsons</ulink>. If you're still stumped, please subscribe to the newsgroup and provide details of exactly what's stumping you!  If enough people complain, I'll have to fix it in the next version of this Guide.  You can subscribe to the newsgroup at <ulink url="news://news.mozilla.org/netscape.public.mozilla.webtools"> news://news.mozilla.org/netscape.public.mozilla.webtools</ulink>
 	</para>
  
-      </note>
-      Although Landfill serves as a great introduction to Bugzilla, it does not offer
-      all the options you would have as a user on your own installation of Bugzilla,
-      nor can it do more than serve as a general introduction to Bugzilla.  Additionally,
-      Landfill often runs cutting-edge versions of Bugzilla for testing, so some things
-      may work slightly differently than mentioned here.
+      </note> Although Landfill serves as a great introduction to
+      Bugzilla, it does not offer all the options you would have as a
+      user on your own installation of Bugzilla, nor can it do more
+      than serve as a general introduction to Bugzilla.  Additionally,
+      Landfill often runs cutting-edge versions of Bugzilla for
+      testing, so some things may work slightly differently than
+      mentioned here.
     </para>
     
     <section id="myaccount">
       <title>Create a Bugzilla Account</title>
       <para>
-	First things first!  If you want to use Bugzilla, first you need to create
-	an account.  Consult with the administrator responsible for your installation
-	of Bugzilla for the URL you should use to access it.
-	If you're test-driving the end-user Bugzilla experience, use this URL:
-	<ulink url="http://landfill.tequilarista.org/bugzilla-tip/">
-	  http://landfill.tequilarista.org/bugzilla-tip/</ulink>
+	First things first!  If you want to use Bugzilla, first you
+	need to create an account.  Consult with the administrator
+	responsible for your installation of Bugzilla for the URL you
+	should use to access it. If you're test-driving the end-user
+	Bugzilla experience, use this URL: <ulink
+						  url="http://landfill.tequilarista.org/bugzilla-tip/"> http://landfill.tequilarista.org/bugzilla-tip/</ulink>
       </para>
       <orderedlist>
 	<listitem>
@@ -238,64 +251,81 @@ system against which all others are measured.
 	</listitem>
 	<listitem>
 	  <para>
-	    Enter your "E-mail address" and "Real Name" (or whatever name you want to call yourself)
-	    in the spaces provided, then select the "Create Account" button.
+	    Enter your "E-mail address" and "Real Name" (or whatever
+	    name you want to call yourself) in the spaces provided,
+	    then select the "Create Account" button.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Within 5-10 minutes, you should receive an email to the address you provided above,
-	    which contains your login name (generally the same as the email address), and
-	    a password you can use to access your account.  This password is randomly generated,
-	    and should be changed at your nearest opportunity (we'll go into how to do it later).
+	    Within moments, you should receive an email to the address
+	    you provided above, which contains your login name
+	    (generally the same as the email address), and a password
+	    you can use to access your account.  This password is
+	    randomly generated, and should be changed at your nearest
+	    opportunity (we'll go into how to do it later).
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Click the "Log In" link in the yellow area at the bottom of the page in your browser,
-	    then enter your "E-mail address" and "Password" you just received into the spaces provided,
-	    and select "Login".
+	    Click the <quote>Log In</quote> link in the yellow area at
+	    the bottom of the page in your browser, then enter your
+	    <quote>E-mail address</quote> and <quote>Password</quote>
+	    you just received into the spaces provided, and select
+	    <quote>Login</quote>.
 	    <note>
 	      <para>
-		If you ever forget your password, you can come back to this page, enter your
-		"E-mail address", then select the "E-mail me a password" button to have your password
-		mailed to you again so that you can login.
+		If you ever forget your password, you can come back to
+		this page, enter your <quote>E-mail address</quote>,
+		then select the <quote>E-mail me a password</quote>
+		button to have your password mailed to you again so
+		that you can login.
 	      </para>
 	    </note>
 	    <caution>
 	      <para>
-		Many modern browsers include an "Auto-Complete" or "Form Fill" feature to
-		remember the user names and passwords you type in at many sites.  Unfortunately,
-		sometimes they attempt to "guess" what you will put in as your password, and guess
-		wrong.  If you notice a text box is already filled out, please overwrite the contents
-		of the text box so you can be sure to input the correct information.
+		Many modern browsers include an
+		<quote>Auto-Complete</quote> or <quote>Form
+		  Fill</quote> feature to remember the user names and
+		passwords you type in at many sites.  Unfortunately,
+		sometimes they attempt to guess what you will put in
+		as your password, and guess wrong.  If you notice a
+		text box is already filled out, please overwrite the
+		contents of the text box so you can be sure to input
+		the correct information.
 	      </para>
 	    </caution>
 	  </para>
 	</listitem>
       </orderedlist>
       <para>
-	Congratulations!  If you followed these directions, you now are the
-	proud owner of a user account on landfill.tequilarista.org (Landfill) or
-	your local Bugzilla install.  You should now see in your browser a
-	page called the "Bugzilla Query Page".  It may look daunting, but
-	with this Guide to walk you through it, you will master it in no time.
+	Congratulations!  If you followed these directions, you now
+	are the proud owner of a user account on
+	landfill.tequilarista.org (Landfill) or your local Bugzilla
+	install.  You should now see in your browser a page called the
+	<quote>Bugzilla Query Page</quote>.  It may look daunting, but with this
+	Guide to walk you through it, you will master it in no time.
       </para>
     </section>
     
     <section id="query">
       <title>The Bugzilla Query Page</title>
       <para>
-	The Bugzilla Query Page is the heart and soul of Bugzilla.  It is the master
-	interface where you can find any bug report, comment, or patch currently in the Bugzilla
-	system.  We'll go into how to create your own bug report later on.
+	The Bugzilla Query Page is the heart and soul of the Bugzilla
+	user experience.  It is the master interface where you can
+	find any bug report, comment, or patch currently in the
+	Bugzilla system.  We'll go into how to create your own bug
+	report later on.
       </para>
       <para>
-	There are efforts underway to simplify query usage.  If you have a local installation
-	of Bugzilla 2.12 or higher, you should have "quicksearch.html" available
-	to use and simplify your searches.  There is also, or shortly will be, a helper
-	for the query interface, called "queryhelp.cgi".  Landfill tends to run the latest code,
-	so these two utilities should be available there for your perusal.
+	There are efforts underway to simplify query usage.  If you
+	have a local installation of Bugzilla 2.12 or higher, you
+	should have <filename>quicksearch.html</filename> available to
+	use and simplify your searches.  There is also a helper for
+	the query interface, called
+	<filename>queryhelp.cgi</filename>.  Landfill tends to run the
+	latest code, so these two utilities should be available there
+	for your perusal.
       </para>
       <para>
 	At this point, please visit the main Bugzilla site,
@@ -303,47 +333,57 @@ system against which all others are measured.
 	bugzilla.mozilla.org</ulink>, to see a more fleshed-out query page.
       </para>
       <para>
-	The first thing you need to notice about the Bugzilla Query Page is that
-	nearly every box you see on your screen has a hyperlink nearby, explaining what
-	it is or what it does.  Near the upper-left-hand corner of your browser window
-	you should see the word "Status" underlined.  Select it.
+	The first thing you need to notice about the Bugzilla Query
+	Page is that nearly every box you see on your screen has a
+	hyperlink nearby, explaining what it is or what it does.  Near
+	the upper-left-hand corner of your browser window you should
+	see the word <quote>Status</quote> underlined.  Select it.
       </para>
       <para>
-	Notice the page that popped up?  Every underlined word you see on your screen
-	is a hyperlink that will take you to context-sensitive help.
-	Click around for a while, and learn what everything here does.  To return
-	to the query interface after pulling up a help page, use the "Back" button in
-	your browser.
+	Notice the page that popped up?  Every underlined word you see
+	on your screen is a hyperlink that will take you to
+	context-sensitive help. Click around for a while, and learn
+	what everything here does.  To return to the query interface
+	after pulling up a help page, use the <quote>Back</quote>
+	button in your browser.
       </para>
       <para>
-	I'm sure that after checking out the online help, you are now an Expert
-	on the Bugzilla Query Page.  If, however, you feel you haven't mastered it yet,
-	let me walk you through making a few successful queries to find out what there
-	are in the Bugzilla bug-tracking system itself.
+	I'm sure that after checking out the online help, you are now
+	an expert on the Bugzilla Query Page.  If, however, you feel
+	you haven't mastered it yet, let me walk you through making a
+	few successful queries to find out what there are in the
+	Bugzilla bug-tracking system itself.
       </para>
       <orderedlist>
 	<listitem>
 	  <para>
-	    Ensure you are back on the "Bugzilla Query Page"
-	    Do nothing in the boxes marked "Status", "Resolution", "Platform", "OpSys",
-	    "Priority", or "Severity".  The default query for "Status" is to find all bugs that
-	    are NEW, ASSIGNED, or REOPENED, which is what we want.  If you don't select anything
-	    in the other 5 scrollboxes there, then you are saying that "any of these are OK";
-	    we're not locking ourselves into only finding bugs on the "DEC" Platform, or "Windows 95"
-	    OpSys (Operating System).  You're smart, I think you have it figured out.
+	    Ensure you are back on the <quote>Bugzilla Query
+	      Page</quote>. Do nothing in the boxes marked "Status",
+	    "Resolution", "Platform", "OpSys", "Priority", or
+	    "Severity".  The default query for "Status" is to find all
+	    bugs that are NEW, ASSIGNED, or REOPENED, which is what we
+	    want.  If you don't select anything in the other 5
+	    scrollboxes there, then you are saying that "any of these
+	    are OK"; we're not locking ourselves into only finding
+	    bugs on the "DEC" Platform, or "Windows 95" OpSys
+	    (Operating System).  You're smart, I think you have it
+	    figured out.
 	  </para>
 	  <para>
-	    Basically, selecting <emphasis>anything</emphasis> on the query page narrows your search
-	    down.  Leaving stuff unselected, or text boxes unfilled, broadens your search!
+	    Basically, selecting <emphasis>anything</emphasis> on the
+	    query page narrows your search down.  Leaving stuff
+	    unselected, or text boxes unfilled, broadens your search.
 	  </para>
 	</listitem>
 
 	<listitem>
 	  <para>
-	    You see the box immediately below the top six boxes that contains an "Email" text box, 
-	    with the words "matching as", a drop-down selection box, then some checkboxes with
-	    "Assigned To" checked by default?  This allows you to filter your search down based upon
-	    email address.  Let's put my email address in there, and see what happens.
+	    You see the box immediately below the top six boxes that
+	    contains an "Email" text box,  with the words "matching
+	    as", a drop-down selection box, then some checkboxes with
+	    "Assigned To" checked by default?  This allows you to
+	    filter your search down based upon email address.  Let's
+	    put my email address in there, and see what happens.
 	  </para>
 	  <para>
 	    Type "barnboy@trilobyte.net" in the top Email text box.
@@ -352,47 +392,55 @@ system against which all others are measured.
 
 	<listitem>
 	  <para>
-	    Let's narrow the search some more.  Scroll down until you find the box with the word
-	    "Program" over the top of it.  This is where we can narrow our search down to only
-	    specific products (software programs or product lines) in our Bugzilla database.
-	    Please notice the box is a <emphasis>scrollbox</emphasis>.  Using the down arrow on the
-	    scrollbox, scroll down until you can see an entry called "Webtools".  Select this entry.
+	    Let's narrow the search some more.  Scroll down until you
+	    find the box with the word "Program" over the top of it.
+	    This is where we can narrow our search down to only
+	    specific products (software programs or product lines) in
+	    our Bugzilla database. Please notice the box is a
+	    <emphasis>scrollbox</emphasis>.  Using the down arrow on
+	    the scrollbox, scroll down until you can see an entry
+	    called "Webtools".  Select this entry.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Did you notice that some of the boxes to the right changed when you selected "Webtools"?
-	    Every Program (or Product) has different Versions, Components, and Target Milestones associated
-	    with it.  A "Version" is the number of a software program.
+	    Did you notice that some of the boxes to the right changed
+	    when you selected "Webtools"? Every Program (or Product)
+	    has different Versions, Components, and Target Milestones
+	    associated with it.  A "Version" is the number of a
+	    software program.
 	    <example>
 	      <title>Some Famous Software Versions</title>
 	      <informalexample>
 		<para>
-		  Do you remember the hype in 1995 when Microsoft Windows 95(r) was released?
-		  It may have been several years
-		  ago, but Microsoft(tm) spent over $300 Million advertising this new Version of their
-		  software.  Three years later, they released Microsoft Windows 98(r),
-		  another new version, to great fanfare, and then in 2000 quietly 
-		  released Microsoft Windows ME(Millenium Edition)(r). 
+		  Do you remember the hype in 1995 when Microsoft
+		  Windows 95(r) was released? It may have been several
+		  years ago, but Microsoft(tm) spent over $300 Million
+		  advertising this new Version of their software.
+		  Three years later, they released Microsoft Windows
+		  98(r), another new version, to great fanfare, and
+		  then in 2000 quietly  released Microsoft Windows
+		  ME(Millenium Edition)(r). 
 		</para>
 		<para>
-		  Software "Versions" help a manufacturer differentiate
-		  their current product from their
-		  previous products.  Most do not identify their products
-		  by the year they were released.
-		  Instead, the "original" version of their software will
-		  often be numbered "1.0", with
-		  small bug-fix releases on subsequent tenths of a digit.  In most cases, it's not
-		  a decimal number; for instance, often 1.9 is an <emphasis>older</emphasis> version
-		  of the software than 1.11,
-		  but is a <emphasis>newer</emphasis> version than 1.1.1.
+		  Software "Versions" help a manufacturer
+		  differentiate their current product from their
+		  previous products.  Most do not identify their
+		  products by the year they were released. Instead,
+		  the "original" version of their software will often
+		  be numbered "1.0", with small bug-fix releases on
+		  subsequent tenths of a digit.  In most cases, it's
+		  not a decimal number; for instance, often 1.9 is an
+		  <emphasis>older</emphasis> version of the software
+		  than 1.11, but is a <emphasis>newer</emphasis>
+		  version than 1.1.1.
 		</para>
 		<para>
-		  In general, a "Version" in Bugzilla should refer to 
-		  <emphasis>released</emphasis>
-		  products, not products that have not yet been released 
-		  to the public.  Forthcoming products
-		  are what the Target Milestone field is for.
+		  In general, a "Version" in Bugzilla should refer to
+		  <emphasis>released</emphasis> products, not products
+		  that have not yet been released  to the public.
+		  Forthcoming products are what the Target Milestone
+		  field is for.
 		</para>
 	      </informalexample>
 	    </example>
@@ -438,26 +486,25 @@ system against which all others are measured.
 	    </example>
 	  </para>
 	  <para>
-	    A "Milestone", or "Target Milestone" is a often a planned future "Version" of a
-	    product.  In many cases, though, Milestones simply represent significant dates for
-	    a developer.  Having certain features in your Product is frequently
-	    tied to revenue (money)
-	    the developer will receive if the features work by the time she 
-	    reaches the Target Milestone.
-	    Target Milestones are a great tool to organize your time.
-	    If someone will pay you $100,000 for
-	    incorporating certain features by a certain date,
-	    those features by that Milestone date become
-	    a very high priority.  Milestones tend to be highly malleable creatures,
-	    though, that appear
-	    to be in reach but are out of reach by the time the important day arrives.
+	    A "Milestone", or "Target Milestone" is a often a planned
+	    future "Version" of a product.  In many cases, though,
+	    Milestones simply represent significant dates for a
+	    developer.  Having certain features in your Product is
+	    frequently tied to revenue (money) the developer will
+	    receive if the features work by the time she  reaches the
+	    Target Milestone. Target Milestones are a great tool to
+	    organize your time. If someone will pay you $100,000 for
+	    incorporating certain features by a certain date, those
+	    features by that Milestone date become a very high
+	    priority.  Milestones tend to be highly malleable
+	    creatures, though, that appear to be in reach but are out
+	    of reach by the time the important day arrives.
 	  </para>
 	  <para>
-	    The Bugzilla Project has set up Milestones for future 
-	    Bugzilla versions 2.14, 2.16, 2.18, 3.0, etc.  However,
-	    a Target Milestone can just as easily be a specific date,
-	    code name, or weird alphanumeric
-	    combination, like "M19".
+	    The Bugzilla Project has set up Milestones for future
+	    Bugzilla versions 2.14, 2.16, 2.18, 3.0, etc.  However, a
+	    Target Milestone can just as easily be a specific date,
+	    code name, or weird alphanumeric combination, like "M19".
 	  </para>
 	</listitem>
 
@@ -475,56 +522,54 @@ system against which all others are measured.
 	</listitem>
 	<listitem>
 	  <para>
-	    Congratulations!  You've completed your first Query, and have before you the Bug List
-	    of the author of this Guide, Matthew P. Barnson (barnboy@trilobyte.net).  If I'm
-	    doing well,
-	    you'll have a cryptic "Zarro Boogs Found" message on your screen.  It is just
-	    a happy hacker's way of saying "Zero Bugs Found".  However, I am fairly certain I will
+	    Congratulations!  You've completed your first Query, and
+	    have before you the Bug List of the author of this Guide,
+	    Matthew P. Barnson (barnboy@trilobyte.net).  If I'm doing
+	    well, you'll have a cryptic "Zarro Boogs Found" message on
+	    your screen.  It is just a happy hacker's way of saying
+	    "Zero Bugs Found".  However, I am fairly certain I will
 	    always have some bugs assigned to me that aren't done yet,
 	    so you won't often see that message!
 	  </para>
 	</listitem>
       </orderedlist>
       <para>
-	I encourage you to click the bug numbers in the left-hand column and examine
-	my bugs.  Also notice that if you click the underlined 
-	links near the top of this page, they do
-	not take you to context-sensitive help here,
-	but instead sort the columns of bugs on the screen!
-	When you need to sort your bugs by priority, severity,
-	or the people they are assigned to, this
-	is a tremendous timesaver.
+	I encourage you to click the bug numbers in the left-hand
+	column and examine my bugs.  Also notice that if you click the
+	underlined  links near the top of this page, they do not take
+	you to context-sensitive help here, but instead sort the
+	columns of bugs on the screen! When you need to sort your bugs
+	by priority, severity, or the people they are assigned to,
+	this is a tremendous timesaver.
       </para>
       <para>
 	A couple more interesting things about the Bug List page:
 	<simplelist>
-	  <member><emphasis>Change Columns</emphasis>:
-	    by selecting this link, you can show all kinds
-	    of information in the Bug List</member>
-	  <member><emphasis>Change several bugs at once</emphasis>:
-	    If you have sufficient rights to change all
-	    the bugs shown in the Bug List, you can mass-modify them.
-	    This is a big time-saver.</member>
-	  <member><emphasis>Send mail to bug owners</emphasis>:
-	    If you have many related bugs, you can request
-	    an update from every person who owns the bugs in
-	    the Bug List asking them the status.</member>
-	  <member><emphasis>Edit this query</emphasis>:
-	    If you didn't get exactly the results you were looking for,
-	    you can return to the Query page through this link and make
-	    small revisions to the query you just made so
-	    you get more accurate results.</member>
+	  <member><emphasis>Change Columns</emphasis>: by selecting
+	    this link, you can show all kinds of information in the
+	    Bug List</member>
+	  <member><emphasis>Change several bugs at once</emphasis>: If
+	    you have sufficient rights to change all the bugs shown in
+	    the Bug List, you can mass-modify them. This is a big
+	    time-saver.</member>
+	  <member><emphasis>Send mail to bug owners</emphasis>: If you
+	    have many related bugs, you can request an update from
+	    every person who owns the bugs in the Bug List asking them
+	    the status.</member>
+	  <member><emphasis>Edit this query</emphasis>: If you didn't
+	    get exactly the results you were looking for, you can
+	    return to the Query page through this link and make small
+	    revisions to the query you just made so you get more
+	    accurate results.</member>
 	</simplelist>
       </para>
       <note>
 	<para>
-	  There are many more options to the Bugzilla Query Page 
-	  and the Bug List than I have shown you.
-	  But this should be enough for you to learn to get around.
-	  I encourage you to check out the
-	  <ulink url="http://www.mozilla.org/bugs/">Bugzilla Home Page</ulink>
-	  to learn about the Anatomy
-	  and Life Cycle of a Bug before continuing.
+	  There are many more options to the Bugzilla Query Page  and
+	  the Bug List than I have shown you. But this should be
+	  enough for you to learn to get around. I encourage you to
+	  check out the <ulink
+			       url="http://www.mozilla.org/bugs/">Bugzilla Home Page</ulink> to learn about the Anatomy and Life Cycle of a Bug before continuing.
 	</para>
       </note>
     </section>
@@ -539,37 +584,35 @@ system against which all others are measured.
       <section id="bug_writing">
 	<title>Writing a Great Bug Report</title>
 	<para>
-	  Before we plunge into writing your first bug report, I encourage you to read 
-	  <ulink url="http://www.mozilla.org/quality/bug-writing-guidelines.html">Mozilla.org's Bug
-	    Writing Guidelines</ulink>.  While some of the advice is Mozilla-specific, the basic
-	  principles of reporting Reproducible, Specific bugs, isolating the Product you are
-	  using, the Version of the Product, the Component which failed, the Hardware Platform, and
-	  Operating System you were using at the time of the failure go a long way toward ensuring accurate,
-	  responsible fixes for the bug that bit you.
+	  Before we plunge into writing your first bug report, I
+	  encourage you to read some bug-writing guidelines.  If you
+	  are reading this document as part of a Bugzilla CVS checkout
+	  or un-tarred Bugzilla distribution, you should be able to
+	  read them by clicking <ulink
+				       url="../../bugwritinghelp.html">here</ulink>.  If you are reading this online, check out the Mozilla.org bug-writing guidelines at <ulink url="http://www.mozilla.org/quality/bug-writing-guidelines.html">http://www.mozilla.org/quality/bug-writing-guidelines.html</ulink>.  While some of the advice is Mozilla-specific, the basic principles of reporting Reproducible, Specific bugs, isolating the Product you are using, the Version of the Product, the Component which failed, the Hardware Platform, and Operating System you were using at the time of the failure go a long way toward ensuring accurate, responsible fixes for the bug that bit you.
 	</para>
 	<para>
-	  While you are at it, why not learn how to find previously reported bugs?  Mozilla.org
-	  has published a great tutorial on finding duplicate bugs, available at
-	  <ulink url="http://www.mozilla.org/quality/help/beginning-duplicate-finding.html">
-	    http://www.mozilla.org/quality/help/beginning-duplicate-finding.html</ulink>.
+	  While you are at it, why not learn how to find previously
+	  reported bugs?  Mozilla.org has published a great tutorial
+	  on finding duplicate bugs, available at <ulink
+							 url="http://www.mozilla.org/quality/help/beginning-duplicate-finding.html"> http://www.mozilla.org/quality/help/beginning-duplicate-finding.html</ulink>.
 	</para>
 	<para>
-	  I realize this was a lot to read.  However, understanding the mentality of writing
-	  great bug reports will help us on the next part!
+	  I realize this was a lot to read.  However, understanding
+	  the mentality of writing great bug reports will help us on
+	  the next part!
 	</para>
 	<orderedlist>
 	  <listitem>
 	    <para>
-	      Go back to <ulink url="http://landfill.tequilarista.org/bugzilla-tip/">
-		http://landfill.tequilarista.org/bugzilla-tip/</ulink>
-	      in your browser.
+	      Go back to <ulink
+				url="http://landfill.tequilarista.org/bugzilla-tip/"> http://landfill.tequilarista.org/bugzilla-tip/</ulink> in your browser.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the 
-	      <ulink url="http://landfill.tequilarista.org/bugzilla-tip/enter_bug.cgi">
-		Enter a new bug report</ulink> link.
+	      Select the  <ulink
+				 url="http://landfill.tequilarista.org/bugzilla-tip/enter_bug.cgi"> Enter a new bug report</ulink> link.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -579,11 +622,11 @@ system against which all others are measured.
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Now you should be at the "Enter Bug" form.
-	      The "reporter" should have been automatically filled out
-	      for you (or else Bugzilla prompted you to Log In again
-	      -- you did keep the email with your username
-	      and password, didn't you?).
+	      Now you should be at the "Enter Bug" form. The
+	      "reporter" should have been automatically filled out for
+	      you (or else Bugzilla prompted you to Log In again --
+	      you did keep the email with your username and password,
+	      didn't you?).
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -593,107 +636,97 @@ system against which all others are measured.
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Bugzilla should have made reasonable guesses, based upon your browser,
-	      for the "Platform" and "OS" drop-down
-	      boxes.  If those are wrong, change them -- if you're on an SGI box
-	      running IRIX, we want to know!
+	      Bugzilla should have made reasonable guesses, based upon
+	      your browser, for the "Platform" and "OS" drop-down
+	      boxes.  If those are wrong, change them -- if you're on
+	      an SGI box running IRIX, we want to know!
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Fill in the "Assigned To" box with the email address you provided earlier. 
-	      This way you don't end up sending copies of your bug to lots of other people,
-	      since it's just a test bug.
+	      Fill in the "Assigned To" box with the email address you
+	      provided earlier.  This way you don't end up sending
+	      copies of your bug to lots of other people, since it's
+	      just a test bug.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Leave the "CC" text box blank. 
-	      Fill in the "URL" box with "http://www.mozilla.org".
+	      Leave the "CC" text box blank.  Fill in the "URL" box
+	      with "http://www.mozilla.org".
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Enter "The Bugzilla Guide" in the Summary text box,
-	      and place any comments you have on this
-	      tutorial, or the Guide in general, into the Description box.
+	      Enter "The Bugzilla Guide" in the Summary text box, and
+	      place any comments you have on this tutorial, or the
+	      Guide in general, into the Description box.
 	    </para>
 	  </listitem>
 	</orderedlist>
 	<para>
-	  Voila!  Select "Commit" and send in your bug report!
-	  Next we'll look at resolving bugs.
+	  Voila!  Select "Commit" and send in your bug report! Next
+	  we'll look at resolving bugs.
 	</para>
       </section>
 
       <section id="bug_manage">
 	<title>Managing your Bug Reports</title>
 	<para>
-	  OK, you should have a link to the bug you just created near the top of your page.
-	  It should say
-	  "Bug XXXX posted", with a link to the right saying "Back to BUG# XXXX".
-	  Select this link.
+	  OK, you should have a link to the bug you just created near
+	  the top of your page. It should say "Bug XXXX posted", with
+	  a link to the right saying "Back to BUG# XXXX". Select this
+	  link.
 	</para>
 	<orderedlist>
 	  <listitem>
 	    <para>
-	      Scroll down a bit on the subsequent page,
-	      until you see the "Resolve bug, changing resolution to (dropdown box).
-	      Normally, you would
-	      "Accept bug (change status to ASSIGNED)", fix it, and then resolve.
-	      But in this case, we're
-	      going to short-circuit the process because this wasn't a real bug.
-	      Change the dropdown next to
-	      "Resolve Bug" to "INVALID", make sure the radio button is
-	      marked next to "Resolve Bug", then
-	      click "Commit".
+	      Scroll down a bit on the subsequent page, until you see
+	      the "Resolve bug, changing resolution to (dropdown box).
+	      Normally, you would "Accept bug (change status to
+	      ASSIGNED)", fix it, and then resolve. But in this case,
+	      we're going to short-circuit the process because this
+	      wasn't a real bug. Change the dropdown next to "Resolve
+	      Bug" to "INVALID", make sure the radio button is marked
+	      next to "Resolve Bug", then click "Commit".
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Hey!  It said it couldn't take the change in a big red box!
-	      That's right, you must specify
-	      a Comment in order to make this change.  Select the "Back"
-	      button in your browser, add a
-	      Comment, then try Resolving the bug with INVALID status again.
-	      This time it should work.
+	      Hey!  It said it couldn't take the change in a big red
+	      box! That's right, you must specify a Comment in order
+	      to make this change.  Select the "Back" button in your
+	      browser, add a Comment, then try Resolving the bug with
+	      INVALID status again. This time it should work.
 	    </para>
 	  </listitem>
 	</orderedlist>
 	<para>
 	  You have now learned the basics of Bugzilla navigation,
-	  entering a bug, and bug maintenance.
-	  I encourage you to explore these features, and see what you can do with them!
-	  We'll spend no more time on individual Bugs or Queries from this point on, so you are
-	  on your own there.
+	  entering a bug, and bug maintenance. I encourage you to
+	  explore these features, and see what you can do with them!
+	  We'll spend no more time on individual Bugs or Queries from
+	  this point on, so you are on your own there.
 	</para>
 	<para>
 	  But I'll give a few last hints!
 	</para>
 	<para>
-	  There is a <ulink url="http://bugzilla.mozilla.org/help.html">CLUE</ulink>
-	  on the Query page
-	  that will teach you more how to use the form.
+	  There is a <ulink
+			    url="http://bugzilla.mozilla.org/help.html">CLUE</ulink> on the Query page that will teach you more how to use the form.
 	</para>
 	<para>
-	  If you click the hyperlink on the
-	  <ulink url="http://bugzilla.mozilla.org/describecomponents.cgi">Component</ulink>
-	  box of the Query page, you will be presented a form that will describe what all
-	  the components are.
+	  If you click the hyperlink on the <ulink
+						   url="http://bugzilla.mozilla.org/describecomponents.cgi">Component</ulink> box of the Query page, you will be presented a form that will describe what all the components are.
 	</para>
 	<para>
-	  Possibly the most powerful feature of the Query page is the 
-	  <ulink url="http://bugzilla.mozilla.org/booleanchart.html">Boolean Chart</ulink> section.
-	  It's a bit confusing to use the first time, but can provide unparalleled
-	  flexibility in your queries,
-	  allowing you to build extremely powerful requests.
+	  Possibly the most powerful feature of the Query page is the
+	  <ulink
+		 url="http://bugzilla.mozilla.org/booleanchart.html">Boolean Chart</ulink> section. It's a bit confusing to use the first time, but can provide unparalleled flexibility in your queries, allowing you to build extremely powerful requests.
 	</para>
 	<para>
-	  Finally, you can build some nifty 
-	  <ulink url="http://bugzilla.mozilla.org/reports.cgi">Reports</ulink>
-	  using the "Bug Reports" link near the bottom of the query page, and also
-	  available via the "Reports" link
-	  at the footer of each page.
+	  Finally, you can build some nifty  <ulink
+						    url="http://bugzilla.mozilla.org/reports.cgi">Reports</ulink> using the "Bug Reports" link near the bottom of the query page, and also available via the "Reports" link at the footer of each page.
 	</para>
       </section>
     </section>
@@ -701,7 +734,7 @@ system against which all others are measured.
   </section>
 
   <section id="init4me">
-    <title>What's in it for me?</title>
+    <title>Where can I find my user preferences?</title>
     <epigraph>
       <para>
 	Indiana, it feels like we walking on fortune cookies!
@@ -711,98 +744,95 @@ system against which all others are measured.
       </para>
     </epigraph>
     <para>
-      Customized User Preferences offer tremendous versatility to
-      your individual Bugzilla experience.
-      Let's plunge into what you can do!  The first step is to click
-      the "Edit prefs" link at the footer of each page once you
-      have logged in to
-      <ulink url="http://landfill.tequilarista.org/bugzilla-tip/query.cgi?GoAheadAndLogIn=1">
-      Landfill</ulink>.
+      Customized User Preferences offer tremendous versatility to your
+      individual Bugzilla experience. Let's plunge into what you can
+      do!  The first step is to click the "Edit prefs" link at the
+      footer of each page once you have logged in to <ulink
+							    url="http://landfill.tequilarista.org/bugzilla-tip/query.cgi?GoAheadAndLogIn=1"> Landfill</ulink>.
     </para>
-    <section id="accountsettings">
+    <section id="accountsettings" xreflabel="Account Settings">
       <title>Account Settings</title>
       <para>
 	On this page, you can change your basic Account Settings,
-	including your password and full name.
-	For security reasons, in order to change anything on this page you
-	must type your <emphasis>current</emphasis>
-	password into the "Old Password" field. 
-	If you wish to change your password, type the new password you
-	want into the "New Password" field and again into the "Re-enter 
-	new password" field to ensure
-	you typed your new password correctly.  Select the "Submit" button and you're done!
+	including your password and full name. For security reasons,
+	in order to change anything on this page you must type your
+	<emphasis>current</emphasis> password into the <quote>Old
+	  Password</quote> field.  If you wish to change your
+	password, type the new password you want into the <quote>New
+	  Password</quote> field and again into the <quote>Re-enter
+	  new password</quote> field to ensure you typed your new
+	password correctly.  Select the <quote>Submit</quote> button
+	    and you are done.
       </para>
     </section>
-    <section id="emailsettings">
+    <section id="emailsettings" >
       <title>Email Settings</title>
-      <section id="notification">
+      <section id="notification" xreflabel="">
 	<title>Email Notification</title>
-	<note>
-	  <para>
-	    The email notification settings described below have been obsoleted in Bugzilla 2.12, and
-	    this section will be replaced with a comprehensive description of the amazing array of 
-	    new options at your disposal.  However, in the meantime, throw this chunk out the window
-	    and go crazy with goofing around with different notification options.
-	  </para>
-	</note>
 	<para>
-	  Ahh, here you can reduce or increase the amount of email sent you from Bugzilla!
-	  In the drop-down "Notify me of changes to", select one of
-	  <simplelist>
-	    <member><emphasis>All qualifying bugs</emphasis>: sends you every change to every bug
-	      where your name is somewhere on it, regardless of who changed it.</member>
-	    <member><emphasis>Only those bugs which I am listed in the CC line</emphasis>: prevents
-	      you from receiving mail for which you are the reporter,'
-	      owner, or QA contact.  If you are on the CC
-	      list, presumably someone had a <emphasis>good</emphasis>
-	      reason for you to get the email.</member>
-	    <member><emphasis>All qulifying bugs except those which I change</emphasis>:
-	      This is the default, and
-	      a sensible setting.  If someone else changes your bugs, you will get emailed,
-	      but if you change bugs
-	      yourself you will receive no notification of the change.</member>
-	  </simplelist>
+	  Here you can reduce or increase the amount of email sent you
+	  from Bugzilla.  Although this is referred to as
+	  <quote>Advanced Email Filtering Options</quote>, they are,
+	  in fact, the standard email filter set.  All of them are
+	  self-explanatory, but you can use the filters in interesting
+	  ways.  For instance, some people (notably Quality Assurance
+	  personnel) often only care to receive updates regarding a
+	  bug when the bug changes state, so they can track bugs on
+	  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
+	  restrict which types of Bugzilla information are fed to
+	  these systems..
 	</para>
       </section>
       <section id="newemailtech">
 	<title>New Email Technology</title>
 	<note>
 	  <para>
-	    This option may not be available in all Bugzilla installations, depending upon
-	    the preferences of the systems administrator responsible for the setup of your Bugzilla.
-	    However, if you really want this functionality, ask her to "enable newemailtech
-	    in Params"
-	    and "make it the default for all new users", referring her to the Administration section
-	    of this Guide.
+	    This option may not be available in all Bugzilla
+	    installations, depending upon the preferences of the
+	    systems administrator responsible for the setup of your
+	    Bugzilla. However, if you really want this functionality,
+	    ask her to "enable newemailtech in Params" and "make it
+	    the default for all new users", referring her to the
+	    Administration section of this Guide.
 	  </para>
 	</note>
 	<para>
-	  Disregard the warnings about "experimental and bleeding edge"; the code to handle email
-	  in a cleaner manner than that historically used for Bugzilla is
-	  quite robust and well-tested now.
+	  Disregard the warnings about "experimental and bleeding
+	  edge"; the code to handle email in a cleaner manner than
+	  that historically used for Bugzilla is quite robust and
+	  well-tested now.
 	</para>
 	<para>
-	  I recommend you enable the option, "Click here to sign up (and risk any bugs)".
-	  Your email-box
-	  will thank you for it.  The fundamental shift in "newemailtech" is away from standard UNIX
-	  "diff" output, which is quite ugly, to a prettier, better laid-out email.
+	  I recommend you enable the option, "Click here to sign up
+	  (and risk any bugs)". Your email-box will thank you for it.
+	  The fundamental shift in "newemailtech" is away from
+	  standard UNIX "diff" output, which is quite ugly, to a
+	  prettier, better laid-out email.
 	</para>
       </section>
       <section id="watchsettings">
 	<title>"Watching" Users</title>
 	<note>
 	  <para>
-	    This option may not be available in all Bugzilla installations, depending upon
-	    the preferences of the systems administrator responsible for the setup of your Bugzilla.
-	    However, if you really want this functionality, ask her to "enable watchers in Params".
+	    This option may not be available in all Bugzilla
+	    installations, depending upon the preferences of the
+	    systems administrator responsible for the setup of your
+	    Bugzilla. However, if you really want this functionality,
+	    ask her to "enable watchers in Params".
 	  </para>
 	</note>
 	<para>
-	  By entering user email names into the "Users to watch" text entry box, delineated by commas,
-	  you can watch bugs of other users.  This powerful functionality enables seamless transitions
-	  as developers change projects, managers wish to get in touch with the issues faced by their
-	  direct reports, or users go on vacation.  If any of these three situations apply
-	  to you, you will undoubtedly find this feature quite convenient.
+	  By entering user email names into the "Users to watch" text
+	  entry box, delineated by commas, you can watch bugs of other
+	  users.  This powerful functionality enables seamless
+	  transitions as developers change projects, managers wish to
+	  get in touch with the issues faced by their direct reports,
+	  or users go on vacation.  If any of these three situations
+	  apply to you, you will undoubtedly find this feature quite
+	  convenient.
 	</para>
       </section>
     </section>
@@ -810,36 +840,46 @@ system against which all others are measured.
       <title>Page Footer</title>
       <note>
 	<para>
-	  By default, this page is quite barren.  However, go explore the Query Page some more; you will
-	  find that you can store numerous queries on the server, so if you regularly run a particular query
-	  it is just a drop-down menu away.  On this page of Preferences, if you have many stored
-	  queries you can elect to have them always one-click away!
+	  By default, this page is quite barren.  However, go explore
+	  the Query Page some more; you will find that you can store
+	  numerous queries on the server, so if you regularly run a
+	  particular query it is just a drop-down menu away.  On this
+	  page of Preferences, if you have many stored queries you can
+	  elect to have them always one-click away!
 	</para>
       </note>
       <para>
-	If you have many stored queries on the server, here you will find individual drop-downs for each
-	stored query.  Each drop-down gives you the option of that query appearing on the footer of every
-	page in Bugzilla!  This gives you powerful one-click access to any complex searches you may set up,
-	and is an excellent way to impress your boss...
+	If you have many stored queries on the server, here you will
+	find individual drop-downs for each stored query.  Each
+	drop-down gives you the option of that query appearing on the
+	footer of every page in Bugzilla!  This gives you powerful
+	one-click access to any complex searches you may set up, and
+	is an excellent way to impress your boss...
       </para>
       <tip>
-	<para>By default, the "My Bugs" link appears at the bottom of each page.  However, this query
-	gives you both the bugs you have reported, as well as those you are assigned.  One of the most
-	common uses for this page is to remove the "My Bugs" link, replacing it with two other queries,
-	commonly called "My Bug Reports" and "My Bugs" (but only referencing bugs assigned to you).  This
-	allows you to distinguish those bugs you have reported from those you are assigned.  I commonly
-	set up complex Boolean queries in the Query page and link them to my footer in this page.  When
-	they are significantly complex, a one-click reference can save hours of work.</para>
+	<para>By default, the "My Bugs" link appears at the bottom of
+	  each page.  However, this query gives you both the bugs you
+	  have reported, as well as those you are assigned.  One of
+	  the most common uses for this page is to remove the "My
+	  Bugs" link, replacing it with two other queries, commonly
+	  called "My Bug Reports" and "My Bugs" (but only referencing
+	  bugs assigned to you).  This allows you to distinguish those
+	  bugs you have reported from those you are assigned.  I
+	  commonly set up complex Boolean queries in the Query page
+	  and link them to my footer in this page.  When they are
+	  significantly complex, a one-click reference can save hours
+	  of work.</para>
       </tip>
     </section>
     <section id="permissionsettings">
       <title>Permissions</title>
       <para>
-	This is a purely informative page which outlines your current permissions on
-	this installation of Bugzilla.  If you have permissions to grant certain permissions to
-	other users, the "other users" link appears on this page as well as the footer.
-	For more information regarding user administration, please consult the Administration
-	section of this Guide.
+	This is a purely informative page which outlines your current
+	permissions on this installation of Bugzilla.  If you have
+	permissions to grant certain permissions to other users, the
+	"other users" link appears on this page as well as the footer.
+	For more information regarding user administration, please
+	consult the Administration section of this Guide.
       </para>
     </section>
   </section>
@@ -847,12 +887,11 @@ system against which all others are measured.
   <section id="usingbz-conc">
     <title>Using Bugzilla-Conclusion</title>
     <para>
-      Thank you for reading through this portion of the Bugzilla Guide.  I anticipate
-      it may not yet meet the needs of all readers.  If you have additional comments or
-      corrections to make, please submit your contributions to the
-      <ulink url="mailto://mozilla-webtools@mozilla.org">mozilla-webtools</ulink>
-      mailing list/newsgroup.  The mailing list is mirrored to the netscape.public.mozilla.webtools
-      newsgroup, and the newsgroup is mirrored to mozilla-webtools@mozilla.org
+      Thank you for reading through this portion of the Bugzilla
+      Guide.  I anticipate it may not yet meet the needs of all
+      readers.  If you have additional comments or corrections to
+      make, please submit your contributions to the <ulink
+							   url="mailto://mozilla-webtools@mozilla.org">mozilla-webtools</ulink> mailing list/newsgroup.  The mailing list is mirrored to the netscape.public.mozilla.webtools newsgroup, and the newsgroup is mirrored to mozilla-webtools@mozilla.org
     </para>
   </section>
 </chapter>
diff --git a/docs/sgml/variants.sgml b/docs/sgml/variants.sgml
index fec867946..a5b346023 100644
--- a/docs/sgml/variants.sgml
+++ b/docs/sgml/variants.sgml
@@ -1,72 +1,77 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN">-->
 
-<chapter id="variants">
-  <title>Bugzilla Variants</title>
-  <note>
-    <para>
-      I <emphasis>know</emphasis> there are more variants than just RedHat Bugzilla out there.
-      Please help me get information about them, their project status, and benefits there
-      might be in using them or in using their code in main-tree Bugzilla.
-    </para>
-  </note>
+<chapter id="variants" xreflabel="Bugzilla Variants and Competitors">
+  <title>Bugzilla Variants and Competitors</title>
+  <para>I created this section to answer questions about Bugzilla
+    competitors and variants, then found a wonderful site which covers
+    an awful lot of what I wanted to discuss.  Rather than quote it in
+    its entirety, I'll simply refer you here: <ulink
+						     url="http://linas.org/linux/pm.html">http://linas.org/linux/pm.html</ulink></para>
 
-  <section id="rhbugzilla">
+  <section id="rhbugzilla" xreflabel="Red Hat Bugzilla">
     <title>Red Hat Bugzilla</title>
     <para>
-      Red Hat Bugzilla is probably the most popular Bugzilla variant, aside from Mozilla Bugzilla,
-      on the planet.
-      One of the major benefits of Red Hat Bugzilla is the ability to work with Oracle as a
-      database, as well as MySQL.
-      Here's what Dave Lawrence had to say about the status of Red Hat Bugzilla,
-      <blockquote>
-	<literallayout>
-	  Hello. I apologize that I am getting back to you so late. It has been difficult to keep
-up with email this past week. I have checked out your updated documentation and I will
-have to say very good work. A few notes and additions as follows.
-
-(ed: from the FAQ)
->For the record, we are not using any template type implementation for the cosmetic changes 
->maded to Bugzilla. It is just alot of html changes in the code itself. I admit I may have 
->gotten a little carried away with it but the corporate types asked for a more standardized 
->interface to match up with other projects relating to Red Hat web sites. A lot of other web 
->based internal tools I am working on also look like Bugzilla. 
-
+      Red Hat Bugzilla is probably the most popular Bugzilla variant
+      on the planet. One of the major benefits of Red Hat Bugzilla is
+      the ability to work with Oracle, MySQL, and PostGreSQL databases
+      serving as the back-end, instead of just MySQL.  Dave Lawrence
+      has worked very hard to keep Red Hat Bugzilla up-to-date, and
+      many people prefer the snappier-looking page layout of Red Hat
+      Bugzilla to the default Mozilla-standard formatting.
+    </para>
+    <para>URL: <ulink
+		      url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.redhat.com/bugzilla/</ulink></para>
+  </section>
 
-This should probably be changed since we are now in fact using Text::Template for most
-of the html rendering. You actually state this later in your numbered list.
+  <section id="variant_fenris" xreflabel="Loki Bugzilla, a.k.a. Fenris">
+    <title>Loki Bugzilla (Fenris)</title>
+    <para>Fenris can be found at <ulink
+					url="http://fenris.lokigames.com/">http://fenris.lokigames.com</ulink>.  It is a fork from Bugzilla.</para>
+  </section>
 
-Also number 6 contradicts number 8 where number 6 would be the most up to date status
-on the Oracle port.
+  <section id="variant_issuezilla" xreflabel="Issuezilla">
+    <title>Issuezilla</title>
+    <para>Issuezilla is another fork from Bugzilla, and seems nearly
+      as popular as the Red Hat Bugzilla fork.  Some Issuezilla team
+      members are regular contributors to the Bugzilla mailing
+      list/newsgroup.  Issuezilla is not the primary focus of
+      bug-tracking at tigris.org, however.  Their Java-based
+      bug-tracker, <xref linkend="variant_scarab">, is under heavy development
+      and looks promising!</para>
+    <para>URL:  <ulink url="http://issuezilla.tigris.org/servlets/ProjectHome">http://issuezilla.tigris.org/servlets/ProjectHome</ulink></para>
+  </section>
 
-Additional Information:
------------------------------
-1. Comments are now stored in varchar fields of 4k in size each. If the comment is more
-than 4k it is broken up into chunks and given a sort number so each comment can be re
-assembled in the correct order. This was done because originally I was storing the comments
-in a long datatype which unfortunately cannot be indexed or joined with another table. This
-cause the search of text within the long description to be disabled for a long time. That
-is now working and is nto showing any noticeble performance hit that I can tell. 
+  <section id="variant_scarab" xreflabel="Scarab, a newfangled Java-based issue tracker">
+    <title>Scarab</title>
+    <para>Scarab is a promising new bug-tracking system built using
+      Java Serlet technology.  As of this writing, no source code has
+      been released as a package, but you can obtain the code from
+      CVS.
+    </para>
+    <para>URL: <ulink url="http://scarab.tigris.org/">http://scarab.tigris.org</ulink></para>
+  </section>
 
-2. Work is being started on internationalizing the Bugzilla source we have to allow our
-Japanese customers to enter bug reports into a single bugzilla system. This will probably
-be done by using the nvarchar data types supported by Oracle which allows storage of
-double byte characters and also the use of the Accept-Language in the http header for 
-detection by Bugilla of which language to render.
+  <section id="variant_perforce" xreflabel="Using Perforce to track bugs">
+    <title>Perforce SCM</title>
+    <para>Although Perforce isn't really a bug tracker, it can be used
+      as such through the <quote>jobs</quote> functionality.</para>
+    <para><ulink
+		 url="http://www.perforce.com/perforce/technotes/note052.html"></ulink>http://www.perforce.com/perforce/technotes/note052.html</para>
+  </section>
 
-3. Of course even more cosmetic changes. It is difficult to keep up with the ever 
-changing faces of www.redhat.com.
+  <section id="variant_sourceforge" xreflabel="SourceForge">
+    <title>SourceForge</title>
+    <para>SourceForge is more of a way of coordinating geographically
+      distributed free software and open source projects over the
+      Internet than strictly a bug tracker, but if you're hunting for
+      bug-tracking for your open project, it may be just what the
+      software engineer ordered!</para>
+    <para>URL: <ulink
+		      url="http://www.sourceforge.net">http://www.sourceforge.net</ulink></para>
+  </section>
 
-4. Some convenience enhancements in the administration utilities. And more integration
-with other internal/external Red Hat web sites.
 
-I hope this information may prove helpful for your documentation. Please contact
-me if you have any more question or I can do anything else.
 
-Regards
-	</literallayout>
-      </blockquote>
-    </para>
-  </section>
 </chapter>
 
 <!-- Keep this comment at the end of the file