Merge branch 'main' of https://github.com/cmknox/windows-docs-pr

windows/deployment/do/TOC.yml

@@ -27,10 +27,12 @@
       href: delivery-optimization-test.md
 - name: Microsoft Connected Cache
   items:
-    - name: Microsoft Connected Cache overview
+    - name: What is Microsoft Connected Cache?
       href: waas-microsoft-connected-cache.md
     - name: MCC for Enterprise and Education
       items:
+      - name: MCC for Enterprise and Education Overview
+        href: mcc-ent-edu-overview.md
       - name: Requirements
         href: mcc-enterprise-prerequisites.md
       - name: Deploy Microsoft Connected Cache
@@ -41,6 +43,8 @@
         href: mcc-enterprise-appendix.md
     - name: MCC for ISPs
       items:
+      - name: MCC for ISPs Overview
+        href: mcc-isp-overview.md
       - name: How-to guides
         items:  
         - name: Operator sign up and service onboarding

windows/deployment/do/mcc-ent-edu-overview.md

@@ -0,0 +1,72 @@
+---
+title: MCC for Enterprise and Education Overview
+manager: aaroncz
+description: Overview of Microsoft Connected Cache (MCC) for Enterprise and Education.
+ms.prod: windows-client
+author: amymzhou
+ms.author: amyzhou
+ms.topic: article
+ms.date: 05/09/2023
+ms.technology: itpro-updates
+ms.collection: tier3
+---
+
+# Microsoft Connected Cache for Enterprise and Education Overview
+
+**Applies to**
+
+- Windows 10
+- Windows 11
+
+> [!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/).
+> - We're still accepting Enterprise and Education customers to join the early preview. To register your interest, fill out the survey 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 (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).
+
+## Supported scenarios
+
+Connected Cache (early preview) supports the following scenarios:
+
+- Pre-provisioning of devices using Windows Autopilot
+- Cloud-only devices, such as Intune-enrolled devices
+
+## 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 Update for Business: Windows feature and quality updates
+- Office Click-to-Run apps: Microsoft 365 Apps and updates
+- Client apps: Microsoft 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).
+
+## 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.
+
+The following diagram displays an overview of how MCC functions:
+
+:::image type="content" source="./images/waas-mcc-diag-overview.png" alt-text="Diagram displaying the components of MCC." lightbox="./images/waas-mcc-diag-overview.png":::
+
+## IoT Edge
+
+Even though your MCC scenario isn't related to IoT, Azure IoT Edge is used as a more generic Linux container deployment and management infrastructure. The Azure IoT Edge runtime sits on your designated MCC device and performs management and communication operations. The runtime performs several functions important to manage MCC on your edge device:
+
+1. Installs and updates MCC on your edge device.
+1. Maintains Azure IoT Edge security standards on your edge device.
+1. Ensures that MCC is always running.
+1. Reports MCC health and usage to the cloud for remote monitoring.
+  
+For more information on Azure IoT Edge, see the Azure IoT Edge [documentation](/azure/iot-edge/about-iot-edge).

windows/deployment/do/mcc-enterprise-prerequisites.md

@@ -20,6 +20,7 @@ ms.collection: tier3
 
 > [!NOTE]
 > We're still accepting Enterprise and Education customers to join the early preview. To register your interest, fill out the survey located at [https://aka.ms/MSConnectedCacheSignup](https://aka.ms/MSConnectedCacheSignup).
+
 ## Enterprise requirements for MCC
 
 1. **Azure subscription**: MCC management portal is hosted within Azure and is used to create the Connected Cache [Azure resource](/azure/cloud-adoption-framework/govern/resource-consistency/resource-access-management) and IoT Hub resource. Both are free services.

windows/deployment/do/mcc-isp-create-provision-deploy.md

@@ -6,7 +6,7 @@ ms.prod: windows-client
 author: nidos
 ms.author: nidos
 ms.topic: article
-ms.date: 12/31/2017
+ms.date: 05/09/2023
 ms.technology: itpro-updates
 ms.collection: tier3
 ---
@@ -18,7 +18,7 @@ ms.collection: tier3
 - Windows 10
 - Windows 11
 
-This article outlines how to create, provision, and deploy your Microsoft Connected Cache nodes. The creation and provisioning of your cache node takes place in Azure portal. The deployment of your cache node will require downloading an installer script that will be run on your cache server.
+This article outlines how to create, provision, and deploy your Microsoft Connected Cache nodes. The creation and provisioning of your cache node takes place in Azure portal. The deployment of your cache node requires downloading an installer script that will be run on your cache server.
 
 > [!IMPORTANT]
 > Before you can create your Microsoft Connected Cache, you will need to complete the [sign up process](mcc-isp-signup.md). You cannot proceed without signing up for our service.
@@ -37,7 +37,7 @@ During the configuration of your cache node, there are many fields for you to co
 
 ### Client routing
 
-Before serving traffic to your customers, client routing configuration is needed. During the configuration of your cache node in Azure portal, you'll be able to route your clients to your cache node.
+Before serving traffic to your customers, client routing configuration is needed. During the configuration of your cache node in Azure portal, you're able to route your clients to your cache node.
 
 Microsoft Connected Cache offers two ways for you to route your clients to your cache node. The first method of manual entry involves uploading a comma-separated list of CIDR blocks that represents the clients. The second method of setting BGP (Border Gateway Protocol) is more automatic and dynamic, which is set up by establishing neighborships with other ASNs. All routing methods are set up within Azure portal.
 
@@ -53,6 +53,23 @@ You can manually upload a list of your CIDR blocks in Azure portal to enable man
 
 BGP (Border Gateway Protocol) routing is another method offered for client routing. BGP dynamically retrieves CIDR ranges by exchanging information with routers to understand reachable networks. For an automatic method of routing traffic, you can choose to configure BGP routing in Azure portal.
 
+Microsoft Connected Cache includes Bird BGP, which enables the cache node to:
+ - Establish iBGP peering sessions with routers, route servers, or route collectors within operator networks 
+ - Act as a route collector 
+
+The operator starts the iBGP peering session from the Microsoft Connected Cache side using the Azure management portal and then starts the session with the Microsoft Connected Cache node from the router.
+
+In the example configuration below:
+- The operator ASN is 65100
+- The ASN of the Microsoft Connected Cache cache node is 65100 and the IP address is 192.168.8.99
+- iBGP peering sessions are established from the portal for ASNs 65100, 65200, and 65300.
+
+    :::image type="content" source="images/mcc-isp-bgp-route.png" alt-text="Screenshot of a table entitled BGP route information showing how each ASN corresponds to a specific IP address." lightbox="./images/mcc-isp-provision-cache-node-numbered.png":::  
+
+    :::image type="content" source="images/mcc-isp-bgp-diagram.png" alt-text="A diagram that shows the relationship between the cache node and other ASNs/routers when using BGP. BGP routing allows the cache node to route to other network providers with different ASNs." lightbox="./images/mcc-isp-provision-cache-node-numbered.png":::  
+
+To set up and enable BGP routing for your cache node, follow the steps below:
+
 1. Navigate to **Settings** > **Cache nodes**. Select the cache node you wish to provision.
 
     :::image type="content" source="images/mcc-isp-provision-cache-node-numbered.png" alt-text="Screenshot of the Azure portal depicting the cache node configuration page of a cache node. This screenshot shows all of the fields you can choose to configure the cache node." lightbox="./images/mcc-isp-provision-cache-node-numbered.png":::  
@@ -101,6 +118,9 @@ There are five IDs that the device provisioning script takes as input in order t
 
 #### Provision your server
 
+> [!IMPORTANT]
+> Have you correctly mounted your disk? Your MCC will not be successfully installed without this important step. Before provisioning your server, ensure your disk is correctly mounted by following the instructions here: [Attach a data disk to a Linux VM](/azure/virtual-machines/linux/attach-disk-portal#find-the-disk).
+
 :::image type="content" source="images/mcc-isp-deploy-cache-node-numbered.png" alt-text="Screenshot of the server provisioning tab within cache node configuration in Azure portal.":::
 
 1. After completing cache node provisioning, navigate to the **Server provisioning** tab. Select **Download provisioning package** to download the installation package to your server.  

windows/deployment/do/mcc-isp-faq.yml

@@ -85,6 +85,8 @@ sections:
         answer: If a downstream customer deploys a Microsoft Connected Cache node, the cache controller will prefer the downstream ASN when handling that ASN's traffic.
       - question: I signed up for Microsoft Connected Cache, but I'm not receiving the verification email. What should I do?
         answer: First, check that the email under the NOC role is correct in your PeeringDB page. If the email associated with NOC role is correct, search for an email from the sender "microsoft-noreply@microsoft.com" with the email subject - "Here's your Microsoft Connected Cache verification code" in your Spam folders. Still can't find it? Ensure that your email admin rules allow emails from the sender "microsoft-noreply@microsoft.com".
+      - question: I noticed I can set up BGP for routing. How does BGP routing work for Microsoft Connected Cache?
+        answer: BGP routing can be set up as an automatic method of routing traffic. To learn more about how BGP is used with Microsoft Connected Cache, see [BGP Routing](mcc-isp-create-provision-deploy.md#bgp-routing).
       - question: I have an active MCC, but I'm noticing I hit the message limit for my IoT Hub each day. Does this affect my MCC performance and should I be concerned?
         answer: Even when the quota of 8k messages is hit, the MCC functionality won't be affected. Your client devices will continue to download content as normal. You'll also not be charged above the 8k message limit, so you don't need to worry at all about getting a paid plan. MCC will always be a free service. So if functionality isn't impacted, what is? Instead, messages about the configuration or edge deployment would be impacted. This means that if there was a request to update your MCC and the daily quota was reached, your MCC might not update. In that case, you would just need to wait for the next day to update. This is only a limitation of the early preview and isn't an issue during public preview.
       - question: What do I do if I need more support and have more questions even after reading this FAQ page?

windows/deployment/do/mcc-isp-overview.md

@@ -0,0 +1,40 @@
+---
+title: MCC for ISPs Overview
+manager: aaroncz
+description: Overview for Microsoft Connected Cache for ISPs
+ms.prod: windows-client
+author: amymzhou
+ms.author: amyzhou
+ms.topic: article
+ms.date: 05/09/2023
+ms.technology: itpro-updates
+ms.collection: tier3
+---
+
+# Microsoft Connected Cache for ISPs Overview
+
+**Applies to**
+
+- Windows 10
+- Windows 11
+
+Microsoft Connected Cache (MCC) for Internet Service Providers (preview) is a software-only caching solution that delivers Microsoft content. MCC can be deployed to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, MCC can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing.
+
+## Supported scenarios
+
+Microsoft Connected Cache (preview) supports the following scenarios:
+
+- Internet service provider that provides content downloads for end customers
+- Network service providers that provide transit for other service providers
+
+## Supported content
+
+Microsoft Connected Cache uses Delivery Optimization as the backbone for Microsoft content delivery. Microsoft Connected Cache caches the following types:
+
+- Windows Update for Business: Windows feature and quality updates
+- Office Click-to-Run apps: Microsoft 365 Apps and updates
+- Client apps: Microsoft Store apps and updates
+- Endpoint protection: Windows Defender definition updates
+- Xbox: Xbox Game Pass (PC only)
+
+For the full list of content endpoints that Microsoft Connected Cache for ISPs supports, see [Microsoft Connected Cache content and services endpoints](delivery-optimization-endpoints.md).

windows/deployment/do/mcc-isp-signup.md

@@ -21,7 +21,7 @@ ms.collection: tier3
 This article details the process of signing up for Microsoft Connected Cache for Internet Service Providers (public preview). 
 
  > [!NOTE]
- > Microsoft Connected Cache is now in public review. Instead of submitting a survey, you can directly onboard by following the instructions in this article.
+ > Microsoft Connected Cache is now in public preview. Instead of submitting a survey, you can directly onboard by following the instructions in this article.
 
 ## Prerequisites
 

windows/deployment/do/waas-microsoft-connected-cache.md

@@ -8,11 +8,11 @@ ms.localizationpriority: medium
 ms.author: carmenf
 ms.topic: article
 ms.technology: itpro-updates
-ms.date: 12/31/2017
+ms.date: 05/09/2023
 ms.collection: tier3
 ---
 
-# Microsoft Connected Cache overview
+# What is Microsoft Connected Cache?
 
 **Applies to**
 
@@ -31,47 +31,20 @@ Both products are created and managed in the cloud portal.
 ## Microsoft Connected Cache for ISPs (preview)
 
 > [!NOTE]
-> Microsoft Connected Cache for Internet Service Providers is now in public preview. Instead of submitting a survey, you can directly onboard by following the instructions in the [Operator sign up and service onboarding](mcc-isp-signup.md) article.
+> Microsoft Connected Cache for Internet Service Providers is now in public preview. To onboard, follow the instructions in the [Operator sign up and service onboarding](mcc-isp-signup.md) article.
 
-Microsoft Connected Cache (MCC) for Internet Service Providers is currently in preview. MCC can be deployed to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, MCC can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing.
+Microsoft Connected Cache (MCC) for Internet Service Providers is currently in preview. MCC can be deployed to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, MCC can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing. Learn more at [Microsoft Connected Cache for ISPs Overview](mcc-isp-overview.md). 
 
 ## Microsoft Connected Cache for Enterprise and Education (early preview)
 
 > [!NOTE]
 > We're still accepting Enterprise and Education customers to join the early preview. To register your interest, fill out the survey 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 (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. Learn more at [Microsoft Connected Cache for Enterprise and Education Overview](mcc-ent-edu-overview.md).
 
-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 will be a Linux IoT Edge module running on the Windows Host OS.  
-
-## IoT Edge 
-
-Both of Microsoft Connected Cache product offerings use Azure IoT Edge. Even though your MCC scenario isn't related to IoT, Azure IoT Edge is used as a more generic Linux container deployment and management infrastructure. The Azure IoT Edge runtime sits on your designated MCC device and performs management and communication operations. The runtime performs several functions important to manage MCC on your edge device:
-
-1. Installs and updates MCC on your edge device.
-1. Maintains Azure IoT Edge security standards on your edge device.
-1. Ensures that MCC is always running.
-1. Reports MCC health and usage to the cloud for remote monitoring.
-  
-To deploy a functional MCC to your device, you must obtain the necessary keys to provision the Connected Cache instance that communicates with Delivery Optimization services, and enable the device to cache and deliver content. The architecture of MCC is described below.
-  
-For more information on Azure IoT Edge, see the Azure IoT Edge [documentation](/azure/iot-edge/about-iot-edge).
-
-## How MCC Works  
-
-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 will pull content from CDN to ensure uninterrupted service for your subscribers.
-
-The following diagram displays and overview of how MCC functions:
-
-:::image type="content" source="./images/waas-mcc-diag-overview.png" alt-text="Diagram displaying the components of MCC." lightbox="./images/waas-mcc-diag-overview.png":::
+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 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)
 
 ## Next steps
 
-- [Microsoft Connected Cache for Enterprise and Education](mcc-enterprise-prerequisites.md)
-- [Microsoft Connected Cache for ISPs](mcc-isp-signup.md)
+- [Microsoft Connected Cache for ISPs Overview](mcc-isp-overview.md)
+- [Microsoft Connected Cache for Enterprise and Education Overview](mcc-ent-edu-overview.md)