Merge branch 'main' into me/joining-fetch

Author: ianswett

draft-ietf-moq-transport.md

@@ -2388,16 +2388,13 @@ OBJECT_DATAGRAM_STATUS Message {
 
 ## Streams
 
-When objects are sent on streams, the stream begins with a stream header
-message and is followed by one or more sets of serialized object fields.
-If a stream ends gracefully in the middle of a serialized Object, terminate the
-session with a Protocol Violation.
+When objects are sent on streams, the stream begins with a Stream Header
+Subgroup message and is followed by one or more sets of serialized object fields.
+If a stream ends gracefully in the middle of a serialized Object, the session
+SHOULD be terminated with a Protocol Violation.
 
-A publisher SHOULD NOT open more than one stream at a time with the same stream
-header message type and fields.
-
-
-TODO: figure out how a relay closes these streams
+A publisher SHOULD NOT open more than one stream at a time with the same Stream
+Header Subgroup field values.
 
 
 ### Stream Header Subgroup
@@ -2545,27 +2542,6 @@ The Subgroup ID field of an object with a Forwarding Preference of "Datagram"
 
 ## Examples
 
-Sending a track on one stream:
-
-~~~
-STREAM_HEADER_TRACK {
-  Track Alias = 1
-  Publisher Priority = 0
-}
-{
-  Group ID = 0
-  Object ID = 0
-  Object Payload Length = 4
-  Payload = "abcd"
-}
-{
-  Group ID = 1
-  Object ID = 0
-  Object Payload Length = 4
-  Payload = "efgh"
-}
-~~~
-
 Sending a subgroup on one stream:
 
 ~~~