--- loncom/build/xfml.dtd	2002/01/29 10:41:41	1.1
+++ loncom/build/xfml.dtd	2002/04/14 20:45:09	1.3
@@ -54,24 +54,21 @@ http://www.lon-capa.org/
      not one or more than two...  okay.. this will be fixed soon -->
 
 <!ENTITY % xfml.Version
-        "-//TUX//DTD piml 1.0 Final//EN"
+        "-//TUX//DTD piml 1.0 Final//EN">
 
-        -- Typical usage:
+<!-- Typical usage:
 
             <!DOCTYPE xfml PUBLIC "-//TUX//DTD PIML 1.0 Final//EN">
             <xfml>
 
             </xfml>
-        --
-        >
+-->
 
-<!ELEMENT when:name (#PCDATA)>
-<!ELEMENT when:attribute (#PCDATA)>
-<!ELEMENT when:cdata (#PCDATA)>
-<!ELEMENT choice:include (#CDATA)>
-<!ELEMENT choice:exclude (#CDATA)>
+<!ELEMENT choice:include (#PCDATA)>
+<!ELEMENT choice:exclude (#PCDATA)>
 
-<!ELEMENT xfml (when:cdata|when:name|when:attribute)+>
+<!ELEMENT xfml (clause)+>
+<!ELEMENT clause (when:cdata|when:name|when:attribute|choice:exclude)+>
 <!ELEMENT when:name
  (when:cdata|when:name|when:attribute|choice:include|choice:exclude)+>
 <!ELEMENT when:attribute