From 5b435385c5ba116ef47bcd7769fceed935b7fd94 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Fri, 1 Oct 2004 08:07:16 +0000
Subject: [PATCH] Return old_function, mark PHP 5 keywords, add more PHP 5
 keywords

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@169697 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/migration5.xml |  8 +++++++-
 appendices/reserved.xml   | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/appendices/migration5.xml b/appendices/migration5.xml
index a9741d35d9..cc4c362a40 100755
--- a/appendices/migration5.xml
+++ b/appendices/migration5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.37 $ -->
+<!-- $Revision: 1.38 $ -->
  <appendix id="migration5">
   <title>Migrating from PHP 4 to PHP 5</title>
 
@@ -24,6 +24,12 @@
     pay attention to the following backward incompatible changes:
    </para>
    <itemizedlist>
+    <listitem>
+     <simpara>
+      There are some <link linkend="reserved.keywords">new reserved
+      keywords</link>.
+     </simpara>
+    </listitem>
     <listitem>
      <simpara>
       <function>strrpos</function> and <function>strripos</function> now use
diff --git a/appendices/reserved.xml b/appendices/reserved.xml
index 3517bb4311..a7a5d96e1f 100755
--- a/appendices/reserved.xml
+++ b/appendices/reserved.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.48 $ -->
+<!-- $Revision: 1.49 $ -->
 
  <appendix id="reserved">
   <title>List of Reserved Words</title>
@@ -39,7 +39,7 @@
         <link linkend="language.constants.predefined">__FILE__</link>
        </entry>
        <entry>
-        <link linkend="reserved.classes.php5">exception</link>
+        <link linkend="reserved.classes.php5">exception</link> (PHP 5)
        </entry>
       </row>
       <row>
@@ -206,37 +206,55 @@
         <link linkend="language.constants.predefined">__METHOD__</link>
        </entry>
        <entry>
-        <link linkend="language.oop5.final">final</link>
+        <link linkend="language.oop5.final">final</link> (PHP 5)
        </entry>
        <entry>
-        <link linkend="reserved.classes.php5">php_user_filter</link>
+        <link linkend="reserved.classes.php5">php_user_filter</link> (PHP 5)
        </entry>
       </row>
       <row>
        <entry>
-        <link linkend="language.oop5.interfaces">interface</link>
+        <link linkend="language.oop5.interfaces">interface</link> (PHP 5)
        </entry>
        <entry>
-        <link linkend="language.oop5.interfaces">implements</link>
+        <link linkend="language.oop5.interfaces">implements</link> (PHP 5)
        </entry>
        <entry>
         <link linkend="language.oop5.basic">extends</link>
        </entry>
        <entry>
-        <link linkend="language.oop5.visibility">public</link>
+        <link linkend="language.oop5.visibility">public</link> (PHP 5)
        </entry>
        <entry>
-        <link linkend="language.oop5.visibility">private</link>
+        <link linkend="language.oop5.visibility">private</link> (PHP 5)
        </entry>
       </row>
       <row>
        <entry>
-        <link linkend="language.oop5.visibility">protected</link>
+        <link linkend="language.oop5.visibility">protected</link> (PHP 5)
        </entry>
        <entry>
-        <link linkend="language.oop5.abstract">abstract</link>
+        <link linkend="language.oop5.abstract">abstract</link> (PHP 5)
        </entry>
        <entry>
+        clone (PHP 5)
+       </entry>
+       <entry>
+        try (PHP 5)
+       </entry>
+       <entry>
+        catch (PHP 5)
+       </entry>
+      </row>
+      <row>
+       <entry>
+        throw (PHP 5)
+       </entry>
+       <entry>
+        <link linkend="migration.old-function">cfunction</link> (PHP 4 only)
+       </entry>
+       <entry>
+        <link linkend="migration.old-function">old_function</link> (PHP 4 only)
        </entry>
        <entry>
        </entry>