Bug 303782: Docs missing prerequsite for required MIME::Base64 and MIME::Parser

Patch by: victory <bmo@rsz.jp>; r=colin

3 files changed, 81 insertions, 45 deletions

diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index a81b86e5d..421faf118 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
 <!-- Include macros -->
 <!ENTITY about SYSTEM "about.xml">
@@ -9,10 +9,12 @@
 <!ENTITY glossary SYSTEM "glossary.xml">
 <!ENTITY installation SYSTEM "installation.xml">
 <!ENTITY administration SYSTEM "administration.xml">
+<!ENTITY security SYSTEM "security.xml">
 <!ENTITY using SYSTEM "using.xml">
 <!ENTITY integration SYSTEM "integration.xml">
 <!ENTITY index SYSTEM "index.xml">
 <!ENTITY customization SYSTEM "customization.xml">
+<!ENTITY troubleshooting SYSTEM "troubleshooting.xml">
 <!ENTITY patches SYSTEM "patches.xml">
 <!ENTITY introduction SYSTEM "introduction.xml">
 <!ENTITY modules SYSTEM "modules.xml">
@@ -21,47 +23,52 @@
      * bz-ver to current stable
      * bz-nexver to next stable
      * bz-date to the release date
-     * bz-devel to "IGNORE"
+     * Remove the BZ-DEVEL comments
      - COMPILE DOCS AND CHECKIN -
        Also, tag and tarball before completing
      * bz-ver to devel version
-     * bz-devel to "INCLUDE"
  
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "2.18rc1">
-<!ENTITY bz-nextver "2.18">
-<!ENTITY bz-date "2004-07-10">
-<!ENTITY % bz-devel "IGNORE">
+<!ENTITY bz-ver "2.21.1">
+<!ENTITY bz-nextver "2.22">
+<!ENTITY bz-date "2005-09-30">
+<!ENTITY current-year "2005">
 
-<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-2.18-branch/">
+<!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
 <!ENTITY bz "http://www.bugzilla.org/">
 <!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
 <!ENTITY mysql "http://www.mysql.com/">
-<!ENTITY newest-perl-ver "5.8.3">
 
 <!-- For minimum versions -->
-<!ENTITY min-mysql-ver "3.23.41">
-<!ENTITY min-perl-ver "5.6.0">
+<!ENTITY min-mysql-ver "4.0.14">
+<!ENTITY min-pg-ver "7.3.x">
+<!ENTITY min-perl-ver "5.6.1">
+<!ENTITY min-perl-ver-win "5.8.1">
 <!ENTITY min-template-ver "2.08">
 <!ENTITY min-file-temp-ver "any">
 <!ENTITY min-appconfig-ver "1.52">
 <!ENTITY min-text-wrap-ver "2001.0131">
-<!ENTITY min-file-spec-ver "0.82">
+<!ENTITY min-file-spec-ver "0.84">
 <!ENTITY min-data-dumper-ver "any">
-<!ENTITY min-dbd-mysql-ver "2.1010">
-<!ENTITY min-dbi-ver "1.32">
+<!ENTITY min-dbd-mysql-ver "2.9003">
+<!ENTITY min-dbd-pg-ver "1.31">
+<!ENTITY min-dbi-ver "1.38">
 <!ENTITY min-date-format-ver "2.21">
 <!ENTITY min-cgi-ver "2.93">
+<!ENTITY min-mail-mailer-ver "1.67">
+<!ENTITY min-mime-base64-ver "3.01">
+<!ENTITY min-mime-parser-ver "5.406">
+<!ENTITY min-storable-ver "any">
 <!-- Optional modules -->
 <!ENTITY min-gd-ver "1.20">
 <!ENTITY min-gd-graph-ver "any">
 <!ENTITY min-gd-text-align-ver "any">
-<!ENTITY min-chart-base-ver "0.99c">
+<!ENTITY min-chart-base-ver "1.0">
 <!ENTITY min-xml-parser-ver "any">
-<!ENTITY min-mime-parser-ver "any">
-<!ENTITY min-patchreader-ver "0.9.1">
+<!ENTITY min-patchreader-ver "0.9.4">
+<!ENTITY min-image-magick-ver "any">
 
 ]>
 
@@ -94,7 +101,8 @@
 
   <bookinfo>
     <title>The Bugzilla Guide - &bz-ver; 
-    <![%bz-devel;[Development ]]>Release</title>
+    <!-- BZ-DEVEL -->Development <!-- /BZ-DEVEL -->
+    Release</title>
 
     <authorgroup>
       <corpauthor>The Bugzilla Team</corpauthor>
@@ -141,6 +149,9 @@
 <!-- Administering Bugzilla -->
 &administration;
 
+<!-- Securing Bugzilla -->
+&security;
+
 <!-- Customizing Bugzilla -->
 &customization;
 
@@ -150,6 +161,9 @@
 <!-- Appendix: The Frequently Asked Questions -->
 &faq;
 
+<!-- Appendix: Troubleshooting -->
+&troubleshooting;
+
 <!-- Appendix: Custom Patches -->
 &patches;
 
@@ -188,3 +202,4 @@ sgml-shorttag:t
 sgml-tag-region-if-active:t
 End:
 -->
+
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 9d90fe1e7..364df0db5 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.106 2008/04/04 06:47:36 mozilla%colinogilvie.co.uk Exp $ -->
+<!-- $Id: installation.xml,v 1.107 2008/04/04 06:47:37 mozilla%colinogilvie.co.uk Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -352,13 +352,25 @@
             Text::Wrap (&min-text-wrap-ver;)
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             Mail::Mailer (&min-mail-mailer-ver;)
           </para>
         </listitem>
-        
+
+        <listitem>
+          <para>
+            MIME::Base64 (&min-mime-base64-ver;)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            MIME::Parser (&min-mime-parser-ver;)
+          </para>
+        </listitem>
+
         <listitem>
           <para>
             Storable (&min-storable-ver;)
@@ -409,11 +421,10 @@
             (&min-patchreader-ver;) for pretty HTML view of patches
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <link linkend="install-modules-mime-parser">MIME::Parser</link>
-            (&min-mime-parser-ver;) for the optional email interface
+            Image::Magick (&min-image-magick-ver;) for converting BMP image attachments to PNG
           </para>
         </listitem>
       </orderedlist>          
@@ -509,25 +520,16 @@
         </para>
       </section>
 
-      <section id="install-modules-mime-parser">
-        <title>MIME::Parser (&min-mime-parser-ver;)</title>
-
-        <para>The MIME::Parser module is only required if you want to use the 
-        email interface
-        located in the <filename class="directory">contrib</filename> directory.
-        </para>
-      </section>
-
       <section id="install-modules-patchreader">
         <title>PatchReader (&min-patchreader-ver;)</title>
 
-        <para>The PatchReader module is only required if you want to use 
+        <para>The PatchReader module is only required if you want to use
         Patch Viewer, a
         Bugzilla feature to show code patches in your web browser in a more
-        readable form. 
+        readable form.
         </para>
       </section>
-    </section>    
+    </section>
     <section id="install-MTA">
       <title>Mail Transfer Agent (MTA)</title>
     
diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml
index d031b19c0..59c58530e 100644
--- a/docs/en/xml/modules.xml
+++ b/docs/en/xml/modules.xml
@@ -147,6 +147,25 @@
         Documentation: <ulink url="http://stein.cshl.org/WWW/software/GD/"/>
       </literallayout>
     </para>
+
+    <para>
+      MIME::Base64:
+      <literallayout>
+        CPAN Download Page: <ulink url="http://search.cpan.org/dist/MIME-Base64/"/>
+        PPM Download Link: <ulink url="http://ppm.activestate.com/PPMPackages/zips/8xx-builds-only/Windows/MIME-Base64-2.20.zip"/>
+        Documentation: <ulink url="http://search.cpan.org/dist/MIME-Base64/Base64.pm"/>
+      </literallayout>
+    </para>
+
+    <para>
+      MIME::Parser (part of MIME-tools):
+      <literallayout>
+        CPAN Download Page: <ulink url="http://search.cpan.org/dist/MIME-tools/"/>
+        PPM Download Link: <ulink url="http://ppm.activestate.com/PPMPackages/zips/8xx-builds-only/Windows/MIME-tools-5.411a.zip"/>
+        Documentation: <ulink url="http://search.cpan.org/dist/MIME-tools/lib/MIME/Parser.pm"/>
+      </literallayout>
+    </para>
+
   </section>
 
   <section id="modules-manual-optional">
@@ -179,15 +198,6 @@
       </literallayout>
     </para>
 
-    <para>
-      MIME::Parser (part of MIME-tools):
-      <literallayout>
-        CPAN Download Page: <ulink url="http://search.cpan.org/dist/MIME-tools/"/>
-        PPM Download Link: <ulink url="http://ppm.activestate.com/PPMPackages/zips/8xx-builds-only/Windows/MIME-tools-5.411a.zip"/>
-        Documentation: <ulink url="http://search.cpan.org/dist/MIME-tools/lib/MIME/Parser.pm"/>
-      </literallayout>
-    </para>
-
    <para>
       XML::Parser:
       <literallayout>
@@ -205,5 +215,14 @@
         Documentation: <ulink url="http://www.johnkeiser.com/mozilla/Patch_Viewer.html"/>
       </literallayout>
     </para>
+
+   <para>
+      Image::Magick:
+      <literallayout>
+        CPAN Download Page: <ulink url="http://search.cpan.org/dist/PerlMagick/"/>
+        PPM Download Link: Included in Windows binary package.
+        Documentation: <ulink url="http://www.imagemagick.org/script/resources.php"/>
+      </literallayout>
+    </para>
    </section>
 </appendix>