Merging with Martin's stream state text

Author: MikeBishop

.gitignore

@@ -8,5 +8,6 @@
 .refcache
 venv/
 issues.json
+pulls.json
 lib
 .targets.mk

CONTRIBUTING.md

@@ -77,7 +77,7 @@ Note that whether or not a design issue is closed does **not** reflect consensus
 
 We also use the following labels to help understand the state of our design issues:
 
-* [`needs-discussion`](https://github.com/quicwg/base-drafts/labels/needs-discussion): The issue needs significant Working Group discussion before it can progress.
+* [`needs-discussion`](https://github.com/quicwg/base-drafts/labels/needs-discussion): The issue blocks progress to our next milestone.
 * [`has-proposal`](https://github.com/quicwg/base-drafts/labels/has-proposal): The issue has a proposal for resolution.
 * [`editor-ready`](https://github.com/quicwg/base-drafts/labels/editor-ready): The Working Group believes it has a viable resolution, but the editors need to incorporate that into the document so we can see it in situ.
 

Makefile

@@ -16,7 +16,7 @@ latest::
 	    echo "$$f contains trailing whitespace"; err=1; \
 	  fi; \
 	  if cat "$$f" | (l=0; while read -r a; do l=$$(($$l + 1)); echo -E "$$l:$$a"; done) | \
-	     grep -v '^[0-9]*: *|' | tr -d '\r' | grep '^[0-9]*:.\{81\}'; then \
+	     sed -e '1,/--- abstract/d;/^[0-9]*: *|/d' | tr -d '\r' | grep '^[0-9]*:.\{81\}'; then \
 	    echo "$$f contains a line with >80 characters"; err=1; \
 	  fi; \
 	  if cat "$$f" | (l=0; while read -r a; do l=$$(($$l + 1)); echo -E "$$l:$$a"; done) | \

draft-ietf-quic-recovery.md

@@ -191,7 +191,7 @@ An unacknowledged QUIC packet is marked as lost in one of the following ways:
     unacknowledged packets are marked as lost.
 
   * Instead of a packet threshold to tolerate reordering, a QUIC sender may use
-    a time thresold. This allows for senders to be tolerant of short periods of
+    a time threshold. This allows for senders to be tolerant of short periods of
     significant reordering. In this mechanism, a QUIC sender marks a packet as
     lost when a packet larger than it is acknowledged and a threshold amount of
     time has passed since the packet was sent.
@@ -216,7 +216,7 @@ kReorderingThreshold (default 3):
   considers a packet lost.
 
 kTimeReorderingFraction (default 1/8):
-: Maximum reordering in time sapce before time based loss detection considers
+: Maximum reordering in time space before time based loss detection considers
   a packet lost.  In fraction of an RTT.
 
 kMinTLPTimeout (default 10ms):
@@ -314,7 +314,7 @@ are as follows:
 
 * packet_number: The packet number of the sent packet.
 
-* is_retransmittble: A boolean that indicates whether the packet contains at
+* is_retransmittable: A boolean that indicates whether the packet contains at
   least one frame requiring reliable deliver.  The retransmittability of various
   QUIC frames is described in {{QUIC-TRANSPORT}}.  If false, it is still
   acceptable for an ack to be received for this packet.  However, a caller MUST
@@ -432,10 +432,10 @@ in response to 0RTT packets.
 
 #### Tail Loss Probe and Retransmission Timeout
 
-Tail loss probes {{?I-D.dukkipati-tcpm-tcp-loss-probe}} and retransmission
-timeouts{{?RFC6298}} are an alarm based mechanism to recover from cases when
-there are outstanding retransmittable packets, but an acknowledgement has
-not been received in a timely manner.
+Tail loss probes {{?LOSS-PROBE=I-D.dukkipati-tcpm-tcp-loss-probe}} and
+retransmission timeouts {{?RFC6298}} are an alarm based mechanism to recover
+from cases when there are outstanding retransmittable packets, but an
+acknowledgement has not been received in a timely manner.
 
 #### Early Retransmit
 
@@ -565,7 +565,7 @@ deployed TCP implementations on the internet.  Exceptions follow.
 
 A shorter delayed ack time of 25ms was chosen because longer delayed acks can
 delay loss recovery and for the small number of connections where less than
-packet per 25ms is delievered, acking every packet is beneficial to congestion
+packet per 25ms is delivered, acking every packet is beneficial to congestion
 control and loss recovery.
 
 The default initial RTT of 100ms was chosen because it is slightly higher than
@@ -685,7 +685,7 @@ the first post-RTO acknowledgement is processed.
 ~~~
    OnRetransmissionTimeoutVerified()
      congestion_window = kMinimumWindow
-~~
+~~~
 
 ## Pacing Packets