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

This checkin contains two fixes:
7407cb30 · jake%bugzilla.org · 0359066d · 7407cb30 · 7407cb30 · 7407cb30
Commit 7407cb30 authored Feb 06, 2003 by jake%bugzilla.org
27 changed files
--- a/docs/html/Bugzilla-Guide.html
+++ b/docs/html/Bugzilla-Guide.html
--- 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

--- 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"

--- 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

--- 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

--- 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

--- a/docs/html/faq.html
+++ b/docs/html/faq.html
--- 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"

--- 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"

--- 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

--- 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

--- 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

--- 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

--- 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
+    you  want to have the bug be closed automatically, you'll have to modify
-    change the Bugzilla bug state.</P
+    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 

--- 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

--- 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

--- 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

--- 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

--- 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>

--- 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>

--- 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>

--- 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
+    you  want to have the bug be closed automatically, you'll have to modify
-    change the Bugzilla bug state.</para>
+    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 

--- 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
+   have CVS check-in comments append to your Bugzilla bug. If you want to
-   your check-in script include an @resolution field, you can even change
+   have the bug be closed automatically, you'll have to modify the
-   the Bugzilla bug state.
+   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.

--- 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>

--- 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>

--- 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>

--- 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
+    you  want to have the bug be closed automatically, you'll have to modify
-    change the Bugzilla bug state.</para>
+    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