aidan           Tue Sep 28 06:50:28 2004 EDT

  Modified files:              
    /phpdoc/en/install/windows  apache1.xml 
  Log:
  Re-ordered sections (makes sense)
  
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.11&r2=1.12&ty=u
Index: phpdoc/en/install/windows/apache1.xml
diff -u phpdoc/en/install/windows/apache1.xml:1.11 
phpdoc/en/install/windows/apache1.xml:1.12
--- phpdoc/en/install/windows/apache1.xml:1.11  Thu Aug 12 21:00:42 2004
+++ phpdoc/en/install/windows/apache1.xml       Tue Sep 28 06:50:28 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
    <sect1 id="install.windows.apache1">
     <title>Apache 1.3.x on Microsoft Windows</title>
     <para>
@@ -46,51 +46,6 @@
     
     &note.apache.slashes;
 
-    <sect2 id="install.windows.apache1.cgi">
-     <title>Installing as a CGI binary</title>
-    
-     <para>
-      If you unzipped the PHP package to <filename>C:\php\</filename> as described
-      in the <link linkend="install.windows.manual">Manual
-      Installation Steps</link> section, you need to insert
-      these lines to your Apache configuration file to set
-      up the CGI binary:
-      <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"
-
-# specify the directory where php.ini is
-SetEnv PHPRC C:/php
-]]>
-       </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
-      PHP.
-     </para>
-     &warn.install.cgi;
-     <simpara>
-      If you would like to present PHP source files syntax highlighted, there
-      is no such convenient option as with the module version of PHP.
-      If you chose to configure Apache to use PHP as a CGI binary, you
-      will need to use the <function>show_source</function> function. To
-      do this simply create a PHP script file and add this code: 
-      <literal>&lt;?php show_source("original_php_script.php"); ?&gt;</literal>. 
-      Substitute <filename>original_php_script.php</filename> with 
-      the name of the file you wish to show the source of. 
-     </simpara>
-    </sect2>
-
     <sect2 id="install.windows.apache1.module">
      <title>Installing as an Apache module</title>
      <para>
@@ -136,6 +91,52 @@
       will be syntax highlighted for the browser.
      </simpara>
     </sect2>
+
+    <sect2 id="install.windows.apache1.cgi">
+     <title>Installing as a CGI binary</title>
+    
+     <para>
+      If you unzipped the PHP package to <filename>C:\php\</filename> as described
+      in the <link linkend="install.windows.manual">Manual
+      Installation Steps</link> section, you need to insert
+      these lines to your Apache configuration file to set
+      up the CGI binary:
+      <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"
+
+# specify the directory where php.ini is
+SetEnv PHPRC C:/php
+]]>
+       </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
+      PHP.
+     </para>
+     &warn.install.cgi;
+     <simpara>
+      If you would like to present PHP source files syntax highlighted, there
+      is no such convenient option as with the module version of PHP.
+      If you chose to configure Apache to use PHP as a CGI binary, you
+      will need to use the <function>show_source</function> function. To
+      do this simply create a PHP script file and add this code: 
+      <literal>&lt;?php show_source("original_php_script.php"); ?&gt;</literal>. 
+      Substitute <filename>original_php_script.php</filename> with 
+      the name of the file you wish to show the source of. 
+     </simpara>
+    </sect2>
+
    </sect1>
 
 <!-- Keep this comment at the end of the file

Reply via email to