Bug 360520: Docs need to be changed to include info about the Email:: modules instead of the Mail:: modules - Patch by victory(_RSZ_) <bmo2007@rsz.jp> r=Colin

2 files changed, 96 insertions, 43 deletions

diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index 58a75448e..f73151eb6 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -1,4 +1,8 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+    <!ENTITY % myents SYSTEM "bugzilla.ent">
+    %myents;
 
 <!-- Include macros -->
 <!ENTITY about SYSTEM "about.xml">
@@ -31,45 +35,18 @@
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "2.22rc1">
-<!ENTITY bz-nextver "2.22">
-<!ENTITY bz-date "2006-02-20">
+<!ENTITY bz-ver "2.23.3">
+<!ENTITY bz-nextver "3.0">
+<!ENTITY bz-date "2006-10-15">
 <!ENTITY current-year "2006">
 
 <!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 bzg-bugs "<ulink url='https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
 <!ENTITY mysql "http://www.mysql.com/">
 
-<!-- For minimum versions -->
-<!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 "5.8.0">
 <!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.84">
-<!ENTITY min-data-dumper-ver "any">
-<!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 "1.0">
-<!ENTITY min-xml-parser-ver "any">
-<!ENTITY min-patchreader-ver "0.9.4">
-<!ENTITY min-image-magick-ver "any">
-
 ]>
 
 
@@ -121,7 +98,7 @@
 
       <para>
         The most current version of this document can always be found on the
-        <ulink url="http://www.bugzilla.org/documentation.html">Bugzilla 
+        <ulink url="http://www.bugzilla.org/docs/">Bugzilla 
         Documentation Page</ulink>.
       </para>
 
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index bef8bca51..e4ce11dca 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.131 2008/04/04 06:48:01 mkanat%bugzilla.org Exp $ -->
+<!-- $Id: installation.xml,v 1.132 2008/04/04 06:48:02 lpsolit%gmail.com Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -258,7 +258,7 @@
         <para>Many people complain that Perl modules will not install for
         them. Most times, the error messages complain that they are missing a
         file in 
-        <quote>@INC</quote>. 
+        <quote>@INC</quote>.
         Virtually every time, this error is due to permissions being set too
         restrictively for you to compile Perl modules or not having the
         necessary Perl development libraries installed on your system.
@@ -331,25 +331,31 @@
 
         <listitem>
           <para>
-            Mail::Mailer (&min-mail-mailer-ver;)
+            MIME::Base64 (&min-mime-base64-ver;)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            MIME::Base64 (&min-mime-base64-ver;)
+            MIME::Parser (&min-mime-parser-ver;)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            MIME::Parser (&min-mime-parser-ver;)
+            Email::Send (&min-email-send-ver;)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Email::MIME::Modifier (&min-email-mime-modifier-ver;)
           </para>
         </listitem>
       </orderedlist>
 
       Optional Perl modules:
-      <orderedlist>  
+      <orderedlist>
         <listitem>
           <para>
             <link linkend="install-modules-gd">GD</link>
@@ -359,6 +365,13 @@
 
         <listitem>
           <para>
+            Template::Plugin::GD::Image
+            (&min-gd-ver;) for Graphical Reports
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             <link linkend="install-modules-chart-base">Chart::Base</link>
             (&min-chart-base-ver;) for bug charting
           </para>
@@ -387,8 +400,8 @@
 
         <listitem>
           <para>
-            <link linkend="install-modules-soap-lite">SOAP::Lite</link>
-            (&min-soap-lite-ver;) for the web service interface
+            LWP::UserAgent
+            (&min-lwp-useragent-ver;) for Automatic Update Notifications
           </para>
         </listitem>
 
@@ -404,7 +417,70 @@
             Image::Magick (&min-image-magick-ver;) for converting BMP image attachments to PNG
           </para>
         </listitem>
-      </orderedlist>          
+
+        <listitem>
+          <para>
+            Net::LDAP
+            (&min-net-ldap-ver;) for LDAP Authentication
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <link linkend="install-modules-soap-lite">SOAP::Lite</link>
+            (&min-soap-lite-ver;) for the web service interface
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            HTML::Parser
+            (&min-html-parser-ver;) for More HTML in Product/Group Descriptions
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            HTML::Scrubber
+            (&min-html-scrubber-ver;) for More HTML in Product/Group Descriptions
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Email::MIME::Attachment::Stripper
+            (&min-email-mime-attachment-stripper-ver;) for Inbound Email
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Email::Reply
+            (&min-email-reply-ver;) for Inbound Email
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            mod_perl2
+            (&min-mod_perl2-ver;) for mod_perl
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            CGI
+            (&min-cgi-ver;) for mod_perl
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Apache::DBI
+            (&min-apache-dbi-ver;) for mod_perl2
+          </para>
+        </listitem>
+      </orderedlist>
       </para>
 
       <section id="install-modules-dbd-mysql">