--- test/html.dtd	1995/06/15 20:17:03	1.27
+++ test/html.dtd	1995/08/04 17:50:22	1.29
@@ -3,7 +3,7 @@
         Document Type Definition for the HyperText Markup Language
 		 (HTML DTD)
 
-	$Id: html.dtd,v 1.27 1995/06/15 20:17:03 connolly Exp $
+	$Id: html.dtd,v 1.29 1995/08/04 17:50:22 connolly Exp $
 
 	Author: Daniel W. Connolly <connolly@w3.org>
 	See Also: html.decl, html-1.dtd
@@ -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">
@@ -182,6 +168,8 @@
 
 <!--========= Link Markup ======================-->
 
+<!ENTITY % linkType "NAMES">
+
 <!ENTITY % linkExtraAttributes
         "REL %linkType #IMPLIED
         REV %linkType #IMPLIED
@@ -202,7 +190,7 @@
 
 <!ELEMENT A     - - %A.content -(A)>
 <!ATTLIST A
-        HREF %URI #IMPLIED
+        HREF CDATA #IMPLIED
         NAME CDATA #IMPLIED
         %linkExtraAttributes;
         %SDAPREF; "<Anchor: #AttList>"
@@ -221,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
@@ -445,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>"
@@ -465,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
@@ -549,7 +537,7 @@
 
 <!ELEMENT LINK - O EMPTY>
 <!ATTLIST LINK
-        HREF %URI #REQUIRED
+        HREF CDATA #REQUIRED
         %linkExtraAttributes;
         %SDAPREF; "Linked to : #AttVal (TITLE) (URN) (HREF)>"    >
 
@@ -570,7 +558,7 @@
 
 <!ELEMENT BASE - O EMPTY>
 <!ATTLIST BASE
-        HREF %URI; #REQUIRED     >
+        HREF CDATA #REQUIRED     >
 
 <!-- <BASE>             Base context document                   -->
 <!-- <BASE HREF="...">  Address for this document               -->