[html5] r7276 - [ac] (0) Updates the the vCard section, and related cleanup. Affected topics: HT [...]

whatwg at whatwg.org whatwg at whatwg.org
Sat Aug 25 20:55:28 PDT 2012


Author: ianh
Date: 2012-08-25 20:55:27 -0700 (Sat, 25 Aug 2012)
New Revision: 7276

Modified:
   complete.html
   index
   source
Log:
[ac] (0) Updates the the vCard section, and related cleanup.
Affected topics: HTML, Microdata

Modified: complete.html
===================================================================
--- complete.html	2012-08-26 03:04:29 UTC (rev 7275)
+++ complete.html	2012-08-26 03:55:27 UTC (rev 7276)
@@ -62843,7 +62843,6 @@
 
   </div>
 
-<!--MD-->
 
 
   <div data-component="HTML Microdata (editor: Ian Hickson)"><!--TOPIC:Microdata-->
@@ -62911,7 +62910,6 @@
 
 -->
 
-
   <h3 id=introduction-4><span class=secno>5.1 </span>Introduction</h3>
 
   <h4 id=overview><span class=secno>5.1.1 </span>Overview</h4>
@@ -62989,7 +62987,6 @@
 
   </div>
 
-<!--DATA--><!--FORK-->
   <p>When a string value is in some machine-readable format unsuitable
   for human consumption, it is expressed using the <code title=attr-data-value><a href=#attr-data-value>value</a></code> attribute of the
   <code><a href=#the-data-element>data</a></code> element, with the human-readable version given in
@@ -63006,7 +63003,6 @@
 </h1></pre>
 
   </div>
-<!--DATA--><!--FORK-->
 
   <p>For date- and time-related data, the <code><a href=#the-time-element>time</a></code> element
   and its <code title=attr-time-datetime><a href=#attr-time-datetime>datetime</a></code> attribute
@@ -63459,7 +63455,6 @@
   <h3 id=encoding-microdata><span class=secno>5.2 </span>Encoding microdata</h3>
 
 
-
   <h4 id=the-microdata-model><span class=secno>5.2.1 </span>The microdata model</h4>
 
   <p>The microdata model consists of groups of name-value pairs known
@@ -63906,10 +63901,8 @@
   elements</a>), because of the requirement above.</p>
 
 
+  <div class=impl>
 
-  <div class=impl> <!-- this is unfortunate, as it is hiding authoring conformance criteria (so we leave it in for the w3c copy) -->
-
-
   <h4 id=associating-names-with-items><span class=secno>5.2.5 </span>Associating names with items</h4>
 
   <p>To find <dfn id=the-properties-of-an-item>the properties of an item</dfn> defined by the
@@ -64038,11 +64031,9 @@
     <dd><code title="">http://www.opensource.org/licenses/mit-license.php</code>
    </dl></div>
 
-
   </div> <!-- see comment above -->
 
 
-
   <h4 id=microdata-and-other-namespaces><span class=secno>5.2.6 </span>Microdata and other namespaces</h4>
 
   <p>Currently, the <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code>,
@@ -64230,16 +64221,10 @@
   </div>
 
 
-
-
   <h3 id=mdvocabs><span class=secno>5.4 </span>Microdata vocabularies</h3>
 
-
-
   <h4 id=vcard><span class=secno>5.4.1 </span>vCard</h4>
 
-
-
   <p>An item with the <a href=#item-types title="item types">item type</a> <dfn id=md-vcard title=md-vcard><code>http://microformats.org/profile/hcard</code></dfn>
   represents a person's or organization's contact information.</p>
 
@@ -64248,9 +64233,9 @@
 
   <p>The following are the type's <a href=#defined-property-name title="defined property
   name">defined property names</a>. They are based on the
-  vocabulary defined in the vCard specification and its extensions,
-  where more information on how to interpret the values can be
-  found. <a href=#refsRFC6350>[RFC6350]</a></p>
+  vocabulary defined in the vCard 4.0 specification and its
+  extensions, where more information on how to interpret the values
+  can be found. <a href=#refsRFC6350>[RFC6350]</a></p>
 
   <dl><dt><dfn id=md-vcard-kind title=md-vcard-kind><code>kind</code></dfn></dt>
 
@@ -64502,9 +64487,10 @@
     <p>If no <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> properties
     are present within an <a href=#concept-item title=concept-item>item</a> that
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of an
-    <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, then the <a href=#address-type-strings>address type
-    strings</a> <code title=mv-vcard-type-adr-intl>intl</code>,
-    <code title=mv-vcard-type-adr-postal>postal</code>, <code title=mv-vcard-type-adr-parcel>parcel</code>, and <code title=mv-vcard-type-adr-work>work</code> are implied.</p>
+    <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>,
+    then the <a href=#address-type-strings title="address type strings">address type
+    string</a> <code title=md-vcard-type-adr-work><a href=#md-vcard-type-adr-work>work</a></code> is
+    implied.</p>
 
     <p>Any number of properties with the name <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> may be present within each <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
 
@@ -64520,11 +64506,6 @@
     text that, when compared in a <a href=#case-sensitive>case-sensitive</a> manner,
     is equal to one of the <a href=#address-type-strings>address type strings</a>.</p>
 
-    <p>Within each <a href=#concept-item title=concept-item>item</a> with the
-    type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, there must be no more
-    than one <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> property whose value is
-    <code title=md-vcard-type-adr-pref>pref</code>.</p>
-
     <p>Any number of properties with the name <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> may be present within the
     <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of an <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, but within each such <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> property per distinct
     value.</p>
@@ -64546,6 +64527,9 @@
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of an
     <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
 
+    <p class=note>The vCard specification urges authors not to use
+    this field.</p>
+
    </dd>
 
    <dt><dfn id=md-vcard-adr-extended-address title=md-vcard-adr-extended-address><code>extended-address</code></dfn> (inside <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code>)</dt>
@@ -64563,6 +64547,9 @@
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of an
     <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
 
+    <p class=note>The vCard specification urges authors not to use
+    this field.</p>
+
    </dd>
 
    <dt><dfn id=md-vcard-adr-street-address title=md-vcard-adr-street-address><code>street-address</code></dfn> (inside <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code>)</dt>
@@ -64647,67 +64634,6 @@
    </dd>
 
 
-   <dt><dfn id=md-vcard-label title=md-vcard-label><code>label</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the formatted text corresponding to the delivery address
-    of the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    either text or an <a href=#concept-item title=concept-item>item</a> with zero
-    or more <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> properties
-    and exactly one <code title=md-vcard-label-value><a href=#md-vcard-label-value>value</a></code>
-    property.</p>
-
-    <p>If no <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> properties
-    are present within an <a href=#concept-item title=concept-item>item</a> that
-    forms the <a href=#concept-property-value title=concept-property-value>value</a> of a
-    <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, or if the <a href=#concept-property-value title=concept-property-value>value</a> of such a <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property is text, then the
-    <a href=#address-type-strings>address type strings</a> <code title=mv-vcard-type-adr-intl>intl</code>, <code title=mv-vcard-type-adr-postal>postal</code>, <code title=mv-vcard-type-adr-parcel>parcel</code>, and <code title=mv-vcard-type-adr-work>work</code> are implied.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> may be present within each
-    <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
-
-   </dd>
-
-   <dt><dfn id=md-vcard-label-type title=md-vcard-label-type><code>type</code></dfn> (inside <code title=md-vcard-label><a href=#md-vcard-label>label</a></code>)</dt>
-
-   <dd>
-
-    <p>Gives the type of delivery address.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text that, when compared in a <a href=#case-sensitive>case-sensitive</a> manner,
-    is equal to one of the <a href=#address-type-strings>address type strings</a>.</p>
-
-    <p>Within each <a href=#concept-item title=concept-item>item</a> with the
-    type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, there must be no more
-    than one <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> property whose value is
-    <code title=md-vcard-type-adr-pref>pref</code>.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> may be present within the
-    <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of a <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, but within each such <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> property per distinct
-    value.</p>
-
-   </dd>
-
-   <dt><dfn id=md-vcard-label-value title=md-vcard-label-value><code>value</code></dfn> (inside <code title=md-vcard-label><a href=#md-vcard-label>label</a></code>)</dt>
-
-   <dd>
-
-    <p>Gives the actual formatted text corresponding to the delivery
-    address of the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
-
-    <p>Exactly one property with the name <code title=md-vcard-label-value><a href=#md-vcard-label-value>value</a></code> must be present within
-    the <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of a <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
-
-   </dd>
-
-
    <dt><dfn id=md-vcard-tel title=md-vcard-tel><code>tel</code></dfn></dt>
 
    <dd>
@@ -64722,7 +64648,7 @@
     <p>If no <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> properties
     are present within an <a href=#concept-item title=concept-item>item</a> that
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of a
-    <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, or if the <a href=#concept-property-value title=concept-property-value>value</a> of such a <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property is text, then the <a href=#telephone-type-strings title="telephone type strings">telephone type string</a> <code title=mv-vcard-type-tel-voice>voice</code> is implied.</p>
+    <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, or if the <a href=#concept-property-value title=concept-property-value>value</a> of such a <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property is text, then the <a href=#telephone-type-strings title="telephone type strings">telephone type string</a> <code title=md-vcard-type-tel-voice><a href=#md-vcard-type-tel-voice>voice</a></code> is implied.</p>
 
     <p>Any number of properties with the name <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> may be present within each
     <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
@@ -64739,11 +64665,6 @@
     text that, when compared in a <a href=#case-sensitive>case-sensitive</a> manner,
     is equal to one of the <a href=#telephone-type-strings>telephone type strings</a>.</p>
 
-    <p>Within each <a href=#concept-item title=concept-item>item</a> with the
-    type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, there must be no more
-    than one <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> property whose value is
-    <code title=md-vcard-type-tel-pref>pref</code>.</p>
-
     <p>Any number of properties with the name <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> may be present within the
     <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of a <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, but within each such <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> property per distinct
     value.</p>
@@ -65204,7 +65125,7 @@
 
   <dl><dt><dfn id=md-vcard-type-adr-home title=md-vcard-type-adr-home><code>home</code></dfn></dt>
    <dd>
-    <p>Indicates a residential delivery address.</p>
+    <p>Indicates a delivery address for a residence.</p>
    </dd>
 
    <dt><dfn id=md-vcard-type-adr-work title=md-vcard-type-adr-work><code>work</code></dfn></dt>
@@ -65849,11 +65770,8 @@
   </div>
 
 
-
   <h4 id=vevent><span class=secno>5.4.2 </span>vEvent</h4>
 
-
-
   <p>An item with the <a href=#item-types title="item types">item type</a> <dfn id=md-vevent title=md-vevent><code>http://microformats.org/profile/hcalendar#vevent</code></dfn>
   represents an event.</p>
 
@@ -66657,11 +66575,8 @@
   </div>
 
 
-
   <h4 id=licensing-works><span class=secno>5.4.3 </span>Licensing works</h4>
 
-
-
   <p>An item with the <a href=#item-types title="item types">item type</a> <dfn id=md-work title=md-work><code>http://n.whatwg.org/work</code></dfn>
   represents a work (e.g. an article, an image, a video, a song,
   etc). This type is primarily intended to allow authors to include
@@ -66756,11 +66671,6 @@
   </div>
 
 
-
-
-
-
-
   <div class=impl>
 
   <h3 id=converting-html-to-other-formats><span class=secno>5.5 </span>Converting HTML to other formats</h3>
@@ -66851,13 +66761,9 @@
 
   </ol></div>
 
-
-
   </div><!--data-component--><!--TOPIC:HTML-->
 
-<!--MD-->
 
-
   <h2 id=browsers><span class=secno>6 </span>Loading Web pages</h2>
 
   <div class=impl>
@@ -80150,8 +80056,6 @@
 
    <!-- DND-v2: text/html as an export format -->
 
-<!--MD-->
-
    <li>
 
     <p>If the <a href=#list-of-dragged-nodes>list of dragged nodes</a> is not empty, then
@@ -80171,7 +80075,6 @@
 
     </dl></li>
 
-
    <li>
 
     <p>Run the following substeps:</p>

Modified: index
===================================================================
--- index	2012-08-26 03:04:29 UTC (rev 7275)
+++ index	2012-08-26 03:55:27 UTC (rev 7276)
@@ -62843,7 +62843,6 @@
 
   </div>
 
-<!--MD-->
 
 
   <div data-component="HTML Microdata (editor: Ian Hickson)"><!--TOPIC:Microdata-->
@@ -62911,7 +62910,6 @@
 
 -->
 
-
   <h3 id=introduction-4><span class=secno>5.1 </span>Introduction</h3>
 
   <h4 id=overview><span class=secno>5.1.1 </span>Overview</h4>
@@ -62989,7 +62987,6 @@
 
   </div>
 
-<!--DATA--><!--FORK-->
   <p>When a string value is in some machine-readable format unsuitable
   for human consumption, it is expressed using the <code title=attr-data-value><a href=#attr-data-value>value</a></code> attribute of the
   <code><a href=#the-data-element>data</a></code> element, with the human-readable version given in
@@ -63006,7 +63003,6 @@
 </h1></pre>
 
   </div>
-<!--DATA--><!--FORK-->
 
   <p>For date- and time-related data, the <code><a href=#the-time-element>time</a></code> element
   and its <code title=attr-time-datetime><a href=#attr-time-datetime>datetime</a></code> attribute
@@ -63459,7 +63455,6 @@
   <h3 id=encoding-microdata><span class=secno>5.2 </span>Encoding microdata</h3>
 
 
-
   <h4 id=the-microdata-model><span class=secno>5.2.1 </span>The microdata model</h4>
 
   <p>The microdata model consists of groups of name-value pairs known
@@ -63906,10 +63901,8 @@
   elements</a>), because of the requirement above.</p>
 
 
+  <div class=impl>
 
-  <div class=impl> <!-- this is unfortunate, as it is hiding authoring conformance criteria (so we leave it in for the w3c copy) -->
-
-
   <h4 id=associating-names-with-items><span class=secno>5.2.5 </span>Associating names with items</h4>
 
   <p>To find <dfn id=the-properties-of-an-item>the properties of an item</dfn> defined by the
@@ -64038,11 +64031,9 @@
     <dd><code title="">http://www.opensource.org/licenses/mit-license.php</code>
    </dl></div>
 
-
   </div> <!-- see comment above -->
 
 
-
   <h4 id=microdata-and-other-namespaces><span class=secno>5.2.6 </span>Microdata and other namespaces</h4>
 
   <p>Currently, the <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code>,
@@ -64230,16 +64221,10 @@
   </div>
 
 
-
-
   <h3 id=mdvocabs><span class=secno>5.4 </span>Microdata vocabularies</h3>
 
-
-
   <h4 id=vcard><span class=secno>5.4.1 </span>vCard</h4>
 
-
-
   <p>An item with the <a href=#item-types title="item types">item type</a> <dfn id=md-vcard title=md-vcard><code>http://microformats.org/profile/hcard</code></dfn>
   represents a person's or organization's contact information.</p>
 
@@ -64248,9 +64233,9 @@
 
   <p>The following are the type's <a href=#defined-property-name title="defined property
   name">defined property names</a>. They are based on the
-  vocabulary defined in the vCard specification and its extensions,
-  where more information on how to interpret the values can be
-  found. <a href=#refsRFC6350>[RFC6350]</a></p>
+  vocabulary defined in the vCard 4.0 specification and its
+  extensions, where more information on how to interpret the values
+  can be found. <a href=#refsRFC6350>[RFC6350]</a></p>
 
   <dl><dt><dfn id=md-vcard-kind title=md-vcard-kind><code>kind</code></dfn></dt>
 
@@ -64502,9 +64487,10 @@
     <p>If no <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> properties
     are present within an <a href=#concept-item title=concept-item>item</a> that
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of an
-    <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, then the <a href=#address-type-strings>address type
-    strings</a> <code title=mv-vcard-type-adr-intl>intl</code>,
-    <code title=mv-vcard-type-adr-postal>postal</code>, <code title=mv-vcard-type-adr-parcel>parcel</code>, and <code title=mv-vcard-type-adr-work>work</code> are implied.</p>
+    <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>,
+    then the <a href=#address-type-strings title="address type strings">address type
+    string</a> <code title=md-vcard-type-adr-work><a href=#md-vcard-type-adr-work>work</a></code> is
+    implied.</p>
 
     <p>Any number of properties with the name <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> may be present within each <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
 
@@ -64520,11 +64506,6 @@
     text that, when compared in a <a href=#case-sensitive>case-sensitive</a> manner,
     is equal to one of the <a href=#address-type-strings>address type strings</a>.</p>
 
-    <p>Within each <a href=#concept-item title=concept-item>item</a> with the
-    type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, there must be no more
-    than one <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> property whose value is
-    <code title=md-vcard-type-adr-pref>pref</code>.</p>
-
     <p>Any number of properties with the name <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> may be present within the
     <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of an <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, but within each such <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-adr-type><a href=#md-vcard-adr-type>type</a></code> property per distinct
     value.</p>
@@ -64546,6 +64527,9 @@
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of an
     <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
 
+    <p class=note>The vCard specification urges authors not to use
+    this field.</p>
+
    </dd>
 
    <dt><dfn id=md-vcard-adr-extended-address title=md-vcard-adr-extended-address><code>extended-address</code></dfn> (inside <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code>)</dt>
@@ -64563,6 +64547,9 @@
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of an
     <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
 
+    <p class=note>The vCard specification urges authors not to use
+    this field.</p>
+
    </dd>
 
    <dt><dfn id=md-vcard-adr-street-address title=md-vcard-adr-street-address><code>street-address</code></dfn> (inside <code title=md-vcard-adr><a href=#md-vcard-adr>adr</a></code>)</dt>
@@ -64647,67 +64634,6 @@
    </dd>
 
 
-   <dt><dfn id=md-vcard-label title=md-vcard-label><code>label</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the formatted text corresponding to the delivery address
-    of the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    either text or an <a href=#concept-item title=concept-item>item</a> with zero
-    or more <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> properties
-    and exactly one <code title=md-vcard-label-value><a href=#md-vcard-label-value>value</a></code>
-    property.</p>
-
-    <p>If no <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> properties
-    are present within an <a href=#concept-item title=concept-item>item</a> that
-    forms the <a href=#concept-property-value title=concept-property-value>value</a> of a
-    <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, or if the <a href=#concept-property-value title=concept-property-value>value</a> of such a <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property is text, then the
-    <a href=#address-type-strings>address type strings</a> <code title=mv-vcard-type-adr-intl>intl</code>, <code title=mv-vcard-type-adr-postal>postal</code>, <code title=mv-vcard-type-adr-parcel>parcel</code>, and <code title=mv-vcard-type-adr-work>work</code> are implied.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> may be present within each
-    <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
-
-   </dd>
-
-   <dt><dfn id=md-vcard-label-type title=md-vcard-label-type><code>type</code></dfn> (inside <code title=md-vcard-label><a href=#md-vcard-label>label</a></code>)</dt>
-
-   <dd>
-
-    <p>Gives the type of delivery address.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text that, when compared in a <a href=#case-sensitive>case-sensitive</a> manner,
-    is equal to one of the <a href=#address-type-strings>address type strings</a>.</p>
-
-    <p>Within each <a href=#concept-item title=concept-item>item</a> with the
-    type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, there must be no more
-    than one <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> property whose value is
-    <code title=md-vcard-type-adr-pref>pref</code>.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> may be present within the
-    <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of a <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, but within each such <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-label-type><a href=#md-vcard-label-type>type</a></code> property per distinct
-    value.</p>
-
-   </dd>
-
-   <dt><dfn id=md-vcard-label-value title=md-vcard-label-value><code>value</code></dfn> (inside <code title=md-vcard-label><a href=#md-vcard-label>label</a></code>)</dt>
-
-   <dd>
-
-    <p>Gives the actual formatted text corresponding to the delivery
-    address of the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
-
-    <p>Exactly one property with the name <code title=md-vcard-label-value><a href=#md-vcard-label-value>value</a></code> must be present within
-    the <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of a <code title=md-vcard-label><a href=#md-vcard-label>label</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
-
-   </dd>
-
-
    <dt><dfn id=md-vcard-tel title=md-vcard-tel><code>tel</code></dfn></dt>
 
    <dd>
@@ -64722,7 +64648,7 @@
     <p>If no <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> properties
     are present within an <a href=#concept-item title=concept-item>item</a> that
     forms the <a href=#concept-property-value title=concept-property-value>value</a> of a
-    <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, or if the <a href=#concept-property-value title=concept-property-value>value</a> of such a <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property is text, then the <a href=#telephone-type-strings title="telephone type strings">telephone type string</a> <code title=mv-vcard-type-tel-voice>voice</code> is implied.</p>
+    <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, or if the <a href=#concept-property-value title=concept-property-value>value</a> of such a <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property is text, then the <a href=#telephone-type-strings title="telephone type strings">telephone type string</a> <code title=md-vcard-type-tel-voice><a href=#md-vcard-type-tel-voice>voice</a></code> is implied.</p>
 
     <p>Any number of properties with the name <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> may be present within each
     <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>.</p>
@@ -64739,11 +64665,6 @@
     text that, when compared in a <a href=#case-sensitive>case-sensitive</a> manner,
     is equal to one of the <a href=#telephone-type-strings>telephone type strings</a>.</p>
 
-    <p>Within each <a href=#concept-item title=concept-item>item</a> with the
-    type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, there must be no more
-    than one <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> property whose value is
-    <code title=md-vcard-type-tel-pref>pref</code>.</p>
-
     <p>Any number of properties with the name <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> may be present within the
     <a href=#concept-item title=concept-item>item</a> that forms the <a href=#concept-property-value title=concept-property-value>value</a> of a <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property of an <a href=#concept-item title=concept-item>item</a> with the type <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>, but within each such <code title=md-vcard-tel><a href=#md-vcard-tel>tel</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-tel-type><a href=#md-vcard-tel-type>type</a></code> property per distinct
     value.</p>
@@ -65204,7 +65125,7 @@
 
   <dl><dt><dfn id=md-vcard-type-adr-home title=md-vcard-type-adr-home><code>home</code></dfn></dt>
    <dd>
-    <p>Indicates a residential delivery address.</p>
+    <p>Indicates a delivery address for a residence.</p>
    </dd>
 
    <dt><dfn id=md-vcard-type-adr-work title=md-vcard-type-adr-work><code>work</code></dfn></dt>
@@ -65849,11 +65770,8 @@
   </div>
 
 
-
   <h4 id=vevent><span class=secno>5.4.2 </span>vEvent</h4>
 
-
-
   <p>An item with the <a href=#item-types title="item types">item type</a> <dfn id=md-vevent title=md-vevent><code>http://microformats.org/profile/hcalendar#vevent</code></dfn>
   represents an event.</p>
 
@@ -66657,11 +66575,8 @@
   </div>
 
 
-
   <h4 id=licensing-works><span class=secno>5.4.3 </span>Licensing works</h4>
 
-
-
   <p>An item with the <a href=#item-types title="item types">item type</a> <dfn id=md-work title=md-work><code>http://n.whatwg.org/work</code></dfn>
   represents a work (e.g. an article, an image, a video, a song,
   etc). This type is primarily intended to allow authors to include
@@ -66756,11 +66671,6 @@
   </div>
 
 
-
-
-
-
-
   <div class=impl>
 
   <h3 id=converting-html-to-other-formats><span class=secno>5.5 </span>Converting HTML to other formats</h3>
@@ -66851,13 +66761,9 @@
 
   </ol></div>
 
-
-
   </div><!--data-component--><!--TOPIC:HTML-->
 
-<!--MD-->
 
-
   <h2 id=browsers><span class=secno>6 </span>Loading Web pages</h2>
 
   <div class=impl>
@@ -80150,8 +80056,6 @@
 
    <!-- DND-v2: text/html as an export format -->
 
-<!--MD-->
-
    <li>
 
     <p>If the <a href=#list-of-dragged-nodes>list of dragged nodes</a> is not empty, then
@@ -80171,7 +80075,6 @@
 
     </dl></li>
 
-
    <li>
 
     <p>Run the following substeps:</p>

Modified: source
===================================================================
--- source	2012-08-26 03:04:29 UTC (rev 7275)
+++ source	2012-08-26 03:55:27 UTC (rev 7276)
@@ -73443,7 +73443,6 @@
 
   </div>
 
-<!--END w3c-html--><!--MD-->
 
 
   <div data-component="HTML Microdata (editor: Ian Hickson)"><!--TOPIC:Microdata-->
@@ -73510,7 +73509,6 @@
      </span>
 
 -->
-<!--START microdata-->
 
   <h3>Introduction</h3>
 
@@ -73594,7 +73592,6 @@
 
   </div>
 
-<!--END w3c-html--><!--DATA--><!--FORK-->
   <p>When a string value is in some machine-readable format unsuitable
   for human consumption, it is expressed using the <code
   title="attr-data-value">value</code> attribute of the
@@ -73612,7 +73609,6 @@
 </h1></pre>
 
   </div>
-<!--START w3c-html--><!--DATA--><!--FORK-->
 
   <p>For date- and time-related data, the <code>time</code> element
   and its <code title="attr-time-datetime">datetime</code> attribute
@@ -74107,22 +74103,7 @@
 
   <h3>Encoding microdata</h3>
 
-<!--END dev-html--><!--END complete--><!--MD-->
 
-  <p>The following attributes are added as <span>global
-  attributes</span> to <span>HTML elements</span>:</p>
-
-  <ul class="brief">
-   <li><code title="attr-itemid">itemid</code></li>
-   <li><code title="attr-itemprop">itemprop</code></li>
-   <li><code title="attr-itemref">itemref</code></li>
-   <li><code title="attr-itemscope">itemscope</code></li>
-   <li><code title="attr-itemtype">itemtype</code></li>
-  </ul>
-
-<!--START dev-html--><!--START complete--><!--MD-->
-
-
   <h4>The microdata model</h4>
 
   <p>The microdata model consists of groups of name-value pairs known
@@ -74628,9 +74609,7 @@
   elements</span>), because of the requirement above.</p>
 
 
-<!--END w3c-html-->
-  <div class="impl"> <!-- this is unfortunate, as it is hiding authoring conformance criteria (so we leave it in for the w3c copy) -->
-<!--START w3c-html-->
+  <div class="impl">
 
   <h4>Associating names with items</h4>
 
@@ -74787,9 +74766,7 @@
 
   </div>
 
-<!--END w3c-html-->
   </div> <!-- see comment above -->
-<!--START w3c-html-->
 
 
   <h4>Microdata and other namespaces</h4>
@@ -75013,89 +74990,10 @@
   </div>
 
 
-
-<!--END complete--><!--END dev-html--><!--MD-->
-<!--YYY-->
-  <h3>Other changes to HTML5</h3>
-
-  <h4>Content models</h4>
-
-  <p>If the <code title="attr-itemprop">itemprop</code> attribute is
-  present on <code>link</code> or <code>meta</code>, they are
-  <span>flow content</span> and <span>phrasing content</span>. The
-  <code>link</code> and <code>meta</code> elements may be used where
-  <span>phrasing content</span> is expected if the <code
-  title="attr-itemprop">itemprop</code> attribute is present.</p>
-
-  <p>If a <code>link</code> element has an <code
-  title="attr-itemprop">itemprop</code> attribute, the <code
-  title="attr-link-rel">rel</code> attribute may be omitted.</p>
-
-  <p>If a <code>meta</code> element has an <code
-  title="attr-itemprop">itemprop</code> attribute, the <code
-  title="attr-meta-name">name</code>, <code
-  title="attr-meta-http-equiv">http-equiv</code>, and <code
-  title="attr-meta-charset">charset</code> attributes must be omitted,
-  and the <code title="attr-meta-content">content</code> attribute
-  must be present.</p>
-
-  <p>If the <code title="attr-itemprop">itemprop</code> is specified
-  on an <code>a</code> or <code>area</code> element, then the <code
-  title="attr-hyperlink-href">href</code> attribute must also be
-  specified.</p>
-
-  <p>If the <code title="attr-itemprop">itemprop</code> is specified
-  on an <code>iframe</code> element, then the <code
-  title="attr-iframe-src">data</code> attribute must also be
-  specified.</p>
-
-  <p>If the <code title="attr-itemprop">itemprop</code> is specified
-  on an <code>embed</code> element, then the <code
-  title="attr-embed-src">data</code> attribute must also be
-  specified.</p>
-
-  <p>If the <code title="attr-itemprop">itemprop</code> is specified
-  on an <code>object</code> element, then the <code
-  title="attr-object-data">data</code> attribute must also be
-  specified.</p>
-
-  <p>If the <code title="attr-itemprop">itemprop</code> is specified
-  on a <span>media element</span>, then the <code
-  title="attr-media-src">src</code> attribute must also be
-  specified.</p>
-<!--/YYY-->
-
-  <div class="impl">
-
-  <h4>Drag-and-drop</h4>
-
-  <p>The <span>drag-and-drop initialization steps</span> are:
-
-  <ol>
-   <li>
-    <p>The user agent must take the <span>list of dragged nodes</span>
-    and <span title="extracting JSON">extract the microdata from those
-    nodes into a JSON form</span>, and then must add the resulting
-    string to the <code
-    title="dom-DragEvent-dataTransfer">dataTransfer</code> member,
-    associated with the <code
-    title="">application/microdata+json</code> format.</p>
-   </li>
-  </ol>
-
-  </div>
-
-<!--END microdata-->
-<!--START complete--><!--START dev-html--><!--MD-->
-
   <h3 id="mdvocabs">Microdata vocabularies</h3>
 
-<!--START vocabs-->
-
   <h4>vCard</h4>
 
-<!--START vCard-->
-
   <p>An item with the <span title="item types">item type</span> <dfn
   title="md-vcard"><code>http://microformats.org/profile/hcard</code></dfn>
   represents a person's or organization's contact information.</p>
@@ -75105,10 +75003,9 @@
 
   <p>The following are the type's <span title="defined property
   name">defined property names</span>. They are based on the
-  vocabulary defined in the vCard specification and its extensions,
-  where more information on how to interpret the values can be
-  found. <a
-  href="#refsRFC6350">[RFC6350]</a></p>
+  vocabulary defined in the vCard 4.0 specification and its
+  extensions, where more information on how to interpret the values
+  can be found. <a href="#refsRFC6350">[RFC6350]</a></p>
 
   <dl>
 
@@ -75415,11 +75312,10 @@
     forms the <span title="concept-property-value">value</span> of an
     <code title="md-vcard-adr">adr</code> property of an <span
     title="concept-item">item</span> with the type <code
-    title="md-vcard">http://microformats.org/profile/hcard</code>, then the <span>address type
-    strings</span> <code title="mv-vcard-type-adr-intl">intl</code>,
-    <code title="mv-vcard-type-adr-postal">postal</code>, <code
-    title="mv-vcard-type-adr-parcel">parcel</code>, and <code
-    title="mv-vcard-type-adr-work">work</code> are implied.</p>
+    title="md-vcard">http://microformats.org/profile/hcard</code>,
+    then the <span title="address type strings">address type
+    string</span> <code title="md-vcard-type-adr-work">work</code> is
+    implied.</p>
 
     <p>Any number of properties with the name <code
     title="md-vcard-adr">adr</code> may be present within each <span
@@ -75438,13 +75334,6 @@
     text that, when compared in a <span>case-sensitive</span> manner,
     is equal to one of the <span>address type strings</span>.</p>
 
-    <p>Within each <span title="concept-item">item</span> with the
-    type <code title="md-vcard">http://microformats.org/profile/hcard</code>, there must be no more
-    than one <code title="md-vcard-adr">adr</code> property <span
-    title="concept-item">item</span> with a <code
-    title="md-vcard-adr-type">type</code> property whose value is
-    <code title="md-vcard-type-adr-pref">pref</code>.</p>
-
     <p>Any number of properties with the name <code
     title="md-vcard-adr-type">type</code> may be present within the
     <span title="concept-item">item</span> that forms the <span
@@ -75477,6 +75366,9 @@
     title="concept-item">item</span> with the type <code
     title="md-vcard">http://microformats.org/profile/hcard</code>.</p>
 
+    <p class="note">The vCard specification urges authors not to use
+    this field.</p>
+
    </dd>
 
    <dt><dfn title="md-vcard-adr-extended-address"><code>extended-address</code></dfn> (inside <code title="md-vcard-adr">adr</code>)</dt>
@@ -75497,6 +75389,9 @@
     title="concept-item">item</span> with the type <code
     title="md-vcard">http://microformats.org/profile/hcard</code>.</p>
 
+    <p class="note">The vCard specification urges authors not to use
+    this field.</p>
+
    </dd>
 
    <dt><dfn title="md-vcard-adr-street-address"><code>street-address</code></dfn> (inside <code title="md-vcard-adr">adr</code>)</dt>
@@ -75600,92 +75495,6 @@
    </dd>
 
 
-   <dt><dfn title="md-vcard-label"><code>label</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the formatted text corresponding to the delivery address
-    of the person or organization.</p>
-
-    <p>The <span title="concept-property-value">value</span> must be
-    either text or an <span title="concept-item">item</span> with zero
-    or more <code title="md-vcard-label-type">type</code> properties
-    and exactly one <code title="md-vcard-label-value">value</code>
-    property.</p>
-
-    <p>If no <code title="md-vcard-label-type">type</code> properties
-    are present within an <span title="concept-item">item</span> that
-    forms the <span title="concept-property-value">value</span> of a
-    <code title="md-vcard-label">label</code> property of an <span
-    title="concept-item">item</span> with the type <code
-    title="md-vcard">http://microformats.org/profile/hcard</code>, or if the <span
-    title="concept-property-value">value</span> of such a <code
-    title="md-vcard-label">label</code> property is text, then the
-    <span>address type strings</span> <code
-    title="mv-vcard-type-adr-intl">intl</code>, <code
-    title="mv-vcard-type-adr-postal">postal</code>, <code
-    title="mv-vcard-type-adr-parcel">parcel</code>, and <code
-    title="mv-vcard-type-adr-work">work</code> are implied.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-label">label</code> may be present within each
-    <span title="concept-item">item</span> with the type <code
-    title="md-vcard">http://microformats.org/profile/hcard</code>.</p>
-
-   </dd>
-
-   <dt><dfn title="md-vcard-label-type"><code>type</code></dfn> (inside <code title="md-vcard-label">label</code>)</dt>
-
-   <dd>
-
-    <p>Gives the type of delivery address.</p>
-
-    <p>The <span title="concept-property-value">value</span> must be
-    text that, when compared in a <span>case-sensitive</span> manner,
-    is equal to one of the <span>address type strings</span>.</p>
-
-    <p>Within each <span title="concept-item">item</span> with the
-    type <code title="md-vcard">http://microformats.org/profile/hcard</code>, there must be no more
-    than one <code title="md-vcard-label">label</code> property <span
-    title="concept-item">item</span> with a <code
-    title="md-vcard-label-type">type</code> property whose value is
-    <code title="md-vcard-type-adr-pref">pref</code>.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-label-type">type</code> may be present within the
-    <span title="concept-item">item</span> that forms the <span
-    title="concept-property-value">value</span> of a <code
-    title="md-vcard-label">label</code> property of an <span
-    title="concept-item">item</span> with the type <code
-    title="md-vcard">http://microformats.org/profile/hcard</code>, but within each such <code
-    title="md-vcard-label">label</code> property <span
-    title="concept-item">item</span> there must only be one <code
-    title="md-vcard-label-type">type</code> property per distinct
-    value.</p>
-
-   </dd>
-
-   <dt><dfn title="md-vcard-label-value"><code>value</code></dfn> (inside <code title="md-vcard-label">label</code>)</dt>
-
-   <dd>
-
-    <p>Gives the actual formatted text corresponding to the delivery
-    address of the person or organization.</p>
-
-    <p>The <span title="concept-property-value">value</span> must be
-    text.</p>
-
-    <p>Exactly one property with the name <code
-    title="md-vcard-label-value">value</code> must be present within
-    the <span title="concept-item">item</span> that forms the <span
-    title="concept-property-value">value</span> of a <code
-    title="md-vcard-label">label</code> property of an <span
-    title="concept-item">item</span> with the type <code
-    title="md-vcard">http://microformats.org/profile/hcard</code>.</p>
-
-   </dd>
-
-
    <dt><dfn title="md-vcard-tel"><code>tel</code></dfn></dt>
 
    <dd>
@@ -75709,7 +75518,7 @@
     title="concept-property-value">value</span> of such a <code
     title="md-vcard-tel">tel</code> property is text, then the <span
     title="telephone type strings">telephone type string</span> <code
-    title="mv-vcard-type-tel-voice">voice</code> is implied.</p>
+    title="md-vcard-type-tel-voice">voice</code> is implied.</p>
 
     <p>Any number of properties with the name <code
     title="md-vcard-tel">tel</code> may be present within each
@@ -75728,13 +75537,6 @@
     text that, when compared in a <span>case-sensitive</span> manner,
     is equal to one of the <span>telephone type strings</span>.</p>
 
-    <p>Within each <span title="concept-item">item</span> with the
-    type <code title="md-vcard">http://microformats.org/profile/hcard</code>, there must be no more
-    than one <code title="md-vcard-tel">tel</code> property <span
-    title="concept-item">item</span> with a <code
-    title="md-vcard-tel-type">type</code> property whose value is
-    <code title="md-vcard-type-tel-pref">pref</code>.</p>
-
     <p>Any number of properties with the name <code
     title="md-vcard-tel-type">type</code> may be present within the
     <span title="concept-item">item</span> that forms the <span
@@ -76285,7 +76087,7 @@
 
    <dt><dfn title="md-vcard-type-adr-home"><code>home</code></dfn></dt>
    <dd>
-    <p>Indicates a residential delivery address.</p>
+    <p>Indicates a delivery address for a residence.</p>
    </dd>
 
    <dt><dfn title="md-vcard-type-adr-work"><code>work</code></dfn></dt>
@@ -77139,12 +76941,9 @@
 
   </div>
 
-<!--END vCard-->
 
   <h4>vEvent</h4>
 
-<!--START vEvent-->
-
   <p>An item with the <span title="item types">item type</span> <dfn
   title="md-vevent"><code>http://microformats.org/profile/hcalendar#vevent</code></dfn>
   represents an event.</p>
@@ -78118,12 +77917,9 @@
 
   </div>
 
-<!--END vEvent-->
 
   <h4>Licensing works</h4>
 
-<!--START work-->
-
   <p>An item with the <span title="item types">item type</span> <dfn
   title="md-work"><code>http://n.whatwg.org/work</code></dfn>
   represents a work (e.g. an article, an image, a video, a song,
@@ -78236,12 +78032,7 @@
 
   </div>
 
-<!--END work-->
 
-<!--END vocabs-->
-
-<!--START microdata-->
-
   <div class="impl">
 
   <h3>Converting HTML to other formats</h3>
@@ -78368,13 +78159,9 @@
 
   </div>
 
-<!--END microdata-->
-
   </div><!--data-component--><!--TOPIC:HTML-->
 
-<!--START w3c-html--><!--MD-->
 
-
   <h2 id="browsers">Loading Web pages</h2>
 
   <div class="impl">
@@ -93778,8 +93565,6 @@
 
    <!-- DND-v2: text/html as an export format -->
 
-<!--END w3c-html--><!--MD-->
-
    <li>
 
     <p>If the <span>list of dragged nodes</span> is not empty, then
@@ -93803,13 +93588,6 @@
 
    </li>
 
-<!--END complete--><!--END dev-html--><!--START w3c-html--><!--MD-->
-
-   <li>Perform <dfn>drag-and-drop initialization steps</dfn> defined
-   in any <span>other applicable specifications</span>.</li>
-
-<!--START complete--><!--START dev-html--><!--MD-->
-
    <li>
 
     <p>Run the following substeps:</p>
@@ -123430,10 +123208,6 @@
    Base32, and Base64 Data Encodings</a></cite>, S. Josefsson.
    IETF.</dd>
 
-   <dt id="refsRFC4770">[RFC4770]</dt>
-   <dd><cite><a href="http://tools.ietf.org/html/rfc4770">vCard Extensions for
-   Instant Messaging (IM)</a></cite>, C. Jennings, J. Reschke. IETF.</dd>
-
    <dt id="refsRFC5280">[RFC5280]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc5280">Internet
    X.509 Public Key Infrastructure Certificate and Certificate
@@ -123703,12 +123477,8 @@
   </dl>
 
 
-<!--END webvtt-->
-<!--END whatwg-workers--><!--END vocabs--><!--END vCard--><!--END vEvent--><!--END work-->
-<!--END websocket-api--><!--END storage--><!--END eventsource--><!--END workers-->
-<!--END html-device--><!--END microdata--><!--END 2dcontext--><!--END postmsg--><!--END w3c-html-->
+<!--END webvtt--><!--END websocket-api--><!--END storage--><!--END eventsource--><!--END workers--><!--END postmsg-->
 
-<!--START w3c-html-->
 
   <h2 class="no-num">Acknowledgements</h2> <!-- ACKS -->
 




More information about the Commit-Watchers mailing list