From 3088b1d2724d7959ea87e84cab98963e2d2c3e72 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 31 Aug 2012 12:31:04 +0200
Subject: Bug 655477: Bugzilla now requires Perl 5.10.1 r=mkanat a=LpSolit

---
 docs/en/xml/installation.xml | 28 ++++++++--------------------
 docs/en/xml/modules.xml      |  7 +++----
 2 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'docs')

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 18de454b9..974415426 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1559,7 +1559,7 @@ AddType application/rdf+xml .rdf</screen>
            You should be able to find a compiled binary at <ulink 
            url="http://aspn.activestate.com/ASPN/Downloads/ActivePerl/" />.
            The following instructions assume that you are using version
-           5.8.1 of ActiveState.
+           &min-perl-ver; of ActiveState.
           </para>
 
           <note>
@@ -1589,32 +1589,20 @@ C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
         </programlisting>
 
         <para>
-          The best source for the Windows PPM modules needed for Bugzilla
-          is probably the theory58S website, which you can add to your list
-          of repositories as follows (for Perl 5.8.x):
+          If you are using Perl 5.10.1, the best source for the Windows PPM modules
+          needed for Bugzilla is probably the theory58S website, which you can add
+          to your list of repositories as follows:
         </para>
 
         <programlisting>
-<command>ppm repo add theory58S http://theoryx5.uwinnipeg.ca/ppms/</command>
+<command>ppm repo add theory58S http://cpan.uwinnipeg.ca/PPMPackages/10xx/</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:
+          If you are using Perl 5.12 or newer, you no longer need to add
+          this repository. All modules you need are already available from
+	  the ActiveState 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 theory58S http://theoryx5.uwinnipeg.ca/ppms/</command>
-            </programlisting>
-          </para>
-        </note>
         <note>
           <para>
             The PPM repository stores modules in 'packages' that may have
diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml
index 5017e241b..4ae77e9b6 100644
--- a/docs/en/xml/modules.xml
+++ b/docs/en/xml/modules.xml
@@ -54,11 +54,10 @@
     <note>
       <para>
         Running Bugzilla on Windows requires the use of ActiveState
-        Perl 5.8.1 or higher. Many modules already exist in the core
+        Perl &min-perl-ver; 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.
+        from <ulink url="http://cpan.uwinnipeg.ca/PPMPackages/10xx/" />
+        if you use Perl 5.10.1.
       </para>
     </note>
 
-- 
cgit v1.2.3-24-g4f1b