--- test/html.dtd	1994/09/26 16:10:19	1.20
+++ test/html.dtd	1994/11/15 19:54:38	1.21
@@ -2,7 +2,7 @@
 
         Document Type Definition for the HyperText Markup Language (HTML DTD)
 
-	$Id: html.dtd,v 1.20 1994/09/26 16:10:19 connolly Exp $
+	$Id: html.dtd,v 1.21 1994/11/15 19:54:38 connolly Exp $
 
 	Author: Daniel W. Connolly <connolly@hal.com>
 	See Also: html.decl, html-0.dtd, html-1.dtd
@@ -30,7 +30,7 @@
 	   with widespread usage, but they may compromise the structural
 	   integrity of a document. This feature test entity enables
 	   a more prescriptive document type definition that eliminates
-	   the above features.
+	   those features.
 	-->
 
 <![ %HTML.Recommended [
@@ -45,17 +45,27 @@
 	   definition that eliminates these features.
 	-->
 
-<!ENTITY % HTML.Highlighting "INCLUDE">
-<!ENTITY % HTML.Forms "INCLUDE">
+<!ENTITY % HTML.Highlighting "INCLUDE"
+	-- Use this feature test entity to validate that a document
+	   uses no highlighting tags, which may be ignored on minimal
+	   implementations.
+	-->
+
+<!ENTITY % HTML.Forms "INCLUDE"
+	-- Use this feature test entity to validate that a document
+	   contains no forms, which may not be supported in minimal
+	   implementations
+	-->
 
 <!--================== Imported Names =====================================-->
 
 <!ENTITY % Content-Type "CDATA"
-	-- meaning a MIME content type, as per RFC1521
+	-- meaning an internet media type
+	   (aka MIME content type, as per RFC1521)
 	-->
 
 <!ENTITY % HTTP-Method "GET | POST"
-	-- as per HTTP specification
+	-- as per HTTP specification, in progress
 	-->
 
 <!ENTITY % URI "CDATA"
@@ -73,7 +83,7 @@
         -->
 
 
-<!-- DTD "macros" -->
+<!--================== DTD "Macros" =======================================-->
 
 <!ENTITY % heading "H1|H2|H3|H4|H5|H6">
 
@@ -102,15 +112,27 @@
 
 <!ENTITY % text "#PCDATA | A | IMG | BR | %phrase | %font">
 
-<!ENTITY % pre.content "#PCDATA | A | HR | BR | %font | %phrase">
-
 <!ELEMENT (%font;|%phrase) - - (%text)+>
+<!-- <TT>	Typewriter text				-->
+<!-- <B>	Bold text				-->
+<!-- <I>	Italic text				-->
+
+<!-- <EM>	Emphasized phrase			-->
+<!-- <STRONG>	Strong emphais				-->
+<!-- <CODE>	Source code phrase			-->
+<!-- <SAMP>	Sample text or characters		-->
+<!-- <KBD>	Keyboard phrase, e.g. user input	-->
+<!-- <VAR>	Variable phrase or substituable		-->
+<!-- <CITE>	Name or title of cited work		-->
+
+<!ENTITY % pre.content "#PCDATA | A | HR | BR | %font | %phrase">
 
 ]]>
 
 <!ENTITY % text "#PCDATA | A | IMG | BR">
 
 <!ELEMENT BR    - O EMPTY>
+<!-- <BR>	Line break	-->
 
 
 <!--================== Link Markup ========================================-->
@@ -125,14 +147,11 @@
 	-- a list of these will be specified at a later date -->
 
 <!ENTITY % linkExtraAttributes
-        "REL %linkType #IMPLIED -- forward relationship type --
-        REV %linkType #IMPLIED -- reversed relationship type
-                              to referent data --
-        URN CDATA #IMPLIED -- universal resource number --
-
-        TITLE CDATA #IMPLIED -- advisory only --
-        METHODS NAMES #IMPLIED -- supported public methods of the object:
-                                        TEXTSEARCH, GET, HEAD, ... --
+        "REL %linkType #IMPLIED
+        REV %linkType #IMPLIED
+        URN CDATA #IMPLIED
+        TITLE CDATA #IMPLIED
+        METHODS NAMES #IMPLIED
         ">
 
 <![ %HTML.Recommended [
@@ -146,43 +165,55 @@
 <!ENTITY % A.content   "(%heading|%text)+">
 
 <!ELEMENT A     - - %A.content -(A)>
-
 <!ATTLIST A
 	HREF %URI #IMPLIED
 	NAME %linkName #IMPLIED
         %linkExtraAttributes;
         >
+<!-- <A>		Anchor; source and/or destination of a link	-->
+<!-- <A NAME="...">	Name of this anchor				-->
+<!-- <A HREF="...">	Address of link destination			-->
+<!-- <A URN="...">	Permanent address of destination	 	-->
+<!-- <A REL=...>	Relationship of this anchor to destination	-->
+<!-- <A REV=...>	Relationship of destination to this anchor 	-->
+<!-- <A TITLE="...">	Title of destination (advisory)	 		-->
+<!-- <A METHODS="...">	Operations allowed on destination (advisory)	-->
 
-<!--=================== Images ============================================-->
 
-<!ENTITY % img.alt.default "#IMPLIED"
-	-- ALT attribute required in Level 0 docs -->
+<!--=================== Images ============================================-->
 
-<!ELEMENT IMG    - O EMPTY --  Embedded image -->
+<!ELEMENT IMG    - O EMPTY>
 <!ATTLIST IMG
-        SRC %URI;  #REQUIRED     -- URI of document to embed --
-	ALT CDATA %img.alt.default;
+        SRC %URI;  #REQUIRED
+	ALT CDATA #IMPLIED
 	ALIGN (top|middle|bottom) #IMPLIED
 	ISMAP (ISMAP) #IMPLIED
         >
 
+<!-- <IMG>		Image; icon, glyph or illustration	-->
+<!-- <IMG SRC="...">	Address of image object	 		-->
+<!-- <IMG ALT="...">	Textual alternative 			-->
+<!-- <IMG ALIGN=...>	Position relative to text 		-->
+<!-- <IMG ISMAP>	Each pixel can be a link		-->
 
 <!--=================== Paragraphs=========================================-->
 
 <!ELEMENT P     - O (%text)+>
+<!-- <P>	Paragraph	-->
 
 
 <!--=================== Headings, Titles, Sections ========================-->
 
-<!ELEMENT HR    - O EMPTY -- horizontal rule -->
+<!ELEMENT HR    - O EMPTY>
+<!-- <HR>	Horizontal rule -->
 
 <!ELEMENT ( %heading )  - -  (%text;)+>
-
-<!ELEMENT TITLE - -  (#PCDATA)
-          -- The TITLE element is not considered part of the flow of text.
-             It should be displayed, for example as the page header or
-             window title.
-          -->
+<!-- <H1>	Heading, level 1 -->
+<!-- <H2>	Heading, level 2 -->
+<!-- <H3>	Heading, level 3 -->
+<!-- <H4>	Heading, level 4 -->
+<!-- <H5>	Heading, level 5 -->
+<!-- <H6>	Heading, level 6 -->
 
 
 <!--=================== Text Flows ========================================-->
@@ -207,42 +238,62 @@
 
 <!ENTITY % pre.content "#PCDATA | A | HR | BR">
 <!ELEMENT PRE - - (%pre.content)+>
-
 <!ATTLIST PRE
         WIDTH NUMBER #implied
         >
 
+<!-- <PRE>		Preformatted text		-->
+<!-- <PRE WIDTH=...>	Maximum characters per line	-->
+
 <![ %HTML.Deprecated [
 
 <!ENTITY % literal "CDATA"
-	-- special non-conforming parsing mode where
+	-- historical, non-conforming parsing mode where
 	   the only markup signal is the end tag
 	   in full
 	-->
 
-<!ELEMENT XMP - -  %literal>
-<!ELEMENT LISTING - -  %literal>
+<!ELEMENT (XMP|LISTING) - -  %literal>
+<!-- <XMP>		Example section		-->
+<!-- <LISTING>		Computer listing	-->
+
 <!ELEMENT PLAINTEXT - O %literal>
+<!-- <PLAINTEXT>	Plain text passage	-->
 
 ]]>
 
 
 <!--=================== Lists =============================================-->
 
-<!ELEMENT DL    - -  (DT*, DD?)+>
+<!ELEMENT DL    - -  (DT | DD)+>
 <!ATTLIST DL
 	COMPACT (COMPACT) #IMPLIED>
 
 <!ELEMENT DT    - O (%text)+>
 <!ELEMENT DD    - O %flow>
 
+<!-- <DL>		Definition list, or glossary	-->
+<!-- <DL COMPACT>	Compact style list		-->
+<!-- <DT>		Term in definition list		-->
+<!-- <DD>		Definition of term		-->
+
 <!ELEMENT (OL|UL) - -  (LI)+>
 <!ELEMENT (DIR|MENU) - -  (LI)+ -(%block)>
 <!ATTLIST (%list)
 	COMPACT (COMPACT) #IMPLIED>
+<!-- <UL>		Unordered list			-->
+<!-- <UL COMPACT>	Compact list style		-->
+<!-- <OL>		Ordered, or numbered list	-->
+<!-- <OL COMPACT>	Compact list style		-->
+<!-- <DIR>		Directory list			-->
+<!-- <DIR COMPACT>	Compact list style		-->
+<!-- <MENU>		Menu list			-->
+<!-- <MENU COMPACT>	Compact list style		-->
 
 <!ELEMENT LI    - O %flow>
 
+<!-- <LI>		List item			-->
+
 <!--=================== Document Body =====================================-->
 
 <![ %HTML.Recommended [
@@ -258,14 +309,13 @@
 <!ENTITY % body.content "(%heading | %text | %block | HR | ADDRESS)*">
 
 <!ELEMENT BODY O O  %body.content>
+<!-- <BODY>	Document body	-->
 
 <!ELEMENT BLOCKQUOTE - - %body.content>
+<!-- <BLOCKQUOTE>	Quoted passage	-->
 
-<![ %HTML.Recommended [
-	<!ENTITY % address.content "(%text)*">
-]]>
-<!ENTITY % address.content "(%text|P)*">
-<!ELEMENT ADDRESS - - %address.content>
+<!ELEMENT ADDRESS - - (%text|P)*>
+<!-- <ADDRESS>	Address, signature, or byline for document or passage	-->
 
 
 <!--================ Forms ===============================================-->
@@ -274,27 +324,41 @@
 
 <!ELEMENT FORM - - %body.content -(FORM) +(INPUT|SELECT|TEXTAREA)>
 <!ATTLIST FORM
-	ACTION %URI #REQUIRED
+	ACTION %URI #IMPLIED
 	METHOD (%HTTP-Method) GET
 	ENCTYPE %Content-Type; "application/x-www-form-urlencoded"
 	>
 
+<!-- <FORM>			Fill-out or data-entry form	-->
+<!-- <FORM ACTION="...">	Address for completed form	-->
+<!-- <FORM METHOD=...>		Method of submitting form	-->
+<!-- <FORM ENCTYPE="...">	Representation of form data	-->
+
 <!ENTITY % InputType "(TEXT | PASSWORD | CHECKBOX |
 			RADIO | SUBMIT | RESET |
 			IMAGE | HIDDEN )">
 <!ELEMENT INPUT - O EMPTY>
 <!ATTLIST INPUT
 	TYPE %InputType TEXT
-	NAME CDATA #IMPLIED -- required for all but submit and reset --
+	NAME CDATA #IMPLIED
 	VALUE CDATA #IMPLIED
-	SRC %URI #IMPLIED -- for image inputs -- 
+	SRC %URI #IMPLIED
 	CHECKED (CHECKED) #IMPLIED
-	SIZE CDATA #IMPLIED -- like NUMBERS,
-				 but delimited with comma, not space --
+	SIZE CDATA #IMPLIED
 	MAXLENGTH NUMBER #IMPLIED
 	ALIGN (top|middle|bottom) #IMPLIED
 	>
 
+<!-- <INPUT>			Form input datum		-->
+<!-- <INPUT TYPE=...>		Type of input interaction	-->
+<!-- <INPUT TYPE=...>		Name of form datum		-->
+<!-- <INPUT VALUE="...">	Default/initial/selected value	-->
+<!-- <INPUT SRC="...">		Address of image		-->
+<!-- <INPUT CHECKED>		Initial state is "on"		-->
+<!-- <INPUT SIZE=...>		Field size hint			-->
+<!-- <INPUT MAXLENGTH=...>	Data length maximum		-->
+<!-- <INPUT ALIGN=...>		Image alignment			-->
+
 <!ELEMENT SELECT - - (OPTION+)>
 <!ATTLIST SELECT
 	NAME CDATA #REQUIRED
@@ -302,12 +366,21 @@
 	MULTIPLE (MULTIPLE) #IMPLIED
 	>
 
+<!-- <SELECT>			Selection of option(s)			-->
+<!-- <SELECT NAME=...>		Name of form datum			-->
+<!-- <SELECT SIZE=...>		Number of options displayed at a time	-->
+<!-- <SELECT MULTIPLE>		Multiple selections allowed		-->
+
 <!ELEMENT OPTION - O (#PCDATA)>
 <!ATTLIST OPTION
 	SELECTED (SELECTED) #IMPLIED
 	VALUE CDATA #IMPLIED
 	>
 
+<!-- <OPTION>			A selection option			-->
+<!-- <OPTION SELECTED>		Initial state				-->
+<!-- <OPTION VALUE>		Form datum value for this option	-->
+
 <!ELEMENT TEXTAREA - - (#PCDATA)>
 <!ATTLIST TEXTAREA
 	NAME CDATA #REQUIRED
@@ -315,6 +388,11 @@
 	COLS NUMBER #REQUIRED
 	>
 
+<!-- <TEXTAREA>			An area for text input			-->
+<!-- <TEXTAREA NAME=...>	Name of form datum			-->
+<!-- <TEXTAREA ROWS=...>	Height of area				-->
+<!-- <TEXTAREA COLS=...>	Width of area				-->
+
 ]]>
 
 
@@ -332,29 +410,48 @@
 			 %head.link">
 
 <!ELEMENT HEAD O O  (%head.content)>
+<!-- <HEAD>	Document head	-->
+
+<!ELEMENT TITLE - -  (#PCDATA)>
+<!-- <TITLE>	Title of document -->
 
 <!ELEMENT LINK - O EMPTY>
 <!ATTLIST LINK
 	HREF %URI #REQUIRED
         %linkExtraAttributes; >
+<!-- <LINK>		Link from this document				-->
+<!-- <LINK HREF="...">	Address of link destination			-->
+<!-- <LINK URN="...">	Lasting name of destination		 	-->
+<!-- <LINK REL=...>	Relationship of this document to destination	-->
+<!-- <LINK REV=...>	Relationship of destination to this document 	-->
+<!-- <LINK TITLE="...">	Title of destination (advisory)	 		-->
+<!-- <LINK METHODS="..."> Operations allowed on destination (advisory)	-->
 
 <!ELEMENT ISINDEX - O EMPTY>
+<!-- <ISINDEX>		Document is a searchable index		-->
 
 <!ELEMENT BASE - O EMPTY>
 <!ATTLIST BASE
         HREF %URI; #REQUIRED
         >
+<!-- <BASE>		Base context document			-->
+<!-- <BASE HREF="...">	Address for this document		-->
 
 <!ELEMENT NEXTID - O EMPTY>
 <!ATTLIST NEXTID N %linkName #REQUIRED>
+<!-- <NEXTID>		Next ID to use for link name			-->
+<!-- <NEXTID N=...>	Next ID to use for link name			-->
 
-<!ELEMENT META - O EMPTY    -- Generic Metainformation -->
+<!ELEMENT META - O EMPTY>
 <!ATTLIST META
-        HTTP-EQUIV  NAME    #IMPLIED  -- HTTP response header name  --
-        NAME        NAME    #IMPLIED  -- metainformation name       --
-        CONTENT     CDATA   #REQUIRED -- associated information     --
+        HTTP-EQUIV  NAME    #IMPLIED
+        NAME        NAME    #IMPLIED
+        CONTENT     CDATA   #REQUIRED
         >
-
+<!-- <META>			Generic Metainformation		-->
+<!-- <META HTTP-EQUIV=...>	HTTP response header name	-->
+<!-- <META HTTP-EQUIV=...>	Metainformation name		-->
+<!-- <META CONTENT="...">	Associated information		-->
 
 <!--================ Document Structure ===================================-->
 
@@ -367,7 +464,10 @@
 <!ENTITY % version.attr "VERSION CDATA #FIXED &#34;%HTML.Version;&#34;">
 
 <!ATTLIST HTML
-	%version.attr;-- report DTD version to application --
+	%version.attr;
 	>
 
+<!-- <HTML>			HyperText Markup Language Document	-->
+<!-- <HTML VERSION="...">	Version of HTML specification		-->
+