Merge pull request #7037 from amymzhou/main

MCC for ISP Public Preview Docs  - To Be Merged Monday 11/21 10:30am

.openpublishing.redirection.json

@@ -19930,6 +19930,11 @@
       "redirect_url": "/windows/client-management/wmi-providers-supported-in-windows",
       "redirect_document_id": false
      },
+     {
+      "source_path": "windows/deployment/do/mcc-enterprise.md",
+      "redirect_url": "/windows/deployment/do/waas-microsoft-connected-cache",
+      "redirect_document_id": false
+    },
     {
       "source_path": "windows/client-management/advanced-troubleshooting-802-authentication.md",
       "redirect_url": "/troubleshoot/windows-client/networking/802-1x-authentication-issues-troubleshooting",

windows/deployment/do/TOC.yml

@@ -1,40 +1,21 @@
-- name: Delivery Optimization for Windows client
+- name: Delivery Optimization for Windows client and Microsoft Connected Cache
   href: index.yml
+- name: What's new
+  href: whats-new-do.md
   items: 
-    - name: Get started
+- name: Delivery Optimization
   items: 
   - name: What is Delivery Optimization
     href: waas-delivery-optimization.md
-        - name: What's new
-          href: whats-new-do.md
   - name: Delivery Optimization Frequently Asked Questions
     href: waas-delivery-optimization-faq.yml    
-          
-
-     
-    - name: Configure Delivery Optimization
+  - name: Configure Delivery Optimization for Windows clients
     items:
-        - name: Configure Windows Clients
-          items:
-            - name: Windows Delivery Optimization settings
+    - name: Windows client Delivery Optimization settings
       href: waas-delivery-optimization-setup.md#recommended-delivery-optimization-settings
-            - name: Windows Delivery Optimization Frequently Asked Questions
-              href: ../do/waas-delivery-optimization-faq.yml
-        - name: Configure Microsoft Intune
-          items:
-            - name: Delivery Optimization settings in Microsoft Intune
+    - name: Configure Delivery Optimization settings using Microsoft Intune
       href: /mem/intune/configuration/delivery-optimization-windows
-     
-    - name: Microsoft Connected Cache
-      items:
-        - name: MCC overview
-          href: waas-microsoft-connected-cache.md
-        - name: MCC for Enterprise and Education
-          href: mcc-enterprise.md
-        - name: MCC for ISPs
-          href: mcc-isp.md
-
-    - name: Resources
+  - name: Resources for Delivery Optimization
     items:
     - name: Set up Delivery Optimization for Windows
       href: waas-delivery-optimization-setup.md
@@ -44,8 +25,43 @@
       href: delivery-optimization-workflow.md       
     - name: Using a proxy with Delivery Optimization
       href: delivery-optimization-proxy.md
-        - name: Content endpoints for Delivery Optimization and Microsoft Connected Cache
+- name: Microsoft Connected Cache
+  items:
+    - name: Microsoft Connected Cache overview
+      href: waas-microsoft-connected-cache.md
+    - name: MCC for Enterprise and Education
+      items:
+      - name: Requirements
+        href: mcc-enterprise-prerequisites.md
+      - name: Deploy Microsoft Connected Cache
+        href: mcc-enterprise-deploy.md
+      - name: Update or uninstall MCC
+        href: mcc-enterprise-update-uninstall.md
+      - name: Appendix
+        href: mcc-enterprise-appendix.md
+    - name: MCC for ISPs
+      items:
+      - name: How-to guides
+        items:  
+        - name: Operator sign up and service onboarding
+          href: mcc-isp-signup.md
+        - 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 or uninstall your cache node
+          href: mcc-isp-update.md
+      - name: Resources
+        items:
+        - 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: MCC for ISPs (early preview)
+          href: mcc-isp.md
+- name: Content endpoints for Delivery Optimization and Microsoft Connected Cache
   href: delivery-optimization-endpoints.md 
-        - name: Testing Delivery Optimization
-          href: delivery-optimization-test.md        
+
   

windows/deployment/do/images/elixir_ux/readme-elixir-ux-files.md

@@ -0,0 +1,30 @@
+---
+title: Don't Remove images under do/images/elixir_ux - used by Azure portal Diagnose/Solve feature UI
+manager: aaroncz
+description: Elixir images read me file
+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
+---
+
+# Read Me
+
+This file contains the images that are included in this GitHub repository that are used by the Azure UI for Diagnose and Solve. The following images _shouldn't be removed_ from the repository: 
+
+:::image type="content" source="ux-check-verbose-2.png" alt-text="A screenshot that shows 6 out of the 22 checks raising errors.":::
+
+:::image type="content" source="ux-check-verbose-1.png" alt-text="A screenshot that all checks passing after the iotedge check command.":::
+
+:::image type="content" source="ux-connectivity-check.png" alt-text="A screenshot of green checkmarks, showing that all of the connectivity checks are successful.":::
+
+:::image type="content" source="ux-edge-agent-failed.png" alt-text="A screenshot of the terminal after the command 'iotedge list', which shows three containers and the edgeAgent container failing.":::
+
+:::image type="content" source="ux-iot-edge-list.png" alt-text="A screenshot of the terminal after the command 'iotedge list', showing all three containers running successfully.":::
+
+:::image type="content" source="ux-mcc-failed.png" alt-text="A screenshot of the terminal after the command 'iotedge list', showing the MCC container in a failure state.":::