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


git-svn-id: svn://10.0.0.236/trunk@137463 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webtools/bugzilla/docs/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>
 

mozilla/webtools/bugzilla/docs/xml/glossary.xml

@@ -118,7 +118,7 @@
       </glossdef>
     </glossentry>
 
-    <glossentry>
+    <glossentry id="gloss-bugzilla">
       <glossterm>Bugzilla</glossterm>
 
       <glossdef>

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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