: Fixed a number of issues that Shane McCarron had with the HTML5+RDFa text.

: Fixed a number of issues that Shane McCarron had with the HTML5+RDFa
text.

http://dev.w3.org/cvsweb/html5/rdfa/Overview.html?r1=1.2&r2=1.3&f=h

===================================================================
RCS file: /sources/public/html5/rdfa/source,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- source 12 Jul 2009 20:19:05 -0000 1.2
+++ source 12 Jul 2009 22:37:42 -0000 1.3
@@ -43,26 +43,25 @@
   <p>
    Starting in 2006, the Semantic Web Deployment Work Group
    began work to develop a technology to express semantic data in 
-   XHTML 1.1. This technology was successfully developed and is now
+   XHTML. This technology was successfully developed and is now
    called RDFa (The Resource Description Framework in Attributes). 
    While HTML provides a mechanism to express the structure of a document
    (title, paragraphs, links), RDFa provides a mechanism to express 
    the meaning of a document (people, places, events).
   <p>
   <p>
-   The document, titled "RDFa in XHTML: Syntax and Processing Rules" 
+   The document, titled "RDF in XHTML: Syntax and Processing" 
    [<a href="http://www.w3.org/TR/rdfa-syntax/">XHTML+RDFa</a>], defined
    a set of attributes and rules for processing those attributes that
    resulted in the output of machine-readable semantic data. While the
-   document was specific to the XHTML 1.1 member in the HTML family, the
-   attributes and rules were always intended to operate across any 
-   tree-based structure containing attributes on tree nodes (such as HTML4, 
-   SVG and ODF).
+   document applied to XHTML, the attributes and rules were always 
+   intended to operate across any tree-based structure containing attributes 
+   on tree nodes (such as HTML4, SVG and ODF).
   </p>
   <p>
-   While RDFa was initially specified for use in XHTML 1.1, adoption by
+   While RDFa was initially specified for use in XHTML, adoption by
    a number of large organizations on the Web spurred RDFa's use in non-XHTML
-   languages. Its use in HTML4 and HTML5, before an official specification 
+   languages. Its use in HTML4, before an official specification 
    was developed for those languages, caused concern regarding document
    conformance.
   </p>
@@ -345,7 +344,84 @@
    If a prefix mapping is not found for text that is given to the CURIE 
    processing algorithm, and the text is an Internationalized Resource 
    Identifier as defined in 
-   [<a href="http://www.ietf.org/rfc/rfc3987">IRI</a>], then the expanded
-   value of the potential CURIE should be the IRI.
-   </pre>
+   [<a href="http://www.ietf.org/rfc/rfc3987">IRI</a>], and the scheme is
+   one of the allowable scheme values in the section below, then the expanded 
+   value of the potential CURIE should be the IRI. 
+  </p>
+  <h5>Allowable CURIE Scheme values</h5>
+  <p>
+   <em>This section is informative.</em>
+  </p>
+  <p>
+   Each of these listed values is a 
+   [<a href="http://www.iana.org/assignments/uri-schemes.html">registered IANA Scheme</a>] 
+   with a corresponding RFC:
+  </p>
+  <p>
+aaa
+aaas
+acap
+cap
+cid
+crid
+data
+dav
+dict
+dns
+fax
+file
+ftp
+go
+gopher
+h323
+http
+https
+iax
+icap
+im
+imap
+info
+ipp
+iris
+iris.beep
+iris.xpc
+iris.xpcs
+iris.lwz
+ldap
+mailto
+mid
+modem
+msrp
+msrps
+mtqp
+mupdate
+news
+nfs
+nntp
+opaquelocktoken
+pop
+pres
+rtsp
+service
+shttp
+sieve
+sip
+sips
+snmp
+soap.beep
+soap.beeps
+tag
+tel
+telnet
+tftp
+thismessage
+tip
+tv
+urn
+vemmi
+xmlrpc.beep
+xmlrpc.beeps
+xmpp
+z39.50r
+z39.50s
   </p>

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/rdfa/Overview.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Overview.html 12 Jul 2009 20:19:04 -0000 1.2
+++ Overview.html 12 Jul 2009 22:37:42 -0000 1.3
@@ -1091,7 +1091,9 @@
      <li><a href=#invalid-xmlliteral-values><span class=secno>5.5.2 </span>Invalid XMLLiteral values</a></li>
      <li><a href=#the-xmlns:-attribute><span class=secno>5.5.3 </span>The <code>xmlns:</code> attribute</a></li>
      <li><a href=#the-token-attribute><span class=secno>5.5.4 </span>The <code>token</code> attribute</a></li>
-     <li><a href=#use-of-uris-in-curie-only-attribute-values><span class=secno>5.5.5 </span>Use of URIs in CURIE-only attribute values</a></li></ol></li></ol></li>
+     <li><a href=#use-of-uris-in-curie-only-attribute-values><span class=secno>5.5.5 </span>Use of URIs in CURIE-only attribute values</a>
+      <ol class=toc>
+       <li><a href=#allowable-curie-scheme-values><span class=secno>5.5.5.1 </span>Allowable CURIE Scheme values</a></li></ol></li></ol></li></ol></li>
  <li><a href=#microdata><span class=secno>6 </span>Microdata</a>
   <ol class=toc>
    <li><a href=#introduction-3><span class=secno>6.1 </span>Introduction</a>
@@ -86285,26 +86287,25 @@
   <p>
    Starting in 2006, the Semantic Web Deployment Work Group
    began work to develop a technology to express semantic data in 
-   XHTML 1.1. This technology was successfully developed and is now
+   XHTML. This technology was successfully developed and is now
    called RDFa (The Resource Description Framework in Attributes). 
    While HTML provides a mechanism to express the structure of a document
    (title, paragraphs, links), RDFa provides a mechanism to express 
    the meaning of a document (people, places, events).
   </p><p>
   </p><p>
-   The document, titled "RDFa in XHTML: Syntax and Processing Rules" 
+   The document, titled "RDF in XHTML: Syntax and Processing" 
    [<a href=http://www.w3.org/TR/rdfa-syntax/>XHTML+RDFa</a>], defined
    a set of attributes and rules for processing those attributes that
    resulted in the output of machine-readable semantic data. While the
-   document was specific to the XHTML 1.1 member in the HTML family, the
-   attributes and rules were always intended to operate across any 
-   tree-based structure containing attributes on tree nodes (such as HTML4, 
-   SVG and ODF).
+   document applied to XHTML, the attributes and rules were always 
+   intended to operate across any tree-based structure containing attributes 
+   on tree nodes (such as HTML4, SVG and ODF).
   </p>
   <p>
-   While RDFa was initially specified for use in XHTML 1.1, adoption by
+   While RDFa was initially specified for use in XHTML, adoption by
    a number of large organizations on the Web spurred RDFa's use in non-XHTML
-   languages. Its use in HTML4 and HTML5, before an official specification 
+   languages. Its use in HTML4, before an official specification 
    was developed for those languages, caused concern regarding document
    conformance.
   </p>
@@ -86581,9 +86582,86 @@
    If a prefix mapping is not found for text that is given to the CURIE 
    processing algorithm, and the text is an Internationalized Resource 
    Identifier as defined in 
-   [<a href=http://www.ietf.org/rfc/rfc3987>IRI</a>], then the expanded
-   value of the potential CURIE should be the IRI.
-   
+   [<a href=http://www.ietf.org/rfc/rfc3987>IRI</a>], and the scheme is
+   one of the allowable scheme values in the section below, then the expanded 
+   value of the potential CURIE should be the IRI. 
+  </p>
+  <h5 id=allowable-curie-scheme-values><span class=secno>5.5.5.1 </span>Allowable CURIE Scheme values</h5>
+  <p>
+   <em>This section is informative.</em>
+  </p>
+  <p>
+   Each of these listed values is a 
+   [<a href=http://www.iana.org/assignments/uri-schemes.html>registered IANA Scheme</a>] 
+   with a corresponding RFC:
+  </p>
+  <p>
+aaa
+aaas
+acap
+cap
+cid
+crid
+data
+dav
+dict
+dns
+fax
+file
+ftp
+go
+gopher
+h323
+http
+https
+iax
+icap
+im
+imap
+info
+ipp
+iris
+iris.beep
+iris.xpc
+iris.xpcs
+iris.lwz
+ldap
+mailto
+mid
+modem
+msrp
+msrps
+mtqp
+mupdate
+news
+nfs
+nntp
+opaquelocktoken
+pop
+pres
+rtsp
+service
+shttp
+sieve
+sip
+sips
+snmp
+soap.beep
+soap.beeps
+tag
+tel
+telnet
+tftp
+thismessage
+tip
+tv
+urn
+vemmi
+xmlrpc.beep
+xmlrpc.beeps
+xmpp
+z39.50r
+z39.50s
   </p>
 
   <h2 id=microdata><span class=secno>6 </span><dfn>Microdata</dfn></h2>

Index: rdfa-module.html
===================================================================
RCS file: /sources/public/html5/rdfa/rdfa-module.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rdfa-module.html 12 Jul 2009 20:19:05 -0000 1.4
+++ rdfa-module.html 12 Jul 2009 22:37:42 -0000 1.5
@@ -245,11 +245,11 @@
    Abstract
   </h2>
   <p>
-   This specification defines rules and guidelines for adapting the RDF 
-   in XHTML 1.1 specification (RDFa) for use in the HTML5 and XHTML5 members
-   of the HTML family. The rules defined in this document not only apply
-   to HTML5 documents, but also to HTML4 documents interpreted through the 
-   HTML5 parsing rules.
+   This specification defines rules and guidelines for adapting the 
+   RDF in XHTML: Syntax and Processing (RDFa) specification for use in the 
+   HTML5 and XHTML5 members of the HTML family. The rules defined in this 
+   document not only apply to HTML5 documents, but also to HTML4 documents 
+   interpreted through the HTML5 parsing rules.
   </p>
   <h2 class="no-num no-toc" id=status-of-this-document>
    Status of this document
@@ -359,26 +359,25 @@
   <p>
    Starting in 2006, the Semantic Web Deployment Work Group
    began work to develop a technology to express semantic data in 
-   XHTML 1.1. This technology was successfully developed and is now
+   XHTML. This technology was successfully developed and is now
    called RDFa (The Resource Description Framework in Attributes). 
    While HTML provides a mechanism to express the structure of a document
    (title, paragraphs, links), RDFa provides a mechanism to express 
    the meaning of a document (people, places, events).
   </p><p>
   </p><p>
-   The document, titled "RDFa in XHTML: Syntax and Processing Rules" 
+   The document, titled "RDF in XHTML: Syntax and Processing" 
    [<a href=http://www.w3.org/TR/rdfa-syntax/>XHTML+RDFa</a>], defined
    a set of attributes and rules for processing those attributes that
    resulted in the output of machine-readable semantic data. While the
-   document was specific to the XHTML 1.1 member in the HTML family, the
-   attributes and rules were always intended to operate across any 
-   tree-based structure containing attributes on tree nodes (such as HTML4, 
-   SVG and ODF).
+   document applied to XHTML, the attributes and rules were always 
+   intended to operate across any tree-based structure containing attributes 
+   on tree nodes (such as HTML4, SVG and ODF).
   </p>
   <p>
-   While RDFa was initially specified for use in XHTML 1.1, adoption by
+   While RDFa was initially specified for use in XHTML, adoption by
    a number of large organizations on the Web spurred RDFa's use in non-XHTML
-   languages. Its use in HTML4 and HTML5, before an official specification 
+   languages. Its use in HTML4, before an official specification 
    was developed for those languages, caused concern regarding document
    conformance.
   </p>
@@ -655,8 +654,85 @@
    If a prefix mapping is not found for text that is given to the CURIE 
    processing algorithm, and the text is an Internationalized Resource 
    Identifier as defined in 
-   [<a href=http://www.ietf.org/rfc/rfc3987>IRI</a>], then the expanded
-   value of the potential CURIE should be the IRI.
-   
+   [<a href=http://www.ietf.org/rfc/rfc3987>IRI</a>], and the scheme is
+   one of the allowable scheme values in the section below, then the expanded 
+   value of the potential CURIE should be the IRI. 
+  </p>
+  <h5 id=allowable-curie-scheme-values><span class=secno>1.5.5.1 </span>Allowable CURIE Scheme values</h5>
+  <p>
+   <em>This section is informative.</em>
+  </p>
+  <p>
+   Each of these listed values is a 
+   [<a href=http://www.iana.org/assignments/uri-schemes.html>registered IANA Scheme</a>] 
+   with a corresponding RFC:
+  </p>
+  <p>
+aaa
+aaas
+acap
+cap
+cid
+crid
+data
+dav
+dict
+dns
+fax
+file
+ftp
+go
+gopher
+h323
+http
+https
+iax
+icap
+im
+imap
+info
+ipp
+iris
+iris.beep
+iris.xpc
+iris.xpcs
+iris.lwz
+ldap
+mailto
+mid
+modem
+msrp
+msrps
+mtqp
+mupdate
+news
+nfs
+nntp
+opaquelocktoken
+pop
+pres
+rtsp
+service
+shttp
+sieve
+sip
+sips
+snmp
+soap.beep
+soap.beeps
+tag
+tel
+telnet
+tftp
+thismessage
+tip
+tv
+urn
+vemmi
+xmlrpc.beep
+xmlrpc.beeps
+xmpp
+z39.50r
+z39.50s
   </p>
 </body></html>
\ No newline at end of file

Received on Sunday, 12 July 2009 22:38:58 UTC