Ticket #13: i13.2.diff

File i13.2.diff, 4.8 KB (added by julian.reschke@…, 12 years ago)

Proposed change.

  • p3-payload.xml

    608608<section title="Language Tags" anchor="language.tags">
    609609  <x:anchor-alias value="language-tag"/>
    610   <x:anchor-alias value="primary-tag"/>
    611   <x:anchor-alias value="subtag"/>
    613    A language tag identifies a natural language spoken, written, or
    614    otherwise conveyed by human beings for communication of information
    615    to other human beings. Computer languages are explicitly excluded.
    616    HTTP uses language tags within the Accept-Language and Content-Language
    617    fields.
     611   A language tag, as defined in <xref target="RFC4646"/>, identifies a
     612   natural language spoken, written, or otherwise conveyed by human beings for
     613   communication of information to other human beings. Computer languages are
     614   explicitly excluded. HTTP uses language tags within the Accept-Language and
     615   Content-Language fields.
    620    The syntax and registry of HTTP language tags is the same as that
    621    defined by <xref target="RFC1766"/>. In summary, a language tag is composed of 1
    622    or more parts: A primary language tag and a possibly empty series of
    623    subtags:
     618   In summary, a language tag is composed of one or more parts: A primary
     619   language subtag followed by a possibly empty series of subtags:
    625 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="language-tag"/><iref primary="true" item="Grammar" subitem="primary-tag"/><iref primary="true" item="Grammar" subitem="subtag"/>
    626   <x:ref>language-tag</x:ref>  = <x:ref>primary-tag</x:ref> *( "-" <x:ref>subtag</x:ref> )
    627   <x:ref>primary-tag</x:ref>   = 1*8<x:ref>ALPHA</x:ref>
    628   <x:ref>subtag</x:ref>        = 1*8<x:ref>ALPHA</x:ref>
     621<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="language-tag"/>
     622  <x:ref>language-tag</x:ref>  = &lt;Language-Tag, defined in <xref target="RFC4646" x:sec="2.1"/>&gt;
    631625   White space is not allowed within the tag and all tags are case-insensitive.
    632    The name space of language tags is administered by the
    633    IANA. Example tags include:
     626   The name space of language subtags is administered by the IANA (see
     627   <eref target="http://www.iana.org/assignments/language-subtag-registry"/>).
    635 <figure><artwork type="example">
    636     en, en-US, en-cockney, i-cherokee, x-pig-latin
    637 </artwork></figure>
     630  <preamble>Example tags include:</preamble>
     631<artwork type="example">
     632  en, en-US, es-419, az-Arab, x-pig-latin, man-Nkoo-GN
    639    where any two-letter primary-tag is an ISO-639 language abbreviation
    640    and any two-letter initial subtag is an ISO-3166 country code. (The
    641    last three tags above are not registered tags; all but the last are
    642    examples of tags which could be registered in future.)
     636  See RFC 4646 for further information.
    17891783  <x:source href="p6-cache.xml" basename="p6-cache"/>
    1792 <reference anchor="RFC1766">
    1793   <front>
    1794     <title abbrev="Language Tag">Tags for the Identification of Languages</title>
    1795     <author initials="H." surname="Alvestrand" fullname="Harald Tveit Alvestrand">
    1796       <organization>UNINETT</organization>
    1797       <address><email>Harald.T.Alvestrand@uninett.no</email></address>
    1798     </author>
    1799     <date month="March" year="1995"/>
    1800   </front>
    1801   <seriesInfo name="RFC" value="1766"/>
    1802 </reference>
    18041786<reference anchor="RFC1864">
    18051787  <front>
    18061788    <title abbrev="Content-MD5 Header Field">The Content-MD5 Header Field</title>
    19351917  <seriesInfo name="RFC" value="2119"/>
     1920<reference anchor='RFC4646'>
     1921  <front>
     1922    <title>Tags for Identifying Languages</title>
     1923    <author initials='A.' surname='Phillips' fullname='A. Phillips' role="editor">
     1924      <organization>Yahoo! Inc.</organization>
     1925      <address><email>addison@inter-locale.com</email></address>
     1926    </author>
     1927    <author initials='M.' surname='Davis' fullname='M. Davis' role="editor">
     1928      <organization>Google</organization>
     1929      <address><email>mark.davis@google.com</email></address>
     1930    </author>
     1931    <date year='2006' month='September' />
     1932  </front>
     1933  <seriesInfo name='BCP' value='47' />
     1934  <seriesInfo name='RFC' value='4646' />
    19401940<references title="Informative References">
    25002500  Closed issues:
    25012501  <list style="symbols">
    25022502    <t>
     2503      <eref target="http://www3.tools.ietf.org/wg/httpbis/trac/ticket/13"/>:
     2504      "Updated reference for language tags"
     2505    </t>
     2506    <t>
    25032507      <eref target="http://www3.tools.ietf.org/wg/httpbis/trac/ticket/105"/>:
    25042508      "Classification for Allow header"
    25052509    </t>