Merge branch 'main' into do_docs

windows/deployment/TOC.yml

@@ -13,6 +13,8 @@
           href: update/release-cycle.md
         - name: Basics of Windows updates, channels, and tools
           href: update/get-started-updates-channels-tools.md
+        - name: Defining Windows update-managed devices
+          href: update/update-managed-unmanaged-devices.md
         - name: Prepare servicing strategy for Windows client updates
           href: update/waas-servicing-strategy-windows-10-updates.md
         - name: Deployment proof of concept
@@ -113,7 +115,7 @@
             - name: Deploy updates with Group Policy
               href: update/waas-wufb-group-policy.md
             - name: Deploy updates using CSPs and MDM
-              href: update/waas-wufb-csp-mdm.md              
+              href: update/waas-wufb-csp-mdm.md
             - name: Update Windows client media with Dynamic Update
               href: update/media-dynamic-update.md
             - name: Migrating and acquiring optional Windows content
@@ -377,7 +379,7 @@
         - name: Delivery Optimization reference
           href: do/waas-delivery-optimization-reference.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: FoD and language packs for WSUS and Configuration Manager
-          href: update/fod-and-lang-packs.md         
+          href: update/fod-and-lang-packs.md
         - name: Windows client in S mode
           href: s-mode.md
         - name: Switch to Windows client Pro or Enterprise from S mode

windows/deployment/do/mcc-isp.md

@@ -20,7 +20,7 @@ appliesto:
 # Microsoft Connected Cache for Internet Service Providers (early preview)
 
 > [!IMPORTANT]
-> This document is for Microsoft Connected Cache (early preview). Microsoft Connected Cache for ISPs is now in Public Preview - for our early preview customers, we highly encourage you to migrate your cache nodes to our public preview. See [instructions on how to migrate](#migrating-your-mcc-to-public-preview) below.
+> This document is for Microsoft Connected Cache (early preview). Microsoft Connected Cache for ISPs is now in Public Preview - for our early preview customers, we highly encourage you to onboard onto our Public Preview program. For instructions on signing up and onboarding please visit [Operator sign up and service onboarding for Microsoft Connected Cache](mcc-isp-signup.md).
 
 ## Overview
 
@@ -441,6 +441,13 @@ If the test fails, for more information, see the [common issues](#common-issues)
 
 ## Common Issues
 
+### Microsoft Connected Cache is no longer serving traffic
+If you did not migrate your cache node then your cache node may still be on early preview version.
+Microsoft Connected Cache for Internet Service Providers is now in Public Preview! To get started, visit  [Azure portal](https://www.portal.azure.com) to sign up for Microsoft Connected Cache for Internet Service Providers. Please see [Operator sign up and service onboarding for Microsoft Connected Cache](mcc-isp-signup.md) for more information on the requirements for sign up and onboarding.
+<br>
+<br>
+<br>
+
 > [!NOTE]
 > This section only lists common issues. For more information on additional issues you may encounter when configuring IoT Edge, see the [IoT Edge troubleshooting guide](/azure/iot-edge/troubleshoot).
 
@@ -551,19 +558,6 @@ If you have an MCC that's already active and running, follow the steps below to
 
 1. To finish configuring your MCC with BGP routing, continue from Step 10 of [Steps to Install MCC](#steps-to-install-mcc). -->
 
-## Migrating your MCC to Public Preview
-
-> [!NOTE]
-> Please note, if you reboot your server, the version that you are currently on will no longer function, after which you will be required to migrate to the new version.
-
-We recommend migrating now to the new version to access these benefits and ensure no downtime.
-
-To migrate, use the following steps:
-
-1. Navigate to the cache node that you would like to migrate and select **Download Migration Package** using the button at the top of the page.
-1. Follow the instructions under the **Connected Cache Migrate Scripts** section within Azure portal.
-   :::image type="content" source="images/mcc-isp-migrate.png" alt-text="A screenshot of Azure portal showing the migration instructions for migrating a cache node from the early preview to the public preview." lightbox="images/mcc-isp-migrate.png":::
-1. Go to https://portal.azure.com and navigate to your resource to check your migrated cache nodes.
 
 ## Uninstalling MCC
 

windows/deployment/update/update-managed-unmanaged-devices.md

@@ -0,0 +1,71 @@
+---
+title: Defining Windows update-managed devices
+description: This article provides clarity on the terminology and practices involved in managing Windows updates for both managed and unmanaged devices.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: overview
+ms.date: 06/25/2024
+author: mikolding
+ms.author: v-mikolding
+ms.reviewer: mstewart,thtrombl,v-fvalentyna,arcarley
+manager: aaroncz
+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>
+---
+
+# Defining Windows update-managed devices
+
+As an IT administrator, understanding the differences between managed and unmanaged devices is crucial for effective Windows update management. This article provides clarity on the terminology and practices involved in managing Windows updates for both types of devices.
+
+## What are update-managed Windows devices?
+
+Update-managed devices are those where an IT administrator or organization controls Windows updates through a management tool, such as Microsoft Intune, or by directly setting policies. You can directly set policies with group policy objects (GPO), configuration service provider (CSP) policies, or Microsoft Graph.
+
+> [!NOTE]
+> This definition is true even if you directly set registry keys. However, we don't recommended doing this action because registry keys can be easily overwritten.
+
+Managed devices can include desktops, laptops, tablets, servers, and manufacturing equipment. These devices are secured and configured according to your organization's standards and policies.
+
+### IT-managed: Windows update offering
+
+Devices are considered Windows update-managed if you manage the update offering in the following ways:
+
+- You configure policies to manage which updates are offered to the specific device.
+- You set when your organization should receive feature, quality, and driver updates, among others.
+- You use [group policy objects (GPO)](/windows/deployment/update/waas-wufb-group-policy), [configuration service provider (CSP)](/windows/client-management/mdm/policy-csp-update#update-allowupdateservice), or [Microsoft Graph](/windows/deployment/update/deployment-service-overview) to configure these offerings.
+
+### IT-managed: Windows update experience
+
+Devices are considered Windows update-managed if you use policies (GPO, CSP, or Microsoft Graph) to manage device behavior when taking Windows updates.
+
+Examples of controllable device behavior include active hours, update grace periods and deadlines, update notifications, update scheduling, and more. Consult the complete list at [Update Policy CSP](/windows/client-management/mdm/policy-csp-update).
+
+## Examples of update-managed Windows devices
+
+Here are a few examples of update-managed devices:
+
+- **Company-owned devices:** Devices provisioned by your IT department with corporate credentials, configurations, and policies.
+- **Employee-owned devices in BYOD programs:** Personally owned devices that are enrolled in the company's device management system to securely access corporate resources.
+- **Devices provisioned through Windows Autopilot:** Devices that are set up and preconfigured to be business-ready right out of the box.
+- **Mandated security settings:** Devices with health requirements such as device encryption, PIN or strong password, specific inactivity timeout periods, and up-to-date operating systems.
+- **Intune-enrolled devices:** Devices enrolled in Microsoft Intune for network access and enforced security policies.
+- **Third-party managed devices:** Devices enrolled in non-Microsoft management tools with configured Windows update policies via GPO, CSP, or registry key.
+
+## What are update-unmanaged Windows devices?
+
+Unlike update-managed devices, unmanaged devices aren't controlled through policies, management tools, or software. These devices aren't enrolled in tools like Microsoft Intune or Configuration Manager. If you only configure the Settings page to control overall device behavior when taking updates, it's considered an unmanaged device.
+
+> [!NOTE]
+> The term "Microsoft managed devices" used to refer to what we now call "update unmanaged Windows devices." Based on feedback, we have updated our terminology for clarity.
+
+## Examples of update-unmanaged Windows devices
+
+Examples of update-unmanaged devices include:
+
+- **Personal devices:** Devices owned by individuals at your organization that aren't enrolled in any corporate management system.
+- **BYOD devices not enrolled in management programs:** Devices used for work but not part of an organizational bring your own device (BYOD) program.
+- **Peripheral devices:** Devices like printers, IP phones, and uninterruptible power supplies (UPS) that can't accept centrally managed administrative credentials.
+
+For more information on managed and unmanaged devices, see [Secure managed and unmanaged devices](/microsoft-365/business-premium/m365bp-managed-unmanaged-devices).

windows/deployment/update/update-other-microsoft-products.md

@@ -53,6 +53,7 @@ The following is a list of other Microsoft products that might be updated:
 - Microsoft StreamInsight
 - Mobile and IoT
 - MSRC
+- .NET (also known as .NET Core)
 - Office 2016 (MSI versions of Office)
 - PlayReady
 - Security intelligence updates for Microsoft Defender Antivirus and other Microsoft antimalware