--- test/html.dtd	1995/06/02 08:00:02	1.26
+++ test/html.dtd	1995/09/21 23:30:19	1.30
@@ -3,7 +3,7 @@
         Document Type Definition for the HyperText Markup Language
 		 (HTML DTD)
 
-	$Id: html.dtd,v 1.26 1995/06/02 08:00:02 connolly Exp $
+	$Id: html.dtd,v 1.30 1995/09/21 23:30:19 connolly Exp $
 
 	Author: Daniel W. Connolly <connolly@w3.org>
 	See Also: html.decl, html-1.dtd
@@ -41,7 +41,7 @@
 <!ENTITY % HTML.Deprecated "INCLUDE"
 	-- Certain features of the language are necessary for
 	   compatibility with earlier versions of the specification,
-	   but they tend to be used an implemented inconsistently,
+	   but they tend to be used and implemented inconsistently,
 	   and their use is deprecated. This feature test entity
 	   enables a document type definition that eliminates
 	   these features.
@@ -70,20 +70,6 @@
         -- as per HTTP specification, in progress
         -->
 
-<!ENTITY % URI "CDATA"
-        -- The term URI means a CDATA attribute
-           whose value is a Uniform Resource Identifier,
-           as defined by 
-	"Universal Resource Identifiers" by Tim Berners-Lee
-	aka RFC 1630
-
-	Note that CDATA attributes are limited by the LITLEN
-	capacity (1024 in the current version of html.decl),
-	so that URIs in HTML have a bounded length.
-
-        -->
-
-
 <!--========= DTD "Macros" =====================-->
 
 <!ENTITY % heading "H1|H2|H3|H4|H5|H6">
@@ -159,11 +145,11 @@
 <!-- <I>        Italic text                             -->
 
 <!-- <EM>       Emphasized phrase                       -->
-<!-- <STRONG>   Strong emphais                          -->
+<!-- <STRONG>   Strong emphasis                         -->
 <!-- <CODE>     Source code phrase                      -->
 <!-- <SAMP>     Sample text or characters               -->
 <!-- <KBD>      Keyboard phrase, e.g. user input        -->
-<!-- <VAR>      Variable phrase or substituable         -->
+<!-- <VAR>      Variable phrase or substitutable        -->
 <!-- <CITE>     Name or title of cited work             -->
 
 <!ENTITY % pre.content "#PCDATA | A | HR | BR | %font | %phrase">
@@ -182,14 +168,7 @@
 
 <!--========= Link Markup ======================-->
 
-<![ %HTML.Recommended [
-        <!ENTITY % linkName "ID">
-]]>
-
-<!ENTITY % linkName "CDATA">
-
-<!ENTITY % linkType "NAME"
-        -- a list of these will be specified at a later date -->
+<!ENTITY % linkType "NAMES">
 
 <!ENTITY % linkExtraAttributes
         "REL %linkType #IMPLIED
@@ -211,8 +190,8 @@
 
 <!ELEMENT A     - - %A.content -(A)>
 <!ATTLIST A
-        HREF %URI #IMPLIED
-        NAME %linkName #IMPLIED
+        HREF CDATA #IMPLIED
+        NAME CDATA #IMPLIED
         %linkExtraAttributes;
         %SDAPREF; "<Anchor: #AttList>"
         >
@@ -230,7 +209,7 @@
 
 <!ELEMENT IMG    - O EMPTY>
 <!ATTLIST IMG
-        SRC %URI;  #REQUIRED
+        SRC CDATA  #REQUIRED
         ALT CDATA #IMPLIED
         ALIGN (top|middle|bottom) #IMPLIED
         ISMAP (ISMAP) #IMPLIED
@@ -454,7 +433,7 @@
 
 <!ELEMENT FORM - - %body.content -(FORM) +(INPUT|SELECT|TEXTAREA)>
 <!ATTLIST FORM
-        ACTION %URI #IMPLIED
+        ACTION CDATA #IMPLIED
         METHOD (%HTTP-Method) GET
         ENCTYPE %Content-Type; "application/x-www-form-urlencoded"
         %SDAPREF; "<Para>Form:</Para>"
@@ -474,7 +453,7 @@
 	TYPE %InputType TEXT
 	NAME CDATA #IMPLIED
 	VALUE CDATA #IMPLIED
-	SRC %URI #IMPLIED
+	SRC CDATA #IMPLIED
 	CHECKED (CHECKED) #IMPLIED
 	SIZE CDATA #IMPLIED
 	MAXLENGTH NUMBER #IMPLIED
@@ -540,19 +519,17 @@
 <!--======= Document Head ======================-->
 
 <![ %HTML.Recommended [
-	<!ENTITY % head.extra "META* & LINK*">
+	<!ENTITY % head.extra "">
 ]]>
+<!ENTITY % head.extra "& NEXTID?">
 
-<!ENTITY % head.extra "NEXTID? & META* & LINK*">
-
-<!ENTITY % head.content "TITLE & ISINDEX? & BASE? &
-			 (%head.extra)">
+<!ENTITY % head.content "TITLE & ISINDEX? & BASE? %head.extra">
 
-<!ELEMENT HEAD O O  (%head.content)>
+<!ELEMENT HEAD O O  (%head.content) +(META|LINK)>
 
 <!-- <HEAD>     Document head   -->
 
-<!ELEMENT TITLE - -  (#PCDATA)*>
+<!ELEMENT TITLE - -  (#PCDATA)*  -(META|LINK)>
 <!ATTLIST TITLE
         %SDAFORM; "Ti"    >
 
@@ -560,7 +537,7 @@
 
 <!ELEMENT LINK - O EMPTY>
 <!ATTLIST LINK
-        HREF %URI #REQUIRED
+        HREF CDATA #REQUIRED
         %linkExtraAttributes;
         %SDAPREF; "Linked to : #AttVal (TITLE) (URN) (HREF)>"    >
 
@@ -581,14 +558,14 @@
 
 <!ELEMENT BASE - O EMPTY>
 <!ATTLIST BASE
-        HREF %URI; #REQUIRED     >
+        HREF CDATA #REQUIRED     >
 
 <!-- <BASE>             Base context document                   -->
 <!-- <BASE HREF="...">  Address for this document               -->
 
 <!ELEMENT NEXTID - O EMPTY>
 <!ATTLIST NEXTID
-        N %linkName #REQUIRED     >
+        N CDATA #REQUIRED     >
 
 <!-- <NEXTID>		Next ID to use for link name		-->
 <!-- <NEXTID N=...>	Next ID to use for link name		-->
@@ -599,9 +576,9 @@
         NAME        NAME    #IMPLIED
         CONTENT     CDATA   #REQUIRED    >
 
-<!-- <META>                     Generic Metainformation         -->
+<!-- <META>                     Generic Meta-information        -->
 <!-- <META HTTP-EQUIV=...>      HTTP response header name       -->
-<!-- <META NAME=...>      	Metainformation name            -->
+<!-- <META NAME=...>      	Meta-information name           -->
 <!-- <META CONTENT="...">       Associated information          -->
 
 <!--======= Document Structure =================-->
