Ticket #13: i13.3.diff

File i13.3.diff, 5.9 KB (added by julian.reschke@…, 11 years ago)

Proposed patch updated so it can be applied to current draft

  • p3-payload.xml

     
    616616
    617617<section title="Language Tags" anchor="language.tags">
    618618  <x:anchor-alias value="language-tag"/>
    619   <x:anchor-alias value="primary-tag"/>
    620   <x:anchor-alias value="subtag"/>
    621619<t>
    622    A language tag identifies a natural language spoken, written, or
    623    otherwise conveyed by human beings for communication of information
    624    to other human beings. Computer languages are explicitly excluded.
    625    HTTP uses language tags within the Accept-Language and Content-Language
    626    fields.
     620   A language tag, as defined in <xref target="RFC4646"/>, identifies a
     621   natural language spoken, written, or otherwise conveyed by human beings for
     622   communication of information to other human beings. Computer languages are
     623   explicitly excluded. HTTP uses language tags within the Accept-Language and
     624   Content-Language fields.
    627625</t>
    628626<t>
    629    The syntax and registry of HTTP language tags is the same as that
    630    defined by <xref target="RFC1766"/>. In summary, a language tag is composed of 1
    631    or more parts: A primary language tag and a possibly empty series of
    632    subtags:
     627   In summary, a language tag is composed of one or more parts: A primary
     628   language subtag followed by a possibly empty series of subtags:
    633629</t>
    634 <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"/>
    635   <x:ref>language-tag</x:ref>  = <x:ref>primary-tag</x:ref> *( "-" <x:ref>subtag</x:ref> )
    636   <x:ref>primary-tag</x:ref>   = 1*8<x:ref>ALPHA</x:ref>
    637   <x:ref>subtag</x:ref>        = 1*8<x:ref>ALPHA</x:ref>
     630<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="language-tag"/>
     631  <x:ref>language-tag</x:ref>  = &lt;Language-Tag, defined in <xref target="RFC4646" x:sec="2.1"/>&gt;
    638632</artwork></figure>
    639633<t>
    640634   White space is not allowed within the tag and all tags are case-insensitive.
    641    The name space of language tags is administered by the
    642    IANA. Example tags include:
     635   The name space of language subtags is administered by the IANA (see
     636   <eref target="http://www.iana.org/assignments/language-subtag-registry"/>).
    643637</t>
    644 <figure><artwork type="example">
    645   en, en-US, en-cockney, i-cherokee, x-pig-latin
    646 </artwork></figure>
     638<figure>
     639  <preamble>Example tags include:</preamble>
     640<artwork type="example">
     641  en, en-US, es-419, az-Arab, x-pig-latin, man-Nkoo-GN
     642</artwork>
     643</figure>
    647644<t>
    648    where any two-letter primary-tag is an ISO-639 language abbreviation
    649    and any two-letter initial subtag is an ISO-3166 country code. (The
    650    last three tags above are not registered tags; all but the last are
    651    examples of tags which could be registered in future.)
     645   See RFC 4646 for further information.
    652646</t>
    653647</section>
    654648</section>
     
    19411935  <x:source href="p6-cache.xml" basename="p6-cache"/>
    19421936</reference>
    19431937
    1944 <reference anchor="RFC1766">
    1945   <front>
    1946     <title abbrev="Language Tag">Tags for the Identification of Languages</title>
    1947     <author initials="H." surname="Alvestrand" fullname="Harald Tveit Alvestrand">
    1948       <organization>UNINETT</organization>
    1949       <address><email>Harald.T.Alvestrand@uninett.no</email></address>
    1950     </author>
    1951     <date month="March" year="1995"/>
    1952   </front>
    1953   <seriesInfo name="RFC" value="1766"/>
    1954 </reference>
    1955 
    19561938<reference anchor="RFC1864">
    19571939  <front>
    19581940    <title abbrev="Content-MD5 Header Field">The Content-MD5 Header Field</title>
     
    20902072  <seriesInfo name="RFC" value="2119"/>
    20912073</reference>
    20922074
     2075<reference anchor='RFC4646'>
     2076  <front>
     2077    <title>Tags for Identifying Languages</title>
     2078    <author initials='A.' surname='Phillips' fullname='A. Phillips' role="editor">
     2079      <organization>Yahoo! Inc.</organization>
     2080      <address><email>addison@inter-locale.com</email></address>
     2081    </author>
     2082    <author initials='M.' surname='Davis' fullname='M. Davis' role="editor">
     2083      <organization>Google</organization>
     2084      <address><email>mark.davis@google.com</email></address>
     2085    </author>
     2086    <date year='2006' month='September' />
     2087  </front>
     2088  <seriesInfo name='BCP' value='47' />
     2089  <seriesInfo name='RFC' value='4646' />
     2090</reference>
     2091
    20932092<reference anchor='RFC4647'>
    20942093  <front>
    20952094    <title>Matching of Language Tags</title>
     
    27352734<x:ref>filename-parm</x:ref> = "filename=" quoted-string
    27362735
    27372736<x:ref>language-range</x:ref> = &lt;language-range, defined in [RFC4647], Section 2.1&gt;
    2738 <x:ref>language-tag</x:ref> = primary-tag *( "-" subtag )
     2737<x:ref>language-tag</x:ref> = &lt;Language-Tag, defined in [RFC4646], Section 2.1&gt;
    27392738
    27402739<x:ref>media-range</x:ref> = ( "*/*" / ( type "/*" ) / ( type "/" subtype ) ) *( OWS
    27412740 ";" OWS parameter )
     
    27442743
    27452744<x:ref>parameter</x:ref> = attribute "=" value
    27462745<x:ref>partial-URI</x:ref> = &lt;partial-URI, defined in [Part1], Section 2.1&gt;
    2747 <x:ref>primary-tag</x:ref> = 1*8ALPHA
    27482746
    27492747<x:ref>quoted-string</x:ref> = &lt;quoted-string, defined in [Part1], Section 1.2.2&gt;
    27502748<x:ref>qvalue</x:ref> = &lt;qvalue, defined in [Part1], Section 3.5&gt;
    27512749
    2752 <x:ref>subtag</x:ref> = 1*8ALPHA
    27532750<x:ref>subtype</x:ref> = token
    27542751
    27552752<x:ref>token</x:ref> = &lt;token, defined in [Part1], Section 1.2.2&gt;
    27562753<x:ref>type</x:ref> = token
    27572754
    27582755<x:ref>value</x:ref> = token / quoted-string
    2759 
    2760 
    27612756</artwork>
    27622757</figure>
    27632758<figure><preamble>ABNF diagnostics:</preamble><artwork type="inline">
     
    29782973
    29792974<section title="Since draft-ietf-httpbis-p3-payload-07" anchor="changes.since.07">
    29802975<t>
    2981   None.
     2976  Closed issues:
     2977  <list style="symbols">
     2978    <t>
     2979      <eref target="http://www3.tools.ietf.org/wg/httpbis/trac/ticket/13"/>:
     2980      "Updated reference for language tags"
     2981    </t>
     2982  </list>
    29822983</t>
    29832984</section>
    29842985