html5/spec single-page.html,1.136,1.137 spec.html,1.2007,1.2008 the-article-element.html,1.184,1.185 the-nav-element.html,1.184,1.185 the-time-element.html,1.185,1.186

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv16375

Modified Files:
	single-page.html spec.html the-article-element.html 
	the-nav-element.html the-time-element.html 
Log Message:
commit 3e11b2978cd49749be36f992c45b27123c59f8f8
Author: Edward O'Connor <hober0@gmail.com>
Date:   Tue Sep 25 11:45:19 2012 -0700

    [Bug 18726] Remove Microdata from <nav> example.


Index: the-article-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-article-element.html,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- the-article-element.html	25 Sep 2012 02:14:20 -0000	1.184
+++ the-article-element.html	25 Sep 2012 19:14:04 -0000	1.185
@@ -374,59 +374,49 @@
   similar in purpose to the <code title="">entry</code> element in
   Atom. <a href="references.html#refsATOM">[ATOM]</a>
 
-  </p><p class="note">The schema.org microdata vocabulary can be used to
-  provide the publication date for an <code><a href="#the-article-element">article</a></code>
-  element, using one of the CreativeWork subtypes.</p>
+<!--FORK-->
 
-  <div class="example" id="article-example">
+  </p><div class="example" id="article-example">
 
    <p>This example shows a blog post using the <code><a href="#the-article-element">article</a></code>
-   element, with some schema.org annotations:</p>
+   element<!--FORK-->:</p>
 
-   <pre>&lt;article itemscope itemtype="http://schema.org/BlogPosting"&gt;
+   <pre>&lt;article<!--FORK-->&gt;
  &lt;header&gt;
-  &lt;h1 itemprop="headline"&gt;The Very First Rule of Life&lt;/h1&gt;
-  &lt;p&gt;&lt;time itemprop="datePublished" datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;
-  &lt;link itemprop="url" href="?comments=0"&gt;
- &lt;/header&gt;[
+  &lt;h1<!--FORK-->&gt;The Very First Rule of Life&lt;/h1&gt;
+  &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;<!--FORK-->
+ &lt;/header&gt;
  &lt;p&gt;If there's a microphone anywhere near you, assume it's hot and
  sending whatever you're saying to the world. Seriously.&lt;/p&gt;
  &lt;p&gt;<em>...</em>&lt;/p&gt;
  &lt;footer&gt;
-  &lt;a itemprop="discussionUrl" href="?comments=1"&gt;Show comments...&lt;/a&gt;
+  &lt;a<!--FORK--> href="?comments=1"&gt;Show comments...&lt;/a&gt;
  &lt;/footer&gt;
 &lt;/article&gt;</pre>
 
    <p>Here is that same blog post, but showing some of the comments:</p>
 
-   <pre>&lt;article itemscope itemtype="http://schema.org/BlogPosting"&gt;
+   <pre>&lt;article<!--FORK-->&gt;
  &lt;header&gt;
-  &lt;h1 itemprop="headline"&gt;The Very First Rule of Life&lt;/h1&gt;
-  &lt;p&gt;&lt;time itemprop="datePublished" datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;
-  &lt;link itemprop="url" href="?comments=0"&gt;
+  &lt;h1<!--FORK-->&gt;The Very First Rule of Life&lt;/h1&gt;
+  &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;<!--FORK-->
  &lt;/header&gt;
  &lt;p&gt;If there's a microphone anywhere near you, assume it's hot and
  sending whatever you're saying to the world. Seriously.&lt;/p&gt;
  &lt;p&gt;<em>...</em>&lt;/p&gt;
  &lt;section&gt;
   &lt;h1&gt;Comments&lt;/h1&gt;
-  &lt;article itemprop="comment" itemscope itemtype="http://schema.org/UserComments" id="c1"&gt;
-   &lt;link itemprop="url" href="#c1"&gt;
+  &lt;article<!--FORK--> id="c1"&gt;<!--FORK-->
    &lt;footer&gt;
-    &lt;p&gt;Posted by: &lt;span itemprop="creator" itemscope itemtype="http://schema.org/Person"&gt;
-     &lt;span itemprop="name"&gt;George Washington&lt;/span&gt;
-    &lt;/span&gt;&lt;/p&gt;
-    &lt;p&gt;&lt;time itemprop="commentTime" datetime="2009-10-10"&gt;15 minutes ago&lt;/time&gt;&lt;/p&gt;
+    &lt;p&gt;Posted by: <!--FORK-->George Washington<!--FORK-->&lt;/p&gt;
+    &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-10"&gt;15 minutes ago&lt;/time&gt;&lt;/p&gt;
    &lt;/footer&gt;
    &lt;p&gt;Yeah! Especially when talking about your lobbyist friends!&lt;/p&gt;
   &lt;/article&gt;
-  &lt;article itemprop="comment" itemscope itemtype="http://schema.org/UserComments" id="c2"&gt;
-   &lt;link itemprop="url" href="#c2"&gt;
+  &lt;article<!--FORK--> id="c2"&gt;<!--FORK-->
    &lt;footer&gt;
-    &lt;p&gt;Posted by: &lt;span itemprop="creator" itemscope itemtype="http://schema.org/Person"&gt;
-     &lt;span itemprop="name"&gt;George Hammond&lt;/span&gt;
-    &lt;/span&gt;&lt;/p&gt;
-    &lt;p&gt;&lt;time itemprop="commentTime" datetime="2009-10-10"&gt;5 minutes ago&lt;/time&gt;&lt;/p&gt;
+    &lt;p&gt;Posted by: <!--FORK-->George Hammond<!--FORK-->&lt;/p&gt;
+    &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-10"&gt;5 minutes ago&lt;/time&gt;&lt;/p&gt;
    &lt;/footer&gt;
    &lt;p&gt;Hey, you have the same first name as me.&lt;/p&gt;
   &lt;/article&gt;


Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- single-page.html	25 Sep 2012 02:14:19 -0000	1.136
+++ single-page.html	25 Sep 2012 19:14:03 -0000	1.137
@@ -17540,13 +17540,13 @@
    links are present, but only one of those places is considered a
    navigation section.</p>
 
-   <pre>&lt;body itemscope itemtype="http://schema.org/Blog"&gt;
+   <pre>&lt;body<!--FORK-->&gt;
  &lt;header&gt;
   &lt;h1&gt;Wake up sheeple!&lt;/h1&gt;
   &lt;p&gt;&lt;a href="news.html"&gt;News&lt;/a&gt; -
      &lt;a href="blog.html"&gt;Blog&lt;/a&gt; -
      &lt;a href="forums.html"&gt;Forums&lt;/a&gt;&lt;/p&gt;
-  &lt;p&gt;Last Modified: &lt;span itemprop="dateModified"&gt;2009-04-01&lt;/span&gt;&lt;/p&gt;
+  &lt;p&gt;Last Modified: <!--FORK-->2009-04-01<!--FORK-->&lt;/p&gt;
   &lt;nav&gt;
    &lt;h1&gt;Navigation&lt;/h1&gt;
    &lt;ul&gt;
@@ -17557,24 +17557,22 @@
   &lt;/nav&gt;
  &lt;/header&gt;
  &lt;div&gt;
-  &lt;article itemprop="blogPosts" itemscope itemtype="http://schema.org/BlogPosting"&gt;
+  &lt;article<!--FORK-->&gt;
    &lt;header&gt;
-    &lt;h1 itemprop="headline"&gt;My Day at the Beach&lt;/h1&gt;
+    &lt;h1<!--FORK-->&gt;My Day at the Beach&lt;/h1&gt;
    &lt;/header&gt;
-   &lt;div itemprop="articleBody"&gt;
+   &lt;div<!--FORK-->&gt;
     &lt;p&gt;Today I went to the beach and had a lot of fun.&lt;/p&gt;
     <em>...more content...</em>
    &lt;/div&gt;
    &lt;footer&gt;
-    &lt;p&gt;Posted &lt;time itemprop="datePublished" datetime="2009-10-10"&gt;Thursday&lt;/time&gt;.&lt;/p&gt;
+    &lt;p&gt;Posted &lt;time<!--FORK--> datetime="2009-10-10"&gt;Thursday&lt;/time&gt;.&lt;/p&gt;
    &lt;/footer&gt;
   &lt;/article&gt;
   <em>...more blog posts...</em>
  &lt;/div&gt;
  &lt;footer&gt;
-  &lt;p&gt;Copyright ©
-   &lt;span itemprop="copyrightYear"&gt;2010&lt;/span&gt;
-   &lt;span itemprop="copyrightHolder"&gt;The Example Company&lt;/span&gt;
+  &lt;p&gt;Copyright ©<!--FORK--> <!--FORK-->2010<!--FORK--> <!--FORK-->The Example Company<!--FORK-->
   &lt;/p&gt;
   &lt;p&gt;&lt;a href="about.html"&gt;About&lt;/a&gt; -
      &lt;a href="policy.html"&gt;Privacy Policy&lt;/a&gt; -
@@ -17586,9 +17584,7 @@
    contents of the page other than the header and footer, and all the
    contents of the blog entry other than its header and footer.</p>
 
-   <p>You can also see microdata annotations in the above example that
-   use the schema.org vocabulary to provide the publication date and
-   other metadata about the blog post.</p>
+<!--FORK-->
 
   </div>
 
@@ -17706,59 +17702,49 @@
   similar in purpose to the <code title="">entry</code> element in
   Atom. <a href=#refsATOM>[ATOM]</a>
 
-  </p><p class=note>The schema.org microdata vocabulary can be used to
-  provide the publication date for an <code><a href=#the-article-element>article</a></code>
-  element, using one of the CreativeWork subtypes.</p>
+<!--FORK-->
 
-  <div class=example id=article-example>
+  </p><div class=example id=article-example>
 
    <p>This example shows a blog post using the <code><a href=#the-article-element>article</a></code>
-   element, with some schema.org annotations:</p>
+   element<!--FORK-->:</p>
 
-   <pre>&lt;article itemscope itemtype="http://schema.org/BlogPosting"&gt;
+   <pre>&lt;article<!--FORK-->&gt;
  &lt;header&gt;
-  &lt;h1 itemprop="headline"&gt;The Very First Rule of Life&lt;/h1&gt;
-  &lt;p&gt;&lt;time itemprop="datePublished" datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;
-  &lt;link itemprop="url" href="?comments=0"&gt;
- &lt;/header&gt;[
+  &lt;h1<!--FORK-->&gt;The Very First Rule of Life&lt;/h1&gt;
+  &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;<!--FORK-->
+ &lt;/header&gt;
  &lt;p&gt;If there's a microphone anywhere near you, assume it's hot and
  sending whatever you're saying to the world. Seriously.&lt;/p&gt;
  &lt;p&gt;<em>...</em>&lt;/p&gt;
  &lt;footer&gt;
-  &lt;a itemprop="discussionUrl" href="?comments=1"&gt;Show comments...&lt;/a&gt;
+  &lt;a<!--FORK--> href="?comments=1"&gt;Show comments...&lt;/a&gt;
  &lt;/footer&gt;
 &lt;/article&gt;</pre>
 
    <p>Here is that same blog post, but showing some of the comments:</p>
 
-   <pre>&lt;article itemscope itemtype="http://schema.org/BlogPosting"&gt;
+   <pre>&lt;article<!--FORK-->&gt;
  &lt;header&gt;
-  &lt;h1 itemprop="headline"&gt;The Very First Rule of Life&lt;/h1&gt;
-  &lt;p&gt;&lt;time itemprop="datePublished" datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;
-  &lt;link itemprop="url" href="?comments=0"&gt;
+  &lt;h1<!--FORK-->&gt;The Very First Rule of Life&lt;/h1&gt;
+  &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-09"&gt;3 days ago&lt;/time&gt;&lt;/p&gt;<!--FORK-->
  &lt;/header&gt;
  &lt;p&gt;If there's a microphone anywhere near you, assume it's hot and
  sending whatever you're saying to the world. Seriously.&lt;/p&gt;
  &lt;p&gt;<em>...</em>&lt;/p&gt;
  &lt;section&gt;
   &lt;h1&gt;Comments&lt;/h1&gt;
-  &lt;article itemprop="comment" itemscope itemtype="http://schema.org/UserComments" id="c1"&gt;
-   &lt;link itemprop="url" href="#c1"&gt;
+  &lt;article<!--FORK--> id="c1"&gt;<!--FORK-->
    &lt;footer&gt;
-    &lt;p&gt;Posted by: &lt;span itemprop="creator" itemscope itemtype="http://schema.org/Person"&gt;
-     &lt;span itemprop="name"&gt;George Washington&lt;/span&gt;
-    &lt;/span&gt;&lt;/p&gt;
-    &lt;p&gt;&lt;time itemprop="commentTime" datetime="2009-10-10"&gt;15 minutes ago&lt;/time&gt;&lt;/p&gt;
+    &lt;p&gt;Posted by: <!--FORK-->George Washington<!--FORK-->&lt;/p&gt;
+    &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-10"&gt;15 minutes ago&lt;/time&gt;&lt;/p&gt;
    &lt;/footer&gt;
    &lt;p&gt;Yeah! Especially when talking about your lobbyist friends!&lt;/p&gt;
   &lt;/article&gt;
-  &lt;article itemprop="comment" itemscope itemtype="http://schema.org/UserComments" id="c2"&gt;
-   &lt;link itemprop="url" href="#c2"&gt;
+  &lt;article<!--FORK--> id="c2"&gt;<!--FORK-->
    &lt;footer&gt;
-    &lt;p&gt;Posted by: &lt;span itemprop="creator" itemscope itemtype="http://schema.org/Person"&gt;
-     &lt;span itemprop="name"&gt;George Hammond&lt;/span&gt;
-    &lt;/span&gt;&lt;/p&gt;
-    &lt;p&gt;&lt;time itemprop="commentTime" datetime="2009-10-10"&gt;5 minutes ago&lt;/time&gt;&lt;/p&gt;
+    &lt;p&gt;Posted by: <!--FORK-->George Hammond<!--FORK-->&lt;/p&gt;
+    &lt;p&gt;&lt;time<!--FORK--> datetime="2009-10-10"&gt;5 minutes ago&lt;/time&gt;&lt;/p&gt;
    &lt;/footer&gt;
    &lt;p&gt;Hey, you have the same first name as me.&lt;/p&gt;
   &lt;/article&gt;
@@ -21448,20 +21434,6 @@
 
   </div>
 
-  <div class=example>
-
-   <p>Here, a fictional microdata vocabulary based on the Atom
-   vocabulary is used with the <code><a href=#the-time-element>time</a></code> element to mark up a
-   blog post's publication date.</p>
-
-   <pre>&lt;article itemscope itemtype="http://n.example.org/rfc4287"&gt;
- &lt;h1 itemprop="title"&gt;Big tasks&lt;/h1&gt;
- &lt;footer&gt;Published &lt;time itemprop="published" datetime="2009-08-29"&gt;two days ago&lt;/time&gt;.&lt;/footer&gt;
- &lt;p itemprop="content"&gt;Today, I went out and bought a bike for my kid.&lt;/p&gt;
-&lt;/article&gt;</pre>
-
-  </div>
-
 <!--FORK-->
 
   <div class=example>

Index: the-time-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-time-element.html,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- the-time-element.html	25 Sep 2012 02:14:25 -0000	1.185
+++ the-time-element.html	25 Sep 2012 19:14:05 -0000	1.186
@@ -605,20 +605,6 @@
 
   </div>
 
-  <div class="example">
-
-   <p>Here, a fictional microdata vocabulary based on the Atom
-   vocabulary is used with the <code><a href="#the-time-element">time</a></code> element to mark up a
-   blog post's publication date.</p>
-
-   <pre>&lt;article itemscope itemtype="http://n.example.org/rfc4287"&gt;
- &lt;h1 itemprop="title"&gt;Big tasks&lt;/h1&gt;
- &lt;footer&gt;Published &lt;time itemprop="published" datetime="2009-08-29"&gt;two days ago&lt;/time&gt;.&lt;/footer&gt;
- &lt;p itemprop="content"&gt;Today, I went out and bought a bike for my kid.&lt;/p&gt;
-&lt;/article&gt;</pre>
-
-  </div>
-
 <!--FORK-->
 
   <div class="example">

Index: the-nav-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-nav-element.html,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- the-nav-element.html	25 Sep 2012 02:14:23 -0000	1.184
+++ the-nav-element.html	25 Sep 2012 19:14:05 -0000	1.185
@@ -375,13 +375,13 @@
    links are present, but only one of those places is considered a
    navigation section.</p>
 
-   <pre>&lt;body itemscope itemtype="http://schema.org/Blog"&gt;
+   <pre>&lt;body<!--FORK-->&gt;
  &lt;header&gt;
   &lt;h1&gt;Wake up sheeple!&lt;/h1&gt;
   &lt;p&gt;&lt;a href="news.html"&gt;News&lt;/a&gt; -
      &lt;a href="blog.html"&gt;Blog&lt;/a&gt; -
      &lt;a href="forums.html"&gt;Forums&lt;/a&gt;&lt;/p&gt;
-  &lt;p&gt;Last Modified: &lt;span itemprop="dateModified"&gt;2009-04-01&lt;/span&gt;&lt;/p&gt;
+  &lt;p&gt;Last Modified: <!--FORK-->2009-04-01<!--FORK-->&lt;/p&gt;
   &lt;nav&gt;
    &lt;h1&gt;Navigation&lt;/h1&gt;
    &lt;ul&gt;
@@ -392,24 +392,22 @@
   &lt;/nav&gt;
  &lt;/header&gt;
  &lt;div&gt;
-  &lt;article itemprop="blogPosts" itemscope itemtype="http://schema.org/BlogPosting"&gt;
+  &lt;article<!--FORK-->&gt;
    &lt;header&gt;
-    &lt;h1 itemprop="headline"&gt;My Day at the Beach&lt;/h1&gt;
+    &lt;h1<!--FORK-->&gt;My Day at the Beach&lt;/h1&gt;
    &lt;/header&gt;
-   &lt;div itemprop="articleBody"&gt;
+   &lt;div<!--FORK-->&gt;
     &lt;p&gt;Today I went to the beach and had a lot of fun.&lt;/p&gt;
     <em>...more content...</em>
    &lt;/div&gt;
    &lt;footer&gt;
-    &lt;p&gt;Posted &lt;time itemprop="datePublished" datetime="2009-10-10"&gt;Thursday&lt;/time&gt;.&lt;/p&gt;
+    &lt;p&gt;Posted &lt;time<!--FORK--> datetime="2009-10-10"&gt;Thursday&lt;/time&gt;.&lt;/p&gt;
    &lt;/footer&gt;
   &lt;/article&gt;
   <em>...more blog posts...</em>
  &lt;/div&gt;
  &lt;footer&gt;
-  &lt;p&gt;Copyright &#169;
-   &lt;span itemprop="copyrightYear"&gt;2010&lt;/span&gt;
-   &lt;span itemprop="copyrightHolder"&gt;The Example Company&lt;/span&gt;
+  &lt;p&gt;Copyright &#169;<!--FORK--> <!--FORK-->2010<!--FORK--> <!--FORK-->The Example Company<!--FORK-->
   &lt;/p&gt;
   &lt;p&gt;&lt;a href="about.html"&gt;About&lt;/a&gt; -
      &lt;a href="policy.html"&gt;Privacy Policy&lt;/a&gt; -
@@ -421,9 +419,7 @@
    contents of the page other than the header and footer, and all the
    contents of the blog entry other than its header and footer.</p>
 
-   <p>You can also see microdata annotations in the above example that
-   use the schema.org vocabulary to provide the publication date and
-   other metadata about the blog post.</p>
+<!--FORK-->
 
   </div>
 

Received on Tuesday, 25 September 2012 19:14:13 UTC