[html5] r6816 - [] (0) Attempt to update to the latest vCard spec Fixing http://www.w3.org/Bugs/ [...]

whatwg at whatwg.org whatwg at whatwg.org
Thu Nov 3 13:47:51 PDT 2011


Author: ianh
Date: 2011-11-03 13:47:49 -0700 (Thu, 03 Nov 2011)
New Revision: 6816

Modified:
   complete.html
   index
   source
Log:
[] (0) Attempt to update to the latest vCard spec
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=13986

Modified: complete.html
===================================================================
--- complete.html	2011-11-03 17:06:05 UTC (rev 6815)
+++ complete.html	2011-11-03 20:47:49 UTC (rev 6816)
@@ -58566,12 +58566,33 @@
   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=#refsRFC2426>[RFC2426]</a> <a href=#refsRFC4770>[RFC4770]</a></p>
+  found. <a href=#refsRFC6350>[RFC6350]</a></p>
 
-  <dl><dt><dfn id=md-vcard-fn title=md-vcard-fn><code>fn</code></dfn></dt>
+  <dl><dt><dfn id=md-vcard-kind title=md-vcard-kind><code>kind</code></dfn></dt>
 
    <dd>
 
+    <p>Describes what kind of contact the item represents.</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=#kind-strings>kind strings</a>.</p>
+
+    <p>A single property with the name <code title=md-vcard-kind><a href=#md-vcard-kind>kind</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>
+
+
+   <!-- XML not included since there's no good way to do it here -->
+   <!-- Note: vCard->microdata->vCard doesn't count as "propagating
+        vCards" according to Tantek, so we're not non-conforming when
+        we drop it, despite vCard's requirement -->
+
+
+   <dt><dfn id=md-vcard-fn title=md-vcard-fn><code>fn</code></dfn></dt>
+
+   <dd>
+
     <p>Gives the formatted text corresponding to the name of the
     person or organization.</p>
 
@@ -58729,6 +58750,56 @@
    </dd>
 
 
+   <dt><dfn id=md-vcard-anniversary title=md-vcard-anniversary><code>anniversary</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the birth date of the person or organization.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be a
+    <a href=#valid-date-string>valid date string</a>.</p>
+
+    <p>A single property with the name <code title=md-vcard-anniversary><a href=#md-vcard-anniversary>anniversary</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-sex title=md-vcard-sex><code>sex</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the biological sex of the person.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be one of
+    <code title="">F</code>, meaning "female",
+    <code title="">M</code>, meaning "male",
+    <code title="">N</code>, meaning "none or not applicable", 
+    <code title="">O</code>, meaning "other", or
+    <code title="">U</code>, meaning "unknown".</p>
+
+    <p>A single property with the name <code title=md-vcard-sex><a href=#md-vcard-sex>sex</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-gender-identity title=md-vcard-gender-identity><code>gender-identity</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the gender identity of the person.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
+    text.</p>
+
+    <p>A single property with the name <code title=md-vcard-gender-identity><a href=#md-vcard-gender-identity>gender-identity</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-adr title=md-vcard-adr><code>adr</code></dfn></dt>
 
    <dd>
@@ -58768,7 +58839,7 @@
     <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><a href=#md-vcard-type-adr-pref>pref</a></code>.</p>
+    <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
@@ -58929,7 +59000,7 @@
     <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><a href=#md-vcard-type-adr-pref>pref</a></code>.</p>
+    <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
@@ -58987,7 +59058,7 @@
     <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><a href=#md-vcard-type-tel-pref>pref</a></code>.</p>
+    <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
@@ -59019,71 +59090,40 @@
     <p>Gives the e-mail 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-email-type><a href=#md-vcard-email-type>type</a></code> properties
-    and exactly one <code title=md-vcard-email-value><a href=#md-vcard-email-value>value</a></code>
-    property.</p>
+    text.</p>
 
-    <p>If no <code title=md-vcard-email-type><a href=#md-vcard-email-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-email><a href=#md-vcard-email>email</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 an <code title=md-vcard-email><a href=#md-vcard-email>email</a></code> property is text, then the
-    <a href=#e-mail-type-strings title="e-mail type strings">e-mail type string</a> <code title=mv-vcard-type-email-internet>internet</code> is
-    implied.</p>
-
     <p>Any number of properties with the name <code title=md-vcard-email><a href=#md-vcard-email>email</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-email-type title=md-vcard-email-type><code>type</code></dfn> (inside <code title=md-vcard-email><a href=#md-vcard-email>email</a></code>)</dt>
 
-   <dd>
+   <dt><dfn id=md-vcard-impp title=md-vcard-impp><code>impp</code></dfn></dt>
 
-    <p>Gives the type of e-mail 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=#e-mail-type-strings>e-mail 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-email><a href=#md-vcard-email>email</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-email-type><a href=#md-vcard-email-type>type</a></code> property whose value is
-    <code title=md-vcard-type-email-pref><a href=#md-vcard-type-email-pref>pref</a></code>.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-email-type><a href=#md-vcard-email-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-email><a href=#md-vcard-email>email</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-email><a href=#md-vcard-email>email</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-email-type><a href=#md-vcard-email-type>type</a></code> property per distinct
-    value.</p>
-
-   </dd>
-
-   <dt><dfn id=md-vcard-email-value title=md-vcard-email-value><code>value</code></dfn> (inside <code title=md-vcard-email><a href=#md-vcard-email>email</a></code>)</dt>
-
    <dd>
 
-    <p>Gives the actual e-mail address of the person or
-    organization.</p>
+    <p>Gives a <a href=#url>URL</a> for instant messaging and presence
+    protocol communications with the person or organization.</p>
 
     <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
+    an <a href=#absolute-url>absolute URL</a>.</p>
 
-    <p>Exactly one property with the name <code title=md-vcard-email-value><a href=#md-vcard-email-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 an <code title=md-vcard-email><a href=#md-vcard-email>email</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>Any number of properties with the name <code title=md-vcard-impp><a href=#md-vcard-impp>impp</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-mailer title=md-vcard-mailer><code>mailer</code></dfn></dt>
+   <dt><dfn id=md-vcard-lang title=md-vcard-lang><code>lang</code></dfn></dt>
 
    <dd>
 
-    <p>Gives the name of the e-mail software used by the person or
-    organization.</p>
+    <p>Gives a language understood by the person or organization.</p>
 
     <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
+    a valid BCP 47 language tag. <a href=#refsBCP47>[BCP47]</a>.</p>
 
-    <p>Any number of properties with the name <code title=md-vcard-mailer><a href=#md-vcard-mailer>mailer</a></code> may be present within each
+    <p>Any number of properties with the name <code title=md-vcard-lang><a href=#md-vcard-lang>lang</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>
@@ -59278,6 +59318,70 @@
    </dd>
 
 
+   <dt><dfn id=md-vcard-member title=md-vcard-member><code>member</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives a <a href=#url>URL</a> that represents a member of the
+    group.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
+    an <a href=#absolute-url>absolute URL</a>.</p>
+
+    <p>Any number of properties with the name <code title=md-vcard-member><a href=#md-vcard-member>member</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> if
+    the <a href=#concept-item title=concept-item>item</a> also has a property
+    with the name <code title=md-vcard-kind><a href=#md-vcard-kind>kind</a></code> whose value
+    is "<code title=md-vcard-kind-group><a href=#md-vcard-kind-group>group</a></code>".</p>
+
+   </dd>
+
+
+   <dt><dfn id=md-vcard-related title=md-vcard-related><code>related</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives a relationship to another entity.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must an
+    <a href=#concept-item title=concept-item>item</a> with one <code title=md-vcard-org-related-url><a href=#md-vcard-org-related-url>url</a></code> property and one <code title=md-vcard-org-related-rel><a href=#md-vcard-org-related-rel>rel</a></code> properties.</p>
+
+    <p>Any number of properties with the name <code title=md-vcard-related><a href=#md-vcard-related>orrelated</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-org-related-url title=md-vcard-org-related-url><code>url</code></dfn> (inside <code title=md-vcard-related><a href=#md-vcard-related>related</a></code>)</dt>
+
+   <dd>
+
+    <p>Gives the <a href=#url>URL</a> for the related entity.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
+    an <a href=#absolute-url>absolute URL</a>.</p>
+
+    <p>Exactly one property with the name <code title=md-vcard-org-url>url</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 an <code title=md-vcard-related><a href=#md-vcard-related>related</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-org-related-rel title=md-vcard-org-related-rel><code>rel</code></dfn> (inside <code title=md-vcard-related><a href=#md-vcard-related>related</a></code>)</dt>
+
+   <dd>
+
+    <p>Gives the relationship between the entity and the related
+    entity.</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=#relationship-strings>relationship strings</a>.</p>
+
+    <p>Exactly one property with the name <code title=md-vcard-org-rel>rel</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 an <code title=md-vcard-related><a href=#md-vcard-related>related</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-categories title=md-vcard-categories><code>categories</code></dfn></dt>
 
    <dd>
@@ -59334,23 +59438,6 @@
    </dd>
 
 
-   <dt><dfn id=md-vcard-sort-string title=md-vcard-sort-string><code>sort-string</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the string to be used for sorting the person or
-    organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-sort-string><a href=#md-vcard-sort-string>sort-string</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-sound title=md-vcard-sound><code>sound</code></dfn></dt>
 
    <dd>
@@ -59381,6 +59468,9 @@
    </dd>
 
 
+   <!-- CLIENTPIDMAP not included since the global parameters are not included -->
+
+
    <dt><dfn id=md-vcard-url title=md-vcard-url><code>url</code></dfn></dt>
 
    <dd>
@@ -59396,122 +59486,40 @@
    </dd>
 
 
-   <!-- VERSION not included - always 3.0 -->
+   <!-- VERSION not included - always 4.0 -->
 
-
-   <dt><dfn id=md-vcard-class title=md-vcard-class><code>class</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the access classification of the information regarding
-    the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text with one of the following values:</p>
-
-    <ul class=brief><li><code title="">public</code></li>
-     <li><code title="">private</code></li>
-     <li><code title="">confidential</code></li>
-    </ul><p class=warning>This is merely advisory and cannot be
-    considered a confidentiality measure.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-class><a href=#md-vcard-class>class</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>
-
-
    <!-- KEY not included - no way to include binary data at this time -->
 
+   <!-- FBURL, CALADRURI, CALURI not included - unclear how calendars would be exposed on the web -->
 
-   <!-- IMPP is from RFC4770 -->
+  </dl><p>The <dfn id=kind-strings>kind strings</dfn> are:</p>
 
-   <dt><dfn id=md-vcard-impp title=md-vcard-impp><code>impp</code></dfn></dt>
-
+  <dl><dt><dfn id=md-vcard-kind-individual title=md-vcard-kind-individual><code>individual</code></dfn></dt>
    <dd>
-
-    <p>Gives a <a href=#url>URL</a> for instant messaging and presence
-    protocol communications with the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    either an <a href=#absolute-url>absolute URL</a> or an <a href=#concept-item title=concept-item>item</a> with zero or more <code title=md-vcard-impp-type><a href=#md-vcard-impp-type>type</a></code> properties and exactly one
-    <code title=md-vcard-impp-value><a href=#md-vcard-impp-value>value</a></code> property.</p>
-
-    <p>If no <code title=md-vcard-impp-type><a href=#md-vcard-impp-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-impp><a href=#md-vcard-impp>impp</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 an <code title=md-vcard-impp><a href=#md-vcard-impp>impp</a></code> property is an <a href=#absolute-url>absolute
-    URL</a>, then no <a href=#impp-type-strings>IMPP type strings</a> are
-    implied.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-impp><a href=#md-vcard-impp>impp</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>
-
+    <p>Indicates a single entity (e.g. a person).</p>
    </dd>
 
-   <dt><dfn id=md-vcard-impp-type title=md-vcard-impp-type><code>type</code></dfn> (inside <code title=md-vcard-impp><a href=#md-vcard-impp>impp</a></code>)</dt>
-
+   <dt><dfn id=md-vcard-kind-group title=md-vcard-kind-group><code>group</code></dfn></dt>
    <dd>
-
-    <p>Gives the intended use of the IMPP <a href=#url>URL</a>.</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=#impp-type-strings>IMPP 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-impp><a href=#md-vcard-impp>impp</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-impp-type><a href=#md-vcard-impp-type>type</a></code> property whose value is
-    <code title=md-vcard-type-impp-pref><a href=#md-vcard-type-impp-pref>pref</a></code>.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-impp-type><a href=#md-vcard-impp-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-impp><a href=#md-vcard-impp>impp</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-impp><a href=#md-vcard-impp>impp</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-impp-type><a href=#md-vcard-impp-type>type</a></code> property per distinct
-    value.</p>
-
+    <p>Indicates multiple entities (e.g. a mailing list).</p>
    </dd>
 
-   <dt><dfn id=md-vcard-impp-value title=md-vcard-impp-value><code>value</code></dfn> (inside <code title=md-vcard-impp><a href=#md-vcard-impp>impp</a></code>)</dt>
-
+   <dt><dfn id=md-vcard-kind-org title=md-vcard-kind-org><code>org</code></dfn></dt>
    <dd>
-
-    <p>Gives the actual <a href=#url>URL</a> for instant messaging and
-    presence protocol communications with the person or
-    organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    an <a href=#absolute-url>absolute URL</a>.</p>
-
-    <p>Exactly one property with the name <code title=md-vcard-impp-value><a href=#md-vcard-impp-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 an <code title=md-vcard-impp><a href=#md-vcard-impp>impp</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>Indicates a single entity that is not a person (e.g. a company).</p>
    </dd>
 
-
-  </dl><p>The <dfn id=address-type-strings>address type strings</dfn> are:</p>
-
-  <dl><dt><dfn id=md-vcard-type-adr-dom title=md-vcard-type-adr-dom><code>dom</code></dfn></dt>
+   <dt><dfn id=md-vcard-kind-location title=md-vcard-kind-location><code>location</code></dfn></dt>
    <dd>
-    <p>Indicates a domestic delivery address.</p>
+    <p>Indicates a geographical place (e.g. an office building).</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-adr-intl title=md-vcard-type-adr-intl><code>intl</code></dfn></dt>
-   <dd>
-    <p>Indicates an international delivery address.</p>
-   </dd>
+   <!-- update this when http://www.iana.org/assignments/vcard-elements/vcard-elements.xml#property-values is updated -->
 
-   <dt><dfn id=md-vcard-type-adr-postal title=md-vcard-type-adr-postal><code>postal</code></dfn></dt>
-   <dd>
-    <p>Indicates a postal delivery address.</p>
-   </dd>
+  </dl><p>The <dfn id=address-type-strings>address type strings</dfn> are:</p>
 
-   <dt><dfn id=md-vcard-type-adr-parcel title=md-vcard-type-adr-parcel><code>parcel</code></dfn></dt>
+  <dl><dt><dfn id=md-vcard-type-adr-home title=md-vcard-type-adr-home><code>home</code></dfn></dt>
    <dd>
-    <p>Indicates a parcel delivery address.</p>
-   </dd>
-
-   <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>
    </dd>
 
@@ -59520,14 +59528,6 @@
     <p>Indicates a delivery address for a place of work.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-adr-pref title=md-vcard-type-adr-pref><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred delivery address when multiple
-    addresses are specified.</p>
-
-   </dd>
-
   </dl><p>The <dfn id=telephone-type-strings>telephone type strings</dfn> are:</p>
 
   <dl><dt><dfn id=md-vcard-type-tel-home title=md-vcard-type-tel-home><code>home</code></dfn></dt>
@@ -59535,14 +59535,14 @@
     <p>Indicates a residential number.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-msg title=md-vcard-type-tel-msg><code>msg</code></dfn></dt>
+   <dt><dfn id=md-vcard-type-tel-work title=md-vcard-type-tel-work><code>work</code></dfn></dt>
    <dd>
-    <p>Indicates a telephone number with voice messaging support.</p>
+    <p>Indicates a telephone number for a place of work.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-work title=md-vcard-type-tel-work><code>work</code></dfn></dt>
+   <dt><dfn id=md-vcard-type-tel-text title=md-vcard-type-tel-text><code>text</code></dfn></dt>
    <dd>
-    <p>Indicates a telephone number for a place of work.</p>
+    <p>Indicates that the telephone number supports text messages (SMS).</p>
    </dd>
 
    <dt><dfn id=md-vcard-type-tel-voice title=md-vcard-type-tel-voice><code>voice</code></dfn></dt>
@@ -59570,82 +59570,46 @@
     <p>Indicates a paging device telephone number.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-bbs title=md-vcard-type-tel-bbs><code>bbs</code></dfn></dt>
+   <dt><dfn id=md-vcard-type-tel-textphone title=md-vcard-type-tel-textphone><code>textphone</code></dfn></dt>
    <dd>
-    <p>Indicates a bulletin board system telephone number.</p>
+    <p>Indicates a telecommunication device for people with hearing or speech difficulties.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-modem title=md-vcard-type-tel-modem><code>modem</code></dfn></dt>
-   <dd>
-    <p>Indicates a MODEM-connected telephone number.</p>
-   </dd>
+  </dl><p>The <dfn id=relationship-strings>relationship strings</dfn> are:</p>
 
-   <dt><dfn id=md-vcard-type-tel-car title=md-vcard-type-tel-car><code>car</code></dfn></dt>
+  <dl><dt><dfn id=md-vcard-rel-emergency title=md-vcard-rel-emergency><code>emergency</code></dfn></dt>
    <dd>
-    <p>Indicates a car-phone telephone number.</p>
+    <p>An emergency contact.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-isdn title=md-vcard-type-tel-isdn><code>isdn</code></dfn></dt>
+   <dt><dfn id=md-vcard-rel-agent title=md-vcard-rel-agent><code>agent</code></dfn></dt>
    <dd>
-    <p>Indicates an ISDN service telephone number.</p>
+    <p>Another entity that acts on behalf of this entity.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-pcs title=md-vcard-type-tel-pcs><code>pcs</code></dfn></dt>
+   <dt><dfn id=md-vcard-rel-contact title=md-vcard-rel-contact>contact</dfn></dt>
+   <dt><dfn id=md-vcard-rel-acquaintance title=md-vcard-rel-acquaintance>acquaintance</dfn></dt>
+   <dt><dfn id=md-vcard-rel-friend title=md-vcard-rel-friend>friend</dfn></dt>
+   <dt><dfn id=md-vcard-rel-met title=md-vcard-rel-met>met</dfn></dt>
+   <dt><dfn id=md-vcard-rel-co-worker title=md-vcard-rel-co-worker>worker</dfn></dt>
+   <dt><dfn id=md-vcard-rel-colleague title=md-vcard-rel-colleague>colleague</dfn></dt>
+   <dt><dfn id=md-vcard-rel-co-resident title=md-vcard-rel-co-resident>resident</dfn></dt>
+   <dt><dfn id=md-vcard-rel-neighbor title=md-vcard-rel-neighbor>neighbor</dfn></dt>
+   <dt><dfn id=md-vcard-rel-child title=md-vcard-rel-child>child</dfn></dt>
+   <dt><dfn id=md-vcard-rel-parent title=md-vcard-rel-parent>parent</dfn></dt>
+   <dt><dfn id=md-vcard-rel-sibling title=md-vcard-rel-sibling>sibling</dfn></dt>
+   <dt><dfn id=md-vcard-rel-spouse title=md-vcard-rel-spouse>spouse</dfn></dt>
+   <dt><dfn id=md-vcard-rel-kin title=md-vcard-rel-kin>kin</dfn></dt>
+   <dt><dfn id=md-vcard-rel-muse title=md-vcard-rel-muse>muse</dfn></dt>
+   <dt><dfn id=md-vcard-rel-crush title=md-vcard-rel-crush>crush</dfn></dt>
+   <dt><dfn id=md-vcard-rel-date title=md-vcard-rel-date>date</dfn></dt>
+   <dt><dfn id=md-vcard-rel-sweetheart title=md-vcard-rel-sweetheart>sweetheart</dfn></dt>
+   <dt><dfn id=md-vcard-rel-me title=md-vcard-rel-me>me</dfn></dt>
    <dd>
-    <p>Indicates a personal communication services telephone number.</p>
+    <p>Has the meaning defined in XFN. <a href=#refsXFN>[XFN]</a></p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-pref title=md-vcard-type-tel-pref><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred telephone number when multiple
-    telephone numbers are specified.</p>
-
-   </dd>
-
-  </dl><p>The <dfn id=e-mail-type-strings>e-mail type strings</dfn> are:</p>
-
-  <dl><dt><dfn id=md-vcard-type-email-internet title=md-vcard-type-email-internet><code>internet</code></dfn></dt>
-   <dd>
-    <p>Indicates an Internet e-mail address.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-email-x400 title=md-vcard-type-email-x400><code>x400</code></dfn></dt>
-   <dd>
-    <p>Indicates an X.400 addressing type.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-email-pref title=md-vcard-type-email-pref><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred e-mail address when multiple e-mail
-    addresses are specified.</p>
-
-   </dd>
-
-  </dl><p>The <dfn id=impp-type-strings>IMPP type strings</dfn> are:</p>
-
-  <dl><dt><dfn id=md-vcard-type-impp-personal title=md-vcard-type-impp-personal><code>personal</code></dfn></dt>
-   <dt><dfn id=md-vcard-type-impp-business title=md-vcard-type-impp-business><code>business</code></dfn></dt>
-   <dd>
-    <p>Indicates the type of communication for which this IMPP
-    <a href=#url>URL</a> is appropriate.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-impp-home title=md-vcard-type-impp-home><code>home</code></dfn></dt>
-   <dt><dfn id=md-vcard-type-impp-work title=md-vcard-type-impp-work><code>work</code></dfn></dt>
-   <dt><dfn id=md-vcard-type-impp-mobile title=md-vcard-type-impp-mobile><code>mobile</code></dfn></dt>
-   <dd>
-    <p>Indicates the location of a device associated with this IMPP
-    <a href=#url>URL</a>.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-impp-pref title=md-vcard-type-impp-pref><code>pref</code></dfn></dt>
-   <dd>
-    <p>Indicates the preferred address when multiple IMPP
-    <a href=#url>URL</a>s are specified.</p>
-   </dd>
-
+   <!-- update this when http://www.iana.org/assignments/vcard-elements/vcard-elements.xml#parameter-values is updated -->
   </dl><h5 id=conversion-to-vcard><span class=secno>5.4.1.1 </span>Conversion to vCard</h5>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -59668,7 +59632,7 @@
 
    <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">PROFILE</code>" and the value "<code title="">VCARD</code>" to <var title="">output</var>.</li>
 
-   <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">VERSION</code>" and the value "<code title="">3.0</code>"
+   <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">VERSION</code>" and the value "<code title="">4.0</code>"
    to <var title="">output</var>.</li>
 
    <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">SOURCE</code>" and the result of <a href=#escaping-the-vcard-text-string>escaping the vCard
@@ -59680,6 +59644,11 @@
    vCard text string</a> obtained from the <code><a href=#textcontent>textContent</a></code>
    of <a href=#the-title-element-0>the <code>title</code> element</a> as the value to <var title="">output</var>.</li>
 
+   <li><p>Let <var title="">sex</var> be the empty string.</li>
+
+   <li><p>Let <var title="">gender-identity</var> be the empty
+   string.</li>
+
    <li>
 
     <p>For each element <var title="">element</var> that is <a href=#the-properties-of-an-item title="the properties of an item">a property of the item</a>
@@ -59832,31 +59801,36 @@
 
        <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is an <a href=#concept-item title=concept-item>item</a> <var title="">subitem</var>
        with the <a href=#item-types title="item types">item type</a> <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>
-       and <var title="">name</var> is <code title=md-vcard-agent><a href=#md-vcard-agent>agent</a></code></dt>
+       and <var title="">name</var> is <code title=md-vcard-related><a href=#md-vcard-related>related</a></code></dt>
 
        <dd>
 
-        <ol><li>
+        <ol><li><p>Let <var title="">value</var> be the empty
+         string.</li>
 
-          <p>If the user agent is already attempting to <a href=#extracting-a-vcard title="extracting a vCard">extract a vCard</a> from the
-          element that represents <var title="">subitem</var>, then
-          let <var title="">value</var> be the string "<code title="">ERROR</code>".</p>
+         <li><p>If there is a property named <code title=md-vcard-related-url>url</code> in <var title="">subitem</var>, and its element is a <a href=#url-property-elements title="URL
+         property elements">URL property element</a>, then append
+         the result of <a href=#escaping-the-vcard-text-string>escaping the vCard text string</a>
+         given by the <a href=#concept-property-value title=concept-property-value>value</a> of the first such
+         property to <var title="">value</var>, and add a parameter
+         with the name "<code title="">VALUE</code>" and the value
+         "<code title="">URI</code>" to <var title="">parameters</var>.</li>
 
-          <p>Otherwise, let <var title="">value</var> be the result of
-          <a href=#escaping-the-vcard-text-string>escaping the vCard text string</a> obtained from
-          <a href=#extracting-a-vcard>extracting a vCard</a> from the element that
-          represents <var title="">subitem</var>.</p>
+         <li><p>If there is a property named <code title=md-vcard-related-rel>rel</code> in <var title="">subitem</var>, and the first such property has a
+         <a href=#concept-property-value title=concept-property-value>value</a> that is not
+         an <a href=#concept-item title=concept-item>item</a> and whose value
+         consists only of <a href=#alphanumeric-ascii-characters>alphanumeric ASCII characters</a>,
+         then add a parameter named "<code title="">RELATION</code>"
+         whose value is the <a href=#concept-property-value title=concept-property-value>value</a> of that property
+         to <var title="">parameters</var>.</li>
 
-         </li>
-
-         <li><p>Add a parameter named "<code title="">VALUE</code>"
-         whose value is "<code title="">VCARD</code>" to <var title="">parameters</var>.</li>
-
         </ol></dd>
 
        <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is an <a href=#concept-item title=concept-item>item</a> and <var title="">name</var>
        is none of the above</dt>
 
+       <!-- tel, adr -->
+
        <dd>
 
         <ol><li><p>Let <var title="">value</var> be the result of
@@ -59873,6 +59847,25 @@
 
         </ol></dd>
 
+
+       <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is not an <a href=#concept-item title=concept-item>item</a> and its <var title="">name</var> is <code title=md-vcard-sex><a href=#md-vcard-sex>sex</a></code></dt>
+
+       <dd>
+
+        <p>If this is the first such property to be found, set <var title="">sex</var> to the property's <a href=#concept-property-value title=concept-property-value>value</a>.</p>
+
+       </dd>
+
+
+       <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is not an <a href=#concept-item title=concept-item>item</a> and its <var title="">name</var> is <code title=md-vcard-gender-identity><a href=#md-vcard-gender-identity>gender-identity</a></code></dt>
+
+       <dd>
+
+        <p>If this is the first such property to be found, set <var title="">gender-identity</var> to the property's <a href=#concept-property-value title=concept-property-value>value</a>.</p>
+
+       </dd>
+
+
        <dt>Otherwise (the property's <a href=#concept-property-value title=concept-property-value>value</a> is not an <a href=#concept-item title=concept-item>item</a>)</dt>
 
        <dd>
@@ -59882,11 +59875,11 @@
          <li><p>If <var title="">element</var> is one of the <a href=#url-property-elements>URL
          property elements</a>, add a parameter with the name "<code title="">VALUE</code>" and the value "<code title="">URI</code>" to <var title="">parameters</var>.</li>
 
-         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-bday><a href=#md-vcard-bday>bday</a></code> and the <var title="">value</var> is a <a href=#valid-date-string>valid date string</a>, add
+         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-bday><a href=#md-vcard-bday>bday</a></code> or <code title=md-vcard-anniversary><a href=#md-vcard-anniversary>anniversary</a></code> and the <var title="">value</var> is a <a href=#valid-date-string>valid date string</a>, add
          a parameter with the name "<code title="">VALUE</code>" and
          the value "<code title="">DATE</code>" to <var title="">parameters</var>.</li>
 
-         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-bday><a href=#md-vcard-bday>rev</a></code> and the <var title="">value</var> is a <a href=#valid-global-date-and-time-string>valid global date and time
+         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-rev><a href=#md-vcard-rev>rev</a></code> and the <var title="">value</var> is a <a href=#valid-global-date-and-time-string>valid global date and time
          string</a>, add a parameter with the name "<code title="">VALUE</code>" and the value "<code title="">DATE-TIME</code>" to <var title="">parameters</var>.</li>
 
          <li><p>Prefix every U+005C REVERSE SOLIDUS character (\) in
@@ -59922,6 +59915,11 @@
 
     </ol></li>
 
+   <li><p>If either of <var title="">sex</var> or <var title="">gender-identity</var> have a value that is not the empty
+   string, <a href=#add-a-vcard-line>add a vCard line</a> with the type "<code title="">GENDER</code>" and the value consisting of the
+   concatenation of <var title="">sex</var>, a U+003B SEMICOLON
+   character (;), and <var title="">gender-identity</var> to <var title="">output</var>.</li>
+
    <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">END</code>" and the value "<code title="">VCARD</code>"
    to <var title="">output</var>.</li>
 
@@ -60095,7 +60093,7 @@
  <ul>
   <li itemprop="tel" itemscope>
    <span itemprop="value">+1 (310) 597 3781</span> <span itemprop="type">work</span>
-   <meta itemprop="type" content="pref">
+   <meta itemprop="type" content="voice">
   </li>
   <li><a itemprop="url" href="http://en.wikipedia.org/wiki/Jack_Bauer">I'm on Wikipedia</a>
   so you can leave a message on my user talk page.</li>
@@ -60106,19 +60104,8 @@
    <meta itemprop="type" content="cell">mobile phone</span>
   </li>
  </ul>
- <p itemprop="note">If I'm out in the field, you may be better off contacting <span
- itemprop="agent" itemscope itemtype="http://microformats.org/profile/hcard"><a
- itemprop="email" href="mailto:c.obrian at la.ctu.gov.invalid"><span
- itemprop="fn"><span itemprop="n" itemscope><span
- itemprop="given-name">Chloe</span> <span
- itemprop="family-name">O'Brian</span></span></span></a></span>
- if it's about work, or ask <span itemprop="agent">Tony Almeida</span>
- if you're interested in the CTU five-a-side football team we're trying to get going.</p>
  <ins datetime="2008-07-20T21:00:00+01:00">
-  <span itemprop="rev" itemscope>
-   <meta itemprop="type" content="date-time">
-   <meta itemprop="value" content="2008-07-20T21:00:00+01:00">
-  </span>
+  <meta itemprop="rev" content="2008-07-20T21:00:00+01:00">
   <p itemprop="tel" itemscope><strong>Update!</strong>
   My new <span itemprop="type">home</span> phone number is
   <span itemprop="value">01632 960 123</span>.</p>
@@ -60169,7 +60156,7 @@
 
    <pre>BEGIN:VCARD
 PROFILE:VCARD
-VERSION:3.0
+VERSION:4.0
 SOURCE:<var title="">document's address</var>
 FN:George Washington
 N:Washington;George;;;
@@ -70227,16 +70214,16 @@
   method allows Web sites to register themselves as possible handlers
   for particular schemes. For example, an online telephone messaging
   service could register itself as a handler of the <code>sms:</code>
-  scheme (<a href=#refsRFC5724>[RFC5724]</a>), so that if the user
-  clicks on such a link, he is given the opportunity to use that Web
-  site. Analogously, the <dfn id=dom-navigator-registercontenthandler title=dom-navigator-registerContentHandler><code>registerContentHandler()</code></dfn>
+  scheme, so that if the user clicks on such a link, he is given the
+  opportunity to use that Web site. Analogously, the <dfn id=dom-navigator-registercontenthandler title=dom-navigator-registerContentHandler><code>registerContentHandler()</code></dfn>
   method allows Web sites to register themselves as possible handlers
   for content in a particular <a href=#mime-type>MIME type</a>. For example, the
   same online telephone messaging service could register itself as a
-  handler for <code>text/directory</code> files (<a href=#refsRFC2425>[RFC2425]</a>), so that if the user has no
-  native application capable of handling vCards (<a href=#refsRFC2426>[RFC2426]</a>), his Web browser can instead
-  suggest he use that site to view contact information stored on
-  vCards that he opens.</p>
+  handler for <code>text/vcard</code> files, so that if the user has
+  no native application capable of handling vCards, his Web browser
+  can instead suggest he use that site to view contact information
+  stored on vCards that he opens. <a href=#refsRFC5724>[RFC5724]</a>
+  <a href=#refsRFC6350>RFC6350</a></p>
 
   <dl class=domintro><dt><var title="">window</var> . <code title=dom-navigator><a href=#dom-navigator>navigator</a></code> . <code title=dom-navigator-registerProtocolHandler><a href=#dom-navigator-registerprotocolhandler>registerProtocolHandler</a></code>(<var title="">scheme</var>, <var title="">url</var>, <var title="">title</var>)</dt>
    <dt><var title="">window</var> . <code title=dom-navigator><a href=#dom-navigator>navigator</a></code> . <code title=dom-navigator-registerContentHandler><a href=#dom-navigator-registercontenthandler>registerContentHandler</a></code>(<var title="">mimeType</var>, <var title="">url</var>, <var title="">title</var>)</dt>
@@ -101441,15 +101428,6 @@
    <dd><cite><a href=http://tools.ietf.org/html/rfc2397>The "data"
    URL scheme</a></cite>, L. Masinter. IETF.</dd>
 
-   <dt id=refsRFC2425>[RFC2425]</dt>
-   <dd><cite><a href=http://tools.ietf.org/html/rfc2425>A MIME
-   Content-Type for Directory Information</a></cite>, T. Howes,
-   M. Smith, F. Dawson. IETF.</dd>
-
-   <dt id=refsRFC2426>[RFC2426]</dt>
-   <dd><cite><a href=http://tools.ietf.org/html/rfc2426>vCard MIME Directory
-   Profile</a></cite>, F. Dawson, T. Howes. IETF.</dd>
-
    <dt id=refsRFC2445>[RFC2445]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc2445>Internet Calendaring
    and Scheduling Core Object Specification (iCalendar)</a></cite>, F. Dawson, D.
@@ -101517,10 +101495,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
@@ -101539,6 +101513,9 @@
    <dt id=refsRFC6266>[RFC6266]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc6266>Use of the Content-Disposition Header Field in the Hypertext Transfer Protocol (HTTP)</a></cite>, J. Reschke. IETF.</dd>
 
+   <dt id=refsRFC6350>[RFC6350]</dt>
+   <dd><cite><a href=http://tools.ietf.org/html/rfc6350>vCard Format Specification</a></cite>, S. Perreault. IETF.</dd>
+
    <dt id=refsSCSU>[SCSU]</dt>
    <dd>(Non-normative) <cite><a href=http://www.unicode.org/reports/tr6/>UTR #6: A Standard
    Compression Scheme For Unicode</a></cite>, M. Wolf, K. Whistler,
@@ -101679,6 +101656,9 @@
    Rules (CER), and Distinguished Encoding Rules
    (DER)</a></cite>. International Telecommunication Union.</dd>
 
+   <dt id=refsXFN>[XFN]</dt>
+   <dd><cite><a href=http://gmpg.org/xfn/11>XFN 1.1 profile</a></cite>, T. Çelik, M. Mullenweg, E. Meyer. GMPG.</dd>
+
    <dt id=refsXHR>[XHR]</dt>
    <!--
    <dd><cite><a href="http://www.w3.org/TR/XMLHttpRequest/">The XMLHttpRequest

Modified: index
===================================================================
--- index	2011-11-03 17:06:05 UTC (rev 6815)
+++ index	2011-11-03 20:47:49 UTC (rev 6816)
@@ -58566,12 +58566,33 @@
   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=#refsRFC2426>[RFC2426]</a> <a href=#refsRFC4770>[RFC4770]</a></p>
+  found. <a href=#refsRFC6350>[RFC6350]</a></p>
 
-  <dl><dt><dfn id=md-vcard-fn title=md-vcard-fn><code>fn</code></dfn></dt>
+  <dl><dt><dfn id=md-vcard-kind title=md-vcard-kind><code>kind</code></dfn></dt>
 
    <dd>
 
+    <p>Describes what kind of contact the item represents.</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=#kind-strings>kind strings</a>.</p>
+
+    <p>A single property with the name <code title=md-vcard-kind><a href=#md-vcard-kind>kind</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>
+
+
+   <!-- XML not included since there's no good way to do it here -->
+   <!-- Note: vCard->microdata->vCard doesn't count as "propagating
+        vCards" according to Tantek, so we're not non-conforming when
+        we drop it, despite vCard's requirement -->
+
+
+   <dt><dfn id=md-vcard-fn title=md-vcard-fn><code>fn</code></dfn></dt>
+
+   <dd>
+
     <p>Gives the formatted text corresponding to the name of the
     person or organization.</p>
 
@@ -58729,6 +58750,56 @@
    </dd>
 
 
+   <dt><dfn id=md-vcard-anniversary title=md-vcard-anniversary><code>anniversary</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the birth date of the person or organization.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be a
+    <a href=#valid-date-string>valid date string</a>.</p>
+
+    <p>A single property with the name <code title=md-vcard-anniversary><a href=#md-vcard-anniversary>anniversary</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-sex title=md-vcard-sex><code>sex</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the biological sex of the person.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be one of
+    <code title="">F</code>, meaning "female",
+    <code title="">M</code>, meaning "male",
+    <code title="">N</code>, meaning "none or not applicable", 
+    <code title="">O</code>, meaning "other", or
+    <code title="">U</code>, meaning "unknown".</p>
+
+    <p>A single property with the name <code title=md-vcard-sex><a href=#md-vcard-sex>sex</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-gender-identity title=md-vcard-gender-identity><code>gender-identity</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the gender identity of the person.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
+    text.</p>
+
+    <p>A single property with the name <code title=md-vcard-gender-identity><a href=#md-vcard-gender-identity>gender-identity</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-adr title=md-vcard-adr><code>adr</code></dfn></dt>
 
    <dd>
@@ -58768,7 +58839,7 @@
     <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><a href=#md-vcard-type-adr-pref>pref</a></code>.</p>
+    <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
@@ -58929,7 +59000,7 @@
     <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><a href=#md-vcard-type-adr-pref>pref</a></code>.</p>
+    <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
@@ -58987,7 +59058,7 @@
     <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><a href=#md-vcard-type-tel-pref>pref</a></code>.</p>
+    <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
@@ -59019,71 +59090,40 @@
     <p>Gives the e-mail 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-email-type><a href=#md-vcard-email-type>type</a></code> properties
-    and exactly one <code title=md-vcard-email-value><a href=#md-vcard-email-value>value</a></code>
-    property.</p>
+    text.</p>
 
-    <p>If no <code title=md-vcard-email-type><a href=#md-vcard-email-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-email><a href=#md-vcard-email>email</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 an <code title=md-vcard-email><a href=#md-vcard-email>email</a></code> property is text, then the
-    <a href=#e-mail-type-strings title="e-mail type strings">e-mail type string</a> <code title=mv-vcard-type-email-internet>internet</code> is
-    implied.</p>
-
     <p>Any number of properties with the name <code title=md-vcard-email><a href=#md-vcard-email>email</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-email-type title=md-vcard-email-type><code>type</code></dfn> (inside <code title=md-vcard-email><a href=#md-vcard-email>email</a></code>)</dt>
 
-   <dd>
+   <dt><dfn id=md-vcard-impp title=md-vcard-impp><code>impp</code></dfn></dt>
 
-    <p>Gives the type of e-mail 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=#e-mail-type-strings>e-mail 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-email><a href=#md-vcard-email>email</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-email-type><a href=#md-vcard-email-type>type</a></code> property whose value is
-    <code title=md-vcard-type-email-pref><a href=#md-vcard-type-email-pref>pref</a></code>.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-email-type><a href=#md-vcard-email-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-email><a href=#md-vcard-email>email</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-email><a href=#md-vcard-email>email</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-email-type><a href=#md-vcard-email-type>type</a></code> property per distinct
-    value.</p>
-
-   </dd>
-
-   <dt><dfn id=md-vcard-email-value title=md-vcard-email-value><code>value</code></dfn> (inside <code title=md-vcard-email><a href=#md-vcard-email>email</a></code>)</dt>
-
    <dd>
 
-    <p>Gives the actual e-mail address of the person or
-    organization.</p>
+    <p>Gives a <a href=#url>URL</a> for instant messaging and presence
+    protocol communications with the person or organization.</p>
 
     <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
+    an <a href=#absolute-url>absolute URL</a>.</p>
 
-    <p>Exactly one property with the name <code title=md-vcard-email-value><a href=#md-vcard-email-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 an <code title=md-vcard-email><a href=#md-vcard-email>email</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>Any number of properties with the name <code title=md-vcard-impp><a href=#md-vcard-impp>impp</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-mailer title=md-vcard-mailer><code>mailer</code></dfn></dt>
+   <dt><dfn id=md-vcard-lang title=md-vcard-lang><code>lang</code></dfn></dt>
 
    <dd>
 
-    <p>Gives the name of the e-mail software used by the person or
-    organization.</p>
+    <p>Gives a language understood by the person or organization.</p>
 
     <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
+    a valid BCP 47 language tag. <a href=#refsBCP47>[BCP47]</a>.</p>
 
-    <p>Any number of properties with the name <code title=md-vcard-mailer><a href=#md-vcard-mailer>mailer</a></code> may be present within each
+    <p>Any number of properties with the name <code title=md-vcard-lang><a href=#md-vcard-lang>lang</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>
@@ -59278,6 +59318,70 @@
    </dd>
 
 
+   <dt><dfn id=md-vcard-member title=md-vcard-member><code>member</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives a <a href=#url>URL</a> that represents a member of the
+    group.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
+    an <a href=#absolute-url>absolute URL</a>.</p>
+
+    <p>Any number of properties with the name <code title=md-vcard-member><a href=#md-vcard-member>member</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> if
+    the <a href=#concept-item title=concept-item>item</a> also has a property
+    with the name <code title=md-vcard-kind><a href=#md-vcard-kind>kind</a></code> whose value
+    is "<code title=md-vcard-kind-group><a href=#md-vcard-kind-group>group</a></code>".</p>
+
+   </dd>
+
+
+   <dt><dfn id=md-vcard-related title=md-vcard-related><code>related</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives a relationship to another entity.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must an
+    <a href=#concept-item title=concept-item>item</a> with one <code title=md-vcard-org-related-url><a href=#md-vcard-org-related-url>url</a></code> property and one <code title=md-vcard-org-related-rel><a href=#md-vcard-org-related-rel>rel</a></code> properties.</p>
+
+    <p>Any number of properties with the name <code title=md-vcard-related><a href=#md-vcard-related>orrelated</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-org-related-url title=md-vcard-org-related-url><code>url</code></dfn> (inside <code title=md-vcard-related><a href=#md-vcard-related>related</a></code>)</dt>
+
+   <dd>
+
+    <p>Gives the <a href=#url>URL</a> for the related entity.</p>
+
+    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
+    an <a href=#absolute-url>absolute URL</a>.</p>
+
+    <p>Exactly one property with the name <code title=md-vcard-org-url>url</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 an <code title=md-vcard-related><a href=#md-vcard-related>related</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-org-related-rel title=md-vcard-org-related-rel><code>rel</code></dfn> (inside <code title=md-vcard-related><a href=#md-vcard-related>related</a></code>)</dt>
+
+   <dd>
+
+    <p>Gives the relationship between the entity and the related
+    entity.</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=#relationship-strings>relationship strings</a>.</p>
+
+    <p>Exactly one property with the name <code title=md-vcard-org-rel>rel</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 an <code title=md-vcard-related><a href=#md-vcard-related>related</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-categories title=md-vcard-categories><code>categories</code></dfn></dt>
 
    <dd>
@@ -59334,23 +59438,6 @@
    </dd>
 
 
-   <dt><dfn id=md-vcard-sort-string title=md-vcard-sort-string><code>sort-string</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the string to be used for sorting the person or
-    organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-sort-string><a href=#md-vcard-sort-string>sort-string</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-sound title=md-vcard-sound><code>sound</code></dfn></dt>
 
    <dd>
@@ -59381,6 +59468,9 @@
    </dd>
 
 
+   <!-- CLIENTPIDMAP not included since the global parameters are not included -->
+
+
    <dt><dfn id=md-vcard-url title=md-vcard-url><code>url</code></dfn></dt>
 
    <dd>
@@ -59396,122 +59486,40 @@
    </dd>
 
 
-   <!-- VERSION not included - always 3.0 -->
+   <!-- VERSION not included - always 4.0 -->
 
-
-   <dt><dfn id=md-vcard-class title=md-vcard-class><code>class</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the access classification of the information regarding
-    the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    text with one of the following values:</p>
-
-    <ul class=brief><li><code title="">public</code></li>
-     <li><code title="">private</code></li>
-     <li><code title="">confidential</code></li>
-    </ul><p class=warning>This is merely advisory and cannot be
-    considered a confidentiality measure.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-class><a href=#md-vcard-class>class</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>
-
-
    <!-- KEY not included - no way to include binary data at this time -->
 
+   <!-- FBURL, CALADRURI, CALURI not included - unclear how calendars would be exposed on the web -->
 
-   <!-- IMPP is from RFC4770 -->
+  </dl><p>The <dfn id=kind-strings>kind strings</dfn> are:</p>
 
-   <dt><dfn id=md-vcard-impp title=md-vcard-impp><code>impp</code></dfn></dt>
-
+  <dl><dt><dfn id=md-vcard-kind-individual title=md-vcard-kind-individual><code>individual</code></dfn></dt>
    <dd>
-
-    <p>Gives a <a href=#url>URL</a> for instant messaging and presence
-    protocol communications with the person or organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    either an <a href=#absolute-url>absolute URL</a> or an <a href=#concept-item title=concept-item>item</a> with zero or more <code title=md-vcard-impp-type><a href=#md-vcard-impp-type>type</a></code> properties and exactly one
-    <code title=md-vcard-impp-value><a href=#md-vcard-impp-value>value</a></code> property.</p>
-
-    <p>If no <code title=md-vcard-impp-type><a href=#md-vcard-impp-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-impp><a href=#md-vcard-impp>impp</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 an <code title=md-vcard-impp><a href=#md-vcard-impp>impp</a></code> property is an <a href=#absolute-url>absolute
-    URL</a>, then no <a href=#impp-type-strings>IMPP type strings</a> are
-    implied.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-impp><a href=#md-vcard-impp>impp</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>
-
+    <p>Indicates a single entity (e.g. a person).</p>
    </dd>
 
-   <dt><dfn id=md-vcard-impp-type title=md-vcard-impp-type><code>type</code></dfn> (inside <code title=md-vcard-impp><a href=#md-vcard-impp>impp</a></code>)</dt>
-
+   <dt><dfn id=md-vcard-kind-group title=md-vcard-kind-group><code>group</code></dfn></dt>
    <dd>
-
-    <p>Gives the intended use of the IMPP <a href=#url>URL</a>.</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=#impp-type-strings>IMPP 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-impp><a href=#md-vcard-impp>impp</a></code> property <a href=#concept-item title=concept-item>item</a> with a <code title=md-vcard-impp-type><a href=#md-vcard-impp-type>type</a></code> property whose value is
-    <code title=md-vcard-type-impp-pref><a href=#md-vcard-type-impp-pref>pref</a></code>.</p>
-
-    <p>Any number of properties with the name <code title=md-vcard-impp-type><a href=#md-vcard-impp-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-impp><a href=#md-vcard-impp>impp</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-impp><a href=#md-vcard-impp>impp</a></code> property <a href=#concept-item title=concept-item>item</a> there must only be one <code title=md-vcard-impp-type><a href=#md-vcard-impp-type>type</a></code> property per distinct
-    value.</p>
-
+    <p>Indicates multiple entities (e.g. a mailing list).</p>
    </dd>
 
-   <dt><dfn id=md-vcard-impp-value title=md-vcard-impp-value><code>value</code></dfn> (inside <code title=md-vcard-impp><a href=#md-vcard-impp>impp</a></code>)</dt>
-
+   <dt><dfn id=md-vcard-kind-org title=md-vcard-kind-org><code>org</code></dfn></dt>
    <dd>
-
-    <p>Gives the actual <a href=#url>URL</a> for instant messaging and
-    presence protocol communications with the person or
-    organization.</p>
-
-    <p>The <a href=#concept-property-value title=concept-property-value>value</a> must be
-    an <a href=#absolute-url>absolute URL</a>.</p>
-
-    <p>Exactly one property with the name <code title=md-vcard-impp-value><a href=#md-vcard-impp-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 an <code title=md-vcard-impp><a href=#md-vcard-impp>impp</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>Indicates a single entity that is not a person (e.g. a company).</p>
    </dd>
 
-
-  </dl><p>The <dfn id=address-type-strings>address type strings</dfn> are:</p>
-
-  <dl><dt><dfn id=md-vcard-type-adr-dom title=md-vcard-type-adr-dom><code>dom</code></dfn></dt>
+   <dt><dfn id=md-vcard-kind-location title=md-vcard-kind-location><code>location</code></dfn></dt>
    <dd>
-    <p>Indicates a domestic delivery address.</p>
+    <p>Indicates a geographical place (e.g. an office building).</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-adr-intl title=md-vcard-type-adr-intl><code>intl</code></dfn></dt>
-   <dd>
-    <p>Indicates an international delivery address.</p>
-   </dd>
+   <!-- update this when http://www.iana.org/assignments/vcard-elements/vcard-elements.xml#property-values is updated -->
 
-   <dt><dfn id=md-vcard-type-adr-postal title=md-vcard-type-adr-postal><code>postal</code></dfn></dt>
-   <dd>
-    <p>Indicates a postal delivery address.</p>
-   </dd>
+  </dl><p>The <dfn id=address-type-strings>address type strings</dfn> are:</p>
 
-   <dt><dfn id=md-vcard-type-adr-parcel title=md-vcard-type-adr-parcel><code>parcel</code></dfn></dt>
+  <dl><dt><dfn id=md-vcard-type-adr-home title=md-vcard-type-adr-home><code>home</code></dfn></dt>
    <dd>
-    <p>Indicates a parcel delivery address.</p>
-   </dd>
-
-   <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>
    </dd>
 
@@ -59520,14 +59528,6 @@
     <p>Indicates a delivery address for a place of work.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-adr-pref title=md-vcard-type-adr-pref><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred delivery address when multiple
-    addresses are specified.</p>
-
-   </dd>
-
   </dl><p>The <dfn id=telephone-type-strings>telephone type strings</dfn> are:</p>
 
   <dl><dt><dfn id=md-vcard-type-tel-home title=md-vcard-type-tel-home><code>home</code></dfn></dt>
@@ -59535,14 +59535,14 @@
     <p>Indicates a residential number.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-msg title=md-vcard-type-tel-msg><code>msg</code></dfn></dt>
+   <dt><dfn id=md-vcard-type-tel-work title=md-vcard-type-tel-work><code>work</code></dfn></dt>
    <dd>
-    <p>Indicates a telephone number with voice messaging support.</p>
+    <p>Indicates a telephone number for a place of work.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-work title=md-vcard-type-tel-work><code>work</code></dfn></dt>
+   <dt><dfn id=md-vcard-type-tel-text title=md-vcard-type-tel-text><code>text</code></dfn></dt>
    <dd>
-    <p>Indicates a telephone number for a place of work.</p>
+    <p>Indicates that the telephone number supports text messages (SMS).</p>
    </dd>
 
    <dt><dfn id=md-vcard-type-tel-voice title=md-vcard-type-tel-voice><code>voice</code></dfn></dt>
@@ -59570,82 +59570,46 @@
     <p>Indicates a paging device telephone number.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-bbs title=md-vcard-type-tel-bbs><code>bbs</code></dfn></dt>
+   <dt><dfn id=md-vcard-type-tel-textphone title=md-vcard-type-tel-textphone><code>textphone</code></dfn></dt>
    <dd>
-    <p>Indicates a bulletin board system telephone number.</p>
+    <p>Indicates a telecommunication device for people with hearing or speech difficulties.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-modem title=md-vcard-type-tel-modem><code>modem</code></dfn></dt>
-   <dd>
-    <p>Indicates a MODEM-connected telephone number.</p>
-   </dd>
+  </dl><p>The <dfn id=relationship-strings>relationship strings</dfn> are:</p>
 
-   <dt><dfn id=md-vcard-type-tel-car title=md-vcard-type-tel-car><code>car</code></dfn></dt>
+  <dl><dt><dfn id=md-vcard-rel-emergency title=md-vcard-rel-emergency><code>emergency</code></dfn></dt>
    <dd>
-    <p>Indicates a car-phone telephone number.</p>
+    <p>An emergency contact.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-isdn title=md-vcard-type-tel-isdn><code>isdn</code></dfn></dt>
+   <dt><dfn id=md-vcard-rel-agent title=md-vcard-rel-agent><code>agent</code></dfn></dt>
    <dd>
-    <p>Indicates an ISDN service telephone number.</p>
+    <p>Another entity that acts on behalf of this entity.</p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-pcs title=md-vcard-type-tel-pcs><code>pcs</code></dfn></dt>
+   <dt><dfn id=md-vcard-rel-contact title=md-vcard-rel-contact>contact</dfn></dt>
+   <dt><dfn id=md-vcard-rel-acquaintance title=md-vcard-rel-acquaintance>acquaintance</dfn></dt>
+   <dt><dfn id=md-vcard-rel-friend title=md-vcard-rel-friend>friend</dfn></dt>
+   <dt><dfn id=md-vcard-rel-met title=md-vcard-rel-met>met</dfn></dt>
+   <dt><dfn id=md-vcard-rel-co-worker title=md-vcard-rel-co-worker>worker</dfn></dt>
+   <dt><dfn id=md-vcard-rel-colleague title=md-vcard-rel-colleague>colleague</dfn></dt>
+   <dt><dfn id=md-vcard-rel-co-resident title=md-vcard-rel-co-resident>resident</dfn></dt>
+   <dt><dfn id=md-vcard-rel-neighbor title=md-vcard-rel-neighbor>neighbor</dfn></dt>
+   <dt><dfn id=md-vcard-rel-child title=md-vcard-rel-child>child</dfn></dt>
+   <dt><dfn id=md-vcard-rel-parent title=md-vcard-rel-parent>parent</dfn></dt>
+   <dt><dfn id=md-vcard-rel-sibling title=md-vcard-rel-sibling>sibling</dfn></dt>
+   <dt><dfn id=md-vcard-rel-spouse title=md-vcard-rel-spouse>spouse</dfn></dt>
+   <dt><dfn id=md-vcard-rel-kin title=md-vcard-rel-kin>kin</dfn></dt>
+   <dt><dfn id=md-vcard-rel-muse title=md-vcard-rel-muse>muse</dfn></dt>
+   <dt><dfn id=md-vcard-rel-crush title=md-vcard-rel-crush>crush</dfn></dt>
+   <dt><dfn id=md-vcard-rel-date title=md-vcard-rel-date>date</dfn></dt>
+   <dt><dfn id=md-vcard-rel-sweetheart title=md-vcard-rel-sweetheart>sweetheart</dfn></dt>
+   <dt><dfn id=md-vcard-rel-me title=md-vcard-rel-me>me</dfn></dt>
    <dd>
-    <p>Indicates a personal communication services telephone number.</p>
+    <p>Has the meaning defined in XFN. <a href=#refsXFN>[XFN]</a></p>
    </dd>
 
-   <dt><dfn id=md-vcard-type-tel-pref title=md-vcard-type-tel-pref><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred telephone number when multiple
-    telephone numbers are specified.</p>
-
-   </dd>
-
-  </dl><p>The <dfn id=e-mail-type-strings>e-mail type strings</dfn> are:</p>
-
-  <dl><dt><dfn id=md-vcard-type-email-internet title=md-vcard-type-email-internet><code>internet</code></dfn></dt>
-   <dd>
-    <p>Indicates an Internet e-mail address.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-email-x400 title=md-vcard-type-email-x400><code>x400</code></dfn></dt>
-   <dd>
-    <p>Indicates an X.400 addressing type.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-email-pref title=md-vcard-type-email-pref><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred e-mail address when multiple e-mail
-    addresses are specified.</p>
-
-   </dd>
-
-  </dl><p>The <dfn id=impp-type-strings>IMPP type strings</dfn> are:</p>
-
-  <dl><dt><dfn id=md-vcard-type-impp-personal title=md-vcard-type-impp-personal><code>personal</code></dfn></dt>
-   <dt><dfn id=md-vcard-type-impp-business title=md-vcard-type-impp-business><code>business</code></dfn></dt>
-   <dd>
-    <p>Indicates the type of communication for which this IMPP
-    <a href=#url>URL</a> is appropriate.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-impp-home title=md-vcard-type-impp-home><code>home</code></dfn></dt>
-   <dt><dfn id=md-vcard-type-impp-work title=md-vcard-type-impp-work><code>work</code></dfn></dt>
-   <dt><dfn id=md-vcard-type-impp-mobile title=md-vcard-type-impp-mobile><code>mobile</code></dfn></dt>
-   <dd>
-    <p>Indicates the location of a device associated with this IMPP
-    <a href=#url>URL</a>.</p>
-   </dd>
-
-   <dt><dfn id=md-vcard-type-impp-pref title=md-vcard-type-impp-pref><code>pref</code></dfn></dt>
-   <dd>
-    <p>Indicates the preferred address when multiple IMPP
-    <a href=#url>URL</a>s are specified.</p>
-   </dd>
-
+   <!-- update this when http://www.iana.org/assignments/vcard-elements/vcard-elements.xml#parameter-values is updated -->
   </dl><h5 id=conversion-to-vcard><span class=secno>5.4.1.1 </span>Conversion to vCard</h5>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -59668,7 +59632,7 @@
 
    <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">PROFILE</code>" and the value "<code title="">VCARD</code>" to <var title="">output</var>.</li>
 
-   <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">VERSION</code>" and the value "<code title="">3.0</code>"
+   <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">VERSION</code>" and the value "<code title="">4.0</code>"
    to <var title="">output</var>.</li>
 
    <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">SOURCE</code>" and the result of <a href=#escaping-the-vcard-text-string>escaping the vCard
@@ -59680,6 +59644,11 @@
    vCard text string</a> obtained from the <code><a href=#textcontent>textContent</a></code>
    of <a href=#the-title-element-0>the <code>title</code> element</a> as the value to <var title="">output</var>.</li>
 
+   <li><p>Let <var title="">sex</var> be the empty string.</li>
+
+   <li><p>Let <var title="">gender-identity</var> be the empty
+   string.</li>
+
    <li>
 
     <p>For each element <var title="">element</var> that is <a href=#the-properties-of-an-item title="the properties of an item">a property of the item</a>
@@ -59832,31 +59801,36 @@
 
        <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is an <a href=#concept-item title=concept-item>item</a> <var title="">subitem</var>
        with the <a href=#item-types title="item types">item type</a> <code title=md-vcard><a href=#md-vcard>http://microformats.org/profile/hcard</a></code>
-       and <var title="">name</var> is <code title=md-vcard-agent><a href=#md-vcard-agent>agent</a></code></dt>
+       and <var title="">name</var> is <code title=md-vcard-related><a href=#md-vcard-related>related</a></code></dt>
 
        <dd>
 
-        <ol><li>
+        <ol><li><p>Let <var title="">value</var> be the empty
+         string.</li>
 
-          <p>If the user agent is already attempting to <a href=#extracting-a-vcard title="extracting a vCard">extract a vCard</a> from the
-          element that represents <var title="">subitem</var>, then
-          let <var title="">value</var> be the string "<code title="">ERROR</code>".</p>
+         <li><p>If there is a property named <code title=md-vcard-related-url>url</code> in <var title="">subitem</var>, and its element is a <a href=#url-property-elements title="URL
+         property elements">URL property element</a>, then append
+         the result of <a href=#escaping-the-vcard-text-string>escaping the vCard text string</a>
+         given by the <a href=#concept-property-value title=concept-property-value>value</a> of the first such
+         property to <var title="">value</var>, and add a parameter
+         with the name "<code title="">VALUE</code>" and the value
+         "<code title="">URI</code>" to <var title="">parameters</var>.</li>
 
-          <p>Otherwise, let <var title="">value</var> be the result of
-          <a href=#escaping-the-vcard-text-string>escaping the vCard text string</a> obtained from
-          <a href=#extracting-a-vcard>extracting a vCard</a> from the element that
-          represents <var title="">subitem</var>.</p>
+         <li><p>If there is a property named <code title=md-vcard-related-rel>rel</code> in <var title="">subitem</var>, and the first such property has a
+         <a href=#concept-property-value title=concept-property-value>value</a> that is not
+         an <a href=#concept-item title=concept-item>item</a> and whose value
+         consists only of <a href=#alphanumeric-ascii-characters>alphanumeric ASCII characters</a>,
+         then add a parameter named "<code title="">RELATION</code>"
+         whose value is the <a href=#concept-property-value title=concept-property-value>value</a> of that property
+         to <var title="">parameters</var>.</li>
 
-         </li>
-
-         <li><p>Add a parameter named "<code title="">VALUE</code>"
-         whose value is "<code title="">VCARD</code>" to <var title="">parameters</var>.</li>
-
         </ol></dd>
 
        <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is an <a href=#concept-item title=concept-item>item</a> and <var title="">name</var>
        is none of the above</dt>
 
+       <!-- tel, adr -->
+
        <dd>
 
         <ol><li><p>Let <var title="">value</var> be the result of
@@ -59873,6 +59847,25 @@
 
         </ol></dd>
 
+
+       <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is not an <a href=#concept-item title=concept-item>item</a> and its <var title="">name</var> is <code title=md-vcard-sex><a href=#md-vcard-sex>sex</a></code></dt>
+
+       <dd>
+
+        <p>If this is the first such property to be found, set <var title="">sex</var> to the property's <a href=#concept-property-value title=concept-property-value>value</a>.</p>
+
+       </dd>
+
+
+       <dt>If the property's <a href=#concept-property-value title=concept-property-value>value</a> is not an <a href=#concept-item title=concept-item>item</a> and its <var title="">name</var> is <code title=md-vcard-gender-identity><a href=#md-vcard-gender-identity>gender-identity</a></code></dt>
+
+       <dd>
+
+        <p>If this is the first such property to be found, set <var title="">gender-identity</var> to the property's <a href=#concept-property-value title=concept-property-value>value</a>.</p>
+
+       </dd>
+
+
        <dt>Otherwise (the property's <a href=#concept-property-value title=concept-property-value>value</a> is not an <a href=#concept-item title=concept-item>item</a>)</dt>
 
        <dd>
@@ -59882,11 +59875,11 @@
          <li><p>If <var title="">element</var> is one of the <a href=#url-property-elements>URL
          property elements</a>, add a parameter with the name "<code title="">VALUE</code>" and the value "<code title="">URI</code>" to <var title="">parameters</var>.</li>
 
-         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-bday><a href=#md-vcard-bday>bday</a></code> and the <var title="">value</var> is a <a href=#valid-date-string>valid date string</a>, add
+         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-bday><a href=#md-vcard-bday>bday</a></code> or <code title=md-vcard-anniversary><a href=#md-vcard-anniversary>anniversary</a></code> and the <var title="">value</var> is a <a href=#valid-date-string>valid date string</a>, add
          a parameter with the name "<code title="">VALUE</code>" and
          the value "<code title="">DATE</code>" to <var title="">parameters</var>.</li>
 
-         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-bday><a href=#md-vcard-bday>rev</a></code> and the <var title="">value</var> is a <a href=#valid-global-date-and-time-string>valid global date and time
+         <li><p>Otherwise, if <var title="">name</var> is <code title=md-vcard-rev><a href=#md-vcard-rev>rev</a></code> and the <var title="">value</var> is a <a href=#valid-global-date-and-time-string>valid global date and time
          string</a>, add a parameter with the name "<code title="">VALUE</code>" and the value "<code title="">DATE-TIME</code>" to <var title="">parameters</var>.</li>
 
          <li><p>Prefix every U+005C REVERSE SOLIDUS character (\) in
@@ -59922,6 +59915,11 @@
 
     </ol></li>
 
+   <li><p>If either of <var title="">sex</var> or <var title="">gender-identity</var> have a value that is not the empty
+   string, <a href=#add-a-vcard-line>add a vCard line</a> with the type "<code title="">GENDER</code>" and the value consisting of the
+   concatenation of <var title="">sex</var>, a U+003B SEMICOLON
+   character (;), and <var title="">gender-identity</var> to <var title="">output</var>.</li>
+
    <li><p><a href=#add-a-vcard-line>Add a vCard line</a> with the type "<code title="">END</code>" and the value "<code title="">VCARD</code>"
    to <var title="">output</var>.</li>
 
@@ -60095,7 +60093,7 @@
  <ul>
   <li itemprop="tel" itemscope>
    <span itemprop="value">+1 (310) 597 3781</span> <span itemprop="type">work</span>
-   <meta itemprop="type" content="pref">
+   <meta itemprop="type" content="voice">
   </li>
   <li><a itemprop="url" href="http://en.wikipedia.org/wiki/Jack_Bauer">I'm on Wikipedia</a>
   so you can leave a message on my user talk page.</li>
@@ -60106,19 +60104,8 @@
    <meta itemprop="type" content="cell">mobile phone</span>
   </li>
  </ul>
- <p itemprop="note">If I'm out in the field, you may be better off contacting <span
- itemprop="agent" itemscope itemtype="http://microformats.org/profile/hcard"><a
- itemprop="email" href="mailto:c.obrian at la.ctu.gov.invalid"><span
- itemprop="fn"><span itemprop="n" itemscope><span
- itemprop="given-name">Chloe</span> <span
- itemprop="family-name">O'Brian</span></span></span></a></span>
- if it's about work, or ask <span itemprop="agent">Tony Almeida</span>
- if you're interested in the CTU five-a-side football team we're trying to get going.</p>
  <ins datetime="2008-07-20T21:00:00+01:00">
-  <span itemprop="rev" itemscope>
-   <meta itemprop="type" content="date-time">
-   <meta itemprop="value" content="2008-07-20T21:00:00+01:00">
-  </span>
+  <meta itemprop="rev" content="2008-07-20T21:00:00+01:00">
   <p itemprop="tel" itemscope><strong>Update!</strong>
   My new <span itemprop="type">home</span> phone number is
   <span itemprop="value">01632 960 123</span>.</p>
@@ -60169,7 +60156,7 @@
 
    <pre>BEGIN:VCARD
 PROFILE:VCARD
-VERSION:3.0
+VERSION:4.0
 SOURCE:<var title="">document's address</var>
 FN:George Washington
 N:Washington;George;;;
@@ -70227,16 +70214,16 @@
   method allows Web sites to register themselves as possible handlers
   for particular schemes. For example, an online telephone messaging
   service could register itself as a handler of the <code>sms:</code>
-  scheme (<a href=#refsRFC5724>[RFC5724]</a>), so that if the user
-  clicks on such a link, he is given the opportunity to use that Web
-  site. Analogously, the <dfn id=dom-navigator-registercontenthandler title=dom-navigator-registerContentHandler><code>registerContentHandler()</code></dfn>
+  scheme, so that if the user clicks on such a link, he is given the
+  opportunity to use that Web site. Analogously, the <dfn id=dom-navigator-registercontenthandler title=dom-navigator-registerContentHandler><code>registerContentHandler()</code></dfn>
   method allows Web sites to register themselves as possible handlers
   for content in a particular <a href=#mime-type>MIME type</a>. For example, the
   same online telephone messaging service could register itself as a
-  handler for <code>text/directory</code> files (<a href=#refsRFC2425>[RFC2425]</a>), so that if the user has no
-  native application capable of handling vCards (<a href=#refsRFC2426>[RFC2426]</a>), his Web browser can instead
-  suggest he use that site to view contact information stored on
-  vCards that he opens.</p>
+  handler for <code>text/vcard</code> files, so that if the user has
+  no native application capable of handling vCards, his Web browser
+  can instead suggest he use that site to view contact information
+  stored on vCards that he opens. <a href=#refsRFC5724>[RFC5724]</a>
+  <a href=#refsRFC6350>RFC6350</a></p>
 
   <dl class=domintro><dt><var title="">window</var> . <code title=dom-navigator><a href=#dom-navigator>navigator</a></code> . <code title=dom-navigator-registerProtocolHandler><a href=#dom-navigator-registerprotocolhandler>registerProtocolHandler</a></code>(<var title="">scheme</var>, <var title="">url</var>, <var title="">title</var>)</dt>
    <dt><var title="">window</var> . <code title=dom-navigator><a href=#dom-navigator>navigator</a></code> . <code title=dom-navigator-registerContentHandler><a href=#dom-navigator-registercontenthandler>registerContentHandler</a></code>(<var title="">mimeType</var>, <var title="">url</var>, <var title="">title</var>)</dt>
@@ -101441,15 +101428,6 @@
    <dd><cite><a href=http://tools.ietf.org/html/rfc2397>The "data"
    URL scheme</a></cite>, L. Masinter. IETF.</dd>
 
-   <dt id=refsRFC2425>[RFC2425]</dt>
-   <dd><cite><a href=http://tools.ietf.org/html/rfc2425>A MIME
-   Content-Type for Directory Information</a></cite>, T. Howes,
-   M. Smith, F. Dawson. IETF.</dd>
-
-   <dt id=refsRFC2426>[RFC2426]</dt>
-   <dd><cite><a href=http://tools.ietf.org/html/rfc2426>vCard MIME Directory
-   Profile</a></cite>, F. Dawson, T. Howes. IETF.</dd>
-
    <dt id=refsRFC2445>[RFC2445]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc2445>Internet Calendaring
    and Scheduling Core Object Specification (iCalendar)</a></cite>, F. Dawson, D.
@@ -101517,10 +101495,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
@@ -101539,6 +101513,9 @@
    <dt id=refsRFC6266>[RFC6266]</dt>
    <dd><cite><a href=http://tools.ietf.org/html/rfc6266>Use of the Content-Disposition Header Field in the Hypertext Transfer Protocol (HTTP)</a></cite>, J. Reschke. IETF.</dd>
 
+   <dt id=refsRFC6350>[RFC6350]</dt>
+   <dd><cite><a href=http://tools.ietf.org/html/rfc6350>vCard Format Specification</a></cite>, S. Perreault. IETF.</dd>
+
    <dt id=refsSCSU>[SCSU]</dt>
    <dd>(Non-normative) <cite><a href=http://www.unicode.org/reports/tr6/>UTR #6: A Standard
    Compression Scheme For Unicode</a></cite>, M. Wolf, K. Whistler,
@@ -101679,6 +101656,9 @@
    Rules (CER), and Distinguished Encoding Rules
    (DER)</a></cite>. International Telecommunication Union.</dd>
 
+   <dt id=refsXFN>[XFN]</dt>
+   <dd><cite><a href=http://gmpg.org/xfn/11>XFN 1.1 profile</a></cite>, T. Çelik, M. Mullenweg, E. Meyer. GMPG.</dd>
+
    <dt id=refsXHR>[XHR]</dt>
    <!--
    <dd><cite><a href="http://www.w3.org/TR/XMLHttpRequest/">The XMLHttpRequest

Modified: source
===================================================================
--- source	2011-11-03 17:06:05 UTC (rev 6815)
+++ source	2011-11-03 20:47:49 UTC (rev 6816)
@@ -66122,11 +66122,35 @@
   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="#refsRFC2426">[RFC2426]</a> <a
-  href="#refsRFC4770">[RFC4770]</a></p>
+  found. <a
+  href="#refsRFC6350">[RFC6350]</a></p>
 
   <dl>
 
+   <dt><dfn title="md-vcard-kind"><code>kind</code></dfn></dt>
+
+   <dd>
+
+    <p>Describes what kind of contact the item represents.</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>kind strings</span>.</p>
+
+    <p>A single property with the name <code
+    title="md-vcard-kind">kind</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>
+
+
+   <!-- XML not included since there's no good way to do it here -->
+   <!-- Note: vCard->microdata->vCard doesn't count as "propagating
+        vCards" according to Tantek, so we're not non-conforming when
+        we drop it, despite vCard's requirement -->
+
+
    <dt><dfn title="md-vcard-fn"><code>fn</code></dfn></dt>
 
    <dd>
@@ -66323,6 +66347,63 @@
    </dd>
 
 
+   <dt><dfn title="md-vcard-anniversary"><code>anniversary</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the birth date of the person or organization.</p>
+
+    <p>The <span title="concept-property-value">value</span> must be a
+    <span>valid date string</span>.</p>
+
+    <p>A single property with the name <code
+    title="md-vcard-anniversary">anniversary</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-sex"><code>sex</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the biological sex of the person.</p>
+
+    <p>The <span title="concept-property-value">value</span> must be one of
+    <code title="">F</code>, meaning "female",
+    <code title="">M</code>, meaning "male",
+    <code title="">N</code>, meaning "none or not applicable", 
+    <code title="">O</code>, meaning "other", or
+    <code title="">U</code>, meaning "unknown".</p>
+
+    <p>A single property with the name <code
+    title="md-vcard-sex">sex</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-gender-identity"><code>gender-identity</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives the gender identity of the person.</p>
+
+    <p>The <span title="concept-property-value">value</span> must be
+    text.</p>
+
+    <p>A single property with the name <code
+    title="md-vcard-gender-identity">gender-identity</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-adr"><code>adr</code></dfn></dt>
 
    <dd>
@@ -66713,23 +66794,8 @@
     <p>Gives the e-mail 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-email-type">type</code> properties
-    and exactly one <code title="md-vcard-email-value">value</code>
-    property.</p>
+    text.</p>
 
-    <p>If no <code title="md-vcard-email-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 an
-    <code title="md-vcard-email">email</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 an <code
-    title="md-vcard-email">email</code> property is text, then the
-    <span title="e-mail type strings">e-mail type string</span> <code
-    title="mv-vcard-type-email-internet">internet</code> is
-    implied.</p>
-
     <p>Any number of properties with the name <code
     title="md-vcard-email">email</code> may be present within each
     <span title="concept-item">item</span> with the type <code
@@ -66737,70 +66803,36 @@
 
    </dd>
 
-   <dt><dfn title="md-vcard-email-type"><code>type</code></dfn> (inside <code title="md-vcard-email">email</code>)</dt>
 
-   <dd>
+   <dt><dfn title="md-vcard-impp"><code>impp</code></dfn></dt>
 
-    <p>Gives the type of e-mail 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>e-mail 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-email">email</code> property <span
-    title="concept-item">item</span> with a <code
-    title="md-vcard-email-type">type</code> property whose value is
-    <code title="md-vcard-type-email-pref">pref</code>.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-email-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 an <code
-    title="md-vcard-email">email</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-email">email</code> property <span
-    title="concept-item">item</span> there must only be one <code
-    title="md-vcard-email-type">type</code> property per distinct
-    value.</p>
-
-   </dd>
-
-   <dt><dfn title="md-vcard-email-value"><code>value</code></dfn> (inside <code title="md-vcard-email">email</code>)</dt>
-
    <dd>
 
-    <p>Gives the actual e-mail address of the person or
-    organization.</p>
+    <p>Gives a <span>URL</span> for instant messaging and presence
+    protocol communications with the person or organization.</p>
 
     <p>The <span title="concept-property-value">value</span> must be
-    text.</p>
+    an <span>absolute URL</span>.</p>
 
-    <p>Exactly one property with the name <code
-    title="md-vcard-email-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 an <code
-    title="md-vcard-email">email</code> property of an <span
-    title="concept-item">item</span> with the type <code
+    <p>Any number of properties with the name <code
+    title="md-vcard-impp">impp</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-mailer"><code>mailer</code></dfn></dt>
+   <dt><dfn title="md-vcard-lang"><code>lang</code></dfn></dt>
 
    <dd>
 
-    <p>Gives the name of the e-mail software used by the person or
-    organization.</p>
+    <p>Gives a language understood by the person or organization.</p>
 
     <p>The <span title="concept-property-value">value</span> must be
-    text.</p>
+    a valid BCP 47 language tag. <a href="#refsBCP47">[BCP47]</a>.</p>
 
     <p>Any number of properties with the name <code
-    title="md-vcard-mailer">mailer</code> may be present within each
+    title="md-vcard-lang">lang</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>
 
@@ -67029,6 +67061,86 @@
    </dd>
 
 
+   <dt><dfn title="md-vcard-member"><code>member</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives a <span>URL</span> that represents a member of the
+    group.</p>
+
+    <p>The <span title="concept-property-value">value</span> must be
+    an <span>absolute URL</span>.</p>
+
+    <p>Any number of properties with the name <code
+    title="md-vcard-member">member</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> if
+    the <span title="concept-item">item</span> also has a property
+    with the name <code title="md-vcard-kind">kind</code> whose value
+    is "<code title="md-vcard-kind-group">group</code>".</p>
+
+   </dd>
+
+
+   <dt><dfn title="md-vcard-related"><code>related</code></dfn></dt>
+
+   <dd>
+
+    <p>Gives a relationship to another entity.</p>
+
+    <p>The <span title="concept-property-value">value</span> must an
+    <span title="concept-item">item</span> with one <code
+    title="md-vcard-org-related-url">url</code> property and one <code
+    title="md-vcard-org-related-rel">rel</code> properties.</p>
+
+    <p>Any number of properties with the name <code
+    title="md-vcard-related">orrelated</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-org-related-url"><code>url</code></dfn> (inside <code title="md-vcard-related">related</code>)</dt>
+
+   <dd>
+
+    <p>Gives the <span>URL</span> for the related entity.</p>
+
+    <p>The <span title="concept-property-value">value</span> must be
+    an <span>absolute URL</span>.</p>
+
+    <p>Exactly one property with the name <code
+    title="md-vcard-org-url">url</code> must be present within the
+    <span title="concept-item">item</span> that forms the <span
+    title="concept-property-value">value</span> of an <code
+    title="md-vcard-related">related</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-org-related-rel"><code>rel</code></dfn> (inside <code title="md-vcard-related">related</code>)</dt>
+
+   <dd>
+
+    <p>Gives the relationship between the entity and the related
+    entity.</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>relationship strings</span>.</p>
+
+    <p>Exactly one property with the name <code
+    title="md-vcard-org-rel">rel</code> must be present within the
+    <span title="concept-item">item</span> that forms the <span
+    title="concept-property-value">value</span> of an <code
+    title="md-vcard-related">related</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-categories"><code>categories</code></dfn></dt>
 
    <dd>
@@ -67090,24 +67202,6 @@
    </dd>
 
 
-   <dt><dfn title="md-vcard-sort-string"><code>sort-string</code></dfn></dt>
-
-   <dd>
-
-    <p>Gives the string to be used for sorting the person or
-    organization.</p>
-
-    <p>The <span title="concept-property-value">value</span> must be
-    text.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-sort-string">sort-string</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-sound"><code>sound</code></dfn></dt>
 
    <dd>
@@ -67143,6 +67237,9 @@
    </dd>
 
 
+   <!-- CLIENTPIDMAP not included since the global parameters are not included -->
+
+
    <dt><dfn title="md-vcard-url"><code>url</code></dfn></dt>
 
    <dd>
@@ -67161,124 +67258,39 @@
    </dd>
 
 
-   <!-- VERSION not included - always 3.0 -->
+   <!-- VERSION not included - always 4.0 -->
 
+   <!-- KEY not included - no way to include binary data at this time -->
 
-   <dt><dfn title="md-vcard-class"><code>class</code></dfn></dt>
+   <!-- FBURL, CALADRURI, CALURI not included - unclear how calendars would be exposed on the web -->
 
-   <dd>
+  </dl>
 
-    <p>Gives the access classification of the information regarding
-    the person or organization.</p>
+  <p>The <dfn>kind strings</dfn> are:</p>
 
-    <p>The <span title="concept-property-value">value</span> must be
-    text with one of the following values:</p>
+  <dl>
 
-    <ul class="brief">
-     <li><code title="">public</code></li>
-     <li><code title="">private</code></li>
-     <li><code title="">confidential</code></li>
-    </ul>
-
-    <p class="warning">This is merely advisory and cannot be
-    considered a confidentiality measure.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-class">class</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>
-
+   <dt><dfn title="md-vcard-kind-individual"><code>individual</code></dfn></dt>
+   <dd>
+    <p>Indicates a single entity (e.g. a person).</p>
    </dd>
 
-
-   <!-- KEY not included - no way to include binary data at this time -->
-
-
-   <!-- IMPP is from RFC4770 -->
-
-   <dt><dfn title="md-vcard-impp"><code>impp</code></dfn></dt>
-
+   <dt><dfn title="md-vcard-kind-group"><code>group</code></dfn></dt>
    <dd>
-
-    <p>Gives a <span>URL</span> for instant messaging and presence
-    protocol communications with the person or organization.</p>
-
-    <p>The <span title="concept-property-value">value</span> must be
-    either an <span>absolute URL</span> or an <span
-    title="concept-item">item</span> with zero or more <code
-    title="md-vcard-impp-type">type</code> properties and exactly one
-    <code title="md-vcard-impp-value">value</code> property.</p>
-
-    <p>If no <code title="md-vcard-impp-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 an
-    <code title="md-vcard-impp">impp</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 an <code
-    title="md-vcard-impp">impp</code> property is an <span>absolute
-    URL</span>, then no <span>IMPP type strings</span> are
-    implied.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-impp">impp</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>
-
+    <p>Indicates multiple entities (e.g. a mailing list).</p>
    </dd>
 
-   <dt><dfn title="md-vcard-impp-type"><code>type</code></dfn> (inside <code title="md-vcard-impp">impp</code>)</dt>
-
+   <dt><dfn title="md-vcard-kind-org"><code>org</code></dfn></dt>
    <dd>
-
-    <p>Gives the intended use of the IMPP <span>URL</span>.</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>IMPP 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-impp">impp</code> property <span
-    title="concept-item">item</span> with a <code
-    title="md-vcard-impp-type">type</code> property whose value is
-    <code title="md-vcard-type-impp-pref">pref</code>.</p>
-
-    <p>Any number of properties with the name <code
-    title="md-vcard-impp-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 an <code
-    title="md-vcard-impp">impp</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-impp">impp</code> property <span
-    title="concept-item">item</span> there must only be one <code
-    title="md-vcard-impp-type">type</code> property per distinct
-    value.</p>
-
+    <p>Indicates a single entity that is not a person (e.g. a company).</p>
    </dd>
 
-   <dt><dfn title="md-vcard-impp-value"><code>value</code></dfn> (inside <code title="md-vcard-impp">impp</code>)</dt>
-
+   <dt><dfn title="md-vcard-kind-location"><code>location</code></dfn></dt>
    <dd>
-
-    <p>Gives the actual <span>URL</span> for instant messaging and
-    presence protocol communications with the person or
-    organization.</p>
-
-    <p>The <span title="concept-property-value">value</span> must be
-    an <span>absolute URL</span>.</p>
-
-    <p>Exactly one property with the name <code
-    title="md-vcard-impp-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 an <code
-    title="md-vcard-impp">impp</code> property of an <span
-    title="concept-item">item</span> with the type <code
-    title="md-vcard">http://microformats.org/profile/hcard</code>.</p>
-
+    <p>Indicates a geographical place (e.g. an office building).</p>
    </dd>
 
+   <!-- update this when http://www.iana.org/assignments/vcard-elements/vcard-elements.xml#property-values is updated -->
 
   </dl>
 
@@ -67286,26 +67298,6 @@
 
   <dl>
 
-   <dt><dfn title="md-vcard-type-adr-dom"><code>dom</code></dfn></dt>
-   <dd>
-    <p>Indicates a domestic delivery address.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-adr-intl"><code>intl</code></dfn></dt>
-   <dd>
-    <p>Indicates an international delivery address.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-adr-postal"><code>postal</code></dfn></dt>
-   <dd>
-    <p>Indicates a postal delivery address.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-adr-parcel"><code>parcel</code></dfn></dt>
-   <dd>
-    <p>Indicates a parcel delivery address.</p>
-   </dd>
-
    <dt><dfn title="md-vcard-type-adr-home"><code>home</code></dfn></dt>
    <dd>
     <p>Indicates a residential delivery address.</p>
@@ -67316,14 +67308,6 @@
     <p>Indicates a delivery address for a place of work.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-adr-pref"><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred delivery address when multiple
-    addresses are specified.</p>
-
-   </dd>
-
   </dl>
 
   <p>The <dfn>telephone type strings</dfn> are:</p>
@@ -67335,14 +67319,14 @@
     <p>Indicates a residential number.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-tel-msg"><code>msg</code></dfn></dt>
+   <dt><dfn title="md-vcard-type-tel-work"><code>work</code></dfn></dt>
    <dd>
-    <p>Indicates a telephone number with voice messaging support.</p>
+    <p>Indicates a telephone number for a place of work.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-tel-work"><code>work</code></dfn></dt>
+   <dt><dfn title="md-vcard-type-tel-text"><code>text</code></dfn></dt>
    <dd>
-    <p>Indicates a telephone number for a place of work.</p>
+    <p>Indicates that the telephone number supports text messages (SMS).</p>
    </dd>
 
    <dt><dfn title="md-vcard-type-tel-voice"><code>voice</code></dfn></dt>
@@ -67370,93 +67354,53 @@
     <p>Indicates a paging device telephone number.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-tel-bbs"><code>bbs</code></dfn></dt>
+   <dt><dfn title="md-vcard-type-tel-textphone"><code>textphone</code></dfn></dt>
    <dd>
-    <p>Indicates a bulletin board system telephone number.</p>
+    <p>Indicates a telecommunication device for people with hearing or speech difficulties.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-tel-modem"><code>modem</code></dfn></dt>
-   <dd>
-    <p>Indicates a MODEM-connected telephone number.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-tel-car"><code>car</code></dfn></dt>
-   <dd>
-    <p>Indicates a car-phone telephone number.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-tel-isdn"><code>isdn</code></dfn></dt>
-   <dd>
-    <p>Indicates an ISDN service telephone number.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-tel-pcs"><code>pcs</code></dfn></dt>
-   <dd>
-    <p>Indicates a personal communication services telephone number.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-tel-pref"><code>pref</code></dfn></dt>
-   <dd>
-
-    <p>Indicates the preferred telephone number when multiple
-    telephone numbers are specified.</p>
-
-   </dd>
-
   </dl>
 
-  <p>The <dfn>e-mail type strings</dfn> are:</p>
+  <p>The <dfn>relationship strings</dfn> are:</p>
 
   <dl>
 
-   <dt><dfn title="md-vcard-type-email-internet"><code>internet</code></dfn></dt>
+   <dt><dfn title="md-vcard-rel-emergency"><code>emergency</code></dfn></dt>
    <dd>
-    <p>Indicates an Internet e-mail address.</p>
+    <p>An emergency contact.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-email-x400"><code>x400</code></dfn></dt>
+   <dt><dfn title="md-vcard-rel-agent"><code>agent</code></dfn></dt>
    <dd>
-    <p>Indicates an X.400 addressing type.</p>
+    <p>Another entity that acts on behalf of this entity.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-email-pref"><code>pref</code></dfn></dt>
+   <dt><dfn title="md-vcard-rel-contact">contact</dfn></dt>
+   <dt><dfn title="md-vcard-rel-acquaintance">acquaintance</dfn></dt>
+   <dt><dfn title="md-vcard-rel-friend">friend</dfn></dt>
+   <dt><dfn title="md-vcard-rel-met">met</dfn></dt>
+   <dt><dfn title="md-vcard-rel-co-worker">worker</dfn></dt>
+   <dt><dfn title="md-vcard-rel-colleague">colleague</dfn></dt>
+   <dt><dfn title="md-vcard-rel-co-resident">resident</dfn></dt>
+   <dt><dfn title="md-vcard-rel-neighbor">neighbor</dfn></dt>
+   <dt><dfn title="md-vcard-rel-child">child</dfn></dt>
+   <dt><dfn title="md-vcard-rel-parent">parent</dfn></dt>
+   <dt><dfn title="md-vcard-rel-sibling">sibling</dfn></dt>
+   <dt><dfn title="md-vcard-rel-spouse">spouse</dfn></dt>
+   <dt><dfn title="md-vcard-rel-kin">kin</dfn></dt>
+   <dt><dfn title="md-vcard-rel-muse">muse</dfn></dt>
+   <dt><dfn title="md-vcard-rel-crush">crush</dfn></dt>
+   <dt><dfn title="md-vcard-rel-date">date</dfn></dt>
+   <dt><dfn title="md-vcard-rel-sweetheart">sweetheart</dfn></dt>
+   <dt><dfn title="md-vcard-rel-me">me</dfn></dt>
    <dd>
-
-    <p>Indicates the preferred e-mail address when multiple e-mail
-    addresses are specified.</p>
-
+    <p>Has the meaning defined in XFN. <a href="#refsXFN">[XFN]</a></p>
    </dd>
 
+   <!-- update this when http://www.iana.org/assignments/vcard-elements/vcard-elements.xml#parameter-values is updated -->
   </dl>
 
-  <p>The <dfn>IMPP type strings</dfn> are:</p>
 
-  <dl>
-
-   <dt><dfn title="md-vcard-type-impp-personal"><code>personal</code></dfn></dt>
-   <dt><dfn title="md-vcard-type-impp-business"><code>business</code></dfn></dt>
-   <dd>
-    <p>Indicates the type of communication for which this IMPP
-    <span>URL</span> is appropriate.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-impp-home"><code>home</code></dfn></dt>
-   <dt><dfn title="md-vcard-type-impp-work"><code>work</code></dfn></dt>
-   <dt><dfn title="md-vcard-type-impp-mobile"><code>mobile</code></dfn></dt>
-   <dd>
-    <p>Indicates the location of a device associated with this IMPP
-    <span>URL</span>.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-impp-pref"><code>pref</code></dfn></dt>
-   <dd>
-    <p>Indicates the preferred address when multiple IMPP
-    <span>URL</span>s are specified.</p>
-   </dd>
-
-  </dl>
-
-
   <h5>Conversion to vCard</h5>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -67490,7 +67434,7 @@
    title="">VCARD</code>" to <var title="">output</var>.</p></li>
 
    <li><p><span>Add a vCard line</span> with the type "<code
-   title="">VERSION</code>" and the value "<code title="">3.0</code>"
+   title="">VERSION</code>" and the value "<code title="">4.0</code>"
    to <var title="">output</var>.</p></li>
 
    <li><p><span>Add a vCard line</span> with the type "<code
@@ -67505,6 +67449,11 @@
    of <span>the <code>title</code> element</span> as the value to <var
    title="">output</var>.</p></li>
 
+   <li><p>Let <var title="">sex</var> be the empty string.</p></li>
+
+   <li><p>Let <var title="">gender-identity</var> be the empty
+   string.</p></li>
+
    <li>
 
     <p>For each element <var title="">element</var> that is <span
@@ -67718,31 +67667,38 @@
        with the <span title="item types">item type</span> <code
        title="md-vcard">http://microformats.org/profile/hcard</code>
        and <var title="">name</var> is <code
-       title="md-vcard-agent">agent</code></dt>
+       title="md-vcard-related">related</code></dt>
 
        <dd>
 
         <ol>
 
-         <li>
+         <li><p>Let <var title="">value</var> be the empty
+         string.</p></li>
 
-          <p>If the user agent is already attempting to <span
-          title="extracting a vCard">extract a vCard</span> from the
-          element that represents <var title="">subitem</var>, then
-          let <var title="">value</var> be the string "<code
-          title="">ERROR</code>".</p>
-
-          <p>Otherwise, let <var title="">value</var> be the result of
-          <span>escaping the vCard text string</span> obtained from
-          <span>extracting a vCard</span> from the element that
-          represents <var title="">subitem</var>.</p>
-
-         </li>
-
-         <li><p>Add a parameter named "<code title="">VALUE</code>"
-         whose value is "<code title="">VCARD</code>" to <var
+         <li><p>If there is a property named <code
+         title="md-vcard-related-url">url</code> in <var
+         title="">subitem</var>, and its element is a <span title="URL
+         property elements">URL property element</span>, then append
+         the result of <span>escaping the vCard text string</span>
+         given by the <span
+         title="concept-property-value">value</span> of the first such
+         property to <var title="">value</var>, and add a parameter
+         with the name "<code title="">VALUE</code>" and the value
+         "<code title="">URI</code>" to <var
          title="">parameters</var>.</p></li>
 
+         <li><p>If there is a property named <code
+         title="md-vcard-related-rel">rel</code> in <var
+         title="">subitem</var>, and the first such property has a
+         <span title="concept-property-value">value</span> that is not
+         an <span title="concept-item">item</span> and whose value
+         consists only of <span>alphanumeric ASCII characters</span>,
+         then add a parameter named "<code title="">RELATION</code>"
+         whose value is the <span
+         title="concept-property-value">value</span> of that property
+         to <var title="">parameters</var>.</p></li>
+
         </ol>
 
        </dd>
@@ -67752,6 +67708,8 @@
        title="concept-item">item</span> and <var title="">name</var>
        is none of the above</dt>
 
+       <!-- tel, adr -->
+
        <dd>
 
         <ol>
@@ -67776,6 +67734,37 @@
 
        </dd>
 
+
+       <dt>If the property's <span
+       title="concept-property-value">value</span> is not an <span
+       title="concept-item">item</span> and its <var
+       title="">name</var> is <code
+       title="md-vcard-sex">sex</code></dt>
+
+       <dd>
+
+        <p>If this is the first such property to be found, set <var
+        title="">sex</var> to the property's <span
+        title="concept-property-value">value</span>.</p>
+
+       </dd>
+
+
+       <dt>If the property's <span
+       title="concept-property-value">value</span> is not an <span
+       title="concept-item">item</span> and its <var
+       title="">name</var> is <code
+       title="md-vcard-gender-identity">gender-identity</code></dt>
+
+       <dd>
+
+        <p>If this is the first such property to be found, set <var
+        title="">gender-identity</var> to the property's <span
+        title="concept-property-value">value</span>.</p>
+
+       </dd>
+
+
        <dt>Otherwise (the property's <span
        title="concept-property-value">value</span> is not an <span
        title="concept-item">item</span>)</dt>
@@ -67794,14 +67783,15 @@
          title="">parameters</var>.</p></li>
 
          <li><p>Otherwise, if <var title="">name</var> is <code
-         title="md-vcard-bday">bday</code> and the <var
+         title="md-vcard-bday">bday</code> or <code
+         title="md-vcard-anniversary">anniversary</code> and the <var
          title="">value</var> is a <span>valid date string</span>, add
          a parameter with the name "<code title="">VALUE</code>" and
          the value "<code title="">DATE</code>" to <var
          title="">parameters</var>.</p></li>
 
          <li><p>Otherwise, if <var title="">name</var> is <code
-         title="md-vcard-bday">rev</code> and the <var
+         title="md-vcard-rev">rev</code> and the <var
          title="">value</var> is a <span>valid global date and time
          string</span>, add a parameter with the name "<code
          title="">VALUE</code>" and the value "<code
@@ -67852,6 +67842,14 @@
 
    </li>
 
+   <li><p>If either of <var title="">sex</var> or <var
+   title="">gender-identity</var> have a value that is not the empty
+   string, <span>add a vCard line</span> with the type "<code
+   title="">GENDER</code>" and the value consisting of the
+   concatenation of <var title="">sex</var>, a U+003B SEMICOLON
+   character (;), and <var title="">gender-identity</var> to <var
+   title="">output</var>.</p></li>
+
    <li><p><span>Add a vCard line</span> with the type "<code
    title="">END</code>" and the value "<code title="">VCARD</code>"
    to <var title="">output</var>.</p></li>
@@ -68085,7 +68083,7 @@
  <ul>
   <li itemprop="tel" itemscope>
    <span itemprop="value">+1 (310) 597 3781</span> <span itemprop="type">work</span>
-   <meta itemprop="type" content="pref">
+   <meta itemprop="type" content="voice">
   </li>
   <li><a itemprop="url" href="http://en.wikipedia.org/wiki/Jack_Bauer">I'm on Wikipedia</a>
   so you can leave a message on my user talk page.</li>
@@ -68096,19 +68094,8 @@
    <meta itemprop="type" content="cell">mobile phone</span>
   </li>
  </ul>
- <p itemprop="note">If I'm out in the field, you may be better off contacting <span
- itemprop="agent" itemscope itemtype="http://microformats.org/profile/hcard"><a
- itemprop="email" href="mailto:c.obrian at la.ctu.gov.invalid"><span
- itemprop="fn"><span itemprop="n" itemscope><span
- itemprop="given-name">Chloe</span> <span
- itemprop="family-name">O'Brian</span></span></span></a></span>
- if it's about work, or ask <span itemprop="agent">Tony Almeida</span>
- if you're interested in the CTU five-a-side football team we're trying to get going.</p>
  <ins datetime="2008-07-20T21:00:00+01:00">
-  <span itemprop="rev" itemscope>
-   <meta itemprop="type" content="date-time">
-   <meta itemprop="value" content="2008-07-20T21:00:00+01:00">
-  </span>
+  <meta itemprop="rev" content="2008-07-20T21:00:00+01:00">
   <p itemprop="tel" itemscope><strong>Update!</strong>
   My new <span itemprop="type">home</span> phone number is
   <span itemprop="value">01632 960 123</span>.</p>
@@ -68159,7 +68146,7 @@
 
    <pre>BEGIN:VCARD
 PROFILE:VCARD
-VERSION:3.0
+VERSION:4.0
 SOURCE:<var title="">document's address</var>
 FN:George Washington
 N:Washington;George;;;
@@ -79846,19 +79833,17 @@
   method allows Web sites to register themselves as possible handlers
   for particular schemes. For example, an online telephone messaging
   service could register itself as a handler of the <code>sms:</code>
-  scheme (<a href="#refsRFC5724">[RFC5724]</a>), so that if the user
-  clicks on such a link, he is given the opportunity to use that Web
-  site. Analogously, the <dfn
+  scheme, so that if the user clicks on such a link, he is given the
+  opportunity to use that Web site. Analogously, the <dfn
   title="dom-navigator-registerContentHandler"><code>registerContentHandler()</code></dfn>
   method allows Web sites to register themselves as possible handlers
   for content in a particular <span>MIME type</span>. For example, the
   same online telephone messaging service could register itself as a
-  handler for <code>text/directory</code> files (<a
-  href="#refsRFC2425">[RFC2425]</a>), so that if the user has no
-  native application capable of handling vCards (<a
-  href="#refsRFC2426">[RFC2426]</a>), his Web browser can instead
-  suggest he use that site to view contact information stored on
-  vCards that he opens.</p>
+  handler for <code>text/vcard</code> files, so that if the user has
+  no native application capable of handling vCards, his Web browser
+  can instead suggest he use that site to view contact information
+  stored on vCards that he opens. <a href="#refsRFC5724">[RFC5724]</a>
+  <a href="#refsRFC6350">RFC6350</a></p>
 
   <dl class="domintro">
 
@@ -115399,15 +115384,6 @@
    <dd><cite><a href="http://tools.ietf.org/html/rfc2397">The "data"
    URL scheme</a></cite>, L. Masinter. IETF.</dd>
 
-   <dt id="refsRFC2425">[RFC2425]</dt>
-   <dd><cite><a href="http://tools.ietf.org/html/rfc2425">A MIME
-   Content-Type for Directory Information</a></cite>, T. Howes,
-   M. Smith, F. Dawson. IETF.</dd>
-
-   <dt id="refsRFC2426">[RFC2426]</dt>
-   <dd><cite><a href="http://tools.ietf.org/html/rfc2426">vCard MIME Directory
-   Profile</a></cite>, F. Dawson, T. Howes. IETF.</dd>
-
    <dt id="refsRFC2445">[RFC2445]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc2445">Internet Calendaring
    and Scheduling Core Object Specification (iCalendar)</a></cite>, F. Dawson, D.
@@ -115509,6 +115485,9 @@
    <dt id="refsRFC6266">[RFC6266]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc6266">Use of the Content-Disposition Header Field in the Hypertext Transfer Protocol (HTTP)</a></cite>, J. Reschke. IETF.</dd>
 
+   <dt id="refsRFC6350">[RFC6350]</dt>
+   <dd><cite><a href="http://tools.ietf.org/html/rfc6350">vCard Format Specification</a></cite>, S. Perreault. IETF.</dd>
+
    <dt id="refsSCSU">[SCSU]</dt>
    <dd>(Non-normative) <cite><a
    href="http://www.unicode.org/reports/tr6/">UTR #6: A Standard
@@ -115689,6 +115668,9 @@
    Rules (CER), and Distinguished Encoding Rules
    (DER)</a></cite>. International Telecommunication Union.</dd>
 
+   <dt id="refsXFN">[XFN]</dt>
+   <dd><cite><a href="http://gmpg.org/xfn/11">XFN 1.1 profile</a></cite>, T. Çelik, M. Mullenweg, E. Meyer. GMPG.</dd>
+
    <dt id="refsXHR">[XHR]</dt>
    <!--
    <dd><cite><a href="http://www.w3.org/TR/XMLHttpRequest/">The XMLHttpRequest




More information about the Commit-Watchers mailing list