html5/rdfa Overview-src.html,1.7,1.8 Overview.html,1.26,1.27

Update of /sources/public/html5/rdfa
In directory hutz:/tmp/cvs-serv27232

Modified Files:
	Overview-src.html Overview.html 
Log Message:
Updated Editor's draft to reflect latest WD publication.
Updated HTML4+RDFa DTD to match latest changes to HTML+RDFa 1.1 spec.


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/rdfa/Overview.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Overview.html	5 Jul 2010 14:32:17 -0000	1.26
+++ Overview.html	16 Oct 2010 19:19:23 -0000	1.27
@@ -1,13 +1,16 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
-<html lang="en" dir="ltr">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML+RDFa 1.0//EN' 'http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd'>
+<html dir="ltr" about="" property="dcterms:language" content="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:dcterms='http://purl.org/dc/terms/' xmlns:bibo='http://purl.org/ontology/bibo/' xmlns:foaf='http://xmlns.com/foaf/0.1/' xmlns:xsd='http://www.w3.org/2001/XMLSchema#'>
 <head>
     <title>HTML+RDFa 1.1</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <!-- 
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    
[...1259 lines suppressed...]
   
 
-<div id="references" class="appendix section"><!--OddPage--><h2><span class="secno">D. </span>References</h2><div id="normative-references" class="section"><h3><span class="secno">D.1 </span>Normative references</h3><dl class="bibliography"><dt id="bib-HTML5">[HTML5]</dt><dd>Ian Hickson; David Hyatt. <a href="http://www.w3.org/TR/2010/WD-html5-20100304/"><cite>HTML 5.</cite></a> 4 March 2010. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/2010/WD-html5-20100304/">http://www.w3.org/TR/2010/WD-html5-20100304/</a> 
-</dd><dt id="bib-RDFA-CORE">[RDFA-CORE]</dt><dd>Shane McCarron; et al. <a href="http://www.w3.org/TR/2010/WD-rdfa-core-20100422"><cite>RDFa Core 1.1: Syntax and processing rules for embedding RDF through attributes.</cite></a>22 April 2010. W3C Working Draft. URL: <a href="http://www.w3.org/TR/2010/WD-rdfa-core-20100422">http://www.w3.org/TR/2010/WD-rdfa-core-20100422</a> 
-</dd><dt id="bib-RFC2119">[RFC2119]</dt><dd>S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key words for use in RFCs to Indicate Requirement Levels.</cite></a> Internet RFC 2119. URL: <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a> 
-</dd><dt id="bib-RFC3236">[RFC3236]</dt><dd>P. Stark; M. Baker. <a href="http://www.rfc-editor.org/rfc/rfc3236.txt"><cite>The 'application/xhtml+xml' Media Type.</cite></a> January 2002. Internet RFC 3236. URL: <a href="http://www.rfc-editor.org/rfc/rfc3236.txt">http://www.rfc-editor.org/rfc/rfc3236.txt</a> 
-</dd><dt id="bib-XML-NAMES11">[XML-NAMES11]</dt><dd>Andrew Layman; et al. <a href="http://www.w3.org/TR/2006/REC-xml-names11-20060816"><cite>Namespaces in XML 1.1 (Second Edition).</cite></a> 16 August 2006. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2006/REC-xml-names11-20060816">http://www.w3.org/TR/2006/REC-xml-names11-20060816</a> 
-</dd></dl></div><div id="informative-references" class="section"><h3><span class="secno">D.2 </span>Informative references</h3><dl class="bibliography"><dt id="bib-RDFA-SYNTAX">[RDFA-SYNTAX]</dt><dd>Ben Adida, et al. <a href="http://www.w3.org/TR/2008/REC-rdfa-syntax-20081014"><cite>RDFa in XHTML: Syntax and Processing.</cite></a> 14 October 2008. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2008/REC-rdfa-syntax-20081014">http://www.w3.org/TR/2008/REC-rdfa-syntax-20081014</a> 
-</dd><dt id="bib-XHTML-RDFA">[XHTML-RDFA]</dt><dd>Shane McCarron; et. al. <a href="http://www.w3.org/TR/2010/WD-xhtml-rdfa-20100422"><cite>XHTML+RDFa 1.1.</cite></a> 22 April 2010. W3C Working Draft. URL: <a href="http://www.w3.org/TR/2010/WD-xhtml-rdfa-20100422">http://www.w3.org/TR/WD-xhtml-rdfa-20100422</a> 
-</dd><dt id="bib-XHTML-VOCAB">[XHTML-VOCAB]</dt><dd>XHTML 2 Working Group. <a href="http://www.w3.org/1999/xhtml/vocab"><cite>XHTML Vocabulary</cite></a>. URL: <a href="http://www.w3.org/1999/xhtml/vocab">http://www.w3.org/1999/xhtml/vocab</a> 
+<div id="references" class="appendix section" typeof="bibo:Chapter" about="#references">
+<!-- OddPage -->
+<h2><span class="secno">C. </span>References</h2><div id="normative-references" typeof="bibo:Chapter" about="#normative-references" class="section"><h3><span class="secno">C.1 </span>Normative references</h3><dl class="bibliography" about=""><dt id="bib-HTML5">[HTML5]</dt><dd rel="dcterms:requires">Ian Hickson; David Hyatt. <a href="http://www.w3.org/TR/2010/WD-html5-20100304/"><cite>HTML 5.</cite></a> 4 March 2010. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/2010/WD-html5-20100304/">http://www.w3.org/TR/2010/WD-html5-20100304/</a> 
+</dd><dt id="bib-RDFA-CORE">[RDFA-CORE]</dt><dd rel="dcterms:requires">Shane McCarron; et al. <a href="http://www.w3.org/TR/2010/WD-rdfa-core-20100803"><cite>RDFa Core 1.1: Syntax and processing rules for embedding RDF through attributes.</cite></a>3 August 2010. W3C Working Draft. URL: <a href="http://www.w3.org/TR/2010/WD-rdfa-core-20100803">http://www.w3.org/TR/2010/WD-rdfa-core-20100803</a> 
+</dd><dt id="bib-RFC2119">[RFC2119]</dt><dd rel="dcterms:requires">S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key words for use in RFCs to Indicate Requirement Levels.</cite></a> March 1997. Internet RFC 2119.  URL: <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a> 
+</dd><dt id="bib-RFC3236">[RFC3236]</dt><dd rel="dcterms:requires">P. Stark; M. Baker. <a href="http://www.rfc-editor.org/rfc/rfc3236.txt"><cite>The 'application/xhtml+xml' Media Type.</cite></a> January 2002. Internet RFC 3236. URL: <a href="http://www.rfc-editor.org/rfc/rfc3236.txt">http://www.rfc-editor.org/rfc/rfc3236.txt</a> 
+</dd><dt id="bib-XML-NAMES11">[XML-NAMES11]</dt><dd rel="dcterms:requires">Andrew Layman; et al. <a href="http://www.w3.org/TR/2006/REC-xml-names11-20060816"><cite>Namespaces in XML 1.1 (Second Edition).</cite></a> 16 August 2006. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2006/REC-xml-names11-20060816">http://www.w3.org/TR/2006/REC-xml-names11-20060816</a> 
+</dd></dl></div><div id="informative-references" typeof="bibo:Chapter" about="#informative-references" class="section"><h3><span class="secno">C.2 </span>Informative references</h3><dl class="bibliography" about=""><dt id="bib-RDFA-SYNTAX">[RDFA-SYNTAX]</dt><dd rel="dcterms:references">Ben Adida, et al. <a href="http://www.w3.org/TR/2008/REC-rdfa-syntax-20081014"><cite>RDFa in XHTML: Syntax and Processing.</cite></a> 14 October 2008. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2008/REC-rdfa-syntax-20081014">http://www.w3.org/TR/2008/REC-rdfa-syntax-20081014</a> 
+</dd><dt id="bib-XHTML-RDFA">[XHTML-RDFA]</dt><dd rel="dcterms:references">Shane McCarron; et. al. <a href="http://www.w3.org/TR/2010/WD-xhtml-rdfa-20100803"><cite>XHTML+RDFa 1.1.</cite></a> 3 August 2010. W3C Working Draft. URL: <a href="http://www.w3.org/TR/2010/WD-xhtml-rdfa-20100803">http://www.w3.org/TR/WD-xhtml-rdfa-20100803</a> 
 </dd></dl></div></div></body></html>

Index: Overview-src.html
===================================================================
RCS file: /sources/public/html5/rdfa/Overview-src.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Overview-src.html	5 Jul 2010 14:32:17 -0000	1.7
+++ Overview-src.html	16 Oct 2010 19:19:23 -0000	1.8
@@ -119,7 +119,7 @@
       var respecConfig = {
           // specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
           specStatus:           "ED",
-          //publishDate:          "2010-06-24",
+          //publishDate:          "2010-10-19",
           diffTool:             "http://www3.aptest.com/standards/htmldiff/htmldiff.pl",
           
           // the specification's short name, as in http://www.w3.org/TR/short-name/
@@ -132,10 +132,10 @@
 
           // if there is a previously published draft, uncomment this and set its YYYY-MM-DD date
           // and its maturity status
-          previousPublishDate:  "2010-06-24",
+          previousPublishDate:  "2010-10-19",
           previousMaturity:  "WD",
           // prevRecShortname:  "rdfa-in-html",
-          previousURI:       "http://www.w3.org/TR/2010/WD-rdfa-in-html-20100624/",
+          previousURI:       "http://www.w3.org/TR/2010/WD-rdfa-in-html-20101019/",
 
           // if there a publicly available Editor's Draft, this is the link
           edDraftURI:           "http://dev.w3.org/html5/rdfa/",
@@ -170,8 +170,11 @@
                 company: "CWI", companyURL: "http://www.cwi.nl/" },
           ],
 
+          // Perform RDFa markup on the document
+          doRDFa: true,
+
           alternateFormats: [
-//                { uri: 'diff-20100304.html',
+//                { uri: 'diff-20100624.html',
 //                  label: "Changes since previous Working Draft" }
 //                { uri: 'html-rdfa.ps',
 //                  label: 'Postscript version' },
@@ -200,7 +203,6 @@
           preProcess: [ preProc ] 
       };
 
-
       function updateExample(doc, content) {
         // perform transformations to make it render and prettier
         content = content.replace(/<!--/, '');
@@ -236,7 +238,6 @@
   <body>
     <section id='abstract'>
 
-
   <p>This specification defines rules and guidelines for adapting the RDFa Core
   1.1 specification for use in HTML5 and XHTML5. The rules defined in this 
   specification not only apply to HTML5 documents in non-XML and XML mode, 
@@ -254,15 +255,16 @@
 to the specification and to promote its widespread deployment. This
 enhances the functionality and interoperability of the Web.</p> -->
 
-<p>There are a number of substantive differences between this version and its 
+<p>There are a few substantive differences between this version and its 
 predecessor, including:</p>
 <ol>
-<li>Inheritance of basic processing rules from RDFa 1.1 [[!RDFA-CORE]], instead of
-XHTML+RDFa 1.0 [[RDFA-SYNTAX]].</li>
-<li>Inclusion of the HTML Default Vocabulary Terms, which mirror the XHTML
-Default Vocabulary Terms, for the purpose of HTML/XHTML interoperability.</li>
-<li>Inclusion of a HTML 4.01 + RDFa 1.1 DTD for validation purposes.</li>
-<li>Added normative definition of @version attribute.</li>
+<li>The removal of the <code>@version</code> attribute to bring the 
+specification more in-line with HTML5's version-less design.</li>
+<li>Removed the HTML Default Vocabulary Terms section from this document, 
+instead deferring the definitions in a default RDFa Profile document, which is
+also shared with XHTML+RDFa for the purposes of consistency and
+interoperability.</li>
+<li>The addition of RDFa to the document markup.</li>
 </ol>
 
 <p>The latest stable version of the editor's draft of this specification is
@@ -288,6 +290,22 @@
 A community-maintained 
 <a href="http://rdfa.info/rdfa-implementations/">Wiki page</a> includes 
 subsequent updates.</p>
+
+<p>This document was published by the 
+<a href="http://www.w3.org/html/wg">HTML Working Group</a> as a Working Draft. 
+This document is intended to become a W3C Recommendation. 
+
+If you wish to make comments regarding this document, please submit them  
+via the <a href="http://www.w3.org/Bugs/Public/enter_bug.cgi?product=HTML%20WG">public bug database</a>. 
+
+If you cannot do this then submit them to 
+<a href="mailto:public-rdfa-wg@w3.org">public-rdfa-wg@w3.org</a> 
+(<a href="mailto:public-rdfa-wg-request@w3.org?subject=subscribe">subscribe</a>, 
+<a href="http://lists.w3.org/Archives/Public/public-rdfa-wg/">archives</a>),
+and arrangements will be made to submit your comments to the 
+<a href="http://www.w3.org/Bugs/Public/enter_bug.cgi?product=HTML%20WG">public bug 
+database</a>. All feedback is welcome.</p>
+
 </section>
 
 <section class='informative'>
@@ -328,12 +346,6 @@
     <li>All HTML5 elements and attributes SHOULD be used in a way that is
     conformant with [[!HTML5]]. All RDFa attributes SHOULD be used in a way that
     is conformant with [[!RDFA-CORE]] and this document.</li>
-
-    <li>There SHOULD be a <code>version</code> attribute on the
-    <code>html</code> element. The value of the <code>version</code>
-    attribute SHOULD be "HTML+RDFa 1.1" if the document is a non-XML mode
-    document, or "XHTML+RDFa 1.1" if the document is a XML mode
-    document.</li>
     
     <li>If HTML4 is the target language, the document SHOULD conform to the 
     constraints expressed in the
@@ -345,12 +357,12 @@
 <p>An example of a conforming HTML+RDFa document:</p>
 
 <pre class='example' data-transform='updateExample' title="Example of an HTML+RDFa 1.1 document"><!--
-<****html**** ****version="HTML+RDFa 1.1"**** lang="en">
+<html lang="en">
   <head>
     <title>Example Document</title>
   </head>
   <body>
-    <p>Moved to <a href="http://example.org/">example.org</a>.</p>
+    <p>This website is <a href="http://example.org/">example.org</a>.</p>
   </body>
 </html>
 --></pre>
@@ -431,9 +443,10 @@
   <p>Documents conforming to the rules in this specification are processed
   according to [[!RDFA-CORE]] with the following extensions:</p>
   <ul>
-  <li>The <tref>default vocabulary URI</tref> is <code>http://www.w3.org/1999/xhtml/vocab#</code>.</li>
-  <li>The <tref>default collection of terms</tref> is defined in 
-  <a href="#html-default-vocabulary-terms">HTML Default Vocabulary Terms</a>.</li>
+  <li>The <tref>default vocabulary URI</tref> is 
+      <code>http://www.w3.org/1999/xhtml/vocab#</code>.</li>
+  <li>The <tref>default RDFa profile</tref> document is 
+      <code>http://www.w3.org/1999/xhtml/vocab</code>.</li>
   <li>The <tref>base</tref> can be set using the <code>base</code> element.</li>
   <li>The <tref>current language</tref> can be set using either the
   <aref>lang</aref> or <aref>xml:lang</aref> attributes.</li>
@@ -647,18 +660,6 @@
   The RDFa Attributes</a>, are conforming when used in an HTML5 or XHTML5
   document.</p>
 
-<section>  
-  <h4>The version Attribute</h4>
-
-  <p>The <code>@version</code> attribute is an OPTIONAL attribute that is
-  allowed on the <code>html</code> element. It specifies the HTML5 language 
-  features that are enabled for the current document. The value MUST contain at 
-  least one non-<strong>space character</strong>. The value must conform to a 
-  <strong>set of space-separated tokens</strong>, as defined in 
-  [[!HTML5]], Space-separated tokens.
-  </p>
-</section>
-
 </section>
 
 <section>
@@ -912,160 +913,6 @@
 </section>
 
 <section class='appendix'>
-<h2>HTML Default Vocabulary Terms</h2>
-
-<p class='issue'>Note that the values defined in this section
-may be removed from this document and placed in an external 
-'RDFa Profile' so that they can be maintained independent of the
-specification.</p>
-
-<p>The terms defined in this section MUST be mapped to 
-lower case by an RDFa Processor.  The vocabulary terms are:</p>
-
-<dl>
-<dt>alternate</dt>
-
-<dd>Designates alternate versions for a resource.</dd>
-
-<dt>appendix</dt>
-
-<dd>Refers to a resource serving as an appendix in a collection.</dd>
-
-<dt>bookmark</dt>
-
-<dd>Refers to a bookmark. A bookmark is a link to a key entry point within an
-extended document. The 
-<aref module="core">title</aref> attribute may be used, for example, to
-label the bookmark. Note that several bookmarks may be defined for a
-document.</dd>
-
-<dt>cite</dt>
-<dd>
-<p>Refers to a resource that defines a citation. 
-In the following example, the <code>cite</code> is used to
-reference the book from which the quotation is taken:</p>
-
-<pre class='example' data-transform='updateExample' title="cite as book reference"><!--
-As Gandalf the White said in 
-<span ****rel="cite"**** resource="http://www.example.com/books/the_two_towers">
-    The Two Towers
-</span>,
-<quote xml:lang="en">"The hospitality of 
-your hall is somewhat lessened of late, Theoden King."</quote>
---></pre>
-<p>which would generate the following triples:</p>
-<pre class='example' data-transform='updateExample'><!--
-<> xhv:cite <http://www.example.com/books/the_two_towers> .
---></pre>
-
-<code>cite</code> is also useful for referencing specifications:
-<pre class='example' data-transform='updateExample' title="cite to reference another specification"><!--
-More information can be found in 
-<span ****rel="cite"**** resource="http://www.w3.org/TR/REC-xml">[XML]</cite>.
---></pre>
-<p>which would generate the following triples:</p>
-<pre class='example' data-transform='updateExample'><!--
-<> xhv:cite <http://www.w3.org/TR/REC-xml> .
---></pre>
-  
-</dd>
-
-<dt>chapter</dt>
-
-<dd>Refers to a resource serving as a chapter in a collection.</dd>
-
-<dt>contents</dt>
-
-<dd>Refers to a resource serving as a table of contents.</dd>
-
-<dt>copyright</dt>
-
-<dd>Refers to a copyright statement for the resource.</dd>
-
-<dt>first</dt>
-
-<dd>Refers to the first item in a collection (see also start and top).</dd>
-
-<dt>glossary</dt>
-
-<dd>Refers to a resource providing a glossary of terms.</dd>
-
-<dt>help</dt>
-
-<dd>Refers to a resource offering help (more information, links to other sources of information, etc.)</dd>
-
-<dt>icon</dt>
-
-<dd>Refers to a resource that represents an icon.
-</dd>
-
-<dt>index</dt>
-
-<dd>Refers to a resource providing an index.</dd>
-
-<dt>last</dt>
-
-<dd>Refers to the last resource in a collection of resources.</dd>
-
-<dt>license</dt>
-
-<dd>Refers to a resource that defines the license associated with a resource.</dd>
-
-<dt>meta</dt>
-
-<dd>Refers to a resource that provides metadata, for instance in RDF.
-</dd>
-
-<dt>next</dt>
-
-<dd>Refers to the next resource (after the current one) in an
-ordered collection.</dd>
-
-<dt>p3pv1</dt>
-
-<dd>Refers to a P3P Policy Reference File. See [[!P3P1.0]].</dd>
-
-<dt>prev</dt>
-
-<dd>Refers to the previous resource (before the current one) 
-in an ordered collection.</dd>
-
-<dt>role</dt>
-
-<dd>
-Indicates the purpose of the resource. For some possible values, see
-[[XHTML-VOCAB]].</dd>
-
-<dt>section</dt>
-
-<dd>Refers to a resource serving as a section in a collection.</dd>
-
-<dt>stylesheet</dt>
-
-<dd>Refers to a resource acting as a stylesheet for a resource.</dd>
-
-<dt>subsection</dt>
-
-<dd>Refers to a resource serving as a subsection in a collection.</dd>
-
-<dt>start</dt>
-
-<dd>Refers to the first resource in a collection of resources. A
-typical use case might be a collection of chapters in a book.
-</dd>
-
-<dt>top</dt>
-
-<dd>Synonym for start.</dd>
-
-<dt>up</dt>
-
-<dd>Refers to the resource "above" in a hierarchically structured set.</dd>
-
-</dl>
-</section>
-
-<section class='appendix'>
 <h2>Validation</h2>
 <p>Documents written using the markup language defined in
 this specification MAY be validated using the 
@@ -1150,6 +997,13 @@
 <p>2010-05-02: Inheritance of basic processing rules from RDFa 1.1 [[!RDFA-CORE]], 
 instead of XHTML+RDFa 1.0 [[RDFA-SYNTAX]], inclusion of the HTML Default 
 Vocabulary Terms, inclusion of a HTML 4.01 + RDFa 1.1 DTD for validation purposes.</p>
+<p>2010-06-24: Inheritance of basic processing rules from RDFa 1.1 [[!RDFA-CORE]], 
+instead of XHTML+RDFa 1.0 [[RDFA-SYNTAX]], inclusion of the HTML Default 
+Vocabulary Terms, added HTML 4.01 + RDFa 1.1 DTD for validation purposes,
+added normative definition of @version attribute.</p>
+<p>2010-10-19: Removal of @version attribute, migrated HTML Vocabulary Terms to
+RDFa Profile document, added statement to send comments to the HTML WG bug tracker.
+</p>
 </section>
 
 <section class='informative'>
@@ -1159,7 +1013,7 @@
 RDFa Working Group were:</p>
 
 <p>
-Ben Adida (chair), Benjamin Adrian, Mark Birbeck, Abhijit Galkward, Markus Gylling, Ivan Herman (staff contact), Toby Inkster, Shane McCarron,  Knud Möller,  John O'Donovan, Steven Pemberton, Jeffrey Sonstein, Manu Sporny (chair), Robert Weir
+Ben Adida (chair), Benjamin Adrian, Mark Birbeck, Ivan Herman (staff contact), Toby Inkster, Shane McCarron, Knud Möller, Steven Pemberton, Nathan Rixham, Manu Sporny (chair)
 </p>
 
 <p>At the time of publication, the members of the HTML Working Group were:</p>

Received on Saturday, 16 October 2010 19:19:28 UTC