W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2010

html5/rdfa/DTD html401-rdfa11-1.dtd,1.2,1.3

From: Manu Sporny via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 05 Jul 2010 14:10:06 +0000
To: public-html-commits@w3.org
Message-Id: <E1OVmN4-0000qp-Cd@lionel-hutz.w3.org>
Update of /sources/public/html5/rdfa/DTD
In directory hutz:/tmp/cvs-serv3230

Modified Files:
	html401-rdfa11-1.dtd 
Log Message:
Updated w/ Shane's fixes to HTML4.01+RDFa1.1 DTD.


Index: html401-rdfa11-1.dtd
===================================================================
RCS file: /sources/public/html5/rdfa/DTD/html401-rdfa11-1.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- html401-rdfa11-1.dtd	5 May 2010 03:47:16 -0000	1.2
+++ html401-rdfa11-1.dtd	5 Jul 2010 14:10:04 -0000	1.3
@@ -1,9 +1,9 @@
 <!--
     This is the HTML 4.01 + RDFa 1.1 DTD, which includes
     presentation attributes and elements that W3C expects to phase out
-    as support for style sheets matures. This DTD should be considered as
-    a Transitional doctype with respect to content, but as a Strict doctype with
-    respect to rendering mode.
+    as support for style sheets matures. Authors should use the Strict
+    DTD when possible, but may use the Transitional DTD when support
+    for presentation attribute and elements is required.
 
     HTML 4 includes mechanisms for style sheets, scripting,
     embedding objects, improved support for right to left and mixed
@@ -21,16 +21,16 @@
               Arnaud Le Hors <lehors@w3.org>
               Ian Jacobs <ij@w3.org>
 
-    Further information about RDFa is available at:
-        http://www.w3.org/TR/rdfa-core
+    Further information about RDFa in HTML is available at:
+        http://www.w3.org/TR/rdfa-in-html
 
     Further information about HTML 4.01 is available at:
 
         http://www.w3.org/TR/1999/REC-html401-19991224
 
-    Further information about HTML+RDFa is available at:
+    And further information about RDFa is available at:
 
-        http://www.w3.org/TR/rdfa-in-html
+        http://www.w3.org/TR/rdfa-core
 
     The HTML 4.01 specification includes additional
     syntactic constraints that cannot be expressed within
@@ -164,7 +164,7 @@
  "id          ID             #IMPLIED  -- document-wide unique id --
   class       CDATA          #IMPLIED  -- space-separated list of classes --
   style       %StyleSheet;   #IMPLIED  -- associated style info --
-  title       %Text;         #IMPLIED  -- advisory title --
+  title       %Text;         #IMPLIED  -- advisory title --"
   >
 
 <!ENTITY % i18n
@@ -185,24 +185,29 @@
   onkeyup     %Script;       #IMPLIED  -- a key was released --"
   >
 
-<!ENTITY % TERMorURIorCURIE "CDATA" >
-<!ENTITY % TERMorURIorCURIEs "CDATA" >
-<!ENTITY % URIorCURIE "CDATA" >
+<!ENTITY % CURIE "CDATA" >
+<!ENTITY % CURIEs "CDATA" >
+<!ENTITY % CURIEorURI "CDATA" >
+<!ENTITY % CURIEorURIs "CDATA" >
+<!ENTITY % SafeCURIEorCURIEorURI "CDATA" >
+<!ENTITY % SafeCURIEorCURIEorURIs "CDATA" >
+<!ENTITY % TERMorCURIEorAbsURI "CDATA" >
+<!ENTITY % TERMorCURIEorAbsURIs "CDATA" >
 <!ENTITY % URIs "CDATA" >
 
 <!ENTITY % metainformation
- "about    %URIorCURIE;        #IMPLIED -- RDFa - specifies subject --
-  content  CDATA               #IMPLIED -- RDFa - specifies object override --
-  datatype %TERMorURIorCURIE;  #IMPLIED -- RDFa - specifies object datatype --
-  typeof   %TERMorURIorCURIEs; #IMPLIED -- RDFa - bnode or rdf:type triple --
-  prefix   CDATA               #IMPLIED -- RDFa - specifies prefix mappings --
-  profile  %URIs;              #IMPLIED -- RDFa - specifies term document --
-  property %TERMorURIorCURIEs; #IMPLIED -- RDFa - specifies predicate --
-  rel      %TERMorURIorCURIEs; #IMPLIED -- relationship for linked resource --
-  rev      %TERMorURIorCURIEs; #IMPLIED -- reverse relationship for linked resource --
-  href     %URI;               #IMPLIED -- URI for linked resource --
-  resource %URIorCURIE;        #IMPLIED -- RDFa - like href, but overrides it --
-  vocab    %URI;               #IMPLIED -- RDFa - specifies default vocabulary"
+ "about       %SafeCURIEorCURIEorURI;   #IMPLIED
+  content     CDATA                     #IMPLIED
+  datatype    %TERMorCURIEorAbsURI;     #IMPLIED
+  typeof      %TERMorCURIEorAbsURIs;    #IMPLIED
+  prefix      CDATA                     #IMPLIED
+  profile     %URIs;                    #IMPLIED
+  property    %TERMorCURIEorAbsURIs;    #IMPLIED
+  href        %URI;                     #IMPLIED
+  rel         %TERMorCURIEorAbsURIs;    #IMPLIED
+  rev         %TERMorCURIEorAbsURIs;    #IMPLIED
+  resource    %SafeCURIEorCURIEorURI;   #IMPLIED
+  vocab       %URI;                     #IMPLIED"
   >
 
 <!-- Reserved Feature Switch -->
Received on Monday, 5 July 2010 14:10:09 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 5 July 2010 14:10:09 GMT