From 307fa1efeea93ce670a75847e649543095edd323 Mon Sep 17 00:00:00 2001
From: Gabor Hojtsy <goba@php.net>
Date: Sun, 27 Oct 2002 12:31:14 +0000
Subject: [PATCH] Adding information about documented PHP versions and PHP 5 in
 history

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@101541 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/about.xml   | 30 +++++++++++++++++++++++++++++-
 appendices/history.xml | 11 ++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/appendices/about.xml b/appendices/about.xml
index 7286dbb6d6..439215b2ef 100644
--- a/appendices/about.xml
+++ b/appendices/about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
 
 <!--
   TODO: add manual conventions section (eg. how to read
@@ -239,6 +239,34 @@ Returns the length of string.
     </para>
  </sect1>
  
+ <sect1 id="about.phpversions">
+  <title>PHP versions documented in this manual</title>
+  <para>
+   This documentation contains information about PHP 4, with some added
+   migration and compatibility notes regarding PHP 3. Behaviour,
+   parameter, return value and other changes between different PHP
+   versions are documented in notes and inline text in the manual.
+  </para>
+  <para>
+   You may find documentation pieces for the CVS version of PHP, which
+   always means the very latest development version available through
+   the CVS version handling system. If you are not a developer of PHP
+   itself, and you are not keen on using the very latest development
+   version of PHP, features marked with the "available in CVS" wording
+   are not accessible to you. Though these features will probably be
+   available in the next stable version of PHP. If you would like to
+   download the CVS version, see the <ulink url="&url.php.anoncvs;">anonymous
+   CVS access page</ulink>.
+  </para>
+  <para>
+   You may also encounter documentation for a PHP version which is
+   not released (something like PHP 4.3.0 as the latest stable version
+   is 4.2.3). Most of the time, this is not an error in the documentation.
+   Explanation is often added for features not available in the current
+   PHP release, but will be available in a known future PHP version.
+  </para>
+ </sect1>
+   
  <sect1 id="about.more">
   <title>How to find more information about PHP</title>
   <para>
diff --git a/appendices/history.xml b/appendices/history.xml
index 56c433c313..4746e4fafd 100644
--- a/appendices/history.xml
+++ b/appendices/history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 
 <appendix id="history">
  <title>History of PHP and related projects</title>
@@ -138,6 +138,15 @@
     and the documentation project.
    </para>
   </sect2>
+
+  <sect2 id="history.php5">
+   <title>PHP 5</title>
+   <para>
+    The future of PHP is mainly driven by it's 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 it's webpage</ulink>.
+   </para>
+  </sect2>
  </sect1>
  
  <sect1 id="history.php.related">