Bug 415676: Remove all mentions of landfill.bugzilla.org/ppm from the documentation. People should use theory58S instead - Patch by Frédéric Buclin <LpSolit@gmail.com> r=justdave

2 files changed, 28 insertions, 42 deletions

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 0bdcd4562..e19fcf7b5 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.154 2008/04/04 06:48:24 lpsolit%gmail.com Exp $ -->
+<!-- $Id: installation.xml,v 1.155 2008/04/04 06:48:25 lpsolit%gmail.com Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -1558,7 +1558,9 @@ AddType application/rdf+xml .rdf</screen>
           Bugzilla on Windows requires the same perl modules found in
           <xref linkend="install-perlmodules"/>. The main difference is that
           windows uses <glossterm linkend="gloss-ppm">PPM</glossterm> instead
-          of CPAN.
+          of CPAN. ActiveState provides a GUI to manage Perl modules. We highly
+          recommend that you use it. If you prefer to use ppm from the
+          command-line, type:
         </para>
 
         <programlisting>
@@ -1567,18 +1569,28 @@ C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
 
         <para>
           The best source for the Windows PPM modules needed for Bugzilla
-          is probably the Bugzilla Test Server (aka 'Landfill'), so 
-          you should add the Landfill package repository as follows:
+          is probably the theory58S website, which you can add to your list
+          of repositories as follows (for Perl 5.8.x):
         </para>
 
         <programlisting>
-<command>ppm repo add landfill http://www.landfill.bugzilla.org/ppm/</command>
+<command>ppm repo add theory58S http://theoryx5.uwinnipeg.ca/ppms/</command>
         </programlisting>
+
+        <para>
+          If you are using Perl 5.10.x, you cannot use the same PPM modules as Perl
+          5.8.x as they are incompatible. In this case, you should add the following
+          repository:
+        </para>
+        <programlisting>
+<command>ppm repo add theory58S http://cpan.uwinnipeg.ca/PPMPackages/10xx/</command>
+        </programlisting>
+
         <note>
           <para>
             In versions prior to 5.8.8 build 819 of PPM the command is 
             <programlisting>
-<command>ppm repository add landfill http://www.landfill.bugzilla.org/ppm/</command>
+<command>ppm repository add theory58S http://theoryx5.uwinnipeg.ca/ppms/</command>
             </programlisting>
           </para>
         </note>
diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml
index a73469ac2..3d4f6e556 100644
--- a/docs/en/xml/modules.xml
+++ b/docs/en/xml/modules.xml
@@ -24,15 +24,13 @@
         a 'make' utility.  The <command>nmake</command> utility provided with
         Microsoft Visual C++ may be used.  As an alternative, there is a
         utility called <command>dmake</command> available from CPAN which is
-        written entirely in Perl. The majority of the links given below, however,
-        are to pre-compiled versions of the modules, which can be installed
-        on Windows simply by issuing the following command once you have
-        downloaded the PPD file (which may be packaged within a ZIP file):
+        written entirely in Perl.
       </para>
       <para>
-        <screen>
-          <prompt>&gt;</prompt> ppm install &lt;filename.ppd&gt;
-        </screen>
+        As described in <xref linkend="modules-manual-download" />, however, most
+        packages already exist and are available from ActiveState or theory58S.
+        We highly recommend that you install them using the ppm GUI available with
+        ActiveState and to add the theory58S repository to your list of repositories.
       </para>
     </note>
   </section>
@@ -43,9 +41,11 @@
     <note>
       <para>
         Running Bugzilla on Windows requires the use of ActiveState
-        Perl 5.8.1 or higher. Some modules already exist in the core
-        distribution of ActiveState Perl so no PPM link is given.
-        (This is noted where it occurs.)
+        Perl 5.8.1 or higher. Many modules already exist in the core
+        distribution of ActiveState Perl. Additional modules can be downloaded
+        from <ulink url="http://theoryx5.uwinnipeg.ca/ppms/" /> if you use
+        Perl 5.8.x or from <ulink url="http://cpan.uwinnipeg.ca/PPMPackages/10xx/" />
+        if you use Perl 5.10.x.
       </para>
     </note>
 
@@ -53,7 +53,6 @@
       CGI:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/CGI.pm/"/>
-        PPM Download Link: Part of core distribution.
         Documentation: <ulink url="http://perldoc.perl.org/CGI.html"/>
       </literallayout>
     </para>
@@ -62,7 +61,6 @@
       Data-Dumper:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/Data-Dumper/"/>
-        PPM Download Page: Part of core distribution.
         Documentation: <ulink url="http://search.cpan.org/dist/Data-Dumper/Dumper.pm"/>
       </literallayout>
     </para>
@@ -71,7 +69,6 @@
       Date::Format (part of TimeDate):
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/TimeDate/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/TimeDate.ppd"/>
         Documentation: <ulink url="http://search.cpan.org/dist/TimeDate/lib/Date/Format.pm"/>
       </literallayout>
     </para>
@@ -80,7 +77,6 @@
       DBI:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/DBI/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/DBI.ppd"/>
         Documentation: <ulink url="http://dbi.perl.org/docs/"/>
       </literallayout>
     </para>
@@ -89,7 +85,6 @@
       DBD::mysql:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/DBD-mysql/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/DBD-mysql.ppd"/>
         Documentation: <ulink url="http://search.cpan.org/dist/DBD-mysql/lib/DBD/mysql.pm"/>
       </literallayout>
     </para>
@@ -98,7 +93,6 @@
       DBD::Pg:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/DBD-Pg/"/>
-        PPM Download Link: <ulink url="http://theoryx5.uwinnipeg.ca/ppms/x86/DBD-Pg.tar.gz"/>
         Documentation: <ulink url="http://search.cpan.org/dist/DBD-Pg/Pg.pm"/>
       </literallayout>
     </para>
@@ -107,7 +101,6 @@
       File::Spec:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/File-Spec/"/>
-        PPM Download Page: Part of core distribution.
         Documentation: <ulink url="http://perldoc.perl.org/File/Spec.html"/>
       </literallayout>
     </para>
@@ -116,7 +109,6 @@
       Template-Toolkit:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/Template-Toolkit/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/Template-Toolkit.ppd"/>
         Documentation: <ulink url="http://www.template-toolkit.org/docs.html"/>
       </literallayout>
     </para>
@@ -125,7 +117,6 @@
       GD:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/GD/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/GD.ppd"/>
         Documentation: <ulink url="http://search.cpan.org/dist/GD/GD.pm"/>
       </literallayout>
     </para>
@@ -134,25 +125,14 @@
       Template::Plugin::GD:
       <literallayout>
        CPAN Download Page: <ulink url="http://search.cpan.org/dist/Template-GD/" />
-       PPM Download Link:  (Just install Template-Toolkit using the instructions below)
        Documentation: <ulink url="http://www.template-toolkit.org/docs/aqua/Modules/index.html" />
       </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>
@@ -166,7 +146,6 @@
       Chart::Base:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/Chart/"/>
-        PPM Download Page: <ulink url="http://landfill.bugzilla.org/ppm/Chart.ppd"/>
         Documentation: <ulink url="http://search.cpan.org/dist/Chart/Chart.pod"/>
       </literallayout>
     </para>
@@ -175,7 +154,6 @@
       GD::Graph:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/GDGraph/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/GDGraph.ppd"/>
         Documentation: <ulink url="http://search.cpan.org/dist/GDGraph/Graph.pm"/>
       </literallayout>
     </para>
@@ -184,7 +162,6 @@
       GD::Text::Align (part of GD::Text::Util):
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/GDTextUtil/"/>
-        PPM Download Page: <ulink url="http://landfill.bugzilla.org/ppm/GDTextUtil.ppd"/>
         Documentation: <ulink url="http://search.cpan.org/dist/GDTextUtil/Text/Align.pm"/>
       </literallayout>
     </para>
@@ -193,7 +170,6 @@
       XML::Twig:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/dist/XML-Twig/"/>
-        PPM Download Link: <ulink url="http://ppm.activestate.com/PPMPackages/zips/8xx-builds-only/Windows/XML-Twig-3.22.zip"/>
         Documentation: <ulink url="http://standards.ieee.org/resources/spasystem/twig/twig_stable.html"/>
       </literallayout>
     </para>
@@ -202,7 +178,6 @@
       PatchReader:
       <literallayout>
         CPAN Download Page: <ulink url="http://search.cpan.org/author/JKEISER/PatchReader/"/>
-        PPM Download Link: <ulink url="http://landfill.bugzilla.org/ppm/PatchReader.ppd"/>
         Documentation: <ulink url="http://www.johnkeiser.com/mozilla/Patch_Viewer.html"/>
       </literallayout>
     </para>
@@ -211,7 +186,6 @@
       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>