didou Thu Mar 17 11:05:11 2005 EDT
Modified files:
/phpdoc/en/install snippet.apache2.compat.xml
Log:
Revert wrong commit
http://cvs.php.net/diff.php/phpdoc/en/install/snippet.apache2.compat.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/install/snippet.apache2.compat.xml
diff -u phpdoc/en/install/snippet.apache2.compat.xml:1.2
phpdoc/en/install/snippet.apache2.compat.xml:1.3
--- phpdoc/en/install/snippet.apache2.compat.xml:1.2 Wed Mar 16 15:21:27 2005
+++ phpdoc/en/install/snippet.apache2.compat.xml Thu Mar 17 11:05:11 2005
@@ -1,47 +1,50 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!-- $Revision: 1.2 $ -->
-<!-- $Author: dallas $ -->
-<!-- EN-Revision: 1.1 Maintainer: dallas Status: ready -->
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.3 $ -->
<note>
- <title>PHP �� Apache 2.0.x ������˵��</title>
+ <title>PHP and Apache 2.0.x compatibility notes</title>
<para>
- ���°汾�� PHP ��֤ʵ���Թ��������°� Apache 2.0.x��
+ The following versions of PHP are known to work with the most recent
+ version of Apache 2.0.x:
<itemizedlist spacing="compact">
<listitem>
<simpara>
- PHP 4.3.0 ����߰汾����
- <ulink url="&url.php.downloads;">&url.php.downloads;</ulink>��
+ PHP 4.3.0 or later available at
+ <ulink url="&url.php.downloads;">&url.php.downloads;</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- �����ȶ������档����Դ���� <ulink
-
url="&url.php.snapshots;php4-latest.tar.gz">&url.php.snapshots;php4-latest.tar.gz</ulink>
- ��Windows ��ִ�а汾 <ulink
-
url="&url.php.snapshots;win32/php4-win32-latest.zip">&url.php.snapshots;win32/php4-win32-latest.zip</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>
- Ԥ�����汾���ɴ�
- <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink> ���ء�
+ a prerelease version downloadable from
+ <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- �����Դ� <ulink url="&url.php.anoncvs;">anonymous CVS</ulink> ȡ��
PHP��
+ you have always the option to obtain PHP through
+ <ulink url="&url.php.anoncvs;">anonymous CVS</ulink>.
</simpara>
</listitem>
</itemizedlist>
- ���ϵ� PHP ������ Apache 2.0.40 �����߰汾��
+ These versions of PHP are compatible to Apache 2.0.40 and later.
</para>
<para>
- Apache 2.0 �� <literal>SAPI</literal> ֧���� PHP 4.2.0 ��PHP 4.2.3
- ������ Apache 2.0.39����Ҫ�������汾�� Apache ��
- PHP 4.2.3 ��ϡ��������齫 PHP 4.3.0 ����߰汾�����°�� Apache2
һ��ʹ�á�
+ Apache 2.0 <literal>SAPI</literal>-support started with PHP 4.2.0.
+ PHP 4.2.3 works with Apache 2.0.39, don't use any other version of
Apache with
+ PHP 4.2.3. However, the recommended setup is to use PHP 4.3.0 or later
with
+ the most recent version of Apache2.
</para>
<para>
- ���������� PHP �汾����Ȼ���� Apache 1.3.x ���ݡ�
+ All mentioned versions of PHP will work still with
+ Apache 1.3.x.
</para>
</note>
