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

windows/deployment/do/TOC.yml

@@ -30,48 +30,36 @@
     - name: Microsoft Connected Cache overview
       href: waas-microsoft-connected-cache.md
     - name: MCC for Enterprise and Education
-      href: mcc-enterprise.md
+      items:
+      - name: Overview and requirements
+        href: mcc-enterprise-overview.md
+      - name: Deploy Microsoft Connected Cache
+        href: mcc-enterprise-deploy.md
+      - name: Update and uninstall cache node
+        href: mcc-enterprise-update-uninstall.md
+      - name: Appendix
+        href: mcc-enterprise-appendix.md
     - name: MCC for ISPs
       items:
-      - name: Concepts
-        items:
-        - name: Device provisioning
-          href: mcc-isp-device-provisioning.md
-        - name: Client routing
-          href: mcc-isp-client-routing.md
-        - name: Cache node configuration
-          href: mcc-isp-cache-node-configuration.md
-        - name: Traffic estimation
-          href: mcc-traffic-estimation.md
       - name: How-to guides
         items:  
         - name: Operator sign up and service onboarding
           href: mcc-isp-signup.md
-        - name: Create the cache node in Azure portal
-          href: mcc-isp-create.md
-        - name: Provision and deploy cache node to your server
-          href: mcc-isp-provision-deploy.md
-        - name: Configure client routing for cache node
-          href: mcc-isp-configure-routing.md
-        - name: Verify cache node functionality
+        - name: Create, provision, and deploy the cache node in Azure portal
+          href: mcc-isp-create-provision-deploy.md
+        - name: Verify cache node functionality and monitor health and performance
           href: mcc-isp-verify-cache-node.md
-        - name: Update your cache node
+        - name: Update or uninstall your cache node
           href: mcc-isp-update.md
-        - name: Monitor cache node health and performance
-          href: mcc-isp-monitor.md
-        - name: Uninstall your cache node
-          href: mcc-isp-uninstall.md
       - name: Resources
         items:
-        - name: Community forum
-          href: link-to-come
-        - name: FAQs
-          href: mcc-isp-faq.md
+        - name: Frequently Asked Questions
+          href: mcc-isp-faq.yml
         - name: Enhancing VM performance
           href: mcc-isp-vm-performance.md
         - name: Support and troubleshooting
           href: mcc-isp-support.md
-        - name: Version History
+        - name: Version history
           href: mcc-version-history.md
         - name: MCC for ISPs (Private Preview)
           href: mcc-isp.md

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

@@ -0,0 +1,125 @@
+---
+title: Appendix
+manager: dougeby
+description: Appendix on Microsoft Connected Cache (MCC) for Enterprise and Education.
+ms.prod: w10
+author: amymzhou
+ms.localizationpriority: medium
+ms.author: amyzhou
+ms.collection: M365-modern-desktop
+ms.topic: article
+---
+
+# Appendix
+
+## Diagnostics Script
+
+If you're having issues with your MCC, we included a diagnostics script which will collect all your logs and zip them into a single file. You can then send us these logs via email for the MCC team to debug.
+
+To run this script:
+
+1. Navigate to the following folder in the MCC installation files:
+
+    mccinstaller > Eflow > Diagnostics
+
+1. Run the following commands:
+
+   ```powershell
+   Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process
+   .\collectMccDiagnostics.ps1
+   ```
+
+1.  The script stores all the debug files into a folder and then creates a tar file. After the script is finished running, it will output the path of the tar file which you can share with us. The location should be **\<currentpath\>**\mccdiagnostics\support_bundle_\$timestamp.tar.gz
+
+1. [Email the MCC team](mailto:mccforenterprise@microsoft.com?subject=Debugging%20Help%20Needed%20for%20MCC%20for%20Enterprise) and attach this file asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during out debugging process.
+
+## Steps to obtain an Azure Subscription ID
+
+1. Sign in to https://portal.azure.com/ and navigate to the Azure services section.
+2. Click on **Subscriptions**. If you do not see **Subscriptions**, click on the **More Services** arrow and search for **Subscriptions**. 
+3. If you already have an Azure Subscription, skip to step 5. If you do not have an Azure Subscription, select **+ Add** on the top left. 
+4. Select the **Pay-As-You-Go** subscription. You'll be asked to enter credit card information, but you'll not be charged for using the MCC service. 
+5. On the **Subscriptions** blade, you'll find details about your current subscription. Click on the subscription name. 
+6. After you select the subscription name, you'll find the subscription ID in the **Overview** tab. Click on the **Copy to clipboard** icon next to your Subscription ID to copy the value. 
+
+## Troubleshooting
+
+If you're not able to sign up for a Microsoft Azure subscription with the error: **Account belongs to a directory that cannot be associated with an Azure subscription. Please sign in with a different account.** See [Can't sign up for a Microsoft Azure subscription](/troubleshoot/azure/general/cannot-sign-up-subscription). 
+
+Also see [Troubleshoot issues when you sign up for a new account in the Azure portal](/azure/cost-management-billing/manage/troubleshoot-azure-sign-up).
+
+## IoT Edge runtime
+
+The Azure IoT Edge runtime enables custom and cloud logic on IoT Edge devices.
+The runtime sits on the IoT Edge device, and performs management and
+communication operations. The runtime performs several functions:
+
+- Installs and update workloads (Docker containers) on the device.
+- Maintains Azure IoT Edge security standards on the device.
+- Ensures that IoT Edge modules (Docker containers) are always running.
+- Reports module (Docker containers) health to the cloud for remote monitoring.
+- Manages communication between an IoT Edge device and the cloud.
+
+For more information on Azure IoT Edge, please see the [Azure IoT Edge documentation](/azure/iot-edge/about-iot-edge).
+
+## EFLOW
+
+- [What is Azure IoT Edge for Linux on Windows](/azure/iot-edge/iot-edge-for-linux-on-windows)
+- [Install Azure IoT Edge for Linux on Windows](/azure/iot-edge/how-to-provision-single-device-linux-on-windows-symmetric#install-iot-edge)
+- [PowerShell functions for Azure IoT Edge for Linux on Windows](/azure/iot-edge/reference-iot-edge-for-linux-on-windows-functions)
+- EFLOW FAQ and Support: [Support · Azure/iotedge-eflow Wiki (github.com)](https://github.com/Azure/iotedge-eflow/wiki/Support#how-can-i-apply-updates-to-eflow)
+- [Now ready for Production: Linux IoT Edge Modules on Windows - YouTube](https://www.youtube.com/watch?v=pgqVCg6cxVU&ab_channel=MicrosoftIoTDevelopers)
+
+## Routing local Windows Clients to an MCC
+
+### Get the IP address of your MCC using ifconfig
+
+There are multiple methods that can be used to apply a policy to PCs that should participate in downloading from the MCC.
+
+#### Registry Key
+
+You can either set your MCC IP address or FQDN using:
+
+1.  Registry Key (version 1709 and later):  
+    `HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization`
+</br>
+    "DOCacheHost"=" "  
+    
+    From an elevated command prompt:
+
+    ```
+    reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization" /v DOCacheHost /t REG_SZ /d "10.137.187.38" /f
+    ```
+
+1. MDM Path (version 1809 and later):
+
+    `.Vendor/MSFT/Policy/Config/DeliveryOptimization/DOCacheHost`
+
+1. In Windows (release version 1809 and later), you can apply the policy via Group Policy Editor. The policy to apply is **DOCacheHost**. To configure the clients to pull content from the MCC using Group Policy, go to **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Delivery Optimization**. Set the **Cache Server Hostname** to the IP address of your MCC, such as `10.137.187.38`.
+
+   :::image type="content" source="./images/ent-mcc-group-policy-hostname.png" alt-text="Screenshot of the Group Policy editor showing the Cache Server Hostname Group Policy setting.":::
+
+
+**Verify Content using the DO Client**
+
+To verify that the Delivery Optimization client can download content using MCC, you can use the following steps:
+
+1. Download a game or application from the Microsoft Store.
+
+   :::image type="content" source="./images/ent-mcc-store-example-download.png" alt-text="Screenshot of the Microsoft Store with the game, Angry Birds 2, selected.":::
+
+
+1. Verify downloads came from MCC by one of two methods:
+
+    - Using the PowerShell Cmdlet Get-DeliveryOptimizationStatus you should see *BytesFromCacheServer*.
+
+      :::image type="content" source="./images/ent-mcc-get-deliveryoptimizationstatus.png" alt-text="Screenshot of the output of Get-DeliveryOptimization | FT from PowerShell.":::
+
+    - Using the Delivery Optimization Activity Monitor
+    
+      :::image type="content" source="./images/ent-mcc-delivery-optimization-activity.png" alt-text="Screenshot of the Delivery Optimization Activity Monitor.":::
+
+## More information
+
+[Microsoft Connected Cache for ISPs](mcc-isp.md)</br>
+[Introducing Microsoft Connected Cache](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/introducing-microsoft-connected-cache-microsoft-s-cloud-managed/ba-p/963898)

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

@@ -0,0 +1,325 @@
+---
+title: Deploying your cache node
+manager: dougeby
+description: How to deploy Microsoft Connected Cache (MCC) for Enterprise and Education cache node
+ms.prod: w10
+author: amymzhou
+ms.localizationpriority: medium
+ms.author: amyzhou
+ms.collection: M365-modern-desktop
+ms.topic: article
+---
+
+# Deploying your cache node
+
+**Applies to**
+
+- Windows 10
+- Windows 11
+
+## Steps to deploy MCC
+
+To deploy MCC to your server:
+
+1. [Provide Microsoft with the Azure subscription ID](#provide-microsoft-with-the-azure-subscription-id)
+1. [Create the MCC Resource in Azure](#create-the-mcc-resource-in-azure)
+1. [Create an MCC Node](#create-an-mcc-node-in-azure)
+1. [Edit Cache Node Information](#edit-cache-node-information)
+1. [Install MCC on a physical server or VM](#install-mcc-on-windows)
+1. [Verify proper functioning MCC server](#verify-proper-functioning-mcc-server)
+1. [Review common Issues](#common-issues) if needed.
+
+For questions regarding these instructions contact [msconnectedcache@microsoft.com](mailto:msconnectedcache@microsoft.com)
+
+### Provide Microsoft with the Azure Subscription ID
+
+As part of the MCC preview onboarding process an Azure subscription ID must be provided to Microsoft. 
+
+> [!IMPORTANT]
+> [Take this survey](https://aka.ms/MSConnectedCacheSignup) and provide your Azure subscription ID and contact information to be added to the allowlist for this preview. You will not be able to proceed if you skip this step.
+
+For information about creating or locating your subscription ID, see [Steps to obtain an Azure Subscription ID](mcc-enterprise-appendix.md#steps-to-obtain-an-azure-subscription-id).
+
+### Create the MCC resource in Azure
+
+The MCC Azure management portal is used to create and manage MCC nodes. An Azure Subscription ID is used to grant access to the preview and to create the MCC resource in Azure and Cache nodes. 
+
+Once you take the survey above and the MCC team adds your subscription ID to the allowlist, you'll be given a link to the Azure portal where you can create the resource described below. 
+
+1. In the Azure portal home page, choose **Create a resource**:  
+    :::image type="content" source="./images/ent-mcc-create-azure-resource.png" alt-text="Screenshot of the Azure portal with the create a resource option outlined in red.":::
+
+1. Type **Microsoft Connected Cache** into the search box, and hit **Enter** to show search results.
+
+   > [!NOTE]
+   > You won't see Microsoft Connected Cache in the drop-down list. You'll need to type the string and press enter to see the result.
+
+1. Select **Microsoft Connected Cache Enterprise** and choose **Create** on the next screen to start the process of creating the MCC resource.
+
+    :::image type="content" source="./images/ent-mcc-azure-search-result.png" alt-text="Screenshot of the Azure portal search results for Microsoft Connected Cache.":::
+    :::image type="content" source="./images/ent-mcc-azure-marketplace.png" alt-text="Screenshot of Microsoft Connected Cache Enterprise within the Azure Marketplace.":::
+
+1. Fill in the required fields to create the MCC resource.
+
+    - Choose the subscription that you provided to Microsoft.
+    - Azure resource groups are logical groups of resources. Create a new resource group and choose a name for your resource group.
+    - Choose **(US) West US** for the location of the resource. This choice won't impact MCC if the physical location isn't in the West US, it's just a limitation of the preview.
+
+       > [!IMPORTANT]
+       > Your MCC resource will not be created properly if you do not select **(US) West US**
+
+    - Choose a name for the MCC resource.
+      - Your MCC resource must not contain the word **Microsoft** in it.
+
+      :::image type="content" source="./images/ent-mcc-azure-create-connected-cache.png" alt-text="Screenshot of the Create a Connected Cache page within the Azure Marketplace.":::
+
+1. Once all the information has been entered, select the **Review + Create** button. Once validation is complete, select the **Create** button to start the
+    resource creation.
+
+    :::image type="content" source="./images/ent-mcc-azure-cache-created.png" alt-text="Screenshot of the completed cache deployment within the Azure.":::
+
+#### Error: Validation failed
+
+- If you get a Validation failed error message on your portal, it's likely because you selected the **Location** as **US West 2** or some other location that isn't **(US) West US**.
+  - To resolve this error, go to the previous step and choose **(US) West US**.
+
+    :::image type="content" source="./images/ent-mcc-create-cache-failed.png" alt-text="Screenshot of a failed cache deployment due to an incorrect location.":::
+
+### Create an MCC node in Azure
+
+Creating an MCC node is a multi-step process and the first step is to access the MCC private preview management portal.
+
+1. After the successful resource creation, select  **Go to resource**.
+1. Under **Cache Node Management** section on the leftmost panel, select **Cache Nodes**.
+
+    :::image type="content" source="./images/ent-mcc-cache-nodes.png" alt-text="Screenshot of the Cache Node Management section with the navigation link to the Cache Nodes page outlined in red.":::
+
+1. On the **Cache Nodes** blade, select the **Create Cache Node** button.
+
+    :::image type="content" source="./images/ent-mcc-create-cache-node.png" alt-text="Screenshot of the Cache Nodes page with the Create Cache Node option outlined in red.":::
+
+1. Selecting the **Create Cache Node** button will open the **Create Cache Node** page; **Cache Node Name** is the only field required for cache node creation.
+
+   | **Field Name**| **Expected Value**|**Description** |
+   |---|---|---|
+   | **Cache Node Name** | Alphanumeric name that doesn't include any spaces. | The name of the cache node. You may choose names based on location such as `Seattle-1`. This name must be unique and can't be changed later. |
+
+1. Enter the information for the **Cache Node** and select the **Create** button.
+
+   :::image type="content" source="./images/ent-mcc-create-cache-node-name.png" alt-text="Screenshot of the Cache Nodes page displaying the Cache Node Name text entry during the creation process.":::
+
+If there are errors, the form will provide guidance on how to correct the errors.
+
+Once the MCC node has been created, the installer instructions will be exposed. More details on the installer instructions will be addressed later in this article, in the [Install Connected Cache](#install-mcc-on-windows) section.
+
+:::image type="content" source="./images/ent-mcc-connected-cache-installer-download.png" alt-text="Screenshot of the Connected Cache installer download button, installer instructions, and script.":::
+
+#### Edit cache node information
+
+Cache nodes can be deleted here by selecting the check box to the left of a **Cache Node Name** and then selecting the delete toolbar item. Be aware that if a cache node is deleted, there's no way to recover the cache node or any of the information related to the cache node.
+
+:::image type="content" source="./images/ent-mcc-delete-cache-node.png" alt-text="Screenshot of deleting a cache node from the Cache Nodes page.":::
+
+### Install MCC on Windows
+
+Installing MCC on your Windows device is a simple process. A PowerShell script performs the following tasks:
+
+- Installs the Azure CLI
+- Downloads, installs, and deploys EFLOW
+- Enables Microsoft Update so EFLOW can stay up to date
+- Creates a virtual machine
+- Enables the firewall and opens ports 80 and 22 for inbound and outbound traffic. Port 80 is used by MCC, and port 22 is used for SSH communications.
+- Configures Connected Cache tuning settings.
+- Creates the necessary *FREE* Azure resource - IoT Hub/IoT Edge.
+- Deploys the MCC container to server.
+
+#### Run the installer
+
+1. Download and unzip `mccinstaller.zip` from the create cache node page or cache node configuration page, both of which contain the necessary installation files.
+
+   :::image type="content" source="./images/ent-mcc-download-installer.png" alt-text="Screenshot of the download installer option on the Create Cache Node page.":::
+
+   The following files are contained in the `mccinstaller.zip` file:
+
+   - **installmcc.ps1**: Main installer file.
+   - **installEflow.ps1**: Installs the necessary prerequisites such as the Linux VM, IoT Edge runtime, and Docker, and makes necessary host OS settings to optimize caching performance.
+   - **resourceDeploymentForConnectedCache.ps1**: Creates Azure cloud resources required to support MCC control plane.
+   - **mccdeployment.json**: Deployment manifest used by IoT Edge to deploy the MCC container and configure settings on the container, such as cache drive location sizes.
+   - **updatemcc.ps1**: The update script used to upgrade MCC to a particular version.
+   - **mccupdate.json**: Used as part of the update script
+
+1. Open Windows PowerShell as administrator then navigate to the location of these files.
+
+   > [!NOTE]
+   > Ensure that Hyper-V is enabled on your device.
+   > - **Windows 10:** [Enable Hyper-V on Windows 10](/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v)
+   > - **Windows Server:** [Install the Hyper-V role on Windows Server](/windows-server/virtualization/hyper-v/get-started/install-the-hyper-v-role-on-windows-server)'
+   >
+   > 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. Enable nested virtualization:
+
+      ```powershell
+      Set -VMProcessor -VMName "VM name" -ExposeVirtualizationExtensions $true
+      ```
+
+   1. Enable MAC spoofing:
+
+      ```powershell
+      Get-VMNetworkAdapter -VMName "VM name" | Set-VMNetworkAdapter -MacAddressSpoofing On
+      ```
+
+1. Set the execution policy.
+
+    ```powershell
+    Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process
+    ```
+
+    > [!NOTE]
+    > After setting the execution policy, you'll see a warning asking if you wish to change the execution policy. Choose **[A] Yes to All**.
+
+1. Copy the command from the Azure portal and run it in Windows PowerShell.
+
+    :::image type="content" source="./images/ent-mcc-installer-script.png" alt-text="Screenshot of the installer script for the connected cache node.":::
+
+    > [!NOTE]
+    > After running the command, and multiple times throughout the installation process, you'll receive the following notice. Select **[R] Run once** to proceed.
+    > </br>
+    > </br> Security warning
+    > </br> Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run C:\Users\mccinstaller\Eflow\installmcc.ps1?
+    > </br>
+    > </br> [D] Do not run **[R] Run once** [S] Suspend [?] Help (default is "D"):
+
+1. Choose whether you would like to create a new virtual switch or select an existing one. Name your switch and select the Net Adapter to use for the switch. A computer restart will be required if you're creating a new switch.
+
+    > [!NOTE]
+    > Restarting your computer after creating a switch is recommended. You'll notice network delays during installation if the computer has not been restarted.
+
+    If you restarted your computer after creating a switch, start from Step 2 above and skip step 5.
+
+   :::image type="content" source="./images/ent-mcc-script-new-switch.png" alt-text="Screenshot of the installer script running in PowerShell when a new switch is created." lightbox="./images/ent-mcc-script-new-switch.png":::
+
+1. Rerun the script after the restart. This time, choose **No** when asked to create a new switch. Enter the number corresponding to the switch you previously created.
+
+     :::image type="content" source="./images/ent-mcc-script-existing-switch.png" alt-text="Screenshot of the installer script running in PowerShell when using an existing switch." lightbox="./images/ent-mcc-script-existing-switch.png":::
+
+1. Decide whether you would like to use dynamic or static address for the Eflow VM
+
+    :::image type="content" source="./images/ent-mcc-script-dynamic-address.png" alt-text="Screenshot of the installer script running in PowerShell asking if you'd like to use a dynamic address." lightbox="./images/ent-mcc-script-dynamic-address.png":::
+
+    > [!NOTE]
+    > Choosing a dynamic IP address might assign a different IP address when the MCC restarts. A static IP address is recommended so you don't have to change this value in your management solution when MCC restarts.
+
+1. Choose where you would like to download, install, and store the virtual hard disk for EFLOW. You'll also be asked how much memory, storage, and how many cores you would like to allocate for the VM. For this example, we chose the default values for all prompts.
+
+1. Follow the Azure Device Login link and sign into the Azure portal.
+
+     :::image type="content" source="./images/ent-mcc-script-device-code.png" alt-text="Screenshot of the installer script running in PowerShell displaying the code and URL to use for the Azure portal." lightbox="./images/ent-mcc-script-device-code.png":::
+
+1. If this is your first MCC deployment, select **n** so that a new IoT Hub can be created. If you have already configured MCC before, choose **y** so that your MCCs are grouped in the same IoT Hub.
+
+    1. You'll be shown a list of existing IoT Hubs in your Azure Subscription. Enter the number corresponding to the IoT Hub to select it. **You'll likely have only 1 IoT Hub in your subscription, in which case you want to enter "1"**
+
+       :::image type="content" source="./images/ent-mcc-script-select-hub.png" alt-text="Screenshot of the installer script running in PowerShell prompting you to select which IoT Hub to use." lightbox="./images/ent-mcc-script-select-hub.png":::
+       :::image type="content" source="./images/ent-mcc-script-complete.png" alt-text="Screenshot of the installer script displaying the completion summary in PowerShell." lightbox="./images/ent-mcc-script-complete.png":::
+
+
+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. 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.
+
+## Verify proper functioning MCC server
+
+#### Verify Client Side
+
+Connect to the EFLOW VM and check if MCC is properly running:
+
+1. Open PowerShell as an Administrator.
+2. Enter the following commands:
+
+   ```powershell
+   Connect-EflowVm
+   sudo -s
+   iotedge list
+   ```
+
+   :::image type="content" source="./images/ent-mcc-connect-eflowvm.png" alt-text="Screenshot of running connect-EflowVm, sudo -s, and iotedge list from PowerShell." lightbox="./images/ent-mcc-connect-eflowvm.png":::
+
+You should see MCC, edgeAgent, and edgeHub running. If you see edgeAgent or edgeHub but not MCC, please try this command in a few minutes. The MCC container can take a few minutes to deploy.
+
+#### Verify server side
+
+For a validation of properly functioning MCC, execute the following command in the EFLOW VM or any device in the network. Replace <CacheServerIP\> with the IP address of the cache server.
+
+```powershell
+wget [http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com]
+```
+
+A successful test result will display a status code of 200 along with additional information.
+
+:::image type="content" source="./images/ent-mcc-verify-server-ssh.png" alt-text="Screenshot of a successful wget with an SSH client." lightbox="./images/ent-mcc-verify-server-ssh.png":::
+
+ :::image type="content" source="./images/ent-mcc-verify-server-powershell.png" alt-text="Screenshot of a successful wget using PowerShell." lightbox="./images/ent-mcc-verify-server-powershell.png":::
+
+Similarly, enter the following URL from a browser in the network:
+
+`http://<YourCacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com`
+
+If the test fails, see the [common issues](#common-issues) section for more information.
+
+### Intune (or other management software) configuration for MCC
+
+For an [Intune](/mem/intune/) deployment, create a **Configuration Profile** and include the Cache Host eFlow IP Address or FQDN:
+
+:::image type="content" source="./images/ent-mcc-intune-do.png" alt-text="Screenshot of Intune showing the Delivery Optimization cache server host names.":::
+
+## Common Issues
+
+#### PowerShell issues
+
+If you're seeing errors similar to this: `The term Get-<Something> isn't recognized as the name of a cmdlet, function, script file, or operable program.`
+
+1. Ensure you're running Windows PowerShell version 5.x.
+
+1. Run \$PSVersionTable and ensure you're running version 5.x and *not version 6 or 7*.
+
+1. Ensure you have Hyper-V enabled:
+
+    **Windows 10:** [Enable Hyper-V on Windows 10](/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v)
+
+    **Windows Server:** [Install the Hyper-V role on Windows Server](/windows-server/virtualization/hyper-v/get-started/install-the-hyper-v-role-on-windows-server)
+
+#### Verify Running MCC Container
+
+Connect to the Connected Cache server and check the list of running IoT Edge modules using the following commands:
+
+```bash
+Connect-EflowVm
+sudo iotedge list
+```
+
+:::image type="content" source="./images/ent-mcc-iotedge-list.png" alt-text="Screenshot of the iotedge list command." lightbox="./images/ent-mcc-iotedge-list.png":::
+
+If edgeAgent and edgeHub containers are listed, but not "MCC", you may view the status of the IoT Edge security manager using the command:
+
+```bash
+sudo journalctl -u iotedge -f
+```
+
+For example, this command will provide the current status of the starting, stopping of a container, or the container pull and start.  
+
+:::image type="content" source="./images/ent-mcc-journalctl.png" alt-text="Screenshot of the output from journalctl -u iotedge -f." lightbox="./images/ent-mcc-journalctl.png":::
+
+Use this command to check the IoT Edge Journal
+
+```bash
+sudo journalctl -u iotedge -f
+```
+
+> [!NOTE]
+> You should consult the IoT Edge troubleshooting guide ([Common issues and resolutions for Azure IoT Edge](/azure/iot-edge/troubleshoot)) for any issues you may encounter configuring IoT Edge, but we've listed a few issues that we encountered during our internal validation.

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

@@ -0,0 +1,93 @@
+---
+title: Overview and requirements
+manager: dougeby
+description: Overview and requirements of Microsoft Connected Cache (MCC) for Enterprise and Education.
+ms.prod: w10
+author: amymzhou
+ms.localizationpriority: medium
+ms.author: amyzhou
+ms.collection: M365-modern-desktop
+ms.topic: article
+---
+
+# Overview and requirements of Microsoft Connected Cache for Enterprise and Education (private preview)
+
+**Applies to**
+
+- Windows 10
+- Windows 11
+
+## Overview
+
+> [!IMPORTANT]
+> Microsoft Connected Cache is currently a private preview feature. During this phase we invite customers to take part in early access for testing purposes. This phase does not include formal support, and should not be used for production workloads. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
+
+Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within Enterprise networks. MCC can be deployed to as many physical 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 a client policy using your management tool, such as [Intune](/mem/intune/).
+
+MCC is a hybrid (a mix of on-premises and cloud resources) SaaS solution built as an Azure IoT Edge module; it's a Docker compatible Linux container that is deployed to your Windows devices. IoT Edge for Linux on Windows (EFLOW) was chosen because it's 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.
+
+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 the following important functions to manage MCC on your edge device: 
+
+1. Installs and updates MCC on your edge device. 
+2. Maintains Azure IoT Edge security standards on your edge device. 
+3. Ensures that MCC is always running. 
+4. 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 that will provision the Connected Cache instance to communicate with Delivery Optimization services and enable the device to cache and deliver content. See [figure 1](#fig1) below for a summary of the architecture of MCC, built using IoT Edge.
+
+For more information about Azure IoT Edge, see [What is Azure IoT Edge](/azure/iot-edge/about-iot-edge).
+
+## How MCC works
+
+The following steps describe how MCC is provisioned and used.
+
+1. The Azure Management Portal is used to create MCC nodes.
+2. The MCC container is deployed and provisioned to a server using the installer provided in the portal.
+3. Client policy is configured in your management solution to point to the IP address or FQDN of the cache server.
+4. Microsoft end-user devices make range requests for content from the MCC node.
+5. An MCC node pulls content from the CDN, seeds its local cache stored on disk, and delivers content to the client.
+6. Subsequent requests from end-user devices for content come from the cache.
+
+If an MCC node is unavailable, the client will pull content from CDN to ensure uninterrupted service for your subscribers.
+
+<a id="fig1">
+
+![eMCC img01](images/emcc01.png)
+
+</a>Figure 1: **MCC processes**. Each number in the diagram corresponds to the steps described above.
+
+
+## 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.
+
+    Your Azure subscription ID is first used to provision MCC services, and enable access to the preview. The MCC server requirement for an Azure subscription will cost you nothing. If you do not have an Azure subscription already, you can create an Azure [Pay-As-You-Go](https://azure.microsoft.com/offers/ms-azr-0003p/) account which requires a credit card for verification purposes. For more information, see the [Azure Free Account FAQ](https://azure.microsoft.com/free/free-account-faq/).
+
+    The resources used for the preview and in the future when this product is ready for production will be completely free to you, like other caching solutions.
+
+2. **Hardware to host MCC**: The recommended configuration will serve approximately 35000 managed devices, downloading a 2GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.
+
+    **EFLOW Requires Hyper-V support**
+    - On Windows client, enable the Hyper-V feature
+    - On Windows Server, install the Hyper-V role and create a default network switch
+
+    Disk recommendations:
+    - Using an SSD is recommended as cache read speed of SSD is superior to HDD
+
+    NIC requirements:
+    - Multiple NICs on a single MCC instance aren't supported.
+    - 1 Gbps NIC is the minimum speed recommended but any NIC is supported.
+    - For best performance, NIC and BIOS should support SR-IOV
+
+    VM networking:
+    -  An external virtual switch to support outbound and inbound network communication (created during the installation process)
+
+### Sizing recommendations
+
+| Component  | Branch Office / Small Enterprise | Large Enterprise |
+| -- | --- | --- |
+| OS|  Windows Server 2019*/2022 <br> Windows 10*/11 (Pro or Enterprise) with Hyper-V Support <br><br>* Windows 10 and Windows Server 2019 build 17763 or later | Same |
+|NIC | 1 Gbps | 5 Gbps |
+|Disk | SSD <br>1 drive <br>50GB each  |SSD <br>1 drive <br>200GB each  |
+|Memory | 4GB | 8GB |
+|Cores | 4 | 8  |

windows/deployment/do/mcc-enterprise-update-uninstall.md

@@ -0,0 +1,45 @@
+---
+title: Update or uninstall Microsoft Connected Cache for Enterprise and Education
+manager: dougeby
+description: Details on updating or uninstalling Microsoft Connected Cache (MCC) for Enterprise and Education.
+ms.prod: w10
+author: amymzhou
+ms.localizationpriority: medium
+ms.author: amyzhou
+ms.collection: M365-modern-desktop
+ms.topic: article
+---
+# Update or uninstall Microsoft Connected Cache for Enterprise and Education
+
+
+## Update MCC
+
+Throughout the preview phase, we'll send you security and feature updates for MCC. Follow these steps to perform the update.
+
+Run the following command with the **arguments** we provided in the email to update your MCC:
+
+```powershell
+# .\updatemcc.ps1 version="**\<VERSION\>**" tenantid="**\<TENANTID\>**" customerid="**\<CUSTOMERID\>**" cachenodeid="**\<CACHENODEID\>**" customerkey="**\<CUSTOMERKEY\>**"
+```
+For example:
+```powershell
+# .\updatemcc.ps1 version="msconnectedcacheprod.azurecr.io/mcc/linux/iot/mcc-ubuntu-iot-amd64:1.2.1.659" tenantid="799a999aa-99a1-99aa-99aa-9a9aa099db99" customerid="99a999aa-99a1-99aa-99aa-9aaa9aaa0saa" cachenodeid=" aa99aaaa-999a-9aas-99aa99daaa99 " customerkey="a99d999a-aaaa-aa99-0999aaaa99a”
+```
+
+## Uninstall MCC
+
+Please contact the MCC Team before uninstalling to let us know if you're facing
+issues.
+
+This script will remove the following:
+
+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

windows/deployment/do/mcc-enterprise.md

@@ -121,18 +121,18 @@ The MCC Azure management portal is used to create and manage MCC nodes. An Azure
 
 Once you take the survey above and the MCC team adds your subscription ID to the allowlist, you will be given a link to the Azure portal where you can create the resource described below. 
 
-1.  On the Azure portal home page, choose **Create a resource**:  
-    ![eMCC img02](images/emcc02.png)
+1.  In the Azure portal home page, choose **Create a resource**:  
+    :::image type="content" source="./images/ent-mcc-create-azure-resource.png" alt-text="Screenshot of the Azure portal with the create a resource option outlined in red.":::
 
 2.  Type **Microsoft Connected Cache** into the search box, and hit **Enter** to show search results.
 
 > [!NOTE]
 > You'll not see Microsoft Connected Cache in the drop-down list. You need to type it and press enter to see the result.
 
-3.  Select **Microsoft Connected Cache** and choose **Create** on the next screen to start the process of creating the MCC resource.
+3.  Select **Microsoft Connected Cache Enterprise** and choose **Create** on the next screen to start the process of creating the MCC resource.
 
-    ![eMCC img03](images/emcc03.png)
-    ![eMCC img04](images/emcc04.png)
+    :::image type="content" source="./images/ent-mcc-azure-search-result.png" alt-text="Screenshot of the Azure portal search results for Microsoft Connected Cache.":::
+    :::image type="content" source="./images/ent-mcc-azure-marketplace.png" alt-text="Screenshot of Microsoft Connected Cache within the Azure Marketplace.":::
 
 4.  Fill in the required fields to create the MCC resource.
 
@@ -148,17 +148,17 @@ Once you take the survey above and the MCC team adds your subscription ID to the
       > [!NOTE]
       > Your MCC resource must not contain the word **Microsoft** in it.
 
-      ![eMCC img05](images/emcc05.png)
+      :::image type="content" source="./images/ent-mcc-azure-create-connected-cache.png" alt-text="Screenshot of the Create a Connected Cache page within the Azure Marketplace.":::
 
 5.  Once all the information has been entered, click the **Review + Create** button. Once validation is complete, click the **Create** button to start the
     resource creation.
 
-    ![eMCC img06](images/emcc06.png)
+    :::image type="content" source="./images/ent-mcc-azure-cache-created.png" alt-text="Screenshot of the completed cache deployment within the Azure.":::
 
 #### Error: Validation failed
 
--   If you get a Validation failed error message on your portal, it's likely because you selected the **Location** as **US West 2** or some other location that isn't **(US) West US**.
--   To resolve this error, go to the previous step and choose **(US) West US**.
+- If you get a Validation failed error message on your portal, it's likely because you selected the **Location** as **US West 2** or some other location that isn't **(US) West US**.
+- To resolve this error, go to the previous step and choose **(US) West US**.
 
     ![eMCC img07](images/emcc07.png)
 
@@ -406,20 +406,20 @@ If you're having issues with your MCC, we included a diagnostics script which wi
 
 To run this script:
 
-1.  Navigate to the following folder in the MCC installation files:
+1. Navigate to the following folder in the MCC installation files:
 
-    mccinstaller \> Eflow \> Diagnostics
+    mccinstaller > Eflow > Diagnostics
 
-2.  Run the following commands:
+1. Run the following commands:
 
-```powershell
-Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process
-.\collectMccDiagnostics.ps1
-```
+   ```powershell
+   Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process
+   .\collectMccDiagnostics.ps1
+   ```
 
-3.  The script stores all the debug files into a folder and then creates a tar file. After the script is finished running, it will output the path of the tar file which you can share with us (should be “**\<currentpath\>**\\mccdiagnostics\\support_bundle_\$timestamp.tar.gz”)
+1. The script stores all the debug files into a folder and then creates a tar file. After the script is finished running, it will output the path of the tar file which you can share with us. The location should be **\<currentpath\>**\mccdiagnostics\support_bundle_\$timestamp.tar.gz
 
-4.  [Email the MCC team](mailto:mccforenterprise@microsoft.com?subject=Debugging%20Help%20Needed%20for%20MCC%20for%20Enterprise) and attach this file asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during out debugging process.
+1. [Email the MCC team](mailto:mccforenterprise@microsoft.com?subject=Debugging%20Help%20Needed%20for%20MCC%20for%20Enterprise) and attach this file asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during out debugging process.
 
 ## Update MCC
 
@@ -502,42 +502,43 @@ There are multiple methods that can be used to apply a policy to PCs that should
 
 You can either set your MCC IP address or FQDN using:
 
-1.  Registry Key in 1709 and higher -  
-    [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization]<br>
+1.  Registry Key (version 1709 and later):  
+    `HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization`
+</br>
     "DOCacheHost"=" "  
     
-  From an elevated command prompt:
+    From an elevated command prompt:
 
-  ```
-  reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization" /v DOCacheHost /t REG_SZ /d "10.137.187.38" /f
-  ```
+    ```
+    reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization" /v DOCacheHost /t REG_SZ /d "10.137.187.38" /f
+    ```
 
-2.  MDM Path in 1809 or higher:
+1. MDM Path (version 1809 and later):
 
-  .Vendor/MSFT/Policy/Config/DeliveryOptimization/DOCacheHost
+    `.Vendor/MSFT/Policy/Config/DeliveryOptimization/DOCacheHost`
 
-3. In Windows release version 1809 and later, you can apply the policy via Group Policy Editor. The policy to apply is **DOCacheHost**. To configure the clients to pull content from the MCC using Group Policy, set the Cache Server Hostname (Setting found under Computer Configuration, Administrative Templates, Windows Components, Delivery Optimization) to the IP address of your MCC. For example 10.137.187.38.
+1. In Windows (release version 1809 and later), you can apply the policy via Group Policy Editor. The policy to apply is **DOCacheHost**. To configure the clients to pull content from the MCC using Group Policy, go to **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Delivery Optimization**. Set the **Cache Server Hostname** to the IP address of your MCC, such as `10.137.187.38`.
 
-    ![eMCC img26](images/emcc26.png)
+   :::image type="content" source="./images/ent-mcc-group-policy-hostname.png" alt-text="Screenshot of the Group Policy editor showing the Cache Server Hostname Group Policy setting.":::
 
 **Verify Content using the DO Client**
 
 To verify that the Delivery Optimization client can download content using MCC, you can use the following steps:
 
-1. Download a game or application from the Microsoft Store.   
+1. Download a game or application from the Microsoft Store.
 
-    ![eMCC img27](images/emcc27.png)
+   :::image type="content" source="./images/ent-mcc-store-example-download.png" alt-text="Screenshot of the Microsoft Store with the game, Angry Birds 2, selected.":::
 
-2. Verify downloads came from MCC by one of two methods:
 
-    - Using PowerShell Cmdlet Get-DeliveryOptimizationStatus you should see BytesFromCacheServer test  
+1. Verify downloads came from MCC by one of two methods:
 
-      ![eMCC img28](images/emcc28.png)
+    - Using the PowerShell Cmdlet Get-DeliveryOptimizationStatus you should see *BytesFromCacheServer*.
 
-    - Looking at the Delivery Optimization Activity Monitor
-
-      ![eMCC img29](images/emcc29.png)
+      :::image type="content" source="./images/ent-mcc-get-deliveryoptimizationstatus.png" alt-text="Screenshot of the output of Get-DeliveryOptimization | FT from PowerShell.":::
 
+    - Using the Delivery Optimization Activity Monitor
+    
+      :::image type="content" source="./images/ent-mcc-delivery-optimization-activity.png" alt-text="Screenshot of the Delivery Optimization Activity Monitor.":::
 ## Also see
 
 [Microsoft Connected Cache for ISPs](mcc-isp.md)<br>

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

@@ -0,0 +1,142 @@
+---
+title: Create, provision, and deploy the cache node in Azure portal
+manager: dougeby
+description: Instructions for creating, provisioning, and deploying Microsoft Connected Cache for ISP on Azure portal
+keywords: updates, downloads, network, bandwidth
+ms.prod: w10
+ms.mktglfcycl: deploy
+audience: itpro
+author: nidos
+ms.localizationpriority: medium
+ms.author: nidos
+ms.collection: M365-modern-desktop
+ms.topic: article
+---
+
+# Create, provision, and deploy the cache node in Azure portal
+
+**Applies to**
+
+- 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.
+
+> [!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.
+
+## Create cache node
+
+1. Open [Azure portal](https://www.portal.azure.com) and navigate to the **Microsoft Connected Cache** resource.
+
+1. Navigate to **Settings** > **Cache nodes** and select **Create Cache Node**.
+
+    :::image type="content" source="images/createcachenode.png" alt-text="Screenshot of the create cache node page in the Azure portal":::
+
+1. Provide a name for your cache node and select **Create** to create your cache node.
+
+    :::image type="content" source="images/cachenodename.png" alt-text="Screenshot of the create cache node page in the Azure portal, with the cache node name input field.":::
+
+## Provision cache node
+
+During the provisioning of your cache node, there are many fields for you to configure your cache node. To learn more about the definitions of each field, review the [Configuration fields](#general-configuration-fields) at the bottom of this article.
+
+### 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.
+
+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.
+
+Once client routing and other settings are configured, your cache node will be able to download content and serve traffic to your customers.
+
+At this time, only IPv4 addresses are supported. IPv6 addresses aren't supported.
+
+#### Manual routing
+
+You can manually upload a list of your CIDR blocks in Azure portal to enable manual routing of your customers to your cache node.
+
+#### BGP routing
+
+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.
+
+1. Navigate to **Settings** > **Cache nodes**. Select the cache node you wish to provision.
+
+    :::image type="content" source="images/numberedprovmcc.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.":::  
+
+1. Enter the max allowable egress that your hardware can support.  
+
+1. Under **Cache storage**, specify the location of the cache drives to store content along with the size of the cache drives in Gigabytes.  
+**Note:** Up to nine cache drives are supported.  
+
+1. Under **Routing information**, select the routing method you would like to use. For more information, see [Client routing](#client-routing).
+
+- If you choose **Manual routing**, enter your address range/CIDR blocks.  
+- If you choose **BGP routing**, enter the ASN and IP addresses of the neighborship.  
+**Note:** **Prefix count** and **IP Space** will stop showing 0 when BGP is successfully established.
+
+## Deploy cache node  
+
+Once the user executes the deployment script, resources are created behind the scenes resulting in the successful cache node installation. The script takes the input of different IDs outlined below to create an IoT Central and an IoT Edge device. Even though Microsoft Connected Cache scenario isn't related to IoT, IoT Central and IoT Edge are installed for management and communication operation purposes.
+
+### Components installed during provisioning
+
+#### IoT Central
+
+IoT Central is the main hub that handles all messaging and requests from IoT Edge devices. To learn more about the interaction between IoT Edge and IoT Central, review the [IoT Central](/azure/iot-central/core/concepts-iot-edge) documentation.
+
+#### IoT Edge
+
+IoT Edge 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.
+
+### Components of the device provisioning script
+
+There are five IDs that the device provisioning script takes as input in order to successfully provision and install your cache server. The provisioning script will automatically include these keys, with no input necessary from the user.
+
+| ID | Description |
+| -- | --- |
+| Customer ID | The Azure subscription ID that the cache node is created in. |
+| Cache node ID | The unique alphanumeric ID of the cache node being provisioned. |
+| Customer Key | |
+| Cache node name | The name of the cache node. |
+| Tenant ID | The unique ID associated with the Azure account. |
+
+:::image type="content" source="images/numbereddeploymcc.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.  
+
+1. Open a terminal window in the directory where you would like to deploy your cache node and run the following command to change the access permission to the Bash script: 
+
+    ```bash
+    sudo chmod +x installmcc.sh
+    ```
+
+1. Run the deployment script that is shown for your cache node in Azure portal by copying and pasting the script in your terminal. The script may take a few minutes to run. If there were no errors, you have set up your cache node successfully. To verify the server is set up correctly, follow the [verification steps](mcc-isp-verify-cache-node.md).
+
+## General configuration fields
+
+| Field Name | Expected Value| Description |
+| -- | --- | --- |
+| **Cache node name** | Alphanumeric string that contains no spaces  | The name of the cache node. You may choose names based on location like Seattle-1. This name must be unique and can't be changed later. |
+| **Server IP address** | IPv4 address  | IP address of your MCC server. This address is used to route end-user devices in your network to the server for Microsoft content downloads. The IP address must be publicly accessible. |
+| **Max allowable egress (Mbps)** | Integer in Mbps | The maximum egress (Mbps) of your MCC based on the specifications of your hardware. For example, 10,000 Mbps.|
+| **Enable cache node** | Enable or Disable | You can choose to enable or disable a cache node at any time. |
+
+### Storage fields
+
+| Field Name | Expected Value| Description |
+| -- | --- | --- |
+| **Cache drive** | File path string | Up to 9 drives can be configured for each cache node to configure cache storage. Enter the file path to each drive. For example: /dev/folder/ |
+| **Cache drive size in gigabytes** | Integer in GB | Set the size of each drive configured for the cache node. |
+
+### Client routing fields
+
+| Field Name | Expected Value| Description |
+| -- | --- | --- |
+| **Manual routing - Address range/CIDR blocks** | IPv4 CIDR notation | The IP address range (CIDR blocks) that should be routed to the MCC server as a comma separated list. For example: 2.21.234.0/24, 3.22.235.0/24, 4.23.236.0/24 |
+| **BGP - Neighbor ASN** | ASN | When configuring BGP, enter the ASN(s) of your neighbors that you want to establish. |
+| **BGP - Neighbor IP address** | IPv4 address | When configuring BGP, enter the IP address(es) of neighbors that you want to establish. |

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

@@ -1,55 +0,0 @@
----
-title: Create Microsoft Connected Cache for ISP
-manager: dougeby
-description: Creating Microsoft Connected Cache for ISP on Azure portal
-keywords: updates, downloads, network, bandwidth
-ms.prod: w10
-ms.mktglfcycl: deploy
-audience: itpro
-author: nidos
-ms.localizationpriority: medium
-ms.author: nidos
-ms.collection: M365-modern-desktop
-ms.topic: article
----
-
-
-# Create Microsoft Connected Cache for ISP
-
-**Applies to**
-
-- Windows 10
-- Windows 11
-
-<br/>
-
-> [!IMPORTANT]  
-
-> Before you can create your Microsoft Connected Cache, you will need to complete the sign up process [here](windows\deployment\do\mcc-isp-signup.md).
-
-<br/>
-<br/>
-
-## Create Cache Node
-<br/>
-
-
-1. Navigate to 'Cache nodes' under Settings and click 'Create Cache Node'.
-
-<br/>
- :::image type="content" source="images/createcachenode.png" alt-text="createcachenode":::
-<br/>
-
-<br/>
-
-2. Provide a name for your cache node and click 'Create' to create your cache node.
-<br/>
-
-:::image type="content" source="images/cachenodename.png" alt-text="cachenodename":::
-
-<br/>
-
-Once your cache node is created follow the instructions on [Provisioning and Deploying MCC](windows\deployment\do\mcc-isp-provision-deploy.md) to provision and deploy the cache node.
-
-
-

windows/deployment/do/mcc-isp-device-provisioning.md

@@ -22,7 +22,7 @@ The device provisioning script takes the input of different IDs outlined below t
 
 #### IoT Central
 
-IoT Central is the main hub that handles all messaging and requests from IoT Edge devices. To learn more about the interaction between IoT Edge and IoT Central, view [IoT Central](https://docs.microsoft.com/en-us/azure/iot-central/core/concepts-iot-edge) documentation.
+IoT Central is the main hub that handles all messaging and requests from IoT Edge devices. To learn more about the interaction between IoT Edge and IoT Central, review the [IoT Central](/azure/iot-central/core/concepts-iot-edge) documentation.
 
 #### IoT Edge
 
@@ -41,7 +41,7 @@ There are five IDs that the device provisioning script takes as input in order t
 | -- | --- |
 | Customer ID | The Azure subscription ID that the cache node is created in. |
 | Cache node ID | The unique alphanumeric ID of the cache node being provisioned. |
-| Customer key | |
+| Customer Key | |
 | Cache node name | The name of the cache node. |
 | Tenant ID | The unique ID associated with the Azure account. |
 

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

@@ -1,138 +0,0 @@
----
-title: FAQs on Microsoft Connected Cache for ISP
-manager: dougeby
-description: FAQs on Microsoft Connected Cache (MCC) for ISP
-keywords: updates, downloads, network, bandwidth
-ms.prod: w10
-ms.mktglfcycl: deploy
-audience: itpro
-author: nidos
-ms.localizationpriority: medium
-ms.author: nidos
-ms.collection: M365-modern-desktop
-ms.topic: article
----
-
-# Microsoft Connected Cache for ISP (public preview)
-
-**Applies to**
-
-- Windows 10
-- Windows 11
-
-<br/>
-
- **1. Is this a free service?**  
-Yes. Microsoft Connected Cache is a free service.  
-
-<br/>
-	
-**2. What will Microsoft Connected Cache do for me? How will it impact our customers?**  
-As an ISP, your network can benefit from reduced load on your backbone and improve customer download experience for supported Microsoft static content. It will also help you save on CDN costs.  
-
-<br/>
-	
-**3. Is there an NDA to sign?**  
-	No NDA is required.
-
-<br/>
-
-**4. What are the prerequisites and hardware requirements?**  
-- Azure subscription  
-- Hardware to host Microsoft Connected Cache - The recommended configuration below will serve approximately 35,000 consumer devices downloading a 2GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.  
-We have 1 customer who is able to achieve 40 Gbps egress rate using the following hardware specification:  
-    - Dell PowerEdge R330  
-	- 2 x Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz , total 32core  
-	- 48GB, Micron Technology 18ASF1G72PDZ-2G1A1, Speed: 2133 MT/s  
-	- 4 - Transcend SSD230s 1TB SATA Drives  
-Intel Corporation Ethernet 10G 2P X520 Adapter (Link Aggregated)
-
-<br/>
-
-| Taffic Estimate | Hardware/VM Recommendation |  
-|-----------|:-----------:|  
-| <5G Peak | 8 Cores<br/>16 GB Memory<br/>1 SSD Drive 500 GB |  
-| 10 - 20G Peak | 16 Cores<br/>32 GB Memory<br/>2 - 3 SSD Drives 1 TB |  
-| 20 - 40G Peak | 32 Cores<br/>64 GB Memory<br/>4 - 6 SSDs 1 TB |  
-
-<br/>
-<br/>
-	
-**5. Will I need to provide hardware BareMetal server or VM?**  
-	Microsoft Connected Cache is a software-only caching solution and will require you to provide your own server to host the software.
-	
-<br/>
-
-**6. Can we use hard drives instead of SSDs?**  
-We highly recommend using SSDs as Microsoft Connected Cache is a read intensive application. We also recommend using multiple drives to improve performance.
-
-<br/>
-
-**7. Will I need to manually enter the CIDR blocks? If I have multiple cache nodes, should I configure a subset of CIDR blocks to each cache node?**  
-You have the option to route your traffic using manual CIDR blocks or BGP. If you have multiple Microsoft Connected Cache(s), you can allocate subsets of CIDR blocks to each cache node if you wish. However, since Microsoft Connected Cache has automatic load balancing, we recommend adding all of your traffic to all of your cache nodes.
-	
-<br/>
-
-**8. Should I add any load balancing mechanism?**  
-You do not need to add any load balancing. Our service will take care of routing traffic if you have multiple cache nodes serving the same CIDR blocks based on the reported health of the cache node.
-
-<br/>
-
-**9. How many Microsoft Connected Cache instances will I need? How do we setup if we support multiple countries?**  
-As stated in the table above, the recommended configuration will achieve near the maximum possible egress of 20Gbps with a two-port link aggregated NIC and four cache drives. If you provide us with your ASN numbers, we can give a rough estimate of how many Microsoft Connected Cache instances may be needed. If your ISP spans multiple countries, you can set up separate cache nodes per country.
-
-<br/>
-
-**10. Where should we install Microsoft Connected Cache?**  
-You are in control of your hardware and you can pick the location based on your traffic and end customers. You can choose the location where you have your routers or where you have dense traffic or any other parameters.
-
-<br/>
-	
-**11. How long would a piece of content live within the Microsoft Connected Cache? Is content purged from the cache?**  
-A request for said content is made, and NGINX looks at the cache control headers from the original acquisition, and if that content has expired, NGINX will continue to serve the stale content while it is downloading the new content.  We are caching the content for 30 days.  The content will be in the hot cache path (open handles and such) for 24 hrs, but will reside on disk for 30 days.  
-The drive fills up and nginx will start to delete content based on its own algorithm, probably some combination of least recently used.
-	
-<br/>
-
-**12. What content is cached by Microsoft Connected Cache?**  
-See [Delivery Optimization and Microsoft Connected Cache content endpoints - Windows Deployment](delivery-optimization-endpoints.md) for more information.
-
-<br/>
-	
-**13. Does Microsoft Connected Cache support Xbox or Teams content?**  
-Currently, Microsoft Connected Cache does not support Xbox or Teams content. However, supporting Xbox content is of high priority, and we expect this feature in the near future. We'll let you know as soon as it becomes available!
-
-<br/>
-	
-**14. Is IPV6 supported?**  
-No, we do not currently support IPV6. We plan to support it in the future. 
-		
-<br/>
-
-**15. Is Microsoft Connected Cache stable and reliable?**  
-We have already successfully onboarded ISPs in many countries around the world and have received positive feedback! However, you can always start off with a portion of your CIDR blocks to test out the performance of MCC before expanding to more customers.
-
-<br/>
-
-**16.How does Microsoft Connected Cache populate its content?**  
-Microsoft Connected Cache is a cold cache warmed by client requests. The client requests content and that is what fills up the cache. There is no off-peak cache fill necessary.  
-Microsoft Connected Cache will reach out to different CDN providers just like a client device would. The traffic flow from Microsoft Connected Cache will vary depending on how you currently transit to each of these CDN providers. The content can come from 3rd party CDNs or from AFD.
-	
-<br/>
-	
-**17. What do I do if I need more support and have more questions even after reading this FAQ page?**  
-You can find more information or post your questions on MCC Community Forum.  
-<link to community forum>  
-
-For further support for your Microsoft Connected Cache you can find solutions to common problems here. <link to common issues>
-
-<br/>
-
-**18. What CDNs will Microsoft Connected Cache pull content from?**  
-	Microsoft relies on a dynamic mix of 1st and 3rd party CDN providers to ensure enough capacity, redundancy, and performance for the delivery of Microsoft served content.  Though we do not provide lists of the CDN vendors we utilize as they can change without notice, our endpoints are public knowledge.  If someone were to perform a series of DNS lookups against our endpoints (tlu.dl.delivery.mp.microsoft.com for example), they would be able to determine which CDN or CDNs were in rotation at a given point in time:
-	 
-		$ dig +noall +answer tlu.dl.delivery.mp.microsoft.com | grep -P "IN\tA"
-		c-0001.c-msedge.net.    20      IN      A       13.107.4.50
-		 
-		$ whois 13.107.4.50|grep "Organization:"
-		Organization:   Microsoft Corporation (MSFT)

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

@@ -0,0 +1,77 @@
+### YamlMime:FAQ
+metadata:
+  title: Microsoft Connected Cache Frequently Asked Questions
+  description: The following article is a list of frequently asked questions for Microsoft Connected Cache.
+  ms.sitesec: library
+  ms.pagetype: security
+  ms.localizationpriority: medium
+  author: amymzhou
+  ms.author: amymzhou
+  manager: dougeby
+  audience: ITPro
+  ms.collection:
+    - M365-security-compliance
+    - highpri
+  ms.topic: faq
+  ms.date: 09/30/2022
+  ms.custom: seo-marvel-apr2020
+title: Microsoft Connected Cache Frequently Asked Questions
+summary: |
+  **Applies to**
+  -   Windows 10
+  -   Windows 11
+  
+sections:
+  - name: Ignored
+    questions:
+      - question: Is this product a free service?
+        answer: Yes. Microsoft Connected Cache is a free service.  
+      - question: What will Microsoft Connected Cache do for me? How will it impact our customers?
+        answer: As an ISP, your network can benefit from reduced load on your backbone and improve customer download experience for supported Microsoft static content. It will also help you save on CDN costs.  
+      - question: Is there a non-disclosure agreement to sign?
+        answer: No non-disclosure agreement is required.
+      - question: What are the prerequisites and hardware requirements?
+        answer: | 
+         - Azure subscription  
+         - Hardware to host Microsoft Connected Cache - The recommended configuration below will serve approximately 35,000 consumer devices downloading a 2-GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.  
+
+         We have one customer who is able to achieve 40-Gbps egress rate using the following hardware specification:  
+          - Dell PowerEdge R330  
+          - 2 x Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40 GHz , total 32 core  
+          - 48 GB, Micron Technology 18ASF1G72PDZ-2G1A1, Speed: 2133 MT/s  
+          - 4 - Transcend SSD230s 1 TB SATA Drives  
+          Intel Corporation Ethernet 10G 2P X520 Adapter (Link Aggregated)
+      - question: Will I need to provide hardware BareMetal server or VM?
+        answer: Microsoft Connected Cache is a software-only caching solution and will require you to provide your own server to host the software.
+      - question: Can we use hard drives instead of SSDs?
+        answer: We highly recommend using SSDs as Microsoft Connected Cache is a read intensive application. We also recommend using multiple drives to improve performance.  
+      - question: Will I need to manually enter the CIDR blocks? If I have multiple cache nodes, should I configure a subset of CIDR blocks to each cache node?
+        answer: You can choose route your traffic using manual CIDR blocks or BGP. If you have multiple Microsoft Connected Cache(s), you can allocate subsets of CIDR blocks to each cache node if you wish. However, since Microsoft Connected Cache has automatic load balancing, we recommend adding all of your traffic to all of your cache nodes.  
+      - question: Should I add any load balancing mechanism?
+        answer: You don't need to add any load balancing. Our service will take care of routing traffic if you have multiple cache nodes serving the same CIDR blocks based on the reported health of the cache node.  
+      - question: How many Microsoft Connected Cache instances will I need? How do we set up if we support multiple countries?
+        answer: As stated in the table above, the recommended configuration will achieve near the maximum possible egress of 20 Gbps with a two-port link aggregated NIC and four cache drives. If you provide us with your ASN numbers, we can give a rough estimate of how many Microsoft Connected Cache instances may be needed. If your ISP spans multiple countries, you can set up separate cache nodes per country.  
+      - question: Where should we install Microsoft Connected Cache?
+        answer: You are in control of your hardware and you can pick the location based on your traffic and end customers. You can choose the location where you have your routers or where you have dense traffic or any other parameters.
+      - question: How long would a piece of content live within the Microsoft Connected Cache? Is content purged from the cache?
+        answer: Once a request for said content is made, NGINX will look at the cache control headers from the original acquisition. If that content has expired, NGINX will continue to serve the stale content while it's downloading the new content.  We cache the content for 30 days. The content will be in the hot cache path (open handles and such) for 24 hrs, but will reside on disk for 30 days. The drive fills up and nginx will start to delete content based on its own algorithm, probably some combination of least recently used.
+      - question: What content is cached by Microsoft Connected Cache?
+        answer: For more information about content cached, see [Delivery Optimization and Microsoft Connected Cache content endpoints - Windows Deployment](delivery-optimization-endpoints.md).  
+      - question: Does Microsoft Connected Cache support Xbox or Teams content?
+        answer: Currently, Microsoft Connected Cache doesn't support Xbox or Teams content. However, supporting Xbox content is of high priority, and we expect this feature soon. We'll let you know as soon as it becomes available!  
+      - question: Is IPv6 supported?
+        answer: No, we don't currently support IPV6. We plan to support it in the future.   
+      - question: Is Microsoft Connected Cache stable and reliable?
+        answer: We have already successfully onboarded ISPs in many countries around the world and have received positive feedback! However, you can always start off with a portion of your CIDR blocks to test out the performance of MCC before expanding to more customers.
+      - question: How does Microsoft Connected Cache populate its content?
+        answer: Microsoft Connected Cache is a cold cache warmed by client requests. The client requests content and that is what fills up the cache. There's no off-peak cache fill necessary. Microsoft Connected Cache will reach out to different CDN providers just like a client device would. The traffic flow from Microsoft Connected Cache will vary depending on how you currently transit to each of these CDN providers. The content can come from third party CDNs or from AFD.
+      - 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).
+      - question: What CDNs will Microsoft Connected Cache pull content from?
+        answer: | 
+         Microsoft relies on a dynamic mix of 1st and 3rd party CDN providers to ensure enough capacity, redundancy, and performance for the delivery of Microsoft served content.  Though we don't provide lists of the CDN vendors we utilize as they can change without notice, our endpoints are public knowledge.  If someone were to perform a series of DNS lookups against our endpoints (tlu.dl.delivery.mp.microsoft.com for example), they would be able to determine which CDN or CDNs were in rotation at a given point in time:
+         $ dig +noall +answer tlu.dl.delivery.mp.microsoft.com | grep -P "IN\tA"
+         c-0001.c-msedge.net.    20      IN      A       13.107.4.50
+
+         $ whois 13.107.4.50|grep "Organization:"
+         Organization:   Microsoft Corporation (MSFT)

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

@@ -32,14 +32,15 @@ Within Azure portal, you're able to build your custom charts and graphs using th
 |  **Average in**|  The average egress (in Gbps) of inbound traffic| 
 | **Average out**| The average egress (in Gbps) of outbound traffic| 
 
-To learn more about how to build your custom charts and graphs, visit [Azure Monitor](https://docs.microsoft.com/en-us/azure/azure-monitor/essentials/data-platform-metrics) for details.
+To learn more about how to build your custom charts and graphs, visit [Azure Monitor](/azure/azure-monitor/essentials/data-platform-metrics) for details.
 
 ### Monitoring your metrics
-To view the metrics associated with your cache nodes, navigate to the Overview >> Monitoring tab within Azure portal.
 
-:::image type="content" source="images/mcc-isp-metrics.png" alt-text="Screenshot of the Azure portal displaying the metrics view in the Overview tab":::
+To view the metrics associated with your cache nodes, navigate to the **Overview** > **Monitoring** tab within Azure portal.
 
-You can choose to monitor the health and performance of all cache nodes or one by one by using the dropdown menu. The Egress bits per second graph shows your inbound and outbound traffic of your cache nodes over time. You can change the time range (1 hour, 12 hours, 1 day, 7 days, 14 days, and 30 days) by selecting the time range of choice on the top bar.
+:::image type="content" source="./images/mcc-img-metrics.png" alt-text="Screenshot of the Azure portal displaying the metrics view in the Overview tab":::
+
+You can choose to monitor the health and performance of all cache nodes or one at a time by using the dropdown menu. The Egress bits per second graph shows your inbound and outbound traffic of your cache nodes over time. You can change the time range (1 hour, 12 hours, 1 day, 7 days, 14 days, and 30 days) by selecting the time range of choice on the top bar.
 
 If you're unable to view metrics for your cache node, it may be that your cache node is unhealthy, inactive, or hasn't been fully configured.
 

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

@@ -18,83 +18,53 @@ ms.topic: article
 
 **Applies to**
 
-- Windows 10
+- Windows 10
 - Windows 11
 
-<br/>
-
-
 > [!IMPORTANT]  
-> Before you can create your Microsoft Connected Cache, you will need to complete the sign up process [here](windows\deployment\do\mcc-isp-signup.md).
+> Before you can create your Microsoft Connected Cache, you will need to complete the [sign up process](mcc-isp-signup.md).
 
-<br/>
-<br/>
+## Create a cache node
 
+1. Navigating to **Cache nodes** under **Settings**.
+1. Select **Create Cache Node**.
+1. Provide a name for your cache node
+1. Select **Create** to create your cache node.  
 
+## Provision your cache node  
 
-Create your cache node by navigating to 'Cache nodes' under Settings and click 'Create Cache Node'. Provide a name for your cache node and click 'Create' to create your cache node.  
+1. Select the cache node you want to provision and deploy.
 
-<br/> 
+   :::image type="content" source="./images/numberedprovmcc.png" alt-text="Screenshot of the Settings tab in the Cache nodes page.":::  
 
-<br/>
+1. Enter the max allowable egress that your hardware can support.  
 
-### Provision your cache node:  
-<br/> 
+1. Under Cache storage, specify the location of the cache drives to store content along with the size of the cache drives in Gigabytes.  
+   > [!NOTE]
+   > You can add up to nine cache drives.  
 
-1. Click on the cache node you want to provision and deploy.
-<br/> 
+1. Under Routing information, select the routing source you would like to use. For more information, see [client routing](mcc-isp-client-routing.md). 
 
-<br/>
-:::image type="content" source="images/numberedprovmcc.png" alt-text="numberedprovmcc":::  
+   - If you choose **Manual** routing, enter Address range/CIDR blocks and the number of IP space.  
+   - If you choose **BGP** routing, enter the ASN and IP addresses of the neighborship.
+    > [!Note] 
+    > **Prefix count** and **IP Space** will stop showing 0 when BGP is successfully established.
 
-<br/>  
-
-2. Enter the max allowable egress that your hardware can support.  
-
-<br/> 
-
-3. Under Cache storage, specify the location of the cache drives to store content along with the size of the cache drives in Gigabytes.  
-Note: You can add upto nine cache drives.  
-
-<br/>
-
-4. Under Routing information, select the routing source you would like to use. For more information see client routing [here](windows\deployment\do\mcc-isp-client-routing.md).
-<br/>  
-
-- If you choose Manual routing, enter Address range/CIDR blocks and the number of IP space.  
-<br/>
-- If you choose BGP routing, enter the ASN and IP addresses of the neighborship.  
-Note: 'Prefix count' and 'IP Space' will stop showing 0 when BGP is successfuly established.
-
-<br/>
-<br/>
-
-### Deploy your cache node:  
+## Deploy your cache node 
  
-:::image type="content" source="images/numbereddeploymcc.png" alt-text="numbereddeploymcc":::
+:::image type="content" source="./images/numbereddeploymcc.png" alt-text="Screenshot of the Azure portal showing the Server provisioning tab.":::
 
-<br/>  
 
-5. Under Server provisioning, download the provisioning package to your server.  
+1. Under **Server provisioning**, download the provisioning package to your server.  
 
     Open a terminal window and run the following command to change the access permission to the Bash script.  
-<br/>
 
     ```bash
     sudo chmod +x installmcc.sh
     ```
 
-<br/>  
-
-6. Run the provisioning script that is shown for your cache node.  
+1. Run the provisioning script that is shown in the Azure portal for your cache node.  
 
 
-<br/>
-<br/>
+1. If there were no errors, you've set up your cache node. To verify the server is set up correctly, follow the [verification steps](mcc-isp-verify-cache-node.md).
 
-<<<<<<< HEAD
-If there were no errors, you have set up your cache node. To verify the server is set up correctly, follow the steps verification steps [here](windows\deployment\do\mcc-isp-verify-cache-node.md).
-=======
-8. If there were no errors, you have set up your cache node. To verify the server is set up correctly, follow the steps verification steps [here](windows\deployment\do\mcc-isp-verify-cache-node.md).
-
->>>>>>> c023d7d15cf06494a2799bdfb23d7674fa5fbb05

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

@@ -1,5 +1,5 @@
 ---
-title: Service onboarding for Microsoft Connected Cache for ISP
+title: Operator sign up and service onboarding
 manager: dougeby
 description: Service onboarding for Microsoft Connected Cache for ISP
 keywords: updates, downloads, network, bandwidth
@@ -13,46 +13,75 @@ ms.collection: M365-modern-desktop
 ms.topic: article
 ---
 
-
-# Service Onboarding for Microsoft Connected Cache for ISP
+# Operator sign up and service onboarding for Microsoft Connected Cache
 
 **Applies to**
 
-- Windows 10
+- Windows 10
 - Windows 11
 
-<br/>
+This article details the process of signing up for Microsoft Connected Cache for Internet Service Providers (Public Preview). 
 
 ## Resource creation and sign up process  
 
+1. Navigate to the [Azure portal](https://www.portal.azure.com). In the top search bar, search for **Microsoft Connected Cache**.
 
-<br/>
+:::image type="content" source="./images/searchmcc.png" alt-text="Screenshot of the Azure portal that shows the Microsoft Connected Cache resource in Azure marketplace.":::
 
-1. Search for 'Microsoft Connected Cache' and go through the process of creating a resource by selecting the region and enter a name for your cache resource name.  
+1. Select **Create** to create a **Microsoft Connected Cache**. When prompted, enter a name for your cache resource.  
 
-:::image type="content" source="images/searchmcc.png" alt-text="searchmcc":::
+   > [!IMPORTANT]
+   > After your resource has been created, we need some information to verify your network operator status and approve you to host Microsoft Connected Cache nodes. Please ensure that your [Peering DB](https://www.peeringdb.com/) organization information is up to date as this information will be used for verification. The NOC contact email will be used to send verification information.
 
+1. Navigate to **Settings** > **Sign up**. Enter your organization ASN. Indicate whether you're a transit provider. If so, additionally, include any ASN(s) for downstream network operators that you may transit traffic for.
 
-<br/>
+   :::image type="content" source="./images/signup1.png" alt-text="Screenshot of the sign up page in the Microsoft Connected Cache resource page in Azure portal.":::
 
-> [!IMPORTANT] 
-After your resource has been created, we need some information to verify you network operator status and approve you to host a Microsoft Connected Cache nodes.  
-> Please ensure that your [Peering DB](https://www.peeringdb.com/) organization information is up to date as this information will be used for verification.
- 
-<br/>
+1. Once we verify the information entered, a verification code will be sent to the NOC email address provided on [Peering DB](https://www.peeringdb.com/). Once you receive the email, navigate to your Azure portal > **Microsoft Connected Cache** > **Settings** > **Verify operator**, and enter the verification code sent to the NOC email address.
 
-2. Add your organization ASN below. The NOC contact email will be used to send verification information. Additionally, please include any ASN(s) for downstream network operators that you may transit traffic for.  
+    > [!NOTE]
+    > Verification codes expire in 24 hours. You will need to generate a new code if it expires.  
 
-:::image type="content" source="images/signup1.png" alt-text="sign up for mcc":::
+    :::image type="content" source="images/verification.png" alt-text="Screenshot of the sign up verification page on Azure portal for Microsoft Connected Cache.":::
 
-<br/>
+1. Once verified, follow the instructions in [Create, provision, and deploy cache node](mcc-isp-create-provision-deploy.md) to create your cache node.
 
-3.  Once we verify the information entered, a verification code will be sent to the NOC email address provided on Peering DB. In the Azure portal operator verification blade enter the verification code sent to the NOC email address.  
-**Note:** The verification code will expire in 24 hours. You will need to generate a new code if it expires.  
+## Traffic estimation
 
-:::image type="content" source="images/verification.png" alt-text="operatorverification":::
+During the sign-up process, Microsoft will provide you with a traffic estimation based on your ASN(s). We make estimations based on our predictions on historical data about Microsoft content download volume. We'll use these estimations to recommend hardware or VM configurations. You can review these recommendations within the Azure portal.
 
-<br/>
-<br/>
-Once verified follow the instruction on [Create Microsoft Connected Cache for ISP](windows\deployment\do\mcc-isp-create.md) to create your cache node.
+We make these estimations based on the Microsoft content types that Microsoft Connected Cache serves. To learn more about the types of content that are supported, see [Delivery Optimization and Microsoft Connected Cache content type endpoints](delivery-optimization-endpoints.md).
 
+### Cache performance
+
+To make sure you're maximizing the performance of your cache node, review the following information:
+
+#### OS requirements
+
+The Microsoft Connected Cache module is optimized for Ubuntu 20.04 LTS. Install Ubuntu 20.04 LTS on a physical server or VM of your choice.
+
+#### NIC requirements
+
+- Multiple NICs on a single MCC instance are supported using a *link aggregated* configuration.
+- 10 Gbps NIC is the minimum speed recommended, but any NIC is supported.
+
+#### Drive performance
+
+The maximum number of disks supported is 9. When configuring your drives, we recommend SSD drives as cache read speed of SSD is superior to HDD. In addition, using multiple disks is recommended to improve cache performance. 
+
+RAID disk configurations are discouraged as cache performance will be impacted. If using RAID disk configurations, ensure striping.
+
+### Hardware configuration example
+
+There are many hardware configurations that suit Microsoft Connected Cache. As an example, a customer has deployed the following hardware configuration and is able achieve a peak egress of about 35 Gbps:
+
+**Dell PowerEdge R330**
+
+- 2 x Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40 GHz, total 32 core
+- 48 GB, Micron Technology 18ASF1G72PDZ-2G1A1, Speed: 2133 MT/s
+- 4 - Transcend SSD230s 1 TB SATA Drives
+- Intel Corporation Ethernet 10G 2P X520 Adapter (Link Aggregated)
+
+### Virtual machines
+
+Microsoft Connected Cache supports both physical and virtual machines as cache servers. If you're using a virtual machine as your server, refer to [VM performance](mcc-isp-vm-performance.md) for tips on how to improve your VM performance.

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

@@ -1,5 +1,5 @@
 ---
-title: Troubleshooting Issues for Microsoft Connected Cache for ISP
+title: Support and troubleshooting
 manager: dougeby
 description: Troubleshooting Issues for Microsoft Connected Cache for ISP
 keywords: updates, downloads, network, bandwidth
@@ -13,38 +13,34 @@ ms.collection: M365-modern-desktop
 ms.topic: article
 ---
 
-# Troubleshooting Issues for Microsoft Connected Cache for ISP (public preview)
+# Support and troubleshooting
 
 **Applies to**
 
-- Windows 10
+- Windows 10
 - Windows 11
 
-<br/>
+## Sign up errors
 
-## Sign up Errors
+### Cannot verify account
 
-### Could not verify account:  
-During sign up we verify the information you provide against what is present in [Peering DB]. Make sure the information you have provided on Peering DB is up to date and matches what you provide during sign up.
-<br/>
-<br/>
+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: 
-During sign up, a verification code is sent to your NOC email address present in Peering DB. **TBD** This code expires in 24 hours. You will need to request a new verification code and use that to complete sign up.  
-<br/>
-
-<br/>
+### 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 expired, you'll need to request a new verification code to complete the sign-up.  
 
 ## Cache Node Errors  
 
-### Cannot find my cache node:  
-If you previously had access to your cache nodes but it is now no longer accessible, it may be because you had a trial subscription and its trial period ended. 
-#### Recommended steps:  
-1. Create a new Azure Pay As You Go subscription  
-1. Recreate the cache nodes using the new subscription 
+### Cannot find my cache node
 
-#### Recommended Documents:  
-[Steps to obtain Azure subscription](https://aka.ms/MCC-Azure-Subscription)   
-[Pay-as-you-go-subscription](https://azure.microsoft.com/en-us/offers/ms-azr-0003p/)  
-[Azure free account FAQs](https://azure.microsoft.com/en-us/free/free-account-faq/) 
+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
+
+### Recommended Documents
+
+[Steps to obtain Azure subscription](https://aka.ms/MCC-Azure-Subscription)
+[Pay-as-you-go-subscription](https://azure.microsoft.com/offers/ms-azr-0003p/)
+[Azure free account FAQs](https://azure.microsoft.com/free/free-account-faq/)

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

@@ -17,9 +17,8 @@ ms.topic: article
 
 There are two main steps required to uninstall your cache node:
 
-
-1. Remove your cache node from Azure portal
-1. Run the uninstall script to cleanly remove MCC from your server
+1. Remove your cache node from Azure portal.
+1. Run the uninstall script to cleanly remove MCC from your server.
 
 
 ## Remove your cache node from Azure portal
@@ -27,6 +26,7 @@ There are two main steps required to uninstall your cache node:
 Within Azure portal, navigate to **Cache Nodes**, then select the cache node you wish to delete. Once selected, select **Delete** on the top bar to remove this cache node from your account. 
 
 ## Run the uninstall script to cleanly remove MCC from your server
+
 In the installer zip file, you'll find the file **uninstallmcc.sh**. This script uninstalls MCC and all the related components. Only run it if you're facing issues with MCC installation.
 
 The **uninstallmcc.sh** script removes the following components:

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

@@ -1,7 +1,7 @@
 ---
-title: Update your cache node
+title: Update or uninstall your cache node
 manager: dougeby
-description: How to update your cache node
+description: How to update or uninstall your cache node
 keywords: updates, downloads, network, bandwidth
 ms.prod: w10
 ms.mktglfcycl: deploy
@@ -13,11 +13,48 @@ ms.collection: M365-modern-desktop
 ms.topic: article
 ---
 
-# Update your cache node
+# Update or uninstall your cache node
+
+This article details how to update or uninstall your cache node. 
+
+## Update cache node
 
 Microsoft will release updates for Microsoft Connected Cache periodically to improve performance, functionality, and security. Updates won't require any action from the customer. Instead, when an update is available, your cache node will automatically update during low traffic hours with minimal to no impact to your end customers. 
 
 To view which version your cache nodes are currently on, navigate to the **Cache nodes** tab to view the versions in the list view.
 
-To view update release notes, visit [Version History](mcc-version-history.md).
+To view update release notes, visit [Version history](mcc-version-history.md).
 
+## Uninstall cache node
+
+There are two main steps required to uninstall your cache node:
+
+1. Remove your cache node from Azure portal
+1. Run the uninstall script to cleanly remove MCC from your server
+
+You must complete both steps to ensure a clean uninstall of your cache node.
+
+### Remove your cache node from Azure portal
+
+Within [Azure portal](https://www.portal.azure.com), navigate to **Cache Nodes**, then select the cache node you wish to delete. Once selected, select **Delete** on the top bar to remove this cache node from your account.
+
+### Run the uninstall script to cleanly remove Microsoft Connected Cache from your server
+
+In the installer zip file, you'll find the file **uninstallmcc.sh**. This script uninstalls Microsoft Connected Cache and all the related components. Only run it if you're facing issues with Microsoft Connected Cache installation.
+
+The **uninstallmcc.sh** script removes the following components:
+
+- IoT Edge
+- Edge Agent
+- Edge Hub
+- MCC
+- Moby CLI
+- Moby engine
+
+To run the script, use the following commands:
+
+```bash
+sudo chmod +x uninstallmcc.sh
+sudo ./uninstallmcc.sh
+
+```

windows/deployment/do/mcc-isp-verify-cache-node.md

@@ -1,5 +1,5 @@
 ---
-title: Verify cache node functionality
+title: Verify cache node functionality and monitor health and performance
 manager: dougeby
 description: How to verify the functionality of a cache node
 keywords: updates, downloads, network, bandwidth
@@ -13,13 +13,15 @@ ms.collection: M365-modern-desktop
 ms.topic: article
 ---
 
-# Verify cache node functionality
+# Verify cache node functionality and monitor health and performance
 
-### Verify functionality on Azure portal
+This article details how to verify that your cache node(s) are functioning properly and serving traffic. In addition, this article details 
 
-Log into Azure portal and navigate to the Overview page. Select the **Monitoring** tab to verify the functionality of your server(s) by validating the number of healthy nodes shown. If you see any **Unhealthy nodes**, select the "Diagnose and Solve" link to troubleshoot and resolve the issue.
+## Verify functionality on Azure portal
 
-### Verify functionality on the server
+Log into [Azure portal](https://www.portal.azure.com) and navigate to the **Overview** page. Select the **Monitoring** tab to verify the functionality of your server(s) by validating the number of healthy nodes shown. If you see any **Unhealthy nodes**, select the **Diagnose and Solve** link to troubleshoot and resolve the issue.
+
+## Verify functionality on the server
 
 It can take a few minutes for the container to deploy after you've saved the configuration.
 
@@ -47,6 +49,34 @@ Similarly, enter the following URL into a web browser on any device on the netwo
 http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com
 ```
 
+If the test fails, for more information, see the [FAQ](mcc-isp-faq.yml) article.
 
-If the test fails, for more information, see the [FAQs](#mcc-isp-faq) section.
+## Monitor cache node health and performance
 
+Within Azure portal, there are many charts and graphs that are available to monitor cache node health and performance.
+
+### Available Metrics
+
+Within Azure portal, you're able to build your custom charts and graphs using the following available metrics:
+
+| Metric name | Description |
+| -- |  ---- |  
+| **Cache Efficiency** |  Cache efficiency is defined as the total cache hit bytes divided by all bytes requested. The higher this value (0 - 100%), the more efficient the cache node is. |
+| **Healthy nodes** |  The number of cache nodes that are reporting as healthy|
+| **Unhealthy nodes**| The number of cache nodes that are reporting as unhealthy|
+| **Maximum in**| The maximum egress (in Gbps) of inbound traffic|
+| **Maximum out**| The maximum egress (in Gbps) of outbound traffic|
+|  **Average in**|  The average egress (in Gbps) of inbound traffic|
+| **Average out**| The average egress (in Gbps) of outbound traffic|
+
+For more information about how to build your custom charts and graphs, see [Azure Monitor](/azure/azure-monitor/essentials/data-platform-metrics).
+
+### Monitoring your metrics
+
+To view the metrics associated with your cache nodes, navigate to the **Overview** > **Monitoring** tab within the Azure portal.
+
+:::image type="content" source="./images/mcc-img-metrics.png" alt-text="Screenshot of the Azure portal displaying the metrics view in the Overview tab":::
+
+You can choose to monitor the health and performance of all cache nodes or one at a time by using the dropdown menu. The **Egress bits per second** graph shows your inbound and outbound traffic of your cache nodes over time. You can change the time range (1 hour, 12 hours, 1 day, 7 days, 14 days, and 30 days) by selecting the time range of choice on the top bar.
+
+If you're unable to view metrics for your cache node, it may be that your cache node is unhealthy, inactive, or hasn't been fully configured.

windows/deployment/do/mcc-version-history.md

@@ -13,8 +13,11 @@ ms.collection: M365-modern-desktop
 ms.topic: article
 ---
 
-# Current Version
-### Version 1332
+# Version History
+Microsoft periodically releases software updates for your cache nodes to improve performance, caching efficiency, and other bug fixes. These updates will be performed automatically at low-traffic hours, requiring no 
+
+## Current Version
+#### Version 1332
 Released September 15, 2022
 
 Version notes: