Ignore:
Timestamp:
Jul 12, 2010, 4:11:48 AM (9 years ago)
Author:
julian.reschke@…
Message:

Make requirements sections consistent again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/diffs/draft-ietf-httpbis-p6-cache-10-from-09.diff.html

    r846 r847  
    204204      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    205205      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    206       <tr bgcolor="gray" ><td></td><th><a name="part-l3" /><small>skipping to change at</small><em> page 8, line 17</em></th><th> </th><th><a name="part-r3" /><small>skipping to change at</small><em> page 8, line 14</em></th><td></td></tr>
     206      <tr bgcolor="gray" ><td></td><th><a name="part-l3" /><small>skipping to change at</small><em> page 7, line 4</em></th><th> </th><th><a name="part-r3" /><small>skipping to change at</small><em> page 7, line 4</em></th><td></td></tr>
     207      <tr><td class="lineno" valign="top"></td><td class="left">      A cache that is accessible to more than one user.  A non-shared</td><td> </td><td class="right">      A cache that is accessible to more than one user.  A non-shared</td><td class="lineno" valign="top"></td></tr>
     208      <tr><td class="lineno" valign="top"></td><td class="left">      cache is dedicated to a single user.</td><td> </td><td class="right">      cache is dedicated to a single user.</td><td class="lineno" valign="top"></td></tr>
     209      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     210      <tr><td class="lineno" valign="top"></td><td class="left">1.3.  Requirements</td><td> </td><td class="right">1.3.  Requirements</td><td class="lineno" valign="top"></td></tr>
     211      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     212      <tr><td class="lineno" valign="top"></td><td class="left">   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",</td><td> </td><td class="right">   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",</td><td class="lineno" valign="top"></td></tr>
     213      <tr><td class="lineno" valign="top"></td><td class="left">   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this</td><td> </td><td class="right">   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this</td><td class="lineno" valign="top"></td></tr>
     214      <tr><td class="lineno" valign="top"></td><td class="left">   document are to be interpreted as described in [RFC2119].</td><td> </td><td class="right">   document are to be interpreted as described in [RFC2119].</td><td class="lineno" valign="top"></td></tr>
     215      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     216      <tr><td class="lineno" valign="top"></td><td class="left">   An implementation is not compliant if it fails to satisfy one or more</td><td> </td><td class="right">   An implementation is not compliant if it fails to satisfy one or more</td><td class="lineno" valign="top"></td></tr>
     217      <tr><td><a name="diff0013" /></td></tr>
     218      <tr><td class="lineno" valign="top"></td><td class="lblock">   of the <span class="delete">MUST</span> or <span class="delete">REQUIRED</span> level requirements for the protocols it</td><td> </td><td class="rblock">   of the <span class="insert">"MUST"</span> or <span class="insert">"REQUIRED"</span> level requirements for the protocols it</td><td class="lineno" valign="top"></td></tr>
     219      <tr><td class="lineno" valign="top"></td><td class="lblock">   implements.  An implementation that satisfies all the <span class="delete">MUST</span> or</td><td> </td><td class="rblock">   implements.  An implementation that satisfies all the <span class="insert">"MUST"</span> or</td><td class="lineno" valign="top"></td></tr>
     220      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">REQUIRED</span> level and all the <span class="delete">SHOULD</span> level requirements for its</td><td> </td><td class="rblock">   <span class="insert">"REQUIRED"</span> level and all the <span class="insert">"SHOULD"</span> level requirements for its</td><td class="lineno" valign="top"></td></tr>
     221      <tr><td class="lineno" valign="top"></td><td class="left">   protocols is said to be "unconditionally compliant"; one that</td><td> </td><td class="right">   protocols is said to be "unconditionally compliant"; one that</td><td class="lineno" valign="top"></td></tr>
     222      <tr><td><a name="diff0014" /></td></tr>
     223      <tr><td class="lineno" valign="top"></td><td class="lblock">   satisfies all the <span class="delete">MUST level requirements but not all the SHOULD</span></td><td> </td><td class="rblock">   satisfies all the <span class="insert">"MUST" level requirements but not all the "SHOULD"</span></td><td class="lineno" valign="top"></td></tr>
     224      <tr><td class="lineno" valign="top"></td><td class="left">   level requirements for its protocols is said to be "conditionally</td><td> </td><td class="right">   level requirements for its protocols is said to be "conditionally</td><td class="lineno" valign="top"></td></tr>
     225      <tr><td><a name="diff0015" /></td></tr>
     226      <tr><td class="lineno" valign="top"></td><td class="lblock">   compliant<span class="delete">."</span></td><td> </td><td class="rblock">   compliant<span class="insert">".</span></td><td class="lineno" valign="top"></td></tr>
     227      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     228      <tr><td class="lineno" valign="top"></td><td class="left">1.4.  Syntax Notation</td><td> </td><td class="right">1.4.  Syntax Notation</td><td class="lineno" valign="top"></td></tr>
     229      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     230      <tr><td class="lineno" valign="top"></td><td class="left">   This specification uses the ABNF syntax defined in Section 1.2 of</td><td> </td><td class="right">   This specification uses the ABNF syntax defined in Section 1.2 of</td><td class="lineno" valign="top"></td></tr>
     231      <tr><td class="lineno" valign="top"></td><td class="left">   [Part1] (which extends the syntax defined in [RFC5234] with a list</td><td> </td><td class="right">   [Part1] (which extends the syntax defined in [RFC5234] with a list</td><td class="lineno" valign="top"></td></tr>
     232      <tr><td class="lineno" valign="top"></td><td class="left">   rule).  Appendix B shows the collected ABNF, with the list rule</td><td> </td><td class="right">   rule).  Appendix B shows the collected ABNF, with the list rule</td><td class="lineno" valign="top"></td></tr>
     233      <tr><td class="lineno" valign="top"></td><td class="left">   expanded.</td><td> </td><td class="right">   expanded.</td><td class="lineno" valign="top"></td></tr>
     234      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     235      <tr><td class="lineno" valign="top"></td><td class="left">   The following core rules are included by reference, as defined in</td><td> </td><td class="right">   The following core rules are included by reference, as defined in</td><td class="lineno" valign="top"></td></tr>
     236      <tr><td class="lineno" valign="top"></td><td class="left">   [RFC5234], Appendix B.1: ALPHA (letters), CR (carriage return), CRLF</td><td> </td><td class="right">   [RFC5234], Appendix B.1: ALPHA (letters), CR (carriage return), CRLF</td><td class="lineno" valign="top"></td></tr>
     237      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
     238      <tr bgcolor="gray" ><td></td><th><a name="part-l4" /><small>skipping to change at</small><em> page 8, line 17</em></th><th> </th><th><a name="part-r4" /><small>skipping to change at</small><em> page 8, line 14</em></th><td></td></tr>
    207239      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    208240      <tr><td class="lineno" valign="top"></td><td class="left">   o  the response status code is understood by the cache, and</td><td> </td><td class="right">   o  the response status code is understood by the cache, and</td><td class="lineno" valign="top"></td></tr>
     
    215247      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    216248      <tr><td class="lineno" valign="top"></td><td class="left">   o  the "Authorization" header (see Section 3.1 of [Part7]) does not</td><td> </td><td class="right">   o  the "Authorization" header (see Section 3.1 of [Part7]) does not</td><td class="lineno" valign="top"></td></tr>
    217       <tr><td><a name="diff0013" /></td></tr>
     249      <tr><td><a name="diff0016" /></td></tr>
    218250      <tr><td class="lineno" valign="top"></td><td class="lblock">      appear in the request, if the cache is <span class="delete">shared (unless</span> the <span class="delete">"public"</span></td><td> </td><td class="rblock">      appear in the request, if the cache is <span class="insert">shared, unless</span> the <span class="insert">response</span></td><td class="lineno" valign="top"></td></tr>
    219251      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      directive is present; see</span> Section <span class="delete">3.2),</span> and</td><td> </td><td class="rblock"><span class="insert">      explicitly allows it (see</span> Section <span class="insert">2.6),</span> and</td><td class="lineno" valign="top"></td></tr>
     
    229261      <tr><td class="lineno" valign="top"></td><td class="left">         shared, or</td><td> </td><td class="right">         shared, or</td><td class="lineno" valign="top"></td></tr>
    230262      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    231       <tr bgcolor="gray" ><td></td><th><a name="part-l4" /><small>skipping to change at</small><em> page 9, line 18</em></th><th> </th><th><a name="part-r4" /><small>skipping to change at</small><em> page 9, line 14</em></th><td></td></tr>
     263      <tr bgcolor="gray" ><td></td><th><a name="part-l5" /><small>skipping to change at</small><em> page 9, line 18</em></th><th> </th><th><a name="part-r5" /><small>skipping to change at</small><em> page 9, line 14</em></th><td></td></tr>
    232264      <tr><td class="lineno" valign="top"></td><td class="left">   status code.</td><td> </td><td class="right">   status code.</td><td class="lineno" valign="top"></td></tr>
    233265      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    240272      <tr><td class="lineno" valign="top"></td><td class="left">   unless:</td><td> </td><td class="right">   unless:</td><td class="lineno" valign="top"></td></tr>
    241273      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    242       <tr><td><a name="diff0014" /></td></tr>
     274      <tr><td><a name="diff0017" /></td></tr>
    243275      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  The presented <span class="delete">Request-URI</span> and that of the stored response <span class="delete">match</span></td><td> </td><td class="rblock">   o  The presented <span class="insert">Effective Request URI (Section 4.3 of [Part1])</span> and</td><td class="lineno" valign="top"></td></tr>
    244276      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      ([[TODO-Request-URI: Need to find a new term for this, as Part 1</span></td><td> </td><td class="rblock">      that of the stored response <span class="insert">match,</span> and</td><td class="lineno" valign="top"></td></tr>
     
    251283      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    252284      <tr><td class="lineno" valign="top"></td><td class="left">   o  selecting request-headers nominated by the stored response (if</td><td> </td><td class="right">   o  selecting request-headers nominated by the stored response (if</td><td class="lineno" valign="top"></td></tr>
    253       <tr><td><a name="diff0015" /></td></tr>
     285      <tr><td><a name="diff0018" /></td></tr>
    254286      <tr><td class="lineno" valign="top"></td><td class="lblock">      any) match those presented (see Section 2.<span class="delete">6</span>), and</td><td> </td><td class="rblock">      any) match those presented (see Section 2.<span class="insert">7</span>), and</td><td class="lineno" valign="top"></td></tr>
    255287      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    264296      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    265297      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    266       <tr bgcolor="gray" ><td></td><th><a name="part-l5" /><small>skipping to change at</small><em> page 10, line 14</em></th><th> </th><th><a name="part-r5" /><small>skipping to change at</small><em> page 10, line 8</em></th><td></td></tr>
     298      <tr bgcolor="gray" ><td></td><th><a name="part-l6" /><small>skipping to change at</small><em> page 10, line 14</em></th><th> </th><th><a name="part-r6" /><small>skipping to change at</small><em> page 10, line 8</em></th><td></td></tr>
    267299      <tr><td class="lineno" valign="top"></td><td class="left">   having received a corresponding response.</td><td> </td><td class="right">   having received a corresponding response.</td><td class="lineno" valign="top"></td></tr>
    268300      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    275307      <tr><td class="lineno" valign="top"></td><td class="left">   Control: no-cache" to disambiguate which response to use.</td><td> </td><td class="right">   Control: no-cache" to disambiguate which response to use.</td><td class="lineno" valign="top"></td></tr>
    276308      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    277       <tr><td><a name="diff0016" /></td></tr>
     309      <tr><td><a name="diff0019" /></td></tr>
    278310      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">[[TODO-header-properties: end-to-end and hop-by-hop headers, non-</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    279311      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   modifiable headers removed; re-spec in p1]]</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    290322      <tr><td class="lineno" valign="top"></td><td class="left">   directive (Section 3.2.2).  Generally, origin servers will assign</td><td> </td><td class="right">   directive (Section 3.2.2).  Generally, origin servers will assign</td><td class="lineno" valign="top"></td></tr>
    291323      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    292       <tr bgcolor="gray" ><td></td><th><a name="part-l6" /><small>skipping to change at</small><em> page 11, line 32</em></th><th> </th><th><a name="part-r6" /><small>skipping to change at</small><em> page 11, line 22</em></th><td></td></tr>
     324      <tr bgcolor="gray" ><td></td><th><a name="part-l7" /><small>skipping to change at</small><em> page 11, line 32</em></th><th> </th><th><a name="part-r7" /><small>skipping to change at</small><em> page 11, line 22</em></th><td></td></tr>
    293325      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    294326      <tr><td class="lineno" valign="top"></td><td class="left">   o  If the cache is shared and the s-maxage response cache directive</td><td> </td><td class="right">   o  If the cache is shared and the s-maxage response cache directive</td><td class="lineno" valign="top"></td></tr>
     
    301333      <tr><td class="lineno" valign="top"></td><td class="left">      value minus the value of the Date response header, or</td><td> </td><td class="right">      value minus the value of the Date response header, or</td><td class="lineno" valign="top"></td></tr>
    302334      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    303       <tr><td><a name="diff0017" /></td></tr>
     335      <tr><td><a name="diff0020" /></td></tr>
    304336      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  Otherwise, no explicit expiration time is present in the <span class="delete">response,</span></td><td> </td><td class="rblock">   o  Otherwise, no explicit expiration time is present in the <span class="insert">response.</span></td><td class="lineno" valign="top"></td></tr>
    305337      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      but a</span> heuristic <span class="delete">may</span> be <span class="delete">used;</span> see Section 2.3.1.1.</td><td> </td><td class="rblock"><span class="insert">      A</span> heuristic <span class="insert">freshness lifetime might</span> be <span class="insert">applicable;</span> see</td><td class="lineno" valign="top"></td></tr>
     
    316348      <tr><td class="lineno" valign="top"></td><td class="left">   other response status codes.</td><td> </td><td class="right">   other response status codes.</td><td class="lineno" valign="top"></td></tr>
    317349      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    318       <tr bgcolor="gray" ><td></td><th><a name="part-l7" /><small>skipping to change at</small><em> page 12, line 6</em></th><th> </th><th><a name="part-r7" /><small>skipping to change at</small><em> page 11, line 46</em></th><td></td></tr>
     350      <tr bgcolor="gray" ><td></td><th><a name="part-l8" /><small>skipping to change at</small><em> page 12, line 6</em></th><th> </th><th><a name="part-r8" /><small>skipping to change at</small><em> page 11, line 46</em></th><td></td></tr>
    319351      <tr><td class="lineno" valign="top"></td><td class="left">   When a heuristic is used to calculate freshness lifetime, the cache</td><td> </td><td class="right">   When a heuristic is used to calculate freshness lifetime, the cache</td><td class="lineno" valign="top"></td></tr>
    320352      <tr><td class="lineno" valign="top"></td><td class="left">   SHOULD attach a Warning header with a 113 warn-code to the response</td><td> </td><td class="right">   SHOULD attach a Warning header with a 113 warn-code to the response</td><td class="lineno" valign="top"></td></tr>
     
    327359      <tr><td class="lineno" valign="top"></td><td class="left">   fraction might be 10%.</td><td> </td><td class="right">   fraction might be 10%.</td><td class="lineno" valign="top"></td></tr>
    328360      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    329       <tr><td><a name="diff0018" /></td></tr>
     361      <tr><td><a name="diff0021" /></td></tr>
    330362      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">[[REVIEW-query-string-heuristics: took away HTTP/1.0 query string</span></td><td> </td><td class="rblock">      <span class="insert">Note: RFC 2616 ([RFC2616], Section 13.9) required that caches do</span></td><td class="lineno" valign="top"></td></tr>
    331363      <tr><td class="lineno" valign="top"></td><td class="lblock">   heuristic <span class="delete">uncacheability.]]</span></td><td> </td><td class="rblock"><span class="insert">      not calculate</span> heuristic <span class="insert">freshness for URLs with query components</span></td><td class="lineno" valign="top"></td></tr>
     
    345377      <tr><td class="lineno" valign="top"></td><td class="left">   amount of time it has been in transit along network paths.</td><td> </td><td class="right">   amount of time it has been in transit along network paths.</td><td class="lineno" valign="top"></td></tr>
    346378      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    347       <tr><td><a name="diff0019" /></td></tr>
     379      <tr><td><a name="diff0022" /></td></tr>
    348380      <tr><td class="lineno" valign="top"></td><td class="lblock">   The <span class="delete">term "age_value" denotes the value of the Age header, in a form</span></td><td> </td><td class="rblock">   The <span class="insert">following data is used</span> for <span class="insert">the age calculation:</span></td><td class="lineno" valign="top"></td></tr>
    349381      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   appropriate</span> for <span class="delete">arithmetic operations.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    350382      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    351       <tr><td><a name="diff0020" /></td></tr>
     383      <tr><td><a name="diff0023" /></td></tr>
    352384      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">HTTP/1.1 requires origin servers to send a Date header, if possible,</span></td><td> </td><td class="rblock">   <span class="insert">age_value</span></td><td class="lineno" valign="top"></td></tr>
    353385      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   with every response, giving the time at which the response was</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
     
    356388      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   arithmetic operations.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    357389      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    358       <tr><td><a name="diff0021" /></td></tr>
     390      <tr><td><a name="diff0024" /></td></tr>
    359391      <tr><td class="lineno" valign="top"></td><td class="lblock">   The term <span class="delete">"now" means "the current</span> value of the <span class="delete">clock at the host</span></td><td> </td><td class="rblock">      The term <span class="insert">"age_value" denotes the</span> value of the <span class="insert">Age header</span></td><td class="lineno" valign="top"></td></tr>
    360392      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   performing the calculation."  Hosts that use HTTP, but especially</span></td><td> </td><td class="rblock"><span class="insert">      (Section 3.1), in</span> a <span class="insert">form appropriate for arithmetic operation; or</span></td><td class="lineno" valign="top"></td></tr>
     
    363395      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   accurate time standard.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    364396      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    365       <tr><td><a name="diff0022" /></td></tr>
     397      <tr><td><a name="diff0025" /></td></tr>
    366398      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">A response's age can be calculated in two entirely independent ways:</span></td><td> </td><td class="rblock">   <span class="insert">date_value</span></td><td class="lineno" valign="top"></td></tr>
    367399      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    368       <tr><td><a name="diff0023" /></td></tr>
     400      <tr><td><a name="diff0026" /></td></tr>
    369401      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">1.  now minus date_value,</span> if the <span class="delete">local clock is reasonably well</span></td><td> </td><td class="rblock">      <span class="insert">HTTP/1.1 requires origin servers to send a Date header,</span> if</td><td class="lineno" valign="top"></td></tr>
    370402      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       synchronized to</span> the <span class="delete">origin server's clock.  If the result is</span></td><td> </td><td class="rblock">      <span class="insert">possible, with every response, giving</span> the <span class="insert">time at which</span> the</td><td class="lineno" valign="top"></td></tr>
     
    375407      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      Date response header.</span></td><td class="lineno" valign="top"></td></tr>
    376408      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    377       <tr><td><a name="diff0024" /></td></tr>
     409      <tr><td><a name="diff0027" /></td></tr>
    378410      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">2.  age_value, if all of the caches along the response path implement</span></td><td> </td><td class="rblock">   <span class="insert">now</span></td><td class="lineno" valign="top"></td></tr>
    379411      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">       HTTP/1.1.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    380412      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    381       <tr><td><a name="diff0025" /></td></tr>
     413      <tr><td><a name="diff0028" /></td></tr>
    382414      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">These are combined as</span></td><td> </td><td class="rblock">      <span class="insert">The term "now" means "the current value of the clock at the host</span></td><td class="lineno" valign="top"></td></tr>
    383415      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      performing the calculation".  Hosts that use HTTP, but especially</span></td><td class="lineno" valign="top"></td></tr>
     
    386418      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">      to a globally accurate time standard.</span></td><td class="lineno" valign="top"></td></tr>
    387419      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    388       <tr><td><a name="diff0026" /></td></tr>
     420      <tr><td><a name="diff0029" /></td></tr>
    389421      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">    corrected_received_age = max(now - date_value, age_value)</span></td><td> </td><td class="rblock">   <span class="insert">request_time</span></td><td class="lineno" valign="top"></td></tr>
    390422      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    391       <tr><td><a name="diff0027" /></td></tr>
     423      <tr><td><a name="diff0030" /></td></tr>
    392424      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">When an Age</span> value <span class="delete">is received, it MUST be interpreted relative to</span> the</td><td> </td><td class="rblock">      <span class="insert">The current</span> value <span class="insert">of</span> the <span class="insert">clock at</span> the <span class="insert">host at</span> the time the <span class="insert">request</span></td><td class="lineno" valign="top"></td></tr>
    393425      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">time</span> the <span class="delete">request was initiated, not</span> the time <span class="delete">that</span> the response was</td><td> </td><td class="rblock"><span class="insert">      resulting in the stored</span> response was <span class="insert">made.</span></td><td class="lineno" valign="top"></td></tr>
    394426      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">received.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    395427      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    396       <tr><td><a name="diff0028" /></td></tr>
     428      <tr><td><a name="diff0031" /></td></tr>
    397429      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">corrected_initial_age = corrected_received_age</span></td><td> </td><td class="rblock">   <span class="insert">response_time</span></td><td class="lineno" valign="top"></td></tr>
    398430      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">                            + (now - request_time)</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    399431      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    400       <tr><td><a name="diff0029" /></td></tr>
     432      <tr><td><a name="diff0032" /></td></tr>
    401433      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">where "request_time" is</span> the <span class="delete">time (according to</span> the <span class="delete">local clock) when</span></td><td> </td><td class="rblock">      <span class="insert">The current value of</span> the <span class="insert">clock at the host at</span> the <span class="insert">time</span> the</td><td class="lineno" valign="top"></td></tr>
    402434      <tr><td class="lineno" valign="top"></td><td class="lblock">   the <span class="delete">request that elicited this</span> response was <span class="delete">sent.</span></td><td> </td><td class="rblock">      response was <span class="insert">received.</span></td><td class="lineno" valign="top"></td></tr>
    403435      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    404       <tr><td><a name="diff0030" /></td></tr>
     436      <tr><td><a name="diff0033" /></td></tr>
    405437      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">The current_age of a stored response</span> can <span class="delete">then</span> be calculated <span class="delete">by adding</span></td><td> </td><td class="rblock">   <span class="insert">A response's age</span> can be calculated <span class="insert">in two entirely independent ways:</span></td><td class="lineno" valign="top"></td></tr>
    406438      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   the amount of time (in seconds) since the stored response was last</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    407439      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   validated by the origin server to the corrected_initial_age.</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    408440      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    409       <tr><td><a name="diff0031" /></td></tr>
     441      <tr><td><a name="diff0034" /></td></tr>
    410442      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">In summary:</span></td><td> </td><td class="rblock">   <span class="insert">1.  the "apparent_age": response_time minus date_value, if the local</span></td><td class="lineno" valign="top"></td></tr>
    411443      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">       clock is reasonably well synchronized to the origin server's</span></td><td class="lineno" valign="top"></td></tr>
     
    413445      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">       zero.</span></td><td class="lineno" valign="top"></td></tr>
    414446      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    415       <tr><td><a name="diff0032" /></td></tr>
     447      <tr><td><a name="diff0035" /></td></tr>
    416448      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">age_value     - Age header field-value received with</span> the <span class="delete">response</span></td><td> </td><td class="rblock">   <span class="insert">2.</span>  the <span class="insert">"corrected_age_value", if all of the caches along</span> the</td><td class="lineno" valign="top"></td></tr>
    417449      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">     date_value    - Date header field-value received with</span> the response</td><td> </td><td class="rblock">       response <span class="insert">path implement HTTP/1.1; note this value MUST be</span></td><td class="lineno" valign="top"></td></tr>
     
    422454      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    423455      <tr><td class="lineno" valign="top"></td><td class="left">     apparent_age = max(0, response_time - date_value);</td><td> </td><td class="right">     apparent_age = max(0, response_time - date_value);</td><td class="lineno" valign="top"></td></tr>
    424       <tr><td><a name="diff0033" /></td></tr>
     456      <tr><td><a name="diff0036" /></td></tr>
    425457      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">corrected_received_age = max(apparent_age, age_value);</span></td><td> </td><td class="rblock">     <span class="insert">                                                                    </span></td><td class="lineno" valign="top"></td></tr>
    426458      <tr><td class="lineno" valign="top"></td><td class="left">     response_delay = response_time - request_time;</td><td> </td><td class="right">     response_delay = response_time - request_time;</td><td class="lineno" valign="top"></td></tr>
    427       <tr><td><a name="diff0034" /></td></tr>
     459      <tr><td><a name="diff0037" /></td></tr>
    428460      <tr><td class="lineno" valign="top"></td><td class="lblock">     <span class="delete">corrected_initial_age</span> = <span class="delete">corrected_received_age</span> + response_delay;</td><td> </td><td class="rblock">     <span class="insert">corrected_age_value</span> = <span class="insert">age_value</span> + response_delay;</td><td class="lineno" valign="top"></td></tr>
    429461      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                         </td><td class="lineno" valign="top"></td></tr>
     
    437469      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">                                                                         </td><td class="lineno" valign="top"></td></tr>
    438470      <tr><td class="lineno" valign="top"></td><td class="left">     resident_time = now - response_time;</td><td> </td><td class="right">     resident_time = now - response_time;</td><td class="lineno" valign="top"></td></tr>
    439       <tr><td><a name="diff0035" /></td></tr>
     471      <tr><td><a name="diff0038" /></td></tr>
    440472      <tr><td class="lineno" valign="top"></td><td class="lblock">     current_age <span class="delete">  </span>= corrected_initial_age + resident_time;</td><td> </td><td class="rblock">     current_age = corrected_initial_age + resident_time;</td><td class="lineno" valign="top"></td></tr>
    441473      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    442474      <tr><td class="lineno" valign="top"></td><td class="left">2.3.3.  Serving Stale Responses</td><td> </td><td class="right">2.3.3.  Serving Stale Responses</td><td class="lineno" valign="top"></td></tr>
    443475      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    444       <tr><td><a name="diff0036" /></td></tr>
     476      <tr><td><a name="diff0039" /></td></tr>
    445477      <tr><td class="lineno" valign="top"></td><td class="lblock">   A "stale" response is one that either has explicit expiry</td><td> </td><td class="rblock">   A "stale" response is one that either has explicit expiry <span class="insert">information</span></td><td class="lineno" valign="top"></td></tr>
    446478      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">information,</span> or is allowed to have heuristic expiry calculated, but</td><td> </td><td class="rblock">   or is allowed to have heuristic expiry calculated, but is not fresh</td><td class="lineno" valign="top"></td></tr>
     
    457489      <tr><td class="lineno" valign="top"></td><td class="left">   forward path) or otherwise explicitly allowed (e.g., the max-stale</td><td> </td><td class="right">   forward path) or otherwise explicitly allowed (e.g., the max-stale</td><td class="lineno" valign="top"></td></tr>
    458490      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    459       <tr bgcolor="gray" ><td></td><th><a name="part-l8" /><small>skipping to change at</small><em> page 14, line 14</em></th><th> </th><th><a name="part-r8" /><small>skipping to change at</small><em> page 14, line 17</em></th><td></td></tr>
     491      <tr bgcolor="gray" ><td></td><th><a name="part-l9" /><small>skipping to change at</small><em> page 14, line 14</em></th><th> </th><th><a name="part-r9" /><small>skipping to change at</small><em> page 14, line 17</em></th><td></td></tr>
    460492      <tr><td class="lineno" valign="top"></td><td class="left">   the requesting client, and the received response is no longer fresh,</td><td> </td><td class="right">   the requesting client, and the received response is no longer fresh,</td><td class="lineno" valign="top"></td></tr>
    461493      <tr><td class="lineno" valign="top"></td><td class="left">   the cache SHOULD forward it to the requesting client without adding a</td><td> </td><td class="right">   the cache SHOULD forward it to the requesting client without adding a</td><td class="lineno" valign="top"></td></tr>
     
    468500      <tr><td class="lineno" valign="top"></td><td class="left">   When a cache has one or more stored responses for a requested URI,</td><td> </td><td class="right">   When a cache has one or more stored responses for a requested URI,</td><td class="lineno" valign="top"></td></tr>
    469501      <tr><td class="lineno" valign="top"></td><td class="left">   but cannot serve any of them (e.g., because they are not fresh, or</td><td> </td><td class="right">   but cannot serve any of them (e.g., because they are not fresh, or</td><td class="lineno" valign="top"></td></tr>
    470       <tr><td><a name="diff0037" /></td></tr>
     502      <tr><td><a name="diff0040" /></td></tr>
    471503      <tr><td class="lineno" valign="top"></td><td class="lblock">   one cannot be selected; see Section 2.<span class="delete">6</span>), it can use the conditional</td><td> </td><td class="rblock">   one cannot be selected; see Section 2.<span class="insert">7</span>), it can use the conditional</td><td class="lineno" valign="top"></td></tr>
    472504      <tr><td class="lineno" valign="top"></td><td class="left">   request mechanism [Part4] in the forwarded request to give the origin</td><td> </td><td class="right">   request mechanism [Part4] in the forwarded request to give the origin</td><td class="lineno" valign="top"></td></tr>
     
    477509      <tr><td class="lineno" valign="top"></td><td class="left">   When sending such a conditional request, the cache SHOULD add an If-</td><td> </td><td class="right">   When sending such a conditional request, the cache SHOULD add an If-</td><td class="lineno" valign="top"></td></tr>
    478510      <tr><td class="lineno" valign="top"></td><td class="left">   Modified-Since header whose value is that of the Last-Modified header</td><td> </td><td class="right">   Modified-Since header whose value is that of the Last-Modified header</td><td class="lineno" valign="top"></td></tr>
    479       <tr><td><a name="diff0038" /></td></tr>
     511      <tr><td><a name="diff0041" /></td></tr>
    480512      <tr><td class="lineno" valign="top"></td><td class="lblock">   from the selected (see Section 2.<span class="delete">6</span>) stored response, if available.</td><td> </td><td class="rblock">   from the selected (see Section 2.<span class="insert">7</span>) stored response, if available.</td><td class="lineno" valign="top"></td></tr>
    481513      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    488520      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    489521      <tr><td class="lineno" valign="top"></td><td class="left">   A 304 (Not Modified) response status code indicates that the stored</td><td> </td><td class="right">   A 304 (Not Modified) response status code indicates that the stored</td><td class="lineno" valign="top"></td></tr>
    490       <tr><td><a name="diff0039" /></td></tr>
     522      <tr><td><a name="diff0042" /></td></tr>
    491523      <tr><td class="lineno" valign="top"></td><td class="lblock">   response can be updated and reused; see Section 2.<span class="delete">7</span>.</td><td> </td><td class="rblock">   response can be updated and reused; see Section 2.<span class="insert">8</span>.</td><td class="lineno" valign="top"></td></tr>
    492524      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    509541      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    510542      <tr><td class="lineno" valign="top"></td><td class="left">   The following HTTP methods MUST cause a cache to invalidate the</td><td> </td><td class="right">   The following HTTP methods MUST cause a cache to invalidate the</td><td class="lineno" valign="top"></td></tr>
    511       <tr><td><a name="diff0040" /></td></tr>
     543      <tr><td><a name="diff0043" /></td></tr>
    512544      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">Request-URI</span> as well as the URI(s) in the Location and <span class="delete">Content-</span></td><td> </td><td class="rblock">   <span class="insert">Effective Request URI (Section 4.3 of [Part1])</span> as well as the URI(s)</td><td class="lineno" valign="top"></td></tr>
    513545      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   Location</span> headers (if present):</td><td> </td><td class="rblock">   in the Location and <span class="insert">Content-Location</span> headers (if present):</td><td class="lineno" valign="top"></td></tr>
     
    521553      <tr><td class="lineno" valign="top"></td><td class="left">   An invalidation based on a URI from a Location or Content-Location</td><td> </td><td class="right">   An invalidation based on a URI from a Location or Content-Location</td><td class="lineno" valign="top"></td></tr>
    522554      <tr><td class="lineno" valign="top"></td><td class="left">   header MUST NOT be performed if the host part of that URI differs</td><td> </td><td class="right">   header MUST NOT be performed if the host part of that URI differs</td><td class="lineno" valign="top"></td></tr>
    523       <tr><td><a name="diff0041" /></td></tr>
     555      <tr><td><a name="diff0044" /></td></tr>
    524556      <tr><td class="lineno" valign="top"></td><td class="lblock">   from the host part in the <span class="delete">Request-URI.</span>  This helps prevent denial of</td><td> </td><td class="rblock">   from the host part in the <span class="insert">Effective Request URI (Section 4.3 of</span></td><td class="lineno" valign="top"></td></tr>
    525557      <tr><td class="lineno" valign="top"></td><td class="lblock">   service attacks.</td><td> </td><td class="rblock"><span class="insert">   [Part1]).</span>  This helps prevent denial of service attacks.</td><td class="lineno" valign="top"></td></tr>
     
    528560      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    529561      <tr><td class="lineno" valign="top"></td><td class="left">   A cache that passes through requests for methods it does not</td><td> </td><td class="right">   A cache that passes through requests for methods it does not</td><td class="lineno" valign="top"></td></tr>
    530       <tr><td><a name="diff0042" /></td></tr>
     562      <tr><td><a name="diff0045" /></td></tr>
    531563      <tr><td class="lineno" valign="top"></td><td class="lblock">   understand SHOULD invalidate the <span class="delete">Request-URI.</span></td><td> </td><td class="rblock">   understand SHOULD invalidate the <span class="insert">Effective Request URI (Section 4.3</span></td><td class="lineno" valign="top"></td></tr>
    532564      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   of [Part1]).</span></td><td class="lineno" valign="top"></td></tr>
    533565      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    534566      <tr><td class="lineno" valign="top"></td><td class="left">   Here, "invalidate" means that the cache will either remove all stored</td><td> </td><td class="right">   Here, "invalidate" means that the cache will either remove all stored</td><td class="lineno" valign="top"></td></tr>
    535       <tr><td><a name="diff0043" /></td></tr>
     567      <tr><td><a name="diff0046" /></td></tr>
    536568      <tr><td class="lineno" valign="top"></td><td class="lblock">   responses related to the <span class="delete">Request-URI,</span> or will mark these as "invalid"</td><td> </td><td class="rblock">   responses related to the <span class="insert">Effective Request URI,</span> or will mark these as</td><td class="lineno" valign="top"></td></tr>
    537569      <tr><td class="lineno" valign="top"></td><td class="lblock">   and in need of a mandatory validation before they can be returned in</td><td> </td><td class="rblock">   "invalid" and in need of a mandatory validation before they can be</td><td class="lineno" valign="top"></td></tr>
     
    546578      <tr><td class="lineno" valign="top"></td><td class="left">   3xx?) responses invalidate.]]</td><td> </td><td class="right">   3xx?) responses invalidate.]]</td><td class="lineno" valign="top"></td></tr>
    547579      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    548       <tr><td><a name="diff0044" /></td></tr>
     580      <tr><td><a name="diff0047" /></td></tr>
    549581      <tr><td class="lineno" valign="top"></td><td class="lblock">2.6.  Caching Negotiated Responses</td><td> </td><td class="rblock">2.6.  <span class="insert">Shared Caching of Authenticated Responses</span></td><td class="lineno" valign="top"></td></tr>
    550582      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    577609      <tr><td class="lineno" valign="top"></td><td class="left">   in the second request by applying any of the following:</td><td> </td><td class="right">   in the second request by applying any of the following:</td><td class="lineno" valign="top"></td></tr>
    578610      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    579       <tr bgcolor="gray" ><td></td><th><a name="part-l9" /><small>skipping to change at</small><em> page 16, line 29</em></th><th> </th><th><a name="part-r9" /><small>skipping to change at</small><em> page 16, line 47</em></th><td></td></tr>
     611      <tr bgcolor="gray" ><td></td><th><a name="part-l10" /><small>skipping to change at</small><em> page 16, line 29</em></th><th> </th><th><a name="part-r10" /><small>skipping to change at</small><em> page 16, line 47</em></th><td></td></tr>
    580612      <tr><td class="lineno" valign="top"></td><td class="left">   subsequent requests to that resource can only be properly interpreted</td><td> </td><td class="right">   subsequent requests to that resource can only be properly interpreted</td><td class="lineno" valign="top"></td></tr>
    581613      <tr><td class="lineno" valign="top"></td><td class="left">   by the origin server.</td><td> </td><td class="right">   by the origin server.</td><td class="lineno" valign="top"></td></tr>
     
    588620      <tr><td class="lineno" valign="top"></td><td class="left">   Section 2.4.</td><td> </td><td class="right">   Section 2.4.</td><td class="lineno" valign="top"></td></tr>
    589621      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    590       <tr><td><a name="diff0045" /></td></tr>
     622      <tr><td><a name="diff0048" /></td></tr>
    591623      <tr><td class="lineno" valign="top"></td><td class="lblock">2.<span class="delete">7</span>.  Combining Responses</td><td> </td><td class="rblock">2.<span class="insert">8</span>.  Combining Responses</td><td class="lineno" valign="top"></td></tr>
    592624      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    601633      <tr><td class="lineno" valign="top"></td><td class="left">   Location here]][[TODO-inm-mult-etags: cover case where INM with</td><td> </td><td class="right">   Location here]][[TODO-inm-mult-etags: cover case where INM with</td><td class="lineno" valign="top"></td></tr>
    602634      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    603       <tr bgcolor="gray" ><td></td><th><a name="part-l10" /><small>skipping to change at</small><em> page 18, line 9</em></th><th> </th><th><a name="part-r10" /><small>skipping to change at</small><em> page 18, line 27</em></th><td></td></tr>
     635      <tr bgcolor="gray" ><td></td><th><a name="part-l11" /><small>skipping to change at</small><em> page 18, line 9</em></th><th> </th><th><a name="part-r11" /><small>skipping to change at</small><em> page 18, line 27</em></th><td></td></tr>
    604636      <tr><td class="lineno" valign="top"></td><td class="left">   MUST transmit an Age header with a field-value of 2147483648 (2^31).</td><td> </td><td class="right">   MUST transmit an Age header with a field-value of 2147483648 (2^31).</td><td class="lineno" valign="top"></td></tr>
    605637      <tr><td class="lineno" valign="top"></td><td class="left">   Caches SHOULD use an arithmetic type of at least 31 bits of range.</td><td> </td><td class="right">   Caches SHOULD use an arithmetic type of at least 31 bits of range.</td><td class="lineno" valign="top"></td></tr>
     
    612644      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    613645      <tr><td class="lineno" valign="top"></td><td class="left">   The "Cache-Control" general-header field is used to specify</td><td> </td><td class="right">   The "Cache-Control" general-header field is used to specify</td><td class="lineno" valign="top"></td></tr>
    614       <tr><td><a name="diff0046" /></td></tr>
     646      <tr><td><a name="diff0049" /></td></tr>
    615647      <tr><td class="lineno" valign="top"></td><td class="lblock">   directives <span class="delete">that MUST be obeyed by all</span> caches along the <span class="delete">request/</span></td><td> </td><td class="rblock">   directives <span class="insert">for</span> caches along the <span class="insert">request/response</span> chain.  Such cache</td><td class="lineno" valign="top"></td></tr>
    616648      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">   response</span> chain.  Such cache directives are unidirectional in that the</td><td> </td><td class="rblock">   directives are unidirectional in that the presence of a directive in</td><td class="lineno" valign="top"></td></tr>
     
    618650      <tr><td class="lineno" valign="top"></td><td class="lblock">   directive is to be given in the response.</td><td> </td><td class="rblock">   the response.</td><td class="lineno" valign="top"></td></tr>
    619651      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    620       <tr><td><a name="diff0047" /></td></tr>
     652      <tr><td><a name="diff0050" /></td></tr>
    621653      <tr><td class="lineno" valign="top"></td><td class="lblock">      <span class="delete">Note that</span> HTTP/1.0 caches might not implement Cache-Control and</td><td> </td><td class="rblock">   <span class="insert">HTTP/1.1 caches MUST obey the requirements of the Cache-Control</span></td><td class="lineno" valign="top"></td></tr>
    622654      <tr><td class="lineno" valign="top"></td><td class="lblock">      might only implement Pragma: no-cache (see Section 3.4).</td><td> </td><td class="rblock"><span class="insert">   directives defined in this section.  See Section 3.2.3 for</span></td><td class="lineno" valign="top"></td></tr>
     
    637669      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    638670      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    639       <tr bgcolor="gray" ><td></td><th><a name="part-l11" /><small>skipping to change at</small><em> page 19, line 21</em></th><th> </th><th><a name="part-r11" /><small>skipping to change at</small><em> page 19, line 44</em></th><td></td></tr>
     671      <tr bgcolor="gray" ><td></td><th><a name="part-l12" /><small>skipping to change at</small><em> page 19, line 21</em></th><th> </th><th><a name="part-r12" /><small>skipping to change at</small><em> page 19, line 44</em></th><td></td></tr>
    640672      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    641673      <tr><td class="lineno" valign="top"></td><td class="left">      This directive is NOT a reliable or sufficient mechanism for</td><td> </td><td class="right">      This directive is NOT a reliable or sufficient mechanism for</td><td class="lineno" valign="top"></td></tr>
     
    648680      <tr><td class="lineno" valign="top"></td><td class="left">      The max-age request directive indicates that the client is willing</td><td> </td><td class="right">      The max-age request directive indicates that the client is willing</td><td class="lineno" valign="top"></td></tr>
    649681      <tr><td class="lineno" valign="top"></td><td class="left">      to accept a response whose age is no greater than the specified</td><td> </td><td class="right">      to accept a response whose age is no greater than the specified</td><td class="lineno" valign="top"></td></tr>
    650       <tr><td><a name="diff0048" /></td></tr>
     682      <tr><td><a name="diff0051" /></td></tr>
    651683      <tr><td class="lineno" valign="top"></td><td class="lblock">      time in seconds.  Unless max-stale directive is also <span class="delete">included,</span> the</td><td> </td><td class="rblock">      time in seconds.  Unless <span class="insert">the</span> max-stale <span class="insert">request</span> directive is also</td><td class="lineno" valign="top"></td></tr>
    652684      <tr><td class="lineno" valign="top"></td><td class="lblock">      client is not willing to accept a stale response.</td><td> </td><td class="rblock">      <span class="insert">present,</span> the client is not willing to accept a stale response.</td><td class="lineno" valign="top"></td></tr>
     
    662694      <tr><td class="lineno" valign="top"></td><td class="left">      stale response of any age.  [[TODO-staleness: of any staleness?</td><td> </td><td class="right">      stale response of any age.  [[TODO-staleness: of any staleness?</td><td class="lineno" valign="top"></td></tr>
    663695      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    664       <tr bgcolor="gray" ><td></td><th><a name="part-l12" /><small>skipping to change at</small><em> page 23, line 31</em></th><th> </th><th><a name="part-r12" /><small>skipping to change at</small><em> page 24, line 8</em></th><td></td></tr>
     696      <tr bgcolor="gray" ><td></td><th><a name="part-l13" /><small>skipping to change at</small><em> page 23, line 31</em></th><th> </th><th><a name="part-r13" /><small>skipping to change at</small><em> page 24, line 8</em></th><td></td></tr>
    665697      <tr><td class="lineno" valign="top"></td><td class="left">   does not understand the community cache-extension, since it will also</td><td> </td><td class="right">   does not understand the community cache-extension, since it will also</td><td class="lineno" valign="top"></td></tr>
    666698      <tr><td class="lineno" valign="top"></td><td class="left">   see and understand the private directive and thus default to the safe</td><td> </td><td class="right">   see and understand the private directive and thus default to the safe</td><td class="lineno" valign="top"></td></tr>
     
    673705      <tr><td class="lineno" valign="top"></td><td class="left">   correct even if the cache does not understand the extension(s).</td><td> </td><td class="right">   correct even if the cache does not understand the extension(s).</td><td class="lineno" valign="top"></td></tr>
    674706      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    675       <tr><td><a name="diff0049" /></td></tr>
     707      <tr><td><a name="diff0052" /></td></tr>
    676708      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   <span class="insert">The HTTP Cache Directive Registry defines the name space for the</span></td><td class="lineno" valign="top"></td></tr>
    677709      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   cache directives.</span></td><td class="lineno" valign="top"></td></tr>
     
    700732      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    701733      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    702       <tr bgcolor="gray" ><td></td><th><a name="part-l13" /><small>skipping to change at</small><em> page 25, line 4</em></th><th> </th><th><a name="part-r13" /><small>skipping to change at</small><em> page 25, line 43</em></th><td></td></tr>
     734      <tr bgcolor="gray" ><td></td><th><a name="part-l14" /><small>skipping to change at</small><em> page 25, line 4</em></th><th> </th><th><a name="part-r14" /><small>skipping to change at</small><em> page 25, line 43</em></th><td></td></tr>
    703735      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    704736      <tr><td class="lineno" valign="top"></td><td class="left">   This mechanism is deprecated; no new Pragma directives will be</td><td> </td><td class="right">   This mechanism is deprecated; no new Pragma directives will be</td><td class="lineno" valign="top"></td></tr>
     
    711743      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    712744      <tr><td class="lineno" valign="top"></td><td class="left">   Caches use this information, in part, to determine whether a stored</td><td> </td><td class="right">   Caches use this information, in part, to determine whether a stored</td><td class="lineno" valign="top"></td></tr>
    713       <tr><td><a name="diff0050" /></td></tr>
     745      <tr><td><a name="diff0053" /></td></tr>
    714746      <tr><td class="lineno" valign="top"></td><td class="lblock">   response can be used to satisfy a given request; see Section 2.<span class="delete">6</span>.</td><td> </td><td class="rblock">   response can be used to satisfy a given request; see Section 2.<span class="insert">7</span>.</td><td class="lineno" valign="top"></td></tr>
    715747      <tr><td class="lineno" valign="top"></td><td class="left">   determines, while the response is fresh, whether a cache is permitted</td><td> </td><td class="right">   determines, while the response is fresh, whether a cache is permitted</td><td class="lineno" valign="top"></td></tr>
    716748      <tr><td class="lineno" valign="top"></td><td class="left">   to use the response to reply to a subsequent request without</td><td> </td><td class="right">   to use the response to reply to a subsequent request without</td><td class="lineno" valign="top"></td></tr>
    717       <tr><td><a name="diff0051" /></td></tr>
     749      <tr><td><a name="diff0054" /></td></tr>
    718750      <tr><td class="lineno" valign="top"></td><td class="lblock">   validation; see Section 2.<span class="delete">6</span>.</td><td> </td><td class="rblock">   validation; see Section 2.<span class="insert">7</span>.</td><td class="lineno" valign="top"></td></tr>
    719751      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    728760      <tr><td class="lineno" valign="top"></td><td class="left">   the selecting request-headers.</td><td> </td><td class="right">   the selecting request-headers.</td><td class="lineno" valign="top"></td></tr>
    729761      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    730       <tr bgcolor="gray" ><td></td><th><a name="part-l14" /><small>skipping to change at</small><em> page 28, line 27</em></th><th> </th><th><a name="part-r14" /><small>skipping to change at</small><em> page 29, line 22</em></th><td></td></tr>
     762      <tr bgcolor="gray" ><td></td><th><a name="part-l15" /><small>skipping to change at</small><em> page 28, line 27</em></th><th> </th><th><a name="part-r15" /><small>skipping to change at</small><em> page 29, line 22</em></th><td></td></tr>
    731763      <tr><td class="lineno" valign="top"></td><td class="left">   The freshness model (Section 2.3) does not necessarily apply to</td><td> </td><td class="right">   The freshness model (Section 2.3) does not necessarily apply to</td><td class="lineno" valign="top"></td></tr>
    732764      <tr><td class="lineno" valign="top"></td><td class="left">   history mechanisms.  I.e., a history mechanism can display a previous</td><td> </td><td class="right">   history mechanisms.  I.e., a history mechanism can display a previous</td><td class="lineno" valign="top"></td></tr>
     
    739771      <tr><td class="lineno" valign="top"></td><td class="left">5.  IANA Considerations</td><td> </td><td class="right">5.  IANA Considerations</td><td class="lineno" valign="top"></td></tr>
    740772      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    741       <tr><td><a name="diff0052" /></td></tr>
     773      <tr><td><a name="diff0055" /></td></tr>
    742774      <tr><td class="lineno" valign="top"></td><td class="lblock">5.1.  Message Header Registration</td><td> </td><td class="rblock">5.1.  <span class="insert">Cache Directive Registry</span></td><td class="lineno" valign="top"></td></tr>
    743775      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    780812      <tr><td class="lineno" valign="top"></td><td class="left">   | Cache-Control     | http     | standard | Section 3.2 |</td><td> </td><td class="right">   | Cache-Control     | http     | standard | Section 3.2 |</td><td class="lineno" valign="top"></td></tr>
    781813      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    782       <tr bgcolor="gray" ><td></td><th><a name="part-l15" /><small>skipping to change at</small><em> page 29, line 24</em></th><th> </th><th><a name="part-r15" /><small>skipping to change at</small><em> page 30, line 48</em></th><td></td></tr>
     814      <tr bgcolor="gray" ><td></td><th><a name="part-l16" /><small>skipping to change at</small><em> page 29, line 24</em></th><th> </th><th><a name="part-r16" /><small>skipping to change at</small><em> page 30, line 48</em></th><td></td></tr>
    783815      <tr><td class="lineno" valign="top"></td><td class="left">   suggestions and comments from individuals including: Shel Kaphan,</td><td> </td><td class="right">   suggestions and comments from individuals including: Shel Kaphan,</td><td class="lineno" valign="top"></td></tr>
    784816      <tr><td class="lineno" valign="top"></td><td class="left">   Paul Leach, Koen Holtman, David Morris, and Larry Masinter.</td><td> </td><td class="right">   Paul Leach, Koen Holtman, David Morris, and Larry Masinter.</td><td class="lineno" valign="top"></td></tr>
     
    791823      <tr><td class="lineno" valign="top"></td><td class="left">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td> </td><td class="right">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td class="lineno" valign="top"></td></tr>
    792824      <tr><td class="lineno" valign="top"></td><td class="left">              and J. Reschke, Ed., "HTTP/1.1, part 1: URIs, Connections,</td><td> </td><td class="right">              and J. Reschke, Ed., "HTTP/1.1, part 1: URIs, Connections,</td><td class="lineno" valign="top"></td></tr>
    793       <tr><td><a name="diff0053" /></td></tr>
     825      <tr><td><a name="diff0056" /></td></tr>
    794826      <tr><td class="lineno" valign="top"></td><td class="lblock">              and Message Parsing", <span class="delete">draft-ietf-httpbis-p1-messaging-09</span></td><td> </td><td class="rblock">              and Message Parsing", <span class="insert">draft-ietf-httpbis-p1-messaging-10</span></td><td class="lineno" valign="top"></td></tr>
    795827      <tr><td class="lineno" valign="top"></td><td class="lblock">              (work in progress), <span class="delete">March</span> 2010.</td><td> </td><td class="rblock">              (work in progress), <span class="insert">July</span> 2010.</td><td class="lineno" valign="top"></td></tr>
     
    798830      <tr><td class="lineno" valign="top"></td><td class="left">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td> </td><td class="right">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td class="lineno" valign="top"></td></tr>
    799831      <tr><td class="lineno" valign="top"></td><td class="left">              and J. Reschke, Ed., "HTTP/1.1, part 2: Message</td><td> </td><td class="right">              and J. Reschke, Ed., "HTTP/1.1, part 2: Message</td><td class="lineno" valign="top"></td></tr>
    800       <tr><td><a name="diff0054" /></td></tr>
     832      <tr><td><a name="diff0057" /></td></tr>
    801833      <tr><td class="lineno" valign="top"></td><td class="lblock">              Semantics", <span class="delete">draft-ietf-httpbis-p2-semantics-09</span> (work in</td><td> </td><td class="rblock">              Semantics", <span class="insert">draft-ietf-httpbis-p2-semantics-10</span> (work in</td><td class="lineno" valign="top"></td></tr>
    802834      <tr><td class="lineno" valign="top"></td><td class="lblock">              progress), <span class="delete">March</span> 2010.</td><td> </td><td class="rblock">              progress), <span class="insert">July</span> 2010.</td><td class="lineno" valign="top"></td></tr>
     
    805837      <tr><td class="lineno" valign="top"></td><td class="left">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td> </td><td class="right">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td class="lineno" valign="top"></td></tr>
    806838      <tr><td class="lineno" valign="top"></td><td class="left">              and J. Reschke, Ed., "HTTP/1.1, part 4: Conditional</td><td> </td><td class="right">              and J. Reschke, Ed., "HTTP/1.1, part 4: Conditional</td><td class="lineno" valign="top"></td></tr>
    807       <tr><td><a name="diff0055" /></td></tr>
     839      <tr><td><a name="diff0058" /></td></tr>
    808840      <tr><td class="lineno" valign="top"></td><td class="lblock">              Requests", <span class="delete">draft-ietf-httpbis-p4-conditional-09</span> (work in</td><td> </td><td class="rblock">              Requests", <span class="insert">draft-ietf-httpbis-p4-conditional-10</span> (work in</td><td class="lineno" valign="top"></td></tr>
    809841      <tr><td class="lineno" valign="top"></td><td class="lblock">              progress), <span class="delete">March</span> 2010.</td><td> </td><td class="rblock">              progress), <span class="insert">July</span> 2010.</td><td class="lineno" valign="top"></td></tr>
     
    812844      <tr><td class="lineno" valign="top"></td><td class="left">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td> </td><td class="right">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td class="lineno" valign="top"></td></tr>
    813845      <tr><td class="lineno" valign="top"></td><td class="left">              and J. Reschke, Ed., "HTTP/1.1, part 5: Range Requests and</td><td> </td><td class="right">              and J. Reschke, Ed., "HTTP/1.1, part 5: Range Requests and</td><td class="lineno" valign="top"></td></tr>
    814       <tr><td><a name="diff0056" /></td></tr>
     846      <tr><td><a name="diff0059" /></td></tr>
    815847      <tr><td class="lineno" valign="top"></td><td class="lblock">              Partial Responses", <span class="delete">draft-ietf-httpbis-p5-range-09</span> (work</td><td> </td><td class="rblock">              Partial Responses", <span class="insert">draft-ietf-httpbis-p5-range-10</span> (work</td><td class="lineno" valign="top"></td></tr>
    816848      <tr><td class="lineno" valign="top"></td><td class="lblock">              in progress), <span class="delete">March</span> 2010.</td><td> </td><td class="rblock">              in progress), <span class="insert">July</span> 2010.</td><td class="lineno" valign="top"></td></tr>
     
    819851      <tr><td class="lineno" valign="top"></td><td class="left">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td> </td><td class="right">              Masinter, L., Leach, P., Berners-Lee, T., Lafon, Y., Ed.,</td><td class="lineno" valign="top"></td></tr>
    820852      <tr><td class="lineno" valign="top"></td><td class="left">              and J. Reschke, Ed., "HTTP/1.1, part 7: Authentication",</td><td> </td><td class="right">              and J. Reschke, Ed., "HTTP/1.1, part 7: Authentication",</td><td class="lineno" valign="top"></td></tr>
    821       <tr><td><a name="diff0057" /></td></tr>
     853      <tr><td><a name="diff0060" /></td></tr>
    822854      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">draft-ietf-httpbis-p7-auth-09</span> (work in progress),</td><td> </td><td class="rblock">              <span class="insert">draft-ietf-httpbis-p7-auth-10</span> (work in progress),</td><td class="lineno" valign="top"></td></tr>
    823855      <tr><td class="lineno" valign="top"></td><td class="lblock">              <span class="delete">March</span> 2010.</td><td> </td><td class="rblock">              <span class="insert">July</span> 2010.</td><td class="lineno" valign="top"></td></tr>
     
    842874      <tr><td class="lineno" valign="top"></td><td class="left">              September 2004.</td><td> </td><td class="right">              September 2004.</td><td class="lineno" valign="top"></td></tr>
    843875      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    844       <tr><td><a name="diff0058" /></td></tr>
     876      <tr><td><a name="diff0061" /></td></tr>
    845877      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   <span class="insert">[RFC5226]  Narten, T. and H. Alvestrand, "Guidelines for Writing an</span></td><td class="lineno" valign="top"></td></tr>
    846878      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">              IANA Considerations Section in RFCs", BCP 26, RFC 5226,</span></td><td class="lineno" valign="top"></td></tr>
     
    860892      <tr><td class="lineno" valign="top"></td><td class="left">   were always returned; by allowing the server to only send needed</td><td> </td><td class="right">   were always returned; by allowing the server to only send needed</td><td class="lineno" valign="top"></td></tr>
    861893      <tr><td class="lineno" valign="top"></td><td class="left">   headers in a 206 response, this problem can be avoided.</td><td> </td><td class="right">   headers in a 206 response, this problem can be avoided.</td><td class="lineno" valign="top"></td></tr>
    862       <tr><td><a name="diff0059" /></td></tr>
     894      <tr><td><a name="diff0062" /></td></tr>
    863895      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section 2.<span class="delete">7</span>)</td><td> </td><td class="rblock">   (Section 2.<span class="insert">8</span>)</td><td class="lineno" valign="top"></td></tr>
    864896      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    867899      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    868900      <tr><td class="lineno" valign="top"></td><td class="left">   Warnings could be cached incorrectly, or not updated appropriately.</td><td> </td><td class="right">   Warnings could be cached incorrectly, or not updated appropriately.</td><td class="lineno" valign="top"></td></tr>
    869       <tr><td><a name="diff0060" /></td></tr>
     901      <tr><td><a name="diff0063" /></td></tr>
    870902      <tr><td class="lineno" valign="top"></td><td class="lblock">   (Section 2.3, 2.<span class="delete">7</span>, 3.2, and 3.6) Warning also needed to be a general</td><td> </td><td class="rblock">   (Section 2.3, 2.<span class="insert">8</span>, 3.2, and 3.6) Warning also needed to be a general</td><td class="lineno" valign="top"></td></tr>
    871903      <tr><td class="lineno" valign="top"></td><td class="left">   header, as PUT or other methods may have need for it in requests.</td><td> </td><td class="right">   header, as PUT or other methods may have need for it in requests.</td><td class="lineno" valign="top"></td></tr>
     
    873905      <tr><td class="lineno" valign="top"></td><td class="left">A.2.  Changes from RFC 2616</td><td> </td><td class="right">A.2.  Changes from RFC 2616</td><td class="lineno" valign="top"></td></tr>
    874906      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    875       <tr><td><a name="diff0061" /></td></tr>
     907      <tr><td><a name="diff0064" /></td></tr>
    876908      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">   <span class="insert">Make the specified age calculation algorithm less conservative.</span></td><td class="lineno" valign="top"></td></tr>
    877909      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">   (Section 2.3.2)</span></td><td class="lineno" valign="top"></td></tr>
     
    883915      <tr><td class="lineno" valign="top"></td><td class="left">   Clarify denial of service attack avoidance requirement.</td><td> </td><td class="right">   Clarify denial of service attack avoidance requirement.</td><td class="lineno" valign="top"></td></tr>
    884916      <tr><td class="lineno" valign="top"></td><td class="left">   (Section 2.5)</td><td> </td><td class="right">   (Section 2.5)</td><td class="lineno" valign="top"></td></tr>
    885       <tr><td><a name="diff0062" /></td></tr>
     917      <tr><td><a name="diff0065" /></td></tr>
    886918      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">                                                                         </span></td><td class="lineno" valign="top"></td></tr>
    887919      <tr><td class="lineno" valign="top"></td><td class="left">   Do not mention RFC 2047 encoding and multiple languages in Warning</td><td> </td><td class="right">   Do not mention RFC 2047 encoding and multiple languages in Warning</td><td class="lineno" valign="top"></td></tr>
     
    896928      <tr><td class="lineno" valign="top"></td><td class="left">   Cache-Control = "Cache-Control:" OWS Cache-Control-v</td><td> </td><td class="right">   Cache-Control = "Cache-Control:" OWS Cache-Control-v</td><td class="lineno" valign="top"></td></tr>
    897929      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    898       <tr bgcolor="gray" ><td></td><th><a name="part-l16" /><small>skipping to change at</small><em> page 34, line 34</em></th><th> </th><th><a name="part-r16" /><small>skipping to change at</small><em> page 36, line 17</em></th><td></td></tr>
     930      <tr bgcolor="gray" ><td></td><th><a name="part-l17" /><small>skipping to change at</small><em> page 34, line 34</em></th><th> </th><th><a name="part-r17" /><small>skipping to change at</small><em> page 36, line 17</em></th><td></td></tr>
    899931      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    900932      <tr><td class="lineno" valign="top"></td><td class="left">C.7.  Since draft-ietf-httpbis-p6-cache-05</td><td> </td><td class="right">C.7.  Since draft-ietf-httpbis-p6-cache-05</td><td class="lineno" valign="top"></td></tr>
     
    907939      <tr><td class="lineno" valign="top"></td><td class="left">      1xx Warn-Codes"</td><td> </td><td class="right">      1xx Warn-Codes"</td><td class="lineno" valign="top"></td></tr>
    908940      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    909       <tr><td><a name="diff0063" /></td></tr>
     941      <tr><td><a name="diff0066" /></td></tr>
    910942      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://trac.tools.ietf.org/wg/httpbis/trac/ticket/60&gt;:</span> "Placement</td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/60&gt;:</span> "Placement of</td><td class="lineno" valign="top"></td></tr>
    911943      <tr><td class="lineno" valign="top"></td><td class="lblock">      of 13.5.1 and 13.5.2"</td><td> </td><td class="rblock">      13.5.1 and 13.5.2"</td><td class="lineno" valign="top"></td></tr>
    912944      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    913       <tr><td><a name="diff0064" /></td></tr>
     945      <tr><td><a name="diff0067" /></td></tr>
    914946      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://trac.tools.ietf.org/wg/httpbis/trac/ticket/138&gt;:</span> "The role</td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/138&gt;:</span> "The role of</td><td class="lineno" valign="top"></td></tr>
    915947      <tr><td class="lineno" valign="top"></td><td class="lblock">      of Warning and Semantic Transparency in Caching"</td><td> </td><td class="rblock">      Warning and Semantic Transparency in Caching"</td><td class="lineno" valign="top"></td></tr>
    916948      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    917       <tr><td><a name="diff0065" /></td></tr>
     949      <tr><td><a name="diff0068" /></td></tr>
    918950      <tr><td class="lineno" valign="top"></td><td class="lblock">   o  <span class="delete">&lt;http://trac.tools.ietf.org/wg/httpbis/trac/ticket/139&gt;:</span> "Methods</td><td> </td><td class="rblock">   o  <span class="insert">&lt;http://tools.ietf.org/wg/httpbis/trac/ticket/139&gt;:</span> "Methods and</td><td class="lineno" valign="top"></td></tr>
    919951      <tr><td class="lineno" valign="top"></td><td class="lblock">      and Caching"</td><td> </td><td class="rblock">      Caching"</td><td class="lineno" valign="top"></td></tr>
     
    929961      <tr><td class="lineno" valign="top"></td><td class="left">   Closed issues:</td><td> </td><td class="right">   Closed issues:</td><td class="lineno" valign="top"></td></tr>
    930962      <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
    931       <tr bgcolor="gray" ><td></td><th><a name="part-l17" /><small>skipping to change at</small><em> page 36, line 5</em></th><th> </th><th><a name="part-r17" /><small>skipping to change at</small><em> page 37, line 31</em></th><td></td></tr>
     963      <tr bgcolor="gray" ><td></td><th><a name="part-l18" /><small>skipping to change at</small><em> page 36, line 5</em></th><th> </th><th><a name="part-r18" /><small>skipping to change at</small><em> page 37, line 31</em></th><td></td></tr>
    932964      <tr><td class="lineno" valign="top"></td><td class="left">   Affected issues:</td><td> </td><td class="right">   Affected issues:</td><td class="lineno" valign="top"></td></tr>
    933965      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    940972      <tr><td class="lineno" valign="top"></td><td class="left">      13.5.1 and 13.5.2"</td><td> </td><td class="right">      13.5.1 and 13.5.2"</td><td class="lineno" valign="top"></td></tr>
    941973      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    942       <tr><td><a name="diff0066" /></td></tr>
     974      <tr><td><a name="diff0069" /></td></tr>
    943975      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">C.11.  Since draft-ietf-httpbis-p6-cache-09</span></td><td class="lineno" valign="top"></td></tr>
    944976      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno" valign="top"></td></tr>
     
    9771009      <tr><td class="lineno" valign="top"></td><td class="left">         max-age  19, 22</td><td> </td><td class="right">         max-age  19, 22</td><td class="lineno" valign="top"></td></tr>
    9781010      <tr><td class="lineno" valign="top"></td><td class="left">         max-stale  19</td><td> </td><td class="right">         max-stale  19</td><td class="lineno" valign="top"></td></tr>
    979       <tr><td><a name="diff0067" /></td></tr>
     1011      <tr><td><a name="diff0070" /></td></tr>
    9801012      <tr><td class="lineno" valign="top"></td><td class="lblock">         min-fresh  <span class="delete">19</span></td><td> </td><td class="rblock">         min-fresh  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    9811013      <tr><td class="lineno" valign="top"></td><td class="lblock">         must-revalidate  <span class="delete">21</span></td><td> </td><td class="rblock">         must-revalidate  <span class="insert">22</span></td><td class="lineno" valign="top"></td></tr>
     
    9921024      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    9931025      <tr><td class="lineno" valign="top"></td><td class="left">   E</td><td> </td><td class="right">   E</td><td class="lineno" valign="top"></td></tr>
    994       <tr><td><a name="diff0068" /></td></tr>
     1026      <tr><td><a name="diff0071" /></td></tr>
    9951027      <tr><td class="lineno" valign="top"></td><td class="lblock">      Expires header  2<span class="delete">3</span></td><td> </td><td class="rblock">      Expires header  2<span class="insert">4</span></td><td class="lineno" valign="top"></td></tr>
    9961028      <tr><td class="lineno" valign="top"></td><td class="left">      explicit expiration time  5</td><td> </td><td class="right">      explicit expiration time  5</td><td class="lineno" valign="top"></td></tr>
     
    10031035      <tr><td class="lineno" valign="top"></td><td class="left">   G</td><td> </td><td class="right">   G</td><td class="lineno" valign="top"></td></tr>
    10041036      <tr><td class="lineno" valign="top"></td><td class="left">      Grammar</td><td> </td><td class="right">      Grammar</td><td class="lineno" valign="top"></td></tr>
    1005       <tr><td><a name="diff0069" /></td></tr>
     1037      <tr><td><a name="diff0072" /></td></tr>
    10061038      <tr><td class="lineno" valign="top"></td><td class="lblock">         Age  <span class="delete">17</span></td><td> </td><td class="rblock">         Age  <span class="insert">18</span></td><td class="lineno" valign="top"></td></tr>
    10071039      <tr><td class="lineno" valign="top"></td><td class="lblock">         Age-v  <span class="delete">17</span></td><td> </td><td class="rblock">         Age-v  <span class="insert">18</span></td><td class="lineno" valign="top"></td></tr>
     
    10091041      <tr><td class="lineno" valign="top"></td><td class="left">         Cache-Control-v  18</td><td> </td><td class="right">         Cache-Control-v  18</td><td class="lineno" valign="top"></td></tr>
    10101042      <tr><td class="lineno" valign="top"></td><td class="left">         cache-extension  18</td><td> </td><td class="right">         cache-extension  18</td><td class="lineno" valign="top"></td></tr>
    1011       <tr><td><a name="diff0070" /></td></tr>
     1043      <tr><td><a name="diff0073" /></td></tr>
    10121044      <tr><td class="lineno" valign="top"></td><td class="lblock">         cache-request-directive  1<span class="delete">8</span></td><td> </td><td class="rblock">         cache-request-directive  1<span class="insert">9</span></td><td class="lineno" valign="top"></td></tr>
    10131045      <tr><td class="lineno" valign="top"></td><td class="left">         cache-response-directive  20</td><td> </td><td class="right">         cache-response-directive  20</td><td class="lineno" valign="top"></td></tr>
    1014       <tr><td><a name="diff0071" /></td></tr>
     1046      <tr><td><a name="diff0074" /></td></tr>
    10151047      <tr><td class="lineno" valign="top"></td><td class="lblock">         delta-seconds  <span class="delete">17</span></td><td> </td><td class="rblock">         delta-seconds  <span class="insert">18</span></td><td class="lineno" valign="top"></td></tr>
    10161048      <tr><td class="lineno" valign="top"></td><td class="lblock">         Expires  <span class="delete">23</span></td><td> </td><td class="rblock">         Expires  <span class="insert">24</span></td><td class="lineno" valign="top"></td></tr>
     
    10341066      <tr><td class="lineno" valign="top"></td><td class="left">         Age  17</td><td> </td><td class="right">         Age  17</td><td class="lineno" valign="top"></td></tr>
    10351067      <tr><td class="lineno" valign="top"></td><td class="left">         Cache-Control  18</td><td> </td><td class="right">         Cache-Control  18</td><td class="lineno" valign="top"></td></tr>
    1036       <tr><td><a name="diff0072" /></td></tr>
     1068      <tr><td><a name="diff0075" /></td></tr>
    10371069      <tr><td class="lineno" valign="top"></td><td class="lblock">         Expires  <span class="delete">23</span></td><td> </td><td class="rblock">         Expires  24</td><td class="lineno" valign="top"></td></tr>
    10381070      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">         Pragma</span>  24</td><td> </td><td class="rblock">         <span class="insert">Pragma  25</span></td><td class="lineno" valign="top"></td></tr>
     
    10471079      <tr><td class="lineno" valign="top"></td><td class="left">         Cache Directive  19</td><td> </td><td class="right">         Cache Directive  19</td><td class="lineno" valign="top"></td></tr>
    10481080      <tr><td class="lineno" valign="top"></td><td class="left">      min-fresh</td><td> </td><td class="right">      min-fresh</td><td class="lineno" valign="top"></td></tr>
    1049       <tr><td><a name="diff0073" /></td></tr>
     1081      <tr><td><a name="diff0076" /></td></tr>
    10501082      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  <span class="delete">19</span></td><td> </td><td class="rblock">         Cache Directive  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    10511083      <tr><td class="lineno" valign="top"></td><td class="left">      must-revalidate</td><td> </td><td class="right">      must-revalidate</td><td class="lineno" valign="top"></td></tr>
    1052       <tr><td><a name="diff0074" /></td></tr>
     1084      <tr><td><a name="diff0077" /></td></tr>
    10531085      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">1</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">2</span></td><td class="lineno" valign="top"></td></tr>
    10541086      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10551087      <tr><td class="lineno" valign="top"></td><td class="left">   N</td><td> </td><td class="right">   N</td><td class="lineno" valign="top"></td></tr>
    10561088      <tr><td class="lineno" valign="top"></td><td class="left">      no-cache</td><td> </td><td class="right">      no-cache</td><td class="lineno" valign="top"></td></tr>
    1057       <tr><td><a name="diff0075" /></td></tr>
     1089      <tr><td><a name="diff0078" /></td></tr>
    10581090      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  1<span class="delete">8</span>, 21</td><td> </td><td class="rblock">         Cache Directive  1<span class="insert">9</span>, 21</td><td class="lineno" valign="top"></td></tr>
    10591091      <tr><td class="lineno" valign="top"></td><td class="left">      no-store</td><td> </td><td class="right">      no-store</td><td class="lineno" valign="top"></td></tr>
    1060       <tr><td><a name="diff0076" /></td></tr>
     1092      <tr><td><a name="diff0079" /></td></tr>
    10611093      <tr><td class="lineno" valign="top"></td><td class="lblock">         <span class="delete">Cache Directive  18, 21</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    10621094      <tr><td class="lineno" valign="top"></td><td class="lblock"><span class="delete">      no-transform</span></td><td> </td><td class="rblock"></td><td class="lineno" valign="top"></td></tr>
    10631095      <tr><td class="lineno" valign="top"></td><td class="left">         Cache Directive  19, 22</td><td> </td><td class="right">         Cache Directive  19, 22</td><td class="lineno" valign="top"></td></tr>
    1064       <tr><td><a name="diff0077" /></td></tr>
     1096      <tr><td><a name="diff0080" /></td></tr>
    10651097      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock">      <span class="insert">no-transform</span></td><td class="lineno" valign="top"></td></tr>
    10661098      <tr><td class="lineno" valign="top"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">         Cache Directive  20, 23</span></td><td class="lineno" valign="top"></td></tr>
     
    10681100      <tr><td class="lineno" valign="top"></td><td class="left">   O</td><td> </td><td class="right">   O</td><td class="lineno" valign="top"></td></tr>
    10691101      <tr><td class="lineno" valign="top"></td><td class="left">      only-if-cached</td><td> </td><td class="right">      only-if-cached</td><td class="lineno" valign="top"></td></tr>
    1070       <tr><td><a name="diff0078" /></td></tr>
     1102      <tr><td><a name="diff0081" /></td></tr>
    10711103      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  <span class="delete">19</span></td><td> </td><td class="rblock">         Cache Directive  <span class="insert">20</span></td><td class="lineno" valign="top"></td></tr>
    10721104      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10731105      <tr><td class="lineno" valign="top"></td><td class="left">   P</td><td> </td><td class="right">   P</td><td class="lineno" valign="top"></td></tr>
    1074       <tr><td><a name="diff0079" /></td></tr>
     1106      <tr><td><a name="diff0082" /></td></tr>
    10751107      <tr><td class="lineno" valign="top"></td><td class="lblock">      Pragma header  2<span class="delete">4</span></td><td> </td><td class="rblock">      Pragma header  2<span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    10761108      <tr><td class="lineno" valign="top"></td><td class="left">      private</td><td> </td><td class="right">      private</td><td class="lineno" valign="top"></td></tr>
    1077       <tr><td><a name="diff0080" /></td></tr>
     1109      <tr><td><a name="diff0083" /></td></tr>
    10781110      <tr><td class="lineno" valign="top"></td><td class="lblock">         Cache Directive  2<span class="delete">0</span></td><td> </td><td class="rblock">         Cache Directive  2<span class="insert">1</span></td><td class="lineno" valign="top"></td></tr>
    10791111      <tr><td class="lineno" valign="top"></td><td class="left">      proxy-revalidate</td><td> </td><td class="right">      proxy-revalidate</td><td class="lineno" valign="top"></td></tr>
     
    10891121      <tr><td class="lineno" valign="top"></td><td class="left">   V</td><td> </td><td class="right">   V</td><td class="lineno" valign="top"></td></tr>
    10901122      <tr><td class="lineno" valign="top"></td><td class="left">      validator  6</td><td> </td><td class="right">      validator  6</td><td class="lineno" valign="top"></td></tr>
    1091       <tr><td><a name="diff0081" /></td></tr>
     1123      <tr><td><a name="diff0084" /></td></tr>
    10921124      <tr><td class="lineno" valign="top"></td><td class="lblock">      Vary header  2<span class="delete">4</span></td><td> </td><td class="rblock">      Vary header  2<span class="insert">5</span></td><td class="lineno" valign="top"></td></tr>
    10931125      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    10941126      <tr><td class="lineno" valign="top"></td><td class="left">   W</td><td> </td><td class="right">   W</td><td class="lineno" valign="top"></td></tr>
    1095       <tr><td><a name="diff0082" /></td></tr>
     1127      <tr><td><a name="diff0085" /></td></tr>
    10961128      <tr><td class="lineno" valign="top"></td><td class="lblock">      Warning header  2<span class="delete">5</span></td><td> </td><td class="rblock">      Warning header  2<span class="insert">6</span></td><td class="lineno" valign="top"></td></tr>
    10971129      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    11061138      <tr><td class="lineno" valign="top"></td><td class="left">   Phone: +1-949-706-5300</td><td> </td><td class="right">   Phone: +1-949-706-5300</td><td class="lineno" valign="top"></td></tr>
    11071139      <tr><td class="lineno" valign="top"></td><td class="left">   Fax:   +1-949-706-5305</td><td> </td><td class="right">   Fax:   +1-949-706-5305</td><td class="lineno" valign="top"></td></tr>
    1108       <tr><td><a name="diff0083" /></td></tr>
     1140      <tr><td><a name="diff0086" /></td></tr>
    11091141      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: fielding@gbiv.com</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: fielding@gbiv.com</td><td class="lineno" valign="top"></td></tr>
    11101142      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://roy.gbiv.com/</td><td> </td><td class="right">   URI:   http://roy.gbiv.com/</td><td class="lineno" valign="top"></td></tr>
    11111143      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    11121144      <tr><td class="lineno" valign="top"></td><td class="left">   Jim Gettys</td><td> </td><td class="right">   Jim Gettys</td><td class="lineno" valign="top"></td></tr>
    1113       <tr><td><a name="diff0084" /></td></tr>
     1145      <tr><td><a name="diff0087" /></td></tr>
    11141146      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">One Laptop per Child</span></td><td> </td><td class="rblock">   <span class="insert">Alcatel-Lucent Bell Labs</span></td><td class="lineno" valign="top"></td></tr>
    11151147      <tr><td class="lineno" valign="top"></td><td class="left">   21 Oak Knoll Road</td><td> </td><td class="right">   21 Oak Knoll Road</td><td class="lineno" valign="top"></td></tr>
     
    11171149      <tr><td class="lineno" valign="top"></td><td class="left">   USA</td><td> </td><td class="right">   USA</td><td class="lineno" valign="top"></td></tr>
    11181150      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1119       <tr><td><a name="diff0085" /></td></tr>
     1151      <tr><td><a name="diff0088" /></td></tr>
    11201152      <tr><td class="lineno" valign="top"></td><td class="lblock">   <span class="delete">Email: jg@laptop.org</span></td><td> </td><td class="rblock">   <span class="insert">EMail: jg@freedesktop.org</span></td><td class="lineno" valign="top"></td></tr>
    11211153      <tr><td class="lineno" valign="top"></td><td class="lblock">   URI:   <span class="delete">http://www.laptop.org/</span></td><td> </td><td class="rblock">   URI:   <span class="insert">http://gettys.wordpress.com/</span></td><td class="lineno" valign="top"></td></tr>
     
    11271159      <tr><td class="lineno" valign="top"></td><td class="left">   USA</td><td> </td><td class="right">   USA</td><td class="lineno" valign="top"></td></tr>
    11281160      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1129       <tr><td><a name="diff0086" /></td></tr>
     1161      <tr><td><a name="diff0089" /></td></tr>
    11301162      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: JeffMogul@acm.org</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: JeffMogul@acm.org</td><td class="lineno" valign="top"></td></tr>
    11311163      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    11361168      <tr><td class="lineno" valign="top"></td><td class="left">   USA</td><td> </td><td class="right">   USA</td><td class="lineno" valign="top"></td></tr>
    11371169      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1138       <tr><td><a name="diff0087" /></td></tr>
     1170      <tr><td><a name="diff0090" /></td></tr>
    11391171      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: henrikn@microsoft.com</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: henrikn@microsoft.com</td><td class="lineno" valign="top"></td></tr>
    11401172      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    11451177      <tr><td class="lineno" valign="top"></td><td class="left">   USA</td><td> </td><td class="right">   USA</td><td class="lineno" valign="top"></td></tr>
    11461178      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1147       <tr><td><a name="diff0088" /></td></tr>
     1179      <tr><td><a name="diff0091" /></td></tr>
    11481180      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: LMM@acm.org</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: LMM@acm.org</td><td class="lineno" valign="top"></td></tr>
    11491181      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://larry.masinter.net/</td><td> </td><td class="right">   URI:   http://larry.masinter.net/</td><td class="lineno" valign="top"></td></tr>
     
    11541186      <tr><td class="lineno" valign="top"></td><td class="left">   Redmond, WA  98052</td><td> </td><td class="right">   Redmond, WA  98052</td><td class="lineno" valign="top"></td></tr>
    11551187      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1156       <tr><td><a name="diff0089" /></td></tr>
     1188      <tr><td><a name="diff0092" /></td></tr>
    11571189      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: paulle@microsoft.com</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: paulle@microsoft.com</td><td class="lineno" valign="top"></td></tr>
    11581190      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
     
    11651197      <tr><td class="lineno" valign="top"></td><td class="left">   USA</td><td> </td><td class="right">   USA</td><td class="lineno" valign="top"></td></tr>
    11661198      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1167       <tr><td><a name="diff0090" /></td></tr>
     1199      <tr><td><a name="diff0093" /></td></tr>
    11681200      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: timbl@w3.org</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: timbl@w3.org</td><td class="lineno" valign="top"></td></tr>
    11691201      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://www.w3.org/People/Berners-Lee/</td><td> </td><td class="right">   URI:   http://www.w3.org/People/Berners-Lee/</td><td class="lineno" valign="top"></td></tr>
     
    11751207      <tr><td class="lineno" valign="top"></td><td class="left">   France</td><td> </td><td class="right">   France</td><td class="lineno" valign="top"></td></tr>
    11761208      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1177       <tr><td><a name="diff0091" /></td></tr>
     1209      <tr><td><a name="diff0094" /></td></tr>
    11781210      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: ylafon@w3.org</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: ylafon@w3.org</td><td class="lineno" valign="top"></td></tr>
    11791211      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://www.raubacapeu.net/people/yves/</td><td> </td><td class="right">   URI:   http://www.raubacapeu.net/people/yves/</td><td class="lineno" valign="top"></td></tr>
     
    11811213      <tr><td class="lineno" valign="top"></td><td class="left">   Mark Nottingham (editor)</td><td> </td><td class="right">   Mark Nottingham (editor)</td><td class="lineno" valign="top"></td></tr>
    11821214      <tr><td class="lineno" valign="top"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno" valign="top"></td></tr>
    1183       <tr><td><a name="diff0092" /></td></tr>
     1215      <tr><td><a name="diff0095" /></td></tr>
    11841216      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: mnot@mnot.net</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: mnot@mnot.net</td><td class="lineno" valign="top"></td></tr>
    11851217      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://www.mnot.net/</td><td> </td><td class="right">   URI:   http://www.mnot.net/</td><td class="lineno" valign="top"></td></tr>
     
    11931225      <tr><td class="lineno" valign="top"></td><td class="left">   Phone: +49 251 2807760</td><td> </td><td class="right">   Phone: +49 251 2807760</td><td class="lineno" valign="top"></td></tr>
    11941226      <tr><td class="lineno" valign="top"></td><td class="left">   Fax:   +49 251 2807761</td><td> </td><td class="right">   Fax:   +49 251 2807761</td><td class="lineno" valign="top"></td></tr>
    1195       <tr><td><a name="diff0093" /></td></tr>
     1227      <tr><td><a name="diff0096" /></td></tr>
    11961228      <tr><td class="lineno" valign="top"></td><td class="lblock">   E<span class="delete">m</span>ail: julian.reschke@greenbytes.de</td><td> </td><td class="rblock">   E<span class="insert">M</span>ail: julian.reschke@greenbytes.de</td><td class="lineno" valign="top"></td></tr>
    11971229      <tr><td class="lineno" valign="top"></td><td class="left">   URI:   http://greenbytes.de/tech/webdav/</td><td> </td><td class="right">   URI:   http://greenbytes.de/tech/webdav/</td><td class="lineno" valign="top"></td></tr>
    11981230
    11991231     <tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
    1200      <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 93 change blocks.&nbsp;</a></th></tr>
    1201      <tr class="stats"><td></td><th><i>204 lines changed or deleted</i></th><th><i> </i></th><th><i>308 lines changed or added</i></th><td></td></tr>
     1232     <tr bgcolor="gray"><th colspan="5" align="center"><a name="end">&nbsp;End of changes. 96 change blocks.&nbsp;</a></th></tr>
     1233     <tr class="stats"><td></td><th><i>209 lines changed or deleted</i></th><th><i> </i></th><th><i>313 lines changed or added</i></th><td></td></tr>
    12021234     <tr><td colspan="5" align="center" class="small"><br/>This html diff was produced by rfcdiff 1.38. The latest version is available from <a href="http://www.tools.ietf.org/tools/rfcdiff/" >http://tools.ietf.org/tools/rfcdiff/</a> </td></tr>
    12031235   </table>
Note: See TracChangeset for help on using the changeset viewer.