From 47bcab4975af6317f3d25a9ccf36fd168b8b6427 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Sat, 27 Nov 2004 11:33:55 +0000
Subject: [PATCH] Update PHP 5 information (bug #30628)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@173597 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/history.xml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/appendices/history.xml b/appendices/history.xml
index 637a12ba3e..0cbe924c07 100644
--- a/appendices/history.xml
+++ b/appendices/history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
 
 <appendix id="history">
  <title>History of PHP and related projects</title>
@@ -124,11 +124,6 @@
     buffering, more secure ways of handling user input and
     several new language constructs.
    </para>
-   <para>
-    PHP 4 is currently the latest released version of PHP. Work
-    has already begun on modifying and improving the Zend Engine
-    to integrate the features which were designed for PHP 5.0.
-   </para>
    <para>
     Today, PHP is being used by hundreds of thousands of developers
     (estimated), and several million sites report as having it
@@ -145,9 +140,10 @@
   <sect2 id="history.php5">
    <title>PHP 5</title>
    <para>
-    The future of PHP is mainly driven by its core, the Zend Engine.
-    PHP 5 will include the new Zend Engine 2.0. To get more information
-    on this engine, <ulink url="&url.zend.future;">see its webpage</ulink>.
+    PHP 5 was released in July 2004 after long development and several
+    pre-releases. It is mainly driven by its core, the Zend Engine 2.0 with a
+    new object model and dozens of other new features. To get more information
+    on this engine, see <ulink url="&url.zend.future;">its webpage</ulink>.
    </para>
   </sect2>
  </sect1>