Merge branch 'main' into do-8858158

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

@@ -3,7 +3,7 @@ title: Using a proxy with Delivery Optimization
 description: Settings to use with various proxy configurations to allow Delivery Optimization to work in your environment.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: article
 author: cmknox
 ms.author: carmenf
 manager: aaroncz
@@ -66,7 +66,7 @@ You can set a device-wide proxy that will apply to all users including an intera
 
 Or, if you use Group Policy, you can apply proxy settings to all users of the same device by enabling the **Computer Configuration\ Administrative Templates\ Windows Components\ Internet Explorer\ Make proxy settings per-machine (rather than per-user)** policy.
 
-This policy is meant to ensure that proxy settings apply uniformly to the same computer and do not vary from user to user, so if you enable this policy, users cannot set user-specific proxy settings. They must use the zones created for all users of the computer. If you disable this policy or do not configure it, users of the same computer can establish their own proxy settings.
+This policy is meant to ensure that proxy settings apply uniformly to the same computer and don't vary from user to user, so if you enable this policy, users can't set user-specific proxy settings. They must use the zones created for all users of the computer. If you disable this policy or don't configure it, users of the same computer can establish their own proxy settings.
 
 ## Using a proxy with Microsoft Connected Cache
 

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

@@ -3,7 +3,7 @@ title: Delivery Optimization workflow, privacy, security, and endpoints
 description: Details of how Delivery Optimization communicates with the server when content is requested to download including privacy, security, and endpoints.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: article
 author: cmknox
 ms.author: carmenf
 manager: aaroncz

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

@@ -5,7 +5,7 @@ description: Elixir images read me file
 ms.service: windows-client
 author: nidos
 ms.author: nidos
-ms.topic: conceptual
+ms.topic: article
 ms.date: 12/31/2017
 ms.subservice: itpro-updates
 robots: noindex

windows/deployment/do/mcc-ent-early-preview.md

@@ -3,7 +3,7 @@ title: Microsoft Connected Cache for Enterprise and Education early preview
 description: Details on Microsoft Connected Cache for Enterprise early preview
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: article
 manager: naengler
 ms.author: lichris
 author: chrisjlin

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

@@ -3,7 +3,7 @@ title: Microsoft Connected Cache for Enterprise and Education Overview
 description: Overview, supported scenarios, and content types for Microsoft Connected Cache for Enterprise and Education.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: article
 ms.author: andyriv
 author: chrisjlin
 manager: naengler

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

@@ -3,7 +3,7 @@ title: Microsoft Connected Cache for Enterprise and Education prerequisites
 description: Details of prerequisites and recommendations for using Microsoft Connected Cache for Enterprise and Education.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: article
 ms.author: lichris
 author: chrisjlin
 manager: naengler
@@ -52,7 +52,7 @@ This article details the requirements and recommended specifications for using M
 ### Additional requirements for Linux host machines
 
 - The Linux host machine must be using one of the following operating systems:
-    - Ubuntu 22.04
+    - Ubuntu 22.04, 24.04
     - Red Hat Enterprise Linux (RHEL) 8.* or 9.*
         - If using RHEL, the default container engine (Podman) must be replaced with [Moby](https://github.com/moby/moby#readme)
 

windows/deployment/do/mcc-ent-release-notes.md

@@ -3,7 +3,7 @@ title: Microsoft Connected Cache Release Notes
 description: Release Notes for Microsoft Connected Cache for Enterprise and Education.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: release-notes
 ms.author: lichris
 author: chrisjlin
 manager: naengler

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

@@ -7,7 +7,7 @@ manager: aaroncz
 author: nidos
 ms.author: nidos
 ms.reviewer: mstewart
-ms.topic: conceptual
+ms.topic: install-set-up-deploy
 ms.collection: tier3
 appliesto: 
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>

windows/deployment/do/waas-optimize-windows-10-updates.md

@@ -2,7 +2,7 @@
 title: Optimize Windows update delivery
 description: Learn about the two methods of peer-to-peer content distribution that are available, Delivery Optimization and BranchCache.
 ms.service: windows-client
-ms.topic: conceptual
+ms.topic: how-to
 ms.subservice: itpro-updates
 ms.author: carmenf
 author: cmknox

windows/deployment/do/whats-new-do.md

@@ -3,7 +3,7 @@ title: What's new in Delivery Optimization
 description: What's new in Delivery Optimization, a peer-to-peer distribution method in Windows 10 and Windows 11.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: whats-new
 author: cmknox
 ms.author: carmenf
 manager: aaroncz