From: jake%bugzilla.org <>
Date: Fri, 4 Apr 2008 11:46:21 +0000 (+0000)
Subject: This checkin contains two fixes:
X-Git-Tag: bugzilla-3.1.3~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a5b7f8785a812aa6ef1dde81a686395bfd96c99;p=thirdparty%2Fbugzilla.git

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

diff --git a/docs/en/xml/conventions.xml b/docs/en/xml/conventions.xml
index 7334b02b8b..5e761d9f4f 100644
--- a/docs/en/xml/conventions.xml
+++ b/docs/en/xml/conventions.xml
@@ -134,6 +134,14 @@
           </entry>
         </row>
 
+        <row>
+          <entry>Term found in the glossary</entry>
+
+          <entry>
+            <glossterm linkend="gloss-bugzilla">Bugzilla</glossterm>
+          </entry>
+        </row>
+
         <row>
           <entry>Code Example</entry>
 
diff --git a/docs/en/xml/glossary.xml b/docs/en/xml/glossary.xml
index fb55363e65..f3be344662 100644
--- a/docs/en/xml/glossary.xml
+++ b/docs/en/xml/glossary.xml
@@ -118,7 +118,7 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
+    <glossentry id="gloss-bugzilla">
       <glossterm>Bugzilla</glossterm>
 
       <glossdef>
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 0770ae4afd..b25a2bcaba 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/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/en/xml/integration.xml b/docs/en/xml/integration.xml
index 68054ee137..1b0489fd93 100644
--- a/docs/en/xml/integration.xml
+++ b/docs/en/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