Merge remote-tracking branch 'origin/tsmith/stream-20250212' into tsmith/stream-20250212

tsmith512 · tsmith512 · commit 5ae8a7874400 · 2025-02-13T23:10:04.000-06:00
diff --git a/src/content/docs/stream/stream-live/dvr-for-live.mdx b/src/content/docs/stream/stream-live/dvr-for-live.mdx
@@ -7,13 +7,13 @@ sidebar:
 ---
 
 Stream Live supports "DVR mode" on an opt-in basis to allow viewers to rewind,
-resume, and fast-forward a live broadcast. To enable DVR mode, simply add the
+resume, and fast-forward a live broadcast. To enable DVR mode, add the
 `dvrEnabled=true` query parameter to the Stream Player embed source or the HLS
 manifest URL.
 
 ## Stream Player embed format
 
-``` html title="Stream Player Embed Code"
+``` html title="Stream Player embed code"
 <div style="position: relative; padding-top: 56.25%;">
   <iframe
     src="https://customer-<CODE>.cloudflarestream.com/<INPUT_ID|VIDEO_ID>/iframe?dvrEnabled=true"
@@ -26,15 +26,19 @@ manifest URL.
 
 When DVR mode is enabled the Stream Player will:
 
-- Show a timeline the viwer can scrub/seek, like when watching an on-demand video
+- Show a timeline the viewer can scrub/seek. For example, when watching an on-demand video,
   the timeline will automatically scale to show the growing duration of the broadcast.
 - The "LIVE" indicator will show grey if the viewer is behind the live edge or
   red if they are watching the latest content. Clicking that indicator will jump
   forward to the live edge.
 - If the viewer pauses the player, it will resume playback from that time instead
   of jumping forward to the live edge.
 
+<<<<<<< HEAD
 ## HLS Manifest URL format
+=======
+**HLS Manifest URL format**
+>>>>>>> origin/tsmith/stream-20250212
 
 ``` text title="HLS Manifest"
 https://customer-<CODE>.cloudflarestream.com/<INPUT_ID|VIDEO_ID>/manifest/video.m3u8?dvrEnabled=true
@@ -47,26 +51,27 @@ library for additional information.
 ## Video ID or Input ID
 
 Stream Live allows loading the Player or HLS manifest by Video ID or Live Input
-ID. See [Watch a live stream](/stream/stream-live/watch-live-stream/) for how to
+ID. Refer to [Watch a live stream](/stream/stream-live/watch-live-stream/) for how to
 retrieve these URLs and compare these options. There are additional
 considerations when using DVR mode:
 
-**Recommended:** When using DVR Mode on a Video ID URL:
+**Recommended:** Use DVR Mode on a Video ID URL:
 
 - When the player loads, it will start playing the active broadcast if it is
-  still live, or its recording if the broadcast has concluded.
+  still live or play the recording if the broadcast has concluded.
 
-When using DVR Mode on a Live Input ID URL:
+DVR Mode on a Live Input ID URL:
 
 - When the player loads, it will start playing the currently live broadcast if
-  there is one (see [Live Input Status](/stream/stream-live/watch-live-stream/#live-input-status)).
+  there is one (refer to [Live Input Status](/stream/stream-live/watch-live-stream/#live-input-status)).
 - If the viewer is still watching _after the broadcast ends,_ they can continue
   to watch. However, if the player or manifest is then reloaded, it will show the
   latest broadcast or "Stream has not yet started" (`HTTP 204`). Past broadcasts
   are not available by Live Input ID.
 
 ## Known Limitations
 
+<<<<<<< HEAD
 - When using DVR Mode and a player/manifest created using a Live Input ID, the
   player may stall when trying to switch quality levels if a viewer is still
   watching after a broadcast has concluded.
@@ -75,4 +80,15 @@ When using DVR Mode on a Live Input ID URL:
 - DVR Mode relies on Version 8 of the HLS manifest specification. Stream uses
   HLS Version 6 in all other contexts. HLS v8 offers extremely broad compatibility
   but may not work with certain old player libraries or older devices.
+=======
+- When using DVR Mode and a player/manifest created using a Live Input ID, if a
+  viewer is still watching after a broadcast has concluded, the player may stall
+  when trying to switch quality levels.
+- There is no enforced limit to the maximum duration of a DVR manifest; however,
+  performance may be degraded for DVR manifests longer than three hours.
+- DVR Mode relies on Version 8 of the HLS manifest specification, which is newer
+  than Version 6, which Stream Live and On-Demand currently use. HLS v8 offers
+  extremely broad compatibility but may not work with certain old player libraries
+  or older devices.
+>>>>>>> origin/tsmith/stream-20250212
 - DVR Mode is not available for DASH manifests.
diff --git a/src/content/docs/stream/stream-live/watch-live-stream.mdx b/src/content/docs/stream/stream-live/watch-live-stream.mdx
@@ -27,12 +27,12 @@ happens when a broadcast concludes.
 
 Use a Live Input ID in instances where a player should always show the active
 broadcast, if there is one, or a "Stream has not started" message if the input
-is idle. Best for cases where a page is dedicated to a creator, channel, or
+is idle. This option is best for cases where a page is dedicated to a creator, channel, or
 recurring program. The Live Input ID is provisioned for you when you create the
 input; it will not change.
 
 Use a Video ID in instances where a player should be used to display a single
-broadcast or its recording once the broadcast has conluded. Best for cases where
+broadcast or its recording once the broadcast has concluded. This option is best for cases where
 a page is dedicated to a one-time event, specific episode/occurance, or date.
 There is a _new_ Video ID generated for each broadcast _when it starts._
 
@@ -61,10 +61,10 @@ You can also retrieve the embed code or manifest URLs from Dash or the API.
 To get the Stream built-in player embed code or HLS Manifest URL for a custom player:
 
 1. Log in to your [Cloudflare dashboard](https://dash.cloudflare.com) and select your account.
-2. Click **Stream** > **Live Inputs**.
-3. Click a live input from the list.
+2. Select **Stream** > **Live Inputs**.
+3. Select a live input from the list.
 4. Locate the **Embed** and **HLS Manifest URL** beneath the video.
-5. Determine which option to use and then click **Click to copy** beneath your choice.
+5. Determine which option to use and then select **Click to copy** beneath your choice.
 
 The embed code or manifest URL retrieved in Dash will reference the Live Input ID.
 
diff --git a/src/content/release-notes/stream.yaml b/src/content/release-notes/stream.yaml
@@ -10,7 +10,7 @@ entries:
     description: |-
       Adjustments have been made to the Stream player UI when playing advertisements called by a customer-provided VAST or VMAP `ad-url` argument:
 
-      A small progress bar has been added along the bottom of the player. The shadow behind player controls has been reduced. These changes have been approved for use with Google Ad Exchange.
+      A small progress bar has been added along the bottom of the player, and the shadow behind player controls has been reduced. These changes have been approved for use with Google Ad Exchange.
 
       This only impacts customers using the built-in Stream player and calling their own advertisements; Stream never shows ads by default. For more information, refer to [Using the Stream Player](https://developers.cloudflare.com/stream/viewing-videos/using-the-stream-player/#basic-options).
   - publish_date: "2025-01-30"
