cvs: peardoc / global.ent /en/chapters/faq users.xml

saltybeagle		Wed Dec  5 04:52:47 2007 UTC

  Modified files:              
    /peardoc	global.ent 
    /peardoc/en/chapters/faq	users.xml 
  Log:
  Improvements to the Mac OS X FAQ.. add link to Marc Liyanage's PHP build. 
  
http://cvs.php.net/viewvc.cgi/peardoc/global.ent?r1=1.84&r2=1.85&diff_format=u
Index: peardoc/global.ent
diff -u peardoc/global.ent:1.84 peardoc/global.ent:1.85
--- peardoc/global.ent:1.84	Sun Dec  2 04:18:11 2007
+++ peardoc/global.ent	Wed Dec  5 04:52:47 2007
@@ -1,6 +1,6 @@
 <!-- -*- SGML -*-
 
- $Id: global.ent,v 1.84 2007/12/02 04:18:11 saltybeagle Exp $
+ $Id: global.ent,v 1.85 2007/12/05 04:52:47 saltybeagle Exp $
 
  Contains global "macros" for all the XML documents.
 
@@ -62,6 +62,7 @@
 <!ENTITY url.opensource 'http://www.opensource.org/'>
 <!ENTITY url.opl 'http://www.opencontent.org/openpub/'>
 <!ENTITY url.oreilly 'http://www.oreilly.com/'>
+<!ENTITY url.mac.entropy "http://www.entropy.ch/software/macosx/php/">
 <!ENTITY url.man.index 'http://unixhelp.ed.ac.uk/alphabetical/index.html'>
 <!ENTITY url.man.freebsd.index 'http://www.freebsd.org/cgi/man.cgi'>
 <!ENTITY url.maxmind 'http://www.maxmind.com/'>
http://cvs.php.net/viewvc.cgi/peardoc/en/chapters/faq/users.xml?r1=1.8&r2=1.9&diff_format=u
Index: peardoc/en/chapters/faq/users.xml
diff -u peardoc/en/chapters/faq/users.xml:1.8 peardoc/en/chapters/faq/users.xml:1.9
--- peardoc/en/chapters/faq/users.xml:1.8	Wed Dec  5 03:44:37 2007
+++ peardoc/en/chapters/faq/users.xml	Wed Dec  5 04:52:47 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <sect1 id="faq.users">
  <title>User FAQ</title>
 
@@ -173,7 +173,8 @@
   </para>
   <para> 
    If you are a OS X 10.4 or lower user, you may wish to upgrade to a newer version
-   of PHP using a binary installable package such as Marc Liyanage's PHP packages.
+   of PHP using a binary installable package such as 
+   <ulink url="&url.mac.entropy;">Marc Liyanage's PHP packages</ulink>.
    If you have installed another PHP package, you may have two versions of PHP and
    PEAR installed on your system. To be sure which version you are using, type
 	<command>which pear</command> in your console to find out where PEAR is 
@@ -185,22 +186,31 @@
 	If you have not made any modifications to the default Max OS X install, the PEAR
 	version you	are running is the <filename>/usr/bin/pear</filename> which is
 	configured for the PHP 4 version distributed with OS X. If this is the case,
-	there are a couple options.
+	there are a couple options to use a PHP 5 version on your Mac.
 	</para>
 	<para>
-	If you're using Marc Liyanage's PHP package, you might want to specify
-	<command>/usr/local/php5/bin/pear install {packagename}</command> (will probably
-	require sudo to install/upgrade packages), and always specify the full path when
-	you run pear &amp; php through the console.
+	If you're using Marc Liyanage's PHP package, you can specify the full path to
+	your PHP5 PEAR installation. For example
+	<command>/usr/local/php5/bin/pear install {packagename}</command> to install a 
+	package for your PHP 5 installation (installing/upgrading packages will probably
+	require sudo).
 	</para>
 	<para>
-	Or you could change every path for the OS X provided PEAR using config-set,
-	or, what I do is <command>sudo rm /usr/bin/php /usr/bin/pear</command> and then
-	<command>sudo ln -s	/usr/local/php5/bin/php /usr/bin/php</command>
-	<command>sudo ln -s /usr/local/php5/bin/pear /usr/bin/pear</command> - which
-	will remove the PHP 4 version and link it to Marc Liyanage's PHP 5 version.
+	Alternatively, you can change every path for the OS X provided PEAR using 
+	<command>pear config-set</command>. Remember to specify all paths necessary
+	to point to your PHP 5 installation.
+	</para>
+	<para>
+	What I prefer to do, is remove the Apple supplied PHP 4 with
+	<command>sudo rm /usr/bin/php /usr/bin/pear</command> and then symbolically
+	link php and PEAR in <filename>/usr/bin</filename> to the location where Marc
+	Liyanage's packages are installed:
+	<command>sudo ln -s	/usr/local/php5/bin/php /usr/bin/php &amp;&amp;
+	sudo ln -s /usr/local/php5/bin/pear /usr/bin/pear</command>.
 	Keep in mind, Apple occasionally updates PHP on OSX, which will revert your
-	<filename>/usr/bin/php</filename> to their distributed version.
+	<filename>/usr/bin/php</filename> to their distributed version. Pay attention
+	to software update, and read the information regarding updated software bundled
+	with OS X updates.
    </para>
   <simpara>
     Note: It is uncertain if Apple will continue to distribute PHP version 4 for