diff --git a/appendices/migration.xml b/appendices/migration.xml
index d78415a667..cf1b23af5f 100644
--- a/appendices/migration.xml
+++ b/appendices/migration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <appendix id="migration">
  <title>Migrating from PHP/FI 2 to PHP 3</title>
 
@@ -37,6 +37,30 @@
   </simpara>
  </section>
 
+ <section id="migration.old-function">
+  <title><literal>old_function</literal></title>
+  <simpara>
+   The <literal>old_function</literal> statement allows you to
+   declare a function using a syntax identical to PHP/FI2 (except you
+   must replace 'function' with 'old_function'.
+  </simpara>
+  <simpara>
+   This is a deprecated feature, and should only be used by the
+   PHP/FI2->PHP 3 convertor.
+  </simpara>
+  <warning>
+   <para>
+    Functions declared as <literal>old_function</literal> cannot be
+    called from PHP's internal code. Among other things, this means
+    you can't use them in functions such as
+    <function>usort</function>, <function>array_walk</function>, and
+    <function>register_shutdown_function</function>. You can get
+    around this limitation by writing a wrapper function (in normal
+    PHP 3 form) to call the <literal>old_function</literal>.
+   </para>
+  </warning>
+ </section>
+ 
  <section id="migration.startendtags">
   <title>Start/end tags</title>
 
diff --git a/appendices/reserved.xml b/appendices/reserved.xml
index 1c9190fb4c..a159c99f43 100755
--- a/appendices/reserved.xml
+++ b/appendices/reserved.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.30 $ -->
+<!-- $Revision: 1.31 $ -->
 
  <appendix id="reserved">
   <title>List of Reserved Words</title>
@@ -58,7 +58,7 @@
       </row>
       <row>
        <entry>
-        <link linkend="functions.old-syntax">cfunction</link>
+        <link linkend="migration.old-function">cfunction</link>
        </entry>
        <entry>
         <link linkend="keyword.class">class</link>
@@ -163,7 +163,7 @@
         <link linkend="keyword.class">new</link>
        </entry>
        <entry>
-        <link linkend="functions.old-syntax">old_function</link>
+        <link linkend="migration.old-function">old_function</link>
        </entry>
        <entry>
         <function>print</function>
diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index b351bbffce..cab5b538a3 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 
 <appendix id="tokens">
  <title>List of Parser Tokens</title>
@@ -422,7 +422,7 @@
     <row>
      <entry>T_OLD_FUNCTION</entry>
      <entry>old_function</entry>
-     <entry><link linkend="functions.old-syntax">old_function</link></entry>
+     <entry><link linkend="migration.old-function">old_function</link></entry>
     </row>
     <row>
      <entry>T_OPEN_TAG</entry>
diff --git a/language/functions.xml b/language/functions.xml
index 008d2900c5..1435fff45d 100644
--- a/language/functions.xml
+++ b/language/functions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.34 $ -->
+<!-- $Revision: 1.35 $ -->
  <chapter id="functions">
   <title>Functions</title>
 
@@ -371,32 +371,6 @@ $newref =& returns_reference();
    </simpara>
   </sect1>
  
-  <sect1 id="functions.old-syntax">
-   <title><literal>old_function</literal></title>
- 
-   <simpara>
-    The <literal>old_function</literal> statement allows you to
-    declare a function using a syntax identical to PHP/FI2 (except you
-    must replace 'function' with 'old_function'.
-   </simpara>
-   <simpara>
-    This is a deprecated feature, and should only be used by the
-    PHP/FI2->PHP 3 convertor.
-   </simpara>
-   <warning>
-    <para>
-     Functions declared as <literal>old_function</literal> cannot be
-     called from PHP's internal code. Among other things, this means
-     you can't use them in functions such as
-     <function>usort</function>, <function>array_walk</function>, and
-     <function>register_shutdown_function</function>. You can get
-     around this limitation by writing a wrapper function (in normal
-     PHP 3 form) to call the <literal>old_function</literal>.
-    </para>
-   </warning>
-
-  </sect1>
-
   <sect1 id="functions.variable-functions">
    <title>Variable functions</title>