Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision a592e428c246c9b5ca112b2a11f463d4ca1946de)
+++ general/prog/php.xml	(revision b84326b728d2c0b7408c5a5b4d5ae75041a8b98c)
@@ -9,6 +9,6 @@
   <!ENTITY php-md5sum        "fb1aac107870f897d26563a9cc5053c0">
   <!ENTITY php-size          "4.7 MB">
-  <!ENTITY php-buildsize     "126 MB">
-  <!ENTITY php-time          "1.82 SBU">
+  <!ENTITY php-buildsize     "138 MB">
+  <!ENTITY php-time          "1.9 SBU">
 ]>
 
@@ -62,4 +62,8 @@
         url="&patch-root;/php-&php-version;-db43-1.patch"/></para>
       </listitem>
+      <listitem>
+        <para>Pre-built documentation (optional): <ulink
+        url="http://www.php.net/download-docs.php"/></para>
+      </listitem>
     </itemizedlist>
 
@@ -69,55 +73,63 @@
     <para><xref linkend="apache"/></para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
+    <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
     <para><xref linkend="libxml2"/>,
     <xref linkend="libxslt"/>,
-    <xref linkend="openssl"/>,
+    <xref linkend="fam"/>,
+    <xref linkend="gmp"/>,
+    <xref linkend="pcre"/>,
+    <xref linkend="aspell"/>,
+    <xref linkend="pkgconfig"/>,
+    <xref linkend="expat"/>,
+    <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
+    <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
+    <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
+    <ulink url="http://www.gnu.org/software/recode/">recode</ulink> and
+    an <ulink url="../server/mail.html">MTA</ulink></para>
+
+    <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
+    <para><xref linkend="libjpeg"/>,
+    <xref linkend="libtiff"/>,
+    <xref linkend="libpng"/>,
+    <xref linkend="freetype2"/>,
+    X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
     <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libtiff"/>,
-    <xref linkend="curl"/>,
+    <ulink url="http://www.boutell.com/gd/">GD</ulink>,
+    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
+    t1lib</ulink> and
+    <ulink url="http://partners.adobe.com/asn/acrobat/forms.jsp">FDF Toolkit</ulink></para>
+
+    <bridgehead renderas="sect4">Optional Web Utilities</bridgehead>
+    <para><xref linkend="curl"/>,
+    <xref linkend="html-tidy"/>,
+    <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
+    <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
+    <ulink url="http://caudium.net/">Caudium</ulink> and
+    <ulink url="http://www.openwddx.org/">WDDX</ulink></para>
+
+    <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
+    <para><xref linkend="openldap"/>,
+    <xref linkend="gdbm"/>,
+    <xref linkend="db"/>,
+    <xref linkend="mysql"/>,
+    <xref linkend="postgresql"/>,
     <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
     <ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
-    <xref linkend="gdbm"/>,
-    <xref linkend="db"/>,
-    <xref linkend="fam"/>,
-    <ulink url="http://www.boutell.com/gd/">GD</ulink>,
-    <xref linkend="libpng"/>,
-    X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
-    <xref linkend="freetype2"/>,
-    <ulink
-    url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
-    t1lib</ulink>,
-    <xref linkend="gmp"/>
-    <xref linkend="mysql"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="postgresql"/>,
-    <xref linkend="aspell"/>,
-    <xref linkend="pkgconfig"/>,
-    <xref linkend="html-tidy"/>,
-    <xref linkend="openldap"/>,
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
-    <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink>,
-    <ulink url="http://mhash.sourceforge.net/">mhash</ulink>,
-    <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
-    <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
     <ulink url="http://www.sqlite.org/">SQLite</ulink>,
-    <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
-    <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
     <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
+    <ulink url="http://www.unixodbc.org/">unixODBC</ulink>,
     <ulink url="http://www.empress.com/">Empress</ulink>,
     <ulink url="http://www.birdstep.com/">Birdstep</ulink>,
     <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
     <ulink url="http://www.softwareag.com/">Adabas</ulink>,
-    <ulink url="http://www.frontbase.com/">FrontBase</ulink>,
-    <ulink url="http://caudium.net/">Caudium</ulink>,
-    <ulink url="http://www.openwddx.org/">WDDX</ulink>,
-    <ulink url="http://partners.adobe.com/asn/acrobat/forms.jsp">
-    FDF Toolkit</ulink>,
-    <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
-    <ulink url="http://www.mainstreetsoftworks.com/">Monetra</ulink>,
-    <xref linkend="expat"/> and
-    <ulink url="../server/mail.html">MTA</ulink></para>
+    <ulink url="http://www.frontbase.com/">FrontBase</ulink> and
+    <ulink url="http://www.mainstreetsoftworks.com/">Monetra</ulink></para>
+
+    <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
+    <para><xref linkend="openssl"/>,
+    <xref linkend="cyrus-sasl"/>,
+    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
+    <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink> and
+    <ulink url="http://mhash.sourceforge.net/">mhash</ulink></para>
 
   </sect2>
@@ -138,4 +150,17 @@
 
 <screen><userinput>patch -Np1 -i ../php-&php-version;-db43-1.patch</userinput></screen>
+
+    <note>
+      <para><application>PHP</application> has many more
+      <command>configure</command> options that will enable support for certain
+      things. You can use <command>./configure --help</command> to see a full
+      list of the available options. Also, use of the
+      <ulink url="http://www.php.net/">PHP web site</ulink>
+      is highly recommended, as their online docs are very good.</para>
+    </note>
+
+    <para>Remove the <option>--disable-libxml</option> switch if you
+    have <xref linkend="libxml2"/> installed otherwise
+    <command>pear</command> will not be built.</para>
 
     <para>Install <application>PHP</application> by
@@ -160,5 +185,6 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test</command>.</para>
+    <para>To test the results, issue: <command>make test</command>. Note that
+    many of the tests are known to fail.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -167,23 +193,32 @@
 cp -v php.ini-recommended /etc/php.ini</userinput></screen>
 
-    <para>Remove the <option>--disable-libxml</option> switch if you
-    have <xref linkend="libxml2"/> installed otherwise
-    <command>pear</command> will not be built.</para>
-
-    <note>
-      <para><application>PHP</application> has many more configure
-      options that will enable support for certain things. You can use
-      <command>./configure --help</command> to see a full list of the
-      available options. Also, use of the
-      <ulink url="http://www.php.net/">PHP web site</ulink>
-      is highly recommended, as their online docs are very good.</para>
-    </note>
-
-  </sect2>
+    <para>The pre-built HTML documentation is packaged in two forms: a tarball
+    containing many individual files, useful for quick loading into your
+    browser, and a tarball of one large file, which is useful for using the
+    search utility of your browser. If you downloaded any of the documentation,
+    the instructions below can be issued by the
+    <systemitem class='username'>root</systemitem> user to install it (note
+    these instructions assume English docs, modify the tarball names below if
+    necessary).</para>
+
+    <para>For the <quote>Single HTML</quote> tarball:</para>
+
+<screen role="root"><userinput>install -v -m644 ../php_manual_en.html.gz \
+    /usr/share/doc/php-&php-version; &amp;&amp;
+gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput></screen>
+
+    <para>For the <quote>Many HTML files</quote> tarball:</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/php-&php-version; &amp;&amp;
+tar -xvf ../php_manual_en.tar.gz -C /usr/share/doc/php-&php-version; &amp;&amp;
+chown -v -R root:root /usr/share/doc/php-&php-version;/html</userinput></screen>
+
+  </sect2>
+
   <sect2 role="commands">
       <title>Command Explanations</title>
 
       <para><parameter>--with-apxs2</parameter>: This parameter
-      builds the Apache 2.0 module.</para>
+      builds the Apache HTTPD 2.0 module.</para>
 
       <para><parameter>--with-config-file-path=/etc</parameter>: This parameter
@@ -194,9 +229,9 @@
       support for <application>Zlib</application> compression.</para>
 
-      <para><parameter>--enable-bcmath</parameter>: Enables bc style
-      precision math functions.</para>
-
-      <para><parameter>--with-bz2</parameter>: Add support for bz2
-      compression functions.</para>
+      <para><parameter>--enable-bcmath</parameter>: Enables
+      <command>bc</command> style precision math functions.</para>
+
+      <para><parameter>--with-bz2</parameter>: Add support for
+      <application>Bzip2</application> compression functions.</para>
 
       <para><parameter>--enable-calendar</parameter>: This parameter
@@ -222,8 +257,9 @@
 
       <para><parameter>--with-readline</parameter>: This parameter
-      enables command line readline support.</para>
+      enables command line <application>Readline</application> support.</para>
 
       <para><parameter>--disable-libxml</parameter>: This parameter
-      disables XML support functions.</para>
+      disables XML support functions. This should be removed if you have
+      <application>Libxml2</application> installed.</para>
 
   </sect2>
@@ -250,4 +286,15 @@
     <sect3>
       <title>Configuration Information</title>
+
+      <para>You may have noticed the following from the output of the
+      <command>make install</command> command:</para>
+
+      <screen><computeroutput>You may want to add: /usr/lib/php to your php.ini include_path</computeroutput></screen>
+
+      <para>If desired, add the entry using the following command as the
+      <systemitem class="username">root</systemitem> user:</para>
+
+      <screen role="root"><userinput>sed -i 's@php/includes"@&amp;\ninclude_path = ".:/usr/lib/php"@' \
+    /etc/php.ini</userinput></screen>
 
       <para>To enable PHP support in the <application>Apache</application>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a592e428c246c9b5ca112b2a11f463d4ca1946de)
+++ introduction/welcome/changelog.xml	(revision b84326b728d2c0b7408c5a5b4d5ae75041a8b98c)
@@ -24,4 +24,11 @@
 
   <itemizedlist>
+
+    <listitem>
+      <para>August 14th, 2005 [randy]: Updates to PHP: added new dependencies,
+      placed the dependencies in catagories, added instructions to install
+      documentation, added instruction to update php.ini and minor textual
+      corrections.</para>
+    </listitem>
 
     <listitem>
