--- a/Explainer.st	Tue Jun 03 17:18:48 2014 +0200
+++ b/Explainer.st	Tue Jun 03 19:03:23 2014 +0200
@@ -1338,8 +1338,8 @@
         ^ '<variable> := <expression>
 
 ":=" and "_" (which is left-arrow in some fonts) mean assignment.
-The variable is bound to (i.e. points to) the value of <expression>.'
-The "_" form is historic and should not be used with new code.
+The variable is bound to (i.e. points to) the value of <expression>.
+The "_" form is historic and should not be used with new code.'
     ].
 
     (string = '^') ifTrue:[
@@ -1511,18 +1511,33 @@
 '
     ].
 
-    (string withoutSeparators startsWith:'"/') ifTrue:[
-        shortText ifTrue:[
-            ^ 'an end-of-line comment'.
-        ].
-        ^ '"/ comment
+    (string withoutSeparators startsWith:'"') ifTrue:[
+        (string withoutSeparators startsWith:'"/') ifTrue:[
+            shortText ifTrue:[
+                ^ 'an end-of-line comment'.
+            ].
+            ^ '"/ comment
 EOL (end-of-line) comment
 
 anything up to the end of line is a comment and ignored (but not inside a string).
 Notice that EOL-comments are only supported by Smalltalk/X (i.e. non-portable).
 '
-    ].
-    (string withoutSeparators startsWith:'"') ifTrue:[
+        ].
+        (string withoutSeparators startsWith:'"<<') ifTrue:[
+            shortText ifTrue:[
+                ^ 'a token delimited comment'.
+            ].
+            ^ '"<<TOKEN
+...
+TOKEN
+
+Token delimited comment
+
+anything up to a line which contains the token alone is a comment and ignored (but not inside a string).
+Notice that Token-comments are only supported by Smalltalk/X (i.e. non-portable).
+'
+        ].
+
         shortText ifTrue:[
             ^ 'a comment'.
         ].
@@ -1585,10 +1600,10 @@
 !Explainer class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.133 2014-03-12 13:42:02 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.134 2014-06-03 17:03:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.133 2014-03-12 13:42:02 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.134 2014-06-03 17:03:23 cg Exp $'
 ! !