From de574c3a801a2b9e98954cb84859934de8aebeb0 Mon Sep 17 00:00:00 2001
From: "mozilla%colinogilvie.co.uk" <mozilla%colinogilvie.co.uk>
Date: Fri, 30 Dec 2005 15:39:01 +0000
Subject: [PATCH] Bug 303782: Docs missing prerequsite for required
 MIME::Base64 and MIME::Parser Patch by: victory <bmo@rsz.jp>; r=colin

---
 webtools/bugzilla/docs/xml/Bugzilla-Guide.xml |  6 ++-
 webtools/bugzilla/docs/xml/installation.xml   | 38 ++++++++++---------
 webtools/bugzilla/docs/xml/modules.xml        | 37 +++++++++++++-----
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml b/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml
index d03ac1b71c0..421faf11861 100644
--- a/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml
+++ b/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml
@@ -57,7 +57,9 @@
 <!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.65">
+<!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">
@@ -65,8 +67,8 @@
 <!ENTITY min-gd-text-align-ver "any">
 <!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.4">
+<!ENTITY min-image-magick-ver "any">
 
 ]>
 
diff --git a/webtools/bugzilla/docs/xml/installation.xml b/webtools/bugzilla/docs/xml/installation.xml
index f122002a676..ebe2d5d48a9 100644
--- a/webtools/bugzilla/docs/xml/installation.xml
+++ b/webtools/bugzilla/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.106 2005-12-30 15:25:11 mozilla%colinogilvie.co.uk Exp $ -->
+<!-- $Id: installation.xml,v 1.107 2005-12-30 15:39:01 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/webtools/bugzilla/docs/xml/modules.xml b/webtools/bugzilla/docs/xml/modules.xml
index d031b19c017..59c58530eb6 100644
--- a/webtools/bugzilla/docs/xml/modules.xml
+++ b/webtools/bugzilla/docs/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>