Ignore:
Timestamp:
Mar 30, 2012, 7:23:00 AM (7 years ago)
Author:
julian.reschke@…
Message:

Step 1 of p2/p3-merge (see #351)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • draft-ietf-httpbis/latest/p2-semantics.xml

    r1635 r1639  
    8686  <!ENTITY p6-explicit                "<xref target='Part6' x:rel='#calculating.freshness.lifetime' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    8787  <!ENTITY p6-invalid                 "<xref target='Part6' x:rel='#invalidation.after.updates.or.deletions' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    88   <!ENTITY p6-head                 "<xref target='Part6' x:rel='#head.effects' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     88  <!ENTITY p6-head                    "<xref target='Part6' x:rel='#head.effects' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     89  <!ENTITY architecture               "<xref target='Part1' x:rel='#architecture' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     90  <!ENTITY notation                   "<xref target='Part1' x:rel='#notation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     91  <!ENTITY abnf-extension             "<xref target='Part1' x:rel='#abnf.extension' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     92  <!ENTITY acks                       "<xref target='Part1' x:rel='#acks' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     93  <!ENTITY whitespace                 "<xref target='Part1' x:rel='#whitespace' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     94  <!ENTITY field-components           "<xref target='Part1' x:rel='#field.components' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     95  <!ENTITY caching-neg-resp           "<xref target='Part6' x:rel='#caching.negotiated.responses' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     96  <!ENTITY header-transfer-encoding   "<xref target='Part1' x:rel='#header.transfer-encoding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     97  <!ENTITY header-content-length      "<xref target='Part1' x:rel='#header.content-length' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     98  <!ENTITY header-content-range       "<xref target='Part5' x:rel='#header.content-range' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     99  <!ENTITY header-etag                "<xref target='Part4' x:rel='#header.etag' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     100  <!ENTITY header-expires             "<xref target='Part6' x:rel='#header.expires' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     101  <!ENTITY header-last-modified       "<xref target='Part4' x:rel='#header.last-modified' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     102  <!ENTITY header-user-agent          "<xref target='Part2' x:rel='#header.user-agent' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     103  <!ENTITY header-vary                "<xref target='Part6' x:rel='#header.vary' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     104  <!ENTITY message-body               "<xref target='Part1' x:rel='#message.body' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     105  <!ENTITY multipart-byteranges       "<xref target='Part5' x:rel='#internet.media.type.multipart.byteranges' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     106  <!ENTITY http-date                  "<xref target='Part2' x:rel='#http.date' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     107  <!ENTITY qvalue                     "<xref target='Part1' x:rel='#quality.values' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     108  <!ENTITY uri                        "<xref target='Part1' x:rel='#uri' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     109  <!ENTITY effective-request-uri      "<xref target='Part1' x:rel='#effective.request.uri' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     110  <!ENTITY compression-codings        "<xref target='Part1' x:rel='#compression.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     111  <!ENTITY transfer-codings           "<xref target='Part1' x:rel='#transfer.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     112  <!ENTITY compress-coding            "<xref target='Part1' x:rel='#compress.coding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     113  <!ENTITY deflate-coding             "<xref target='Part1' x:rel='#deflate.coding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     114  <!ENTITY gzip-coding                "<xref target='Part1' x:rel='#gzip.coding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     115  <!ENTITY response-representation    "<xref target='Part2' x:rel='#identifying.response.associated.with.representation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    89116]>
    90117<?rfc toc="yes" ?>
    … …  
    33523379</reference>
    33533380
     3381<reference anchor="RFC1950">
     3382  <front>
     3383    <title>ZLIB Compressed Data Format Specification version 3.3</title>
     3384    <author initials="L.P." surname="Deutsch" fullname="L. Peter Deutsch">
     3385      <organization>Aladdin Enterprises</organization>
     3386      <address><email>ghost@aladdin.com</email></address>
     3387    </author>
     3388    <author initials="J-L." surname="Gailly" fullname="Jean-Loup Gailly"/>
     3389    <date month="May" year="1996"/>
     3390  </front>
     3391  <seriesInfo name="RFC" value="1950"/>
     3392  <!--<annotation>
     3393    RFC 1950 is an Informational RFC, thus it might be less stable than
     3394    this specification. On the other hand, this downward reference was
     3395    present since the publication of <xref target="RFC2068" x:fmt="none">RFC 2068</xref> in 1997,
     3396    therefore it is unlikely to cause problems in practice. See also
     3397    <xref target="BCP97"/>.
     3398  </annotation>-->
     3399</reference>
     3400
     3401<reference anchor="RFC1951">
     3402  <front>
     3403    <title>DEFLATE Compressed Data Format Specification version 1.3</title>
     3404    <author initials="P." surname="Deutsch" fullname="L. Peter Deutsch">
     3405      <organization>Aladdin Enterprises</organization>
     3406      <address><email>ghost@aladdin.com</email></address>
     3407    </author>
     3408    <date month="May" year="1996"/>
     3409  </front>
     3410  <seriesInfo name="RFC" value="1951"/>
     3411  <!--<annotation>
     3412    RFC 1951 is an Informational RFC, thus it might be less stable than
     3413    this specification. On the other hand, this downward reference was
     3414    present since the publication of <xref target="RFC2068" x:fmt="none">RFC 2068</xref> in 1997,
     3415    therefore it is unlikely to cause problems in practice. See also
     3416    <xref target="BCP97"/>.
     3417  </annotation>-->
     3418</reference>
     3419
     3420<reference anchor="RFC1952">
     3421  <front>
     3422    <title>GZIP file format specification version 4.3</title>
     3423    <author initials="P." surname="Deutsch" fullname="L. Peter Deutsch">
     3424      <organization>Aladdin Enterprises</organization>
     3425      <address><email>ghost@aladdin.com</email></address>
     3426    </author>
     3427    <author initials="J-L." surname="Gailly" fullname="Jean-Loup Gailly">
     3428      <address><email>gzip@prep.ai.mit.edu</email></address>
     3429    </author>
     3430    <author initials="M." surname="Adler" fullname="Mark Adler">
     3431      <address><email>madler@alumni.caltech.edu</email></address>
     3432    </author>
     3433    <author initials="L.P." surname="Deutsch" fullname="L. Peter Deutsch">
     3434      <address><email>ghost@aladdin.com</email></address>
     3435    </author>
     3436    <author initials="G." surname="Randers-Pehrson" fullname="Glenn Randers-Pehrson">
     3437      <address><email>randeg@alumni.rpi.edu</email></address>
     3438    </author>
     3439    <date month="May" year="1996"/>
     3440  </front>
     3441  <seriesInfo name="RFC" value="1952"/>
     3442  <!--<annotation>
     3443    RFC 1952 is an Informational RFC, thus it might be less stable than
     3444    this specification. On the other hand, this downward reference was
     3445    present since the publication of <xref target="RFC2068" x:fmt="none">RFC 2068</xref> in 1997,
     3446    therefore it is unlikely to cause problems in practice. See also
     3447    <xref target="BCP97"/>.
     3448  </annotation>-->
     3449</reference>
     3450
     3451<reference anchor="RFC2045">
     3452  <front>
     3453    <title abbrev="Internet Message Bodies">Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies</title>
     3454    <author initials="N." surname="Freed" fullname="Ned Freed">
     3455      <organization>Innosoft International, Inc.</organization>
     3456      <address><email>ned@innosoft.com</email></address>
     3457    </author>
     3458    <author initials="N.S." surname="Borenstein" fullname="Nathaniel S. Borenstein">
     3459      <organization>First Virtual Holdings</organization>
     3460      <address><email>nsb@nsb.fv.com</email></address>
     3461    </author>
     3462    <date month="November" year="1996"/>
     3463  </front>
     3464  <seriesInfo name="RFC" value="2045"/>
     3465</reference>
     3466
     3467<reference anchor="RFC2046">
     3468  <front>
     3469    <title abbrev="Media Types">Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types</title>
     3470    <author initials="N." surname="Freed" fullname="Ned Freed">
     3471      <organization>Innosoft International, Inc.</organization>
     3472      <address><email>ned@innosoft.com</email></address>
     3473    </author>
     3474    <author initials="N." surname="Borenstein" fullname="Nathaniel S. Borenstein">
     3475      <organization>First Virtual Holdings</organization>
     3476      <address><email>nsb@nsb.fv.com</email></address>
     3477    </author>
     3478    <date month="November" year="1996"/>
     3479  </front>
     3480  <seriesInfo name="RFC" value="2046"/>
     3481</reference>
     3482
    33543483<reference anchor="RFC2119">
    33553484  <front>
    … …  
    33953524</reference>
    33963525
     3526<reference anchor='RFC4647'>
     3527  <front>
     3528    <title>Matching of Language Tags</title>
     3529    <author initials='A.' surname='Phillips' fullname='Addison Phillips' role="editor">
     3530      <organization>Yahoo! Inc.</organization>
     3531      <address><email>addison@inter-locale.com</email></address>
     3532    </author>
     3533    <author initials='M.' surname='Davis' fullname='Mark Davis' role="editor">
     3534      <organization>Google</organization>
     3535      <address><email>mark.davis@macchiato.com</email></address>
     3536    </author>
     3537    <date year='2006' month='September' />
     3538  </front>
     3539  <seriesInfo name='BCP' value='47' />
     3540  <seriesInfo name='RFC' value='4647' />
     3541</reference>
     3542
    33973543<reference anchor="RFC5234">
    33983544  <front>
    … …  
    34163562</reference>
    34173563
     3564<reference anchor='RFC5646'>
     3565  <front>
     3566    <title>Tags for Identifying Languages</title>
     3567    <author initials='A.' surname='Phillips' fullname='Addison Phillips' role='editor'>
     3568      <organization>Lab126</organization>
     3569      <address><email>addison@inter-locale.com</email></address>
     3570    </author>
     3571    <author initials='M.' surname='Davis' fullname='Mark Davis' role='editor'>
     3572      <organization>Google</organization>
     3573      <address><email>mark.davis@google.com</email></address>
     3574    </author>
     3575    <date month='September' year='2009' />
     3576  </front>
     3577  <seriesInfo name='BCP' value='47' />
     3578  <seriesInfo name='RFC' value='5646' />
     3579</reference>
     3580
    34183581</references>
    34193582
    … …  
    34533616</reference>
    34543617
     3618<reference anchor="RFC2049">
     3619  <front>
     3620    <title abbrev="MIME Conformance">Multipurpose Internet Mail Extensions (MIME) Part Five: Conformance Criteria and Examples</title>
     3621    <author initials="N." surname="Freed" fullname="Ned Freed">
     3622      <organization>Innosoft International, Inc.</organization>
     3623      <address><email>ned@innosoft.com</email></address>
     3624    </author>
     3625    <author initials="N.S." surname="Borenstein" fullname="Nathaniel S. Borenstein">
     3626      <organization>First Virtual Holdings</organization>
     3627      <address><email>nsb@nsb.fv.com</email></address>
     3628    </author>
     3629    <date month="November" year="1996"/>
     3630  </front>
     3631  <seriesInfo name="RFC" value="2049"/>
     3632</reference>
     3633
    34553634<reference anchor="RFC2068">
    34563635  <front>
    … …  
    34813660</reference>
    34823661
     3662<reference anchor="RFC2076">
     3663  <front>
     3664    <title abbrev="Internet Message Headers">Common Internet Message Headers</title>
     3665    <author initials="J." surname="Palme" fullname="Jacob Palme">
     3666      <organization>Stockholm University/KTH</organization>
     3667      <address><email>jpalme@dsv.su.se</email></address>
     3668    </author>
     3669    <date month="February" year="1997"/>
     3670  </front>
     3671  <seriesInfo name="RFC" value="2076"/>
     3672</reference>
     3673
     3674<reference anchor="RFC2277">
     3675  <front>
     3676    <title abbrev="Charset Policy">IETF Policy on Character Sets and Languages</title>
     3677    <author initials="H.T." surname="Alvestrand" fullname="Harald Tveit Alvestrand">
     3678      <organization>UNINETT</organization>
     3679      <address><email>Harald.T.Alvestrand@uninett.no</email></address>
     3680    </author>
     3681    <date month="January" year="1998"/>
     3682  </front>
     3683  <seriesInfo name="BCP" value="18"/>
     3684  <seriesInfo name="RFC" value="2277"/>
     3685</reference>
     3686
     3687<reference anchor='RFC2295'>
     3688  <front>
     3689    <title abbrev='HTTP Content Negotiation'>Transparent Content Negotiation in HTTP</title>
     3690    <author initials='K.' surname='Holtman' fullname='Koen Holtman'>
     3691      <organization>Technische Universiteit Eindhoven</organization>
     3692      <address>
     3693        <email>koen@win.tue.nl</email>
     3694      </address>
     3695    </author>
     3696    <author initials='A.H.' surname='Mutz' fullname='Andrew H. Mutz'>
     3697      <organization>Hewlett-Packard Company</organization>
     3698      <address>
     3699        <email>mutz@hpl.hp.com</email>
     3700      </address>
     3701    </author>
     3702    <date year='1998' month='March'/>
     3703  </front>
     3704  <seriesInfo name='RFC' value='2295'/>
     3705</reference>
     3706
     3707<reference anchor="RFC2388">
     3708  <front>
     3709    <title abbrev="multipart/form-data">Returning Values from Forms:  multipart/form-data</title>
     3710    <author initials="L." surname="Masinter" fullname="Larry Masinter">
     3711      <organization>Xerox Palo Alto Research Center</organization>
     3712      <address><email>masinter@parc.xerox.com</email></address>
     3713    </author>
     3714    <date year="1998" month="August"/>
     3715  </front>
     3716  <seriesInfo name="RFC" value="2388"/>
     3717</reference>
     3718
     3719<reference anchor="RFC2557">
     3720  <front>
     3721    <title abbrev="MIME Encapsulation of Aggregate Documents">MIME Encapsulation of Aggregate Documents, such as HTML (MHTML)</title>
     3722    <author initials="F." surname="Palme" fullname="Jacob Palme">
     3723      <organization>Stockholm University and KTH</organization>
     3724      <address><email>jpalme@dsv.su.se</email></address>
     3725    </author>
     3726    <author initials="A." surname="Hopmann" fullname="Alex Hopmann">
     3727      <organization>Microsoft Corporation</organization>
     3728      <address><email>alexhop@microsoft.com</email></address>
     3729    </author>
     3730    <author initials="N." surname="Shelness" fullname="Nick Shelness">
     3731      <organization>Lotus Development Corporation</organization>
     3732      <address><email>Shelness@lotus.com</email></address>
     3733    </author>
     3734    <author initials="E." surname="Stefferud" fullname="Einar Stefferud">
     3735      <address><email>stef@nma.com</email></address>
     3736    </author>
     3737    <date year="1999" month="March"/>
     3738  </front>
     3739  <seriesInfo name="RFC" value="2557"/>
     3740</reference>
     3741
    34833742<reference anchor="RFC2616">
    34843743  <front>
    … …  
    35333792</reference>
    35343793
     3794<reference anchor="RFC3629">
     3795  <front>
     3796    <title>UTF-8, a transformation format of ISO 10646</title>
     3797    <author initials="F." surname="Yergeau" fullname="F. Yergeau">
     3798      <organization>Alis Technologies</organization>
     3799      <address><email>fyergeau@alis.com</email></address>
     3800    </author>
     3801    <date month="November" year="2003"/>
     3802  </front>
     3803  <seriesInfo name="STD" value="63"/>
     3804  <seriesInfo name="RFC" value="3629"/>
     3805</reference>
     3806
    35353807<reference anchor='RFC3864'>
    35363808  <front>
    … …  
    35523824  <seriesInfo name='BCP' value='90' />
    35533825  <seriesInfo name='RFC' value='3864' />
     3826</reference>
     3827
     3828<reference anchor="RFC4288">
     3829  <front>
     3830    <title>Media Type Specifications and Registration Procedures</title>
     3831    <author initials="N." surname="Freed" fullname="N. Freed">
     3832      <organization>Sun Microsystems</organization>
     3833      <address>
     3834        <email>ned.freed@mrochek.com</email>
     3835      </address>
     3836    </author>
     3837    <author initials="J." surname="Klensin" fullname="J. Klensin">
     3838      <address>
     3839        <email>klensin+ietf@jck.com</email>
     3840      </address>
     3841    </author>
     3842    <date year="2005" month="December"/>
     3843  </front>
     3844  <seriesInfo name="BCP" value="13"/>
     3845  <seriesInfo name="RFC" value="4288"/>
    35543846</reference>
    35553847
    … …  
    36123904  </front>
    36133905  <seriesInfo name="RFC" value="5987"/>
     3906</reference>
     3907
     3908<reference anchor="RFC6151">
     3909  <front>
     3910    <title>Updated Security Considerations for the MD5 Message-Digest and the HMAC-MD5 Algorithms</title>
     3911    <author initials="S." surname="Turner" fullname="S. Turner"/>
     3912    <author initials="L." surname="Chen" fullname="L. Chen"/>
     3913    <date year="2011" month="March" />
     3914  </front>
     3915  <seriesInfo name="RFC" value="6151" />
     3916</reference>
     3917
     3918<reference anchor="RFC6266">
     3919  <front>
     3920    <title abbrev="Content-Disposition in HTTP">Use of the Content-Disposition Header Field
     3921    in the Hypertext Transfer Protocol (HTTP)</title>
     3922    <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke">
     3923      <organization abbrev="greenbytes">greenbytes GmbH</organization>
     3924      <address>
     3925        <email>julian.reschke@greenbytes.de</email>
     3926      </address>
     3927    </author>
     3928    <date month="June" year="2011"/>
     3929  </front>
     3930  <seriesInfo name='RFC' value='6266' />
    36143931</reference>
    36153932
Note: See TracChangeset for help on using the changeset viewer.