From c90f94738ae316ac68b9b4048d576d8c1d17b736 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Thu, 30 Sep 2004 13:07:55 +0000
Subject: [PATCH] nuke old_function & cfunction and rearrange entries

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@169631 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/reserved.xml | 42 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/appendices/reserved.xml b/appendices/reserved.xml
index 86867406b6..074287a694 100755
--- a/appendices/reserved.xml
+++ b/appendices/reserved.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.46 $ -->
+<!-- $Revision: 1.47 $ -->
 
  <appendix id="reserved">
   <title>List of Reserved Words</title>
@@ -60,9 +60,6 @@
        </entry>
       </row>
       <row>
-       <entry>
-        <link linkend="migration.old-function">cfunction</link>
-       </entry>
        <entry>
         <link linkend="keyword.class">class</link>
        </entry>
@@ -75,11 +72,11 @@
        <entry>
         <link linkend="control-structures.declare">declare</link>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="control-structures.switch">default</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <function>die</function>
        </entry>
@@ -92,11 +89,11 @@
        <entry>
         <link linkend="control-structures.else">else</link>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="control-structures.elseif">elseif</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <function>empty</function>
        </entry>
@@ -109,11 +106,11 @@
        <entry>
         <link linkend="control-structures.alternative-syntax">endforeach</link>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="control-structures.alternative-syntax">endif</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <link linkend="control-structures.alternative-syntax">endswitch</link>
        </entry>
@@ -126,11 +123,11 @@
        <entry>
         <function>exit</function>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="keyword.class">extends</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <link linkend="control-structures.for">for</link>
        </entry>
@@ -143,11 +140,11 @@
        <entry>
         <link linkend="language.variables.scope">global</link>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="control-structures.if">if</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <function>include</function>
        </entry>
@@ -160,14 +157,11 @@
        <entry>
         <function>list</function>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="keyword.class">new</link>
        </entry>
-       <entry>
-        <link linkend="migration.old-function">old_function</link>
-       </entry>
+      </row>
+      <row>
        <entry>
         <function>print</function>
        </entry>
@@ -177,14 +171,14 @@
        <entry>
         <function>require_once</function>
        </entry>
-      </row>
-      <row>
        <entry>
         <function>return</function>
        </entry>
        <entry>
         <link linkend="language.variables.scope">static</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <link linkend="control-structures.switch">switch</link>
        </entry>
@@ -194,14 +188,14 @@
        <entry>
         use
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="keyword.class">var</link>
        </entry>
        <entry>
         <link linkend="control-structures.while">while</link>
        </entry>
+      </row>
+      <row>
        <entry>
         <link linkend="language.constants.predefined">__FUNCTION__</link>
        </entry>
@@ -211,8 +205,6 @@
        <entry>
         <link linkend="language.constants.predefined">__METHOD__</link>
        </entry>
-      </row>
-      <row>
        <entry>
         <link linkend="language.oop5.final">final</link>
        </entry>