Index: general.ent
===================================================================
--- general.ent	(revision 1f3b7a775a8eb2091e15691012bf80032b0ace94)
+++ general.ent	(revision ba1a38ba5ec579083db14ef6409564ad50032b11)
@@ -1,3 +1,3 @@
-<!ENTITY day          "16">
+<!ENTITY day          "17">
 <!ENTITY month        "12">
 <!ENTITY year         "2005">
@@ -159,5 +159,5 @@
 <!ENTITY NASM-version                 "0.98.39">
 <!ENTITY pdl-version                  "2.4.2">
-<!ENTITY php-version                  "5.0.5">
+<!ENTITY php-version                  "5.1.1">
 <!ENTITY Python-version               "2.4.2">
 <!ENTITY pyxml-version                "0.8.4">
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 1f3b7a775a8eb2091e15691012bf80032b0ace94)
+++ general/prog/php.xml	(revision ba1a38ba5ec579083db14ef6409564ad50032b11)
@@ -7,8 +7,8 @@
   <!ENTITY php-download-http "http://us2.php.net/distributions/php-&php-version;.tar.bz2">
   <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.bz2">
-  <!ENTITY php-md5sum        "b5d4ca75bbb11ee5b830fa67213d9f7f">
-  <!ENTITY php-size          "4.7 MB">
-  <!ENTITY php-buildsize     "138 MB">
-  <!ENTITY php-time          "1.9 SBU">
+  <!ENTITY php-md5sum        "70a7c90de182d1a1901c390b844153c7">
+  <!ENTITY php-size          "6.1 MB">
+  <!ENTITY php-buildsize     "204 MB (includes installing all documentation)">
+  <!ENTITY php-time          "2.5 SBU (additional 1.7 SBU to run the test suite)">
 ]>
 
@@ -90,7 +90,11 @@
     <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.gnu.org/software/pth/">GNU Pth</ulink>,
+    <ulink url="http://re2c.org/">re2c</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>
+    <xref linkend="sendmail"/> (or another
+    <ulink url="../server/mail.html">MTA</ulink> that provides a
+    <command>sendmail</command> command)</para>
 
     <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
@@ -98,4 +102,5 @@
     <xref linkend="libtiff"/>,
     <xref linkend="libpng"/>,
+    <xref linkend="libexif"/>,
     <xref linkend="freetype2"/>,
     X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
@@ -111,4 +116,5 @@
     <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
     <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
+    <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>,
     <ulink url="http://caudium.net/">Caudium</ulink> and
     <ulink url="http://www.openwddx.org/">WDDX</ulink></para>
@@ -146,6 +152,6 @@
     <note>
       <para>You can use <application>PHP</application>
-      for server-side scripting, command line scripting or client-side
-      GUI applications. The book provides instructions for
+      for server-side scripting, command-line scripting or client-side
+      GUI applications. This book provides instructions for
       setting up <application>PHP</application> for
       server-side scripting as it is the most common form.</para>
@@ -159,5 +165,5 @@
     <note>
       <para><application>PHP</application> has many more
-      <command>configure</command> options that will enable support for certain
+      <command>configure</command> options that will enable support for various
       things. You can use <command>./configure --help</command> to see a full
       list of the available options. Also, use of the
@@ -166,7 +172,12 @@
     </note>
 
-    <para>Remove the <parameter>--disable-libxml</parameter> switch if you
+    <!-- Commenting this out as libxml is a recommended dependency.
+         Current protocol in the book is to expect folks to have it
+         installed.
+
+    <para>Remove the <parameter>-disable-libxml</parameter> switch if you
     have <xref linkend="libxml2"/> installed otherwise
     <command>pear</command> will not be built.</para>
+    -->
 
     <para>Install <application>PHP</application> by
@@ -187,26 +198,31 @@
             --enable-mbstring \
             --with-ncurses \
-            --with-readline \
-            --disable-libxml &amp;&amp;
+            --with-readline &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test</command>. Note that
-    many of the tests are known to fail.</para>
+    <para>To test the results, issue: <command>make test</command>. Three of
+    the tests are known to fail.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-cp -v php.ini-recommended /etc/php.ini</userinput></screen>
+install -v -m644 php.ini-recommended /etc/php.ini &amp;&amp;
+install -v -m755 -d /usr/share/doc/php-&php-version; &amp;&amp;
+install -v -m644 CODING_STANDARDS EXTENSIONS INSTALL NEWS \
+                 README* TODO* UPGRADING php.gif \
+    /usr/share/doc/php-&php-version; &amp;&amp;
+ln -v -s /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
+    /usr/share/doc/php-&php-version;</userinput></screen>
 
     <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
+    browser, and one large individual file, which is useful for using the
+    search utility of your browser. If you downloaded either, or both, of the
+    documentation files, issue the following commands as the
+    <systemitem class='username'>root</systemitem> user to install them (note
     these instructions assume English docs, modify the tarball names below if
     necessary).</para>
 
-    <para>For the <quote>Single HTML</quote> tarball:</para>
+    <para>For the <quote>Single HTML</quote> file:</para>
 
 <screen role="root"><userinput>install -v -m644 ../php_manual_en.html.gz \
@@ -216,6 +232,5 @@
     <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;
+<screen role="root"><userinput>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>
 
@@ -229,6 +244,7 @@
 
       <para><parameter>--with-config-file-path=/etc</parameter>: This parameter
-      puts the <filename>php.ini</filename> configuration file in <filename
-      class='directory'>/etc</filename>.</para>
+      makes <application>PHP</application> look for the
+      <filename>php.ini</filename> configuration file in
+      <filename class='directory'>/etc</filename>.</para>
 
       <para><parameter>--with-zlib</parameter>: This parameter adds
@@ -266,5 +282,5 @@
 
       <para><parameter>--disable-libxml</parameter>: This parameter
-      allows building PHP without <application>Libxml2</application>
+      allows building PHP without <application>libxml2</application>
       installed.</para>
 
@@ -277,5 +293,5 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/php.ini</filename>,
+      <para><filename>/etc/php.ini</filename> and
       <filename>/etc/pear.conf</filename></para>
 
@@ -335,5 +351,6 @@
         <seg>pear, php, php-config, phpextdist, and phpize</seg>
         <seg>libphp5.so</seg>
-        <seg>/usr/include/php and /usr/lib/php</seg>
+        <seg>/usr/include/php, /usr/lib/php and
+        /usr/share/doc/php-&php-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1f3b7a775a8eb2091e15691012bf80032b0ace94)
+++ introduction/welcome/changelog.xml	(revision ba1a38ba5ec579083db14ef6409564ad50032b11)
@@ -43,4 +43,13 @@
 
     <listitem>
+      <para>December 17th, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to PHP-5.1.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 16th, 2005</para>
       <itemizedlist>
