Merging new docs from 2.16 branch.

1 files changed, 25 insertions, 41 deletions

diff --git a/docs/sgml/variants.sgml b/docs/sgml/variants.sgml
index 5fbea801f..73f6822fb 100644
--- a/docs/sgml/variants.sgml
+++ b/docs/sgml/variants.sgml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN">-->
-<chapter id="variants" xreflabel="Bugzilla Variants and Competitors">
+<appendix id="variants" xreflabel="Bugzilla Variants and Competitors">
   <title>Bugzilla Variants and Competitors</title>
 
   <para>I created this section to answer questions about Bugzilla competitors
@@ -13,13 +13,12 @@
   <section id="rhbugzilla" xreflabel="Red Hat Bugzilla">
     <title>Red Hat Bugzilla</title>
 
-    <para>Red Hat Bugzilla is probably the most popular Bugzilla variant on
-    the planet. One of the major benefits of Red Hat Bugzilla is the ability
+    <para>Red Hat Bugzilla is a fork of Bugzilla 2.8. 
+    One of its major benefits is the ability
     to work with Oracle, MySQL, and PostGreSQL databases serving as the
-    back-end, instead of just MySQL. Dave Lawrence has worked very hard to
-    keep Red Hat Bugzilla up-to-date, and many people prefer the
-    snappier-looking page layout of Red Hat Bugzilla to the default
-    Mozilla-standard formatting.</para>
+    back-end, instead of just MySQL. Dave Lawrence of Red Hat is 
+    active in the Bugzilla community, and we hope to see a reunification
+    of the fork before too long.</para>
 
     <para>URL: 
     <ulink url="http://bugzilla.redhat.com/bugzilla/">
@@ -30,38 +29,26 @@
   <section id="variant-fenris" xreflabel="Loki Bugzilla, a.k.a. Fenris">
     <title>Loki Bugzilla (Fenris)</title>
 
-    <para>Fenris can be found at 
-    <ulink url="http://fenris.lokigames.com/">
-    http://fenris.lokigames.com</ulink>
-
-    . It is a fork from Bugzilla.</para>
+    <para>Fenris was a fork from Bugzilla made by Loki Games; when
+    Loki went into receivership, it died. While Loki's other code lives on,
+    its custodians recommend Bugzilla for future bug-tracker deployments.
+    </para>
   </section>
 
   <section id="variant-issuezilla" xreflabel="Issuezilla">
     <title>Issuezilla</title>
 
-    <para>Issuezilla is another fork from Bugzilla, and seems nearly as
-    popular as the Red Hat Bugzilla fork. Some Issuezilla team members are
-    regular contributors to the Bugzilla mailing list/newsgroup. Issuezilla
-    is not the primary focus of bug-tracking at tigris.org, however. Their
-    Java-based bug-tracker, 
-    <xref linkend="variant-scarab" />
-
-    , is under heavy development and looks promising!</para>
-
-    <para>URL: 
-    <ulink url="http://issuezilla.tigris.org/servlets/ProjectHome">
-    http://issuezilla.tigris.org/servlets/ProjectHome</ulink>
-    </para>
+    <para>Issuezilla was another fork from Bugzilla, made by collab.net and
+    hosted at tigris.org. It is also dead; the primary focus of bug-tracking 
+    at tigris.org is their Java-based bug-tracker, 
+    <xref linkend="variant-scarab"/>.</para>
   </section>
 
-  <section id="variant-scarab"
-  xreflabel="Scarab, a newfangled Java-based issue tracker">
+  <section id="variant-scarab" xreflabel="Scarab">
     <title>Scarab</title>
 
-    <para>Scarab is a promising new bug-tracking system built using Java
-    Serlet technology. As of this writing, no source code has been released
-    as a package, but you can obtain the code from CVS.</para>
+    <para>Scarab is a new open source bug-tracking system built using Java
+    Serlet technology. It is currently at version 1.0 beta 8.</para>
 
     <para>URL: 
     <ulink url="http://scarab.tigris.org/">http://scarab.tigris.org</ulink>
@@ -72,32 +59,29 @@
     <title>Perforce SCM</title>
 
     <para>Although Perforce isn't really a bug tracker, it can be used as
-    such through the 
-    <quote>jobs</quote>
-
+    such through the <quote>jobs</quote>
     functionality.</para>
 
-    <para>
+    <para>URL: 
     <ulink url="http://www.perforce.com/perforce/technotes/note052.html">
+    http://www.perforce.com/perforce/technotes/note052.html
     </ulink>
-
-    http://www.perforce.com/perforce/technotes/note052.html</para>
+    </para>
   </section>
 
   <section id="variant-sourceforge" xreflabel="SourceForge">
     <title>SourceForge</title>
 
-    <para>SourceForge is more of a way of coordinating geographically
-    distributed free software and open source projects over the Internet than
-    strictly a bug tracker, but if you're hunting for bug-tracking for your
-    open project, it may be just what the software engineer ordered!</para>
+    <para>SourceForge is a way of coordinating geographically
+    distributed free software and open source projects over the Internet.
+    It has a built-in bug tracker, but it's not highly thought of.</para>
 
     <para>URL: 
     <ulink url="http://www.sourceforge.net">
     http://www.sourceforge.net</ulink>
     </para>
   </section>
-</chapter>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables: