Merge branch 'master' into 201807192239-rephrase-successful-processing

quicwg · Jul 24, 2018 · e7e3ab6 · e7e3ab6
2 parents edd98c6 + d04fed4
commit e7e3ab6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/draft-ietf-quic-qpack.md b/draft-ietf-quic-qpack.md
@@ -294,8 +294,8 @@ track the decoder's state.  These events are:
 - Receipt of new dynamic table entries
 
 Regardless of whether a header block contained blocking references, the
-knowledge that it has been processed permits the encoder to avoid
-evicting entries while references remain outstanding; see {{blocked-eviction}}.
+knowledge that it has been processed permits the encoder to evict
+entries to which no unacknowledged references remain; see {{blocked-eviction}}.
 When a stream is reset or abandoned, the indication that these header blocks
 will never be processed serves a similar function; see {{stream-cancellation}}.
 

diff --git a/draft-ietf-quic-recovery.md b/draft-ietf-quic-recovery.md
@@ -1107,7 +1107,7 @@ detected. Starts a new recovery period and reduces the congestion window.
      // is larger than the end of the previous recovery epoch.
      if (!InRecovery(packet_number)):
        end_of_recovery = largest_sent_packet
-       congestion_window *= kMarkReductionFactor
+       congestion_window *= kLossReductionFactor
        congestion_window = max(congestion_window, kMinimumWindow)
 ~~~
 

diff --git a/draft-ietf-quic-transport.md b/draft-ietf-quic-transport.md
@@ -2193,11 +2193,11 @@ While multiple paths might be used during connection migration, a single
 congestion control context and a single loss recovery context (as described in
 {{QUIC-RECOVERY}}) may be adequate.  A sender can make exceptions for probe
 packets so that their loss detection is independent and does not unduly cause
-the congestion controller to reduce its sending rate.  An endpoint might arm a
-separate alarm when a PATH_CHALLENGE is sent, which is disarmed when the
-corresponding PATH_RESPONSE is received.  If the alarm fires before the
+the congestion controller to reduce its sending rate.  An endpoint might set a
+separate timer when a PATH_CHALLENGE is sent, which is cancelled when the
+corresponding PATH_RESPONSE is received.  If the timer fires before the
 PATH_RESPONSE is received, the endpoint might send a new PATH_CHALLENGE, and
-restart the alarm for a longer period of time.
+restart the timer for a longer period of time.
 
 
 ### Privacy Implications of Connection Migration {#migration-linkability}
@@ -4558,7 +4558,7 @@ CRYPTO_ERROR (0x1XX):
 : The cryptographic handshake failed.  A range of 256 values is reserved for
   carrying error codes specific to the cryptographic handshake that is used.
   Codes for errors occuring when TLS is used for the crypto handshake are
-  defined in Section 11 of {{QUIC-TLS}}.
+  described in Section 4.8 of {{QUIC-TLS}}.
 
 See {{iana-error-codes}} for details of registering new error codes.