Index: appendices/symlinks/rc0.xml
===================================================================
--- appendices/symlinks/rc0.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc0.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -78,4 +78,11 @@
 
 <row>
+<entry>K28</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Shut down Apache Daemon: <xref linkend="apache"/></entry>
+</row>
+
+<row>
 <entry>K30</entry>
 <entry>sshd</entry>
Index: appendices/symlinks/rc1.xml
===================================================================
--- appendices/symlinks/rc1.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc1.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -61,4 +61,11 @@
 <entry><filename>../init.d/postgres</filename></entry>
 <entry>Shut down PostgreSQL Daemon: <xref linkend="postgres"/></entry>
+</row>
+
+<row>
+<entry>K28</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Shut down Apache Daemon: <xref linkend="apache"/></entry>
 </row>
 
Index: appendices/symlinks/rc2.xml
===================================================================
--- appendices/symlinks/rc2.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc2.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -54,4 +54,11 @@
 <entry><filename>../init.d/postgres</filename></entry>
 <entry>Shut down PostgreSQL Daemon: <xref linkend="postgres"/></entry>
+</row>
+
+<row>
+<entry>K28</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Shut down Apache Daemon: <xref linkend="apache"/></entry>
 </row>
 
Index: appendices/symlinks/rc3.xml
===================================================================
--- appendices/symlinks/rc3.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc3.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -106,4 +106,11 @@
 
 <row>
+<entry>S32</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Start Apache Daemon: <xref linkend="apache"/></entry>
+</row>
+
+<row>
 <entry>S34</entry>
 <entry>mysql</entry>
Index: appendices/symlinks/rc4.xml
===================================================================
--- appendices/symlinks/rc4.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc4.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -106,4 +106,11 @@
 
 <row>
+<entry>S32</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Start Apache Daemon: <xref linkend="apache"/></entry>
+</row>
+
+<row>
 <entry>S34</entry>
 <entry>mysql</entry>
Index: appendices/symlinks/rc5.xml
===================================================================
--- appendices/symlinks/rc5.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc5.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -99,4 +99,11 @@
 
 <row>
+<entry>S32</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Start Apache Daemon: <xref linkend="apache"/></entry>
+</row>
+
+<row>
 <entry>S34</entry>
 <entry>mysql</entry>
Index: appendices/symlinks/rc6.xml
===================================================================
--- appendices/symlinks/rc6.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ appendices/symlinks/rc6.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -71,4 +71,11 @@
 
 <row>
+<entry>K28</entry>
+<entry>apache</entry>
+<entry><filename>../init.d/apache</filename></entry>
+<entry>Shut down Apache Daemon: <xref linkend="apache"/></entry>
+</row>
+
+<row>
 <entry>K30</entry>
 <entry>sshd</entry>
Index: content/web/apache/apache-config.xml
===================================================================
--- content/web/apache/apache-config.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ content/web/apache/apache-config.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -0,0 +1,75 @@
+<sect2>
+<title>Configuring Apache</title>
+
+<sect3>
+<title>Config files</title>
+
+<para><filename>/etc/apache/*</filename></para>
+
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The main configuration file is called
+<filename>httpd.conf</filename>. See
+<ulink
+url="http://httpd.apache.org/docs-2.0/configuring.html">http://httpd.apache.org/docs-2.0/configuring.html</ulink> for detailed
+instructions on customizing your Apache <acronym>HTTP</acronym>
+server.</para>
+
+<para>To automate the running of Apache, use the following command to
+create the init.d script:</para>
+
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/apache &lt;&lt; "EOF"
+#!/bin/bash
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+        start)
+                echo "Starting Apache daemon..."
+                /usr/sbin/apachectl -k start
+                evaluate_retval
+                ;;
+
+        stop)
+                echo "Stopping Apache daemon..."
+                /usr/sbin/apachectl -k stop
+                evaluate_retval
+                ;;
+
+        restart)
+                echo "Restarting Apache daemon..."
+                /usr/sbin/apachectl -k restart
+                evaluate_retval
+                ;;
+
+        status)
+                statusproc /usr/sbin/httpd
+                ;;
+                
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
+esac
+EOF
+chmod 755 /etc/rc.d/init.d/apache</command></userinput></screen>
+
+<para>Create the symbolic links to this file in the relevant
+<filename class="directory">rc.d</filename> directory
+with the following commands:</para>
+
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/apache ../rc0.d/K28apache &amp;&amp;
+ln -sf ../init.d/apache ../rc1.d/K28apache &amp;&amp;
+ln -sf ../init.d/apache ../rc2.d/K28apache &amp;&amp;
+ln -sf ../init.d/apache ../rc3.d/S32apache &amp;&amp;
+ln -sf ../init.d/apache ../rc4.d/S32apache &amp;&amp;
+ln -sf ../init.d/apache ../rc5.d/S32apache &amp;&amp;
+ln -sf ../init.d/apache ../rc6.d/K28apache</command></userinput></screen>
+
+</sect3>
+
+</sect2>
Index: content/web/apache/apache-desc.xml
===================================================================
--- content/web/apache/apache-desc.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ content/web/apache/apache-desc.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -0,0 +1,68 @@
+<sect2>
+<title>Contents</title>
+
+<para>The Apache package provides
+<command>ab</command>,
+<command>apachectl</command>,
+<command>apr-config</command>,
+<command>apu-config</command>,
+<command>apxs</command>,
+<command>checkgid</command>,
+<command>dbmmanage</command>,
+<command>htdbm</command>,
+<command>htdigest</command>,
+<command>htpasswd</command>,
+<command>httpd</command>,
+<command>logresolve</command>,
+<command>rotatelogs</command>,
+<filename class="libraryfile">libapr</filename>,
+<filename class="libraryfile">libaprutil</filename> and
+various modules.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ab</title>
+<para><command>ab</command> is a tool for benchmarking your Apache <acronym>HTTP</acronym> server.
+</para></sect3>
+
+<sect3><title>apachectl</title>
+<para><command>apachectl</command> is a frontend to the Apache <acronym>HTTP</acronym> 
+server which is designed to help the administrator control the functioning of the Apache
+httpd daemon.</para></sect3>
+
+<sect3><title>apxs</title>
+<para><command>apxs</command> 
+is a tool for building and installing extension modules for the Apache
+<acronym>HTTP</acronym> server.</para></sect3>
+
+<sect3><title>dbmmanage</title>
+<para><command>dbmmanage</command> is used to create and update the
+<acronym>DBM</acronym> format files used to store usernames and password  
+for basic authentication of <acronym>HTTP</acronym>
+users.</para></sect3>
+
+<sect3><title>htdigest</title>
+<para><command>htdigest</command> is used to create and update the
+flat-files used to store usernames, realm and password for digest 
+authentication of <acronym>HTTP</acronym> users.</para></sect3>
+
+<sect3><title>htpasswd</title>
+<para><command>htpasswd</command> is used to create and update the
+flat-files used to store usernames and password for basic authentication of 
+<acronym>HTTP</acronym> users.</para></sect3>
+
+<sect3><title>httpd</title>
+<para><command>httpd</command> is the Apache <acronym>HTTP</acronym>
+server program.</para></sect3>
+
+<sect3><title>logresolve</title>
+<para><command>logresolve</command> is a post-processing program to
+resolve IP-addresses in Apache's access logfiles.</para></sect3>
+
+<sect3><title>rotatelogs</title>
+<para><command>rotatelogs</command> is a simple program for use in
+conjunction with Apache's piped logfile feature.</para></sect3>
+
+</sect2>
Index: content/web/apache/apache-exp.xml
===================================================================
--- content/web/apache/apache-exp.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ content/web/apache/apache-exp.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>--enable-mods-shared=all</command> : We want modules
+to be compiled and used as Dynamic Shared Objects
+(<acronym>DSO</acronym>s) so they can be included and excluded from the
+server using the run-time configuration directives.
+</para>
+
+</sect2>
Index: content/web/apache/apache-inst.xml
===================================================================
--- content/web/apache/apache-inst.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ content/web/apache/apache-inst.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -1,29 +1,21 @@
 <sect2>
-<title>Installation of Apache</title>
+<title>Installation of <application>Apache</application></title>
 
 <para>For security reasons, running the server as an unpriviledged user and group is strongly encouraged.</para>
 
-<screen><userinput>groupadd apache &amp;&amp;
-useradd -c apache -d /dev/null -g apache -s /bin/false apache</userinput></screen>
+<screen><userinput><command>groupadd apache &amp;&amp;
+useradd -c apache -d /dev/null -g apache -s /bin/false apache</command></userinput></screen>
 
-<para>Build and install Apache by running the following commands:</para>
+<para>Build and install <application>Apache</application> by running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --sbindir=/usr/sbin \
+<screen><userinput><command>./configure --prefix=/usr \
             --libexecdir=/usr/lib/apache \
+            --datadir=/var/www \
             --sysconfdir=/etc/apache \
+            --localstatedir=/var/www \
             --includedir=/usr/include/apache \
-            --datadir=/var/www \
-            --localstatedir=/var/www \
-            --logfiledir=/var/log/apache \
-            --runtimedir=/var/run \
-            --enable-module=all \
-            --enable-shared=max \
-            --disable-module=auth_db \
-            --disable-module=auth_dbm \
-            --server-uid=apache \
-            --server-gid=apache &amp;&amp;
+            --enable-mods-shared=all &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen>
+make install</command></userinput></screen>
 
 </sect2>
Index: content/web/apache/apache-intro.xml
===================================================================
--- content/web/apache/apache-intro.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ content/web/apache/apache-intro.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -1,14 +1,25 @@
 <sect2>
-<title>Introduction to Apache</title>
+<title>Introduction to <application>Apache</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&apache-download-http;" />
-Download location (FTP):        <ulink url="&apache-download-ftp;" />
-Version used:                   &apache-version;
-Package size:                   &apache-size;
-Estimated disk space required:  &apache-buildsize;</screen>
-
-<para>The Apache package contains an open-source HTTP server.  It is
+<para>The <application>Apache</application> package contains an
+open-source <acronym>HTTP</acronym> server. It is
 useful for creating local intranet web sites or running huge web serving
 operations.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&apache-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&apache-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &apache-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &apache-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &apache-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Apache</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="db"/>, <xref linkend="openssl"/>, <xref
+linkend="openldap"/> and <xref linkend="lynx"/>
+</para></sect4>
+</sect3>
+
 </sect2>
Index: content/web/apache/apache.ent
===================================================================
--- content/web/apache/apache.ent	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ content/web/apache/apache.ent	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -5,7 +5,8 @@
 <!ENTITY apache-config SYSTEM "apache-config.xml">
 <!ENTITY apache-desc SYSTEM "apache-desc.xml">
-<!ENTITY apache-version "1.3.27">
-<!ENTITY apache-download-http "http://www.apache.org/dist/httpd/apache_1.3.27.tar.gz">
-<!ENTITY apache-download-ftp "ftp://ftp.tux.org/pub/net/apache/dist/httpd/apache_1.3.27.tar.gz">
-<!ENTITY apache-size "2.2 MB">
-<!ENTITY apache-buildsize "13 MB">
+<!ENTITY apache-version "2.0.47">
+<!ENTITY apache-download-http "http://www.apache.org/dist/httpd/httpd-&apache-version;.tar.gz">
+<!ENTITY apache-download-ftp "ftp://ftp.tux.org/pub/net/apache/dist/httpd/httpd-&apache-version;.tar.gz">
+<!ENTITY apache-size "5.9 MB">
+<!ENTITY apache-buildsize "95 MB">
+<!ENTITY apache-time "1.31 SBU">
Index: index.xml
===================================================================
--- index.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ index.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030912">
-<!ENTITY releasedate "September 12th, 2003">
+<!ENTITY version "20030913">
+<!ENTITY releasedate "September 13th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7891efcdb398fe318186f488f15262a241d1fc53)
+++ introduction/welcome/changelog.xml	(revision ff3fa53882913bcbf9c0630ff54798746eff0b91)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>September 13th, 2003 [igor]: update to
+Apache-2.0.47.</para></listitem>
 
 <listitem><para>September 11th, 2003 [larry]: Arranged Part
