Massive rearrangement of the installation section. Hopefully it makes sense now.

docs/en/xml/Bugzilla-Guide.xml

@@ -11,13 +11,11 @@
 <!ENTITY administration SYSTEM "administration.xml">
 <!ENTITY using SYSTEM "using.xml">
 <!ENTITY integration SYSTEM "integration.xml">
-<!ENTITY future SYSTEM "future.xml">
 <!ENTITY index SYSTEM "index.xml">
 <!ENTITY customization SYSTEM "customization.xml">
 <!ENTITY patches SYSTEM "patches.xml">
-<!ENTITY variants SYSTEM "variants.xml">
 <!ENTITY introduction SYSTEM "introduction.xml">
-<!ENTITY revhistory SYSTEM "revhistory.xml">
+<!ENTITY modules SYSTEM "modules.xml">
 
 <!-- Things to change for a stable release:
      * bz-ver to current stable
@@ -32,9 +30,9 @@
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "2.17.5">
+<!ENTITY bz-ver "2.17.7">
 <!ENTITY bz-nextver "2.18">
-<!ENTITY bz-date "2004-01-15">
+<!ENTITY bz-date "2004-01-24">
 <!ENTITY % bz-devel "INCLUDE">
 
 <!ENTITY bz "http://www.bugzilla.org/">
@@ -54,7 +52,7 @@
 <!ENTITY min-dbd-mysql-ver "2.1010">
 <!ENTITY min-dbi-ver "1.32">
 <!ENTITY min-date-format-ver "2.21">
-<!ENTITY min-cgi-ver "2.88">
+<!ENTITY min-cgi-ver "2.93">
 <!-- Optional modules -->
 <!ENTITY min-gd-ver "1.20">
 <!ENTITY min-gd-graph-ver "any">
@@ -136,12 +134,6 @@
 <!-- About This Guide -->
 &about;
 
-<!-- Introduction -->
-&introduction;
-
-<!-- Using Bugzilla -->
-&using;
-
 <!-- Installing Bugzilla -->
 &installation;
 
@@ -151,12 +143,18 @@
 <!-- Customizing Bugzilla -->
 &customization;
 
+<!-- Using Bugzilla -->
+&using;
+
 <!-- Appendix: The Frequently Asked Questions -->
 &faq;
 
 <!-- Appendix: Custom Patches -->
 &patches;
 
+<!-- Appendix: Manually Installing Perl Modules -->
+&modules;
+
 <!-- Appendix: GNU Free Documentation License -->
 &gfdl;
 

docs/en/xml/about.xml

@@ -6,8 +6,11 @@
 
   <section id="copyright">
     <title>Copyright Information</title>
+
+    <para>This document is copyright (c) 2000-2004 by the various
+    Bugzilla contributors who wrote it.</para>
+    
     <blockquote>
-      <attribution>Copyright (c) 2000-2004 The Bugzilla Team</attribution>
       <para>
 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free Documentation
@@ -45,10 +48,10 @@
     </para>
     <para>
       Although the Bugzilla development team has taken great care to
-      ensure that all exploitable bugs or options have been
-      fixed, security holes surely exist. Great care should be taken both in 
+      ensure that all exploitable bugs have been fixed, security holes surely 
+      exist in any piece of code. Great care should be taken both in 
       the installation and usage of this software. The Bugzilla development
-      team members assume no liability for your use of this software. You have 
+      team members assume no liability for your use of Bugzilla. You have 
       the source code, and are responsible for auditing it yourself to ensure
       your security needs are met.
     </para>
@@ -68,16 +71,36 @@
     </para>
     <para>
       The latest version of this guide can always be found at <ulink
-      url="http://www.bugzilla.org"/>, or checked out via CVS.
-      (Please follow the <ulink url="http://www.mozilla.org/cvs.html">Mozilla 
+      url="http://www.bugzilla.org"/>, or checked out via CVS by
+      following the <ulink url="http://www.mozilla.org/cvs.html">Mozilla 
       CVS</ulink> instructions and check out the 
       <filename>mozilla/webtools/bugzilla/docs/</filename>
-      subtree.) However, you should read the version
+      subtree. However, you should read the version
       which came with the Bugzilla release you are using.
     </para>
     <para>
-      The Bugzilla Guide is currently only available in English. 
-      If you would like to volunteer to translate it, please contact
+      The Bugzilla Guide, or a section of it, is also available in
+      the following languages:
+      <ulink url="http://bugzilla-de.sourceforge.net/docs/html/">German</ulink>.
+    </para>
+    
+    <para>  
+      In addition, there are Bugzilla template localisation projects in
+      the following languages. They may have translated documentation 
+      available: 
+      <ulink url="http://sourceforge.net/projects/bugzilla-be/">Belarusian</ulink>,
+      <ulink url="http://sourceforge.net/projects/bugzilla-br/">Brazilian Portuguese</ulink>,
+      <ulink url="http://sourceforge.net/projects/bugzilla-cn/">Chinese</ulink>,
+      <ulink url="http://sourceforge.net/projects/bugzilla-fr/">French</ulink>,
+      <ulink url="http://sourceforge.net/projects/bugzilla-de/">German</ulink>,
+      <ulink url="http://sourceforge.net/projects/bugzilla-kr/">Korean</ulink>,
+      <ulink url="http://sourceforge.net/projects/bugzilla-ru/">Russian</ulink> and
+      <ulink url="http://sourceforge.net/projects/bugzilla-es/">Spanish</ulink>.
+    </para>
+    
+    <para>  
+      If you would like to volunteer to translate the Guide into additional
+      languages, please contact
       <ulink url="mailto:justdave@syndicomm.com">Dave Miller</ulink>.
     </para>
   </section>
@@ -113,7 +136,7 @@
     </para>
     
     <para>
-      Last but not least, all the members of the 
+      Also, thanks are due to the members of the 
       <ulink url="news://news.mozilla.org/netscape.public.mozilla.webtools">
       netscape.public.mozilla.webtools</ulink>
       newsgroup. Without your discussions, insight, suggestions, and patches,

docs/en/xml/gfdl.xml

@@ -16,7 +16,7 @@
   </blockquote>
 
   <section label="0" id="gfdl-0">
-    <title>PREAMBLE</title>
+    <title>Preamble</title>
 
     <para>The purpose of this License is to make a manual, textbook, or other
     written document "free" in the sense of freedom: to assure everyone the
@@ -41,7 +41,7 @@
   </section>
 
   <section label="1" id="gfdl-1">
-    <title>APPLICABILITY AND DEFINITIONS</title>
+    <title>Applicability and Definition</title>
 
     <para>This License applies to any manual or other work that contains a
     notice placed by the copyright holder saying it can be distributed under
@@ -101,7 +101,7 @@
   </section>
 
   <section label="2" id="gfdl-2">
-    <title>VERBATIM COPYING</title>
+    <title>Verbatim Copying</title>
 
     <para>You may copy and distribute the Document in any medium, either
     commercially or noncommercially, provided that this License, the
@@ -118,7 +118,7 @@
   </section>
 
   <section label="3" id="gfdl-3">
-    <title>COPYING IN QUANTITY</title>
+    <title>Copying in Quantity</title>
 
     <para>If you publish printed copies of the Document numbering more than
     100, and the Document's license notice requires Cover Texts, you must
@@ -157,7 +157,7 @@
   </section>
 
   <section label="4" id="gfdl-4">
-    <title>MODIFICATIONS</title>
+    <title>Modifications</title>
 
     <para>You may copy and distribute a Modified Version of the Document
     under the conditions of sections 2 and 3 above, provided that you release
@@ -287,7 +287,7 @@
   </section>
 
   <section label="5" id="gfdl-5">
-    <title>COMBINING DOCUMENTS</title>
+    <title>Combining Documents</title>
 
     <para>You may combine the Document with other documents released under
     this License, under the terms defined in section 4 above for modified
@@ -313,7 +313,7 @@
   </section>
 
   <section label="6" id="gfdl-6">
-    <title>COLLECTIONS OF DOCUMENTS</title>
+    <title>Collections of Documents</title>
 
     <para>You may make a collection consisting of the Document and other
     documents released under this License, and replace the individual copies
@@ -329,7 +329,7 @@
   </section>
 
   <section label="7" id="gfdl-7">
-    <title>AGGREGATION WITH INDEPENDENT WORKS</title>
+    <title>Aggregation with Independent Works</title>
 
     <para>A compilation of the Document or its derivatives with other
     separate and independent documents or works, in or on a volume of a
@@ -348,7 +348,7 @@
   </section>
 
   <section label="8" id="gfdl-8">
-    <title>TRANSLATION</title>
+    <title>Translation</title>
 
     <para>Translation is considered a kind of modification, so you may
     distribute translations of the Document under the terms of section 4.
@@ -363,7 +363,7 @@
   </section>
 
   <section label="9" id="gfdl-9">
-    <title>TERMINATION</title>
+    <title>Termination</title>
 
     <para>You may not copy, modify, sublicense, or distribute the Document
     except as expressly provided for under this License. Any other attempt to
@@ -375,7 +375,7 @@
   </section>
 
   <section label="10" id="gfdl-10">
-    <title>FUTURE REVISIONS OF THIS LICENSE</title>
+    <title>Future Revisions of this License</title>
 
     <para>The Free Software Foundation may publish new, revised versions of
     the GNU Free Documentation License from time to time. Such new versions