HTML Standard Tracker

Filter

File a bug

SVNBugCommentTime (UTC)
681613986Attempt to update to the latest vCard spec2011-11-03 20:47
@@ -66115,25 +66115,49 @@ partial interface <span>HTMLElement</span> {
   title="md-vcard"><code>http://microformats.org/profile/hcard</code></dfn>
   represents a person's or organization's contact information.</p>
 
   <p>This vocabulary does not <span>support global identifiers for
   items</span>.</p>
 
   <p>The following are the type's <span title="defined property
   name">defined property names</span>. They are based on the
   vocabulary defined in the vCard specification and its extensions,
   where more information on how to interpret the values can be
-  found. <a href="#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>
 
     <p>Gives the formatted text corresponding to the name of the
     person or organization.</p>
 
     <p>The <span title="concept-property-value">value</span> must be
     text.</p>
 
@@ -66316,20 +66340,77 @@ partial interface <span>HTMLElement</span> {
     <span>valid date string</span>.</p>
 
     <p>A single property with the name <code
     title="md-vcard-bday">bday</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-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>
 
     <p>Gives the delivery address of the person or organization.</p>
 
     <p>The <span title="concept-property-value">value</span> must be
     an <span title="concept-item">item</span> with zero or more <code
     title="md-vcard-adr-type">type</code>, <code
     title="md-vcard-adr-post-office-box">post-office-box</code>, <code
@@ -66706,108 +66787,59 @@ partial interface <span>HTMLElement</span> {
    </dd>
 
 
    <dt><dfn title="md-vcard-email"><code>email</code></dfn></dt>
 
    <dd>
 
     <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>
-
-    <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>
+    text.</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
     title="md-vcard">http://microformats.org/profile/hcard</code>.</p>
 
    </dd>
 
-   <dt><dfn title="md-vcard-email-type"><code>type</code></dfn> (inside <code title="md-vcard-email">email</code>)</dt>
-
-   <dd>
-
-    <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>
+   <dt><dfn title="md-vcard-impp"><code>impp</code></dfn></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>
 
    </dd>
 
 
    <dt><dfn title="md-vcard-tz"><code>tz</code></dfn></dt>
 
    <dd>
 
@@ -67022,20 +67054,100 @@ partial interface <span>HTMLElement</span> {
     title="md-vcard-org-organization-unit">organization-unit</code>
     may be present within the <span title="concept-item">item</span>
     that forms the <span title="concept-property-value">value</span>
     of the <code title="md-vcard-org">org</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-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>
 
     <p>Gives the name of a category or tag that the person or
     organization could be classified as.</p>
 
     <p>The <span title="concept-property-value">value</span> must be
     text.</p>
 
@@ -67083,38 +67195,20 @@ partial interface <span>HTMLElement</span> {
     the information for other renditions of the information.</p>
 
     <p>Any number of properties with the name <code
     title="md-vcard-rev">rev</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-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>
 
     <p>Gives a sound file relating to the person or organization.</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
@@ -67136,220 +67230,110 @@ partial interface <span>HTMLElement</span> {
     text.</p>
 
     <p>A single property with the name <code
     title="md-vcard-uid">uid</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>
 
 
+   <!-- CLIENTPIDMAP not included since the global parameters are not included -->
+
+
    <dt><dfn title="md-vcard-url"><code>url</code></dfn></dt>
 
    <dd>
 
     <p>Gives a <span>URL</span> relating to the person or
     organization.</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-url">url</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>
 
 
-   <!-- VERSION not included - always 3.0 -->
-
-
-   <dt><dfn title="md-vcard-class"><code>class</code></dfn></dt>
-
-   <dd>
+   <!-- VERSION not included - always 4.0 -->
 
-    <p>Gives the access classification of the information regarding
-    the person or organization.</p>
+   <!-- KEY not included - no way to include binary data at this time -->
 
-    <p>The <span title="concept-property-value">value</span> must be
-    text with one of the following values:</p>
+   <!-- FBURL, CALADRURI, CALURI not included - unclear how calendars would be exposed on the web -->
 
-    <ul class="brief">
-     <li><code title="">public</code></li>
-     <li><code title="">private</code></li>
-     <li><code title="">confidential</code></li>
-    </ul>
+  </dl>
 
-    <p class="warning">This is merely advisory and cannot be
-    considered a confidentiality measure.</p>
+  <p>The <dfn>kind strings</dfn> are:</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>
+  <dl>
 
+   <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>
 
   <p>The <dfn>address type strings</dfn> are:</p>
 
   <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>
    </dd>
 
    <dt><dfn title="md-vcard-type-adr-work"><code>work</code></dfn></dt>
    <dd>
     <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>
 
   <dl>
 
    <dt><dfn title="md-vcard-type-tel-home"><code>home</code></dfn></dt>
    <dd>
     <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>
    <dd>
     <p>Indicates a voice telephone number.</p>
    </dd>
 
    <dt><dfn title="md-vcard-type-tel-fax"><code>fax</code></dfn></dt>
    <dd>
     <p>Indicates a facsimile telephone number.</p>
@@ -67363,104 +67347,64 @@ partial interface <span>HTMLElement</span> {
    <dt><dfn title="md-vcard-type-tel-video"><code>video</code></dfn></dt>
    <dd>
     <p>Indicates a video conferencing telephone number.</p>
    </dd>
 
    <dt><dfn title="md-vcard-type-tel-pager"><code>pager</code></dfn></dt>
    <dd>
     <p>Indicates a paging device telephone number.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-tel-bbs"><code>bbs</code></dfn></dt>
-   <dd>
-    <p>Indicates a bulletin board system telephone number.</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>
-
-  <dl>
-
-   <dt><dfn title="md-vcard-type-email-internet"><code>internet</code></dfn></dt>
-   <dd>
-    <p>Indicates an Internet e-mail address.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-email-x400"><code>x400</code></dfn></dt>
-   <dd>
-    <p>Indicates an X.400 addressing type.</p>
-   </dd>
-
-   <dt><dfn title="md-vcard-type-email-pref"><code>pref</code></dfn></dt>
+   <dt><dfn title="md-vcard-type-tel-textphone"><code>textphone</code></dfn></dt>
    <dd>
-
-    <p>Indicates the preferred e-mail address when multiple e-mail
-    addresses are specified.</p>
-
+    <p>Indicates a telecommunication device for people with hearing or speech difficulties.</p>
    </dd>
 
   </dl>
 
-  <p>The <dfn>IMPP type strings</dfn> are:</p>
+  <p>The <dfn>relationship 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>
+   <dt><dfn title="md-vcard-rel-emergency"><code>emergency</code></dfn></dt>
    <dd>
-    <p>Indicates the type of communication for which this IMPP
-    <span>URL</span> is appropriate.</p>
+    <p>An emergency contact.</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>
+   <dt><dfn title="md-vcard-rel-agent"><code>agent</code></dfn></dt>
    <dd>
-    <p>Indicates the location of a device associated with this IMPP
-    <span>URL</span>.</p>
+    <p>Another entity that acts on behalf of this entity.</p>
    </dd>
 
-   <dt><dfn title="md-vcard-type-impp-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 address when multiple IMPP
-    <span>URL</span>s 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>
 
 
   <h5>Conversion to vCard</h5>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
   <code>Document</code>, a user agent must run the following algorithm
   to <dfn title="extracting a vCard">extract any vCard data
   represented by those nodes</dfn> (only the first vCard is
   returned):</p>
@@ -67483,35 +67427,40 @@ partial interface <span>HTMLElement</span> {
 
    <li><p><span>Add a vCard line</span> with the type "<code
    title="">BEGIN</code>" and the value "<code title="">VCARD</code>"
    to <var title="">output</var>.</p></li>
 
    <li><p><span>Add a vCard line</span> with the type "<code
    title="">PROFILE</code>" and the value "<code
    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
    title="">SOURCE</code>" and the result of <span>escaping the vCard
    text string</span> that is <span>the document's current
    address</span> as the value to <var title="">output</var>.</p></li>
 
    <li><p>If <span>the <code>title</code> element</span> is not null,
    <span>add a vCard line</span> with the type "<code
    title="">NAME</code>" and with the result of <span>escaping the
    vCard text string</span> obtained from the <code>textContent</code>
    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
     title="the properties of an item">a property of the item</span>
     <var title="">node</var>: for each name <var title="">name</var>
     in <var title="">element</var>'s <span>property names</span>, run
     the following substeps:</p>
 
     <ol>
 
@@ -67711,54 +67660,63 @@ partial interface <span>HTMLElement</span> {
         </ol>
 
        </dd>
 
        <dt>If the property's <span
        title="concept-property-value">value</span> is an <span
        title="concept-item">item</span> <var title="">subitem</var>
        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>
-
-          <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>Let <var title="">value</var> be the empty
+         string.</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>
 
        <dt>If the property's <span
        title="concept-property-value">value</span> is an <span
        title="concept-item">item</span> 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
          <span>collecting the first vCard subproperty</span> named
          <code title="">value</code> in <var
          title="">subitem</var>.</p>
 
          <li><p>If there is a property named <code
@@ -67769,46 +67727,78 @@ partial interface <span>HTMLElement</span> {
          consists only of <span>alphanumeric ASCII characters</span>,
          then add a parameter named "<code title="">TYPE</code>" whose
          value is the <span
          title="concept-property-value">value</span> of that property
          to <var title="">parameters</var>.</p></li>
 
         </ol>
 
        </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>
 
        <dd>
 
         <ol>
 
          <li><p>Let <var title="">value</var> be the property's <span
          title="concept-property-value">value</span>.</p></li>
 
          <li><p>If <var title="">element</var> is one of the <span>URL
          property elements</span>, 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>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
          title="">DATE-TIME</code>" to <var
          title="">parameters</var>.</p></li>
 
          <li><p>Prefix every U+005C REVERSE SOLIDUS character (\) in
          <var title="">value</var> with another U+005C REVERSE SOLIDUS
          character (\).</p></li>
 
@@ -67845,20 +67835,28 @@ partial interface <span>HTMLElement</span> {
       title="">name</var>, the parameters <var
       title="">parameters</var>, and the value <var
       title="">value</var> to <var title="">output</var>.</p>
 
      </li>
 
     </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, <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>
 
   </ol>
 
   <p>When the above algorithm says that the user agent is to <dfn>add
   a vCard line</dfn> consisting of a type <var title="">type</var>,
   optionally some parameters, and a value <var title="">value</var> to
   a string <var title="">output</var>, it must run the following
@@ -68078,44 +68076,33 @@ partial interface <span>HTMLElement</span> {
    &lt;span itemprop="region">CA&lt;/span>
    &lt;span itemprop="postal-code">90064&lt;/span>&lt;br>
    &lt;span itemprop="country-name">United States&lt;/span>&lt;br>
   &lt;/span>
   &lt;span itemprop="geo">34.052339;-118.410623&lt;/span>
  &lt;/p>
  &lt;h2>Assorted Contact Methods&lt;/h2>
  &lt;ul>
   &lt;li itemprop="tel" itemscope>
    &lt;span itemprop="value">+1 (310) 597 3781&lt;/span> &lt;span itemprop="type">work&lt;/span>
-   &lt;meta itemprop="type" content="pref">
+   &lt;meta itemprop="type" content="voice">
   &lt;/li>
   &lt;li>&lt;a itemprop="url" href="http://en.wikipedia.org/wiki/Jack_Bauer">I'm on Wikipedia&lt;/a>
   so you can leave a message on my user talk page.&lt;/li>
   &lt;li>&lt;a itemprop="url" href="http://www.jackbauerfacts.com/">Jack Bauer Facts&lt;/a>&lt;/li>
   &lt;li itemprop="email">&lt;a href="mailto:j.bauer@la.ctu.gov.invalid">j.bauer@la.ctu.gov.invalid&lt;/a>&lt;/li>
   &lt;li itemprop="tel" itemscope>
    &lt;span itemprop="value">+1 (310) 555 3781&lt;/span> &lt;span>
    &lt;meta itemprop="type" content="cell">mobile phone&lt;/span>
   &lt;/li>
  &lt;/ul>
- &lt;p itemprop="note">If I'm out in the field, you may be better off contacting &lt;span
- itemprop="agent" itemscope itemtype="http://microformats.org/profile/hcard">&lt;a
- itemprop="email" href="mailto:c.obrian@la.ctu.gov.invalid">&lt;span
- itemprop="fn">&lt;span itemprop="n" itemscope>&lt;span
- itemprop="given-name">Chloe&lt;/span> &lt;span
- itemprop="family-name">O'Brian&lt;/span>&lt;/span>&lt;/span>&lt;/a>&lt;/span>
- if it's about work, or ask &lt;span itemprop="agent">Tony Almeida&lt;/span>
- if you're interested in the CTU five-a-side football team we're trying to get going.&lt;/p>
  &lt;ins datetime="2008-07-20T21:00:00+01:00">
-  &lt;span itemprop="rev" itemscope>
-   &lt;meta itemprop="type" content="date-time">
-   &lt;meta itemprop="value" content="2008-07-20T21:00:00+01:00">
-  &lt;/span>
+  &lt;meta itemprop="rev" content="2008-07-20T21:00:00+01:00">
   &lt;p itemprop="tel" itemscope>&lt;strong>Update!&lt;/strong>
   My new &lt;span itemprop="type">home&lt;/span> phone number is
   &lt;span itemprop="value">01632 960 123&lt;/span>.&lt;/p>
  &lt;/ins>
 &lt;/section></pre>
 
    <p>The odd line wrapping is needed because newlines are meaningful
    in microdata: newlines would be preserved in a conversion to, for
    example, the vCard format.<p>
 
@@ -68152,21 +68139,21 @@ partial interface <span>HTMLElement</span> {
 
    <p>This creates a single item with a two name-value pairs, one with
    the name "fn" and the value "George Washington", and the other with
    the name "n" and a second item as its value, the second item having
    the two name-value pairs "given-name" and "family-name" with the
    values "George" and "Washington" respectively. This is defined to
    map to the following vCard:</p>
 
    <pre>BEGIN:VCARD
 PROFILE:VCARD
-VERSION:3.0
+VERSION:4.0
 SOURCE:<var title="">document's address</var>
 FN:George Washington
 N:Washington;George;;;
 END:VCARD</pre>
 
   </div>
 
 <!--END vCard-->
 
   <h4>vEvent</h4>
@@ -79839,33 +79826,31 @@ interface <dfn>NavigatorContentUtils</dfn> {
   DOMString <span title="dom-navigator-isContentHandlerRegistered">isContentHandlerRegistered</span>(DOMString mimeType, DOMString url);
   void <span title="dom-navigator-unregisterProtocolHandler">unregisterProtocolHandler</span>(DOMString scheme, DOMString url);
   void <span title="dom-navigator-unregisterContentHandler">unregisterContentHandler</span>(DOMString mimeType, DOMString url);
 };</pre>
 
   <p>The <dfn
   title="dom-navigator-registerProtocolHandler"><code>registerProtocolHandler()</code></dfn>
   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">
 
    <dt><var title="">window</var> . <code title="dom-navigator">navigator</code> . <code title="dom-navigator-registerProtocolHandler">registerProtocolHandler</code>(<var title="">scheme</var>, <var title="">url</var>, <var title="">title</var>)</dt>
    <dt><var title="">window</var> . <code title="dom-navigator">navigator</code> . <code title="dom-navigator-registerContentHandler">registerContentHandler</code>(<var title="">mimeType</var>, <var title="">url</var>, <var title="">title</var>)</dt>
 
    <dd>
 
     <p>Registers a handler for the given scheme or content type, at
     the given URL, with the given title.</p>
@@ -115392,29 +115377,20 @@ if (s = prompt('What is your name?')) {
    text/css Media Type</a></cite>, H. Lie, B. Bos, C. Lilley. IETF.</dd>
 
    <dt id="refsRFC2388">[RFC2388]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc2388">Returning Values from
    Forms: multipart/form-data</a></cite>, L. Masinter. IETF.</dd>
 
    <dt id="refsRFC2397">[RFC2397]</dt>
    <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.
    Stenerson. IETF.</dd>
 
    <dt id="refsRFC2483">[RFC2483]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc2483">URI Resolution
    Services Necessary for URN Resolution</a></cite>, M. Mealling, R. Daniel.
    IETF.</dd>
 
@@ -115502,20 +115478,23 @@ if (s = prompt('What is your name?')) {
    Format</a></cite>, P. Resnick. IETF.</dd>
 
    <dt id="refsRFC5724">[RFC5724]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc5724">URI Scheme
    for Global System for Mobile Communications (GSM) Short Message
    Service (SMS)</a></cite>, E. Wilde, A. Vaha-Sipila. IETF.</dd>
 
    <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,
    C. Wicksteed, M. Davis, A. Freytag, M. Scherer. Unicode Consortium.</dd>
 
    <dt id="refsSDP">[SDP]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc4566">SDP: Session Description Protocol</a></cite>, M. Handley, V. Jacobson, C. Perkins. IETF.</dd>
 
    <dt id="refsSDPLABEL">[SDPLABEL]</dt>
@@ -115682,20 +115661,23 @@ if (s = prompt('What is your name?')) {
    pp. 317-332.</dd>
 
    <dt id="refsX690">[X690]</dt>
    <dd><cite><a
    href="http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf">Recommendation
    X.690 &mdash; Information Technology &mdash; ASN.1 Encoding Rules &mdash;
    Specification of Basic Encoding Rules (BER), Canonical Encoding
    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. &Ccedil;elik, M. Mullenweg, E. Meyer. GMPG.</dd>
+
    <dt id="refsXHR">[XHR]</dt>
    <!--
    <dd><cite><a href="http://www.w3.org/TR/XMLHttpRequest/">The XMLHttpRequest
    Object</a></cite>, A. van Kesteren. W3C.</dd>
    -->
    <dd><cite><a
    href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/"><code>XMLHttpRequest</code></a></cite>,
    A. van Kesteren. W3C.</dd>
 
    <dt id="refsXHTML1">[XHTML1]</dt>

|