Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ basicnet/netprogs/netprogs.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
@@ -24,5 +24,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="portmap.xml"/>  
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>  
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nfs-utils.xml"/>  
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncpfs.xml"/>  
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ntp.xml"/>  
Index: sicnet/netprogs/nfs-utils.xml
===================================================================
--- basicnet/netprogs/nfs-utils.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ 	(revision )
@@ -1,203 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY nfs-utils-download-http "http://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
-  <!ENTITY nfs-utils-download-ftp  "ftp://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
-  <!ENTITY nfs-utils-md5sum        "f17e9983457e1cf61c37f0be4493fce6">
-  <!ENTITY nfs-utils-size          "260 KB">
-  <!ENTITY nfs-utils-buildsize     "4.1 MB">
-  <!ENTITY nfs-utils-time          "0.9 SBU">
-]>
-
-<sect1 id="nfs-utils" xreflabel="NFS Utilities-&nfs-utils-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="nfs-utils.html"?>
-<title>NFS Utilities-&nfs-utils-version;</title>
-
-<sect2>
-<title>Introduction to <application>nfs-utils</application></title>
-
-<para>The <application>nfs-utils</application> package contains the userspace 
-server and client tools necessary to use the kernel's nfs-abilities. 
-<acronym>NFS</acronym> is a protocol that allows sharing file systems over the 
-network.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&nfs-utils-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&nfs-utils-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &nfs-utils-md5sum;</para></listitem>
-<listitem><para>Download size: &nfs-utils-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&nfs-utils-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&nfs-utils-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>nfs-utils</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="portmap"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Kernel Configuration</title>
-
-<para>Enable the following options in the kernel configuration
-and recompile the kernel if neccessary:</para>
-
-<screen>File systems:
-  Network File Systems:
-    NFS File System Support: M or Y
-    NFS Server Support: M or Y</screen>
-
-<para>Select the appropriate sub-options that appear when the above options
-are selected.</para>
-
-</sect2>
-
-<sect2>
-<title>Installation of nfs-utils</title>
-
-<para>Before you compile the program, you need to be sure the "nobody"
-user and "nogroup" group are available. You can add these with the
-following commands:</para>
-
-<screen><userinput><command>groupadd -g 65534 nogroup &amp;&amp;
-useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody</command></userinput></screen>
-
-<para>Install nfs-utils by running the following commands:</para>
-
-<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen></para>
-
-<note><para>If your <filename>/usr</filename> directory is NFS mounted,
-you should install the executables in <filename>/sbin</filename> by passing
-an additional parameter <command>--sbindir=/sbin</command> to the above
-<command>./configure</command> command.</para></note>
-
-</sect2>
-
-<sect2>
-<title>Configuring nfs-utils</title>
-
-<sect3><title>Server Configutation</title>
-
-<para><filename>/etc/exports</filename> contains the exported directories on 
-<acronym>NFS</acronym> servers. Refer to the exports manual page for the 
-syntax of this file. Also refer to the <acronym>NFS</acronym> HowTo available 
-at <ulink url="http://nfs.sourceforge.net/nfs-howto/"/> on how to configure 
-the servers and clients in a secure manner. For example, for sharing the
-<filename>/home</filename> directory over the local network, the following 
-line may be added:</para>
-
-<screen><userinput>/home 192.168.0.0/255.255.0.0(rw)</userinput></screen>
-
-<para>Install the <filename>/etc/rc.d/init.d/nfs-server</filename>
-init script included in the
-<xref linkend="intro-important-bootscripts"/> package to start
-the server at boot.</para>
-
-<screen><userinput><command>make install-nfs-server</command></userinput></screen>
-
-<para>Now create the <filename>/etc/sysconfig/nfs-server</filename> 
-configuration file:</para>
-
-<screen><userinput><command>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"</command>
-PORT="2049"
-PROCESSES="8"
-QUOTAS="no"
-KILLDELAY="10"
-<command>EOF</command></userinput></screen>
-
-</sect3>
-
-<sect3><title>Client Configutation</title>
-
-<para><filename>/etc/fstab</filename> contains the directories that are to be 
-mounted on the client. Alternately the partitions can be mounted by using the 
-<command>mount</command> command with the proper options. To mount the 
-<filename>/home</filename> partition, add the following to the 
-<filename>/etc/fstab</filename>:</para>
-
-<screen><userinput>&lt;server-name&gt;:/home /home nfs rw 0 0</userinput></screen>
-
-<para>Install the <filename>/etc/rc.d/init.d/nfs-client</filename>
-init script included in the
-<xref linkend="intro-important-bootscripts"/> package to 
-start the client services at boot.</para>
-
-<screen><userinput><command>make install-nfs-client</command></userinput></screen>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The nfs-utils package contains 
-<command>getiversion</command>,
-<command>getkversion</command>,
-<command>locktest</command>,
-<command>nlmtest</command>,
-<command>rpcdebug</command>,
-<command>rpcgen</command>,
-<command>exportfs</command>,
-<command>lockd</command>,
-<command>mountd</command>,
-<command>nfsd</command>,
-<command>nfsstat</command>,
-<command>nhfsstone</command>,
-<command>rquotad</command>,
-<command>showmount</command>,
-<command>statd</command> </para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>getiversion</title><para>No description available.</para></sect3>
-<sect3><title>getkversion</title><para>No description available.</para></sect3>
-<sect3><title>locktest</title><para>No description available.</para></sect3>
-<sect3><title>nlmtest</title><para>No description available.</para></sect3>
-<sect3><title>rpcdebug</title><para>No description available.</para></sect3>
-<sect3><title>rpcgen</title><para>No description available.</para></sect3>
-<sect3><title>exportfs</title><para><command>exportfs</command>
-maintains a list of <acronym>NFS</acronym> exported directories.</para></sect3>
-<sect3><title>lockd</title><para><command>lockd</command>
-is the <acronym>NFS</acronym> lock manager.</para></sect3>
-<sect3><title>mountd</title><para><command>mountd</command>
-is the <acronym>NFS</acronym> mount daemon which checks 
-client-permissions.</para></sect3>
-<sect3><title>nfsd</title><para><command>nfsd</command>
-is the user-space daemon of the <acronym>NFS</acronym> service.</para></sect3>
-<sect3><title>nfsstat</title><para><command>nfsstat</command>
-prints <acronym>NFS</acronym> statistics.</para></sect3>
-<sect3><title>nhfsstone</title><para><command>nhfsstone</command>
-is the <acronym>NFS</acronym> benchmark program.</para></sect3>
-<sect3><title>rquotad</title><para><command>rquotad</command>
-is the remote quota server communicating with the
-<command>quota</command> client.</para></sect3>
-<sect3><title>showmount</title><para><command>showmount</command>
-shows mount information for an <acronym>NFS</acronym> server.</para></sect3>
-<sect3><title>statd</title><para><command>statd</command>
-is the <acronym>NFS</acronym> status monitor which implements the
-<acronym>NSM</acronym> (Network Status Monitor) <acronym>RPC</acronym> protocol.
-</para></sect3>
-
-</sect2>
-
-</sect1>
-
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
+++ general/prog/php.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!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        "fb1aac107870f897d26563a9cc5053c0">
+  <!ENTITY php-size          "4.7 MB">
+  <!ENTITY php-buildsize     "126 MB">
+  <!ENTITY php-time          "1.82 SBU">
+]>
+
+<sect1 id="php" xreflabel="PHP-&php-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="php.html"?>
+<title><acronym>PHP</acronym>-&php-version;</title>
+<indexterm zone="php">
+<primary sortas="a-PHP">PHP</primary></indexterm>
+
+<sect2>
+<title>Introduction to <application><acronym>PHP</acronym></application></title>
+
+<para><application><acronym>PHP</acronym></application> is the 
+<acronym>PHP</acronym> Hypertext Preprocessor. Primarily used in dynamic web 
+sites, it allows for programming code to be directly embedded into the
+<acronym>HTML</acronym> markup.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): 
+<ulink url="&php-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&php-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &php-md5sum;</para></listitem>
+<listitem><para>Download size: &php-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&php-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&php-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing="compact">
+<listitem><para>Required patch for Berkeley DB: <ulink 
+url="&patch-root;/php-&php-version;-db43-1.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>PHP</acronym></application> 
+dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="apache"/></para>
+</sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>,
+<xref linkend="openssl"/>,
+<ulink url="http://www.fastio.com/">ClibPDF</ulink>,
+<xref linkend="libjpeg"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="curl"/>,
+<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.0.2.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.hellug.gr/">libmcrypt</ulink>,
+<ulink url="http://mhash.sourceforge.net/">mhash</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.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>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>PHP</acronym></application></title>
+
+<note><para>You can use <application><acronym>PHP</acronym></application>
+for server-side scripting, command line scripting or client-side
+<acronym>GUI</acronym> applications. The book provides instructions for
+setting up <application><acronym>PHP</acronym></application> for
+server-side scripting as it is the most common form.</para></note>
+
+<para>If you have Berkeley DB installed and wish to utilize it, apply
+the following patch:</para>
+
+<screen><userinput><command>patch -Np1 -i ../php-&php-version;-db43-1.patch</command></userinput></screen>
+
+<para>Install <application><acronym>PHP</acronym></application> by
+running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --with-apxs2 \
+            --with-config-file-path=/etc \
+            --with-zlib \
+            --enable-bcmath \
+            --with-bz2 \
+            --enable-calendar \
+            --enable-dba \
+            --enable-exif \
+            --enable-ftp \
+            --with-gettext \
+            --with-iconv \
+            --enable-mbstring \
+            --with-ncurses \
+            --with-readline \
+            --disable-libxml &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
+cp php.ini-recommended /etc/php.ini</command></userinput></screen>
+
+<para>Remove the <parameter>--disable-libxml</parameter> switch if you
+have <xref linkend="libxml2"/> installed otherwise
+<command>pear</command> will not be built.</para>
+
+<note><para><acronym>PHP</acronym> 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/"><acronym>PHP</acronym> web site</ulink>
+is highly recommended, as their online docs are very good.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application><acronym>PHP</acronym></application></title>
+
+<sect3 id="php-config"><title>Config files</title>
+<para><filename>/etc/php.ini</filename>,
+<filename>/etc/pear.conf</filename></para>
+<indexterm zone="php php-config">
+<primary sortas="e-etc-php.ini">/etc/php.ini</primary></indexterm>
+<indexterm zone="php php-config">
+<primary sortas="e-etc-pear.conf">/etc/pear.conf</primary></indexterm>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>To enable <acronym>PHP</acronym> support in the
+<application>Apache</application> web server,
+a new LoadModule (which should be handled automatically by the
+<command>make install</command> command) and AddType directives must be added 
+to the <filename>httpd.conf</filename> file:</para>
+
+<screen><userinput>LoadModule php5_module lib/apache/libphp5.so
+AddType application/x-httpd-php .php</userinput></screen>
+
+<para>Also, it can be useful to add an entry for 
+<filename>index.php</filename> to the DirectoryIndex directive of the 
+<filename>httpd.conf</filename> file.</para>
+
+<para>You'll need to restart the <application>Apache</application> web server 
+after making any modifications to the <filename>httpd.conf</filename> 
+file.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>pear, php, php-config, phpextdist and phpize</seg>
+<seg>libphp5.so</seg>
+<seg>/usr/include/php and /usr/lib/php</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="php-prog">
+<term><command>php</command></term>
+<listitem><para>is a command line interface that enables you to parse and 
+execute <acronym>PHP</acronym> code.</para>
+<indexterm zone="php php-prog">
+<primary sortas="b-php">php</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="pear">
+<term><command>pear</command></term>
+<listitem><para>is the <acronym>PHP</acronym> Extension and Application 
+Repository (<acronym>PEAR</acronym>) package manager.</para>
+<indexterm zone="php pear">
+<primary sortas="b-pear">pear</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ general/prog/prog.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
@@ -17,19 +17,20 @@
 system's development capabilities.</para>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="doxygen.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expect.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="j2sdk.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="librep.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pdl.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl-modules.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="php.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="python.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl-modules.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pdl.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="librep.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="j2sdk.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ruby.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcl.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tk.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expect.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="doxygen.xml"/>
 
 </chapter>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ introduction/welcome/changelog.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>April 12th, 2005 [bdubbs]: Finish server reorganization.
+Moved php to Programming and NFS to Major Servers.</para></listitem>
 
 <listitem><para>April 12th, 2005 [bdubbs]: Major reorganization of 
Index: server/major/major.xml
===================================================================
--- server/major/major.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ server/major/major.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
@@ -16,4 +16,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="apache.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bind.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nfs-utils.xml"/>  
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssh.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="proftpd.xml"/>
@@ -21,5 +22,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vsftpd.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xinetd.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="php.xml"/>
 
 </chapter>
Index: server/major/nfs-utils.xml
===================================================================
--- server/major/nfs-utils.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
+++ server/major/nfs-utils.xml	(revision df774029c25ef0a87d0e166f18b320c70b5c0628)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY nfs-utils-download-http "http://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
+  <!ENTITY nfs-utils-download-ftp  "ftp://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
+  <!ENTITY nfs-utils-md5sum        "f17e9983457e1cf61c37f0be4493fce6">
+  <!ENTITY nfs-utils-size          "260 KB">
+  <!ENTITY nfs-utils-buildsize     "4.1 MB">
+  <!ENTITY nfs-utils-time          "0.9 SBU">
+]>
+
+<sect1 id="nfs-utils" xreflabel="NFS Utilities-&nfs-utils-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="nfs-utils.html"?>
+<title>NFS Utilities-&nfs-utils-version;</title>
+
+<sect2>
+<title>Introduction to <application>nfs-utils</application></title>
+
+<para>The <application>nfs-utils</application> package contains the userspace 
+server and client tools necessary to use the kernel's nfs-abilities. 
+<acronym>NFS</acronym> is a protocol that allows sharing file systems over the 
+network.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&nfs-utils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&nfs-utils-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &nfs-utils-md5sum;</para></listitem>
+<listitem><para>Download size: &nfs-utils-size;</para></listitem>
+<listitem><para>Estimated disk space required:
+&nfs-utils-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&nfs-utils-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>nfs-utils</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="portmap"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Kernel Configuration</title>
+
+<para>Enable the following options in the kernel configuration
+and recompile the kernel if neccessary:</para>
+
+<screen>File systems:
+  Network File Systems:
+    NFS File System Support: M or Y
+    NFS Server Support: M or Y</screen>
+
+<para>Select the appropriate sub-options that appear when the above options
+are selected.</para>
+
+</sect2>
+
+<sect2>
+<title>Installation of nfs-utils</title>
+
+<para>Before you compile the program, you need to be sure the "nobody"
+user and "nogroup" group are available. You can add these with the
+following commands:</para>
+
+<screen><userinput><command>groupadd -g 65534 nogroup &amp;&amp;
+useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody</command></userinput></screen>
+
+<para>Install nfs-utils by running the following commands:</para>
+
+<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen></para>
+
+<note><para>If your <filename>/usr</filename> directory is NFS mounted,
+you should install the executables in <filename>/sbin</filename> by passing
+an additional parameter <command>--sbindir=/sbin</command> to the above
+<command>./configure</command> command.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Configuring nfs-utils</title>
+
+<sect3><title>Server Configutation</title>
+
+<para><filename>/etc/exports</filename> contains the exported directories on 
+<acronym>NFS</acronym> servers. Refer to the exports manual page for the 
+syntax of this file. Also refer to the <acronym>NFS</acronym> HowTo available 
+at <ulink url="http://nfs.sourceforge.net/nfs-howto/"/> on how to configure 
+the servers and clients in a secure manner. For example, for sharing the
+<filename>/home</filename> directory over the local network, the following 
+line may be added:</para>
+
+<screen><userinput>/home 192.168.0.0/255.255.0.0(rw)</userinput></screen>
+
+<para>Install the <filename>/etc/rc.d/init.d/nfs-server</filename>
+init script included in the
+<xref linkend="intro-important-bootscripts"/> package to start
+the server at boot.</para>
+
+<screen><userinput><command>make install-nfs-server</command></userinput></screen>
+
+<para>Now create the <filename>/etc/sysconfig/nfs-server</filename> 
+configuration file:</para>
+
+<screen><userinput><command>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"</command>
+PORT="2049"
+PROCESSES="8"
+QUOTAS="no"
+KILLDELAY="10"
+<command>EOF</command></userinput></screen>
+
+</sect3>
+
+<sect3><title>Client Configutation</title>
+
+<para><filename>/etc/fstab</filename> contains the directories that are to be 
+mounted on the client. Alternately the partitions can be mounted by using the 
+<command>mount</command> command with the proper options. To mount the 
+<filename>/home</filename> partition, add the following to the 
+<filename>/etc/fstab</filename>:</para>
+
+<screen><userinput>&lt;server-name&gt;:/home /home nfs rw 0 0</userinput></screen>
+
+<para>Install the <filename>/etc/rc.d/init.d/nfs-client</filename>
+init script included in the
+<xref linkend="intro-important-bootscripts"/> package to 
+start the client services at boot.</para>
+
+<screen><userinput><command>make install-nfs-client</command></userinput></screen>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The nfs-utils package contains 
+<command>getiversion</command>,
+<command>getkversion</command>,
+<command>locktest</command>,
+<command>nlmtest</command>,
+<command>rpcdebug</command>,
+<command>rpcgen</command>,
+<command>exportfs</command>,
+<command>lockd</command>,
+<command>mountd</command>,
+<command>nfsd</command>,
+<command>nfsstat</command>,
+<command>nhfsstone</command>,
+<command>rquotad</command>,
+<command>showmount</command>,
+<command>statd</command> </para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>getiversion</title><para>No description available.</para></sect3>
+<sect3><title>getkversion</title><para>No description available.</para></sect3>
+<sect3><title>locktest</title><para>No description available.</para></sect3>
+<sect3><title>nlmtest</title><para>No description available.</para></sect3>
+<sect3><title>rpcdebug</title><para>No description available.</para></sect3>
+<sect3><title>rpcgen</title><para>No description available.</para></sect3>
+<sect3><title>exportfs</title><para><command>exportfs</command>
+maintains a list of <acronym>NFS</acronym> exported directories.</para></sect3>
+<sect3><title>lockd</title><para><command>lockd</command>
+is the <acronym>NFS</acronym> lock manager.</para></sect3>
+<sect3><title>mountd</title><para><command>mountd</command>
+is the <acronym>NFS</acronym> mount daemon which checks 
+client-permissions.</para></sect3>
+<sect3><title>nfsd</title><para><command>nfsd</command>
+is the user-space daemon of the <acronym>NFS</acronym> service.</para></sect3>
+<sect3><title>nfsstat</title><para><command>nfsstat</command>
+prints <acronym>NFS</acronym> statistics.</para></sect3>
+<sect3><title>nhfsstone</title><para><command>nhfsstone</command>
+is the <acronym>NFS</acronym> benchmark program.</para></sect3>
+<sect3><title>rquotad</title><para><command>rquotad</command>
+is the remote quota server communicating with the
+<command>quota</command> client.</para></sect3>
+<sect3><title>showmount</title><para><command>showmount</command>
+shows mount information for an <acronym>NFS</acronym> server.</para></sect3>
+<sect3><title>statd</title><para><command>statd</command>
+is the <acronym>NFS</acronym> status monitor which implements the
+<acronym>NSM</acronym> (Network Status Monitor) <acronym>RPC</acronym> protocol.
+</para></sect3>
+
+</sect2>
+
+</sect1>
+
Index: rver/major/php.xml
===================================================================
--- server/major/php.xml	(revision addff0a608cfc6eef335a18b84efac27bcc042fd)
+++ 	(revision )
@@ -1,243 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!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        "fb1aac107870f897d26563a9cc5053c0">
-  <!ENTITY php-size          "4.7 MB">
-  <!ENTITY php-buildsize     "126 MB">
-  <!ENTITY php-time          "1.82 SBU">
-]>
-
-<sect1 id="php" xreflabel="PHP-&php-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="php.html"?>
-<title><acronym>PHP</acronym>-&php-version;</title>
-<indexterm zone="php">
-<primary sortas="a-PHP">PHP</primary></indexterm>
-
-<sect2>
-<title>Introduction to <application><acronym>PHP</acronym></application></title>
-
-<para><application><acronym>PHP</acronym></application> is the 
-<acronym>PHP</acronym> Hypertext Preprocessor. Primarily used in dynamic web 
-sites, it allows for programming code to be directly embedded into the
-<acronym>HTML</acronym> markup.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&php-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&php-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &php-md5sum;</para></listitem>
-<listitem><para>Download size: &php-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&php-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&php-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing="compact">
-<listitem><para>Required patch for Berkeley DB: <ulink 
-url="&patch-root;/php-&php-version;-db43-1.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application><acronym>PHP</acronym></application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="apache"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
-<para><xref linkend="libxml2"/>,
-<xref linkend="libxslt"/>,
-<xref linkend="openssl"/>,
-<ulink url="http://www.fastio.com/">ClibPDF</ulink>,
-<xref linkend="libjpeg"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="curl"/>,
-<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.0.2.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.hellug.gr/">libmcrypt</ulink>,
-<ulink url="http://mhash.sourceforge.net/">mhash</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.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>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application><acronym>PHP</acronym></application></title>
-
-<note><para>You can use <application><acronym>PHP</acronym></application>
-for server-side scripting, command line scripting or client-side
-<acronym>GUI</acronym> applications. The book provides instructions for
-setting up <application><acronym>PHP</acronym></application> for
-server-side scripting as it is the most common form.</para></note>
-
-<para>If you have Berkeley DB installed and wish to utilize it, apply
-the following patch:</para>
-
-<screen><userinput><command>patch -Np1 -i ../php-&php-version;-db43-1.patch</command></userinput></screen>
-
-<para>Install <application><acronym>PHP</acronym></application> by
-running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-apxs2 \
-            --with-config-file-path=/etc \
-            --with-zlib \
-            --enable-bcmath \
-            --with-bz2 \
-            --enable-calendar \
-            --enable-dba \
-            --enable-exif \
-            --enable-ftp \
-            --with-gettext \
-            --with-iconv \
-            --enable-mbstring \
-            --with-ncurses \
-            --with-readline \
-            --disable-libxml &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
-cp php.ini-recommended /etc/php.ini</command></userinput></screen>
-
-<para>Remove the <parameter>--disable-libxml</parameter> switch if you
-have <xref linkend="libxml2"/> installed otherwise
-<command>pear</command> will not be built.</para>
-
-<note><para><acronym>PHP</acronym> 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/"><acronym>PHP</acronym> web site</ulink>
-is highly recommended, as their online docs are very good.</para></note>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application><acronym>PHP</acronym></application></title>
-
-<sect3 id="php-config"><title>Config files</title>
-<para><filename>/etc/php.ini</filename>,
-<filename>/etc/pear.conf</filename></para>
-<indexterm zone="php php-config">
-<primary sortas="e-etc-php.ini">/etc/php.ini</primary></indexterm>
-<indexterm zone="php php-config">
-<primary sortas="e-etc-pear.conf">/etc/pear.conf</primary></indexterm>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>To enable <acronym>PHP</acronym> support in the
-<application>Apache</application> web server,
-a new LoadModule (which should be handled automatically by the
-<command>make install</command> command) and AddType directives must be added 
-to the <filename>httpd.conf</filename> file:</para>
-
-<screen><userinput>LoadModule php5_module lib/apache/libphp5.so
-AddType application/x-httpd-php .php</userinput></screen>
-
-<para>Also, it can be useful to add an entry for 
-<filename>index.php</filename> to the DirectoryIndex directive of the 
-<filename>httpd.conf</filename> file.</para>
-
-<para>You'll need to restart the <application>Apache</application> web server 
-after making any modifications to the <filename>httpd.conf</filename> 
-file.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Library</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>pear, php, php-config, phpextdist and phpize</seg>
-<seg>libphp5.so</seg>
-<seg>/usr/include/php and /usr/lib/php</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="php-prog">
-<term><command>php</command></term>
-<listitem><para>is a command line interface that enables you to parse and 
-execute <acronym>PHP</acronym> code.</para>
-<indexterm zone="php php-prog">
-<primary sortas="b-php">php</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pear">
-<term><command>pear</command></term>
-<listitem><para>is the <acronym>PHP</acronym> Extension and Application 
-Repository (<acronym>PEAR</acronym>) package manager.</para>
-<indexterm zone="php pear">
-<primary sortas="b-pear">pear</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
