This checkin contains two fixes:

* Bug 191971 - The guide incorrectly stated that you could resolve a bug via email
* Provide an example of a glossary term in the document conventions section

27 files changed, 394 insertions, 327 deletions

diff --git a/docs/html/Bugzilla-Guide.html b/docs/html/Bugzilla-Guide.html
index 90d42f458..c40121bc0 100644
--- a/docs/html/Bugzilla-Guide.html
+++ b/docs/html/Bugzilla-Guide.html
@@ -1042,6 +1042,23 @@ VALIGN="MIDDLE"
 ><TD
 ALIGN="LEFT"
 VALIGN="MIDDLE"
+>Term found in the glossary</TD
+><TD
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+>&#13;            <A
+HREF="#gloss-bugzilla"
+><I
+CLASS="glossterm"
+>Bugzilla</I
+></A
+>
+          </TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+VALIGN="MIDDLE"
 >Code Example</TD
 ><TD
 ALIGN="LEFT"
@@ -1792,7 +1809,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN336"
+NAME="AEN340"
 ></A
 >3.2.1. Autolinkification</H2
 ><P
@@ -1940,7 +1957,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN365"
+NAME="AEN369"
 ></A
 >3.2.5. Filing Bugs</H2
 ><P
@@ -2879,7 +2896,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN552"
+NAME="AEN556"
 ></A
 >4.1.5.1. DBI</H3
 ><P
@@ -2894,7 +2911,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN555"
+NAME="AEN559"
 ></A
 >4.1.5.2. Data::Dumper</H3
 ><P
@@ -2908,7 +2925,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN558"
+NAME="AEN562"
 ></A
 >4.1.5.3. MySQL-related modules</H3
 ><P
@@ -2934,7 +2951,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN563"
+NAME="AEN567"
 ></A
 >4.1.5.4. TimeDate modules</H3
 ><P
@@ -2950,7 +2967,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN566"
+NAME="AEN570"
 ></A
 >4.1.5.5. GD (optional)</H3
 ><P
@@ -3005,7 +3022,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN573"
+NAME="AEN577"
 ></A
 >4.1.5.6. Chart::Base (optional)</H3
 ><P
@@ -3020,7 +3037,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN576"
+NAME="AEN580"
 ></A
 >4.1.5.7. Template Toolkit</H3
 ><P
@@ -3089,7 +3106,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN586"
+NAME="AEN590"
 ></A
 >4.1.7. Bugzilla</H2
 ><P
@@ -3259,7 +3276,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN611"
+NAME="AEN615"
 ></A
 >4.1.8. Setting Up the MySQL Database</H2
 ><P
@@ -3432,7 +3449,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN647"
+NAME="AEN651"
 ></A
 >4.1.9. <TT
 CLASS="filename"
@@ -3585,7 +3602,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN679"
+NAME="AEN683"
 ></A
 >4.1.10. Securing MySQL</H2
 ><P
@@ -3863,7 +3880,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN745"
+NAME="AEN749"
 ></A
 >4.1.11. Configuring Bugzilla</H2
 ><P
@@ -3889,7 +3906,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN751"
+NAME="AEN755"
 ></A
 >4.2.1. Dependency Charts</H2
 ><P
@@ -3953,7 +3970,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN766"
+NAME="AEN770"
 ></A
 >4.2.2. Bug Graphs</H2
 ><P
@@ -4012,7 +4029,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN779"
+NAME="AEN783"
 ></A
 >4.2.3. The Whining Cron</H2
 ><P
@@ -4923,7 +4940,7 @@ CLASS="section"
 ><HR><H4
 CLASS="section"
 ><A
-NAME="AEN926"
+NAME="AEN930"
 ></A
 >4.3.1.3.3. System Calls</H4
 ><P
@@ -5344,7 +5361,7 @@ WIDTH="100%"
 COLOR="#000000"
 ><PRE
 CLASS="programlisting"
->&#13;Options +ExecCGI 
+>&#13;Options +ExecCGI
 AllowOverride Limit
         </PRE
 ></FONT
@@ -5745,7 +5762,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN1059"
+NAME="AEN1063"
 ></A
 >4.5.1. Bundle::Bugzilla makes me upgrade to Perl 5.6.1</H2
 ><P
@@ -5770,7 +5787,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN1064"
+NAME="AEN1068"
 ></A
 >4.5.2. DBD::Sponge::db prepare failed</H2
 ><P
@@ -7483,7 +7500,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN1409"
+NAME="AEN1413"
 ></A
 >5.7.1. What to Edit</H2
 ><P
@@ -7598,7 +7615,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN1428"
+NAME="AEN1432"
 ></A
 >5.7.2. How To Edit Templates</H2
 ><P
@@ -7680,7 +7697,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN1438"
+NAME="AEN1442"
 ></A
 >5.7.3. Template Formats</H2
 ><P
@@ -7742,7 +7759,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN1451"
+NAME="AEN1455"
 ></A
 >5.7.4. Particular Templates</H2
 ><P
@@ -8652,8 +8669,12 @@ CLASS="QUOTE"
 >"[Bug XXXX]"</SPAN
 >, 
     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.</P
+    you  want to have the bug be closed automatically, you'll have to modify
+    the <TT
+CLASS="filename"
+>contrib/bugzilla_email_append.pl</TT
+> script.
+    </P
 ><P
 >There is also a CVSZilla project, based upon somewhat dated 
     Bugzilla code, to integrate CVS and Bugzilla through CVS' ability to 
@@ -8740,64 +8761,64 @@ HREF="#faq-general"
 ><DL
 ><DT
 >A.1.1. <A
-HREF="#AEN1612"
+HREF="#AEN1617"
 >&#13;	    Where can I find information about Bugzilla?</A
 ></DT
 ><DT
 >A.1.2. <A
-HREF="#AEN1618"
+HREF="#AEN1623"
 >&#13;	    What license is Bugzilla distributed under?
 	  </A
 ></DT
 ><DT
 >A.1.3. <A
-HREF="#AEN1624"
+HREF="#AEN1629"
 >&#13;	    How do I get commercial support for Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.1.4. <A
-HREF="#AEN1633"
+HREF="#AEN1638"
 >&#13;	    What major companies or projects are currently using Bugzilla
 	    for bug-tracking?
 	  </A
 ></DT
 ><DT
 >A.1.5. <A
-HREF="#AEN1657"
+HREF="#AEN1662"
 >&#13;	    Who maintains Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.1.6. <A
-HREF="#AEN1663"
+HREF="#AEN1668"
 >&#13;	    How does Bugzilla stack up against other bug-tracking databases?
 	  </A
 ></DT
 ><DT
 >A.1.7. <A
-HREF="#AEN1669"
+HREF="#AEN1674"
 >&#13;	    Why doesn't Bugzilla offer this or that feature or compatibility
 	    with this other tracking software?
 	  </A
 ></DT
 ><DT
 >A.1.8. <A
-HREF="#AEN1676"
+HREF="#AEN1681"
 >&#13;	    Why MySQL?  I'm interested in seeing Bugzilla run on
 	    Oracle/Sybase/Msql/PostgreSQL/MSSQL.
 	  </A
 ></DT
 ><DT
 >A.1.9. <A
-HREF="#AEN1685"
+HREF="#AEN1690"
 >&#13;	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
 	    "/usr/bin/perl" or something else?
 	  </A
 ></DT
 ><DT
 >A.1.10. <A
-HREF="#AEN1691"
+HREF="#AEN1696"
 >&#13;	    Is there an easy way to change the Bugzilla cookie name?
 	  </A
 ></DT
@@ -8812,41 +8833,41 @@ HREF="#faq-phb"
 ><DL
 ><DT
 >A.2.1. <A
-HREF="#AEN1701"
+HREF="#AEN1706"
 >&#13;	    Is Bugzilla web-based, or do you have to have specific software or
 	    a specific operating system on your machine?
 	  </A
 ></DT
 ><DT
 >A.2.2. <A
-HREF="#AEN1706"
+HREF="#AEN1711"
 >&#13;	    Can Bugzilla integrate with
 	    Perforce (SCM software)?
 	  </A
 ></DT
 ><DT
 >A.2.3. <A
-HREF="#AEN1711"
+HREF="#AEN1716"
 >&#13;	    Does Bugzilla allow the user to track multiple projects?
 	  </A
 ></DT
 ><DT
 >A.2.4. <A
-HREF="#AEN1716"
+HREF="#AEN1721"
 >&#13;	    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?
 	  </A
 ></DT
 ><DT
 >A.2.5. <A
-HREF="#AEN1721"
+HREF="#AEN1726"
 >&#13;	    Does Bugzilla allow attachments (text, screenshots, URLs etc)? If yes,
 	    are there any that are NOT allowed?
 	  </A
 ></DT
 ><DT
 >A.2.6. <A
-HREF="#AEN1726"
+HREF="#AEN1731"
 >&#13;	    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?
@@ -8854,35 +8875,35 @@ HREF="#AEN1726"
 ></DT
 ><DT
 >A.2.7. <A
-HREF="#AEN1733"
+HREF="#AEN1738"
 >&#13;	    Does Bugzilla provide any reporting features, metrics, graphs, etc? You
 	    know, the type of stuff that management likes to see. :)
 	  </A
 ></DT
 ><DT
 >A.2.8. <A
-HREF="#AEN1740"
+HREF="#AEN1745"
 >&#13;	    Is there email notification and if so, what do you see when you get an
 	    email?
 	  </A
 ></DT
 ><DT
 >A.2.9. <A
-HREF="#AEN1745"
+HREF="#AEN1750"
 >&#13;	    Can email notification be set up to send to multiple
 	    people, some on the To List, CC List, BCC List etc?
 	  </A
 ></DT
 ><DT
 >A.2.10. <A
-HREF="#AEN1750"
+HREF="#AEN1755"
 >&#13;	    Do users have to have any particular
 	    type of email application?
 	  </A
 ></DT
 ><DT
 >A.2.11. <A
-HREF="#AEN1757"
+HREF="#AEN1762"
 >&#13;	    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
@@ -8891,28 +8912,28 @@ HREF="#AEN1757"
 ></DT
 ><DT
 >A.2.12. <A
-HREF="#AEN1769"
+HREF="#AEN1774"
 >&#13;	    Has anyone converted Bugzilla to another language to be used in other
 	    countries? Is it localizable?
 	  </A
 ></DT
 ><DT
 >A.2.13. <A
-HREF="#AEN1776"
+HREF="#AEN1781"
 >&#13;	    Can a user create and save reports? Can they do this in Word format?
 	    Excel format?
 	  </A
 ></DT
 ><DT
 >A.2.14. <A
-HREF="#AEN1781"
+HREF="#AEN1786"
 >&#13;	    Does Bugzilla have the ability to search by word, phrase, compound
 	    search?
 	  </A
 ></DT
 ><DT
 >A.2.15. <A
-HREF="#AEN1786"
+HREF="#AEN1791"
 >&#13;	     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?
@@ -8920,19 +8941,19 @@ HREF="#AEN1786"
 ></DT
 ><DT
 >A.2.16. <A
-HREF="#AEN1791"
+HREF="#AEN1796"
 >&#13;	    Are there any backup features provided?
 	  </A
 ></DT
 ><DT
 >A.2.17. <A
-HREF="#AEN1797"
+HREF="#AEN1802"
 >&#13;	    Can users be on the system while a backup is in progress?
 	  </A
 ></DT
 ><DT
 >A.2.18. <A
-HREF="#AEN1802"
+HREF="#AEN1807"
 >&#13;	    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
@@ -8942,7 +8963,7 @@ HREF="#AEN1802"
 ></DT
 ><DT
 >A.2.19. <A
-HREF="#AEN1808"
+HREF="#AEN1813"
 >&#13;	    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
@@ -8952,7 +8973,7 @@ HREF="#AEN1808"
 ></DT
 ><DT
 >A.2.20. <A
-HREF="#AEN1813"
+HREF="#AEN1818"
 >&#13;	    Is there any licensing fee or other fees for using Bugzilla? Any
 	    out-of-pocket cost other than the bodies needed as identified above?
 	  </A
@@ -8968,20 +8989,20 @@ HREF="#faq-security"
 ><DL
 ><DT
 >A.3.1. <A
-HREF="#AEN1820"
+HREF="#AEN1825"
 >&#13;	    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)?
 	  </A
 ></DT
 ><DT
 >A.3.2. <A
-HREF="#AEN1826"
+HREF="#AEN1831"
 >&#13;	    Are there any security problems with Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.3.3. <A
-HREF="#AEN1831"
+HREF="#AEN1836"
 >&#13;	    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.
@@ -8998,48 +9019,48 @@ HREF="#faq-email"
 ><DL
 ><DT
 >A.4.1. <A
-HREF="#AEN1838"
+HREF="#AEN1843"
 >&#13;	    I have a user who doesn't want to receive any more email from Bugzilla.
 	    How do I stop it entirely for this user?
 	  </A
 ></DT
 ><DT
 >A.4.2. <A
-HREF="#AEN1844"
+HREF="#AEN1849"
 >&#13;	    I'm evaluating/testing Bugzilla, and don't want it to send email to
 	    anyone but me. How do I do it?
 	  </A
 ></DT
 ><DT
 >A.4.3. <A
-HREF="#AEN1849"
+HREF="#AEN1854"
 >&#13;	    I want whineatnews.pl to whine at something more, or other than, only new
 	    bugs. How do I do it?
 	  </A
 ></DT
 ><DT
 >A.4.4. <A
-HREF="#AEN1855"
+HREF="#AEN1860"
 >&#13;	    I don't like/want to use Procmail to hand mail off to bug_email.pl.
 	    What alternatives do I have?
 	  </A
 ></DT
 ><DT
 >A.4.5. <A
-HREF="#AEN1862"
+HREF="#AEN1867"
 >&#13;	    How do I set up the email interface to submit/change bugs via email?
 	  </A
 ></DT
 ><DT
 >A.4.6. <A
-HREF="#AEN1867"
+HREF="#AEN1872"
 >&#13;	    Email takes FOREVER to reach me from Bugzilla -- it's extremely slow.
 	    What gives?
 	  </A
 ></DT
 ><DT
 >A.4.7. <A
-HREF="#AEN1874"
+HREF="#AEN1879"
 >&#13;	     How come email from Bugzilla changes never reaches me?
 	  </A
 ></DT
@@ -9054,33 +9075,33 @@ HREF="#faq-db"
 ><DL
 ><DT
 >A.5.1. <A
-HREF="#AEN1882"
+HREF="#AEN1887"
 >&#13;	    I've heard Bugzilla can be used with Oracle?
 	  </A
 ></DT
 ><DT
 >A.5.2. <A
-HREF="#AEN1887"
+HREF="#AEN1892"
 >&#13;	    I think my database might be corrupted, or contain invalid entries. What
 	    do I do?
 	  </A
 ></DT
 ><DT
 >A.5.3. <A
-HREF="#AEN1895"
+HREF="#AEN1900"
 >&#13;	    I want to manually edit some entries in my database. How?
 	  </A
 ></DT
 ><DT
 >A.5.4. <A
-HREF="#AEN1903"
+HREF="#AEN1908"
 >&#13;	    I think I've set up MySQL permissions correctly, but Bugzilla still can't
 	    connect.
 	  </A
 ></DT
 ><DT
 >A.5.5. <A
-HREF="#AEN1911"
+HREF="#AEN1916"
 >&#13;	    How do I synchronize bug information among multiple different Bugzilla
 	    databases?
 	  </A
@@ -9096,26 +9117,26 @@ HREF="#faq-nt"
 ><DL
 ><DT
 >A.6.1. <A
-HREF="#AEN1920"
+HREF="#AEN1925"
 >&#13;	    What is the easiest way to run Bugzilla on Win32 (Win98+/NT/2K)?
 	  </A
 ></DT
 ><DT
 >A.6.2. <A
-HREF="#AEN1925"
+HREF="#AEN1930"
 >&#13;	    Is there a "Bundle::Bugzilla" equivalent for Win32?
 	  </A
 ></DT
 ><DT
 >A.6.3. <A
-HREF="#AEN1930"
+HREF="#AEN1935"
 >&#13;	    CGI's are failing with a "something.cgi is not a valid Windows NT
 	    application" error. Why?
 	  </A
 ></DT
 ><DT
 >A.6.4. <A
-HREF="#AEN1938"
+HREF="#AEN1943"
 >&#13;	    I'm having trouble with the perl modules for NT not being able to talk to
 	    to the database.
 	  </A
@@ -9131,33 +9152,33 @@ HREF="#faq-use"
 ><DL
 ><DT
 >A.7.1. <A
-HREF="#AEN1959"
+HREF="#AEN1964"
 >&#13;	    How do I change my user name (email address) in Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.7.2. <A
-HREF="#AEN1964"
+HREF="#AEN1969"
 >&#13;	    The query page is very confusing.  Isn't there a simpler way to query?
 	  </A
 ></DT
 ><DT
 >A.7.3. <A
-HREF="#AEN1969"
+HREF="#AEN1974"
 >&#13;	    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?
 	  </A
 ></DT
 ><DT
 >A.7.4. <A
-HREF="#AEN1979"
+HREF="#AEN1984"
 >&#13;	    I can't upload anything into the database via the "Create Attachment"
 	    link.  What am I doing wrong?
 	  </A
 ></DT
 ><DT
 >A.7.5. <A
-HREF="#AEN1984"
+HREF="#AEN1989"
 >&#13;	    How do I change a keyword in Bugzilla, once some bugs are using it?
 	  </A
 ></DT
@@ -9172,26 +9193,26 @@ HREF="#faq-hacking"
 ><DL
 ><DT
 >A.8.1. <A
-HREF="#AEN1991"
+HREF="#AEN1996"
 >&#13;	    What kind of style should I use for templatization?
 	  </A
 ></DT
 ><DT
 >A.8.2. <A
-HREF="#AEN1999"
+HREF="#AEN2004"
 >&#13;	    What bugs are in Bugzilla right now?
 	  </A
 ></DT
 ><DT
 >A.8.3. <A
-HREF="#AEN2008"
+HREF="#AEN2013"
 >&#13;	    How can I change the default priority to a null value?  For instance, have the default
 	    priority be "---" instead of "P2"?
 	  </A
 ></DT
 ><DT
 >A.8.4. <A
-HREF="#AEN2014"
+HREF="#AEN2019"
 >&#13;	    What's the best way to submit patches?  What guidelines should I follow?
 	  </A
 ></DT
@@ -9211,7 +9232,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1612"
+NAME="AEN1617"
 ></A
 ><B
 >A.1.1. </B
@@ -9239,7 +9260,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1618"
+NAME="AEN1623"
 ></A
 ><B
 >A.1.2. </B
@@ -9268,7 +9289,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1624"
+NAME="AEN1629"
 ></A
 ><B
 >A.1.3. </B
@@ -9314,7 +9335,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1633"
+NAME="AEN1638"
 ></A
 ><B
 >A.1.4. </B
@@ -9420,7 +9441,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1657"
+NAME="AEN1662"
 ></A
 ><B
 >A.1.5. </B
@@ -9450,7 +9471,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1663"
+NAME="AEN1668"
 ></A
 ><B
 >A.1.6. </B
@@ -9488,7 +9509,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1669"
+NAME="AEN1674"
 ></A
 ><B
 >A.1.7. </B
@@ -9528,7 +9549,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1676"
+NAME="AEN1681"
 ></A
 ><B
 >A.1.8. </B
@@ -9573,7 +9594,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1685"
+NAME="AEN1690"
 ></A
 ><B
 >A.1.9. </B
@@ -9606,7 +9627,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1691"
+NAME="AEN1696"
 ></A
 ><B
 >A.1.10. </B
@@ -9668,7 +9689,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1701"
+NAME="AEN1706"
 ></A
 ><B
 >A.2.1. </B
@@ -9694,7 +9715,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1706"
+NAME="AEN1711"
 ></A
 ><B
 >A.2.2. </B
@@ -9720,7 +9741,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1711"
+NAME="AEN1716"
 ></A
 ><B
 >A.2.3. </B
@@ -9745,7 +9766,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1716"
+NAME="AEN1721"
 ></A
 ><B
 >A.2.4. </B
@@ -9770,7 +9791,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1721"
+NAME="AEN1726"
 ></A
 ><B
 >A.2.5. </B
@@ -9799,7 +9820,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1726"
+NAME="AEN1731"
 ></A
 ><B
 >A.2.6. </B
@@ -9836,7 +9857,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1733"
+NAME="AEN1738"
 ></A
 ><B
 >A.2.7. </B
@@ -9874,7 +9895,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1740"
+NAME="AEN1745"
 ></A
 ><B
 >A.2.8. </B
@@ -9901,7 +9922,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1745"
+NAME="AEN1750"
 ></A
 ><B
 >A.2.9. </B
@@ -9926,7 +9947,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1750"
+NAME="AEN1755"
 ></A
 ><B
 >A.2.10. </B
@@ -9985,7 +10006,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1757"
+NAME="AEN1762"
 ></A
 ><B
 >A.2.11. </B
@@ -10047,7 +10068,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1769"
+NAME="AEN1774"
 ></A
 ><B
 >A.2.12. </B
@@ -10085,7 +10106,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1776"
+NAME="AEN1781"
 ></A
 ><B
 >A.2.13. </B
@@ -10110,7 +10131,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1781"
+NAME="AEN1786"
 ></A
 ><B
 >A.2.14. </B
@@ -10136,7 +10157,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1786"
+NAME="AEN1791"
 ></A
 ><B
 >A.2.15. </B
@@ -10163,7 +10184,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1791"
+NAME="AEN1796"
 ></A
 ><B
 >A.2.16. </B
@@ -10193,7 +10214,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1797"
+NAME="AEN1802"
 ></A
 ><B
 >A.2.17. </B
@@ -10219,7 +10240,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1802"
+NAME="AEN1807"
 ></A
 ><B
 >A.2.18. </B
@@ -10254,7 +10275,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1808"
+NAME="AEN1813"
 ></A
 ><B
 >A.2.19. </B
@@ -10287,7 +10308,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1813"
+NAME="AEN1818"
 ></A
 ><B
 >A.2.20. </B
@@ -10321,7 +10342,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1820"
+NAME="AEN1825"
 ></A
 ><B
 >A.3.1. </B
@@ -10350,7 +10371,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1826"
+NAME="AEN1831"
 ></A
 ><B
 >A.3.2. </B
@@ -10378,7 +10399,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1831"
+NAME="AEN1836"
 ></A
 ><B
 >A.3.3. </B
@@ -10414,7 +10435,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1838"
+NAME="AEN1843"
 ></A
 ><B
 >A.4.1. </B
@@ -10444,7 +10465,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1844"
+NAME="AEN1849"
 ></A
 ><B
 >A.4.2. </B
@@ -10470,7 +10491,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1849"
+NAME="AEN1854"
 ></A
 ><B
 >A.4.3. </B
@@ -10502,7 +10523,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1855"
+NAME="AEN1860"
 ></A
 ><B
 >A.4.4. </B
@@ -10520,7 +10541,7 @@ CLASS="answer"
 	    You can call bug_email.pl directly from your aliases file, with
 	    an entry like this:
 	    <A
-NAME="AEN1859"
+NAME="AEN1864"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -10541,7 +10562,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1862"
+NAME="AEN1867"
 ></A
 ><B
 >A.4.5. </B
@@ -10566,7 +10587,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1867"
+NAME="AEN1872"
 ></A
 ><B
 >A.4.6. </B
@@ -10601,7 +10622,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1874"
+NAME="AEN1879"
 ></A
 ><B
 >A.4.7. </B
@@ -10641,7 +10662,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1882"
+NAME="AEN1887"
 ></A
 ><B
 >A.5.1. </B
@@ -10669,7 +10690,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1887"
+NAME="AEN1892"
 ></A
 ><B
 >A.5.2. </B
@@ -10716,7 +10737,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1895"
+NAME="AEN1900"
 ></A
 ><B
 >A.5.3. </B
@@ -10757,7 +10778,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1903"
+NAME="AEN1908"
 ></A
 ><B
 >A.5.4. </B
@@ -10818,7 +10839,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1911"
+NAME="AEN1916"
 ></A
 ><B
 >A.5.5. </B
@@ -10864,7 +10885,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1920"
+NAME="AEN1925"
 ></A
 ><B
 >A.6.1. </B
@@ -10889,7 +10910,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1925"
+NAME="AEN1930"
 ></A
 ><B
 >A.6.2. </B
@@ -10915,7 +10936,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1930"
+NAME="AEN1935"
 ></A
 ><B
 >A.6.3. </B
@@ -10938,7 +10959,7 @@ CLASS="answer"
 ><P
 >&#13;	    Microsoft has some advice on this matter, as well:
 	    <A
-NAME="AEN1935"
+NAME="AEN1940"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -10963,7 +10984,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1938"
+NAME="AEN1943"
 ></A
 ><B
 >A.6.4. </B
@@ -11040,7 +11061,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1959"
+NAME="AEN1964"
 ></A
 ><B
 >A.7.1. </B
@@ -11065,7 +11086,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1964"
+NAME="AEN1969"
 ></A
 ><B
 >A.7.2. </B
@@ -11091,7 +11112,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1969"
+NAME="AEN1974"
 ></A
 ><B
 >A.7.3. </B
@@ -11146,7 +11167,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1979"
+NAME="AEN1984"
 ></A
 ><B
 >A.7.4. </B
@@ -11173,7 +11194,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1984"
+NAME="AEN1989"
 ></A
 ><B
 >A.7.5. </B
@@ -11207,7 +11228,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1991"
+NAME="AEN1996"
 ></A
 ><B
 >A.8.1. </B
@@ -11266,7 +11287,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1999"
+NAME="AEN2004"
 ></A
 ><B
 >A.8.2. </B
@@ -11312,7 +11333,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN2008"
+NAME="AEN2013"
 ></A
 ><B
 >A.8.3. </B
@@ -11344,7 +11365,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN2014"
+NAME="AEN2019"
 ></A
 ><B
 >A.8.4. </B
@@ -11568,7 +11589,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN2057"
+NAME="AEN2062"
 ></A
 >B.2.1. Bugzilla Database Basics</H2
 ><P
@@ -11684,7 +11705,7 @@ CLASS="section"
 ><HR><H3
 CLASS="section"
 ><A
-NAME="AEN2084"
+NAME="AEN2089"
 ></A
 >B.2.1.1. Bugzilla Database Tables</H3
 ><P
@@ -12252,7 +12273,7 @@ NAME="gfdl"
 ><P
 >Version 1.1, March 2000</P
 ><A
-NAME="AEN2172"
+NAME="AEN2177"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -12717,7 +12738,7 @@ NAME="gfdl-howto"
     of the License in the document and put the following copyright and
     license notices just after the title page:</P
 ><A
-NAME="AEN2262"
+NAME="AEN2267"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -12754,7 +12775,7 @@ CLASS="glossdiv"
 ><H1
 CLASS="glossdiv"
 ><A
-NAME="AEN2267"
+NAME="AEN2272"
 ></A
 >0-9, high ascii</H1
 ><DL
@@ -12976,6 +12997,9 @@ CLASS="QUOTE"
         "Find" box.</P
 ></DD
 ><DT
+><A
+NAME="gloss-bugzilla"
+></A
 ><B
 >Bugzilla</B
 ></DT
diff --git a/docs/html/administration.html b/docs/html/administration.html
index adf33ef25..2cf3c373b 100644
--- a/docs/html/administration.html
+++ b/docs/html/administration.html
@@ -156,22 +156,22 @@ HREF="cust-templates.html"
 ><DL
 ><DT
 >5.7.1. <A
-HREF="cust-templates.html#AEN1409"
+HREF="cust-templates.html#AEN1413"
 >What to Edit</A
 ></DT
 ><DT
 >5.7.2. <A
-HREF="cust-templates.html#AEN1428"
+HREF="cust-templates.html#AEN1432"
 >How To Edit Templates</A
 ></DT
 ><DT
 >5.7.3. <A
-HREF="cust-templates.html#AEN1438"
+HREF="cust-templates.html#AEN1442"
 >Template Formats</A
 ></DT
 ><DT
 >5.7.4. <A
-HREF="cust-templates.html#AEN1451"
+HREF="cust-templates.html#AEN1455"
 >Particular Templates</A
 ></DT
 ></DL
diff --git a/docs/html/conventions.html b/docs/html/conventions.html
index c87467b57..dba8eeec7 100644
--- a/docs/html/conventions.html
+++ b/docs/html/conventions.html
@@ -381,6 +381,23 @@ VALIGN="MIDDLE"
 ><TD
 ALIGN="LEFT"
 VALIGN="MIDDLE"
+>Term found in the glossary</TD
+><TD
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+>&#13;            <A
+HREF="glossary.html#gloss-bugzilla"
+><I
+CLASS="glossterm"
+>Bugzilla</I
+></A
+>
+          </TD
+></TR
+><TR
+><TD
+ALIGN="LEFT"
+VALIGN="MIDDLE"
 >Code Example</TD
 ><TD
 ALIGN="LEFT"
diff --git a/docs/html/cust-templates.html b/docs/html/cust-templates.html
index d0c2dffcb..c790954f3 100644
--- a/docs/html/cust-templates.html
+++ b/docs/html/cust-templates.html
@@ -99,7 +99,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1409"
+NAME="AEN1413"
 ></A
 >5.7.1. What to Edit</H2
 ><P
@@ -214,7 +214,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1428"
+NAME="AEN1432"
 ></A
 >5.7.2. How To Edit Templates</H2
 ><P
@@ -296,7 +296,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1438"
+NAME="AEN1442"
 ></A
 >5.7.3. Template Formats</H2
 ><P
@@ -358,7 +358,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1451"
+NAME="AEN1455"
 ></A
 >5.7.4. Particular Templates</H2
 ><P
diff --git a/docs/html/dbdoc.html b/docs/html/dbdoc.html
index fdbf91734..c7346a91a 100644
--- a/docs/html/dbdoc.html
+++ b/docs/html/dbdoc.html
@@ -135,7 +135,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN2057"
+NAME="AEN2062"
 ></A
 >B.2.1. Bugzilla Database Basics</H2
 ><P
@@ -251,7 +251,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN2084"
+NAME="AEN2089"
 ></A
 >B.2.1.1. Bugzilla Database Tables</H3
 ><P
diff --git a/docs/html/extraconfig.html b/docs/html/extraconfig.html
index b68815a38..f9d1f97aa 100644
--- a/docs/html/extraconfig.html
+++ b/docs/html/extraconfig.html
@@ -81,7 +81,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN751"
+NAME="AEN755"
 ></A
 >4.2.1. Dependency Charts</H2
 ><P
@@ -145,7 +145,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN766"
+NAME="AEN770"
 ></A
 >4.2.2. Bug Graphs</H2
 ><P
@@ -204,7 +204,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN779"
+NAME="AEN783"
 ></A
 >4.2.3. The Whining Cron</H2
 ><P
diff --git a/docs/html/faq.html b/docs/html/faq.html
index 7dc95eff4..920e17a58 100644
--- a/docs/html/faq.html
+++ b/docs/html/faq.html
@@ -87,64 +87,64 @@ HREF="faq.html#faq-general"
 ><DL
 ><DT
 >A.1.1. <A
-HREF="faq.html#AEN1612"
+HREF="faq.html#AEN1617"
 >&#13;	    Where can I find information about Bugzilla?</A
 ></DT
 ><DT
 >A.1.2. <A
-HREF="faq.html#AEN1618"
+HREF="faq.html#AEN1623"
 >&#13;	    What license is Bugzilla distributed under?
 	  </A
 ></DT
 ><DT
 >A.1.3. <A
-HREF="faq.html#AEN1624"
+HREF="faq.html#AEN1629"
 >&#13;	    How do I get commercial support for Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.1.4. <A
-HREF="faq.html#AEN1633"
+HREF="faq.html#AEN1638"
 >&#13;	    What major companies or projects are currently using Bugzilla
 	    for bug-tracking?
 	  </A
 ></DT
 ><DT
 >A.1.5. <A
-HREF="faq.html#AEN1657"
+HREF="faq.html#AEN1662"
 >&#13;	    Who maintains Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.1.6. <A
-HREF="faq.html#AEN1663"
+HREF="faq.html#AEN1668"
 >&#13;	    How does Bugzilla stack up against other bug-tracking databases?
 	  </A
 ></DT
 ><DT
 >A.1.7. <A
-HREF="faq.html#AEN1669"
+HREF="faq.html#AEN1674"
 >&#13;	    Why doesn't Bugzilla offer this or that feature or compatibility
 	    with this other tracking software?
 	  </A
 ></DT
 ><DT
 >A.1.8. <A
-HREF="faq.html#AEN1676"
+HREF="faq.html#AEN1681"
 >&#13;	    Why MySQL?  I'm interested in seeing Bugzilla run on
 	    Oracle/Sybase/Msql/PostgreSQL/MSSQL.
 	  </A
 ></DT
 ><DT
 >A.1.9. <A
-HREF="faq.html#AEN1685"
+HREF="faq.html#AEN1690"
 >&#13;	    Why do the scripts say "/usr/bonsaitools/bin/perl" instead of
 	    "/usr/bin/perl" or something else?
 	  </A
 ></DT
 ><DT
 >A.1.10. <A
-HREF="faq.html#AEN1691"
+HREF="faq.html#AEN1696"
 >&#13;	    Is there an easy way to change the Bugzilla cookie name?
 	  </A
 ></DT
@@ -159,41 +159,41 @@ HREF="faq.html#faq-phb"
 ><DL
 ><DT
 >A.2.1. <A
-HREF="faq.html#AEN1701"
+HREF="faq.html#AEN1706"
 >&#13;	    Is Bugzilla web-based, or do you have to have specific software or
 	    a specific operating system on your machine?
 	  </A
 ></DT
 ><DT
 >A.2.2. <A
-HREF="faq.html#AEN1706"
+HREF="faq.html#AEN1711"
 >&#13;	    Can Bugzilla integrate with
 	    Perforce (SCM software)?
 	  </A
 ></DT
 ><DT
 >A.2.3. <A
-HREF="faq.html#AEN1711"
+HREF="faq.html#AEN1716"
 >&#13;	    Does Bugzilla allow the user to track multiple projects?
 	  </A
 ></DT
 ><DT
 >A.2.4. <A
-HREF="faq.html#AEN1716"
+HREF="faq.html#AEN1721"
 >&#13;	    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?
 	  </A
 ></DT
 ><DT
 >A.2.5. <A
-HREF="faq.html#AEN1721"
+HREF="faq.html#AEN1726"
 >&#13;	    Does Bugzilla allow attachments (text, screenshots, URLs etc)? If yes,
 	    are there any that are NOT allowed?
 	  </A
 ></DT
 ><DT
 >A.2.6. <A
-HREF="faq.html#AEN1726"
+HREF="faq.html#AEN1731"
 >&#13;	    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?
@@ -201,35 +201,35 @@ HREF="faq.html#AEN1726"
 ></DT
 ><DT
 >A.2.7. <A
-HREF="faq.html#AEN1733"
+HREF="faq.html#AEN1738"
 >&#13;	    Does Bugzilla provide any reporting features, metrics, graphs, etc? You
 	    know, the type of stuff that management likes to see. :)
 	  </A
 ></DT
 ><DT
 >A.2.8. <A
-HREF="faq.html#AEN1740"
+HREF="faq.html#AEN1745"
 >&#13;	    Is there email notification and if so, what do you see when you get an
 	    email?
 	  </A
 ></DT
 ><DT
 >A.2.9. <A
-HREF="faq.html#AEN1745"
+HREF="faq.html#AEN1750"
 >&#13;	    Can email notification be set up to send to multiple
 	    people, some on the To List, CC List, BCC List etc?
 	  </A
 ></DT
 ><DT
 >A.2.10. <A
-HREF="faq.html#AEN1750"
+HREF="faq.html#AEN1755"
 >&#13;	    Do users have to have any particular
 	    type of email application?
 	  </A
 ></DT
 ><DT
 >A.2.11. <A
-HREF="faq.html#AEN1757"
+HREF="faq.html#AEN1762"
 >&#13;	    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
@@ -238,28 +238,28 @@ HREF="faq.html#AEN1757"
 ></DT
 ><DT
 >A.2.12. <A
-HREF="faq.html#AEN1769"
+HREF="faq.html#AEN1774"
 >&#13;	    Has anyone converted Bugzilla to another language to be used in other
 	    countries? Is it localizable?
 	  </A
 ></DT
 ><DT
 >A.2.13. <A
-HREF="faq.html#AEN1776"
+HREF="faq.html#AEN1781"
 >&#13;	    Can a user create and save reports? Can they do this in Word format?
 	    Excel format?
 	  </A
 ></DT
 ><DT
 >A.2.14. <A
-HREF="faq.html#AEN1781"
+HREF="faq.html#AEN1786"
 >&#13;	    Does Bugzilla have the ability to search by word, phrase, compound
 	    search?
 	  </A
 ></DT
 ><DT
 >A.2.15. <A
-HREF="faq.html#AEN1786"
+HREF="faq.html#AEN1791"
 >&#13;	     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?
@@ -267,19 +267,19 @@ HREF="faq.html#AEN1786"
 ></DT
 ><DT
 >A.2.16. <A
-HREF="faq.html#AEN1791"
+HREF="faq.html#AEN1796"
 >&#13;	    Are there any backup features provided?
 	  </A
 ></DT
 ><DT
 >A.2.17. <A
-HREF="faq.html#AEN1797"
+HREF="faq.html#AEN1802"
 >&#13;	    Can users be on the system while a backup is in progress?
 	  </A
 ></DT
 ><DT
 >A.2.18. <A
-HREF="faq.html#AEN1802"
+HREF="faq.html#AEN1807"
 >&#13;	    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
@@ -289,7 +289,7 @@ HREF="faq.html#AEN1802"
 ></DT
 ><DT
 >A.2.19. <A
-HREF="faq.html#AEN1808"
+HREF="faq.html#AEN1813"
 >&#13;	    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
@@ -299,7 +299,7 @@ HREF="faq.html#AEN1808"
 ></DT
 ><DT
 >A.2.20. <A
-HREF="faq.html#AEN1813"
+HREF="faq.html#AEN1818"
 >&#13;	    Is there any licensing fee or other fees for using Bugzilla? Any
 	    out-of-pocket cost other than the bodies needed as identified above?
 	  </A
@@ -315,20 +315,20 @@ HREF="faq.html#faq-security"
 ><DL
 ><DT
 >A.3.1. <A
-HREF="faq.html#AEN1820"
+HREF="faq.html#AEN1825"
 >&#13;	    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)?
 	  </A
 ></DT
 ><DT
 >A.3.2. <A
-HREF="faq.html#AEN1826"
+HREF="faq.html#AEN1831"
 >&#13;	    Are there any security problems with Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.3.3. <A
-HREF="faq.html#AEN1831"
+HREF="faq.html#AEN1836"
 >&#13;	    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.
@@ -345,48 +345,48 @@ HREF="faq.html#faq-email"
 ><DL
 ><DT
 >A.4.1. <A
-HREF="faq.html#AEN1838"
+HREF="faq.html#AEN1843"
 >&#13;	    I have a user who doesn't want to receive any more email from Bugzilla.
 	    How do I stop it entirely for this user?
 	  </A
 ></DT
 ><DT
 >A.4.2. <A
-HREF="faq.html#AEN1844"
+HREF="faq.html#AEN1849"
 >&#13;	    I'm evaluating/testing Bugzilla, and don't want it to send email to
 	    anyone but me. How do I do it?
 	  </A
 ></DT
 ><DT
 >A.4.3. <A
-HREF="faq.html#AEN1849"
+HREF="faq.html#AEN1854"
 >&#13;	    I want whineatnews.pl to whine at something more, or other than, only new
 	    bugs. How do I do it?
 	  </A
 ></DT
 ><DT
 >A.4.4. <A
-HREF="faq.html#AEN1855"
+HREF="faq.html#AEN1860"
 >&#13;	    I don't like/want to use Procmail to hand mail off to bug_email.pl.
 	    What alternatives do I have?
 	  </A
 ></DT
 ><DT
 >A.4.5. <A
-HREF="faq.html#AEN1862"
+HREF="faq.html#AEN1867"
 >&#13;	    How do I set up the email interface to submit/change bugs via email?
 	  </A
 ></DT
 ><DT
 >A.4.6. <A
-HREF="faq.html#AEN1867"
+HREF="faq.html#AEN1872"
 >&#13;	    Email takes FOREVER to reach me from Bugzilla -- it's extremely slow.
 	    What gives?
 	  </A
 ></DT
 ><DT
 >A.4.7. <A
-HREF="faq.html#AEN1874"
+HREF="faq.html#AEN1879"
 >&#13;	     How come email from Bugzilla changes never reaches me?
 	  </A
 ></DT
@@ -401,33 +401,33 @@ HREF="faq.html#faq-db"
 ><DL
 ><DT
 >A.5.1. <A
-HREF="faq.html#AEN1882"
+HREF="faq.html#AEN1887"
 >&#13;	    I've heard Bugzilla can be used with Oracle?
 	  </A
 ></DT
 ><DT
 >A.5.2. <A
-HREF="faq.html#AEN1887"
+HREF="faq.html#AEN1892"
 >&#13;	    I think my database might be corrupted, or contain invalid entries. What
 	    do I do?
 	  </A
 ></DT
 ><DT
 >A.5.3. <A
-HREF="faq.html#AEN1895"
+HREF="faq.html#AEN1900"
 >&#13;	    I want to manually edit some entries in my database. How?
 	  </A
 ></DT
 ><DT
 >A.5.4. <A
-HREF="faq.html#AEN1903"
+HREF="faq.html#AEN1908"
 >&#13;	    I think I've set up MySQL permissions correctly, but Bugzilla still can't
 	    connect.
 	  </A
 ></DT
 ><DT
 >A.5.5. <A
-HREF="faq.html#AEN1911"
+HREF="faq.html#AEN1916"
 >&#13;	    How do I synchronize bug information among multiple different Bugzilla
 	    databases?
 	  </A
@@ -443,26 +443,26 @@ HREF="faq.html#faq-nt"
 ><DL
 ><DT
 >A.6.1. <A
-HREF="faq.html#AEN1920"
+HREF="faq.html#AEN1925"
 >&#13;	    What is the easiest way to run Bugzilla on Win32 (Win98+/NT/2K)?
 	  </A
 ></DT
 ><DT
 >A.6.2. <A
-HREF="faq.html#AEN1925"
+HREF="faq.html#AEN1930"
 >&#13;	    Is there a "Bundle::Bugzilla" equivalent for Win32?
 	  </A
 ></DT
 ><DT
 >A.6.3. <A
-HREF="faq.html#AEN1930"
+HREF="faq.html#AEN1935"
 >&#13;	    CGI's are failing with a "something.cgi is not a valid Windows NT
 	    application" error. Why?
 	  </A
 ></DT
 ><DT
 >A.6.4. <A
-HREF="faq.html#AEN1938"
+HREF="faq.html#AEN1943"
 >&#13;	    I'm having trouble with the perl modules for NT not being able to talk to
 	    to the database.
 	  </A
@@ -478,33 +478,33 @@ HREF="faq.html#faq-use"
 ><DL
 ><DT
 >A.7.1. <A
-HREF="faq.html#AEN1959"
+HREF="faq.html#AEN1964"
 >&#13;	    How do I change my user name (email address) in Bugzilla?
 	  </A
 ></DT
 ><DT
 >A.7.2. <A
-HREF="faq.html#AEN1964"
+HREF="faq.html#AEN1969"
 >&#13;	    The query page is very confusing.  Isn't there a simpler way to query?
 	  </A
 ></DT
 ><DT
 >A.7.3. <A
-HREF="faq.html#AEN1969"
+HREF="faq.html#AEN1974"
 >&#13;	    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?
 	  </A
 ></DT
 ><DT
 >A.7.4. <A
-HREF="faq.html#AEN1979"
+HREF="faq.html#AEN1984"
 >&#13;	    I can't upload anything into the database via the "Create Attachment"
 	    link.  What am I doing wrong?
 	  </A
 ></DT
 ><DT
 >A.7.5. <A
-HREF="faq.html#AEN1984"
+HREF="faq.html#AEN1989"
 >&#13;	    How do I change a keyword in Bugzilla, once some bugs are using it?
 	  </A
 ></DT
@@ -519,26 +519,26 @@ HREF="faq.html#faq-hacking"
 ><DL
 ><DT
 >A.8.1. <A
-HREF="faq.html#AEN1991"
+HREF="faq.html#AEN1996"
 >&#13;	    What kind of style should I use for templatization?
 	  </A
 ></DT
 ><DT
 >A.8.2. <A
-HREF="faq.html#AEN1999"
+HREF="faq.html#AEN2004"
 >&#13;	    What bugs are in Bugzilla right now?
 	  </A
 ></DT
 ><DT
 >A.8.3. <A
-HREF="faq.html#AEN2008"
+HREF="faq.html#AEN2013"
 >&#13;	    How can I change the default priority to a null value?  For instance, have the default
 	    priority be "---" instead of "P2"?
 	  </A
 ></DT
 ><DT
 >A.8.4. <A
-HREF="faq.html#AEN2014"
+HREF="faq.html#AEN2019"
 >&#13;	    What's the best way to submit patches?  What guidelines should I follow?
 	  </A
 ></DT
@@ -558,7 +558,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1612"
+NAME="AEN1617"
 ></A
 ><B
 >A.1.1. </B
@@ -586,7 +586,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1618"
+NAME="AEN1623"
 ></A
 ><B
 >A.1.2. </B
@@ -615,7 +615,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1624"
+NAME="AEN1629"
 ></A
 ><B
 >A.1.3. </B
@@ -661,7 +661,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1633"
+NAME="AEN1638"
 ></A
 ><B
 >A.1.4. </B
@@ -767,7 +767,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1657"
+NAME="AEN1662"
 ></A
 ><B
 >A.1.5. </B
@@ -797,7 +797,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1663"
+NAME="AEN1668"
 ></A
 ><B
 >A.1.6. </B
@@ -835,7 +835,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1669"
+NAME="AEN1674"
 ></A
 ><B
 >A.1.7. </B
@@ -875,7 +875,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1676"
+NAME="AEN1681"
 ></A
 ><B
 >A.1.8. </B
@@ -920,7 +920,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1685"
+NAME="AEN1690"
 ></A
 ><B
 >A.1.9. </B
@@ -953,7 +953,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1691"
+NAME="AEN1696"
 ></A
 ><B
 >A.1.10. </B
@@ -1015,7 +1015,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1701"
+NAME="AEN1706"
 ></A
 ><B
 >A.2.1. </B
@@ -1041,7 +1041,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1706"
+NAME="AEN1711"
 ></A
 ><B
 >A.2.2. </B
@@ -1067,7 +1067,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1711"
+NAME="AEN1716"
 ></A
 ><B
 >A.2.3. </B
@@ -1092,7 +1092,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1716"
+NAME="AEN1721"
 ></A
 ><B
 >A.2.4. </B
@@ -1117,7 +1117,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1721"
+NAME="AEN1726"
 ></A
 ><B
 >A.2.5. </B
@@ -1146,7 +1146,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1726"
+NAME="AEN1731"
 ></A
 ><B
 >A.2.6. </B
@@ -1183,7 +1183,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1733"
+NAME="AEN1738"
 ></A
 ><B
 >A.2.7. </B
@@ -1221,7 +1221,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1740"
+NAME="AEN1745"
 ></A
 ><B
 >A.2.8. </B
@@ -1248,7 +1248,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1745"
+NAME="AEN1750"
 ></A
 ><B
 >A.2.9. </B
@@ -1273,7 +1273,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1750"
+NAME="AEN1755"
 ></A
 ><B
 >A.2.10. </B
@@ -1332,7 +1332,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1757"
+NAME="AEN1762"
 ></A
 ><B
 >A.2.11. </B
@@ -1394,7 +1394,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1769"
+NAME="AEN1774"
 ></A
 ><B
 >A.2.12. </B
@@ -1432,7 +1432,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1776"
+NAME="AEN1781"
 ></A
 ><B
 >A.2.13. </B
@@ -1457,7 +1457,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1781"
+NAME="AEN1786"
 ></A
 ><B
 >A.2.14. </B
@@ -1483,7 +1483,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1786"
+NAME="AEN1791"
 ></A
 ><B
 >A.2.15. </B
@@ -1510,7 +1510,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1791"
+NAME="AEN1796"
 ></A
 ><B
 >A.2.16. </B
@@ -1540,7 +1540,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1797"
+NAME="AEN1802"
 ></A
 ><B
 >A.2.17. </B
@@ -1566,7 +1566,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1802"
+NAME="AEN1807"
 ></A
 ><B
 >A.2.18. </B
@@ -1601,7 +1601,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1808"
+NAME="AEN1813"
 ></A
 ><B
 >A.2.19. </B
@@ -1634,7 +1634,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1813"
+NAME="AEN1818"
 ></A
 ><B
 >A.2.20. </B
@@ -1668,7 +1668,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1820"
+NAME="AEN1825"
 ></A
 ><B
 >A.3.1. </B
@@ -1697,7 +1697,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1826"
+NAME="AEN1831"
 ></A
 ><B
 >A.3.2. </B
@@ -1725,7 +1725,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1831"
+NAME="AEN1836"
 ></A
 ><B
 >A.3.3. </B
@@ -1761,7 +1761,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1838"
+NAME="AEN1843"
 ></A
 ><B
 >A.4.1. </B
@@ -1791,7 +1791,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1844"
+NAME="AEN1849"
 ></A
 ><B
 >A.4.2. </B
@@ -1817,7 +1817,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1849"
+NAME="AEN1854"
 ></A
 ><B
 >A.4.3. </B
@@ -1849,7 +1849,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1855"
+NAME="AEN1860"
 ></A
 ><B
 >A.4.4. </B
@@ -1867,7 +1867,7 @@ CLASS="answer"
 	    You can call bug_email.pl directly from your aliases file, with
 	    an entry like this:
 	    <A
-NAME="AEN1859"
+NAME="AEN1864"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -1888,7 +1888,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1862"
+NAME="AEN1867"
 ></A
 ><B
 >A.4.5. </B
@@ -1913,7 +1913,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1867"
+NAME="AEN1872"
 ></A
 ><B
 >A.4.6. </B
@@ -1948,7 +1948,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1874"
+NAME="AEN1879"
 ></A
 ><B
 >A.4.7. </B
@@ -1988,7 +1988,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1882"
+NAME="AEN1887"
 ></A
 ><B
 >A.5.1. </B
@@ -2016,7 +2016,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1887"
+NAME="AEN1892"
 ></A
 ><B
 >A.5.2. </B
@@ -2063,7 +2063,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1895"
+NAME="AEN1900"
 ></A
 ><B
 >A.5.3. </B
@@ -2104,7 +2104,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1903"
+NAME="AEN1908"
 ></A
 ><B
 >A.5.4. </B
@@ -2165,7 +2165,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1911"
+NAME="AEN1916"
 ></A
 ><B
 >A.5.5. </B
@@ -2211,7 +2211,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1920"
+NAME="AEN1925"
 ></A
 ><B
 >A.6.1. </B
@@ -2236,7 +2236,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1925"
+NAME="AEN1930"
 ></A
 ><B
 >A.6.2. </B
@@ -2262,7 +2262,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1930"
+NAME="AEN1935"
 ></A
 ><B
 >A.6.3. </B
@@ -2285,7 +2285,7 @@ CLASS="answer"
 ><P
 >&#13;	    Microsoft has some advice on this matter, as well:
 	    <A
-NAME="AEN1935"
+NAME="AEN1940"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -2310,7 +2310,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1938"
+NAME="AEN1943"
 ></A
 ><B
 >A.6.4. </B
@@ -2387,7 +2387,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1959"
+NAME="AEN1964"
 ></A
 ><B
 >A.7.1. </B
@@ -2412,7 +2412,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1964"
+NAME="AEN1969"
 ></A
 ><B
 >A.7.2. </B
@@ -2438,7 +2438,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1969"
+NAME="AEN1974"
 ></A
 ><B
 >A.7.3. </B
@@ -2493,7 +2493,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1979"
+NAME="AEN1984"
 ></A
 ><B
 >A.7.4. </B
@@ -2520,7 +2520,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1984"
+NAME="AEN1989"
 ></A
 ><B
 >A.7.5. </B
@@ -2554,7 +2554,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1991"
+NAME="AEN1996"
 ></A
 ><B
 >A.8.1. </B
@@ -2613,7 +2613,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN1999"
+NAME="AEN2004"
 ></A
 ><B
 >A.8.2. </B
@@ -2659,7 +2659,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN2008"
+NAME="AEN2013"
 ></A
 ><B
 >A.8.3. </B
@@ -2691,7 +2691,7 @@ CLASS="qandaentry"
 CLASS="question"
 ><P
 ><A
-NAME="AEN2014"
+NAME="AEN2019"
 ></A
 ><B
 >A.8.4. </B
diff --git a/docs/html/gfdl-howto.html b/docs/html/gfdl-howto.html
index cf7bdb131..3d507f8fa 100644
--- a/docs/html/gfdl-howto.html
+++ b/docs/html/gfdl-howto.html
@@ -81,7 +81,7 @@ NAME="gfdl-howto"
     of the License in the document and put the following copyright and
     license notices just after the title page:</P
 ><A
-NAME="AEN2262"
+NAME="AEN2267"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/docs/html/gfdl.html b/docs/html/gfdl.html
index 76aa7ca32..146cf3ca7 100644
--- a/docs/html/gfdl.html
+++ b/docs/html/gfdl.html
@@ -144,7 +144,7 @@ HREF="gfdl-howto.html"
 ><P
 >Version 1.1, March 2000</P
 ><A
-NAME="AEN2172"
+NAME="AEN2177"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/docs/html/glossary.html b/docs/html/glossary.html
index d795b1fc8..d849ab69d 100644
--- a/docs/html/glossary.html
+++ b/docs/html/glossary.html
@@ -70,7 +70,7 @@ CLASS="glossdiv"
 ><H1
 CLASS="glossdiv"
 ><A
-NAME="AEN2267"
+NAME="AEN2272"
 ></A
 >0-9, high ascii</H1
 ><DL
@@ -292,6 +292,9 @@ CLASS="QUOTE"
         "Find" box.</P
 ></DD
 ><DT
+><A
+NAME="gloss-bugzilla"
+></A
 ><B
 >Bugzilla</B
 ></DT
diff --git a/docs/html/hintsandtips.html b/docs/html/hintsandtips.html
index 413c28087..0b6551188 100644
--- a/docs/html/hintsandtips.html
+++ b/docs/html/hintsandtips.html
@@ -84,7 +84,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN336"
+NAME="AEN340"
 ></A
 >3.2.1. Autolinkification</H2
 ><P
@@ -232,7 +232,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN365"
+NAME="AEN369"
 ></A
 >3.2.5. Filing Bugs</H2
 ><P
diff --git a/docs/html/http.html b/docs/html/http.html
index f60cc04dc..2025ebe73 100644
--- a/docs/html/http.html
+++ b/docs/html/http.html
@@ -193,7 +193,7 @@ WIDTH="100%"
 COLOR="#000000"
 ><PRE
 CLASS="programlisting"
->&#13;Options +ExecCGI 
+>&#13;Options +ExecCGI
 AllowOverride Limit
         </PRE
 ></FONT
diff --git a/docs/html/installation.html b/docs/html/installation.html
index 13bcd6c3b..fb62a7bc5 100644
--- a/docs/html/installation.html
+++ b/docs/html/installation.html
@@ -118,17 +118,17 @@ HREF="stepbystep.html#sbs-http"
 ></DT
 ><DT
 >4.1.7. <A
-HREF="stepbystep.html#AEN586"
+HREF="stepbystep.html#AEN590"
 >Bugzilla</A
 ></DT
 ><DT
 >4.1.8. <A
-HREF="stepbystep.html#AEN611"
+HREF="stepbystep.html#AEN615"
 >Setting Up the MySQL Database</A
 ></DT
 ><DT
 >4.1.9. <A
-HREF="stepbystep.html#AEN647"
+HREF="stepbystep.html#AEN651"
 ><TT
 CLASS="filename"
 >checksetup.pl</TT
@@ -136,12 +136,12 @@ CLASS="filename"
 ></DT
 ><DT
 >4.1.10. <A
-HREF="stepbystep.html#AEN679"
+HREF="stepbystep.html#AEN683"
 >Securing MySQL</A
 ></DT
 ><DT
 >4.1.11. <A
-HREF="stepbystep.html#AEN745"
+HREF="stepbystep.html#AEN749"
 >Configuring Bugzilla</A
 ></DT
 ></DL
@@ -155,17 +155,17 @@ HREF="extraconfig.html"
 ><DL
 ><DT
 >4.2.1. <A
-HREF="extraconfig.html#AEN751"
+HREF="extraconfig.html#AEN755"
 >Dependency Charts</A
 ></DT
 ><DT
 >4.2.2. <A
-HREF="extraconfig.html#AEN766"
+HREF="extraconfig.html#AEN770"
 >Bug Graphs</A
 ></DT
 ><DT
 >4.2.3. <A
-HREF="extraconfig.html#AEN779"
+HREF="extraconfig.html#AEN783"
 >The Whining Cron</A
 ></DT
 ><DT
@@ -277,12 +277,12 @@ HREF="troubleshooting.html"
 ><DL
 ><DT
 >4.5.1. <A
-HREF="troubleshooting.html#AEN1059"
+HREF="troubleshooting.html#AEN1063"
 >Bundle::Bugzilla makes me upgrade to Perl 5.6.1</A
 ></DT
 ><DT
 >4.5.2. <A
-HREF="troubleshooting.html#AEN1064"
+HREF="troubleshooting.html#AEN1068"
 >DBD::Sponge::db prepare failed</A
 ></DT
 ><DT
diff --git a/docs/html/integration.html b/docs/html/integration.html
index ebfcd69c4..b4faa8272 100644
--- a/docs/html/integration.html
+++ b/docs/html/integration.html
@@ -122,8 +122,12 @@ CLASS="QUOTE"
 >"[Bug XXXX]"</SPAN
 >, 
     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.</P
+    you  want to have the bug be closed automatically, you'll have to modify
+    the <TT
+CLASS="filename"
+>contrib/bugzilla_email_append.pl</TT
+> script.
+    </P
 ><P
 >There is also a CVSZilla project, based upon somewhat dated 
     Bugzilla code, to integrate CVS and Bugzilla through CVS' ability to 
diff --git a/docs/html/os-specific.html b/docs/html/os-specific.html
index 96f7157cc..f54221ff6 100644
--- a/docs/html/os-specific.html
+++ b/docs/html/os-specific.html
@@ -379,7 +379,7 @@ CLASS="section"
 ><H4
 CLASS="section"
 ><A
-NAME="AEN926"
+NAME="AEN930"
 ></A
 >4.3.1.3.3. System Calls</H4
 ><P
diff --git a/docs/html/stepbystep.html b/docs/html/stepbystep.html
index d925b25cb..5e5a09522 100644
--- a/docs/html/stepbystep.html
+++ b/docs/html/stepbystep.html
@@ -863,7 +863,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN552"
+NAME="AEN556"
 ></A
 >4.1.5.1. DBI</H3
 ><P
@@ -878,7 +878,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN555"
+NAME="AEN559"
 ></A
 >4.1.5.2. Data::Dumper</H3
 ><P
@@ -892,7 +892,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN558"
+NAME="AEN562"
 ></A
 >4.1.5.3. MySQL-related modules</H3
 ><P
@@ -918,7 +918,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN563"
+NAME="AEN567"
 ></A
 >4.1.5.4. TimeDate modules</H3
 ><P
@@ -934,7 +934,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN566"
+NAME="AEN570"
 ></A
 >4.1.5.5. GD (optional)</H3
 ><P
@@ -989,7 +989,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN573"
+NAME="AEN577"
 ></A
 >4.1.5.6. Chart::Base (optional)</H3
 ><P
@@ -1004,7 +1004,7 @@ CLASS="section"
 ><H3
 CLASS="section"
 ><A
-NAME="AEN576"
+NAME="AEN580"
 ></A
 >4.1.5.7. Template Toolkit</H3
 ><P
@@ -1073,7 +1073,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN586"
+NAME="AEN590"
 ></A
 >4.1.7. Bugzilla</H2
 ><P
@@ -1243,7 +1243,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN611"
+NAME="AEN615"
 ></A
 >4.1.8. Setting Up the MySQL Database</H2
 ><P
@@ -1416,7 +1416,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN647"
+NAME="AEN651"
 ></A
 >4.1.9. <TT
 CLASS="filename"
@@ -1569,7 +1569,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN679"
+NAME="AEN683"
 ></A
 >4.1.10. Securing MySQL</H2
 ><P
@@ -1847,7 +1847,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN745"
+NAME="AEN749"
 ></A
 >4.1.11. Configuring Bugzilla</H2
 ><P
diff --git a/docs/html/troubleshooting.html b/docs/html/troubleshooting.html
index c97cce857..924c70f50 100644
--- a/docs/html/troubleshooting.html
+++ b/docs/html/troubleshooting.html
@@ -85,7 +85,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1059"
+NAME="AEN1063"
 ></A
 >4.5.1. Bundle::Bugzilla makes me upgrade to Perl 5.6.1</H2
 ><P
@@ -110,7 +110,7 @@ CLASS="section"
 ><H2
 CLASS="section"
 ><A
-NAME="AEN1064"
+NAME="AEN1068"
 ></A
 >4.5.2. DBD::Sponge::db prepare failed</H2
 ><P
diff --git a/docs/html/using.html b/docs/html/using.html
index 9da8345b4..36596aabe 100644
--- a/docs/html/using.html
+++ b/docs/html/using.html
@@ -122,7 +122,7 @@ HREF="hintsandtips.html"
 ><DL
 ><DT
 >3.2.1. <A
-HREF="hintsandtips.html#AEN336"
+HREF="hintsandtips.html#AEN340"
 >Autolinkification</A
 ></DT
 ><DT
@@ -142,7 +142,7 @@ HREF="hintsandtips.html#attachments"
 ></DT
 ><DT
 >3.2.5. <A
-HREF="hintsandtips.html#AEN365"
+HREF="hintsandtips.html#AEN369"
 >Filing Bugs</A
 ></DT
 ></DL
diff --git a/docs/sgml/conventions.sgml b/docs/sgml/conventions.sgml
index 7334b02b8..5e761d9f4 100644
--- a/docs/sgml/conventions.sgml
+++ b/docs/sgml/conventions.sgml
@@ -135,6 +135,14 @@
         </row>
 
         <row>
+          <entry>Term found in the glossary</entry>
+
+          <entry>
+            <glossterm linkend="gloss-bugzilla">Bugzilla</glossterm>
+          </entry>
+        </row>
+
+        <row>
           <entry>Code Example</entry>
 
           <entry>
diff --git a/docs/sgml/glossary.sgml b/docs/sgml/glossary.sgml
index fb55363e6..f3be34466 100644
--- a/docs/sgml/glossary.sgml
+++ b/docs/sgml/glossary.sgml
@@ -118,7 +118,7 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
+    <glossentry id="gloss-bugzilla">
       <glossterm>Bugzilla</glossterm>
 
       <glossdef>
diff --git a/docs/sgml/installation.sgml b/docs/sgml/installation.sgml
index 0770ae4af..b25a2bcab 100644
--- a/docs/sgml/installation.sgml
+++ b/docs/sgml/installation.sgml
@@ -1597,7 +1597,7 @@ AddHandler cgi-script .cgi
         (either the Bugzilla directory or one of its parents).
         </para>
         <programlisting>
-Options +ExecCGI 
+Options +ExecCGI
 AllowOverride Limit
         </programlisting>
 
diff --git a/docs/sgml/integration.sgml b/docs/sgml/integration.sgml
index 68054ee13..1b0489fd9 100644
--- a/docs/sgml/integration.sgml
+++ b/docs/sgml/integration.sgml
@@ -30,8 +30,9 @@
     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>
+    you  want to have the bug be closed automatically, you'll have to modify
+    the <filename>contrib/bugzilla_email_append.pl</filename> script.
+    </para>
 
     <para>There is also a CVSZilla project, based upon somewhat dated 
     Bugzilla code, to integrate CVS and Bugzilla through CVS' ability to 
diff --git a/docs/txt/Bugzilla-Guide.txt b/docs/txt/Bugzilla-Guide.txt
index 02f37f79f..ce90ed22f 100644
--- a/docs/txt/Bugzilla-Guide.txt
+++ b/docs/txt/Bugzilla-Guide.txt
@@ -258,6 +258,7 @@ Chapter 1. About This Guide
    Prompt of user command under tcsh shell tcsh$
    Environment Variables VARIABLE
    Emphasized word word
+   Term found in the glossary Bugzilla
    Code Example
 <para>
 Beginning and end of paragraph
@@ -2648,9 +2649,9 @@ patching file globals.pl
    Follow the instructions in this Guide 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 "[Bug XXXX]", 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.
+   have CVS check-in comments append to your Bugzilla bug. If you want to
+   have the bug be closed automatically, you'll have to modify the
+   contrib/bugzilla_email_append.pl script.
 
    There is also a CVSZilla project, based upon somewhat dated Bugzilla
    code, to integrate CVS and Bugzilla through CVS' ability to email.
diff --git a/docs/xml/conventions.xml b/docs/xml/conventions.xml
index 7334b02b8..5e761d9f4 100644
--- a/docs/xml/conventions.xml
+++ b/docs/xml/conventions.xml
@@ -135,6 +135,14 @@
         </row>
 
         <row>
+          <entry>Term found in the glossary</entry>
+
+          <entry>
+            <glossterm linkend="gloss-bugzilla">Bugzilla</glossterm>
+          </entry>
+        </row>
+
+        <row>
           <entry>Code Example</entry>
 
           <entry>
diff --git a/docs/xml/glossary.xml b/docs/xml/glossary.xml
index fb55363e6..f3be34466 100644
--- a/docs/xml/glossary.xml
+++ b/docs/xml/glossary.xml
@@ -118,7 +118,7 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
+    <glossentry id="gloss-bugzilla">
       <glossterm>Bugzilla</glossterm>
 
       <glossdef>
diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index 0770ae4af..b25a2bcab 100644
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1597,7 +1597,7 @@ AddHandler cgi-script .cgi
         (either the Bugzilla directory or one of its parents).
         </para>
         <programlisting>
-Options +ExecCGI 
+Options +ExecCGI
 AllowOverride Limit
         </programlisting>
 
diff --git a/docs/xml/integration.xml b/docs/xml/integration.xml
index 68054ee13..1b0489fd9 100644
--- a/docs/xml/integration.xml
+++ b/docs/xml/integration.xml
@@ -30,8 +30,9 @@
     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>
+    you  want to have the bug be closed automatically, you'll have to modify
+    the <filename>contrib/bugzilla_email_append.pl</filename> script.
+    </para>
 
     <para>There is also a CVSZilla project, based upon somewhat dated 
     Bugzilla code, to integrate CVS and Bugzilla through CVS' ability to