From 2411227ac0236f37d10cee606c15037d05053dee Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Sat, 31 Jul 2004 10:02:17 +0000
Subject: [PATCH] document PHP 5 changes on comments

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@164801 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/tokens.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index 4e6020907f..f4602e3d98 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 
 <appendix id="tokens">
  <title>List of Parser Tokens</title>
@@ -93,7 +93,7 @@
     </row>
     <row>
      <entry>T_COMMENT</entry>
-     <entry>// or #</entry>
+     <entry>// or #, and /* */ on PHP 5</entry>
      <entry><link linkend="language.basic-syntax.comments">comments</link></entry>
     </row>
     <row>
@@ -150,6 +150,11 @@
      <entry>0.12, etc</entry>
      <entry><link linkend="language.types.float">floating point numbers</link></entry>
     </row>
+    <row>
+     <entry>T_DOC_COMMENT</entry>
+     <entry>/** */</entry>
+     <entry><link linkend="language.basic-syntax.comments">PHPDoc style comments</link></entry>
+    </row>
     <row>
      <entry>T_DO</entry>
      <entry>do</entry>
@@ -385,7 +390,8 @@
     <row>
      <entry>T_ML_COMMENT</entry>
      <entry>/* and */</entry>
-     <entry><link linkend="language.basic-syntax.comments">comments</link></entry>
+     <entry><link linkend="language.basic-syntax.comments">comments</link>
+      (PHP 4 only)</entry>
     </row>
     <row>
      <entry>T_MOD_EQUAL</entry>