diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index 14545230d8..8b9f75cd48 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
 
 <appendix id="tokens">
  <title>List of Parser Tokens</title>
@@ -99,7 +99,10 @@
     <row>
      <entry>T_CLONE</entry>
      <entry>clone</entry>
-     <entry><link linkend="language.oop5">classes and objects</link>. PHP 5 only.</entry>
+     <entry>
+      <link linkend="language.oop5">classes and objects</link>
+      (available since PHP 5.0.0)
+     </entry>
     </row>
     <row>
      <entry>T_CLOSE_TAG</entry>
@@ -108,7 +111,7 @@
     </row>
     <row>
      <entry>T_COMMENT</entry>
-     <entry>// or #, and /* */ on PHP 5</entry>
+     <entry>// or #, and /* */ in PHP 5</entry>
      <entry><link linkend="language.basic-syntax.comments">comments</link></entry>
     </row>
     <row>
@@ -168,7 +171,10 @@
     <row>
      <entry>T_DOC_COMMENT</entry>
      <entry>/** */</entry>
-     <entry><link linkend="language.basic-syntax.comments">PHPDoc style comments</link> (PHP 5 only)</entry>
+     <entry>
+      <link linkend="language.basic-syntax.comments">PHPDoc style comments</link>
+      (available since PHP 5.0.0)
+     </entry>
     </row>
     <row>
      <entry>T_DO</entry>
@@ -349,7 +355,10 @@
     <row>
      <entry>T_INSTANCEOF</entry>
      <entry>instanceof</entry>
-     <entry><link linkend="language.operators.type">type operators</link> (PHP5 only)</entry>
+     <entry>
+      <link linkend="language.operators.type">type operators</link>
+      (available since PHP 5.0.0)
+     </entry>
     </row>
     <row>
      <entry>T_INT_CAST</entry>
@@ -513,27 +522,36 @@
     <row>
      <entry>T_PRIVATE</entry>
      <entry>private</entry>
-     <entry><link linkend="language.oop5">classes and objects</link>. PHP 5 only.</entry>
+     <entry>
+      <link linkend="language.oop5">classes and objects</link>
+      (available since PHP 5.0.0)
+     </entry>
     </row>
     <row>
      <entry>T_PUBLIC</entry>
      <entry>public</entry>
-     <entry><link linkend="language.oop5">classes and objects</link>. PHP 5 only.</entry>
+     <entry>
+      <link linkend="language.oop5">classes and objects</link>
+      (available since PHP 5.0.0)
+     </entry>
     </row>
     <row>
      <entry>T_PROTECTED</entry>
      <entry>protected</entry>
-     <entry><link linkend="language.oop5">classes and objects</link>. PHP 5 only.</entry>
+     <entry>
+      <link linkend="language.oop5">classes and objects</link>
+      (available since PHP 5.0.0)
+     </entry>
     </row>
     <row>
      <entry>T_REQUIRE</entry>
      <entry>require()</entry>
-     <entry><function>require</function></entry>
+     <entry><function linkend="function.require">require</function></entry>
     </row>
     <row>
      <entry>T_REQUIRE_ONCE</entry>
      <entry>require_once()</entry>
-     <entry><function>require_once</function></entry>
+     <entry><function linkend="function.require_once">require_once</function></entry>
     </row>
     <row>
      <entry>T_RETURN</entry>
@@ -650,14 +668,18 @@
     <row>
      <entry>T_FUNC_C</entry>
      <entry>__FUNCTION__</entry>
-     <entry><link linkend="language.constants">constants</link>, since
-     PHP 4.3.0</entry>
+     <entry>
+      <link linkend="language.constants">constants</link>
+      (available since PHP 4.3.0)
+     </entry>
     </row>
     <row>
      <entry>T_CLASS_C</entry>
      <entry>__CLASS__</entry>
-     <entry><link linkend="language.constants">constants</link>, since
-     PHP 4.3.0</entry>
+     <entry>
+      <link linkend="language.constants">constants</link>
+      (available since PHP 4.3.0)
+     </entry>
     </row>
    </tbody> 
   </tgroup>