From 8529085ff524efddf676cfa0cd6331d9fc43af14 Mon Sep 17 00:00:00 2001
From: Frank Rojas <45807133+frankroj@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:45:50 -0400
Subject: [PATCH 1/5] Update broken link
Update broken link
---
windows/deployment/update/waas-restart.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows/deployment/update/waas-restart.md b/windows/deployment/update/waas-restart.md
index 9d859d31c3..46c69eb5b6 100644
--- a/windows/deployment/update/waas-restart.md
+++ b/windows/deployment/update/waas-restart.md
@@ -14,7 +14,7 @@ ms.localizationpriority: medium
appliesto:
- ✅ Windows 11
- ✅ Windows 10
-ms.date: 10/10/2023
+ms.date: 10/04/2024
---
# Manage device restarts after updates
@@ -215,4 +215,4 @@ There are three different registry combinations for controlling restart behavior
- [Configure Windows Update for Business](waas-configure-wufb.md)
- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](/intune/windows-update-for-business-configure)
\ No newline at end of file
+- [Manage Windows 10 and Windows 11 software updates in Intune](/mem/intune/protect/windows-update-for-business-configure)
From 2df6965672618b15cf301293d0ed362c1ac00bda Mon Sep 17 00:00:00 2001
From: Frank Rojas <45807133+frankroj@users.noreply.github.com>
Date: Fri, 4 Oct 2024 16:09:10 -0400
Subject: [PATCH 2/5] Remove bad link
Removed bad link. There is already a second link referring to content so no need to replace the link.
---
windows/deployment/upgrade/windows-edition-upgrades.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows/deployment/upgrade/windows-edition-upgrades.md b/windows/deployment/upgrade/windows-edition-upgrades.md
index f09b8e67cc..b1fc50c67b 100644
--- a/windows/deployment/upgrade/windows-edition-upgrades.md
+++ b/windows/deployment/upgrade/windows-edition-upgrades.md
@@ -11,7 +11,7 @@ ms.collection:
- highpri
- tier2
ms.subservice: itpro-deploy
-ms.date: 10/02/2023
+ms.date: 10/04/2024
appliesto:
- ✅ Windows 10
- ✅ Windows 11
@@ -56,7 +56,7 @@ The following table shows the methods and paths available to change the edition
>
> - Each desktop edition in the table also has an N and KN SKU. These editions have had media-related functionality removed. Devices with N or KN SKUs installed can be upgraded to corresponding N or KN SKUs using the same methods.
>
-> - Edition upgrades via Microsoft Store for Business are no longer available with the retirement of the Microsoft Store for Business. For more information, see [Microsoft Store for Business and Education retiring March 31, 2023](/lifecycle/announcements/microsoft-store-for-business-education-retiring) and [Microsoft Store for Business and Microsoft Store for Education overview](/microsoft-store/microsoft-store-for-business-overview).
+> - Edition upgrades via Microsoft Store for Business are no longer available with the retirement of the Microsoft Store for Business. For more information, see [Microsoft Store for Business and Education retiring March 31, 2023](/lifecycle/announcements/microsoft-store-for-business-education-retiring).
> [!TIP]
> Edition upgrade is also possible using edition upgrade policy in Microsoft Configuration Manager. For more information, see [Upgrade Windows devices to a new edition with Configuration Manager](/mem/configmgr/compliance/deploy-use/upgrade-windows-version).
From 194b82d5a183ddefa9188c8127512f25ea47d2b2 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:13:33 -0400
Subject: [PATCH 3/5] docfx update for security book
---
windows/security/docfx.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/windows/security/docfx.json b/windows/security/docfx.json
index 1a7808e2b1..b2eefb6943 100644
--- a/windows/security/docfx.json
+++ b/windows/security/docfx.json
@@ -101,6 +101,12 @@
"security-foundations/certification/**/*.md": "mike-grimm",
"security-foundations/certification/**/*.yml": "mike-grimm"
},
+ "feedback_system": {
+ "book/*.md": "none"
+ },
+ "hideEdit": {
+ "book/*.md": "true"
+ },
"ms.author": {
"application-security//**/*.md": "vinpa",
"application-security//**/*.yml": "vinpa",
From 34e4612847343aeea4681e56db4b14899d650243 Mon Sep 17 00:00:00 2001
From: Frank Rojas <45807133+frankroj@users.noreply.github.com>
Date: Fri, 4 Oct 2024 18:32:29 -0400
Subject: [PATCH 4/5] Correct TOC entry changing Windows 10 to Windows
---
windows/deployment/TOC.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/deployment/TOC.yml b/windows/deployment/TOC.yml
index 99c636d922..e816d252d7 100644
--- a/windows/deployment/TOC.yml
+++ b/windows/deployment/TOC.yml
@@ -317,7 +317,7 @@ items:
href: configure-a-pxe-server-to-load-windows-pe.md
- name: Windows Deployment Services (WDS) boot.wim support
href: wds-boot-support.md
- - name: Windows ADK for Windows 10 scenarios for IT Pros
+ - name: Windows ADK for Windows scenarios for IT Pros
href: windows-adk-scenarios-for-it-pros.md
- name: User State Migration Tool (USMT) technical reference
items:
From 76b8e94f6182a31c6907a6116794a3eb0814cb36 Mon Sep 17 00:00:00 2001
From: Phil Garcia
Date: Sat, 5 Oct 2024 02:39:45 -0700
Subject: [PATCH 5/5] Update whats-new-do.md
- Vpn to VPN
- Minor improvements
---
windows/deployment/do/whats-new-do.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows/deployment/do/whats-new-do.md b/windows/deployment/do/whats-new-do.md
index 0b167097fa..496d1240c1 100644
--- a/windows/deployment/do/whats-new-do.md
+++ b/windows/deployment/do/whats-new-do.md
@@ -43,8 +43,8 @@ There are two different versions:
### Windows 11 22H2
-- New setting: Customize vpn detection by choosing custom keywords. Now, you don't have to rely on Delivery Optimization keywords to detect your Vpn. By using the new VpnKeywords configuration you can add keywords for Delivery Optimization to use when detecting a Vpn when in use. You can find this configuration **[VPN Keywords](waas-delivery-optimization-reference.md#vpn-keywords)** in Group Policy or MDM under **DOVpnKeywords**.
-- New setting: Use the disallow downloads from a connected cache server, when a Vpn is detected and you want to prevent the download from the connected cache server. You can find this configuration **[Disallow download from MCC over VPN](waas-delivery-optimization-reference.md#disallow-cache-server-downloads-on-vpn) in Group Policy or MDM under **DODisallowCacheServerDownloadsOnVPN**.
+- New setting: Customize VPN detection by choosing custom keywords. Now, you don't have to rely on Delivery Optimization keywords to detect your VPN. By using the new VpnKeywords setting, you can add keywords for Delivery Optimization to use to detect when a VPN is in use. You can find this configuration **[VPN Keywords](waas-delivery-optimization-reference.md#vpn-keywords)** in Group Policy or MDM under **DOVpnKeywords**.
+- New setting: Use the disallow downloads from a connected cache server, when a VPN is detected and you want to prevent the download from the connected cache server. You can find this configuration **[Disallow download from MCC over VPN](waas-delivery-optimization-reference.md#disallow-cache-server-downloads-on-vpn)** in Group Policy or MDM under **DODisallowCacheServerDownloadsOnVPN**.
- Delivery Optimization introduced support for receiver side ledbat (rLEDBAT).
- New setting: Local Peer Discovery, a new option for **[Restrict Peer Selection By](waas-delivery-optimization-reference.md#select-a-method-to-restrict-peer-selection)** in Group Policy or MDM **DORestrictPeerSelectionBy**. This option restricts the discovery of local peers using the DNS-SD protocol. When you set Option 2, Delivery Optimization restricts peer selection to peers that are locally discovered (using DNS-SD).