Bug 504418: mod_perl CGI requirement no longer newer than base CGI requirement -...

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 65c6b9e8ac4274f7358d11f274df735990709a8c..1edd30bb23be54360437b30ca9664e10a2feb9cd 100644 (file)
--- 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.165 2009/03/02 01:21:57 mkanat%bugzilla.org Exp $ -->
+<!-- $Id: installation.xml,v 1.165.2.1 2009/07/16 01:17:53 lpsolit%gmail.com Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -485,14 +485,6 @@
             (&min-mod_perl2-ver;) for mod_perl
           </para>
         </listitem>
-
-        <listitem>
-          <para>
-            CGI
-            (&min-mp-cgi-ver;) for mod_perl
-          </para>
-        </listitem>
-
       </orderedlist>
       </para>
 
@@ -665,10 +657,6 @@
       <para>Bugzilla requires <literal>mod_perl</literal> to be installed, which can be
       obtained from <ulink url="http://perl.apache.org"/> - Bugzilla requires
       version &min-mod_perl2-ver; (AKA 2.0.0-RC5) to be installed.</para>
-      
-      <para>Bugzilla also requires a more up-to-date version of the CGI
-      perl module to be installed, version &min-mp-cgi-ver; as opposed to &min-cgi-ver;
-      </para>
     </section>
   </section>
   

diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index 17e6c3331727b8ffd5413b28b4dafbc6422e8c38..506fbe61b3a07199c608eb6255a2e38fe2c21a15 100644 (file)
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -73,13 +73,6 @@ foreach my $module (@$modules, @$opt_modules)
     print ENTITIES '<!ENTITY min-' . $name . '-ver "'.$version.'">' . "\n";
 }
 
-# CGI is a special case, because for Perl versions below 5.10, it has an
-# optional version *and* a required version.
-# We check @opt_modules first, then @modules, and pick the first we get.
-# We'll get the optional one then, if it is given, otherwise the required one.
-my ($cgi_opt) = grep($_->{module} eq 'CGI', @$opt_modules, @$modules);
-print ENTITIES '<!ENTITY min-mp-cgi-ver "' . $cgi_opt->{version} . '">' . "\n";
-
 print ENTITIES "\n <!-- Database Versions --> \n";
 
 my $db_modules = DB_MODULE;