nlopess         Sat Jun  5 05:33:46 2004 EDT

  Modified files:              
    /phpdoc/en/install/windows  apache1.xml 
  Log:
  better presentation and PHP 5 instructions
  
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/windows/apache1.xml
diff -u phpdoc/en/install/windows/apache1.xml:1.3 
phpdoc/en/install/windows/apache1.xml:1.4
--- phpdoc/en/install/windows/apache1.xml:1.3   Fri Jun  4 16:29:35 2004
+++ phpdoc/en/install/windows/apache1.xml       Sat Jun  5 05:33:45 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
    <sect1 id="install.windows.apache1">
     <title>Apache 1.3.x on Microsft Windows</title>
     <para>
@@ -11,7 +11,8 @@
     
     <simpara>
      There are two ways to set up PHP to work with Apache 1.3.x
-     on Windows. One is to use the CGI binary (<filename>php.exe</filename>),
+     on Windows. One is to use the CGI binary (<filename>php.exe</filename>
+     for PHP 4 and <filename>php-cgi.exe</filename> for PHP 5),
      the other is to use the Apache module DLL. In either case
      you need to edit your &httpd.conf; to configure Apache to
      work with PHP, and then restart the server.
@@ -37,29 +38,21 @@
       Installation Steps</link> section, you need to insert
       these lines to your Apache configuration file to set
       up the CGI binary:
-      <itemizedlist>
-       <listitem>
-        <simpara>
-         <literal>
-          ScriptAlias /php/ "c:/php/"
-         </literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>
-          AddType application/x-httpd-php .php .phtml
-         </literal>
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>
-          Action application/x-httpd-php "/php/php.exe"
-         </literal>
-        </simpara>
-       </listitem>
-      </itemizedlist>
+      <example>
+       <title>PHP and Apache 1.3.x as CGI</title>
+        <programlisting role="apache-conf">
+<![CDATA[
+ScriptAlias /php/ "c:/php/"
+AddType application/x-httpd-php .php
+
+# For PHP 4
+Action application/x-httpd-php "/php/php.exe"
+
+# For PHP 5
+Action application/x-httpd-php "/php/php-cgi.exe"
+]]>
+       </programlisting>
+      </example>
       Note that the second line in the list above can be found
       in the actual versions of &httpd.conf;, but it is commented out. Remember
       also to substitute the <filename>c:/php/</filename> for your actual path to
@@ -106,7 +99,7 @@
          <emphasis>at the end</emphasis> of the list for PHP 4:
          <literal>LoadModule php4_module "c:/php/sapi/php4apache.dll"</literal>
          or the following for PHP 5:
-         <literal>LoadModule php5_module "c:/php/sapi/php5apache.dll"</literal>
+         <literal>LoadModule php5_module "c:/php/php5apache.dll"</literal>
         </simpara>
        </listitem>
        <listitem>

Reply via email to