Index: apache2.xml
===================================================================
RCS file: /repository/phpdoc/en/install/unix/apache2.xml,v
retrieving revision 1.10
diff -B -b -u -r1.10 apache2.xml
--- apache2.xml	24 Jun 2008 22:17:14 -0000	1.10
+++ apache2.xml	26 May 2009 13:30:29 -0000
@@ -3,7 +3,7 @@
    <sect1 xml:id="install.unix.apache2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>Apache 2.0 on Unix systems</title>
     <para>
-     This section contains notes and hints specific to Apache 2.0 installs
+     This section contains notes and hints specific to Apache 2.x installs
      of PHP on Unix systems.
     </para>
    
@@ -12,15 +12,15 @@
     <para>
      You are highly encouraged to take a look at the
      <link xlink:href="&url.apache2.docs;">Apache Documentation</link> to get
-     a basic understanding of the Apache 2.0 Server.
+     a basic understanding of the Apache 2.x Server.
     </para>
 
     &install.snippet.apache2.compat;
 
     <para>
      Download the most recent version of <link xlink:href="&url.apache;">
-     Apache 2.0</link> and a fitting PHP version from the above mentioned places.
-     This quick guide covers only the basics to get started with Apache 2.0
+     Apache 2.x</link> and a fitting PHP version from the above mentioned places.
+     This quick guide covers only the basics to get started with Apache 2.x
      and PHP. For more information read the
      <link xlink:href="&url.apache2.docs;">Apache Documentation</link>.
      The version numbers have been omitted here, to ensure the
@@ -33,16 +33,16 @@
      </title>
      <screen>
 <![CDATA[
-1.  gzip -d httpd-2_0_NN.tar.gz
-2.  tar xvf httpd-2_0_NN.tar
+1.  gzip -d httpd-2_x_NN.tar.gz
+2.  tar xvf httpd-2_x_NN.tar
 3.  gunzip php-NN.tar.gz
 4.  tar -xvf php-NN.tar
-5.  cd httpd-2_0_NN
+5.  cd httpd-2_x_NN
 6.  ./configure --enable-so
 7.  make
 8.  make install
 
-    Now you have Apache 2.0.NN available under /usr/local/apache2,
+    Now you have Apache 2.x.NN available under /usr/local/apache2,
     configured with loadable module support and the standard MPM prefork.
     To test the installation use your normal procedure for starting
     the Apache server, e.g.:
@@ -138,12 +138,12 @@
      many more configuration options available Apache and PHP.  For more
      information type <command>./configure --help</command> in the corresponding
      source tree. If you wish to build a multithreaded version of Apache2, you
-     must overwrite the standard MPM-Module <filename>prefork</filename> either
-     with <filename>worker</filename> or <filename>perchild</filename>.  To do
-     so append to your configure line in step 6 above either the option
-     <option role="configure">--with-mpm=worker</option> or
-     <option role="configure">--with-mpm=perchild</option>.  Before doing so,
-     please beware the consequences and have at least a fair understand of what
+     must overwrite the standard MPM-Module <filename>prefork</filename>
+     with <filename>worker</filename>.  To do
+     so append to your configure line in step 6 above the option
+     <option role="configure">--with-mpm=worker</option>.
+     Before doing so,
+     please be aware of the consequences and have at least a fair understand of
      the implications. For more information, read the Apache documentation
      regarding <link xlink:href="&url.apache2.mpm;">MPM-Modules</link>.
     </para>
@@ -157,8 +157,8 @@
     <note>
      <para>
       To build a multithreaded version of Apache your system must support threads.
-      This also implies to build PHP with experimental
-      Zend Thread Safety (ZTS). Therefore not all extensions might be available.
+      You should also build PHP with experimental
+      Zend Thread Safety (ZTS). Under this configuration, not all extensions will be available.
       The recommended setup is to build Apache with the standard
       <filename>prefork</filename> MPM-Module.
      </para>