cvs: phpdoc /en/install ini.xml /en/install/windows iis.xml manual.xml

nlopess Thu Nov 9 15:50:45 2006 UTC Modified files: /phpdoc/en/install ini.xml /phpdoc/en/install/windows iis.xml manual.xml Log: add Apache 2.2 sapi fix the php.ini search order for CLI sapi remove reference to php.ini beeing search on the PATH(#39432) http://cvs.php.net/viewvc.cgi/phpdoc/en/install/ini.xml?r1=1.14&r2=1.15&diff_format=u Index: phpdoc/en/install/ini.xml diff -u phpdoc/en/install/ini.xml:1.14 phpdoc/en/install/ini.xml:1.15 --- phpdoc/en/install/ini.xml:1.14 Tue Jul 4 11:03:22 2006 +++ phpdoc/en/install/ini.xml Thu Nov 9 15:50:45 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> +<!-- $Revision: 1.15 $ --> <chapter id="configuration"> <title>Runtime Configuration</title> @@ -39,7 +39,7 @@ </listitem> <listitem> <para> - Current working directory (for CLI) + Current working directory (except CLI) </para> </listitem> <listitem> http://cvs.php.net/viewvc.cgi/phpdoc/en/install/windows/iis.xml?r1=1.18&r2=1.19&diff_format=u Index: phpdoc/en/install/windows/iis.xml diff -u phpdoc/en/install/windows/iis.xml:1.18 phpdoc/en/install/windows/iis.xml:1.19 --- phpdoc/en/install/windows/iis.xml:1.18 Thu Apr 20 15:33:05 2006 +++ phpdoc/en/install/windows/iis.xml Thu Nov 9 15:50:45 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18 $ --> +<!-- $Revision: 1.19 $ --> <sect1 id="install.windows.iis"> <title>Microsoft IIS / PWS</title> <para> @@ -42,8 +42,8 @@ <listitem> <simpara> Modify the Windows <literal>PATH</literal> environment variable to - include the PHP directory. This way the PHP DLL files, PHP executables, - and &php.ini; can all remain in the PHP directory without cluttering + include the PHP directory. This way the PHP DLL files and PHP executables + can all remain in the PHP directory without cluttering up the Windows system directory. For more details, see the FAQ on <link linkend="faq.installation.addtopath">Setting the PATH</link>. </simpara> http://cvs.php.net/viewvc.cgi/phpdoc/en/install/windows/manual.xml?r1=1.19&r2=1.20&diff_format=u Index: phpdoc/en/install/windows/manual.xml diff -u phpdoc/en/install/windows/manual.xml:1.19 phpdoc/en/install/windows/manual.xml:1.20 --- phpdoc/en/install/windows/manual.xml:1.19 Wed Nov 30 20:53:45 2005 +++ phpdoc/en/install/windows/manual.xml Thu Nov 9 15:50:45 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <sect1 id="install.windows.manual"> <title>Manual Installation Steps</title> @@ -230,6 +230,9 @@ <filename>sapi/php4apache2.dll (php5apache2.dll)</filename> - Apache 2.0.x module. </para></listitem> <listitem><para> + <filename>sapi/php5apache2_2.dll</filename> - Apache 2.2.x module. + </para></listitem> + <listitem><para> <filename>sapi/php4isapi.dll (php5isapi.dll)</filename> - ISAPI Module for ISAPI compliant web servers like IIS 4.0/PWS 4.0 or newer. </para></listitem>