diff --git a/internals2/intro.xml b/internals2/intro.xml index 06fae532a8..10d42354bd 100644 --- a/internals2/intro.xml +++ b/internals2/intro.xml @@ -17,7 +17,6 @@ &internals2.faq.index; FAQ &internals2.apiref.index; full index of all APIs, constants, macros, etc. &internals2.ze1.index; old docs, quick list of major differences, short discussion re: OOP - &internals2.ze3.index; quick discussion of major changes, some details on Unicode --> @@ -28,9 +27,7 @@ robust and widespread language. With the introduction of PHP 5 came the Zend Engine 2 (ZE2). ZE2 came with an almost entirely new Object-Oriented Programming (OOP) model and a number of improvements in the - API. PHP 6, which is still under active development at the time of this - writing, introduces the Zend Engine 3 (ZE3), which brings full Unicode - support to the language. + API. @@ -43,16 +40,14 @@ - This section of the manual is devoted to ZE2. While PHP 4.4 is still in - widespread use, the differences in how extensions are written in ZE1 are - small; a short reference to them is given in an appendix to this section. - ZE3's API may yet change significantly, and is covered in another appendix. - It will be more fully documented when PHP 6 enters a beta testing stage. + This section of the manual is devoted to ZE2. The differences in how + extensions are written in ZE1 are small; a short reference to them is + given in an appendix to this section. - The documentation in this section is current as of PHP 5.2.11, the most - recent stable release of PHP 5.2 at the time of this writing. Notable + The documentation in this section is current as of PHP 5.3.3, the most + recent stable release of PHP 5.3 at the time of this writing. Notable differences in the minor PHP 5 releases (5.0 through 5.3) are given as appropriate. diff --git a/internals2/ze3/index.xml b/internals2/ze3/index.xml deleted file mode 100644 index 3cc800ba8a..0000000000 --- a/internals2/ze3/index.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - The future: PHP 6 and Zend Engine 3 - - - - -