diff --git a/windows/deployment/do/mcc-ent-edu-overview.md b/windows/deployment/do/mcc-ent-edu-overview.md
index 0060028e14..9a7dec5b39 100644
--- a/windows/deployment/do/mcc-ent-edu-overview.md
+++ b/windows/deployment/do/mcc-ent-edu-overview.md
@@ -20,53 +20,70 @@ ms.date: 05/09/2023
> [!IMPORTANT]
> - Microsoft Connected Cache is currently a preview feature. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
-> - As we near the release of public preview, we have paused onboarding. Please continue to submit the form to express interest so we can follow up with you once public preview of Microsoft Connected Cache for Enteprise and Education is available. To register your interest, fill out the form located at [https://aka.ms/MSConnectedCacheSignup](https://aka.ms/MSConnectedCacheSignup).
-Microsoft Connected Cache (MCC) for Enterprise and Education (early preview) is a software-only caching solution that delivers Microsoft content within Enterprise and Education networks. MCC can be deployed to as many Windows servers, bare-metal servers, or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune.
+Microsoft Connected Cache (MCC) for Enterprise and Education (preview) is a software-only caching solution that delivers Microsoft content within Enterprise and Education networks. MCC can be managed from an Azure portal or through Azure CLI and can be deployed to as many Windows devices, Linux devices, or VMs as needed. Managed Windows devices can be configured to download cloud content from a Connected Cache server by applying the client policy using management tools such as Intune.
-Microsoft Connected Cache (MCC) for Enterprise and Education (early preview) is a standalone cache for customers moving towards modern management and away from Configuration Manager distribution points. For information about Microsoft Connected Cache in Configuration Manager (generally available, starting Configuration Manager version 2111), see [Microsoft Connected Cache in Configuration Manager](/mem/configmgr/core/plan-design/hierarchy/microsoft-connected-cache).
+Microsoft Connected Cache (MCC) for Enterprise and Education (preview) is a standalone cache for customers moving towards modern management and away from Configuration Manager distribution points. For information about Microsoft Connected Cache in Configuration Manager (generally available, starting Configuration Manager version 2111), see [Microsoft Connected Cache in Configuration Manager](configmgr/core/plan-design/hierarchy/microsoft-connected-cache).
-## Supported scenarios
+Microsoft Connected Cache deployed directly to Windows relies on [Windows Subsystem for Linux] (windows/wsl/about) and either a [Group Managed Service Account](windows-server/identity/ad-ds/manage/group-managed-service-accounts/group-managed-service-accounts/getting-started-with-group-managed-service-accounts), local user account, or domain user account are required to run WSL. WSL needs to run in a user context and any user, even if the currently logged-in user, could be used to run WSL and Microsoft Connected Cache.
-Connected Cache (early preview) supports the following scenarios:
+### Supported scenarios and deployments
-- Pre-provisioning of devices using Windows Autopilot
-- Cloud-only devices, such as Intune-enrolled devices
+Microsoft Connected Cache for Enterprise and Education (preview) is intended to support the following content delivery scenarios:
+* Pre-provisioning of devices using Windows Autopilot
+* Co-managed clients that get monthly update and Win32 apps from Microsoft Intune. For more information, see Support for Intune Win32 apps.
+* Cloud-only managed devices, such as Intune-enrolled devices without the Configuration Manager client, that get monthly update and Win32 apps from Microsoft Intune. For more information, see Support for cloud-managed devices.
-## Supported content types
+Microsoft Connected Cache is built for flexible deployments to support a number of enterprise configurations:
+##### Branch office
+Customers may have globally dispersed offices that meet the following parameters:
+* 10 – 50 Windows Clients
+* No dedicated server hardware
+* Internet bandwidth is great to limited (satellite internet)
+* Possibly intermittent connectivity
+
+To support the branch the branch office scenario, customers can deploy to a Windows 11 client (see Host machine requirements) device.
+
+##### Large Enterprise
+Customers may have office spaces, data centers, or Azure deployments that meet the following parameters:
+* 100's or 1,000's of Windows devices (client or server).
+* Existing hardware – Decommissioned DP, file server, cloud print server
+* Azure VMs and Azure Virtual Desktop
+* Internet bandwidth is great to limited (T1)
+
+
+### Supported content types
When clients download cloud-managed content, they use Delivery Optimization from the cache server installed on a Windows server or VM. Cloud-managed content includes the following types:
+* Windows updates: Windows feature and quality updates
+* Office Click-to-Run apps: Microsoft 365 Apps and updates
+* Client apps: Intune, store apps, and updates
+* Endpoint protection: Windows Defender definition updates
-- Windows updates: Windows feature and quality updates
-- Office Click-to-Run apps: Microsoft 365 Apps and updates
-- Client apps: Intune, store apps, and updates
-- Endpoint protection: Windows Defender definition updates
+For the full list of content endpoints that Microsoft Connected Cache for Enterprise and Education supports, see [Microsoft Connected Cache content and services endpoints](delivery-optimization-endpoints.md).
-For the full list of content endpoints that Microsoft Connected Cache for Enterprise and Education supports, see [Microsoft Connected Cache content and services endpoints](delivery-optimization-endpoints.md).
+### Hardware or VM Requirements
+See [Host machine requirements](mcc-ent-prerequisites.md) for complete details.
+
+|Deployment Scenarios| Download Speed Range | Download Speeds and Content Volume Delivered in 8 Hours | VM/Hardware Recommendation |
+|---|---|---|---|
+|Branch Office|< 1 Gbps Peak| 500 Mbps - 1,800 GB 250 Mbps - 900 GB 100 Mbps - 360 GB 50 Mbps - 180 GB| 4 Cores Up to 8 GB Memory with 4 GB of Free 100 GB free disk space|
+|Small to Medium Enterprises/Autopilot Provisioning Center - 50 - 500 devices in a single location|1 - 5 Gbps| 5 Gbps - 18,000 GB 3 Gbps - 10,800 GB 1 Gbps - 3,600 GB| 8 Cores Up to 16 GB Memory with 4 GB of Free 500 GB free disk space|
+|Medium to Large Enterprises/Autopilot Provisioning Center - 500 - 5,000 devices|5 - 101 Gbps Peak| 9 Gbps - 32,400 GB 5 Gbps - 18,000 GB 3 Gbps - 10,800 GB| 16 Cores 32 GB Memory with 4 GB of Free 2 200-500 GB SSDs|
+
+
## How it works
-MCC is a hybrid (mix of on-premises and cloud resources) SaaS solution built as an Azure IoT Edge module and Docker compatible Linux container deployed to your Windows devices. The Delivery Optimization team chose IoT Edge for Linux on Windows (EFLOW) as a secure, reliable container management infrastructure. EFLOW is a Linux virtual machine, based on Microsoft's first party CBL-Mariner operating system. It's built with the IoT Edge runtime and validated as a tier 1 supported environment for IoT Edge workloads. MCC is a Linux IoT Edge module running on the Windows Host OS.
-
-1. The Azure Management Portal is used to create MCC nodes.
-1. The MCC container is deployed and provisioned to the server using the installer provided in the portal.
-1. Client policy is set in your management solution to point to the IP address or FQDN of the cache server.
-1. Microsoft end-user devices make range requests for content from the MCC node.
-1. The MCC node pulls content from the CDN, seeds its local cache stored on disk, and delivers the content to the client.
-1. Subsequent requests from end-user devices for content will now come from cache.
-1. If the MCC node is unavailable, the client pulls content from CDN to ensure uninterrupted service for your subscribers.
+1. The Azure management portal for Microsoft Connected Cache or CLI are used to create cache nodes, configure deployments, including unauthenticated proxy settings.
+1. Prepare Windows or Linux devices. If deploying to Windows devices, prepare accounts - gMSA, local user account, domain account. Deploy to Windows or Linux devices using scripts.
+1. The Microsoft Connected Cache container is deployed to the device using Azure IoT Edge container management services and the cache server begins reporting status and metrics to Delivery Optimization services.
+1. The DOCacheHost setting is configured using Intune or other MDM, DHCP custom option, or registry key.
+1. Devices request content from the cache server, the cache server forwards the requests to the CDN and fills the cache, the cache server delivers the content requested to the devices, and uses Peer to Peer (depending on DO Download mode settings) for all DO content.
+1. Devices can fallback to CDN if cache server is unavailable for any reason or use Delivery Optimization delay fallback to http (CDN )settings to prefer the local cache server.
+Customers can view data regarding Microsoft Connected Cache downloads on management portal and Windows Update for Business reports
The following diagram displays an overview of how MCC functions:
-
+
diff --git a/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md b/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md
index 36acc712de..9c264dfe33 100644
--- a/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md
+++ b/windows/deployment/do/mcc-ent-manage-cache-using-CLI.md
@@ -25,7 +25,13 @@ This article outlines how to create, configure, and deploy Microsoft Connected C
## Prerequisites:
1. **Install Azure CLI**: [How to install the Azure CLI](/cli/azure/install-azure-cli)
-1. **Install MCC extension**: [Install the MCC extension.](/cli/azure/azure-cli-extensions-overview#how-to-install-extensions)
+1. **Install MCC extension**: Install MCC extension via the command below
+
+```azurecli-interactive
+az extension add --name mcc
+```
+
+To learn more about installting extensions, visit [Install the MCC extension.](/cli/azure/azure-cli-extensions-overview#how-to-install-extensions)
@@ -67,7 +73,7 @@ The next step is to create a cache node under this resource.
To create a cache node, use `az mcc ent node create`
```azurecli-interactive
-az mcc ent node create --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg --host-os linux
+az mcc ent node create --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg --host-os
```
diff --git a/windows/deployment/do/mcc-ent-monitor-cache.md b/windows/deployment/do/mcc-ent-monitor-cache.md
deleted file mode 100644
index a8eb213e19..0000000000
--- a/windows/deployment/do/mcc-ent-monitor-cache.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-title: MCC for Enterprise monitor cache nodes
-description: Microsoft Connected Cache for Enterprise. Learn about how to monitor cache node.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: how-to
-manager: aaroncz
-ms.author: nidos
-author: doshnid
-ms.reviewer: mstewart
-ms.collection: tier3
-appliesto:
-- ✅ Windows 11
-- ✅ Windows 10
-- ✅ Microsoft Connected Cache for Enterprise
-ms.date: 09/04/2024
----
-
-
-
-
-
-# " * "
-TODO: Add your heading
-
-
-
-TODO: Add your introductory paragraph
-
-
-
-
-
-## Prerequisites
-
-TODO: List the prerequisites
-
-
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-## "\ * \"
-TODO: Add introduction sentence(s)
-[Include a sentence or two to explain only what is needed to complete the procedure.]
-TODO: Add ordered list of procedure steps
-1. Step 1
-1. Step 2
-1. Step 3
-
-
-
-## Next step
-
-TODO: Add your next step link(s)
-
-> [!div class="nextstepaction"]
-> [Write concepts](article-concept.md)
-
-
-
-## Related content
-
-TODO: Add your next step link(s)
-
-- [Write concepts](article-concept.md)
-
-
-
diff --git a/windows/deployment/do/mcc-ent-monitoring.md b/windows/deployment/do/mcc-ent-monitoring.md
index 16d67271c0..4201daea40 100644
--- a/windows/deployment/do/mcc-ent-monitoring.md
+++ b/windows/deployment/do/mcc-ent-monitoring.md
@@ -14,9 +14,9 @@ appliesto:
ms.date: 09/04/2024
---
-# Monitor MCCE cache node usage
+# Monitor MCC cache node usage
-Tracking the status and performance of your MCCE cache node is essential to making sure that you're getting the most out of the service.
+Tracking the status and performance of your MCC cache node is essential to making sure that you're getting the most out of the service.
[!INCLUDE [Get Azure subscription](includes/get-azure-subscription.md)]
-<<<<<<< HEAD
-
-TODO: List the prerequisites
-
-
-
-## "\ * \"
-=======
-
-
-# Troubleshoot Microsoft Connected Cache for Enterprise and Education (MCCE)
-
-
-
-This article contains instructions on how to troubleshoot different issues you may encounter while using MCCE. These issues are categorized by the task in which they may be encountered. For example, this next section covers troubleshooting [MCC Azure resource creation](mcc-ent-create-resource-and-cache.md).
-
## Troubleshooting Azure resource creation
MCC Azure resource creation can be initiated using either the Azure portal or the Azure CLI command set. If you're encountering an error during resource creation, check that you have the necessary RPaaS permissions and have filled out all required fields.
## Troubleshooting cache node creation
->>>>>>> baff7906fe02b76b4a3649d7e6c3acdac9534e66
TODO: Add introduction sentence(s)
[Include a sentence or two to explain only what is needed to complete the procedure.]
TODO: Add ordered list of procedure steps
diff --git a/windows/deployment/do/mcc-ent-uninstall-cache-node.md b/windows/deployment/do/mcc-ent-uninstall-cache-node.md
index 70ca441c4f..88ecc4b0aa 100644
--- a/windows/deployment/do/mcc-ent-uninstall-cache-node.md
+++ b/windows/deployment/do/mcc-ent-uninstall-cache-node.md
@@ -14,18 +14,18 @@ appliesto:
ms.date: 09/27/2024
---
-# Uninstall MCCE caching software from a host machine
+# Uninstall MCC caching software from a host machine
-This article describes how to uninstall Microsoft Connected Cache for Enterprise and Education (MCCE) caching software from a host machine. These steps should be taken after deleting the cache node in the Azure portal.
+This article describes how to uninstall Microsoft Connected Cache for Enterprise and Education (MCC) caching software from a host machine. These steps should be taken after deleting the cache node in the Azure portal.
-## Steps to uninstall MCCE from a Windows host machine
+## Steps to uninstall MCC from a Windows host machine
1. Launch a PowerShell window *as administrator* and navigate to the MCC installation directory (C:\mcconwsl01 by default)
1. Run the `uninstallmcconwsl.ps1` script
-## Steps to uninstall MCCE from a Linux host machine
+## Steps to uninstall MCC from a Linux host machine
-The `uninstallmcc.sh` script within the provisioning package uninstalls the MCCE caching software and all related components, including:
+The `uninstallmcc.sh` script within the provisioning package uninstalls the MCC caching software and all related components, including:
- IoT Edge
- IoT Edge Agent
diff --git a/windows/deployment/do/mcc-ent-update-cache.md b/windows/deployment/do/mcc-ent-update-cache.md
deleted file mode 100644
index 8ffa3c50c7..0000000000
--- a/windows/deployment/do/mcc-ent-update-cache.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: Uninstall MCC for Enterprise and Education
-description: Details on how to uninstall Microsoft Connected Cache (MCC) for Enterprise and Education for your environment.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: how-to
-ms.author: carmenf
-author: cmknox
-manager: aaroncz
-ms.reviewer: mstewart
-ms.collection:
- - tier3
- - must-keep
-appliesto:
-- ✅ Windows 11
-- ✅ Windows 10
-- ✅ Microsoft Connected Cache for Enterprise and Education
-ms.date: 05/23/2024
----
-
-
-# Uninstall MCC
-
-Contact the MCC Team before uninstalling to let us know if you're facing issues.
-
-This script removes the following items:
-
-1. EFLOW + Linux VM
-1. IoT Edge
-1. Edge Agent
-1. Edge Hub
-1. MCC
-1. Moby CLI
-1. Moby Engine
-
-To delete MCC, go to Control Panel \> Uninstall a program \> Select Azure IoT
-Edge LTS \> Uninstall
diff --git a/windows/deployment/do/mcc-ent-verify-cache-node.md b/windows/deployment/do/mcc-ent-verify-cache-node.md
index 28bc2764ff..0b16356433 100644
--- a/windows/deployment/do/mcc-ent-verify-cache-node.md
+++ b/windows/deployment/do/mcc-ent-verify-cache-node.md
@@ -14,15 +14,15 @@ appliesto:
- ✅ Microsoft Connected Cache for Enterprise and Education
---
-# Verify MCCE cache node functionality
+# Verify MCC cache node functionality
-This article describes how to verify that a Microsoft Connected Cache for Enterprise and Education (MCCE) cache node is functioning correctly.
+This article describes how to verify that a Microsoft Connected Cache for Enterprise and Education (MCC) cache node is functioning correctly.
These steps should be taken after deploying MCCE caching software to a [Windows](mcc-ent-deploy-to-windows.md) or [Linux](mcc-ent-deploy-to-linux.md) host machine.
## Steps to verify functionality of MCCE cache node
-1. To verify that the MCCE container on the host machine is running and reachable, run the following command from the host machine:
+1. To verify that the MCC container on the host machine is running and reachable, run the following command from the host machine:
```powershell
wget http://localhost/filestreamingservice/files/7bc846e0-af9c-49be-a03d-bb04428c9bb5/Microsoft.png?cacheHostOrigin=dl.delivery.mp.microsoft.com
@@ -30,13 +30,13 @@ These steps should be taken after deploying MCCE caching software to a [Windows]
If successful, there should be an HTTP response with StatusCode 200.
-1. To verify that Windows clients in your network can reach the MCCE cache node, visit the following address from a web browser on a Windows client device:
+1. To verify that Windows clients in your network can reach the MCC cache node, visit the following address from a web browser on a Windows client device:
`http://[HostMachine-IP-address]/filestreamingservice/files/7bc846e0-af9c-49be-a03d-bb04428c9bb5/Microsoft.png?cacheHostOrigin=dl.delivery.mp.microsoft.com`
If successful, the Windows client device should begin to download a small image file from the MCCE cache node.
-1. To check how much content an individual Windows client has pulled from an MCCE cache node, open the [Delivery Optimization activity monitor](/microsoft-365-apps/updates/delivery-optimization#viewing-data-about-the-use-of-delivery-optimization) on the Windows client device.
+1. To check how much content an individual Windows client has pulled from an MCC cache node, open the [Delivery Optimization activity monitor](/microsoft-365-apps/updates/delivery-optimization#viewing-data-about-the-use-of-delivery-optimization) on the Windows client device.
You should see a donut chart titled Download Statistics. If the Windows client has pulled content from the cache node, you'll see a segment of the donut labeled "From Microsoft cache server".