W3C home > Mailing lists > Public > public-html-commits@w3.org > April 2011

html5/md Overview.html,1.117,1.118

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 08 Apr 2011 19:20:35 +0000
To: public-html-commits@w3.org
Message-Id: <E1Q8HER-0003Rk-RJ@lionel-hutz.w3.org>
Update of /sources/public/html5/md
In directory hutz:/tmp/cvs-serv13234

Modified Files:
	Overview.html 
Log Message:
fix conflict issue

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/md/Overview.html,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- Overview.html	29 Mar 2011 22:08:30 -0000	1.117
+++ Overview.html	8 Apr 2011 19:20:33 -0000	1.118
@@ -344,13 +344,15 @@
 
    <h1>HTML Microdata</h1>
    <h2 class="no-num no-toc" id="generatedID"></h2>
-   <h2 class="no-num no-toc" id="editor-s-draft-29-march-2011">Editor's Draft 29 March 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-8-april-2011">Editor's Draft 8 April 2011</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/microdata/">http://www.w3.org/TR/microdata/</a></dd>
     <dt>Latest Editor's Draft:</dt>
     <dd><a class="latest-link" href="http://dev.w3.org/html5/md/">http://dev.w3.org/html5/md/</a></dd>
 <!-- ZZZ: add the new version after it has shipped -->
     <dt>Previous Versions:</dt>
+    <dd><a href="http://www.w3.org/TR/2011/WD-microdata-20110405/">http://www.w3.org/TR/2011/WD-microdata-20110405/</a></dd>
+    <dd><a href="http://www.w3.org/TR/2011/WD-microdata-20110113/">http://www.w3.org/TR/2011/WD-microdata-20110113/</a></dd>
     <dd><a href="http://www.w3.org/TR/2010/WD-microdata-20101019/">http://www.w3.org/TR/2010/WD-microdata-20101019/</a></dd>
     <dd><a href="http://www.w3.org/TR/2010/WD-microdata-20100624/">http://www.w3.org/TR/2010/WD-microdata-20100624/</a></dd>
     <dd><a href="http://www.w3.org/TR/2010/WD-microdata-20100304/">http://www.w3.org/TR/2010/WD-microdata-20100304/</a></dd>
@@ -474,7 +476,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 29 March 2011 Editor's Draft.
+  This specification is the 8 April 2011 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
   actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
   group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!--YYY BOILERPLATE middle-w3c-html-module-status--><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Received on Friday, 8 April 2011 19:20:40 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 8 April 2011 19:25:44 GMT