From 895251c0fc8e67b8fe48389ae97bb06a2f315d6a Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sun, 17 Feb 2008 20:29:02 +0000
Subject: Bug 390972: we shouldn't favor fink for os x - Patch by timeless
 <timeless@bemail.org> r=Colin r=justdave

---
 docs/xml/installation.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index 526fa7c9e..3d1b4d5e7 100644
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.153 2008/02/06 21:58:55 lpsolit%gmail.com Exp $ -->
+<!-- $Id: installation.xml,v 1.154 2008/02/17 14:29:02 lpsolit%gmail.com Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -1678,19 +1678,20 @@ C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
       <section id="macosx-libraries">
         <title>Libraries &amp; Perl Modules on Mac OS X</title>
 
-        <para>Apple did not include the GD library with Mac OS X. Bugzilla
+        <para>Apple does not include the GD library with Mac OS X. Bugzilla
         needs this for bug graphs.</para>
 
-        <para>You can install it using a program called
-        Fink, which is similar in nature to the CPAN installer, but installs
-        common GNU utilities. Fink is available from
-        <ulink url="http://sourceforge.net/projects/fink/"/>.</para>
+        <para>You can use DarwinPorts (<ulink url="http://darwinports.com/"/>)
+        or Fink (<ulink url="http://sourceforge.net/projects/fink/"/>), both
+        of which are similar in nature to the CPAN installer, but install
+        common unix programs.</para>
 
-        <para>Follow the instructions for setting up Fink. Once it's installed,
-        you'll want to use it to install the <filename>gd2</filename> package.
+        <para>Follow the instructions for setting up DarwinPorts or Fink.
+        Once you have one installed, you'll want to use it to install the
+        <filename>gd2</filename> package.
         </para>
 
-        <para>It will prompt you for a number of dependencies, type 'y' and hit
+        <para>Fink will prompt you for a number of dependencies, type 'y' and hit
         enter to install all of the dependencies and then watch it work. You will
         then be able to use <glossterm linkend="gloss-cpan">CPAN</glossterm> to
         install the GD Perl module.
@@ -1711,9 +1712,10 @@ C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
           </para>
         </note>
 
-        <para>Also available via Fink is <filename>expat</filename>. After using
-        fink to install the expat package you will be able to install
-        XML::Parser using CPAN. There is one caveat. Unlike recent versions of
+        <para>Also available via DarwinPorts and Fink is
+        <filename>expat</filename>. After installing the expat package, you
+        will be able to install XML::Parser using CPAN. If you use fink, there
+        is one caveat. Unlike recent versions of
         the GD module, XML::Parser doesn't prompt for the location of the
         required libraries. When using CPAN, you will need to use the following
         command sequence:
-- 
cgit v1.2.3-24-g4f1b