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 7334b02b8b9dc350e1d73eb5c6dadf8058472d28..5e761d9f4f148f212972a4909998a4e0d94c0773 100644 (file)
--- 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 fb55363e65166b78690f6319b768a9b58e0cb037..f3be344662430a0a881adcfe94c81d4a10ed8181 100644 (file)
--- 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 0770ae4afdb40c35b079173eed4c28fd64337d4b..b25a2bcaba20a8326e54b0b0824144e0ee443a79 100644 (file)
--- 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 68054ee1377c0bc00e8ee501b35065f82490b0f9..1b0489fd93466cadc53d6bc33a06326beabb8e37 100644 (file)
--- 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