Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision 39373956d9c46cfe4bdf90e10e8536989f6813fb)
+++ content/web/apache.xml	(revision b1623c2f7aa01375b3bbadff983c74511f91a44b)
@@ -36,12 +36,11 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink
-url="&patch-root;/httpd-&apache-version;-config.patch"/></para></listitem>
+url="&patch-root;/httpd-&apache-version;-config-1.patch"/></para></listitem>
 </itemizedlist></sect3>
 
 <sect3><title><application>Apache</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="db"/> or <xref linkend="gdbm"/>, <xref linkend="openssl"/>, <xref
-linkend="openldap"/> and <xref linkend="expat"/>
-</para></sect4>
+<para><xref linkend="db"/> or <xref linkend="gdbm"/>, <xref linkend="openssl"/>, 
+<xref linkend="openldap"/> and <xref linkend="expat"/></para></sect4>
 </sect3>
 
@@ -51,5 +50,6 @@
 <title>Installation of <application>Apache</application></title>
 
-<para>For security reasons, running the server as an unprivileged user and group is strongly encouraged.</para>
+<para>For security reasons, running the server as an unprivileged user and 
+group is strongly encouraged.</para>
 
 <screen><userinput><command>groupadd apache &amp;&amp;
@@ -62,10 +62,11 @@
 be configured without errors. Apply the patch:</para>
 
-<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config.patch</command></userinput></screen>
-
-<para>Build and install <application>Apache</application> by running the following commands:</para>
+<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config-1.patch</command></userinput></screen>
+
+<para>Build and install <application>Apache</application> by running the 
+following commands:</para>
 
 <screen><userinput><command>./configure --enable-layout=LFS \
-            --enable-mods-shared=all &amp;&amp;
+    --enable-mods-shared=all &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -78,10 +79,11 @@
 <para><parameter>--with-expat=/usr</parameter>: Uses system installed
 expat. <emphasis>If you have installed expat and do not use this switch, the
-apache installation may overwrite some files from the expat installation.</emphasis></para>
+apache installation may overwrite some files from the expat 
+installation.</emphasis></para>
+
 <para><parameter>--enable-mods-shared=all</parameter>: 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>
+server using the run-time configuration directives.</para>
 
 <para><parameter>--enable-ssl</parameter>: Use this switch
@@ -108,5 +110,5 @@
 
 <screen><userinput><command>sed -i -e "s%User nobody%User apache%" -e "s%^Group #-1%Group apache%" /etc/apache/httpd.conf</command></userinput></screen>
-    
+
 <para>See 
 <ulink url="http://httpd.apache.org/docs-2.0/configuring.html"/> for
@@ -115,6 +117,7 @@
 
 <para>Install the <filename>/etc/rc.d/init.d/apache</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                                                                
+init script included in the <xref linkend="intro-important-bootscripts"/> 
+package.</para>
+
 <screen><userinput><command>make install-apache</command></userinput></screen>
 
@@ -181,6 +184,6 @@
 
 <sect3><title>httpd</title>
-<para><command>httpd</command> is the <application>Apache</application> <acronym>HTTP</acronym>
-server program.</para></sect3>
+<para><command>httpd</command> is the <application>Apache</application> 
+<acronym>HTTP</acronym> server program.</para></sect3>
 
 <sect3><title>instdso.sh</title>
@@ -190,9 +193,10 @@
 <sect3><title>logresolve</title>
 <para><command>logresolve</command> is a post-processing program to
-resolve <acronym>IP</acronym>-addresses in <application>Apache</application>'s access log files.</para></sect3>
+resolve <acronym>IP</acronym>-addresses in <application>Apache</application>'s 
+access log files.</para></sect3>
 
 <sect3><title>rotatelogs</title>
-<para><command>rotatelogs</command> is a simple program for use in
-conjunction with <application>Apache</application>'s piped log file feature.</para></sect3>
+<para><command>rotatelogs</command> is a simple program for use in conjunction 
+with <application>Apache</application>'s piped log file feature.</para></sect3>
 
 </sect2>
