From 083d647c035bf86b16763c3cfb0b8b54c416988c Mon Sep 17 00:00:00 2001
From: Friedhelm Betz <betz@php.net>
Date: Sun, 24 Nov 2002 12:03:37 +0000
Subject: [PATCH] direct download links for snaps clean up of http.conf
 configuration examples warning about mixing dlls

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@105534 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters/install.apache2.xml | 56 +++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/chapters/install.apache2.xml b/chapters/install.apache2.xml
index b09b00fe68..b9752e7a33 100644
--- a/chapters/install.apache2.xml
+++ b/chapters/install.apache2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="install.apache2">
    <title>Servers-Apache 2.0</title>
    <para>
@@ -28,14 +28,17 @@
      <itemizedlist spacing="compact">
       <listitem>
        <simpara>
-        the latest stable development versions downloadable from
-        <ulink url="&url.php.snapshots;">&url.php.snapshots;</ulink>
+        the latest stable development version.
+        Get the source code <ulink url="&url.php.snapshots;php4-latest.tar.gz">
+        &url.php.snapshots;php4-latest.tar.gz</ulink> or download binaries
+        for windows <ulink url="&url.php.snapshots;win32/php4-win32-latest.zip">
+        &url.php.snapshots;win32/php4-win32-latest.zip</ulink>.
        </simpara>
       </listitem>
       <listitem>
        <simpara>
         a prerelease version of PHP 4.3.0 downloadable from
-        <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink>
+        <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink>.
        </simpara>
       </listitem>
       <listitem>
@@ -161,8 +164,8 @@
     </para>
     <warning>
      <para>
-      Apache 2.0 is designed to run on Windows NT 4.0 and Windows 2000.
-      At this time, support for Windows 9x is incomplete.
+      Apache 2.0 is designed to run on Windows NT 4.0, Windows 2000 or
+      Windows XP. At this time, support for Windows 9x is incomplete.
       Apache 2.0 is not expected to work on those platforms at this time.
      </para>
     </warning>
@@ -185,12 +188,12 @@
      </filename> configuration file to set up the
      <emphasis>CGI binary</emphasis>:
      <example>
-      <title>PHP development version and Apache 2.0</title>
+      <title>PHP and Apache 2.0 as CGI</title>
        <programlisting role="apache">
 <![CDATA[
 ScriptAlias /php/ "c:/php/"
 AddType application/x-httpd-php .php
-Action application/x-httpd-php "/php/php.exe"
+Action application/x-httpd-php "/php/php-cgi.exe"
 ]]>
        </programlisting>
      </example>
@@ -202,24 +205,13 @@ Action application/x-httpd-php "/php/php.exe"
       Action directive for Apache.
      </para>
     </note>
-    <para>
-     <example>
-      <title>PHP 4.3.0 prerelease and Apache 2.0</title>
-       <programlisting role="apache">
-<![CDATA[
-ScriptAlias /php/ "c:/php/"
-AddType application/x-httpd-php .php
-Action application/x-httpd-php "/php/php-cgi.exe"
-]]>
-       </programlisting>
-     </example>
-    </para>
     <para>
      If you would like to use <literal>PHP</literal> as a module in Apache 2.0,
-     be sure to move <filename>php4ts.dll</filename> to your
-     <filename>winnt/system32</filename> directory, overwriting any older file.
-     You need to insert these two lines to your Apache <filename>httpd.conf
-     </filename> configuration file to set up the
+     be sure to move <filename>php4ts.dll</filename> to
+     <filename>winnt/system32</filename> (for Windows NT/2000) or
+     <filename>windows/system32</filename> (for Windows XP),
+     overwriting any older file. You need to insert these two lines to your
+     Apache <filename>httpd.conf </filename> configuration file to set up the
      <emphasis>PHP-Module</emphasis> for Apache 2.0:
      <example>
       <title>PHP and Apache 2.0 as Module</title>
@@ -232,14 +224,18 @@ AddType application/x-httpd-php .php
      </example>
     </para>
     <note>
-     <para>
+     <simpara>
       Remember to substitute the <filename>c:/php/</filename> for your actual
-      path to <literal>PHP</literal> in the above examples. Don't mix up your
-      installation with dll files from <emphasis>different PHP versions
-      </emphasis>. You have the only choice to use the dll's and extensions
-      that ship with your downloaded PHP version.
-     </para>
+      path to <literal>PHP</literal> in the above examples.
+     </simpara>
     </note>
+    <warning>
+     <simpara>
+      Don't mix up your installation with dll files from
+      <emphasis>different PHP versions </emphasis>. You have the only choice
+      to use the dll's and extensions that ship with your downloaded PHP version.
+     </simpara>
+    </warning>
    </sect2>
 
   </sect1>