summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjake%bugzilla.org <>2008-04-04 13:46:21 +0200
committerjake%bugzilla.org <>2008-04-04 13:46:21 +0200
commit7a5b7f8785a812aa6ef1dde81a686395bfd96c99 (patch)
tree540e498d5fdb74338c91733dd7c464f7fa953262
parent1a6e346ca51799b197070f0f2837e5fd8d930311 (diff)
downloadbugzilla-7a5b7f8785a812aa6ef1dde81a686395bfd96c99.tar.gz
bugzilla-7a5b7f8785a812aa6ef1dde81a686395bfd96c99.tar.xz
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
-rw-r--r--docs/en/xml/conventions.xml8
-rw-r--r--docs/en/xml/glossary.xml2
-rw-r--r--docs/en/xml/installation.xml2
-rw-r--r--docs/en/xml/integration.xml5
4 files changed, 13 insertions, 4 deletions
diff --git a/docs/en/xml/conventions.xml b/docs/en/xml/conventions.xml
index 7334b02b8..5e761d9f4 100644
--- a/docs/en/xml/conventions.xml
+++ b/docs/en/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/en/xml/glossary.xml b/docs/en/xml/glossary.xml
index fb55363e6..f3be34466 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 0770ae4af..b25a2bcab 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 68054ee13..1b0489fd9 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