please revert this ASAP. You've modified the file in the *english* tree, not added a new translation to *your* tree.

- tul

Dallas Thunder wrote:

dallas          Wed Mar 16 15:21:29 2005 EDT

Modified files: /phpdoc/en/install snippet.apache2.compat.xml Log:
New file added.
http://cvs.php.net/diff.php/phpdoc/en/install/snippet.apache2.compat.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/install/snippet.apache2.compat.xml
diff -u phpdoc/en/install/snippet.apache2.compat.xml:1.1 phpdoc/en/install/snippet.apache2.compat.xml:1.2
--- phpdoc/en/install/snippet.apache2.compat.xml:1.1 Fri Jun 4 16:29:35 2004
+++ phpdoc/en/install/snippet.apache2.compat.xml Wed Mar 16 15:21:27 2005
@@ -1,50 +1,47 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<?xml version="1.0" encoding="gb2312"?>
+<!-- $Revision: 1.2 $ -->
+<!-- $Author: dallas $ -->
+<!-- EN-Revision: 1.1 Maintainer: dallas Status: ready -->
<note>
- <title>PHP and Apache 2.0.x compatibility notes</title>
+ <title>PHP 与 Apache 2.0.x 兼容性说明</title>
<para>
- The following versions of PHP are known to work with the most recent
- version of Apache 2.0.x:
+ 以下版本的 PHP 已证实可以工作于最新版 Apache 2.0.x:
<itemizedlist spacing="compact">
<listitem>
<simpara>
- PHP 4.3.0 or later available at
- <ulink url="&url.php.downloads;">&url.php.downloads;</ulink>.
+ PHP 4.3.0 或更高版本,见
+ <ulink url="&url.php.downloads;">&url.php.downloads;</ulink>。
</simpara>
</listitem>
<listitem>
<simpara>
- 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>.
+ 最新稳定开发版。下载源代码 <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>。
</simpara>
</listitem>
<listitem>
<simpara>
- a prerelease version downloadable from
- <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink>.
+ 预发布版本,可从
+ <ulink url="&url.php.prerelease;">&url.php.prerelease;</ulink> 下载。
</simpara>
</listitem>
<listitem>
<simpara>
- you have always the option to obtain PHP through
- <ulink url="&url.php.anoncvs;">anonymous CVS</ulink>.
+ 还可以从 <ulink url="&url.php.anoncvs;">anonymous CVS</ulink> 取得 PHP。
</simpara>
</listitem>
</itemizedlist>
- These versions of PHP are compatible to Apache 2.0.40 and later.
+ 以上的 PHP 兼容于 Apache 2.0.40 及更高版本。
</para>
<para>
- 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.
+ 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 一起使用。
</para>
<para>
- All mentioned versions of PHP will work still with
- Apache 1.3.x.
+ 所有上述的 PHP 版本都仍然能与 Apache 1.3.x 兼容。
</para>
</note>

Reply via email to