resolve merge conflict, add preview cu version

windows/deployment/TOC.yml

@@ -7,12 +7,12 @@
           href: deploy-whats-new.md
         - name: Windows client deployment scenarios
           href: windows-10-deployment-scenarios.md
-        - name: What is Windows as a service?
-          href: update/waas-quick-start.md
-        - name: Windows update fundamentals
-          href: update/waas-overview.md
-        - name: Monthly quality updates
-          href: update/quality-updates.md
+        - name: Quick guide to Windows as a service
+          href: update/waas-quick-start.md        
+        - name: Windows as a service overview
+          href: update/waas-overview.md      
+        - name: Update release cycle
+          href: update/release-cycle.md
         - name: Basics of Windows updates, channels, and tools
           href: update/get-started-updates-channels-tools.md
         - name: Prepare servicing strategy for Windows client updates
@@ -47,12 +47,12 @@
         - name: Define your servicing strategy
           href: update/plan-define-strategy.md
         - name: Delivery Optimization for Windows client updates
-          href: do/waas-delivery-optimization.md
+          href: do/waas-delivery-optimization.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
           items:
             - name: Using a proxy with Delivery Optimization
-              href: do/delivery-optimization-proxy.md
+              href: do/delivery-optimization-proxy.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
             - name: Delivery Optimization client-service communication
-              href: do/delivery-optimization-workflow.md
+              href: do/delivery-optimization-workflow.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Windows 10 deployment considerations
           href: planning/windows-10-deployment-considerations.md
         - name: Windows 10 infrastructure requirements
@@ -80,7 +80,7 @@
         - name: Update Baseline
           href: update/update-baseline.md
         - name: Set up Delivery Optimization for Windows client updates
-          href: do/index.yml
+          href: do/waas-delivery-optimization-setup.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Configure BranchCache for Windows client updates
           href: update/waas-branchcache.md
         - name: Prepare your deployment tools
@@ -212,6 +212,8 @@
           items:
           - name: Windows Update for Business reports workbook
             href: update/wufb-reports-workbook.md
+          - name: Delivery Optimization data in reports
+            href: update/wufb-reports-do.md
           - name: Software updates in the Microsoft 365 admin center
             href: update/wufb-reports-admin-center.md                                
           - name: Use Windows Update for Business reports data
@@ -339,7 +341,7 @@
         - name: Additional Windows Update settings
           href: update/waas-wu-settings.md
         - name: Delivery Optimization reference
-          href: do/waas-delivery-optimization-reference.md
+          href: do/waas-delivery-optimization-reference.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Windows client in S mode
           href: s-mode.md
         - name: Switch to Windows client Pro or Enterprise from S mode

windows/deployment/breadcrumb/toc.yml

@@ -46,3 +46,15 @@ items:
     - name: Deployment
       tocHref: /windows/client-management/mdm
       topicHref: /windows/deployment/     
+
+- name: Learn
+  tocHref: /
+  topicHref: /
+  items:
+  - name: Windows
+    tocHref: /windows/
+    topicHref: /windows/resources/
+    items:
+    - name: Deployment
+      tocHref: /windows/deployment/do
+      topicHref: /windows/deployment/

windows/deployment/deploy-enterprise-licenses.md

@@ -8,7 +8,9 @@ ms.prod: windows-client
 ms.technology: itpro-fundamentals
 ms.localizationpriority: medium
 ms.topic: how-to
-ms.collection: highpri, tier2
+ms.collection:
+  - highpri
+  - tier2
 appliesto: 
   - ✅ <b>Windows 10</b>
   - ✅ <b>Windows 11</b>

windows/deployment/deploy-whats-new.md

@@ -1,15 +1,17 @@
 ---
 title: What's new in Windows client deployment
-manager: aaroncz
-ms.author: frankroj
 description: Use this article to learn about new solutions and online content related to deploying Windows in your organization.
 ms.localizationpriority: medium
 ms.prod: windows-client
-author: frankroj
-ms.topic: article
-ms.collection: highpri, tier2
-ms.date: 11/23/2022
 ms.technology: itpro-deploy
+author: frankroj
+manager: aaroncz
+ms.author: frankroj
+ms.topic: conceptual
+ms.collection:
+  - highpri
+  - tier2
+ms.date: 11/23/2022
 ---
 
 # What's new in Windows client deployment

windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md

@@ -8,7 +8,9 @@ ms.localizationpriority: medium
 author: frankroj
 ms.topic: article
 ms.technology: itpro-deploy
-ms.collection: highpri, tier2
+ms.collection:
+  - highpri
+  - tier3
 ms.date: 11/28/2022
 ---
 

windows/deployment/deploy-windows-mdt/get-started-with-the-microsoft-deployment-toolkit.md

@@ -8,7 +8,9 @@ ms.localizationpriority: medium
 author: frankroj
 ms.topic: article
 ms.technology: itpro-deploy
-ms.collection: highpri, tier2
+ms.collection:
+  - highpri
+  - tier3
 ms.date: 11/28/2022
 ---
 
@@ -190,7 +192,7 @@ Selection profiles, which are available in the Advanced Configuration node, prov
 MDT uses many log files during operating system deployments. By default the logs are client side, but by configuring the deployment settings, you can have MDT store them on the server, as well.
 
 > [!NOTE]
-> The easiest way to view log files is to use Configuration Manager Trace (CMTrace), which is included in the [Configuration Manager Toolkit](https://go.microsoft.com/fwlink/p/?LinkId=734717).
+> The easiest way to view log files is to use Configuration Manager Trace (CMTrace). For more information, see [CMTrace](/mem/configmgr/core/support/cmtrace).
 
 ## Monitoring
 

windows/deployment/deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md

@@ -8,7 +8,9 @@ ms.localizationpriority: medium
 author: frankroj
 ms.topic: article
 ms.technology: itpro-deploy
-ms.collection: highpri, tier2
+ms.collection:
+  - highpri
+  - tier3
 ms.date: 11/28/2022
 ---
 
@@ -264,7 +266,8 @@ See the following example:
 
 ## Use CMTrace to read log files (optional)
 
-The log files in MDT Lite Touch are formatted to be read by Configuration Manager Trace ([CMTrace](/sccm/core/support/cmtrace)), which is available as part of the [Microsoft System 2012 R2 Center Configuration Manager Toolkit](https://go.microsoft.com/fwlink/p/?LinkId=734717). You should also download this tool.
+The log files in MDT Lite Touch are formatted to be read by Configuration Manager Trace ([CMTrace](/mem/configmgr/core/support/cmtrace)).
+
 You can use Notepad (example below):
 
 ![figure 8.](../images/mdt-05-fig09.png)

windows/deployment/deploy-windows-mdt/simulate-a-windows-10-deployment-in-a-test-environment.md

@@ -49,7 +49,8 @@ On **PC0001**:
     & "C:\MDT\CMTrace" C:\MININT\SMSOSD\OSDLOGS\ZTIGather.log
     ```
 
-3. Download and install the free [Configuration Manager Toolkit](https://go.microsoft.com/fwlink/p/?LinkId=734717) on PC0001 so that you have access to the Configuration Manager Trace (cmtrace.exe) tool.
+    > [!NOTE]
+    > For more information about the Configuration Manager Trace (cmtrace.exe) tool, see [CMTrace](/mem/configmgr/core/support/cmtrace).
 
 4. Using Local Users and Groups (lusrmgr.msc), add the **contoso\\MDT\_BA** user account to the local **Administrators** group.
 

windows/deployment/do/TOC.yml

@@ -11,14 +11,12 @@
     href: waas-delivery-optimization-faq.yml    
   - name: Configure Delivery Optimization for Windows
     items:
-    - name: Windows Delivery Optimization settings
-      href: waas-delivery-optimization-setup.md#recommended-delivery-optimization-settings
+    - name: Set up Delivery Optimization for Windows
+      href: waas-delivery-optimization-setup.md
     - name: Configure Delivery Optimization settings using Microsoft Intune
       href: /mem/intune/configuration/delivery-optimization-windows
   - name: Resources for Delivery Optimization
     items:
-    - name: Set up Delivery Optimization for Windows
-      href: waas-delivery-optimization-setup.md
     - name: Delivery Optimization reference
       href: waas-delivery-optimization-reference.md
     - name: Delivery Optimization client-service communication

windows/deployment/do/delivery-optimization-endpoints.md

@@ -1,7 +1,7 @@
 ---
-title: Delivery Optimization and Microsoft Connected Cache content endpoints
+title: Microsoft Connected Cache content and services endpoints
 description: List of fully qualified domain names, ports, and associated content types to use Delivery Optimization and Microsoft Connected Cache.
-ms.date: 07/26/2022
+ms.date: 03/31/2023
 ms.prod: windows-client
 ms.technology: itpro-updates
 ms.topic: reference
@@ -13,7 +13,7 @@ manager: aaroncz
 ms.collection: tier3
 ---
 
-# Delivery Optimization and Microsoft Connected Cache content type endpoints
+# Microsoft Connected Cache content and services endpoints
 
 _Applies to:_
 
@@ -23,16 +23,17 @@ _Applies to:_
 > [!NOTE]
 > All ports are outbound.
 
-This article lists the endpoints that need to be allowed through the firewall to ensure that content from Delivery Optimization and Microsoft Connected cache is properly delivered. Use the table below to reference any particular content types supported by Delivery Optimization and Microsoft Connected Cache:
+This article lists the content and services endpoints to allow in your firewall to be used by Microsoft Connected Cache. 
+Use the table below to reference any particular content types or services endpoints that are required for [Connected Cache on a Configuration Manager distribution point](/mem/configmgr/core/plan-design/hierarchy/microsoft-connected-cache), [Connected Cache managed in Azure](waas-microsoft-connected-cache.md), or both.
 
-|Domain Name  |Protocol/Port(s)  | Content Type | Additional Information | Version |
+|Domain Name  |Protocol/Port(s)  | Content Type | Additional Information | Microsoft Connected Cache Version |
 |---------|---------|---------------|-------------------|-----------------|
-| *.b1.download.windowsupdate.com, *.dl.delivery.mp.microsoft.com, *.download.windowsupdate.com, *.au.download.windowsupdate.com, *.au.b1.download.windowsupdate.com, *.tlu.dl.delivery.mp.microsoft.com, *.emdl.ws.microsoft.com, *.ctldl.windowsupdate.com   |  HTTP / 80  | Windows Update </br> Windows Defender </br> Windows Drivers | [Complete list](/windows/privacy/manage-windows-2004-endpoints) of endpoints for Windows Update services and payload. | Microsoft Configuration Manager Distribution Point |
-| *.delivery.mp.microsoft.com  |  HTTP / 80  | Edge Browser | [Complete list](/deployedge/microsoft-edge-security-endpoints) of endpoints for Edge Browser. | Microsoft Configuration Manager Distribution Point |
-| *.officecdn.microsoft.com.edgesuite.net, *.officecdn.microsoft.com, *.cdn.office.net |  HTTP / 80  | Office CDN updates | [Complete list](/office365/enterprise/office-365-endpoints) of endpoints for Office CDN updates. | Microsoft Configuration Manager Distribution Point |
-| *.manage.microsoft.com, *.swda01.manage.microsoft.com, *.swda02.manage.microsoft.com, *.swdb01.manage.microsoft.com, *.swdb02.manage.microsoft.com, *.swdc01.manage.microsoft.com, *.swdc02.manage.microsoft.com, *.swdd01.manage.microsoft.com, *.swdd02.manage.microsoft.com, *.swda01-mscdn.manage.microsoft.com, *.swda02-mscdn.manage.microsoft.com, *.swdb01-mscdn.manage.microsoft.com, *.swdb02-mscdn.manage.microsoft.com, *.swdc01-mscdn.manage.microsoft.com, *.swdc02-mscdn.manage.microsoft.com, *.swdd01-mscdn.manage.microsoft.com, *.swdd02-mscdn.manage.microsoft.com |  HTTP / 80 </br> HTTPs / 443  | Intune Win32 Apps | [Complete list](/mem/intune/fundamentals/intune-endpoints) of endpoints for Intune Win32 Apps updates. | Microsoft Configuration Manager Distribution Point |
-| *.statics.teams.cdn.office.net |  HTTP / 80 </br> HTTPs / 443  | Teams | | Microsoft Configuration Manager Distribution Point |
-| *.assets1.xboxlive.com, *.assets2.xboxlive.com, *.dlassets.xboxlive.com, *.dlassets2.xboxlive.com, *.d1.xboxlive.com, *.d2.xboxlive.com, *.assets.xbox.com, *.xbl-dlassets-origin.xboxlive.com, *.assets-origin.xboxlive.com, *.xvcb1.xboxlive.com, *.xvcb2.xboxlive.com, *.xvcf1.xboxlive.com, *.xvcf2.xboxlive.com |  HTTP / 80 | Xbox | | Microsoft Configuration Manager Distribution Point |
-| *.tlu.dl.adu.microsoft.com, *.nlu.dl.adu.microsoft.com, *.dcsfe.prod.adu.microsoft.com |  HTTP / 80 | Device Update | [Complete list](/azure/iot-hub-device-update/) of endpoints for Device Update updates.  | Microsoft Configuration Manager Distribution Point |
-| *.do.dsp.mp.microsoft.com |  HTTP / 80 </br> HTTPs / 443 | Microsoft Connected Cache -> Delivery Optimization Services communication | [Complete list](../do/waas-delivery-optimization-faq.yml) of endpoints for Delivery Optimization only.  | Microsoft Connected Cache Managed in Azure |
-| *.azure-devices.net, *.global.azure-devices-provisioning.net, *.azurecr.io, *.blob.core.windows.net, *.mcr.microsoft.com, github.com |  AMQP / 5671 </br>  MQTT / 8883 </br> HTTPs / 443 | IoT Edge / IoT Hub communication| [Complete list](/azure/iot-hub/iot-hub-devguide-protocols) of Azure IoT Hub communication protocols and ports. [Azure IoT Guide](/azure/iot-hub/iot-hub-devguide-endpoints) to understanding Azure IoT Hub endpoints. | Microsoft Connected Cache Managed in Azure |
+| *.b1.download.windowsupdate.com, *.dl.delivery.mp.microsoft.com, *.download.windowsupdate.com, *.au.download.windowsupdate.com, *.au.b1.download.windowsupdate.com, *.tlu.dl.delivery.mp.microsoft.com, *.emdl.ws.microsoft.com, *.ctldl.windowsupdate.com   |  HTTP / 80  | Windows Update </br> Windows Defender </br> Windows Drivers | [Complete list](/windows/privacy/manage-windows-2004-endpoints) of endpoints for Windows Update services and payload. | Both |
+| *.delivery.mp.microsoft.com  |  HTTP / 80  | Edge Browser | [Complete list](/deployedge/microsoft-edge-security-endpoints) of endpoints for Edge Browser. | Both |
+| *.officecdn.microsoft.com.edgesuite.net, *.officecdn.microsoft.com, *.cdn.office.net |  HTTP / 80  | Office CDN updates | [Complete list](/office365/enterprise/office-365-endpoints) of endpoints for Office CDN updates. | Both |
+| *.manage.microsoft.com, *.swda01.manage.microsoft.com, *.swda02.manage.microsoft.com, *.swdb01.manage.microsoft.com, *.swdb02.manage.microsoft.com, *.swdc01.manage.microsoft.com, *.swdc02.manage.microsoft.com, *.swdd01.manage.microsoft.com, *.swdd02.manage.microsoft.com, *.swda01-mscdn.manage.microsoft.com, *.swda02-mscdn.manage.microsoft.com, *.swdb01-mscdn.manage.microsoft.com, *.swdb02-mscdn.manage.microsoft.com, *.swdc01-mscdn.manage.microsoft.com, *.swdc02-mscdn.manage.microsoft.com, *.swdd01-mscdn.manage.microsoft.com, *.swdd02-mscdn.manage.microsoft.com |  HTTP / 80 </br> HTTPs / 443  | Intune Win32 Apps | [Complete list](/mem/intune/fundamentals/intune-endpoints) of endpoints for Intune Win32 Apps updates. | Both |
+| *.statics.teams.cdn.office.net |  HTTP / 80 </br> HTTPs / 443  | Teams | | Both |
+| *.assets1.xboxlive.com, *.assets2.xboxlive.com, *.dlassets.xboxlive.com, *.dlassets2.xboxlive.com, *.d1.xboxlive.com, *.d2.xboxlive.com, *.assets.xbox.com, *.xbl-dlassets-origin.xboxlive.com, *.assets-origin.xboxlive.com, *.xvcb1.xboxlive.com, *.xvcb2.xboxlive.com, *.xvcf1.xboxlive.com, *.xvcf2.xboxlive.com |  HTTP / 80 | Xbox | | Both |
+| *.tlu.dl.adu.microsoft.com, *.nlu.dl.adu.microsoft.com, *.dcsfe.prod.adu.microsoft.com |  HTTP / 80 | Device Update | [Complete list](/azure/iot-hub-device-update/) of endpoints for Device Update updates.  |  Both |
+| *.do.dsp.mp.microsoft.com |  HTTP / 80 </br> HTTPs / 443 | Microsoft Connected Cache -> Delivery Optimization Services communication | [Complete list](../do/waas-delivery-optimization-faq.yml) of endpoints for Delivery Optimization only.  | Connected Cache Managed in Azure |
+| *.azure-devices.net, *.global.azure-devices-provisioning.net, *.azurecr.io, *.blob.core.windows.net, *.mcr.microsoft.com, github.com |  AMQP / 5671 </br>  MQTT / 8883 </br> HTTPs / 443 | IoT Edge / IoT Hub communication| [Complete list](/azure/iot-hub/iot-hub-devguide-protocols) of Azure IoT Hub communication protocols and ports. [Azure IoT Guide](/azure/iot-hub/iot-hub-devguide-endpoints) to understanding Azure IoT Hub endpoints. | Connected Cache Managed in Azure |

windows/deployment/do/index.yml

@@ -9,7 +9,9 @@ metadata:
   ms.topic: landing-page
   ms.prod: windows-client
   ms.technology: itpro-updates
-  ms.collection: highpri, tier3
+  ms.collection:
+    - highpri
+    - tier3
   author: aczechowski
   ms.author: aaroncz
   manager: dougeby

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

@@ -158,13 +158,11 @@ Installing MCC on your Windows device is a simple process. A PowerShell script p
    >
    > Don't use PowerShell ISE, PowerShell 6.x, or PowerShell 7.x. Only Windows PowerShell version 5.x is supported.
 
-#### If you're installing MCC on a local virtual machine
-
-1. Turn the virtual machine **off** while you enable nested virtualization and MAC spoofing.
+1. **If you're installing MCC on a local virtual machine**, turn the virtual machine **off** while you enable nested virtualization and MAC spoofing.
    1. Enable nested virtualization:
 
       ```powershell
-      Set -VMProcessor -VMName "VM name" -ExposeVirtualizationExtensions $true
+      Set-VMProcessor -VMName "VM name" -ExposeVirtualizationExtensions $true
       ```
 
    1. Enable MAC spoofing:
@@ -230,7 +228,7 @@ Installing MCC on your Windows device is a simple process. A PowerShell script p
 
 1. Your MCC deployment is now complete.
 
-    1. If you don't see any errors, continue to the next section to validate your MCC deployment.
+    1. If you don't see any errors, continue to the next section to validate your MCC deployment. Your VM will not appear in Hyper-V Manager as it is an EFLOW VM.
     1. After validating your MCC is properly functional, review your management solution documentation, such as [Intune](/mem/intune/configuration/delivery-optimization-windows), to set the cache host policy to the IP address of your MCC.
     1. If you had errors during your deployment, see the [Common Issues](#common-issues) section in this article.
 

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

@@ -18,6 +18,8 @@ ms.collection: tier3
 - Windows 10
 - Windows 11
 
+> [!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

@@ -99,6 +99,8 @@ There are five IDs that the device provisioning script takes as input in order t
 | Customer key | The unique alphanumeric ID that provides secure authentication of the cache node to Delivery Optimization services. |
 | Registration key | Single use device registration key used by Microsoft Delivery Optimization services. |
 
+#### Provision your server
+
 :::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

@@ -5,7 +5,9 @@ metadata:
   author: amymzhou
   ms.author: amymzhou
   manager: aaroncz
-  ms.collection: highpri, tier3
+  ms.collection:
+    - highpri
+    - tier3
   ms.topic: faq
   ms.date: 09/30/2022
   ms.prod: windows-client
@@ -84,6 +86,6 @@ sections:
       - 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 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 private preview and isn't an issue during public preview.
+        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?
         answer: For further support for Microsoft Connected Cache, visit [Troubleshooting Issues for Microsoft Connected Cache for ISP (public preview)](mcc-isp-support.md).

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

@@ -20,6 +20,9 @@ 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.
+
 ## Prerequisites
 
 Before you begin sign up, ensure you have the following components:

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

@@ -19,27 +19,45 @@ ms.collection: tier3
 - Windows 11
 
 This article provides information on how to troubleshoot common issues with Microsoft Connected Cache for ISPs.
-## Sign up errors
 
-### Cannot verify account
+## Common issues
+
+This section details a few common issues that customers face during the sign up process.
+
+### Sign up errors
+
+#### Cannot verify account
 
 During sign-up, we verify the information you provide against what is present in [Peering DB](https://www.peeringdb.com/). Make sure the information for your ISP entry on [Peering DB](https://www.peeringdb.com/) is up to date and matches what you provide during sign-up.
 
-### Invalid verification code
+#### Invalid verification code
 
 During sign-up, a verification code is sent to your NOC email address present in [Peering DB](https://www.peeringdb.com/). This code expires in 24 hours. If it's expired, you'll need to request a new verification code to complete the sign-up.  
 
-## Cache Node Errors  
+### Cache Node Errors  
 
-### Cannot find my cache node
+#### Cannot find my cache node
 
 Did you previously had access to your cache nodes but it's now no longer accessible? If so, it may be because you had a trial subscription, and its trial period ended. To resolve this issue, complete the following two steps:
 
 1. Create a new Azure Pay-As-You-Go subscription  
 1. Recreate the cache nodes using the new subscription
 
+## Diagnose and Solve Problems
+
+If this article isn't resolving the issue you're facing with your cache node, you can use the **Diagnose and solve problems** functionality within your MCC resource to continue troubleshooting. **Diagnose and solve problems** contains solutions to most common problems that users may face as they onboard.
+
+You can find **Diagnose and solve problems** on the left pane within your MCC resource.
+
+:::image type="content" source="images/mcc-isp-diagnose-solve.png" alt-text="A screenshot of Azure portal showing the Diagnose and Solve problems tab on the left hand pane of Azure portal." lightbox="images/mcc-isp-diagnose-solve.png":::
+
+Within **Diagnose and solve problems**, select **Troubleshoot** under the type of problem you're facing and follow the prompts that narrow down the solution to the issue.
+
+:::image type="content" source="images/mcc-isp-diagnose-solve-troubleshoot.png" alt-text="A screenshot of Azure portal showing the option to select Troubleshoot to continue troubleshooting common issues related to the installation of Microsoft Connected Cache." lightbox="images/mcc-isp-diagnose-solve-troubleshoot.png":::
+
 ## Steps to obtain an Azure subscription ID
 
+To onboard onto Microsoft Connected Cache, you will need an Azure subscription ID. Follow the steps below to obtain your subscription ID:
 <!--Using include file, get-azure-subscription.md, for shared content-->
 [!INCLUDE [Get Azure subscription](includes/get-azure-subscription.md)]
 

windows/deployment/do/mcc-isp.md

@@ -23,7 +23,7 @@ ms.collection: tier3
 ## Overview
 
 > [!IMPORTANT]
-> This document is for Microsoft Connected Cache (early preview). During this phase we invite customers to take part in early access for testing purposes. This phase doesn't include formal support. Instead, you'll be working directly with the product team to provide feedback on Microsoft Connected Cache. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
+> 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.
 
 Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within operator networks. MCC can be deployed to as many physical servers or VMs as needed and is managed from a cloud portal. Microsoft cloud services handle routing of consumer devices to the cache server for content downloads.
 
@@ -62,7 +62,9 @@ The following steps describe how MCC is provisioned and used:
 
 ## ISP requirements for MCC
 
-### Azure subscription
+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.
+
+<!-- ### Azure subscription
 
 The MCC management portal is hosted within Azure. It's used to create the Connected Cache Azure resource and IoT Hub resource. Both are *free* services.
 
@@ -73,9 +75,6 @@ Your Azure subscription ID is first used to provision MCC services and enable ac
 
 The resources used for the preview, and in the future when this product is ready for production, will be free to you - like other caching solutions.
 
-> [!IMPORTANT]
-> To join the Microsoft Connected Cache early preview, provide your Azure subscription ID by filling out [this survey](https://aka.ms/MCCForISPSurvey).
-
 ### Hardware to host the MCC
 
 This recommended configuration can egress at a rate of 9 Gbps with a 10 Gbps NIC.
@@ -102,9 +101,9 @@ The MCC module is optimized for Ubuntu 20.04 LTS. Install Ubuntu 20.04 LTS on a
 | NIC | 10 Gbps| at least 10 Gbps |
 | Disk | SSD </br>1 drive </br>2 TB each  |SSD </br>2-4 drives </br>at least 2 TB each  |
 | Memory | 8 GB | 32 GB or greater |
-| Cores | 4 | 8 or more  |
+| Cores | 4 | 8 or more  | -->
 
-## Steps to deploy MCC
+<!-- ## Steps to deploy MCC
 
 To deploy MCC:
 
@@ -116,16 +115,13 @@ To deploy MCC:
 6. [Verify properly functioning MCC server](#verify-properly-functioning-mcc-server)
 7. [Review common issues if needed](#common-issues)
 
-For questions regarding these instructions, contact [msconnectedcache@microsoft.com](mailto:msconnectedcache@microsoft.com).
 
 ## Provide Microsoft with your Azure subscription ID
 
 As part of the MCC preview onboarding process, an Azure subscription ID must be provided to Microsoft.
 
 > [!IMPORTANT]
-> If you haven't already, provide your Azure subscription ID by filling out [this survey](https://aka.ms/MCCForISPSurvey). You can't continue if you skip this step.
-
-For information about creating or locating your subscription ID, see [Steps to obtain an Azure subscription ID](#steps-to-obtain-an-azure-subscription-id).
+> For information about creating or locating your subscription ID, see [Steps to obtain an Azure subscription ID](#steps-to-obtain-an-azure-subscription-id).
 
 ### Create the MCC resource in Azure
 
@@ -265,9 +261,9 @@ To modify the configuration for existing MCC nodes in the portal, select the cac
 
 :::image type="content" source="./images/mcc-isp-node-configuration.png" alt-text="Screenshot of the Cache Node Configuration page, highlighting editable fields.":::
 
-To delete a cache node, select it in the cache nodes list, and then select **Delete** in the toolbar. If you delete a cache node, there's no way to recover it or any of the information related to the cache node.
+To delete a cache node, select it in the cache nodes list, and then select **Delete** in the toolbar. If you delete a cache node, there's no way to recover it or any of the information related to the cache node. -->
 
-## Install MCC
+<!-- ## Install MCC
 
 To install MCC on your physical server or VM, you use a Bash script installer, which runs the following tasks:
 
@@ -400,7 +396,7 @@ Before you start, make sure that you have a data drive configured on your server
 
     - Inspect the installer logs, which are in the following path: `/etc/mccresourcecreation/`
 
-    - For more information, see [Troubleshoot your IoT Edge device](/azure/iot-edge/troubleshoot).
+    - For more information, see [Troubleshoot your IoT Edge device](/azure/iot-edge/troubleshoot). -->
 
 ## Verify properly functioning MCC server
 
@@ -509,9 +505,9 @@ To configure the device to work with your DNS, use the following steps:
     sudo restart IoTEdge
     ```
 
-### Diagnostics script
+<!-- ### Diagnostics script
 
-If you're having issues with your MCC, the installer file includes a diagnostics script. The script collects all logs and zips them into a single file. You can then email these logs to Microsoft.
+If you're having issues with your MCC, the installer file includes a diagnostics script. The script collects all logs and zips them into a single file. 
 
 To run the script:
 
@@ -528,9 +524,9 @@ To run the script:
 
 1. The script stores all the debug files into a folder and creates a tar file. After the script is finished running, it displays the path of the tar file that you can share with the MCC team. The file should be `/etc/mccdiagnostics/support_bundle_\$timestamp.tar.gz`
 
-1. [Email the MCC team](mailto:msconnectedcache@microsoft.com?subject=Debugging%20Support%20Request%20for%20MCC) and attach this tar file, asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during the debugging process.
+1. [Email the MCC team](mailto:msconnectedcache@microsoft.com?subject=Debugging%20Support%20Request%20for%20MCC) and attach this tar file, asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during the debugging process. -->
 
-## Updating your MCC
+<!-- ## Updating your MCC
 
 Throughout the early preview phase, Microsoft will release security and feature updates for MCC. Follow these steps to update your MCC.
 
@@ -546,9 +542,9 @@ For example:
 
 ```bash
 sudo ./updatemcc.sh version="msconnectedcacheprod.azurecr.io/mcc/linux/iot/mcc-ubuntu-iot-amd64:1.2.1.981" tenantid="799a999aa-99a1-99aa-99aa-9a9aa099db99" customerid="99a999aa-99a1-99aa-99aa-9aaa9aaa0saa" cachenodeid=" aa99aaaa-999a-9aas-99aa99daaa99 " customerkey="a99d999a-aaaa-aa99-0999aaaa99aa"
-```
+``` -->
 
-### Configure BGP on an Existing MCC
+<!-- ### Configure BGP on an Existing MCC
 
 If you have an MCC that's already active and running, follow the steps below to configure BGP.
 
@@ -556,7 +552,22 @@ If you have an MCC that's already active and running, follow the steps below to
 
 1. Sign in with your Azure credentials using the device code.
 
-1. To finish configuring your MCC with BGP routing, continue from Step 10 of [Steps to Install MCC](#steps-to-install-mcc).
+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
 
@@ -708,7 +719,7 @@ You can use hardware that will natively run Ubuntu 20.04 LTS, or you can run an
     >
     > :::image type="content" source="./images/mcc-isp-ubuntu-upgrade.png" alt-text="Screenshot of the Ubuntu install's Upgrade Available prompt with Don't Upgrade selected.":::
 
-Your Ubuntu VM is now ready to [Install MCC](#install-mcc).
+Your Ubuntu VM is now ready to install MCC.
 
 ### IoT Edge runtime
 

windows/deployment/do/waas-delivery-optimization-faq.yml

@@ -1,16 +1,18 @@
 ### YamlMime:FAQ
 metadata:
   title: Delivery Optimization Frequently Asked Questions
-  description: The following is a list of frequently asked questions for Delivery Optimization.
-  ms.reviewer: aaroncz
+  description: List of frequently asked questions for Delivery Optimization.
+  ms.reviewer: mstewart
   ms.prod: windows-client
-  author: carmenf
+  author: cmknox
   ms.author: carmenf
-  manager: dougeby
+  manager: aaroncz
   ms.technology: itpro-updates
-  ms.collection: highpri, tier3
+  ms.collection:
+    - highpri
+    - tier3
   ms.topic: faq
-  ms.date: 08/04/2022
+  ms.date: 04/17/2023
 title: Delivery Optimization Frequently Asked Questions
 summary: |
   **Applies to**
@@ -27,7 +29,7 @@ sections:
         answer: | 
           Delivery Optimization listens on port 7680 for requests from other peers by using TCP/IP. The service will register and open this port on the device. The port must be set to accept inbound traffic through your firewall. If you don't allow inbound traffic over port 7680, you can't use the peer-to-peer functionality of Delivery Optimization. However, devices can still successfully download by using HTTP or HTTPS traffic over port 80 (such as for default Windows Update data).
 
-          Delivery Optimization will use Teredo to create peer groups, which include devices across NATs (or any form of internal subnet that uses gateways or firewalls between subnets). For this to work, you must allow inbound TCP/IP traffic over port 3544. Look for a "NAT traversal" setting in your firewall to set this up.
+          Delivery Optimization will use Teredo to create peer groups, which include devices across NATs (or any form of internal subnet that uses gateways or firewalls between subnets). To enable this scenario, you must allow inbound TCP/IP traffic over port 3544. Look for a "NAT traversal" setting in your firewall to set this up.
 
           Delivery Optimization also communicates with its cloud service by using HTTP/HTTPS over port 80.
 
@@ -68,7 +70,7 @@ sections:
 
           If the connection is identified as a VPN, Delivery Optimization will suspend uploads to other peers. However, you can allow uploads over a VPN by using the [Enable Peer Caching while the device connects via VPN](../do/waas-delivery-optimization-reference.md#enable-peer-caching-while-the-device-connects-via-vpn) policy.
 
-          If you have defined a boundary group in Configuration Manager for VPN IP ranges, you can set the [DownloadMode](../do/waas-delivery-optimization-reference.md#download-mode) policy to 0 for that boundary group, to ensure that there will be no peer-to-peer activity over the VPN. When the device is not connected using a VPN, it can still use peer-to-peer with the default of LAN.
+          If you have defined a boundary group in Configuration Manager for VPN IP ranges, you can set the [DownloadMode](../do/waas-delivery-optimization-reference.md#download-mode) policy to 0 for that boundary group, to ensure that there will be no peer-to-peer activity over the VPN. When the device isn't connected using a VPN, it can still use peer-to-peer with the default of LAN.
 
           With split tunneling, make sure to allow direct access to these endpoints:
 
@@ -97,3 +99,11 @@ sections:
           > [!NOTE]
           > If you use public IP addresses instead of private in LAN mode, the bytes downloaded from or uploaded to LAN peers with public IP addresses might be reported as coming from Internet peers.
 
+      - question: How are downloads initiated by Delivery Optimization?
+        answer: |
+         Delivery Optimization only starts when an application or service that's integrated with Delivery Optimization starts a download. For example, the Microsoft Edge browser. For more information about Delivery Optimization callers, see [Types of download content supported by Delivery Optimization](waas-delivery-optimization.md#types-of-download-content-supported-by-delivery-optimization).
+            
+      - question: How does Delivery Optimization determine which content is available for peering?
+        answer: |
+          Delivery Optimization uses the cache content on the device to determine what's available for peering. For the upload source device, there's a limited number (4) of slots for cached content that's available for peering at a given time. Delivery Optimization contains logic that rotates the cached content in those slots.
+          

windows/deployment/do/waas-delivery-optimization-reference.md

@@ -285,7 +285,7 @@ This policy allows you to specify how your client(s) can discover Delivery Optim
 
 With either option, the client will query DHCP Option ID 235 and use the returned value as the Cache Server Hostname. Option 2 overrides the Cache Server Hostname policy, if set. **By default, this policy has no value.**
 
-Set this policy to designate Delivery Optimization in Network Cache servers through a custom DHCP Option. Specify the custom DHCP option on your server as *text* type. You can add one or more values as either fully qualified domain names (FQDN) or IP addresses. To add multiple values, separate each FQDN or IP address with commas.
+Set this policy to designate Delivery Optimization in Network Cache servers through a custom DHCP Option. Specify the custom DHCP option on your DHCP server as *text* type. You can add one or more values as either fully qualified domain names (FQDN) or IP addresses. To add multiple values, separate each FQDN or IP address with commas.
 
 > [!NOTE]
 > If you format the DHCP Option ID incorrectly, the client will fall back to the Cache Server Hostname policy value if that value has been set.

windows/deployment/do/waas-delivery-optimization.md

@@ -1,14 +1,16 @@
 ---
 title: What is Delivery Optimization?
-manager: aaroncz
 description: This article provides information about Delivery Optimization, a peer-to-peer distribution method in Windows 10 and Windows 11.
 ms.prod: windows-client
-author: cmknox
-ms.localizationpriority: medium
-ms.author: carmenf
-ms.collection: tier3, highpri
-ms.topic: article
 ms.technology: itpro-updates
+ms.localizationpriority: medium
+author: cmknox
+ms.author: carmenf
+manager: aaroncz
+ms.collection:
+  - tier3
+  - highpri
+ms.topic: overview
 ms.date: 12/31/2017
 ---
 
@@ -16,7 +18,7 @@ ms.date: 12/31/2017
 
 **Applies to**
 
-- Windows 10
+- Windows 10
 - Windows 11
 
 > **Looking for Group Policy objects?** See [Delivery Optimization reference](waas-delivery-optimization-reference.md) or the master spreadsheet available at the Download Center [for Windows 11](https://www.microsoft.com/en-us/download/details.aspx?id=104594) or [for Windows 10](https://www.microsoft.com/en-us/download/details.aspx?id=104678).
@@ -81,7 +83,7 @@ In Windows client Enterprise, Professional, and Education editions, Delivery Opt
 
 ## How Microsoft uses Delivery Optimization
 
-At Microsoft, to help ensure that ongoing deployments weren't affecting our network and taking away bandwidth for other services, Microsoft IT used a couple of different bandwidth management strategies. Delivery Optimization, peer-to-peer caching enabled through Group Policy, was piloted and then deployed to all managed devices using Group Policy. Based on recommendations from the Delivery Optimization team, we used the "group" configuration to limit sharing of content to only the devices that are members of the same Active Directory domain. The content is cached for 24 hours. More than 76 percent of content came from peer devices versus the Internet.
+At Microsoft, to help ensure that ongoing deployments weren't affecting our network and taking away bandwidth for other services, Microsoft IT used a couple of different bandwidth management strategies. Delivery Optimization, peer-to-peer caching enabled through Group Policy, was piloted and then deployed to all managed devices using Group Policy. Based on recommendations from the Delivery Optimization team, we used the "group" configuration to limit sharing of content to only the devices that are members of the same Active Directory domain. The content is cached for 24 hours. More than 76 percent of content came from peer devices versus the Internet.
 
 For more information, check out the [Adopting Windows as a Service at Microsoft](https://www.microsoft.com/itshowcase/Article/Content/851/Adopting-Windows-as-a-service-at-Microsoft) technical case study.
 

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

@@ -20,14 +20,26 @@ ms.collection: tier3
 - Windows 11
 
 > [!IMPORTANT]
-> Microsoft Connected Cache is currently a preview feature. To view our Microsoft Connected Cache for ISPs early preview documentation, visit [Microsoft Connected Cache for Internet Service Providers (ISPs)](mcc-isp.md). For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
+> 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/).
 
-Microsoft Connected Cache is a software-only caching solution that delivers Microsoft content. Microsoft Connected Cache has two main offerings: 1) Microsoft Connected Cache for Internet Service Providers and 2) Microsoft Connected Cache for Enterprise and Education (early preview). Both products are created and managed in the cloud portal.
+Microsoft Connected Cache is a software-only caching solution that delivers Microsoft content. Microsoft Connected Cache has two main offerings:
+- Microsoft Connected Cache for Internet Service Providers 
+- Microsoft Connected Cache for Enterprise and Education (early preview). 
+
+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 (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 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.
 
 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.  

windows/deployment/docfx.json

@@ -34,6 +34,7 @@
     "externalReference": [],
     "globalMetadata": {
       "recommendations": true,
+      "adobe-target": true,
       "ms.collection": [
         "tier2"
       ],
@@ -56,7 +57,8 @@
         "claydetels19", 
         "jborsecnik",
         "tiburd",
-        "garycentric"
+        "garycentric",
+        "beccarobins"
       ],
       "searchScope": ["Windows 10"]
     },