Skip to content

Commit

Permalink
Merge pull request #10292 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
Publish main to live 10/04/2024, 3:30 PM
  • Loading branch information
garycentric authored Oct 4, 2024
2 parents 21df154 + 66ddc8c commit e8240df
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions windows/deployment/update/waas-restart.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.localizationpriority: medium
appliesto:
- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
ms.date: 10/10/2023
ms.date: 10/04/2024
---

# Manage device restarts after updates
Expand Down Expand Up @@ -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)
- [Manage Windows 10 and Windows 11 software updates in Intune](/mem/intune/protect/windows-update-for-business-configure)
4 changes: 2 additions & 2 deletions windows/deployment/upgrade/windows-edition-upgrades.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ms.collection:
- highpri
- tier2
ms.subservice: itpro-deploy
ms.date: 10/02/2023
ms.date: 10/04/2024
appliesto:
- ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 10</a>
- ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 11</a>
Expand Down Expand Up @@ -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).
Expand Down
6 changes: 6 additions & 0 deletions windows/security/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit e8240df

Please sign in to comment.