--- a/ED/microdata-rdf/20120320/diff-20120112.html	Fri Mar 02 13:39:57 2012 -0800
+++ b/ED/microdata-rdf/20120320/diff-20120112.html	Sat Mar 03 22:00:15 2012 -0800
@@ -1201,16 +1201,14 @@
 </ul>
 </li>
 <li class="tocline">
-<a href="#conformance" class="tocxref">
-<span class="secno">
-<ins class="diff-new">5.
-</ins></span><ins class="diff-new">
-Conformance
-</ins></a></li><li class="tocline">
-<a href="#markup-examples" class="tocxref">
+<a href="#testing" class="tocxref">
 <span class="secno">
 A.
 </span>
+<ins class="diff-new">Testing
+</ins></a></li><li class="tocline"><a href="#markup-examples" class="tocxref"><span class="secno"><ins class="diff-new">
+B.
+</ins></span>
 Markup
 Examples
 </a>
@@ -1218,7 +1216,10 @@
 <li class="tocline">
 <a href="#example-registry" class="tocxref">
 <span class="secno">
-B.
+<del class="diff-old">B.
+</del>
+<ins class="diff-chg">C.
+</ins>
 </span>
 Example
 <span class="tref internalDFN formerLink tref internalDFN" title="registry">
@@ -1231,7 +1232,7 @@
 <span class="secno">
 <del class="diff-old">B.1
 </del>
-<ins class="diff-chg">C.
+<ins class="diff-chg">D.
 </ins>
 </span>
 Acknowledgements
@@ -1242,7 +1243,7 @@
 <span class="secno">
 <del class="diff-old">C.
 </del>
-<ins class="diff-chg">D.
+<ins class="diff-chg">E.
 </ins>
 </span>
 References
@@ -1253,7 +1254,7 @@
 <span class="secno">
 <del class="diff-old">C.1
 </del>
-<ins class="diff-chg">D.1
+<ins class="diff-chg">E.1
 </ins>
 </span>
 Normative
@@ -1265,7 +1266,7 @@
 <span class="secno">
 <del class="diff-old">C.2
 </del>
-<ins class="diff-chg">D.2
+<ins class="diff-chg">E.2
 </ins>
 </span>
 Informative
@@ -8981,77 +8982,40 @@
 </ol>
 </div>
 </div>
-<div id="conformance" class="section">
+<div class="appendix informative section" id="testing">
 <h2>
 <span class="secno">
-<ins class="diff-new">5.
-</ins></span><ins class="diff-new">
-Conformance
-</ins></h2><p><ins class="diff-new">
-Systems
-conforming
-to
-this
-specification
-</ins><em class="rfc2119" title="must"><ins class="diff-new">
-must
-</ins></em><ins class="diff-new">
-pass
-all
-the
-tests
-in
-the
+A.
+</span>
+<ins class="diff-new">Testing
+</ins></h2><p><em><ins class="diff-new">
+This
+section
+is
+non-normative.
+</ins></em></p><p><ins class="diff-new">
+A
+test
+suite
 [
 </ins><cite><a class="bibref" rel="biblioentry" href="#bib-MICRODATA-RDF-TESTS"><ins class="diff-new">
 MICRODATA-RDF-TESTS
 </ins></a></cite><ins class="diff-new">
-].
-Passing
-these
-tests
-means:
-</ins></p><ol><li><ins class="diff-new">
-All
-the
-</ins><cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html#positive-tests"><ins class="diff-new">
-Positive
-Parser
-Tests
-</ins></a></cite><ins class="diff-new">
-must
-return
-a
-value
-of
-</ins><code><ins class="diff-new">
-true
-</ins></code>.</li><li><ins class="diff-new">
-All
-the
-</ins><cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html#negative-tests"><ins class="diff-new">
-Negative
-Parser
-Tests
-</ins></a></cite><ins class="diff-new">
-must
-return
-a
-value
-of
-</ins><code><ins class="diff-new">
-false
-</ins></code>.</li></ol><p class="note"><ins class="diff-new">
-Tests
-are
-undergoing
-development.
-</ins></p></div>
-<div class="appendix informative section" id="markup-examples">
-<h2>
-<span class="secno">
-A.
-</span>
+]
+under
+development
+to
+help
+processor
+developers
+verify
+conformance
+to
+this
+specification.
+</ins></p></div><div class="appendix informative section" id="markup-examples"><h2><span class="secno"><ins class="diff-new">
+B.
+</ins></span>
 Markup
 Examples
 </h2>
@@ -9514,7 +9478,10 @@
 <div class="appendix informative section" id="example-registry">
 <h2>
 <span class="secno">
-B.
+<del class="diff-old">B.
+</del>
+<ins class="diff-chg">C.
+</ins>
 </span>
 Example
 <a class="tref internalDFN" title="registry" href="#dfn-registry">
@@ -9624,7 +9591,7 @@
 <span class="secno">
 <del class="diff-old">B.1
 </del>
-<ins class="diff-chg">C.
+<ins class="diff-chg">D.
 </ins>
 </span>
 Acknowledgements
@@ -9668,7 +9635,7 @@
 <span class="secno">
 <del class="diff-old">C.
 </del>
-<ins class="diff-chg">D.
+<ins class="diff-chg">E.
 </ins>
 </span>
 References
@@ -9678,7 +9645,7 @@
 <span class="secno">
 <del class="diff-old">C.1
 </del>
-<ins class="diff-chg">D.1
+<ins class="diff-chg">E.1
 </ins>
 </span>
 Normative
@@ -9855,7 +9822,7 @@
 <span class="secno">
 <del class="diff-old">C.2
 </del>
-<ins class="diff-chg">D.2
+<ins class="diff-chg">E.2
 </ins>
 </span>
 Informative

--- a/ED/microdata-rdf/20120320/index.html	Fri Mar 02 13:39:57 2012 -0800
+++ b/ED/microdata-rdf/20120320/index.html	Sat Mar 03 22:00:15 2012 -0800
@@ -522,7 +522,7 @@
   provide guidance for a possible future Working Group chartered to provide a Recommendation
   for this transformation. As a consequence, implementers of this specification, either producers
   or consumers, should note that it may change prior to any possible publication as a Recommendation.</p>
-<p>This document was published by the <a href="http://www.w3.org/2001/sw/interest/">HTML Data Task Force, Semantic Web Interest Group</a> as an Interest Group Note. If you wish to make comments regarding this document, please send them to <a href="mailto:public-html-data-tf@w3.org">public-html-data-tf@w3.org</a> (<a href="mailto:public-html-data-tf-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-html-data-tf/">archives</a>). All feedback is welcome.</p><p>Publication as an Interest Group Note does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>The disclosure obligations of the Participants of this group are described in the <a href="http://www.w3.org/2006/07/swig-charter#Ipr">charter</a>. </p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#background" class="tocxref"><span class="secno">1.1 </span>Background</a></li><li class="tocline"><a href="#use-cases" class="tocxref"><span class="secno">1.2 </span>Use Cases</a></li><li class="tocline"><a href="#issues" class="tocxref"><span class="secno">1.3 </span>Issues</a></li></ul></li><li class="tocline"><a href="#attributes-and-syntax" class="tocxref"><span class="secno">2. </span>Attributes and Syntax</a></li><li class="tocline"><a href="#vocabulary-registry" class="tocxref"><span class="secno">3. </span>Vocabulary Registry</a><ul class="toc"><li class="tocline"><a href="#property-uri-generation" class="tocxref"><span class="secno">3.1 </span>Property URI Generation</a></li><li class="tocline"><a href="#value-ordering" class="tocxref"><span class="secno">3.2 </span>Value Ordering</a></li><li class="tocline"><a href="#value-typing" class="tocxref"><span class="secno">3.3 </span>Value Typing</a></li></ul></li><li class="tocline"><a href="#algorithm" class="tocxref"><span class="secno">4. </span>Algorithm</a><ul class="toc"><li class="tocline"><a href="#algorithm-terms" class="tocxref"><span class="secno">4.1 </span>Algorithm Terms</a></li><li class="tocline"><a href="#rdf-conversion-algorithm" class="tocxref"><span class="secno">4.2 </span>RDF Conversion Algorithm</a></li><li class="tocline"><a href="#generate-the-triples" class="tocxref"><span class="secno">4.3 </span>Generate the triples</a></li><li class="tocline"><a href="#generate-predicate-uri" class="tocxref"><span class="secno">4.4 </span>Generate Predicate URI</a></li><li class="tocline"><a href="#generate-property-values" class="tocxref"><span class="secno">4.5 </span>Generate Property Values</a></li><li class="tocline"><a href="#generate-collection" class="tocxref"><span class="secno">4.6 </span>Generate RDF Collection</a></li></ul></li><li class="tocline"><a href="#conformance" class="tocxref"><span class="secno">5. </span>Conformance</a></li><li class="tocline"><a href="#markup-examples" class="tocxref"><span class="secno">A. </span>Markup Examples</a></li><li class="tocline"><a href="#example-registry" class="tocxref"><span class="secno">B. </span>Example <span class="tref internalDFN formerLink tref internalDFN" title="registry">registry</span></a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">C. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">D. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">D.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">D.2 </span>Informative references</a></li></ul></li></ul></div>
+<p>This document was published by the <a href="http://www.w3.org/2001/sw/interest/">HTML Data Task Force, Semantic Web Interest Group</a> as an Interest Group Note. If you wish to make comments regarding this document, please send them to <a href="mailto:public-html-data-tf@w3.org">public-html-data-tf@w3.org</a> (<a href="mailto:public-html-data-tf-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-html-data-tf/">archives</a>). All feedback is welcome.</p><p>Publication as an Interest Group Note does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>The disclosure obligations of the Participants of this group are described in the <a href="http://www.w3.org/2006/07/swig-charter#Ipr">charter</a>. </p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#background" class="tocxref"><span class="secno">1.1 </span>Background</a></li><li class="tocline"><a href="#use-cases" class="tocxref"><span class="secno">1.2 </span>Use Cases</a></li><li class="tocline"><a href="#issues" class="tocxref"><span class="secno">1.3 </span>Issues</a></li></ul></li><li class="tocline"><a href="#attributes-and-syntax" class="tocxref"><span class="secno">2. </span>Attributes and Syntax</a></li><li class="tocline"><a href="#vocabulary-registry" class="tocxref"><span class="secno">3. </span>Vocabulary Registry</a><ul class="toc"><li class="tocline"><a href="#property-uri-generation" class="tocxref"><span class="secno">3.1 </span>Property URI Generation</a></li><li class="tocline"><a href="#value-ordering" class="tocxref"><span class="secno">3.2 </span>Value Ordering</a></li><li class="tocline"><a href="#value-typing" class="tocxref"><span class="secno">3.3 </span>Value Typing</a></li></ul></li><li class="tocline"><a href="#algorithm" class="tocxref"><span class="secno">4. </span>Algorithm</a><ul class="toc"><li class="tocline"><a href="#algorithm-terms" class="tocxref"><span class="secno">4.1 </span>Algorithm Terms</a></li><li class="tocline"><a href="#rdf-conversion-algorithm" class="tocxref"><span class="secno">4.2 </span>RDF Conversion Algorithm</a></li><li class="tocline"><a href="#generate-the-triples" class="tocxref"><span class="secno">4.3 </span>Generate the triples</a></li><li class="tocline"><a href="#generate-predicate-uri" class="tocxref"><span class="secno">4.4 </span>Generate Predicate URI</a></li><li class="tocline"><a href="#generate-property-values" class="tocxref"><span class="secno">4.5 </span>Generate Property Values</a></li><li class="tocline"><a href="#generate-collection" class="tocxref"><span class="secno">4.6 </span>Generate RDF Collection</a></li></ul></li><li class="tocline"><a href="#testing" class="tocxref"><span class="secno">A. </span>Testing</a></li><li class="tocline"><a href="#markup-examples" class="tocxref"><span class="secno">B. </span>Markup Examples</a></li><li class="tocline"><a href="#example-registry" class="tocxref"><span class="secno">C. </span>Example <span class="tref internalDFN formerLink tref internalDFN" title="registry">registry</span></a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">D. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">E. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">E.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">E.2 </span>Informative references</a></li></ul></li></ul></div>
 
 
 
@@ -1604,19 +1604,14 @@
   </div>
 </div>
 
-<div id="conformance" class="section">
-  <!--OddPage--><h2><span class="secno">5. </span>Conformance</h2>
-  <p>Systems conforming to this specification <em class="rfc2119" title="must">must</em> pass all the tests in the [<cite><a class="bibref" rel="biblioentry" href="#bib-MICRODATA-RDF-TESTS">MICRODATA-RDF-TESTS</a></cite>].
-    Passing these tests means:</p>
-  <ol>
-    <li>All the <cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html#positive-tests">Positive Parser Tests</a></cite> must return a value of <code>true</code>.</li>
-    <li>All the <cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html#negative-tests">Negative Parser Tests</a></cite> must return a value of <code>false</code>.</li>
-  </ol>
-  <p class="note">Tests are undergoing development.</p>
+<div class="appendix informative section" id="testing">
+  <!--OddPage--><h2><span class="secno">A. </span>Testing</h2><p><em>This section is non-normative.</em></p>
+  <p>A test suite [<cite><a class="bibref" rel="biblioentry" href="#bib-MICRODATA-RDF-TESTS">MICRODATA-RDF-TESTS</a></cite>] under development to help processor developers verify
+    conformance to this specification.</p>
 </div>
 
 <div class="appendix informative section" id="markup-examples">
-<!--OddPage--><h2><span class="secno">A. </span>Markup Examples</h2><p><em>This section is non-normative.</em></p>
+<!--OddPage--><h2><span class="secno">B. </span>Markup Examples</h2><p><em>This section is non-normative.</em></p>
 
 <p>The microdata example below expresses book information as an FRBR Work item.</p>
 
@@ -1759,7 +1754,7 @@
 </div>
 
 <div class="appendix informative section" id="example-registry">
-  <!--OddPage--><h2><span class="secno">B. </span>Example <a class="tref internalDFN" title="registry" href="#dfn-registry">registry</a></h2><p><em>This section is non-normative.</em></p>
+  <!--OddPage--><h2><span class="secno">C. </span>Example <a class="tref internalDFN" title="registry" href="#dfn-registry">registry</a></h2><p><em>This section is non-normative.</em></p>
   <p>The following is an example <a class="tref internalDFN" title="registry" href="#dfn-registry">registry</a> in JSON format.</p>
 
   <pre class="example">{
@@ -1800,19 +1795,19 @@
 </div>
 
 <div class="appendix informative section" id="acknowledgements">
-  <!--OddPage--><h2><span class="secno">C. </span>Acknowledgements</h2><p><em>This section is non-normative.</em></p>
+  <!--OddPage--><h2><span class="secno">D. </span>Acknowledgements</h2><p><em>This section is non-normative.</em></p>
   <p>Thanks to Richard Cyganiak for property URI and vocabulary terminology and the general excellent
     consideration of practical problems in generating RDF from microdata.</p>
 </div>
 
 
 
-<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/html5"><cite>HTML5.</cite></a> 25 May 2011. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/html5">http://www.w3.org/TR/html5</a> 
+<div id="references" class="appendix section"><!--OddPage--><h2><span class="secno">E. </span>References</h2><div id="normative-references" class="section"><h3><span class="secno">E.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/html5"><cite>HTML5.</cite></a> 25 May 2011. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/html5">http://www.w3.org/TR/html5</a> 
 </dd><dt id="bib-MICRODATA">[MICRODATA]</dt><dd><cite><a href="http://dev.w3.org/html5/md/">HTML Microdata</a></cite> Ian Hickson Editor. World Wide Web Consortium (work in progress). 18 November 2011. This edition of the HTML Microdata specification is http://dev.w3.org/html5/md/. The <a href="http://dev.w3.org/html5/md/">latest edition of HTML Microdata</a> is available at http://www.w3.org/TR/microdata/
 </dd><dt id="bib-RDF-CONCEPTS">[RDF-CONCEPTS]</dt><dd>Graham Klyne; Jeremy J. Carroll. <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210"><cite>Resource Description Framework (RDF): Concepts and Abstract Syntax.</cite></a> 10 February 2004. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210">http://www.w3.org/TR/2004/REC-rdf-concepts-20040210</a> 
 </dd><dt id="bib-RDF-SCHEMA">[RDF-SCHEMA]</dt><dd>Dan Brickley; Ramanathan V. Guha. <a href="http://www.w3.org/TR/2004/REC-rdf-schema-20040210"><cite>RDF Vocabulary Description Language 1.0: RDF Schema.</cite></a> 10 February 2004. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2004/REC-rdf-schema-20040210">http://www.w3.org/TR/2004/REC-rdf-schema-20040210</a> 
 </dd><dt id="bib-RFC3986">[RFC3986]</dt><dd>T. Berners-Lee; R. Fielding; L. Masinter. <a href="http://www.ietf.org/rfc/rfc3986.txt"><cite>Uniform Resource Identifier (URI): Generic Syntax.</cite></a> January 2005. Internet RFC 3986. URL: <a href="http://www.ietf.org/rfc/rfc3986.txt">http://www.ietf.org/rfc/rfc3986.txt</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-MICRODATA-RDF-SUPPLEMENT">[MICRODATA-RDF-SUPPLEMENT]</dt><dd><cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-supplement/index.html">Microdata to RDF Supplement</a></cite> Gregg Kellogg Editor. World Wide Web Consortium (work in progress). 22 January 2012.
+</dd></dl></div><div id="informative-references" class="section"><h3><span class="secno">E.2 </span>Informative references</h3><dl class="bibliography"><dt id="bib-MICRODATA-RDF-SUPPLEMENT">[MICRODATA-RDF-SUPPLEMENT]</dt><dd><cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-supplement/index.html">Microdata to RDF Supplement</a></cite> Gregg Kellogg Editor. World Wide Web Consortium (work in progress). 22 January 2012.
 </dd><dt id="bib-MICRODATA-RDF-TESTS">[MICRODATA-RDF-TESTS]</dt><dd><cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html">Microdata to RDF Tests</a></cite> Gregg Kellogg, Ivan Herman Editors. World Wide Web Consortium (work in progress). 22 March 2012.
 </dd><dt id="bib-RDF-SYNTAX-GRAMMAR">[RDF-SYNTAX-GRAMMAR]</dt><dd>Dave Beckett. <a href="http://www.w3.org/TR/2004/REC-rdf-syntax-grammar-20040210"><cite>RDF/XML Syntax Specification (Revised).</cite></a> 10 February 2004. W3C Recommendation. URL: <a href="http://www.w3.org/TR/2004/REC-rdf-syntax-grammar-20040210">http://www.w3.org/TR/2004/REC-rdf-syntax-grammar-20040210</a> 
 </dd></dl></div></div></body></html>
\ No newline at end of file

--- a/microdata-rdf/index.html	Fri Mar 02 13:39:57 2012 -0800
+++ b/microdata-rdf/index.html	Sat Mar 03 22:00:15 2012 -0800
@@ -1402,15 +1402,10 @@
   </section>
 </section>
 
-<section>
-  <h2>Conformance</h2>
-  <p>Systems conforming to this specification MUST pass all the tests in the [[MICRODATA-RDF-TESTS]].
-    Passing these tests means:</p>
-  <ol>
-    <li>All the <cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html#positive-tests">Positive Parser Tests</a></cite> must return a value of <code>true</code>.</li>
-    <li>All the <cite><a href="https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/index.html#negative-tests">Negative Parser Tests</a></cite> must return a value of <code>false</code>.</li>
-  </ol>
-  <p class="note">Tests are undergoing development.</p>
+<section class="appendix informative">
+  <h2>Testing</h2>
+  <p>A test suite [[MICRODATA-RDF-TESTS]] under development to help processor developers verify
+    conformance to this specification.</p>
 </section>
 
 <section class="appendix informative">