Patch for bug 253308: Mention the Scmbug integration system in documentation; patch...

diff --git a/docs/en/xml/integration.xml b/docs/en/xml/integration.xml
index e801847d6bf8ece3c35f9cdf729192288935870e..3aa49245c5556cf3efb901971b6775359724647d 100644 (file)
--- a/docs/en/xml/integration.xml
+++ b/docs/en/xml/integration.xml
@@ -1,6 +1,6 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN" > -->
 <!-- Keep these tools listings in alphabetical order please. -MPB -->
-<chapter id="integration">
+<section id="integration">
   <title>Integrating Bugzilla with Third-Party Tools</title>
 
   <section id="bonsai"
@@ -13,43 +13,38 @@
     . Using Bonsai, administrators can control open/closed status of trees,
     query a fast relational database back-end for change, branch, and comment
     information, and view changes made since the last time the tree was
-    closed. These kinds of changes cause the engineer responsible to be 
-    <quote>on the hook</quote>
-
-    (include cool URL link here for Hook policies at mozilla.org). Bonsai
-    also includes gateways to 
-    <xref linkend="tinderbox" />
-
-    and Bugzilla</para>
+    closed. Bonsai
+    also integrates with  
+    <xref linkend="tinderbox" />.
+    </para>
   </section>
 
   <section id="cvs" xreflabel="CVS, the Concurrent Versioning System">
     <title>CVS</title>
 
     <para>CVS integration is best accomplished, at this point, using the
-    Bugzilla Email Gateway. There have been some files submitted to allow
-    greater CVS integration, but we need to make certain that Bugzilla is not
-    tied into one particular software management package.</para>
+    Bugzilla Email Gateway.</para>
 
-    <para>Follow the instructions in the FAQ for enabling Bugzilla e-mail
+    <para>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 
-    <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>
-
-    <para>There is also a project, based upon somewhat dated Bugzilla code,
-    to integrate CVS and Bugzilla through CVS' ability to email. Check it out
-    at: 
-    <ulink url="http://homepages.kcbbs.gen.nz/~tonyg/">
-    http://homepages.kcbbs.gen.nz/~tonyg/</ulink>
+    <quote>[Bug XXXX]</quote>, 
+    and you can have CVS check-in comments append to your Bugzilla bug. If
+    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 
+    email. Check it out at: <ulink url="http://homepages.kcbbs.gen.nz/~tonyg/"/>.
+    </para>
+
+    <para>Another system capable of CVS integration with Bugzilla is
+    Scmbug. This system provides generic integration of Source code
+    Configuration Management with Bugtracking. Check it out at: <ulink
+    url="http://freshmeat.net/projects/scmbug/"/>.
+    </para>
 
-    , under the 
-    <quote>cvszilla</quote>
-
-    link.</para>
   </section>
 
   <section id="scm"
@@ -59,16 +54,14 @@
 
     <para>You can find the project page for Bugzilla and Teamtrack Perforce
     integration (p4dti) at: 
-    <ulink url="http://www.ravenbrook.com/project/p4dti/">
-    http://www.ravenbrook.com/project/p4dti</ulink>
+    <ulink url="http://www.ravenbrook.com/project/p4dti/"/>
 
     . 
     <quote>p4dti</quote>
 
     is now an officially supported product from Perforce, and you can find
     the "Perforce Public Depot" p4dti page at 
-    <ulink url="http://public.perforce.com/public/perforce/p4dti/index.html">
-    http://public.perforce.com/public/perforce/p4dti/index.html</ulink>
+    <ulink url="http://public.perforce.com/public/perforce/p4dti/index.html"/>
 
     .</para>
 
@@ -80,13 +73,29 @@
     Please consult the pages linked above for further information.</para>
   </section>
 
+  <section id="svn"
+  xreflabel="Subversion, a compelling replacement for CVS">
+     <title>Subversion</title>
+     <para>Subversion is a free/open-source version control system,
+     designed to overcome various limitations of CVS. Integration of
+     Subversion with Bugzilla is possible using Scmbug, a system
+     providing generic integration of Source Code Configuration
+     Management with Bugtracking. Scmbug is available at <ulink
+     url="http://freshmeat.net/projects/scmbug/"/>.</para>
+  </section>
+
   <section id="tinderbox"
   xreflabel="Tinderbox, the Mozilla automated build management system">
     <title>Tinderbox/Tinderbox2</title>
 
-    <para>We need Tinderbox integration information.</para>
+    <para>Tinderbox is a continuous-build system which can integrate with
+    Bugzilla - see
+    <ulink url="http://www.mozilla.org/projects/tinderbox"/> for details
+    of Tinderbox, and 
+    <ulink url="http://tinderbox.mozilla.org/showbuilds.cgi"/> to see it
+    in action.</para>
   </section>
-</chapter>
+</section>
 
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -103,7 +112,7 @@ sgml-local-ecat-files:nil
 sgml-minimize-attributes:nil
 sgml-namecase-general:t
 sgml-omittag:t
-sgml-parent-document:("Bugzilla-Guide.sgml" "book" "chapter")
+sgml-parent-document:("Bugzilla-Guide.xml" "book" "chapter")
 sgml-shorttag:t
 sgml-tag-region-if-active:t
 End: