From f44e455e17fdbe6a0efd1df179825d23b4df3a57 Mon Sep 17 00:00:00 2001
From: Meghan Stewart <33289333+mestew@users.noreply.github.com>
Date: Thu, 24 Aug 2023 09:20:36 -0700
Subject: [PATCH 1/4] test suffix
---
windows/deployment/update/deployment-service-feature-updates.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/deployment/update/deployment-service-feature-updates.md b/windows/deployment/update/deployment-service-feature-updates.md
index c5cab745c1..f3b7b2340d 100644
--- a/windows/deployment/update/deployment-service-feature-updates.md
+++ b/windows/deployment/update/deployment-service-feature-updates.md
@@ -1,6 +1,6 @@
---
title: Deploy feature updates
-titlesuffix: Windows Update for Business deployment service
+titlesuffix: ""
description: Use Windows Update for Business deployment service to deploy feature updates to devices in your organization.
ms.prod: windows-client
ms.technology: itpro-updates
From 0f9111e56df4c35c95251d048d53ee705ec32b1a Mon Sep 17 00:00:00 2001
From: Meghan Stewart <33289333+mestew@users.noreply.github.com>
Date: Mon, 28 Aug 2023 11:45:43 -0700
Subject: [PATCH 2/4] update suffix meta
---
windows/deployment/update/deployment-service-drivers.md | 2 +-
.../deployment/update/deployment-service-expedited-updates.md | 2 +-
windows/deployment/update/deployment-service-feature-updates.md | 2 +-
windows/deployment/update/deployment-service-overview.md | 2 +-
windows/deployment/update/deployment-service-prerequisites.md | 2 +-
windows/deployment/update/deployment-service-troubleshoot.md | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/windows/deployment/update/deployment-service-drivers.md b/windows/deployment/update/deployment-service-drivers.md
index 40235bc9bf..39d270bf63 100644
--- a/windows/deployment/update/deployment-service-drivers.md
+++ b/windows/deployment/update/deployment-service-drivers.md
@@ -1,6 +1,6 @@
---
title: Deploy drivers and firmware updates
-titlesuffix: Windows Update for Business deployment service
+titleSuffix: Windows Update for Business deployment service
description: Use Windows Update for Business deployment service to deploy driver and firmware updates to devices.
ms.prod: windows-client
ms.technology: itpro-updates
diff --git a/windows/deployment/update/deployment-service-expedited-updates.md b/windows/deployment/update/deployment-service-expedited-updates.md
index ece5c1e592..dfa61b9776 100644
--- a/windows/deployment/update/deployment-service-expedited-updates.md
+++ b/windows/deployment/update/deployment-service-expedited-updates.md
@@ -1,6 +1,6 @@
---
title: Deploy expedited updates
-titlesuffix: Windows Update for Business deployment service
+titleSuffix: Windows Update for Business deployment service
description: Learn how to use Windows Update for Business deployment service to deploy expedited updates to devices in your organization.
ms.prod: windows-client
ms.technology: itpro-updates
diff --git a/windows/deployment/update/deployment-service-feature-updates.md b/windows/deployment/update/deployment-service-feature-updates.md
index f3b7b2340d..61ed9e5d63 100644
--- a/windows/deployment/update/deployment-service-feature-updates.md
+++ b/windows/deployment/update/deployment-service-feature-updates.md
@@ -1,6 +1,6 @@
---
title: Deploy feature updates
-titlesuffix: ""
+titleSuffix: Windows Update for Business deployment service
description: Use Windows Update for Business deployment service to deploy feature updates to devices in your organization.
ms.prod: windows-client
ms.technology: itpro-updates
diff --git a/windows/deployment/update/deployment-service-overview.md b/windows/deployment/update/deployment-service-overview.md
index b56ef4dffb..58d36aae43 100644
--- a/windows/deployment/update/deployment-service-overview.md
+++ b/windows/deployment/update/deployment-service-overview.md
@@ -1,6 +1,6 @@
---
title: Overview of the deployment service
-titlesuffix: Windows Update for Business deployment service
+titleSuffix: Windows Update for Business deployment service
description: Overview of deployment service to control approval, scheduling, and safeguarding of Windows updates with the deployment service.
ms.prod: windows-client
ms.technology: itpro-updates
diff --git a/windows/deployment/update/deployment-service-prerequisites.md b/windows/deployment/update/deployment-service-prerequisites.md
index c75475842c..de71ad0223 100644
--- a/windows/deployment/update/deployment-service-prerequisites.md
+++ b/windows/deployment/update/deployment-service-prerequisites.md
@@ -1,6 +1,6 @@
---
title: Prerequisites for the deployment service
-titlesuffix: Windows Update for Business deployment service
+titleSuffix: Windows Update for Business deployment service
description: Prerequisites for using the Windows Update for Business deployment service for updating devices in your organization.
ms.prod: windows-client
ms.technology: itpro-updates
diff --git a/windows/deployment/update/deployment-service-troubleshoot.md b/windows/deployment/update/deployment-service-troubleshoot.md
index 836eba7c18..2d4052bbba 100644
--- a/windows/deployment/update/deployment-service-troubleshoot.md
+++ b/windows/deployment/update/deployment-service-troubleshoot.md
@@ -1,6 +1,6 @@
---
title: Troubleshoot the deployment service
-titlesuffix: Windows Update for Business deployment service
+titleSuffix: Windows Update for Business deployment service
description: Solutions to commonly encountered problems when using the Windows Update for Business deployment service.
ms.prod: windows-client
ms.technology: itpro-updates
From 20dded1df6dd13129965b53ee8d01655dc695059 Mon Sep 17 00:00:00 2001
From: Vinay Pamnani <37223378+vinaypamnani-msft@users.noreply.github.com>
Date: Mon, 28 Aug 2023 14:48:49 -0400
Subject: [PATCH 3/4] Update AllowOptionalContent policy
---
.../mdm/policy-csp-update.md | 123 +++++++++---------
1 file changed, 62 insertions(+), 61 deletions(-)
diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md
index 3ec573368b..cf9c04b176 100644
--- a/windows/client-management/mdm/policy-csp-update.md
+++ b/windows/client-management/mdm/policy-csp-update.md
@@ -4,7 +4,7 @@ description: Learn more about the Update Area in Policy CSP.
author: vinaypamnani-msft
manager: aaroncz
ms.author: vinpa
-ms.date: 08/10/2023
+ms.date: 08/28/2023
ms.localizationpriority: medium
ms.prod: windows-client
ms.technology: itpro-manage
@@ -25,11 +25,11 @@ ms.topic: reference
Update CSP policies are listed below based on the group policy area:
- [Windows Insider Preview](#windows-insider-preview)
- - [AllowOptionalContent](#allowoptionalcontent)
- [ConfigureDeadlineNoAutoRebootForFeatureUpdates](#configuredeadlinenoautorebootforfeatureupdates)
- [ConfigureDeadlineNoAutoRebootForQualityUpdates](#configuredeadlinenoautorebootforqualityupdates)
- [Manage updates offered from Windows Update](#manage-updates-offered-from-windows-update)
- [AllowNonMicrosoftSignedUpdate](#allownonmicrosoftsignedupdate)
+ - [AllowOptionalContent](#allowoptionalcontent)
- [AutomaticMaintenanceWakeUp](#automaticmaintenancewakeup)
- [BranchReadinessLevel](#branchreadinesslevel)
- [DeferFeatureUpdatesPeriodInDays](#deferfeatureupdatesperiodindays)
@@ -107,65 +107,6 @@ Update CSP policies are listed below based on the group policy area:
## Windows Insider Preview
-
-### AllowOptionalContent
-
-
-| Scope | Editions | Applicable OS |
-|:--|:--|:--|
-| ✅ Device
❌ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
-
-
-
-```Device
-./Device/Vendor/MSFT/Policy/Config/Update/AllowOptionalContent
-```
-
-
-
-
-This policy enables devices to get offered optional updates and users interact with the 'Get the latest updates as soon as they're available' toggle on the Windows Update Settings page.
-
-
-
-
-
-
-
-**Description framework properties**:
-
-| Property name | Property value |
-|:--|:--|
-| Format | `int` |
-| Access Type | Add, Delete, Get, Replace |
-| Default Value | 0 |
-
-
-
-**Allowed values**:
-
-| Value | Description |
-|:--|:--|
-| 0 (Default) | Device doesn't receive optional updates. |
-| 1 | Device receives optional updates and user can install from WU Settings page. |
-| 2 | Device receives optional updates and install them as soon as they're available. |
-
-
-
-**Group policy mapping**:
-
-| Name | Value |
-|:--|:--|
-| Name | AllowOptionalContent |
-| Path | WindowsUpdate > AT > WindowsComponents > WindowsUpdateCat |
-
-
-
-
-
-
-
-
### ConfigureDeadlineNoAutoRebootForFeatureUpdates
@@ -335,6 +276,66 @@ Allows the IT admin to manage whether Automatic Updates accepts updates signed b
+
+### AllowOptionalContent
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device
❌ User | ✅ Pro
✅ Enterprise
✅ Education
✅ Windows SE
✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 11, version 22H2 [10.0.22621] and later |
+
+
+
+```Device
+./Device/Vendor/MSFT/Policy/Config/Update/AllowOptionalContent
+```
+
+
+
+
+This policy enables devices to get offered optional updates and users interact with the 'Get the latest updates as soon as they're available' toggle on the Windows Update Settings page.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+| Default Value | 0 |
+
+
+
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 (Default) | Don't receive optional updates. |
+| 1 | Automatically receive optional updates (including CFRs). |
+| 2 | Automatically receive optional updates. |
+| 3 | Users can select which optional updates to receive. |
+
+
+
+**Group policy mapping**:
+
+| Name | Value |
+|:--|:--|
+| Name | AllowOptionalContent |
+| Path | WindowsUpdate > AT > WindowsComponents > WindowsUpdateCat |
+
+
+
+
+
+
+
+
### AutomaticMaintenanceWakeUp
From d63de69b85e7377723a0af8ded8d29c37c2b42c7 Mon Sep 17 00:00:00 2001
From: Harman Thind <63820404+hathin@users.noreply.github.com>
Date: Mon, 28 Aug 2023 12:19:59 -0700
Subject: [PATCH 4/4] Update windows-autopatch-exclude-device.md
Device action in UI reads 'restore excluded device' not 'restore device'
---
.../operate/windows-autopatch-exclude-device.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/deployment/windows-autopatch/operate/windows-autopatch-exclude-device.md b/windows/deployment/windows-autopatch/operate/windows-autopatch-exclude-device.md
index e3b0793469..c41dd12e0c 100644
--- a/windows/deployment/windows-autopatch/operate/windows-autopatch-exclude-device.md
+++ b/windows/deployment/windows-autopatch/operate/windows-autopatch-exclude-device.md
@@ -53,4 +53,4 @@ You can view the excluded devices in the **Not registered** tab to make it easie
1. Select **Windows Autopatch** in the left navigation menu.
1. Select **Devices**.
1. In the **Not registered** tab, select the device(s) you want to restore.
-1. Once a device or multiple devices are selected, select **Device actions**. Then, select **Restore device**.
+1. Once a device or multiple devices are selected, select **Device actions**. Then, select **Restore excluded device**.