Merge branch 'main' into vp-sandbox

.openpublishing.build.ps1

@@ -1,18 +0,0 @@
-param(
-    [string]$buildCorePowershellUrl = "https://opbuildstoragesandbox2.blob.core.windows.net/opps1container/.openpublishing.buildcore.ps1",
-    [string]$parameters
-)
-# Main
-$errorActionPreference = 'Stop'
-
-# Step-1 Download buildcore script to local
-echo "download build core script to local with source url: $buildCorePowershellUrl"
-$repositoryRoot = Split-Path -Parent $MyInvocation.MyCommand.Definition
-$buildCorePowershellDestination = "$repositoryRoot\.openpublishing.buildcore.ps1"
-Invoke-WebRequest $buildCorePowershellUrl -OutFile $buildCorePowershellDestination
-
-# Step-2: Run build core
-echo "run build core script with parameters: $parameters"
-$arguments = "-parameters:'$parameters'"
-Invoke-Expression "$buildCorePowershellDestination $arguments"
-exit $LASTEXITCODE

.openpublishing.redirection.windows-deployment.json

@@ -1660,6 +1660,26 @@
       "redirect_url": "/previous-versions/windows/it-pro/windows-10/deployment/planning/windows-10-enterprise-faq-itpro",
       "redirect_document_id": false
     },
+    {
+      "source_path": "windows/deployment/do/mcc-enterprise-appendix.md",
+      "redirect_url": "/windows/deployment/do/mcc-ent-early-preview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/do/mcc-enterprise-deploy.md",
+      "redirect_url": "/windows/deployment/do/mcc-ent-early-preview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/do/mcc-enterprise-prerequisites.md",
+      "redirect_url": "/windows/deployment/do/mcc-ent-early-preview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/do/mcc-enterprise-update-uninstall.md",
+      "redirect_url": "/windows/deployment/do/mcc-ent-early-preview",
+      "redirect_document_id": false
+    },          
     {
       "source_path": "windows/deployment/planning/windows-10-deployment-considerations.md",
       "redirect_url": "/previous-versions/windows/it-pro/windows-10/deployment/planning/windows-10-deployment-considerations",

education/windows/suspcs/reference.md

@@ -1,8 +1,8 @@
 ---
 title: Set up School PCs app technical reference overview
-description: Describes the purpose of the Set up School PCs app for Windows 10 devices.
+description: Describes the purpose of the Set up School PCs app for Windows devices.
 ms.topic: overview
-ms.date: 01/16/2024
+ms.date: 10/29/2024
 appliesto:
   - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 11</a>
   - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 10</a>
@@ -12,12 +12,12 @@ appliesto:
 
 The **Set up School PCs** app helps you configure new Windows 10 PCs for school use. The app, which is available for Windows 10 version 1703 and later, configures and saves school-optimized settings, apps, and policies into a single provisioning package. You can then save the package to a USB drive and distribute it to your school PCs.
 
-If your school uses Microsoft Entra ID or Office 365, the Set up
+If your school uses Microsoft Entra ID or Microsoft 365, the Set up
 School PCs app will create a setup file. This file joins the PC to your Microsoft Entra tenant. The app also helps set up PCs for use with or without Internet connectivity.
 
 ## Join devices to Microsoft Entra ID
 
-If your school uses Microsoft Entra ID or Office 365, the Set up School PCs app creates a setup file that joins your PC to your Microsoft Entra ID tenant.
+If your school uses Microsoft Entra ID or Microsoft 365, the Set up School PCs app creates a setup file that joins your PC to your Microsoft Entra ID tenant.
 
 The app also helps set up PCs for use with or without Internet connectivity.
 

windows/client-management/mdm/declaredconfiguration-csp.md

@@ -1,7 +1,7 @@
 ---
 title: DeclaredConfiguration CSP
 description: Learn more about the DeclaredConfiguration CSP.
-ms.date: 09/12/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -45,6 +45,8 @@ The following list shows the DeclaredConfiguration configuration service provide
       - [Results](#hostinventoryresults)
         - [{DocID}](#hostinventoryresultsdocid)
           - [Document](#hostinventoryresultsdociddocument)
+  - [ManagementServiceConfiguration](#managementserviceconfiguration)
+    - [ConflictResolution](#managementserviceconfigurationconflictresolution)
 <!-- DeclaredConfiguration-Tree-End -->
 
 <!-- Device-Host-Begin -->
@@ -728,6 +730,93 @@ The Document node's value is an XML based document containing a collection of se
 
 <!-- Device-Host-Inventory-Results-{DocID}-Document-End -->
 
+<!-- Device-ManagementServiceConfiguration-Begin -->
+## ManagementServiceConfiguration
+
+<!-- Device-ManagementServiceConfiguration-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- Device-ManagementServiceConfiguration-Applicability-End -->
+
+<!-- Device-ManagementServiceConfiguration-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/DeclaredConfiguration/ManagementServiceConfiguration
+```
+<!-- Device-ManagementServiceConfiguration-OmaUri-End -->
+
+<!-- Device-ManagementServiceConfiguration-Description-Begin -->
+<!-- Description-Source-DDF -->
+The ManagementServiceConfiguration node that's used to control certain Windows Declared Configuration behavior.
+<!-- Device-ManagementServiceConfiguration-Description-End -->
+
+<!-- Device-ManagementServiceConfiguration-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- Device-ManagementServiceConfiguration-Editable-End -->
+
+<!-- Device-ManagementServiceConfiguration-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `node` |
+| Access Type | Get |
+<!-- Device-ManagementServiceConfiguration-DFProperties-End -->
+
+<!-- Device-ManagementServiceConfiguration-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- Device-ManagementServiceConfiguration-Examples-End -->
+
+<!-- Device-ManagementServiceConfiguration-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Begin -->
+### ManagementServiceConfiguration/ConflictResolution
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Applicability-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/DeclaredConfiguration/ManagementServiceConfiguration/ConflictResolution
+```
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-OmaUri-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Description-Begin -->
+<!-- Description-Source-DDF -->
+This node controls to turn on conflict resolution on and off.
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Description-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Editable-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-DFProperties-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 | The conflict resolution is OFF. |
+| 1 | The conflict resolution is ON. |
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-AllowedValues-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-Examples-End -->
+
+<!-- Device-ManagementServiceConfiguration-ConflictResolution-End -->
+
 <!-- DeclaredConfiguration-CspMoreInfo-Begin -->
 <!-- Add any additional information about this CSP here. Anything outside this section will get overwritten. -->
 ## DeclaredConfiguration OMA URI

windows/client-management/mdm/declaredconfiguration-ddf-file.md

@@ -1,7 +1,7 @@
 ---
 title: DeclaredConfiguration DDF file
 description: View the XML file containing the device description framework (DDF) for the DeclaredConfiguration configuration service provider.
-ms.date: 06/28/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -466,6 +466,61 @@ The following XML file contains the device description framework (DDF) for the D
         </Node>
       </Node>
     </Node>
+    <Node>
+      <NodeName>ManagementServiceConfiguration</NodeName>
+      <DFProperties>
+        <AccessType>
+          <Get />
+        </AccessType>
+        <Description>The ManagementServiceConfiguration node that is used to control certain Windows Declared Configuration behavior</Description>
+        <DFFormat>
+          <node />
+        </DFFormat>
+        <Occurrence>
+          <One />
+        </Occurrence>
+        <Scope>
+          <Dynamic />
+        </Scope>
+        <DFType>
+          <DDFName />
+        </DFType>
+      </DFProperties>
+      <Node>
+        <NodeName>ConflictResolution</NodeName>
+        <DFProperties>
+          <AccessType>
+            <Add />
+            <Delete />
+            <Get />
+            <Replace />
+          </AccessType>
+          <Description>This node controls to turn on conflict resolution on and off.</Description>
+          <DFFormat>
+            <int />
+          </DFFormat>
+          <Occurrence>
+            <One />
+          </Occurrence>
+          <Scope>
+            <Dynamic />
+          </Scope>
+          <DFType>
+            <MIME />
+          </DFType>
+          <MSFT:AllowedValues ValueType="ENUM">
+            <MSFT:Enum>
+              <MSFT:Value>0</MSFT:Value>
+              <MSFT:ValueDescription>The conflict resolution is OFF.</MSFT:ValueDescription>
+            </MSFT:Enum>
+            <MSFT:Enum>
+              <MSFT:Value>1</MSFT:Value>
+              <MSFT:ValueDescription>The conflict resolution is ON.</MSFT:ValueDescription>
+            </MSFT:Enum>
+          </MSFT:AllowedValues>
+        </DFProperties>
+      </Node>
+    </Node>
   </Node>
 </MgmtTree>
 ```

windows/client-management/mdm/laps-csp.md

@@ -1,7 +1,7 @@
 ---
 title: LAPS CSP
 description: Learn more about the LAPS CSP.
-ms.date: 09/27/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -325,7 +325,7 @@ Note if a custom managed local administrator account name is specified in this s
 <!-- Description-Source-DDF -->
 Use this setting to configure whether the password is encrypted before being stored in Active Directory.
 
-This setting is ignored if the password is currently being stored in Azure.
+This setting is ignored if the password is currently being stored in Microsoft Entra ID.
 
 This setting is only honored when the Active Directory domain is at Windows Server 2016 Domain Functional Level or higher.
 
@@ -387,7 +387,7 @@ If not specified, this setting defaults to True.
 <!-- Description-Source-DDF -->
 Use this setting to configure the name or SID of a user or group that can decrypt the password stored in Active Directory.
 
-This setting is ignored if the password is currently being stored in Azure.
+This setting is ignored if the password is currently being stored in Microsoft Entra ID.
 
 If not specified, the password will be decryptable by the Domain Admins group in the device's domain.
 

windows/client-management/mdm/laps-ddf-file.md

@@ -1,7 +1,7 @@
 ---
 title: LAPS DDF file
 description: View the XML file containing the device description framework (DDF) for the LAPS configuration service provider.
-ms.date: 09/27/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -80,7 +80,7 @@ The following XML file contains the device description framework (DDF) for the L
 The allowable settings are:
 
 0=Disabled (password will not be backed up)
-1=Backup the password to Azure AD only
+1=Backup the password to Microsoft Entra ID only
 2=Backup the password to Active Directory only
 
 If not specified, this setting will default to 0.</Description>
@@ -103,7 +103,7 @@ If not specified, this setting will default to 0.</Description>
             </MSFT:Enum>
             <MSFT:Enum>
               <MSFT:Value>1</MSFT:Value>
-              <MSFT:ValueDescription>Backup the password to Azure AD only</MSFT:ValueDescription>
+              <MSFT:ValueDescription>Backup the password to Microsoft Entra ID only</MSFT:ValueDescription>
             </MSFT:Enum>
             <MSFT:Enum>
               <MSFT:Value>2</MSFT:Value>
@@ -126,7 +126,7 @@ If not specified, this setting will default to 0.</Description>
 
 If not specified, this setting will default to 30 days
 
-This setting has a minimum allowed value of 1 day when backing the password to onpremises Active Directory, and 7 days when backing the password to Azure AD.
+This setting has a minimum allowed value of 1 day when backing the password to onpremises Active Directory, and 7 days when backing the password to Microsoft Entra ID.
 
 This setting has a maximum allowed value of 365 days.</Description>
           <DFFormat>
@@ -154,7 +154,7 @@ This setting has a maximum allowed value of 365 days.</Description>
                 <MSFT:DependencyAllowedValue ValueType="ENUM">
                   <MSFT:Enum>
                     <MSFT:Value>1</MSFT:Value>
-                    <MSFT:ValueDescription>BackupDirectory configured to Azure AD</MSFT:ValueDescription>
+                    <MSFT:ValueDescription>BackupDirectory configured to Microsoft Entra ID</MSFT:ValueDescription>
                   </MSFT:Enum>
                 </MSFT:DependencyAllowedValue>
               </MSFT:Dependency>
@@ -442,7 +442,7 @@ If not specified, this setting defaults to True.</Description>
           <DefaultValue>True</DefaultValue>
           <Description>Use this setting to configure whether the password is encrypted before being stored in Active Directory.
 
-This setting is ignored if the password is currently being stored in Azure.
+This setting is ignored if the password is currently being stored in Microsoft Entra ID.
 
 This setting is only honored when the Active Directory domain is at Windows Server 2016 Domain Functional Level or higher.
 
@@ -499,7 +499,7 @@ If not specified, this setting defaults to True.</Description>
           </AccessType>
           <Description>Use this setting to configure the name or SID of a user or group that can decrypt the password stored in Active Directory.
 
-This setting is ignored if the password is currently being stored in Azure.
+This setting is ignored if the password is currently being stored in Microsoft Entra ID.
 
 If not specified, the password will be decryptable by the Domain Admins group in the device's domain.
 

windows/client-management/mdm/passportforwork-csp.md

@@ -1,7 +1,7 @@
 ---
 title: PassportForWork CSP
 description: Learn more about the PassportForWork CSP.
-ms.date: 08/06/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -265,7 +265,7 @@ If the user forgets their PIN, it can be changed to a new PIN using the Windows
 <!-- Device-{TenantId}-Policies-EnableWindowsHelloProvisioningForSecurityKeys-Applicability-Begin -->
 | Scope | Editions | Applicable OS |
 |:--|:--|:--|
-| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 11, version 22H2 [10.0.22621] and later |
 <!-- Device-{TenantId}-Policies-EnableWindowsHelloProvisioningForSecurityKeys-Applicability-End -->
 
 <!-- Device-{TenantId}-Policies-EnableWindowsHelloProvisioningForSecurityKeys-OmaUri-Begin -->

windows/client-management/mdm/passportforwork-ddf.md

@@ -1,7 +1,7 @@
 ---
 title: PassportForWork DDF file
 description: View the XML file containing the device description framework (DDF) for the PassportForWork configuration service provider.
-ms.date: 06/28/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -831,7 +831,7 @@ If you disable or do not configure this policy setting, the PIN recovery secret
               <MIME />
             </DFType>
             <MSFT:Applicability>
-              <MSFT:OsBuildVersion>99.9.99999</MSFT:OsBuildVersion>
+              <MSFT:OsBuildVersion>10.0.22621</MSFT:OsBuildVersion>
               <MSFT:CspVersion>1.6</MSFT:CspVersion>
             </MSFT:Applicability>
             <MSFT:AllowedValues ValueType="ENUM">

windows/client-management/mdm/policies-in-policy-csp-supported-by-surface-hub.md

@@ -1,7 +1,7 @@
 ---
 title: Policies supported by Windows 10 Team
 description: Learn about the policies supported by Windows 10 Team.
-ms.date: 08/06/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -417,6 +417,7 @@ This article lists the policies that are applicable for the Surface Hub operatin
 - [ExcludeJapaneseIMEExceptJIS0208andEUDC](policy-csp-textinput.md#excludejapaneseimeexceptjis0208andeudc)
 - [ExcludeJapaneseIMEExceptShiftJIS](policy-csp-textinput.md#excludejapaneseimeexceptshiftjis)
 - [ForceTouchKeyboardDockedState](policy-csp-textinput.md#forcetouchkeyboarddockedstate)
+- [TouchKeyboardControllerModeAvailability](policy-csp-textinput.md#touchkeyboardcontrollermodeavailability)
 - [TouchKeyboardDictationButtonAvailability](policy-csp-textinput.md#touchkeyboarddictationbuttonavailability)
 - [TouchKeyboardEmojiButtonAvailability](policy-csp-textinput.md#touchkeyboardemojibuttonavailability)
 - [TouchKeyboardFullModeAvailability](policy-csp-textinput.md#touchkeyboardfullmodeavailability)

windows/client-management/mdm/policies-in-preview.md

@@ -1,7 +1,7 @@
 ---
 title: Configuration service provider preview policies
 description: Learn more about configuration service provider (CSP) policies that are available for Windows Insider Preview.
-ms.date: 09/27/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -29,10 +29,17 @@ This article lists the policies that are applicable for Windows Insider Preview
 - [EnablePhysicalDeviceAccessOnErrorScreens](clouddesktop-csp.md#userenablephysicaldeviceaccessonerrorscreens)
 - [EnableBootToCloudSharedPCMode](clouddesktop-csp.md#deviceenableboottocloudsharedpcmode)
 
+## Connectivity
+
+- [UseCellularWhenWiFiPoor](policy-csp-connectivity.md#usecellularwhenwifipoor)
+- [DisableCellularSettingsPage](policy-csp-connectivity.md#disablecellularsettingspage)
+- [DisableCellularOperatorSettingsPage](policy-csp-connectivity.md#disablecellularoperatorsettingspage)
+
 ## DeclaredConfiguration CSP
 
 - [Document](declaredconfiguration-csp.md#hostcompletedocumentsdociddocument)
 - [Abandoned](declaredconfiguration-csp.md#hostcompletedocumentsdocidpropertiesabandoned)
+- [ConflictResolution](declaredconfiguration-csp.md#managementserviceconfigurationconflictresolution)
 
 ## DeliveryOptimization
 
@@ -52,6 +59,10 @@ This article lists the policies that are applicable for Windows Insider Preview
 - [MdmAgentInstalled](devicepreparation-csp.md#mdmprovidermdmagentinstalled)
 - [RebootRequired](devicepreparation-csp.md#mdmproviderrebootrequired)
 
+## Display
+
+- [ConfigureMultipleDisplayMode](policy-csp-display.md#configuremultipledisplaymode)
+
 ## DMClient CSP
 
 - [DiscoveryEndpoint](dmclient-csp.md#deviceproviderprovideridlinkedenrollmentdiscoveryendpoint)
@@ -97,7 +108,6 @@ This article lists the policies that are applicable for Windows Insider Preview
 
 ## PassportForWork CSP
 
-- [EnableWindowsHelloProvisioningForSecurityKeys](passportforwork-csp.md#devicetenantidpoliciesenablewindowshelloprovisioningforsecuritykeys)
 - [DisablePostLogonProvisioning](passportforwork-csp.md#devicetenantidpoliciesdisablepostlogonprovisioning)
 
 ## Reboot CSP
@@ -112,6 +122,10 @@ This article lists the policies that are applicable for Windows Insider Preview
 
 - [ExchangeModernAuthEnabled](surfacehub-csp.md#deviceaccountexchangemodernauthenabled)
 
+## TextInput
+
+- [TouchKeyboardControllerModeAvailability](policy-csp-textinput.md#touchkeyboardcontrollermodeavailability)
+
 ## Update
 
 - [AllowTemporaryEnterpriseFeatureControl](policy-csp-update.md#allowtemporaryenterprisefeaturecontrol)

windows/client-management/mdm/policy-csp-connectivity.md

@@ -1,7 +1,7 @@
 ---
 title: Connectivity Policy CSP
 description: Learn more about the Connectivity Area in Policy CSP.
-ms.date: 04/10/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -11,6 +11,8 @@ ms.date: 04/10/2024
 
 [!INCLUDE [ADMX-backed CSP tip](includes/mdm-admx-csp-note.md)]
 
+[!INCLUDE [Windows Insider tip](includes/mdm-insider-csp-note.md)]
+
 <!-- Connectivity-Editable-Begin -->
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 <!-- Connectivity-Editable-End -->
@@ -584,6 +586,104 @@ Also, see the "Web-based printing" policy setting in Computer Configuration/Admi
 
 <!-- DiablePrintingOverHTTP-End -->
 
+<!-- DisableCellularOperatorSettingsPage-Begin -->
+## DisableCellularOperatorSettingsPage
+
+<!-- DisableCellularOperatorSettingsPage-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- DisableCellularOperatorSettingsPage-Applicability-End -->
+
+<!-- DisableCellularOperatorSettingsPage-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/Policy/Config/Connectivity/DisableCellularOperatorSettingsPage
+```
+<!-- DisableCellularOperatorSettingsPage-OmaUri-End -->
+
+<!-- DisableCellularOperatorSettingsPage-Description-Begin -->
+<!-- Description-Source-DDF -->
+This policy makes all configurable settings in the 'Cellular' > 'Mobile operator settings' page read-only.
+<!-- DisableCellularOperatorSettingsPage-Description-End -->
+
+<!-- DisableCellularOperatorSettingsPage-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- DisableCellularOperatorSettingsPage-Editable-End -->
+
+<!-- DisableCellularOperatorSettingsPage-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+| Default Value  | 0 |
+<!-- DisableCellularOperatorSettingsPage-DFProperties-End -->
+
+<!-- DisableCellularOperatorSettingsPage-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 (Default) | Disabled. |
+| 1 | Enabled. |
+<!-- DisableCellularOperatorSettingsPage-AllowedValues-End -->
+
+<!-- DisableCellularOperatorSettingsPage-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- DisableCellularOperatorSettingsPage-Examples-End -->
+
+<!-- DisableCellularOperatorSettingsPage-End -->
+
+<!-- DisableCellularSettingsPage-Begin -->
+## DisableCellularSettingsPage
+
+<!-- DisableCellularSettingsPage-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- DisableCellularSettingsPage-Applicability-End -->
+
+<!-- DisableCellularSettingsPage-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/Policy/Config/Connectivity/DisableCellularSettingsPage
+```
+<!-- DisableCellularSettingsPage-OmaUri-End -->
+
+<!-- DisableCellularSettingsPage-Description-Begin -->
+<!-- Description-Source-DDF -->
+This policy makes all configurable settings in the 'Cellular' Settings page read-only.
+<!-- DisableCellularSettingsPage-Description-End -->
+
+<!-- DisableCellularSettingsPage-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- DisableCellularSettingsPage-Editable-End -->
+
+<!-- DisableCellularSettingsPage-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+| Default Value  | 0 |
+<!-- DisableCellularSettingsPage-DFProperties-End -->
+
+<!-- DisableCellularSettingsPage-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 (Default) | Disabled. |
+| 1 | Enabled. |
+<!-- DisableCellularSettingsPage-AllowedValues-End -->
+
+<!-- DisableCellularSettingsPage-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- DisableCellularSettingsPage-Examples-End -->
+
+<!-- DisableCellularSettingsPage-End -->
+
 <!-- DisableDownloadingOfPrintDriversOverHTTP-Begin -->
 ## DisableDownloadingOfPrintDriversOverHTTP
 
@@ -899,6 +999,55 @@ If you disable this setting or don't configure it, the user will be able to crea
 
 <!-- ProhibitInstallationAndConfigurationOfNetworkBridge-End -->
 
+<!-- UseCellularWhenWiFiPoor-Begin -->
+## UseCellularWhenWiFiPoor
+
+<!-- UseCellularWhenWiFiPoor-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- UseCellularWhenWiFiPoor-Applicability-End -->
+
+<!-- UseCellularWhenWiFiPoor-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/Policy/Config/Connectivity/UseCellularWhenWiFiPoor
+```
+<!-- UseCellularWhenWiFiPoor-OmaUri-End -->
+
+<!-- UseCellularWhenWiFiPoor-Description-Begin -->
+<!-- Description-Source-DDF -->
+This policy allows the use of a cellular connection when Wi-Fi connectivity is limited.
+<!-- UseCellularWhenWiFiPoor-Description-End -->
+
+<!-- UseCellularWhenWiFiPoor-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- UseCellularWhenWiFiPoor-Editable-End -->
+
+<!-- UseCellularWhenWiFiPoor-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+| Default Value  | 1 |
+<!-- UseCellularWhenWiFiPoor-DFProperties-End -->
+
+<!-- UseCellularWhenWiFiPoor-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 | Disabled. |
+| 1 (Default) | Enabled. |
+<!-- UseCellularWhenWiFiPoor-AllowedValues-End -->
+
+<!-- UseCellularWhenWiFiPoor-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- UseCellularWhenWiFiPoor-Examples-End -->
+
+<!-- UseCellularWhenWiFiPoor-End -->
+
 <!-- Connectivity-CspMoreInfo-Begin -->
 <!-- Add any additional information about this CSP here. Anything outside this section will get overwritten. -->
 <!-- Connectivity-CspMoreInfo-End -->

windows/client-management/mdm/policy-csp-controlpolicyconflict.md

@@ -37,7 +37,7 @@ If set to 1 then any MDM policy that's set that has an equivalent GP policy will
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 
 > [!NOTE]
-> MDMWinsOverGP only applies to policies in Policy CSP. MDM policies win over Group Policies where applicable; not all Group Policies are available via MDM or CSP. It does not apply to other MDM settings with equivalent GP settings that are defined in other CSPs such as the [Defender CSP](defender-csp.md). Nor does it apply to the [Update Policy CSP](policy-csp-update.md) for managing Windows updates.
+> MDMWinsOverGP only applies to policies in Policy CSP. MDM policies win over Group Policies where applicable; not all Group Policies are available via MDM or CSP. It does not apply to other MDM settings with equivalent GP settings that are defined in other CSPs such as the [Defender CSP](defender-csp.md). 
 
 This policy is used to ensure that MDM policy wins over GP when policy is configured on MDM channel. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1.
 

windows/client-management/mdm/policy-csp-deliveryoptimization.md

@@ -164,7 +164,7 @@ One or more values can be added as either fully qualified domain names (FQDN) or
 <!-- DOCacheHost-Editable-Begin -->
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 > [!NOTE]
-> Clients don't talk to multiple Microsoft Connected Cache (MCC) servers at the same time. If you configure a list of MCC servers in this policy, the clients will round robin until they successfully connect to an MCC server. The clients have no way to determine if the MCC server has the content or not. If the MCC server doesn't have the content, it caches the content as it is handing the content back to the client.
+> Clients don't talk to multiple Microsoft Connected Cache servers at the same time. If you configure a list of Connected Cache servers in this policy, the clients will round robin until they successfully connect to a Connected Cache server. The clients have no way to determine if the Connected Cache server has the content or not. If the Connected Cache server doesn't have the content, it caches the content as it is handing the content back to the client.
 <!-- DOCacheHost-Editable-End -->
 
 <!-- DOCacheHost-DFProperties-Begin -->
@@ -578,7 +578,7 @@ Specifies the download method that Delivery Optimization can use in downloads of
 <!-- DODownloadMode-Editable-Begin -->
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 > [!NOTE]
-> The Delivery Optimization service on the clients checks to see if there are peers and/or an MCC server which contains the content and determines the best source for the content.
+> The Delivery Optimization service on the clients checks to see if there are peers and/or a Connected Cache server which contains the content and determines the best source for the content.
 <!-- DODownloadMode-Editable-End -->
 
 <!-- DODownloadMode-DFProperties-Begin -->

windows/client-management/mdm/policy-csp-display.md

@@ -1,7 +1,7 @@
 ---
 title: Display Policy CSP
 description: Learn more about the Display Area in Policy CSP.
-ms.date: 01/18/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -9,10 +9,72 @@ ms.date: 01/18/2024
 <!-- Display-Begin -->
 # Policy CSP - Display
 
+[!INCLUDE [Windows Insider tip](includes/mdm-insider-csp-note.md)]
+
 <!-- Display-Editable-Begin -->
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 <!-- Display-Editable-End -->
 
+<!-- ConfigureMultipleDisplayMode-Begin -->
+## ConfigureMultipleDisplayMode
+
+<!-- ConfigureMultipleDisplayMode-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- ConfigureMultipleDisplayMode-Applicability-End -->
+
+<!-- ConfigureMultipleDisplayMode-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/Policy/Config/Display/ConfigureMultipleDisplayMode
+```
+<!-- ConfigureMultipleDisplayMode-OmaUri-End -->
+
+<!-- ConfigureMultipleDisplayMode-Description-Begin -->
+<!-- Description-Source-DDF -->
+This policy set the default display to set the arrangement between cloning or extending.
+<!-- ConfigureMultipleDisplayMode-Description-End -->
+
+<!-- ConfigureMultipleDisplayMode-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- ConfigureMultipleDisplayMode-Editable-End -->
+
+<!-- ConfigureMultipleDisplayMode-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+| Default Value  | 1 |
+<!-- ConfigureMultipleDisplayMode-DFProperties-End -->
+
+<!-- ConfigureMultipleDisplayMode-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 | Default. |
+| 1 (Default) | Clone. |
+| 2 | Extend. |
+<!-- ConfigureMultipleDisplayMode-AllowedValues-End -->
+
+<!-- ConfigureMultipleDisplayMode-GpMapping-Begin -->
+**Group policy mapping**:
+
+| Name | Value |
+|:--|:--|
+| Name | ConfigureMultipleDisplayMode |
+| Path | Display > AT > System > DisplayCat |
+| Element Name | ConfigureMultipleDisplayModePrompt |
+<!-- ConfigureMultipleDisplayMode-GpMapping-End -->
+
+<!-- ConfigureMultipleDisplayMode-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- ConfigureMultipleDisplayMode-Examples-End -->
+
+<!-- ConfigureMultipleDisplayMode-End -->
+
 <!-- DisablePerProcessDpiForApps-Begin -->
 ## DisablePerProcessDpiForApps
 

windows/client-management/mdm/policy-csp-localpoliciessecurityoptions.md

@@ -1,7 +1,7 @@
 ---
 title: LocalPoliciesSecurityOptions Policy CSP
 description: Learn more about the LocalPoliciesSecurityOptions Area in Policy CSP.
-ms.date: 09/27/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -388,10 +388,27 @@ Audit: Audit the use of Backup and Restore privilege This security setting deter
 |:--|:--|
 | Format | `b64` |
 | Access Type | Add, Delete, Get, Replace |
-| Allowed Values | List (Delimiter: ``) |
+| Default Value  | AA== |
-| Default Value  | 00 |
 <!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-DFProperties-End -->
 
+<!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| AQ== | Enable. |
+| AA== (Default) | Disable. |
+<!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-AllowedValues-End -->
+
+<!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-GpMapping-Begin -->
+**Group policy mapping**:
+
+| Name | Value |
+|:--|:--|
+| Name | Audit: Audit the use of Backup and Restore privilege |
+| Path | Windows Settings > Security Settings > Local Policies > Security Options |
+<!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-GpMapping-End -->
+
 <!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-Examples-Begin -->
 <!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
 <!-- Audit_AuditTheUseOfBackupAndRestoreprivilege-Examples-End -->

windows/client-management/mdm/policy-csp-remotedesktopservices.md

@@ -1,7 +1,7 @@
 ---
 title: RemoteDesktopServices Policy CSP
 description: Learn more about the RemoteDesktopServices Area in Policy CSP.
-ms.date: 09/27/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -156,7 +156,7 @@ FIPS compliance can be configured through the System cryptography. Use FIPS comp
 <!-- DisconnectOnLockLegacyAuthn-Applicability-Begin -->
 | Scope | Editions | Applicable OS |
 |:--|:--|:--|
-| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 11, version 24H2 [10.0.26100] and later |
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ [10.0.20348.2461] and later <br> ✅ [10.0.25398.887] and later <br> ✅ Windows 10, version 2004 [10.0.19041.4474] and later <br> ✅ Windows 11, version 21H2 with [KB5037770](https://support.microsoft.com/help/5037770) [10.0.22000.2960] and later <br> ✅ Windows 11, version 22H2 with [KB5037771](https://support.microsoft.com/help/5037771) [10.0.22621.3593] and later <br> ✅ Windows 11, version 24H2 [10.0.26100] and later |
 <!-- DisconnectOnLockLegacyAuthn-Applicability-End -->
 
 <!-- DisconnectOnLockLegacyAuthn-OmaUri-Begin -->
@@ -217,7 +217,7 @@ This policy applies only when using legacy authentication to authenticate to the
 <!-- DisconnectOnLockMicrosoftIdentityAuthn-Applicability-Begin -->
 | Scope | Editions | Applicable OS |
 |:--|:--|:--|
-| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 11, version 24H2 [10.0.26100] and later |
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ [10.0.20348.2461] and later <br> ✅ [10.0.25398.887] and later <br> ✅ Windows 10, version 2004 [10.0.19041.4474] and later <br> ✅ Windows 11, version 21H2 with [KB5037770](https://support.microsoft.com/help/5037770) [10.0.22000.2960] and later <br> ✅ Windows 11, version 22H2 with [KB5037771](https://support.microsoft.com/help/5037771) [10.0.22621.3593] and later <br> ✅ Windows 11, version 24H2 [10.0.26100] and later |
 <!-- DisconnectOnLockMicrosoftIdentityAuthn-Applicability-End -->
 
 <!-- DisconnectOnLockMicrosoftIdentityAuthn-OmaUri-Begin -->

windows/client-management/mdm/policy-csp-textinput.md

@@ -1,7 +1,7 @@
 ---
 title: TextInput Policy CSP
 description: Learn more about the TextInput Area in Policy CSP.
-ms.date: 01/18/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -9,6 +9,8 @@ ms.date: 01/18/2024
 <!-- TextInput-Begin -->
 # Policy CSP - TextInput
 
+[!INCLUDE [Windows Insider tip](includes/mdm-insider-csp-note.md)]
+
 <!-- TextInput-Editable-Begin -->
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 <!-- TextInput-Editable-End -->
@@ -1172,6 +1174,56 @@ Specifies the touch keyboard is always docked. When this policy is set to enable
 
 <!-- ForceTouchKeyboardDockedState-End -->
 
+<!-- TouchKeyboardControllerModeAvailability-Begin -->
+## TouchKeyboardControllerModeAvailability
+
+<!-- TouchKeyboardControllerModeAvailability-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device <br> ❌ User | ✅ Pro <br> ✅ Enterprise <br> ✅ Education <br> ✅ Windows SE <br> ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview |
+<!-- TouchKeyboardControllerModeAvailability-Applicability-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-OmaUri-Begin -->
+```Device
+./Device/Vendor/MSFT/Policy/Config/TextInput/TouchKeyboardControllerModeAvailability
+```
+<!-- TouchKeyboardControllerModeAvailability-OmaUri-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-Description-Begin -->
+<!-- Description-Source-DDF -->
+Specifies whether the controller keyboard mode is enabled or disabled for the touch keyboard. When this policy is set to disabled, the controller keyboard mode for touch keyboard is disabled.
+<!-- TouchKeyboardControllerModeAvailability-Description-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- TouchKeyboardControllerModeAvailability-Editable-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-DFProperties-Begin -->
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Add, Delete, Get, Replace |
+| Default Value  | 0 |
+<!-- TouchKeyboardControllerModeAvailability-DFProperties-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-AllowedValues-Begin -->
+**Allowed values**:
+
+| Value | Description |
+|:--|:--|
+| 0 (Default) | The OS determines when it's most appropriate to be available. |
+| 1 | Controller keyboard is always available. |
+| 2 | Controller keyboard is always disabled. |
+<!-- TouchKeyboardControllerModeAvailability-AllowedValues-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- TouchKeyboardControllerModeAvailability-Examples-End -->
+
+<!-- TouchKeyboardControllerModeAvailability-End -->
+
 <!-- TouchKeyboardDictationButtonAvailability-Begin -->
 ## TouchKeyboardDictationButtonAvailability
 

windows/client-management/mdm/policy-csp-wifi.md

@@ -1,7 +1,7 @@
 ---
 title: Wifi Policy CSP
 description: Learn more about the Wifi Area in Policy CSP.
-ms.date: 01/31/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -188,10 +188,7 @@ By default, ICS is disabled when you create a remote access connection, but admi
 
 <!-- AllowManualWiFiConfiguration-Description-Begin -->
 <!-- Description-Source-DDF -->
-Allow or disallow connecting to Wi-Fi outside of MDM server-installed networks. Most restricted value is 0.
+Allow or block connections to Wi-Fi outside of MDM server-installed networks. If you change this setting to Block, you must deploy enterprise Wi-Fi profiles to the device using the Wi-Fi CSP before you apply this setting. Otherwise, the device will go offline since it won't be able to connect to Wi-Fi. Note that choosing to block Wi-Fi connections will delete any previously installed user-configured Wi-Fi profiles from the device, though not all non-MDM profiles will be deleted.
-
-> [!NOTE]
-> Setting this policy deletes any previously installed user-configured and Wi-Fi sense Wi-Fi profiles from the device. Certain Wi-Fi profiles that aren't user configured nor Wi-Fi sense might not be deleted. In addition, not all non-MDM profiles are completely deleted.
 <!-- AllowManualWiFiConfiguration-Description-End -->
 
 <!-- AllowManualWiFiConfiguration-Editable-Begin -->

windows/client-management/mdm/policy-csp-windowsai.md

@@ -1,7 +1,7 @@
 ---
 title: WindowsAI Policy CSP
 description: Learn more about the WindowsAI Area in Policy CSP.
-ms.date: 09/27/2024
+ms.date: 11/05/2024
 ---
 
 <!-- Auto-Generated CSP Document -->
@@ -286,10 +286,9 @@ This policy setting allows you to turn off Windows Copilot.
 <!-- TurnOffWindowsCopilot-Description-End -->
 
 <!-- TurnOffWindowsCopilot-Editable-Begin -->
-
-> [!Note]
-> - The TurnOffWindowsCopilot policy isn't for the [new Copilot experience](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/evolving-copilot-in-windows-for-your-workforce/ba-p/4141999) that's in some [Windows Insider builds](https://blogs.windows.com/windows-insider/2024/05/22/releasing-windows-11-version-24h2-to-the-release-preview-channel/) and that will be gradually rolling out to Windows 11 and Windows 10 devices. <!--9048085-->
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+> [!NOTE]
+> - The TurnOffWindowsCopilot policy isn't for the [new Copilot experience](https://techcommunity.microsoft.com/blog/windows-itpro-blog/evolving-copilot-in-windows-for-your-workforce/4141999) that's in some [Windows Insider builds](https://blogs.windows.com/windows-insider/2024/05/22/releasing-windows-11-version-24h2-to-the-release-preview-channel/) and that will be gradually rolling out to Windows 11 and Windows 10 devices. <!--9048085-->
 <!-- TurnOffWindowsCopilot-Editable-End -->
 
 <!-- TurnOffWindowsCopilot-DFProperties-Begin -->

windows/configuration/assigned-access/configuration-file.md

@@ -3,7 +3,7 @@ title: Create an Assigned Access configuration file
 description: Learn how to create an XML file to configure Assigned Access.
 ms.topic: how-to
 zone_pivot_groups: windows-versions-11-10
-ms.date: 03/04/2024
+ms.date: 10/31/2024
 appliesto:
 ---
 

windows/configuration/assigned-access/examples.md

@@ -1,7 +1,7 @@
 ---
 title: Assigned Access examples
 description: Practical examples of XML files to configure Assigned Access.
-ms.date: 03/04/2024
+ms.date: 10/31/2024
 ms.topic: reference
 zone_pivot_groups: windows-versions-11-10
 appliesto:

windows/configuration/assigned-access/index.md

@@ -2,7 +2,7 @@
 title: Windows kiosks and restricted user experiences
 description: Learn about the options available in Windows to configure kiosks and restricted user experiences.
 ms.topic: overview
-ms.date: 03/04/2024
+ms.date: 10/31/2024
 ---
 
 # Windows kiosks and restricted user experiences
@@ -43,6 +43,8 @@ Windows offers two different features to configure a kiosk experience:
 
 This option loads the Windows desktop, but it only allows to run a defined set of applications. When the designated user signs in, the user can only run the apps that are allowed. The Start menu is customized to show only the apps that are allowed to execute. With this approach, you can configure a locked-down experience for different account types. This option is sometimes referred to as *multi-app kiosk*.
 
+:::image type="content" source="images/restricted-user-experience-example.png" alt-text="Screenshot of a restricted user experience in Windows 11." border="false":::
+
 To configure a restricted user experience, you use the **Assigned Access** feature.
 
 ## Choose the right experience

windows/configuration/assigned-access/overview.md

@@ -1,7 +1,7 @@
 ---
 title: What is Assigned Access?
 description: Learn how to configure a Windows kiosk for single-app and multi-app scenarios with Assigned Access.
-ms.date: 06/14/2024
+ms.date: 10/31/2024
 ms.topic: overview
 ---
 

windows/configuration/assigned-access/policy-settings.md

@@ -2,7 +2,7 @@
 title: Assigned Access policy settings
 description: Learn about the policy settings enforced on a device configured with Assigned Access.
 ms.topic: reference
-ms.date: 03/04/2024
+ms.date: 10/31/2024
 ---
 
 # Assigned Access policy settings

windows/configuration/assigned-access/quickstart-kiosk.md

@@ -2,7 +2,7 @@
 title: "Quickstart: configure a kiosk experience with Assigned Access"
 description: Learn how to configure a kiosk experience with Assigned Access using the Assigned Access configuration service provider (CSP), Microsoft Intune, PowerShell, or group policy (GPO).
 ms.topic: quickstart
-ms.date: 03/04/2024
+ms.date: 10/31/2024
 ---
 
 # Quickstart: configure a kiosk with Assigned Access

windows/configuration/assigned-access/quickstart-restricted-user-experience.md

@@ -2,7 +2,7 @@
 title: "Quickstart: configure a restricted user experience with Assigned Access"
 description: Learn how to configure a restricted user experience with Assigned Access using the Assigned Access configuration service provider (CSP), Microsoft Intune, PowerShell, or group policy (GPO).
 ms.topic: quickstart
-ms.date: 03/04/2024
+ms.date: 10/31/2024
 appliesto:
 zone_pivot_groups: windows-versions-11-10
 ---

windows/configuration/assigned-access/recommendations.md

@@ -2,7 +2,7 @@
 title: Assigned Access recommendations
 description: Learn about the recommended kiosk and restricted user experience configuration options.
 ms.topic: best-practice
-ms.date: 03/11/2024
+ms.date: 10/31/2024
 ---
 
 # Assigned Access recommendations

windows/configuration/assigned-access/shell-launcher/configuration-file.md

@@ -1,7 +1,7 @@
 ---
 title: Create a Shell Launcher configuration file
 description: Learn how to create an XML file to configure a device with Shell Launcher.
-ms.date: 02/12/2024
+ms.date: 10/31/2024
 ms.topic: how-to
 ---
 

windows/configuration/assigned-access/shell-launcher/includes/quickstart-intune.md

@@ -1,7 +1,7 @@
 ---
 author: paolomatarazzo
 ms.author: paoloma
-ms.date: 02/05/2024
+ms.date: 10/31/2024
 ms.topic: include
 ---
 

windows/configuration/assigned-access/shell-launcher/includes/quickstart-ps.md

@@ -1,7 +1,7 @@
 ---
 author: paolomatarazzo
 ms.author: paoloma
-ms.date: 02/05/2024
+ms.date: 10/31/2024
 ms.topic: include
 ---
 

windows/configuration/assigned-access/shell-launcher/includes/quickstart-xml.md

@@ -1,7 +1,7 @@
 ---
 author: paolomatarazzo
 ms.author: paoloma
-ms.date: 02/05/2024
+ms.date: 10/31/2024
 ms.topic: include
 ---
 

windows/configuration/assigned-access/shell-launcher/index.md

@@ -1,7 +1,7 @@
 ---
 title: What is Shell Launcher?
 description: Learn how to configure devices with Shell Launcher.
-ms.date: 06/18/2024
+ms.date: 10/31/2024
 ms.topic: overview
 ---
 

windows/configuration/assigned-access/shell-launcher/quickstart-kiosk.md

@@ -2,7 +2,7 @@
 title: "Quickstart: configure a kiosk experience with Shell Launcher"
 description: Learn how to configure a kiosk experience with Shell Launcher, using the Assigned Access configuration service provider (CSP), Microsoft Intune, PowerShell, or group policy (GPO).
 ms.topic: quickstart
-ms.date: 02/05/2024
+ms.date: 10/31/2024
 ---
 
 # Quickstart: configure a kiosk experience with Shell Launcher

windows/configuration/assigned-access/shell-launcher/xsd.md

@@ -2,7 +2,7 @@
 title: Shell Launcher XML Schema Definition (XSD)
 description: Shell Launcher XSD reference article.
 ms.topic: reference
-ms.date: 02/15/2024
+ms.date: 10/31/2024
 ---
 
 # Shell Launcher XML Schema Definition (XSD)

windows/configuration/assigned-access/xsd.md

@@ -2,7 +2,7 @@
 title: Assigned Access XML Schema Definition (XSD)
 description: Assigned Access XSD reference article.
 ms.topic: reference
-ms.date: 04/08/2024
+ms.date: 10/31/2024
 ---
 
 # Assigned Access XML Schema Definition (XSD)

windows/configuration/shared-pc/set-up-shared-or-guest-pc.md

@@ -1,7 +1,7 @@
 ---
 title: Configure a shared or guest Windows device
 description: Description of how to configured Shared PC mode, which is a Windows feature that optimizes devices for shared use scenarios.
-ms.date: 09/06/2024
+ms.date: 10/31/2024
 ms.topic: how-to
 ---
 

windows/configuration/shared-pc/shared-devices-concepts.md

@@ -1,7 +1,7 @@
 ---
 title: Manage multi-user and guest Windows devices
 description: options to optimize Windows devices used in shared scenarios, such touchdown spaces in an enterprise, temporary customer use in retail or shared devices in a school.
-ms.date: 02/06/2024
+ms.date: 10/31/2024
 ms.topic: concept-article
 ---
 

windows/configuration/shared-pc/shared-pc-technical.md

@@ -1,7 +1,7 @@
 ---
 title: Shared PC technical reference
 description: List of policies and settings applied by the Shared PC options.
-ms.date: 02/06/2024
+ms.date: 10/31/2024
 ms.topic: reference
 ---
 

windows/configuration/start/includes/disable-account-notifications.md

@@ -0,0 +1,25 @@
+---
+author: paolomatarazzo
+ms.author: paoloma
+ms.date: 11/04/2024
+ms.topic: include
+---
+
+### Disable Account Notifications
+
+This policy controls the notifications to Microsoft account (MSA) and local users in the Start's user tile:
+
+- When enabled, Windows doesn't send account related notifications for local and MSA users to the user tile in Start
+- Wen disabled or not configured, Windows sends account related notifications for local and MSA users to the user tile in Start
+
+Notifications include getting users to:
+
+- reauthenticate
+- back up their device
+- manage cloud storage quotas
+- manage their Microsoft 365 or XBOX subscription
+
+|  | Path |
+|--|--|
+| **CSP** | `./User/Vendor/MSFT/Policy/Config/Notifications/`[DisableAccountNotifications](/windows/client-management/mdm/policy-csp-notifications#disableaccountnotifications) |
+| **GPO** | **User Configuration** > **Administrative Templates** > **Windows Components** > **Account Notifications** > **Turn off account notifications in Start** |

windows/configuration/start/layout.md

@@ -304,10 +304,10 @@ Column="2"/>
 
 You can use the `start:SecondaryTile` tag to pin a web link through a Microsoft Edge secondary tile. This method doesn't require more actions compared to the method of using legacy `.url` shortcuts (through the `start:DesktopApplicationTile` tag).
 
-The following example shows how to create a tile of the Web site's URL using the Microsoft Edge secondary tile:
+The following example shows how to create a tile of the Web site's URL using the Microsoft Edge secondary tile. Ensure to replace `<--Microsoft Edge AUMID-->` with the AUMID of Microsoft Edge (learn how to [Find the Application User Model ID of an installed app](../store/find-aumid.md)):
 
 ```XML
-<start:SecondaryTile AppUserModelID="Microsoft.MicrosoftEdge_8wekyb3d8bbwe!MicrosoftEdge"
+<start:SecondaryTile AppUserModelID="<--Microsoft Edge AUMID-->"
 TileID="MyWeblinkTile"
 Arguments="http://msn.com"
 DisplayName="MySite"
@@ -427,13 +427,13 @@ You can edit the JSON file to make any modifications to the **Pinned** section o
 1. Open the `LayoutModification.json` file in a JSON editor, such as Visual Studio Code or Notepad
 1. The `pinnedList` section includes all the pins that are applied to the Start layout
 
-You can add more apps to the section using the following keys:
+    You can add more apps to the section using the following keys:
 
-| Key | Description |
+    | Key | Description |
-|--|--|
+    |--|--|
-| `packagedAppID` | Used for Universal Windows Platform (UWP) apps. To pin a UWP app, use the app's AUMID. |
+    | `packagedAppID` | Used for Universal Windows Platform (UWP) apps. To pin a UWP app, use the app's AUMID. |
-| `desktopAppID` | Used for desktop apps. To pin a desktop app, use the app's AUMID. If the app doesn't have an AUMID, use the `desktopAppLink` instead. |
+    | `desktopAppID` | Used for desktop apps. To pin a desktop app, use the app's AUMID. If the app doesn't have an AUMID, use the `desktopAppLink` instead. |
-| `desktopAppLink` | Used for desktop apps that don't have an associated AUMID. To pin this type of app, use the path to the `.lnk` shortcut that points to the app. |
+    | `desktopAppLink` | Used for desktop apps that don't have an associated AUMID. To pin this type of app, use the path to the `.lnk` shortcut that points to the app. |
 
 ::: zone-end
 

windows/configuration/start/policy-settings.md

@@ -135,6 +135,7 @@ Select one of the tabs to see the list of available settings:
 ::: zone pivot="windows-11"
 |Policy name| CSP | GPO |
 |-|-|-|
+|[Disable account notifications](#disable-account-notifications)|✅|✅|
 |[Hide **Change account settings**](#hide-change-account-settings)|✅|❌|
 |[Hide **Sign out**](#hide-sign-out)|✅|✅|
 |[Hide **Switch user**](#hide-switch-user)|✅|❌|
@@ -145,6 +146,7 @@ Select one of the tabs to see the list of available settings:
 ::: zone pivot="windows-10"
 |Policy name| CSP | GPO |
 |-|-|-|
+|[Disable account notifications](#disable-account-notifications)|❌|✅|
 |[Hide **Change account settings**](#hide-change-account-settings)|✅|❌|
 |[Hide **Lock**](#hide-lock)|✅|❌|
 |[Hide **Sign out**](#hide-sign-out)|✅|✅|
@@ -153,12 +155,9 @@ Select one of the tabs to see the list of available settings:
 |[Hide user tile](#hide-user-tile)|✅|❌|
 ::: zone-end
 
+[!INCLUDE [disable-account-notifications](includes/disable-account-notifications.md)]
 [!INCLUDE [hide-change-account-settings](includes/hide-change-account-settings.md)]
-
-::: zone pivot="windows-10"
 [!INCLUDE [hide-lock](includes/hide-lock.md)]
-::: zone-end
-
 [!INCLUDE [hide-signout](includes/hide-signout.md)]
 [!INCLUDE [hide-switch-user](includes/hide-switch-user.md)]
 [!INCLUDE [hide-lock](includes/hide-entry-points-for-fast-user-switching.md)]

windows/configuration/store/find-aumid.md

@@ -2,7 +2,9 @@
 title: Find the Application User Model ID of an installed app
 description: Learn how to find the Application User Model ID (AUMID) of the applications installed on a Windows device.
 ms.topic: how-to
-ms.date: 02/06/2024
+ms.date: 10/31/2024
+appliesto:
+zone_pivot_groups: windows-versions-11-10
 ---
 
 # Find the Application User Model ID of an installed app
@@ -90,6 +92,8 @@ Get-AppAUMID -AppName Word
 Get-AppAUMID
 ```
 
+::: zone pivot="windows-10"
+
 # [:::image type="icon" source="../images/icons/explorer.svg"::: **Explorer**](#tab/explorer)
 
 To get the names and AUMIDs for all apps installed for the current user, perform the following steps:
@@ -99,7 +103,7 @@ To get the names and AUMIDs for all apps installed for the current user, perform
 1. In the **Choose Details** window, select **AppUserModelId**, and then select **OK**. (You might need to c
 1. Change the **View** setting from **Tiles** to **Details**
 
-:::image type="content" source="images/aumid-file-explorer.png" alt-text="Screenshot of the File Explorer showing the AUMID details." border="false":::
+::: zone-end
 
 # [:::image type="icon" source="../images/icons/registry.svg"::: **Registry**](#tab/registry)
 

windows/configuration/taskbar/index.md

@@ -1,8 +1,8 @@
 ---
-title: Configure the Windows taskbar
+title: Configure the Windows Taskbar Using Policy Settings
 description: Learn how to configure the Windows taskbar to provide quick access to the tools and applications that users need most.
 ms.topic: how-to
-ms.date: 04/17/2024
+ms.date: 11/07/2024
 ms.collection:
 - essentials-manage
 appliesto:

windows/configuration/taskbar/pinned-apps.md

@@ -1,8 +1,8 @@
 ---
-title: Configure the applications pinned to the taskbar
+title: Configure the Windows Taskbar Pinned Apps with Policy Settings
 description: Learn how to configure the applications pinned to the Windows taskbar.
 ms.topic: how-to
-ms.date: 04/17/2024
+ms.date: 11/07/2024
 appliesto:
 zone_pivot_groups: windows-versions-11-10
 ---
@@ -20,15 +20,15 @@ To learn about all the policy settings to customize the taskbar layout and confi
 
 Here are some considerations before you start configuring the taskbar pinned applications:
 
-- There's no limit to the number of apps that you can pin
+- There's no limit to the number of apps that you can pin.
-- In the XML file, add apps using the Application User Model ID (AUMID), the Desktop Application ID, or the Desktop Application Link Path
+- In the XML file, add apps using the Application User Model ID (AUMID), the Desktop Application ID, or the Desktop Application Link Path.
-- Some classic Windows applications are packaged differently than they were in previous versions of Windows, including Notepad and File Explorer. Make sure to enter the correct Application ID. To learn more, see [Find the Application User Model ID of an installed app](../store/find-aumid.md)
+- Some classic Windows applications are packaged differently than they were in previous versions of Windows, including Notepad and File Explorer. Make sure to enter the correct Application ID. To learn more, see [Find the Application User Model ID of an installed app](../store/find-aumid.md).
-- If you specify an app to be pinned that isn't provisioned for the user on the device, the pinned icon doesn't appear on the taskbar
+- If you specify an app to be pinned that isn't provisioned for the user on the device, the pinned icon doesn't appear on the taskbar.
 - The order of applications in the XML file dictates the order of pinned apps on the taskbar, from left to right. If the OS is configured to use a right-to-left language, then the taskbar order is reversed
 - Applications can be pinned using the following methods:
-  - Default Windows apps, pinned during the OS installation. For example: Microsoft Edge, File Explorer, and Store. These applications are pinned first (blue square)
+  - Default Windows apps, pinned during the OS installation. For example: Microsoft Edge, File Explorer, and Store. These applications are pinned first (blue square).
-  - Pinned manually by the user. These applications are usually pinned next to the default pinned apps (red circle)
+  - Pinned manually by the user. These applications are usually pinned next to the default pinned apps (red circle).
-  - Pinned via policy settings. These applications are pinned after the apps pinned manually by the user (green triangle)
+  - Pinned via policy settings. These applications are pinned after the apps pinned manually by the user (green triangle).
 
 ::: zone pivot="windows-10"
 
@@ -46,15 +46,23 @@ Here are some considerations before you start configuring the taskbar pinned app
 
 The following steps describe how to configure the taskbar pinned applications using policy settings:
 
-1. Create the XML file. You can start with the [XML example](#taskbar-layout-example)
+1. Create the XML file. You can start with the [XML example](#taskbar-layout-example).
-1. Edit the XML file to meet your requirements and save it
+1. Edit the XML file to meet your requirements and save it.
-1. Deploy the XML file to devices using configuration service provider (CSP), provisioning packages (PPKG), or group policy (GPO)
+1. Deploy the XML file to devices using configuration service provider (CSP), provisioning packages (PPKG), or group policy (GPO).
 
-> [!IMPORTANT]
+### Taskbar configuration and policy refresh
-> If you use a provisioning package to configure the taskbar, your configuration will be reapplied each time the `explorer.exe` process restarts. If your configuration pins an app and the user then unpins that app, the user's change will be overwritten the next time the configuration is applied. To apply a taskbar configuration that allows users to make changes that will persist, apply your configuration by using CSP or GPO.
+
+Depending on the method you use to configure the taskbar, the configuration is reapplied at different intervals. When the taskbar configuration is reapplied, user changes are overwritten.
+
+| Configuration method | Reapplied interval |
+|--|--|
+| Configuration service provider (CSP) | Every 8 hours or based on the [ConfigRefresh](/windows/client-management/mdm/dmclient-csp#deviceproviderprovideridconfigrefresh) interval. |
+| Provisioning package (PPKG) | Each time the `explorer.exe` process restarts. |
+| Group policy (GPO) | In case of a group policy change. |
 
 > [!CAUTION]
-> The use of the `Import-StartLayout` PowerShell cmdlet to provision the Taskbar layout is no longer supported in Windows 11. The only supported configuration in Windows 11 is to use a provisioning package.
+> The use of the `Import-StartLayout` PowerShell cmdlet to provision the Taskbar layout is no longer supported in Windows 11.
+
 ::: zone pivot="windows-10"
 
 >[!NOTE]
@@ -78,13 +86,13 @@ Here you can find an example of taskbar layout that you can use as a reference:
 You can change the apps pinned to the taskbar by modifying the `<TaskbarLayout>` node.
 
 1. In the `<taskbar:TaskbarPinList>` node, add (or remove) the apps you want pinned. You can pin Universal Windows Platform (UWP) apps and desktop apps:
-    - `<taskbar:UWA>`: Select this option for UWP apps. Add the *AUMID* of the UWP app
+    - `<taskbar:UWA>`: Select this option for UWP apps. Add the *AUMID* of the UWP app.
-    - `<taskbar:DesktopApp>`: Select this option for desktop apps. Add the *Desktop Application ID* or the *Desktop Application Link Path* of the desktop app
+    - `<taskbar:DesktopApp>`: Select this option for desktop apps. Add the *Desktop Application ID* or the *Desktop Application Link Path* of the desktop app.
 1. In the `<CustomTaskbarLayoutCollection>` node, the apps you add are pinned after the default apps. If you want to remove the default apps, and only show the apps you add in the XML file, then add `PinListPlacement="Replace"`:
-    - `<CustomTaskbarLayoutCollection>`: Keeps the default pinned apps. After the default apps, the apps you add are pinned
+    - `<CustomTaskbarLayoutCollection>`: Keeps the default pinned apps. After the default apps, the apps you add are pinned.
-    - `<CustomTaskbarLayoutCollection PinListPlacement="Replace">`: Unpins the default apps. Only the apps you add are pinned. If you want to remove some of the default pinned apps, then add `PinListPlacement="Replace"`. When you add your apps to `<taskbar:TaskbarPinList>`, include the default apps you still want pinned
+    - `<CustomTaskbarLayoutCollection PinListPlacement="Replace">`: Unpins the default apps. Only the apps you add are pinned. If you want to remove some of the default pinned apps, then add `PinListPlacement="Replace"`. When you add your apps to `<taskbar:TaskbarPinList>`, include the default apps you still want pinned.
-1. In the `<defaultlayout:TaskbarLayout>` node, use `region=" | "` to use different taskbar configurations based on the device locale and region
+1. In the `<defaultlayout:TaskbarLayout>` node, use `region=" | "` to use different taskbar configurations based on the device locale and region.
-1. Save the file
+1. Save the file.
 
 For practical examples of how to add, remove, or replace pinned apps, see the following sections:
 
@@ -147,8 +155,8 @@ In the following XML example, two regions are added: `US|UK` and `DE|FR|IT`:
 
 [!INCLUDE [example](includes/example-region.md)]
 
-- If the `<TaskbarPinList>` node has region matching the one configured on the device, then the configuration applies
+- If the `<TaskbarPinList>` node has region matching the one configured on the device, then the configuration applies.
-- If the `<TaskbarPinList>` node doesn't have a region matching the one configured on the device, then the first `<TaskbarPinList>` node without region applies
+- If the `<TaskbarPinList>` node doesn't have a region matching the one configured on the device, then the first `<TaskbarPinList>` node without region applies.
 
 > [!NOTE]
 > [Look up country and region codes (use the ISO Short column)](/previous-versions/commerce-server/ee799297(v=cs.20))
@@ -212,15 +220,15 @@ After the taskbar layout is applied, the users must sign out and sign in again t
 
 On a clean install of Windows, if you apply a taskbar layout, the following apps are pinned to the taskbar:
 
-- Any default apps you don't remove
+- Any default apps you don't remove.
-- Apps that you specifically pin in the XML file
+- Apps that you specifically pin in the XML file.
 
 On a Windows OS upgrade, apps are already pinned to the taskbar. The taskbar layout applies the following logic:
 
-- If users pinned apps to the taskbar, then those pinned apps remain. New apps are pinned after the existing user-pinned apps
+- If users pinned apps to the taskbar, then those pinned apps remain. New apps are pinned after the existing user-pinned apps.
-- If the apps are pinned during the install or by a policy (not by a user), and the apps aren't pinned in an updated layout file, then the apps are unpinned
+- If the apps are pinned during the install or by a policy (not by a user), and the apps aren't pinned in an updated layout file, then the apps are unpinned.
-- If a user didn't pin an app, and the same app is pinned in the updated layout file, then the app is pinned after any existing pinned apps
+- If a user didn't pin an app, and the same app is pinned in the updated layout file, then the app is pinned after any existing pinned apps.
-- New apps in updated layout file are pinned after the user's pinned apps
+- New apps in updated layout file are pinned after the user's pinned apps.
 
 If you apply the taskbar configuration to a clean install or an update, users can still:
 

windows/configuration/taskbar/policy-settings.md

@@ -1,8 +1,8 @@
 ---
-title: Taskbar policy settings
+title: List of the Policy Settings To Configure the Windows Taskbar
-description: Learn about the policy settings to configure the Windows taskbar.
+description: Learn about the CSP and GPO policy settings to configure the Windows taskbar.
 ms.topic: reference
-ms.date: 04/17/2024
+ms.date: 11/07/2024
 appliesto:
 zone_pivot_groups: windows-versions-11-10
 ---

windows/configuration/taskbar/xsd.md

@@ -1,8 +1,8 @@
 ---
-title: Taskbar XML Schema Definition (XSD)
+title: Windows Taskbar XML Schema Definition (XSD)
-description: Taskbar XSD reference article.
+description: Reference article about the Taskbar XML schema definition (XSD).
 ms.topic: reference
-ms.date: 02/15/2024
+ms.date: 11/07/2024
 ---
 
 # Taskbar XML Schema Definition (XSD)

windows/deployment/customize-boot-image.md

@@ -1,6 +1,6 @@
 ---
 title: Customize Windows PE boot images
-description: This article describes how to customize a Windows PE (WinPE) boot image including updating it with the latest cumulative update, adding drivers, and adding optional components.
+description: This article describes how to customize a Windows PE (WinPE) boot image, including updating it with the latest cumulative update, adding drivers, and adding optional components.
 ms.service: windows-client
 ms.localizationpriority: medium
 author: frankroj
@@ -23,13 +23,13 @@ appliesto:
 
 The Windows PE (WinPE) boot images that are included with the Windows ADK have a minimal number of features and drivers. However the boot images can be customized by adding drivers, optional components, and applying the latest cumulative update.
 
-Microsoft recommends updating Windows PE boot images with the latest cumulative update for maximum security and protection. The latest cumulative updates may also resolve known issues. For example, the Windows PE boot image can be updated with the latest cumulative update to address the BlackLotus UEFI bootkit vulnerability as documented in [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932](https://prod.support.services.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) and [CVE-2023-24932](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-24932).
+Microsoft recommends updating Windows PE boot images with the latest cumulative update for maximum security and protection. The latest cumulative updates may also resolve known issues. For example, the Windows PE boot image can be updated with the latest cumulative update to address the BlackLotus UEFI bootkit vulnerability as documented in [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932](https://support.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) and [CVE-2023-24932](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-24932).
 
 > [!TIP]
 >
 > The boot images from the [ADK 10.1.26100.1 (May 2024)](/windows-hardware/get-started/adk-install) and later already contain the cumulative update to address the BlackLotus UEFI bootkit vulnerability.
 
-This walkthrough describes how to customize a Windows PE boot image including updating with the latest cumulative update, adding drivers, and adding optional components. Additionally this walkthrough goes over how customizations in boot images affect several different popular products that utilize boot images, such as Microsoft Configuration Manager, Microsoft Deployment Toolkit (MDT), and Windows Deployment Services (WDS).
+This walkthrough describes how to customize a Windows PE boot image, including updating with the latest cumulative update, adding drivers, and adding optional components. Additionally this walkthrough goes over how customizations in boot images affect several different popular products that utilize boot images, such as Microsoft Configuration Manager, Microsoft Deployment Toolkit (MDT), and Windows Deployment Services (WDS).
 
 ## Prerequisites
 
@@ -668,7 +668,7 @@ For more information, see [copy](/windows-server/administration/windows-commands
 
 This step doesn't update or change the boot image. However, it makes sure that the latest bootmgr boot files are available to the Windows ADK when creating bootable media via the Windows ADK. When these files are updated in the Windows ADK, products that use the Windows ADK to create bootable media, such as **Microsoft Deployment Toolkit (MDT)**, also have access to the updated bootmgr boot files.
 
-In particular, this step is needed when addressing the BlackLotus UEFI bootkit vulnerability as documented in [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932](https://prod.support.services.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) and [CVE-2023-24932](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-24932).
+In particular, this step is needed when addressing the BlackLotus UEFI bootkit vulnerability as documented in [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932](https://support.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) and [CVE-2023-24932](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-24932).
 
 > [!TIP]
 >
@@ -1295,4 +1295,4 @@ For more information, see [Windows Server 2012 R2 Lifecycle](/lifecycle/products
 
 - [Create bootable Windows PE media: Update the Windows PE add-on for the Windows ADK](/windows-hardware/manufacture/desktop/winpe-create-usb-bootable-drive#update-the-windows-pe-add-on-for-the-windows-adk)
 - [Update Windows installation media with Dynamic Update: Update WinPE](/windows/deployment/update/media-dynamic-update#update-winpe)
-- [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932: Updating bootable media](https://prod.support.services.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d?preview=true#updatebootable5025885)
+- [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932: Updating bootable media](https://support.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d)

windows/deployment/do/TOC.yml

@@ -33,21 +33,45 @@
   items:
     - name: What is Microsoft Connected Cache?
       href: waas-microsoft-connected-cache.md
-    - name: MCC for Enterprise and Education
+    - name: Microsoft Connected Cache for Enterprise and Education
       items:
-      - name: MCC for Enterprise and Education Overview
+      - name: Connected Cache for Enterprise and Education overview
         href: mcc-ent-edu-overview.md
       - name: Requirements
-        href: mcc-enterprise-prerequisites.md
+        href: mcc-ent-prerequisites.md
-      - name: Deploy Microsoft Connected Cache
+      - name: How-to guides
-        href: mcc-enterprise-deploy.md
+        items:
-      - name: Update or uninstall MCC
+        - name: Create and configure Connected Cache resources and cache nodes
-        href: mcc-enterprise-update-uninstall.md
+          href: mcc-ent-create-resource-and-cache.md
-      - name: Appendix
+        - name: Deploy Connected Cache nodes to host machines
-        href: mcc-enterprise-appendix.md
+          items:
-    - name: MCC for ISPs
+          - name: Deploy Connected Cache to Linux
+            href: mcc-ent-deploy-to-linux.md
+          - name: Deploy Connected Cache to Windows
+            href: mcc-ent-deploy-to-windows.md
+        - name: Use Azure CLI to manage Connected Cache
+          href: mcc-ent-manage-using-cli.md 
+        - name: Verify Connected Cache node functionality
+          href: mcc-ent-verify-cache-node.md
+        - name: Monitor Connected Cache nodes
+          href: mcc-ent-monitoring.md
+        - name: Update Connected Cache nodes
+          href: mcc-ent-update-cache-node.md 
+        - name: Uninstall Connected Cache nodes
+          href: mcc-ent-uninstall-cache-node.md     
+      - name: Resources
+        items:
+        - name: Frequent Asked Questions
+          href: mcc-ent-faq.yml
+        - name: Troubleshooting
+          href: mcc-ent-troubleshooting.md
+        - name: Microsoft Connected Cache for Enterprise and Education early preview
+          href: mcc-ent-early-preview.md
+      - name: Release notes
+        href: mcc-ent-release-notes.md        
+    - name: Microsoft Connected Cache for ISPs
       items:
-      - name: MCC for ISPs Overview
+      - name: Connected Cache for ISPs Overview
         href: mcc-isp-overview.md
       - name: How-to guides
         items:  
@@ -67,9 +91,8 @@
           href: mcc-isp-vm-performance.md
         - name: Support and troubleshooting
           href: mcc-isp-support.md
-        - name: MCC for ISPs (early preview)
+        - name: Connected Cache for ISPs (early preview)
           href: mcc-isp.md
 - name: Endpoints for Microsoft Connected Cache content and services
   href: delivery-optimization-endpoints.md 
   
-  

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

@@ -35,7 +35,7 @@ Use this checklist to guide you through different aspects when modifying Deliver
     * System resources
     * Improve P2P efficiencies
   
-1. Using Connected Cache (MCC)
+1. Using Microsoft Connected Cache
 1. Choose where to set Delivery Optimization policies
 
 ## 1. Prerequisites to allow Delivery Optimization communication
@@ -189,7 +189,7 @@ Regardless of P2P, consider setting the following policies to avoid network disr
 > [!NOTE]
 > The absolute policies are recommended in low bandwidth environments.
 
-## 3. Using Connected Cache (MCC)
+## 3. Using Connected Cache
 
 :::image type="content" source="images/do-setup-connected-cache.png" alt-text="Screenshot of Delivery Optimization options when using Connected Cache." lightbox="images/do-setup-connected-cache.png":::
 

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

@@ -29,7 +29,7 @@ This article discusses how to troubleshoot Delivery Optimization.
 
 - -HealthCheck: Provides an overall check of the device setup to ensure Delivery Optimization communication is possible on the device.
 - -P2P: Provides output specific to P2P settings, efficiency, and errors.
-- -MCC: Provides output specific to MCC settings and verifies the client can access the cache server.
+- -MCC: Provides output specific to Microsoft Connected Cache settings and verifies the client can access the cache server.
 
 ## Common problems and solutions
 

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

@@ -25,4 +25,4 @@ This file contains the images that are included in this GitHub repository that a
 
 :::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.":::
+:::image type="content" source="ux-mcc-failed.png" alt-text="A screenshot of the terminal after the command 'iotedge list', showing the Microsoft Connected Cache container in a failure state.":::

windows/deployment/do/includes/get-azure-subscription.md

@@ -14,6 +14,6 @@ ms.localizationpriority: medium
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Select **Subscriptions**. If you don't see **Subscriptions**, type **Subscriptions** in the search bar. As you begin typing, the list filters based on your input.
 1. If you already have an Azure Subscription, skip to step 5. If you don't have an Azure Subscription, select **+ Add** on the top left. 
-1. 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. 
+1. 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 Microsoft Connected Cache service. 
 1. On the **Subscriptions** page, you'll find details about your current subscription. Select the subscription name. 
 1. After you select the subscription name, you'll find the subscription ID in the **Overview** tab. Select the **Copy to clipboard** icon next to your Subscription ID to copy the value. 

windows/deployment/do/index.yml

@@ -15,7 +15,7 @@ metadata:
   author: aczechowski
   ms.author: aaroncz
   manager: aaroncz
-  ms.date: 12/22/2023 #Required; mm/dd/yyyy format.
+  ms.date: 10/30/2024 #Required; mm/dd/yyyy format.
   ms.localizationpriority: medium
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -32,7 +32,7 @@ landingContent:
             url: waas-delivery-optimization.md
           - text: What's new in Delivery Optimization
             url: whats-new-do.md
-          - text: Microsoft Connected Cache (MCC) overview
+          - text: Microsoft Connected Cache overview
             url: waas-microsoft-connected-cache.md
 
 
@@ -63,25 +63,25 @@ landingContent:
             url: /mem/intune/configuration/delivery-optimization-windows
 
   # Card
-  - title: Microsoft Connected Cache (MCC) for Enterprise and Education
+  - title: Microsoft Connected Cache for Enterprise and Education
     linkLists:
       - linkListType: deploy
         links:
-          - text: MCC for Enterprise and Education (early preview)
+          - text: Connected Cache for Enterprise and Education overview
-            url: waas-microsoft-connected-cache.md
+            url: mcc-ent-edu-overview.md
-          - text: Sign up
+          - text: Connected Cache for Enterprise and Education requirements
-            url: https://aka.ms/MSConnectedCacheSignup
+            url: mcc-ent-prerequisites.md
+          - text: Create the Microsoft Connected Cache Azure resource and cache nodes
+            url: mcc-ent-create-resource-and-cache.md
 
   # Card
-  - title: Microsoft Connected Cache (MCC) for Internet Service Providers (ISPs)
+  - title: Microsoft Connected Cache for Internet Service Providers (ISPs)
     linkLists:
       - linkListType: deploy
         links:
-          - text: MCC for ISPs (public preview)
+          - text: Connected Cache for ISPs (public preview)
             url: mcc-isp-signup.md
-          - text: Sign up
+          - text: Connected Cache for ISPs (early preview)
-            url: https://aka.ms/MCCForISPSurvey
-          - text: MCC for ISPs (early preview)
             url: mcc-isp.md
 
 

windows/deployment/do/mcc-ent-create-resource-and-cache.md

@@ -0,0 +1,349 @@
+---
+title: Create and configure Microsoft Connected Cache nodes
+description: Details on how to create and configure Microsoft Connected Cache for Enterprise and Education cache nodes.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+manager: naengler
+ms.author: nidos
+author: doshnid
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise</a>	
+ms.date: 10/30/2024
+---
+
+# Create Microsoft Connected Cache Azure resource and cache nodes
+
+This article outlines how to create and configure your Microsoft Connected Cache for Enterprise and Education cache nodes. The creation and configuration of your cache node takes place in Azure. The deployment of your cache node requires downloading and running an OS-specific provisioning package on your host machine.
+
+## Prerequisites
+
+1. **Azure Pay-As-You-Go subscription**: Microsoft Connected Cache is a free-of-charge service hosted in Azure. You'll need a pay-as-you-go Azure subscription in order to onboard to our service. To create a subscription, go to [pay-as-you-go subscription page](https://azure.microsoft.com/offers/ms-azr-0003p/).
+2. **Hardware to host Connected Cache**: The recommended configuration serves approximately 35,000 managed devices, downloading a 2-GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.
+
+For more information on sizing and OS requirements, see [the prerequisites for using Connected Cache](mcc-ent-prerequisites.md).
+
+
+## Create Connected Cache Azure resource
+
+# [Azure portal](#tab/portal)
+
+1. In the [Azure portal](https://portal.azure.com), select **Create a Resource** and search for `Microsoft Connected Cache for Enterprise and Education`.
+<!--
+    :::image type="content" source="images/mcc-isp-provision-cache-node-numbered.png" alt-text="Screenshot of the Azure portal depicting the cache node configuration page of a cache node. This screenshot shows all of the fields you can choose to configure the cache node." lightbox="./images/mcc-isp-provision-cache-node-numbered.png":::  
+-->
+
+1. Select the Microsoft Connected Cache for Enterprise resource. When prompted, choose the subscription, resource group, and location for the resource. Then enter a name for the resource, then select Review + Create.
+
+1. After a few moments, you'll see a "Validation successful" message, indicating you can move onto the next step and select Create.
+
+1. The creation of the resource might take a few minutes. After a successful creation, you'll see a page stating the deployment is complete. Select **Go to resource** to create cache nodes.
+
+
+# [Azure CLI](#tab/cli)
+
+### Prerequisites
+
+* An Azure CLI environment:
+
+  * Use the Bash environment in [Azure Cloud Shell](/azure/cloud-shell/get-started/classic).
+
+  * Or, if you prefer to run CLI reference commands locally, [install the Azure CLI](/cli/azure/install-azure-cli)
+
+    * Sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command.
+
+    * Run [az version](/cli/azure/reference-index#az-version) to find the version and dependent libraries that are installed. To upgrade to the latest version, run [az upgrade](/cli/azure/reference-index#az-upgrade).
+
+    * Install Azure CLI extension **mcc** by following the instructions [here](/cli/azure/azure-cli-extensions-overview#how-to-install-extensions).
+
+    * Resource group under which a Connected Cache resource can be created. Use the [az group create](/cli/azure/group#az-group-create) command to create a new Resource group if you don't already have one.
+
+#### Create Connected Cache Azure resource
+
+Replace the following placeholders with your own information:
+* *\<resource-group>*: Name of an existing resource group in your subscription.
+* *\<mcc-resource-name>*: A name for your Microsoft Connected Cache for Enterprise resource.
+* *\<location>*: The Azure region where your Microsoft Connected Cache will be located.
+
+```azurecli-interactive
+az mcc ent resource create --mcc-resource-name <mymccresource> --resource-group <myrg> --location <region>
+```
+
+---
+
+## Create Connected Cache cache node
+
+# [Azure portal](#tab/portal)
+
+  1. Open Azure portal and navigate to the Microsoft Connected Cache for Enterprise resource that you created.<br>
+  1. Under Cache Node Management, select **Cache Nodes** then **Create Cache Node**.<br>
+  
+  1. Provide a name for your cache node and select the host OS you plan to deploy the cache node on, then select **Create**. Note, cache node names have to be unique under the Microsoft Connected Cache resource.
+  <!--
+    :::image type="content" source="images/mcc-isp-provision-cache-node-numbered.png" alt-text="Screenshot of the Azure portal depicting the cache node configuration page of a cache node. This screenshot shows all of the fields you can choose to configure the cache node." lightbox="./images/mcc-isp-provision-cache-node-numbered.png":::  
+    -->
+  The creation of the cache node might take a few minutes. Select **Refresh** to see your recently created cache node.
+Once the cache node state changes to **Not Configured**, you can now configure your cache node.<br>
+For more information about different cache node states, see [Cache node states](#cache-node-states).
+
+
+# [Azure CLI](#tab/cli)
+
+Use the following command to create a new cache node if you don't already have one.
+
+Replace the following placeholders with your own information:
+* *\<resource-group>*: Name of existing resource group in your subscription.
+* *\<mcc-resource-name>*: Name of the Microsoft Connected Cache for Enterprise resource.
+* *\<cache-node-name>*: A name for your Microsoft Connected Cache node.
+* *\<host-os>*: The OS on which cache node will be provisioned.
+  Accepted values: `windows`, `linux`
+
+```azurecli-interactive
+az mcc ent node create --cache-node-name <mycachenode> --mcc-resource-name <mymccresource> --resource-group <myrg> --host-os <linux>
+```
+
+<br>
+
+>[!NOTE]
+>To ensure cache node has been created successfully, run the following command before continuing with cache node configuration.
+>```azurecli-interactive
+>az mcc ent node show --cache-node-name <mycachenode> --mcc-resource-name <mymccresource> --resource-group <myrg>  
+>```
+>In the output look for **cacheNodeState**. If ***cacheNodeState = Not Configured***, you can continue with cache node configuration.
+>If ***cacheNodeState = Registration in Progress***, then the cache node is still in process of being created. Wait a couple of minutes and run the command again.
+>To know more about different cache node state, see [Cache node states](#cache-node-states).
+
+---
+
+## Configure Connected Cache node
+
+# [Azure portal](#tab/portal)
+Enter required values to configure your cache node. For more information about the definitions of each field, review the [Configuration fields](#general-configuration-fields) at the bottom of this article.
+Don't forget to select save after adding configuration information.
+
+
+# [Azure CLI](#tab/cli)
+
+### Configure Linux-hosted Connected Cache node
+Use the following command to configure cache node for deployment to a **Linux** host machine.
+
+Replace the following placeholders with your own information:
+
+* *\<resource-group>*: Name of the resource group in your subscription.
+* *\<mcc-resource-name>*: Name of your Microsoft Connected Cache for Enterprise resource.
+* *\<cache-node-name>*: Name for your Microsoft Connected Cache node.
+* *\<physical-path>*: The cache drive path. You can add up to nine cache drives.
+* *\<size-in-gb>*: The size of cache drive. Must be at least 50 Gb.
+* *\<proxy>*: If proxy needs to be enabled or not.<br>
+  Accepted values: `enabled`, `disabled`<br>
+  Proxy should be set to enabled if the cache node will need to pass through a network proxy to download content. The provided proxy will also be used during deployment of the Connected Cache cache node to your host machine.
+* *\<proxy-host>*: The proxy host name or ip address. Required if proxy is set to enabled.
+* *\<proxy-port>*: Proxy port number. Required if proxy is set to enabled.
+* *\<auto-update-ring>*: Update ring the cache node should have.<br>
+  Accepted values: `slow`, `fast`.<br>
+  If update ring is set to slow, you must provide the day of week, time of day and week of month the cache node should be updated.
+* *\<auto-update-day>*: The day of the week cache node should be updated. Week starts from Monday.<br>
+  Accepted values: 1,2,3,4,5,6,7
+* *\<auto-update-time>*: The time of day cache node should be updated in 24 hour format (hh:mm)
+* *\<auto-update-week>*: The week of month cache node should be updated.<br>
+  Accepted values: 1,2,3,4
+
+```azurecli-interactive
+az mcc ent node update --cache-node-name <mycachenode> --mcc-resource-name <mymccresource> --resource-group <myrg>
+--cache-drive "[{physical-path:</physical/path>,size-in-gb:<size of cache drive>},{</physical/path>,size-in-gb:<size of cache drive>}...]"> --proxy <enabled> --proxy-host <"proxy host name"> --proxy-port <proxy port>  --auto-update-day <day of week> --auto-update-time <time of day> --auto-update-week <week of month> --auto-update-ring <update ring>
+```
+
+<br>
+<br>
+
+### Configure Windows-hosted Connected Cache node
+Use the following command to configure cache node for deployment to a **Windows** host machine.
+
+Replace the following placeholders with your own information:
+  
+* *\<resource-group>*: Name of the resource group in your subscription.
+* *\<mcc-resource-name>*: Name of your Microsoft Connected Cache for Enterprise resource.
+* *\<cache-node-name>*: Name for your Microsoft Connected Cache node.
+* *\<physical-path>*: The cache drive path.<br>
+  Accepted value: /var/mcc
+* *\<size-in-gb>*: The size of cache drive. Must be at least 50 Gb.
+* *\<proxy>*: If proxy needs to be enabled or not.<br>
+  Accepted values: `enabled`, `disabled`<br>
+  Proxy should be set to enabled if the cache node will need to pass through a network proxy to download content. The provided proxy will also be used during deployment of the Connected Cache cache node to your host machine.
+* *\<proxy-host>*: The proxy host name or ip address. Required if proxy is set to enabled.
+* *\<proxy-port>*: Proxy port number. Required if proxy is set to enabled.
+* *\<auto-update-ring>*: Update ring the cache node should have.<br>
+  Accepted values: `slow`, `fast`.<br>
+  If update ring is set to slow, you must provide the day of week, time of day and week of month the cache node should be updated.
+* *\<auto-update-day>*: The day of the week cache node should be updated. Week starts from Monday.<br>
+  Accepted values: 1,2,3,4,5,6,7
+* *\<auto-update-time>*: The time of day cache node should be updated in 24 hour format (hh:mm)
+* *\<auto-update-week>*: The week of month cache node should be updated.<br>
+  Accepted values: 1,2,3,4
+  
+```azurecli-interactive
+az mcc ent node update --cache-node-name <mycachenode> --mcc-resource-name <mymccresource> --resource-group <myrg>
+--cache-drive "[{physical-path:/var/mcc,size-in-gb:<size of cache drive>}]" --proxy <enabled> --proxy-host <"proxy host name"> --proxy-port <proxy port>  --auto-update-day <day of week> --auto-update-time <time of day> --auto-update-week <week of month> --auto-update-ring <update ring>
+```
+
+---
+
+## Next step
+
+### [Azure portal](#tab/portal)
+To deploy the cache node to a **Windows** host machine, see 
+>[!div class="nextstepaction"]
+>[Deploy cache node to Windows](mcc-ent-deploy-to-windows.md)
+
+To deploy the cache node to a **Linux** host machine, see 
+>[!div class="nextstepaction"]
+>[Deploy cache node to Linux](mcc-ent-deploy-to-linux.md)
+
+### [Azure CLI](#tab/cli)
+To deploy cache nodes using Azure CLI, see 
+>[!div class="nextstepaction"]
+>[Manage cache nodes using CLI](mcc-ent-manage-using-CLI.md)
+
+---
+<br>
+<br>
+
+
+### 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 such as "Seattle-1". This name must be unique and can't be changed later |
+|**Host OS** | Linux or Windows| This is the operating system of the host machine that the cache node will be deployed to.|
+
+### Storage fields
+
+##### Cache node for Linux
+
+>[!Important]
+>All cache drives must have full read/write permissions set or the cache node will not function. For example, in a terminal you can run: sudo chmod 777 /path/to/cachedrivefolder
+<br>
+
+| Field Name |Expected Value |Description|
+|---|---|---|
+|**Cache drive folder**| File path string |Up to nine drive folders accessible by the cache node can be configured for each cache node to configure cache storage. Enter the location of the folder in Ubuntu where the external physical drive is mounted. For example: /dev/sda3/. Each cache drive should have read/write permissions configured. Ensure your disks are mounted and visit Attach a data disk to a Linux VM for more information.|
+|**Cache drive size in gigabytes**| Integer in GB| Set the size of each drive configured for the cache node. Minimum cache drive size is 50 GB.|
+
+##### Cache node for Windows
+
+| Field Name |Expected Value |Description|
+|---|---|---|
+|**Cache drive folder**| File path string /var/mcc| This is the folder path where content is cached. You can't change the folder path.|
+|**Cache drive size in gigabytes**| Integer in GB| Set the size of each drive configured for the cache node. Minimum cache drive size is 50 GB. |
+
+#### Proxy settings
+<br>
+You can choose to enable or disable proxy settings on your cache node. Proxy should be set to enabled if the cache node will need to pass through a network proxy to download content. The provided proxy will also be used during deployment of the Connected Cache node to your host machine.
+
+<br>
+
+>[!IMPORTANT]
+>Enabling or disabling the proxy settings after your cache node has been deployed will require running the provisioning script on the host machine again. This will ensure that proxy changes are in effect on the cache node. 
+
+| Field Name	|Expected Value	 |Description|
+|---|---|---|
+|**Proxy host name**|	String or number|	Proxy host name or address|
+|**Proxy port**|	Integer|	Proxy port
+
+<br>
+<br>
+
+## Other operations on resource and cache nodes
+<br>
+
+### List all Connected Cache resources
+
+# [Azure portal](#tab/portal)
+Navigate to the resource group under which you would like to see the Connected Cache resources.
+
+
+# [Azure CLI](#tab/cli)
+Use the following command to list all the Connected Cache resources under the resource group. 
+
+Replace the following placeholders with your own information:
+* *\<resource-group>*: An existing resource group in your subscription.
+
+
+```azurecli-interactive
+az mcc ent resource list  --resource-group <myrg>
+```
+---
+
+### List all cache nodes
+
+# [Azure portal](#tab/portal)
+On the left pane, select **Cache Nodes** under **Cache Node Management** to see all the cache nodes under the Connected Cache resource.
+
+
+# [Azure CLI](#tab/cli)
+Use the following command to list all the cache nodes under the resource. 
+
+Replace the following placeholders with your own information:
+* *\<resource-group>*: Name of the resource group in your subscription.
+* *\<mcc-resource-name>*: Name of your Microsoft Connected Cache for Enterprise resource.
+
+```azurecli-interactive
+az mcc ent node list --mcc-resource-name <mymccresource> --resource-group <myrg>
+```
+
+---
+<br>
+
+### Delete Connected Cache resource
+
+# [Azure portal](#tab/portal)
+Navigate to the Connected Cache resource to delete, then select the **Delete** option on top.
+
+
+# [Azure CLI](#tab/cli)
+Use the following command to delete the cache node under the resource. 
+
+Replace the following placeholders with your own information:
+* *\<resource-group>*: Name of the resource group in your subscription.
+* *\<mcc-resource-name>*: Name of your Microsoft Connected Cache for Enterprise resource.
+
+```azurecli-interactive
+az mcc ent resource delete --mcc-resource-name <mymccresource> --resource-group <myrg>
+```
+---
+
+### Delete cache node
+
+# [Azure portal](#tab/portal)
+On the left pane, select **Cache Nodes** under **Cache Node Management** to see all the cache nodes under the Connected Cache resource. Select the cache node you wish to delete and select the **Delete** option on top of the page.
+
+
+# [Azure CLI](#tab/cli)
+Use the following command to delete the Connected Cache node.
+
+Replace the following placeholders with your own information:
+* *\<resource-group>*: Name of the resource group in your subscription.
+* *\<mcc-resource-name>*: Name of your Microsoft Connected Cache for Enterprise resource.
+* *\<cache-node-name>*: The name for your Microsoft Connected Cache node.
+
+
+```azurecli-interactive
+az mcc ent node delete --cache-node-name <mycachenode> --mcc-resource-name <mymccresource> --resource-group <myrg> 
+```
+
+
+---
+<br>
+
+##### Cache node states
+| Cache node state |Description|
+|---|---|
+|Operation in progress| An operation is being done on the cache node|
+|Registration in progress| Cache node is being registered|
+|Not configured| Cache node is ready to be configured|
+|Not provisioned| Cache node is ready to be provisioned on host machine|
+|Healthy| Cache node phoning home|
+|Unhealthy| Cache node has stopped phoning home|
+|Never phoned home| Cache node has provisioned but has never phoned home|

windows/deployment/do/mcc-ent-deploy-to-linux.md

@@ -0,0 +1,68 @@
+---
+title: Deploy Microsoft Connected Cache software to a Linux host machine
+description: Details on how to deploy Microsoft Connected Cache for Enterprise and Education cache software to a Linux host machine.
+author: chrisjlin
+ms.author: lichris
+manager: naengler
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+ms.date: 10/30/2024
+appliesto: 
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>	
+---
+
+# Deploy Microsoft Connected Cache caching software to a Linux host machine
+
+This article describes how to deploy Microsoft Connected Cache for Enterprise and Education caching software to a Linux host machine.
+
+Before deploying Connected Cache to a Linux host machine, ensure that the host machine meets all [requirements](mcc-ent-prerequisites.md), and that you have [created and configured your Connected Cache Azure resource and cache node](mcc-ent-create-resource-and-cache.md).
+
+## Steps to deploy Connected Cache cache node to Linux
+
+# [Azure portal](#tab/portal)
+
+1. Within the Azure portal, navigate to the **Provisioning** tab of your cache node and copy the provisioning command.
+1. Download the provisioning package using the option at the top of the Cache Node Configuration page and extract the package onto the host machine.
+1. Open a command line window *as administrator* on the host machine, then change directory to the extracted provisioning package.
+1. Set access permissions to allow the `provisionmcc.sh` script within the provisioning package directory to execute.
+1. Run the provisioning command on the host machine.
+
+# [Azure CLI](#tab/cli)
+
+To deploy a cache node programmatically, you'll need to use Azure CLI to get the cache node's provisioning details and then run the provisioning command on the host machine.
+
+1. To get the cache node's provisioning details, use `az mcc ent node get-provisioning-details`
+
+   ```azurecli-interactive
+   az mcc ent node get-provisioning-details --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg
+   ```
+
+1. Save the resulting output. These values will be passed as parameters within the provisioning command.
+1. Download and extract the [Connected Cache provisioning package for Linux](https://aka.ms/MCC-Ent-InstallScript-Linux) to your host machine.
+1. Open a command line window *as administrator* on the host machine, then change directory to the extracted provisioning package.
+1. Set access permissions to allow the `provisionmcc.sh` script within the provisioning package directory to execute.
+1. Replace the values in the following provisioning command before running it on the host machine.
+
+   ```azurepowershell-interactive
+   sudo ./provisionmcc.sh customerid="enter mccResourceId here" cachenodeid="enter cacheNodeId here" customerkey=" enter customerKey here " registrationkey="enter registrationKey here" drivepathandsizeingb="enter physicalPath value,enter sizeInGb value here" shoulduseproxy="enter true if present, enter false if not" proxyurl=http://enter proxy hostname:enter port
+   ```
+
+---
+
+## Steps to point Windows client devices at Connected Cache node
+
+Once you have successfully deployed Connected Cache to your Linux host machine, you'll need to configure your Windows client devices to request Microsoft content from the Connected Cache node.
+
+You can do this by setting the [DOCacheHost or DOCacheHostSource policies via Intune](./waas-delivery-optimization-reference.md#cache-server-hostname).
+
+## Next step
+
+> [!div class="nextstepaction"]
+> [Verify cache node functionality](mcc-ent-verify-cache-node.md)
+
+## Related content
+
+- [Deploy to a Windows host machine](mcc-ent-deploy-to-windows.md)
+- [Uninstall Connected Cache node](mcc-ent-uninstall-cache-node.md)

windows/deployment/do/mcc-ent-deploy-to-windows.md

@@ -0,0 +1,82 @@
+---
+title: Deploy Microsoft Connected Cache software to a Windows host machine
+description: Details on how to deploy Microsoft Connected Cache for Enterprise and Education cache software to a Windows host machine.
+author: chrisjlin
+ms.author: lichris
+manager: naengler
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+ms.date: 10/30/2024
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>	
+---
+
+# Deploy Microsoft Connected Cache caching software to a Windows host machine
+
+This article describes how to deploy Microsoft Connected Cache for Enterprise and Education caching software to a Windows host machine.
+
+Deploying Connected Cache to a Windows host machine requires designating a [Group Managed Service Account (gMSA)](/windows-server/security/group-managed-service-accounts/getting-started-with-group-managed-service-accounts) or a [Local User Account](https://support.microsoft.com/windows/create-a-local-user-or-administrator-account-in-windows-20de74e0-ac7f-3502-a866-32915af2a34d) as the Connected Cache runtime account. This prevents tampering with the Connected Cache container and the cached content on the host machine.
+
+Before deploying Connected Cache to a Windows host machine, ensure that the host machine meets all [requirements](mcc-ent-prerequisites.md), and that you have [created and configured your Connected Cache Azure resource](mcc-ent-create-resource-and-cache.md).
+
+## Steps to deploy Connected Cache node to Windows
+
+# [Azure portal](#tab/portal)
+
+1. Within the Azure portal, navigate to the **Provisioning** tab of your cache node and copy the provisioning command.
+1. Download the provisioning package using the option at the top of the Cache Node Configuration page and extract the package onto the host machine. **Note**: The installer should be in a folder that isn't synced to OneDrive, as this will interfere with the installation process.
+1. Open a PowerShell window *as administrator* on the host machine, then change directory to the extracted provisioning package.
+1. Set the Execution Policy to *Unrestricted* to allow the provisioning scripts to run.
+1. Create a `$User` environment variable containing the username of the account you intend to designate as the Connected Cache runtime account. 
+
+    For gMSAs, the value should be formatted as `"Domain\Username$"`. For Local User accounts, `$User` should be formatted as `"LocalMachineName\Username"`.
+
+   If you're using a Local User account as the Connected Cache runtime account, you'll also need to create a [PSCredential Object](/dotnet/api/system.management.automation.pscredential) named `$myLocalAccountCredential`. **Note**: You'll need to apply a local security policy to permit the Local User account to `Log on as a batch job`.
+
+1. Run the provisioning command on the host machine.
+
+# [Azure CLI](#tab/cli)
+
+To deploy a cache node programmatically, you'll need to use Azure CLI to get the cache node's provisioning details and then run the provisioning command on the host machine.
+
+1. To get the cache node's provisioning details, use `az mcc ent node get-provisioning-details`.
+
+   ```azurecli-interactive
+   az mcc ent node get-provisioning-details --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg
+   ```
+
+1. Save the resulting output. These values will be passed as parameters within the provisioning command.
+1. Download and extract the [Connected Cache provisioning package for Windows](https://aka.ms/MCC-Ent-InstallScript-WSL) to your host machine. **Note**: The installer should be in a folder that isn't synced to OneDrive, as this will interfere with the installation process.
+1. Open a PowerShell window *as administrator* on the host machine, then change directory to the extracted provisioning package.
+1. Set the Execution Policy to *Unrestricted* to allow the provisioning scripts to run.
+1. Create a `$User` environment variable containing the username of the account you intend to designate as the Connected Cache runtime account. 
+
+    For gMSAs, the value should be formatted as `"Domain\Username$"`. For Local User accounts, `$User` should be formatted as `"LocalMachineName\Username"`.
+
+   If you're using a Local User account as the Connected Cache runtime account, you'll also need to create a [PSCredential Object](/dotnet/api/system.management.automation.pscredential) named `$myLocalAccountCredential`. **Note**: You'll need to apply a local security policy to permit the Local User account to `Log on as a batch job`.
+
+1. Replace the values in the following provisioning command before running it on the host machine. **Note**:  `-mccLocalAccountCredential $myLocalAccountCredential` is only needed if you're using a Local User account as the Connected Cache runtime account.
+
+   ```powershell-interactive
+   ./provisionmcconwsl.ps1 -installationFolder c:\mccwsl01 -customerid [enter mccResourceId here] -cachenodeid [enter cacheNodeId here] -customerkey [enter customerKey here] -registrationkey [enter registration key] -cacheDrives "/var/mcc,enter drive size"  -shouldUseProxy [enter true if present, enter false if not] -proxyurl "http://[enter proxy host name]:[enter port]"  -mccRunTimeAccount $User -mccLocalAccountCredential $myLocalAccountCredential
+   ```
+
+--- 
+
+## Steps to point Windows client devices at Connected Cache node
+
+Once you have successfully deployed Connected Cache to your Windows host machine, you'll need to configure your Windows client devices to request Microsoft content from the Connected Cache node.
+
+You can do this by setting the [DOCacheHost or DOCacheHostSource policies via Intune](./waas-delivery-optimization-reference.md#cache-server-hostname).
+
+## Next step
+
+> [!div class="nextstepaction"]
+> [Verify cache node functionality](mcc-ent-verify-cache-node.md)
+
+## Related content
+
+- [Deploy to a Linux host machine](mcc-ent-deploy-to-linux.md)
+- [Uninstall Connected Cache node](mcc-ent-uninstall-cache-node.md)

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

@@ -0,0 +1,28 @@
+---
+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
+manager: naengler
+ms.author: lichris
+author: chrisjlin
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise</a>	
+ms.date: 10/30/2024
+---
+
+
+# Microsoft Connected Cache for Enterprise and Education (early preview)
+
+If you participated in the early preview program, thank you for your collaboration and feedback.
+
+To continue using supported version of Microsoft Connected Cache, we strongly recommend that you upgrade your existing cache nodes to the new release. Cache nodes created and deployed during early preview should still function but can no longer be managed or monitored remotely via the Microsoft Connected Cache Azure service.
+
+We strongly recommend you [recreate your existing cache nodes in Azure](mcc-ent-create-resource-and-cache.md) and then [redeploy the caching software to your host machines](mcc-ent-deploy-to-windows.md) using the latest OS-specific installer.
+
+
+## Next step
+
+> [!div class="nextstepaction"]
+> [View documentation for Connected Cache public preview](mcc-ent-edu-overview.md)

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

@@ -1,38 +1,71 @@
 ---
-title: MCC for Enterprise and Education Overview
+title: Microsoft Connected Cache for Enterprise and Education Overview
-description: Overview, supported scenarios, and content types for Microsoft Connected Cache (MCC) for Enterprise and Education.
+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.author: carmenf
+ms.author: andyriv
-author: cmknox
+author: chrisjlin
-manager: aaroncz
+manager: naengler
 ms.reviewer: mstewart
 ms.collection: tier3
 appliesto: 
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
 - ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>	
-ms.date: 05/23/2024
+ms.date: 10/30/2024
 ---
 
 # Microsoft Connected Cache for Enterprise and Education Overview
 
 > [!IMPORTANT]
->
+> Microsoft Connected Cache is currently a preview feature. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
-> - Microsoft Connected Cache is currently a preview feature. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
-> - As we near the release of public preview, we have paused onboarding. Please continue to submit the form to express interest so we can follow up with you once public preview of Microsoft Connected Cache for Enteprise and Education is available. To register your interest, fill out the form located at [https://aka.ms/MSConnectedCacheSignup](https://aka.ms/MSConnectedCacheSignup).
 
-Microsoft Connected Cache (MCC) for Enterprise and Education (early preview) is a software-only caching solution that delivers Microsoft content within Enterprise and Education networks. MCC can be deployed to as many Windows servers, bare-metal servers, or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune.
+Microsoft Connected Cache for Enterprise and Education (preview) is a software-only caching solution that delivers Microsoft content within enterprise and education networks. Connected Cache can be managed from the Azure portal or through Azure CLI. It can be deployed to as many Windows devices, Linux devices, or VMs as needed. Managed Windows devices can be configured to download cloud content from a Connected Cache server by applying the client policy using management tools such as Microsoft Intune.
 
-Microsoft Connected Cache (MCC) for Enterprise and Education (early preview) is a standalone cache for customers moving towards modern management and away from Configuration Manager distribution points. For information about Microsoft Connected Cache in Configuration Manager (generally available, starting Configuration Manager version 2111), see [Microsoft Connected Cache in Configuration Manager](/mem/configmgr/core/plan-design/hierarchy/microsoft-connected-cache).
+For information about Microsoft Connected Cache in Configuration Manager<!-- version 2111-->, see [Microsoft Connected Cache in Configuration Manager](/configmgr/core/plan-design/hierarchy/microsoft-connected-cache).
 
-## Supported scenarios
+Microsoft Connected Cache deployed directly to Windows relies on [Windows Subsystem for Linux (WSL](/windows/wsl/about) and either a [Group Managed Service Account](/windows-server/identity/ad-ds/manage/group-managed-service-accounts/group-managed-service-accounts/getting-started-with-group-managed-service-accounts), local user account, or domain user account are required to run WSL. WSL needs to run in a user context and any user, even if the currently logged-in user, could be used to run WSL and Microsoft Connected Cache.
 
-Connected Cache (early preview) supports the following scenarios:
+## Supported scenarios and configurations
+
+Microsoft Connected Cache for Enterprise and Education (preview) is intended to support the following content delivery scenarios:
 
 - Pre-provisioning of devices using Windows Autopilot
-- Cloud-only devices, such as Intune-enrolled devices
+- Co-managed clients that get monthly updates and Win32 apps from Microsoft Intune
+- Cloud-only managed devices, such as Intune-enrolled devices without the Configuration Manager client, that get monthly updates and Win32 apps from Microsoft Intune
+
+Microsoft Connected Cache is built for flexible deployments to support several different enterprise configurations:
+
+### Branch office
+
+Customers may have globally dispersed offices that meet some or all of the following parameters:
+
+- Have 10 to 50 Windows devices on-site
+- Don't have dedicated server hardware
+- Have internet bandwidth that is limited (satellite internet)
+- Have intermittent internet connectivity
+
+To support the branch office scenario, customers can deploy a Connected Cache node to a Windows 11 client device.
+
+### Large Enterprise
+
+Customers may have office spaces, data centers, or Azure deployments that meet some or all of the following parameters:  
+
+- Have 100s or 1,000s of Windows devices (desktop or server)
+- Have some existing server hardware (Decommissioned Distribution Point, file server, cloud print server)
+- Have Azure VMs and/or Azure Virtual Desktop deployed
+- Have limited internet bandwidth (T1 or T3 lines)
+
+To support the large enterprise scenario, customers can deploy a Connected Cache node to a server running Windows Server 2022 or Ubuntu 22.04.
+
+See [Connected Cache node host machine requirements](mcc-ent-prerequisites.md) for recommended host machine specifications in each configuration.
+
+| Enterprise configuration | Download speed range | Download speeds and approximate content volume delivered in 8 Hours |
+|---|---|---|
+|Branch office|< 1 Gbps Peak| 500 Mbps => 1,800 GB </br></br> 250 Mbps => 900 GB </br></br> 100 Mbps => 360 GB </br></br> 50 Mbps => 180 GB|
+|Small to medium enterprises/Autopilot provisioning center (50 - 500 devices in a single location) |1 - 5 Gbps| 5 Gbps => 18,000 GB </br></br>3 Gbps => 10,800 GB </br></br>1 Gbps => 3,600 GB|
+|Medium to large enterprises/Autopilot provisioning center (500 - 5,000 devices in a single location) |5 - 10 Gbps Peak|   9 Gbps => 32,400 GB </br></br> 5 Gbps => 18,000 GB </br></br>3 Gbps => 10,800 GB|
 
 ## Supported content types
 
@@ -47,27 +80,21 @@ For the full list of content endpoints that Microsoft Connected Cache for Enterp
 
 ## How it works
 
-MCC is a hybrid (mix of on-premises and cloud resources) SaaS solution built as an Azure IoT Edge module and Docker compatible Linux container deployed to your Windows devices. The Delivery Optimization team chose IoT Edge for Linux on Windows (EFLOW) as a secure, reliable container management infrastructure. EFLOW is a Linux virtual machine, based on Microsoft's first party CBL-Mariner operating system. It's built with the IoT Edge runtime and validated as a tier 1 supported environment for IoT Edge workloads. MCC is a Linux IoT Edge module running on the Windows Host OS.  
+The following diagram displays an overview of how Connected Cache functions:
 
-1. The Azure Management Portal is used to create MCC nodes.
+:::image type="content" source="./images/mcc_ent_publicpreview.png" alt-text="Diagram displaying the components of Connected Cache." lightbox="./images/mcc_ent_publicpreview.png":::
-1. The MCC container is deployed and provisioned to the server using the installer provided in the portal.
-1. Client policy is set in your management solution to point to the IP address or FQDN of the cache server.
-1. Microsoft end-user devices make range requests for content from the MCC node.
-1. The MCC node pulls content from the CDN, seeds its local cache stored on disk, and delivers the content to the client.
-1. Subsequent requests from end-user devices for content will now come from cache.
-1. If the MCC node is unavailable, the client pulls content from CDN to ensure uninterrupted service for your subscribers.
 
-The following diagram displays an overview of how MCC functions:
+1. The Azure management portal for Microsoft Connected Cache or CLI are used to create cache nodes, configure deployments, including unauthenticated proxy settings.
+1. Prepare Windows or Linux devices. If deploying to Windows devices, prepare accounts - gMSA, local user account, domain account. Deploy to Windows or Linux devices using scripts.
+1. The Microsoft Connected Cache container is deployed to the device using Azure IoT Edge container management services and the cache server begins reporting status and metrics to Delivery Optimization services.
+1. The DOCacheHost setting is configured using Intune or other MDM, DHCP custom option, or registry key.
+1. Devices request content from the cache server, the cache server forwards the requests to the CDN and fills the cache, the cache server delivers the content requested to the devices, and uses Peer to Peer (depending on DO Download mode settings) for all DO content.
+1. Devices can fall back to CDN if the cache server is unavailable for any reason or use Delivery Optimization delay fallback to http (CDN) settings to prefer the local cache server.
+You can view data about Microsoft Connected Cache downloads on management portal and Windows Update for Business reports.
 
-:::image type="content" source="./images/waas-mcc-diag-overview.png" alt-text="Diagram displaying the components of MCC." lightbox="./images/waas-mcc-diag-overview.png":::
+## Next steps
 
-## IoT Edge
+>[!div class="nextstepaction"]
 
-Even though your MCC scenario isn't related to IoT, Azure IoT Edge is used as a more generic Linux container deployment and management infrastructure. The Azure IoT Edge runtime sits on your designated MCC device and performs management and communication operations. The runtime performs several functions important to manage MCC on your edge device:
+>[Create Connected Cache Azure resources](mcc-ent-create-resource-and-cache.md)
-
+>
-1. Installs and updates MCC on your edge device.
-1. Maintains Azure IoT Edge security standards on your edge device.
-1. Ensures that MCC is always running.
-1. Reports MCC health and usage to the cloud for remote monitoring.
-  
-For more information on Azure IoT Edge, see the Azure IoT Edge [documentation](/azure/iot-edge/about-iot-edge).

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

@@ -0,0 +1,78 @@
+### YamlMime:FAQ
+metadata:
+  title: Microsoft Connected Cache for Enterprise and Education Frequently Asked Questions
+  description: The following article is a list of frequently asked questions for Microsoft Connected Cache for Enterprise.
+  ms.service: windows-client
+  ms.subservice: itpro-updates
+  ms.topic: faq
+  ms.author: nidos
+  author: doshnid
+  ms.reviewer: mstewart
+  manager: aaroncz
+  ms.collection:
+    - highpri
+    - tier3
+  appliesto: 
+    - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+    - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
+  ms.date: 10/30/2024
+title: Microsoft Connected Cache for Enterprise Frequently Asked Questions
+summary: |
+  Frequently asked questions about Microsoft Connected Cache for Enterprise
+  
+sections:
+  - name: Ignored
+    questions:
+      - question: What are the licesning requirement?
+        answer: Microsoft Connected Cache for Enterprise and Education is available to all Windows E3, E5 and F3 and Education A3 and A5 customers.
+      - question: Is there a charge to create Connected Cache resources and cache node on Azure?
+        answer: No. You won't be charged to create Connected Cache resource and cache nodes on Azure. However, you need an Azure pay-as-you-go subscription to create the resources but there is no charge for the resource itself.
+      - question: Is there a nondisclosure agreement to sign?
+        answer: No, a nondisclosure agreement isn't required.
+      - question: What will Microsoft Connected Cache for Enterprise and Education do for me? 
+        answer: "[Delivery Optimization](waas-delivery-optimization-reference.md) and Microsoft Connected Cache are Microsoft’s comprehensive solutions for minimizing enterprises’ internet bandwidth consumption, with Delivery Optimization acting as the distributed content source and Connected Cache as a dedicated content source. Microsoft customers have benefited from these solutions, seeing savings of more than 90% of bandwidth when managing Windows 11 upgrades, Autopilot device provisioning, Intune application installations, and monthly update deployments."
+      - question: Can I deploy Connected Cache to a production environment?
+        answer: The core caching engine of Microsoft Connected Cache is deployed to hundreds of ISPs globally and has been reliably delivering Microsoft content to customers. Connected Cache relies on production Azure services for the deployment and management of Connected Cache nodes and for Windows installations Windows Subsystem for Linux. Microsoft support is fully onboarded to support your organization whether you deploy Connected Cache in a lab for testing or in production.
+      - question: When will Microsoft Connected Cache for Enterprise and Education be made generally available (GA)?
+        answer: "[Delivery Optimization](waas-delivery-optimization-reference.md) and Microsoft Connected Cache are Microsoft’s comprehensive solutions for minimizing enterprises’ internet bandwidth consumption. Microsoft is committed to making Connected Cache generally available soon. Additionally, Microsoft support is fully onboarded to support your organization in whatever capacity you deploy Connected Cache."
+      - question: What are the prerequisites and hardware requirements?
+        answer:  | 
+         - [Azure pay-as-you-go subscription](https://azure.microsoft.com/offers/ms-azr-0003p/).
+         - [Hardware to host Microsoft Connected Cache](mcc-ent-edu-overview.md)
+         - [Host machine requirements](mcc-ent-prerequisites.md)
+      - question: What host OS do I need to deploy Connected Cache?
+        answer: You can use Linux or Windows OS. Depending on the OS, the provisioning script and certain provisioning steps are different. 
+      - 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](delivery-optimization-endpoints.md).
+      - question: Do I need to provide hardware BareMetal server or a virtual machine (VM)?
+        answer: Microsoft Connected Cache is a software-only caching solution and requires 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: 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 clients. You can choose the location where you have your routers or where you have dense traffic or any other parameters.   
+      - question: How can I set up a gMSA account?
+        answer: For more information about gMSA accounts, see [Learn how to provision a Group Managed Service Account on a Domain Controller](/windows-server/identity/ad-ds/manage/group-managed-service-accounts/group-managed-service-accounts/getting-started-with-group-managed-service-accounts#create-group-managed-service-accounts). Make sure that your gMSA has been granted permissions to "Log on as batch job" within the host machine's [local security policies](/previous-versions/windows/it-pro/windows-10/security/threat-protection/security-policy-settings/how-to-configure-security-policy-settings).
+      - question: How can I set up a local account?
+        answer: For more information, see [Learn how to provision a Local User Account](https://support.microsoft.com/topic/104dc19f-6430-4b49-6a2b-e4dbd1dcdf32). Make sure that your gMSA has been granted permissions to "Log on as batch job" within the host machine's [local security policies](/previous-versions/windows/it-pro/windows-10/security/threat-protection/security-policy-settings/how-to-configure-security-policy-settings).
+      - question: Where can I monitor cache node usage?
+        answer: You can monitor your cache node usage on Azure portal. For more information, see [Monitor cache node usage Info on Reporting Capabilities](mcc-ent-monitoring.md).
+      - question: How does Microsoft Connected Cache populate its content? Can I precache content?
+        answer: Microsoft Connected Cache is a cold cache warmed by client requests at the byte range level so your clients only request the content they need. The client requests content and that is what fills the cache which means there's no cache fill necessary. "Preseeding" can be achieved by use of update rings. A test ring or early adopter ring can be used to fill the cache and all subsequent requests by other clients will come from cache.
+      - 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 looks at the cache control headers from the original acquisition. If that content is expired, NGINX continues to serve the stale content while it's downloading the new content. We cache the content for 30 days. The content is in the hot cache path (open handles and such) for 24 hrs, but resides on disk for 30 days. The drive fills up and nginx starts to delete content based on its own algorithm, probably some combination of least recently used.
+      - question: Is it possible to not update the Microsoft Connected Cache software or delay update longer than the timeline provided in the updates configuration?
+        answer: No. It's important to keep the Microsoft Connected Cache software up to date, especially when it comes to security issues. Microsoft validates updates prior to releasing Enterprises Connected Cache updates and only releases updates when it's necessary to keep customers secure or to ensure the continued successful operation of Connected Cache nodes for customers.  
+      - question: How do I set up CLI?
+        answer: For more information, see [How to install the Azure CLI](/cli/azure/install-azure-cli).
+      - question: How do I install the Microsoft Connected Cache Azure CLI extension?
+        answer: For more information, see [Install the Microsoft Connected Cache extension](mcc-ent-manage-using-cli.md#prerequisites).
+      - question: What do I do if I have to set up or change existing proxy?
+        answer: You can enable proxy and provide proxy information on Azure portal or use the CLI. Don't forget to rerun the provisioning script after making any proxy changes. For more information, see [Set up or change existing proxy](mcc-ent-create-resource-and-cache.md#proxy-settings).
+      - question: How do we set up Microsoft Connected Cache if we support multiple countries or regions?
+        answer: Microsoft Connected Cache isn't a service that has dependency on a specific Azure region, and there isn't personal or organizational identifiable information stored in the resource that necessitates data residency. The three regions that the Connected Cache resource can be deployed to are (Europe) North Europe, (Asia Pacific) Korea Central, and (US) West US.
+      - question: Should I use a gMSA, local user, or domain account to deploy Microsoft Connected Cache to Windows?
+        answer: There are pros and cons to the account options available to customers. We anticipate that security and manageability are top priories for customers. Microsoft provides guidance on both Active Directory and Microsoft Entra-based service accounts ([Introduction to Active Directory service accounts - Choose the right type of service account](/entra/architecture/service-accounts-on-premises#types-of-on-premises-service-accounts)) and user-based service accounts ([Secure user-based service accounts in Active Directory)](/entra/architecture/service-accounts-user-on-premises#assess-on-premises-user-account-security)).
+      - question: Does the user have to be logged using the account that installed Microsoft Connected Cache on Windows or Linux?
+        answer: No. As part of the installation on Windows a scheduled task is created using the account used to install Connected Cache. Regardless of which user is logged in or not logged in, the scheduled task remains running. On Linux, Connected Cache is installed by the user and remains running regardless of which user is logged in to the OS.
+      - 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, see [Troubleshooting issues for Microsoft Connected Cache for Enterprise and Education](mcc-ent-troubleshooting.md). If you still need more support, you can contact customer support.

windows/deployment/do/mcc-ent-manage-using-cli.md

@@ -0,0 +1,215 @@
+---
+title: Manage Microsoft Connected Cache nodes using CLI
+description: Details on how to manage Microsoft Connected Cache for Enterprise cache nodes via Azure CLI commands.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+manager: aaroncz
+ms.author: nidos
+author: doshnid
+ms.reviewer: mstewart
+ms.collection: tier3
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise</a>	
+ms.date: 10/30/2024
+---
+
+# Manage cache nodes using CLI
+
+<br>
+
+This article outlines how to create, configure, and deploy Microsoft Connected Cache for Enterprise cache nodes using Azure CLI.
+
+ 
+## Prerequisites:
+1. **Install Azure CLI**: [How to install the Azure CLI](/cli/azure/install-azure-cli)
+1. **Install Connected Cache extension**: Install Connected Cache extension via the command below
+
+```azurecli-interactive
+az extension add --name mcc
+```
+
+To learn more about installing extensions, see [Install the Connected Cache extension.](/cli/azure/azure-cli-extensions-overview#how-to-install-extensions)
+
+<br>
+<br>
+
+### 1. Create a Resource group
+
+The first step is to create a resource group if you don't already have one.
+An Azure resource group is a logical container into which Azure resources are deployed and managed.
+
+To create a resource group, use `az group create`. You can find more details on this CLI command [here](/cli/azure/group#az-group-create).
+<br>
+
+```azurecli-interactive
+az group create --name myrg --location westus
+```
+
+Once the resource group is created, you'll need to create a Microsoft Connected Cache for Enterprise resource.
+
+### 2. Create a Connected Cache Azure resource
+
+A Connected Cache Azure resource is a top-level Azure resource under which cache nodes can be created.
+
+To create a Connected Cache Azure resource, use `az mcc ent resource create`
+
+```azurecli-interactive
+az mcc ent resource create --mcc-resource-name mymccresource --resource-group myrg
+```
+
+<br>
+
+>[!IMPORTANT]
+>In the output, look for operationStatus. **operationStatus = Succeeded** indicates that our services have successfully started creating your Connected Cache resource.
+
+<br>
+
+The next step is to create a cache node under this resource.
+
+
+### 3. Create a cache node
+
+To create a cache node, use `az mcc ent node create`
+
+```azurecli-interactive
+az mcc ent node create --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg --host-os <linux or windows>
+```
+
+<br>
+
+>[!IMPORTANT]
+>In the output, look for operationStatus. **operationStatus = Succeeded** indicates that our services have successfully started creating cache node.
+
+<br>
+
+### 4. Confirm cache node creation
+
+Before you can start configuring your cache node, you need to confirm that the cache node was successfully created.
+
+To confirm cache node creation, use `az mcc ent node show`
+
+<br>
+
+```azurecli-interactive
+az mcc ent node show --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg  
+```
+
+>[!IMPORTANT]
+>In the output look for cacheNodeState. If **cacheNodeState = Not Configured**, you can continue with cache node configuration.
+>If **cacheNodeState = Registration in Progress**, then the cache node is still in process of being created. Please wait for a minute or two more and run the command again.
+
+<br>
+
+Once successful cache node creation is confirmed, you can proceed to configure the cache node.
+
+
+### 5. Configure cache node
+
+To configure your cache node, use `az mcc ent node update`
+
+The below example configures a Linux cache node with proxy enabled:
+
+```azurecli-interactive
+az mcc ent node update --cache-node-name <mycachenode> --mcc-resource-name <mymccresource> --resource-group <myrg>
+--cache-drive "[{physical-path:</physical/path>,size-in-gb:<size of cache drive>},{</physical/path>,size-in-gb:<size of cache drive>}...]"> --proxy <enabled> --proxy-host <"proxy host name"> --proxy-port <proxy port>  --auto-update-day <day of week> --auto-update-time <time of day> --auto-update-week <week of month> --auto-update-ring <update ring>
+```
+
+>[!Note]
+>* For a cache node that is to be deployed on Windows host OS, the physical path of the cache drive <u>must</u> be **/var/mcc**.<br>
+>* In the output, look for operationStatus. **operationStatus = Succeeded** indicates that our services have successfully updated the cache node. You will also see that cacheNodeState will show *Not Provisioned*. <br>
+>* Please save values for <u>physicalPath, sizeInGb, proxyPort, proxyHostName</u> as these values will be needed to construct the provisioning script.
+
+
+<br>
+
+### 6. Get provisioning details for the cache node
+
+After successfully configuring the cache node, the next step is to deploy the cache node to a host machine. To deploy the cache node, you'll need to create a provisioning script with relevant information.
+
+To get the relevant information for provisioning script, use `az mcc ent node get-provisioning-details`
+
+```azurecli-interactive
+az mcc ent node get-provisioning-details --cache-node-name mycachenode --mcc-resource-name mymccresource --resource-group myrg
+```
+
+>[!IMPORTANT]
+>* Save the resulting values for cacheNodeId, customerKey, mccResourceId, registrationKey. These GUIDs are needed to create the provisioning script.
+>* In the output look for cacheNodeState. If **cacheNodeState = Not Provisioned**, you can continue with cache node provisioning.
+>* If **cacheNodeState = Not Configured**, then the cache node has not been configured. Configure the cache node before provisioning.
+
+<br>
+
+## Next step
+
+To deploy the cache node to a **Windows** host machine, see 
+>[!div class="nextstepaction"]
+>[Deploy cache node to Windows](mcc-ent-deploy-to-windows.md)
+
+To deploy the cache node to a **Linux** host machine, see 
+>[!div class="nextstepaction"]
+>[Deploy cache node to Linux](mcc-ent-deploy-to-linux.md)
+
+<br>
+
+### Example script to bulk create and configure multiple cache nodes:
+
+Below is a pseudocode example of how to script bulk creation and configuration of a Connected Cache Azure resource and multiple Connected Cache cache nodes:
+
+<!--# [Bash](#tab/bash)
+
+:::code language="azurecli" source="~/azure_cli_scripts/azure-cli/create-azure-resources-at-scale/bash/create-azure-resources-at-scale.sh" id="step4":::
+
+In your console output, are you missing the last row in your CSV file?  This can be caused by a missing line continuation character after the last line. Add a blank line at the end of your CSV file to fix the issue.
+
+# [PowerShell](#tab/powershell)
+
+:::code language="azurecli" source="~/azure_cli_scripts/azure-cli/create-azure-resources-at-scale/powershell/create-azure-resources-at-scale.ps1" id="step4":::
+
+-->
+
+# [PowerShell](#tab/powershell)
+
+```powershell
+#Define variables
+$mccResourceName = "myMCCResource"
+$cacheNodeName = "demo-node"
+$cacheNodeOperatingSystem = "Windows"
+$resourceGroup = "myRG"
+$resourceLocation = "westus"
+$cacheNodesToCreate = 2
+$proxyHost = "myProxy.com"
+$proxyPort = "8080"
+$waitTime = 3
+
+# Create Microsoft Connected Cache Azure resource
+az mcc ent resource create --mcc-resource-name $mccResourceName --location $resourceLocation --resource-group $resourceGroup
+
+#Loop through $cacheNodesToCreate iterations
+for ($cacheNodeNumber = 1; $cacheNodeNumber -le $cacheNodesToCreate; $cacheNodeNumber++) {
+    $iteratedCacheNodeName = $cacheNodeName + "-" + $cacheNodeNumber
+    
+    #Create cache node
+    az mcc ent node create --cache-node-name $iteratedCacheNodeName --mcc-resource-name $mccResourceName --host-os $cacheNodeOperatingSystem --resource-group $resourceGroup
+
+    #Get cache node state
+    $cacheNodeState = $(az mcc ent node show --cache-node-name $iteratedCacheNodeName --mcc-resource-name $mccResourceName --resource-group $resourceGroup --query "cacheNodeState") | ConvertFrom-Json
+
+    $howLong = 0
+    #Wait until cache node state returns "Not Configured"
+    while ($cacheNodeState -ne "Not Configured") {
+        Write-Output "Waiting for cache node creation to complete...$howLong seconds"
+        Start-Sleep -Seconds $waitTime
+        $howLong += $waitTime
+    
+        $cacheNodeState = $(az mcc ent node show --cache-node-name $iteratedCacheNodeName --mcc-resource-name $mccResourceName --resource-group $resourceGroup --query "cacheNodeState") | ConvertFrom-Json
+    }
+
+    #Configure cache node
+    az mcc ent node update --cache-node-name $iteratedCacheNodeName --mcc-resource-name $mccResourceName --resource-group $resourceGroup --cache-drive  "[{physical-path:/var/mcc,size-in-gb:50}]" --proxy enabled --proxy-host $proxyHost --proxy-port $proxyPort
+}
+```
+---
+

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

@@ -0,0 +1,91 @@
+---
+title: Monitor usage of Microsoft Connected Cache nodes
+description: Details on how to monitor the usage of Microsoft Connected Cache for Enterprise cache nodes.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+manager: naengler
+ms.author: lichris
+author: chrisjlin
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise</a>	
+ms.date: 10/30/2024
+---
+
+# Monitor cache node usage
+
+Tracking the status and performance of your Connected Cache node is essential to making sure you're getting the most out of the service.
+
+For basic monitoring, navigate to the **Overview** tab. Here you'll be able to view a collection of predefined metrics and charts. All the monitoring in this section will function right after your Connected Cache node has been deployed.
+
+For advanced monitoring, navigate to the **Metrics** section under the **Monitoring** tab. Here you'll be able to access more sampled metrics (hits, misses, inbound traffic) and specify different aggregations (count, avg, min, max, sum). You can then use this data to create customized charts and configure alerts.
+
+Between the two monitoring sections, you'll be able to gather essential insights into the health, performance, and efficiency of your Connected Cache nodes.
+
+## Basic Monitoring
+
+### Cache node summary
+
+Below are the metrics you'll find in the **Cache Node Summary** dashboard, along with their descriptions. This dashboard only reflects data received from cache nodes in the last 24 hours.
+
+![Screenshot of cache node summary in the Azure portal interface.](../images/mcc-ent-cache-node-summary.png)
+
+| Metric | Description |
+| --- | --- |
+| Healthy nodes | Your Connected Cache node will periodically send heartbeat messages to the Connected Cache service. If the Connected Cache service has received a heartbeat message from your Connected Cache node in the last 24 hours, the node will be labeled as healthy. |
+| Unhealthy nodes | If the Connected Cache service hasn't received a heartbeat message from your Connected Cache node in the last 24 hours, the node will be labeled as unhealthy. |
+| Max in | The maximum ingress in Megabits per second (Mbps) that your node has pulled from CDN endpoints in the last 24 hours. |
+| Max out | The minimum egress in Mbps that your node has sent to Windows devices in its network over the last 24 hours. |
+| Average in | The average ingress in Mbps that your node has pulled from CDN endpoints in the last 24 hours. |
+| Average out | The average egress in Mbps that your node has sent to Windows devices in its network over the last 24 hours. |
+| Cache efficiency | The percentage of all content requests your Connected Cache node receives that can be fulfilled using your node's cached content. A well-performing node should have an efficiency > 90%. |
+
+### Key metric charts
+
+The two predefined charts on the Overview page visually represent the egress and types of content served by your Connected Cache node. The filters that are displayed below the cache node summary dashboard only affect the data shown in the key metric charts.
+
+![Screenshot of key metric charts in the Azure portal interface.](../images/mcc-ent-key-metric-charts.png)
+
+#### Filters
+
+There are two filter controls that can be used to configure the key metric charts.
+
+- Timespan: Select how far back the chart should display
+- Cache nodes: Select which Connected Cache nodes the chart should display data for
+
+#### Outbound Traffic Chart
+
+This chart displays the average egress in bits per second (b/s) that your selected Connected Cache nodes delivered over the specified timespan.
+
+#### Volume by Content Type
+
+This chart displays the volume of each supported content type in bytes (B) that your selected Connected Cache nodes delivered over the specified timespan. See [Microsoft Connected Cache content and services endpoints](delivery-optimization-endpoints.md) for a complete list of supported content types.
+
+The content types displayed in the chart each have a distinct color and are sorted in descending order of volume. The bar chart is stacked such that you can visually compare total volume being delivered at different points in time.
+
+## Advanced Monitoring
+
+To expand upon the metrics shown in the Overview tab, navigate to the **Metrics** tab in the left side toolbar of Azure portal.
+
+Listed below are the metrics you can access in this section:
+
+| Metric | Description |
+| --- | --- |
+| Inbound | The number of content requests your Connected Cache node receives over a specified period of time. |
+| Hits | The number of times your Connected Cache node fulfills a content request by pulling from its cache. |
+| Misses | The number of times your Connected Cache node isn't able to fulfill a content request by pulling from its cache |
+
+### Customizable Dashboards
+
+Once you select the charts you would like to track, you can save them to a personalized dashboard. You can configure the chart title, filters, range, legend, and more. You can also use this personalized dashboard to set up alerts that will notify you if your Connected Cache node dips in performance.
+
+Some example scenarios where you would want to set up a custom alert:
+
+- My Connected Cache node is being shown as unhealthy and I want to know exactly when it stopped egressing last
+- A new Microsoft Word update was released last night and I want to know if my Connected Cache node is helping deliver this content to my Windows devices
+
+## Additional Metrics
+
+Your Connected Cache node can keep track of how much content has been sent to requesting Windows devices, but the node can't track whether the content was successfully received by the device. For more information on accessing client-side data from your Windows devices, see [Monitor Delivery Optimization](waas-delivery-optimization-monitor.md).

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

@@ -0,0 +1,72 @@
+---
+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.author: lichris
+author: chrisjlin
+manager: naengler
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>
+ms.date: 10/30/2024
+---
+
+# Microsoft Connected Cache for Enterprise and Education Requirements
+
+This article details the requirements and recommended specifications for using Microsoft Connected Cache for Enterprise and Education.
+
+## Licensing requirements
+
+- **Valid Azure subscription**: To use the Microsoft Connected Cache for Enterprise and Education service, you'll need a valid Azure subscription that can be used to provision the necessary [Azure resources](/azure/cloud-adoption-framework/govern/resource-consistency/resource-access-management).
+
+    If you don't 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 Azure resources used for Connected Cache will be free to you during this public preview.
+
+- **E3/E5 or A3/A5 license**: Your organization must have one of the following license subscriptions for each device that downloads content from a Connected Cache node:
+
+    - [Windows Enterprise E3 or E5](/windows/whats-new/windows-licensing#windows-11-enterprise), included in [Microsoft 365 F3, E3, or E5](https://www.microsoft.com/microsoft-365/enterprise/microsoft365-plans-and-pricing?msockid=32c407b43d5968050f2b13443c746916)
+    - Windows Education A3 or A5, included in [Microsoft 365 A3 or A5](https://www.microsoft.com/education/products/microsoft-365?msockid=32c407b43d5968050f2b13443c746916#Education-plans)
+
+## Cache node host machine requirements
+
+### General requirements
+
+- Any previous installations of Connected Cache must be [uninstalled](mcc-ent-uninstall-cache-node.md) from the host machine before installing the latest version of Connected Cache.
+- [These listed endpoints](delivery-optimization-endpoints.md) must be reachable by the host machine.
+- The host machine must have no other services / applications utilizing port 80 (for example, Configuration Manager or a distribution point).
+- The host machine must have at least 4 GB of free memory.
+
+### Additional requirements for Windows host machines
+
+- The Windows host machine must be using Windows 11 or Windows Server 2022 with the latest cumulative update applied.
+    - Windows 11 must have [OS Build 22631.3296](https://support.microsoft.com/topic/march-12-2024-kb5035853-os-builds-22621-3296-and-22631-3296-a69ac07f-e893-4d16-bbe1-554b7d9dd39b) or later
+    - Windows Server 2022 must have [OS Build 20348.2227](https://support.microsoft.com/topic/january-9-2024-kb5034129-os-build-20348-2227-6958a36f-efaf-4ef5-a576-c5931072a89a) or later
+- The Windows host machine must support nested virtualization. Ensure that any security settings that may restrict nested virtualization are not enabled, such as ["Trusted launch" in Azure VMs](/azure/virtual-machines/trusted-launch-portal).
+- The Windows host machine must have [WSL 2 installed](/windows/wsl/install#install-wsl-command). You can install this on Windows 11 and Windows Server 2022 by logging on as a local administrator and running the PowerShell command `wsl.exe --install --no-distribution` in an elevated PowerShell window.
+
+### Additional requirements for Linux host machines
+
+- The Linux host machine must be using one of the following operating systems:
+    - Ubuntu 22.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)
+
+### Recommended host machine networking specifications
+
+- Multiple network interface cards (NICs) on a single Connected Cache host machine isn't supported.
+- 1 Gbps NIC is the minimum speed recommended but any NIC is supported.
+- The NIC and BIOS should support SR-IOV for best performance.
+
+### Recommended host machine hardware specifications
+
+Based on your [enterprise configuration](mcc-ent-edu-overview.md), it's recommended to deploy your Connected Cache nodes to host machines that meet the following recommended hardware specifications:
+
+| Component | Branch office | Small / medium enterprise | Large enterprise |
+| --- | --- | --- | --- |
+| CPU cores | 4 | 8 | 16 |
+| Memory | 8 GB, 4 GB free | 16 GB, 4 GB free | 32 GB, 4 GB free |
+| Disk storage | 100 GB free  | 500 GB free | 2x 200-500 GB free |
+| NIC | 1 Gbps | 5 Gbps | 10 Gbps |

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

@@ -0,0 +1,41 @@
+---
+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.author: lichris
+author: chrisjlin
+manager: naengler
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>	
+ms.date: 10/30/2024
+---
+
+# Release Notes for Microsoft Connected Cache for Enterprise and Education
+
+This article contains details about the latest releases of Connected Cache. Since Connected Cache is a preview service, some releases may contain breaking changes.
+
+## Release v1.2.1.2076_E (public preview launch)
+
+The public preview released on **10/30/2024**
+
+For customers that installed earlier versions of Connected Cache, this release contains breaking changes that affect both Linux and Windows host machines. Please see the [early preview documentation page](mcc-ent-early-preview.md) for more details.
+
+### Feature updates
+
+- **Metrics and charts in Azure portal**: You can now visualize *Outbound egress* and *Volume by Content type* charts for your cache node on Azure portal. You can also create custom monitoring charts for your cache nodes. This capability is under the **Metrics** tab on Azure portal.
+- **Cache nodes for Windows or Linux host machines**: Cache nodes can now be created and deployed to Windows host machine or Linux host machines by simply choosing the OS when creating cache nodes.
+- **Ubuntu 22.04 LTS**: Cache nodes can now be deployed on Ubuntu 22.04 LTS.
+- **Azure CLI support**: Cache nodes can now be created and managed via Azure CLI.
+- **Proxy**: We added support for unauthenticated proxy and cloud proxy integration.
+- **Updates**: Your cache nodes are now updated automatically and we also added the capability to set each cache node's update ring to govern the cadence of Microsoft Connected Cache container updates.
+
+### Fixes
+- We fixed various bugs to achieve a smoother installation experience.
+
+## Related content
+
+- [Overview of Connected Cache](mcc-ent-edu-overview.md)

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

@@ -0,0 +1,119 @@
+---
+title: Microsoft Connected Cache for Enterprise and Education troubleshooting
+description: Details on how to troubleshoot common issues for Microsoft Connected Cache for Enterprise.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+manager: naengler
+ms.author: lichris
+author: chrisjlin
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise</a>	
+ms.date: 10/30/2024
+---
+
+
+# Troubleshoot Microsoft Connected Cache for Enterprise and Education
+
+This article contains instructions on how to troubleshoot different issues you may encounter while using Connected Cache. These issues are categorized by the task in which they may be encountered.
+
+## Steps to obtain an Azure subscription ID
+
+<!--Using include file, get-azure-subscription.md, do/mcc-isp.md for shared content-->
+[!INCLUDE [Get Azure subscription](includes/get-azure-subscription.md)]
+
+## Troubleshooting Azure resource creation
+
+[Connected Cache Azure resource creation](mcc-ent-create-resource-and-cache.md) can be initiated using either the Azure portal user interface or the Azure CLI command set.
+
+If you're encountering an error during resource creation, check that you have the necessary permissions to create Azure resources under your subscription and have filled out all required fields during the resource creation process.
+
+## Troubleshooting cache node configuration
+
+[Configuration of your Connected Cache node](mcc-ent-create-resource-and-cache.md) can be done using either the Azure portal user interface or the Azure CLI command set.
+
+If you're encountering a validation error, check that you have filled out all required configuration fields.
+
+If your configuration doesn't appear to be taking effect, check that you have selected the **Save** option at the top of the configuration page in the Azure portal user interface.
+
+If you have changed the proxy configuration, you will need to re-provision the Connected Cache software on the host machine for the proxy configuration to take effect.
+
+## Troubleshooting cache nodes created during early preview
+
+Cache nodes created and deployed during the [Microsoft Connected Cache for Enterprise and Education early preview](mcc-ent-early-preview.md) should continue to function but can no longer be managed or monitored remotely via the Connected Cache Azure service.
+
+As such, we strongly recommend you [recreate your existing resources in Azure](mcc-ent-create-resource-and-cache.md) and then [redeploy the Connected Cache software to your host machines](mcc-ent-deploy-to-windows.md) using the latest OS-specific installer.
+
+## Troubleshooting cache node deployment to Windows host machine
+
+### Collecting Windows-hosted installation logs
+
+[Deploying a Connected Cache node to a Windows host machine](mcc-ent-deploy-to-windows.md) involves running a series of PowerShell scripts contained within the Windows provisioning package. These scripts will attempt to write log files to the installation directory specified in the provisioning command (`C:\mccwsl01\InstallLogs` by default).
+
+There are three types of installation log files:
+
+1. **WSL_Mcc_Install_Transcript**: This log file records the lines printed to the PowerShell window when running the installation script
+1. **WSL_Mcc_Install_FromRegisteredTask_Status**: This log file records the high level status that is written during the registered tasks install
+1. **WSL_Mcc_Install_FromRegisteredTask_Transcript**: This log file records the detailed status that is written during the registered tasks install
+
+The Registered Task Transcript is usually the most useful for diagnosing the installation issue.
+
+### WSL2 fails to install with message "A specified logon session does not exist"
+
+If you are encountering this failure message when attempting to run the PowerShell command `wsl.exe --install --no-distribution` on your Windows host machine, verify that you are logged on as a local administrator and running the command from an elevated PowerShell window.
+
+### Updating the WSL2 kernel
+
+If the Connected Cache installation is failing due to WSL-related issues, try running `wsl.exe --update` to get the latest version of the WSL kernel.
+
+### Checking if the Connected Cache container is running
+
+Once the Connected Cache software has been successfully deployed to the Windows host machine, you can check if the cache node is running properly by doing the following on the Windows host machine:
+
+1. Launch a PowerShell process as the account specified as the runtime account during the Connected Cache install
+1. Run `wsl -d Ubuntu-22.04-Mcc-Base` to access the Linux distribution that hosts the Connected Cache container
+1. Run `sudo iotedge list` to show which containers are running within the IoT Edge runtime
+
+If it shows the **edgeAgent** and **edgeHub** containers but doesn't show **MCC**, you can view the status of the IoT Edge security manager using `sudo iotedge system logs -- -f`.
+
+You can also reboot the IoT Edge runtime using `sudo systemctl restart iotedge`.
+
+### Checking Connected Cache scheduled tasks
+
+Once the Connected Cache container is running, a scheduled task is periodically run under the Connected Cache runtime account to keep WSL from cleaning up the Connected Cache container.
+
+You can use Task Scheduler on the host machine to check the status of this scheduled task.
+
+1. Open Task Scheduler on the host machine
+1. Navigate to the Active Tasks section and double-click on **MCC_Monitor_Task**
+1. Select the scheduled task **MCC_Monitor_Task**
+1. Select the **Triggers** tab and confirm that the Status is **Enabled**
+
+> [!Note]
+> If the password of the runtime account changes, you'll need to update the user in all of the Connected Cache scheduled tasks in order for the Connected Cache node to continue functioning properly.
+
+## Troubleshooting cache node deployment to Linux host machine
+
+[Deploying a Connected Cache node to a Linux host machine](mcc-ent-deploy-to-linux.md) involves running a series of Bash scripts contained within the Linux provisioning package.
+
+Once the Connected Cache software has been successfully deployed to the Linux host machine, you can check if the cache node is running properly by doing the following on the Linux host machine:
+
+1. Run `sudo iotedge list` to show which containers are running within the IoT Edge runtime
+
+If it shows the **edgeAgent** and **edgeHub** containers but doesn't show **MCC**, you can view the status of the IoT Edge security manager using `sudo iotedge system logs -- -f`.
+
+You can also reboot the IoT Edge runtime using `sudo systemctl restart iotedge`.
+
+## Troubleshooting cache node monitoring
+
+Connected Cache node status and performance can be [monitored using the Azure portal user interface](mcc-ent-monitoring.md).
+
+If the [basic monitoring](mcc-ent-monitoring.md#basic-monitoring) visuals on the Overview tab are showing unexpected or erroneous values, refresh the browser window.
+
+If the issue persists, check that you have configured the Timespan and Cache node filters as desired.
+
+## Diagnose and Solve
+
+You can also use the **Diagnose and solve problems** functionality provided by the Azure portal interface. This tab within the Microsoft Connected Cache Azure resource will walk you through a few prompts to help narrow down the solution to your issue.

windows/deployment/do/mcc-ent-uninstall-cache-node.md

@@ -0,0 +1,35 @@
+---
+title: Uninstall Microsoft Connected Cache for Enterprise and Education cache nodes
+description: Details on how to uninstall Microsoft Connected Cache for Enterprise and Education from a host machine.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+ms.author: lichris
+author: chrisjlin
+manager: naengler
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a> 
+ms.date: 10/30/2024
+---
+
+# Uninstall Connected Cache software from a host machine
+
+This article describes how to uninstall Microsoft Connected Cache for Enterprise and Education caching software from a host machine. These steps should be taken after deleting the cache node in the Azure portal.
+
+## Steps to uninstall Connected Cache from a Windows host machine
+
+1. Launch a PowerShell window *as administrator* and navigate to the Connected Cache installation directory (C:\mcconwsl01 by default)
+1. Run the `uninstallmcconwsl.ps1` script
+
+## Steps to uninstall Connected Cache from a Linux host machine
+
+The `uninstallmcc.sh` script within the provisioning package uninstalls the Connected Cache caching software and all related components, including:
+
+- IoT Edge
+- IoT Edge Agent
+- IoT Edge Hub
+- Connected Cache container
+- Moby CLI
+- Moby engine

windows/deployment/do/mcc-ent-update-cache-node.md

@@ -0,0 +1,60 @@
+---
+title: Update Microsoft Connected Cache for Enterprise and Education cache nodes
+description: Details on how Microsoft Connected Cache for Enterprise and Education cache nodes are updated by Microsoft.
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+ms.author: andyriv
+author: chrisjlin
+manager: naengler
+appliesto: 
+- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
+- ✅ Supported Linux distributions
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a> 
+ms.date: 10/30/2024
+---
+# Configure container update frequency for Microsoft Connected Cache for Enterprise and Education
+
+Microsoft Connected Cache for Enterprise and Education caching software is deployed to host machines as a container. The container OS and any software component within the container need to be updated to address security vulnerabilities and improve quality and performance. These Microsoft-published container updates are referred to as "Connected Cache updates" in this article.
+
+Microsoft silently deploys Connected Cache updates to your cache nodes based on the **Update Ring** setting you configure for each cache node.
+
+## Update rings
+
+Connected Cache nodes can be configured to either the `Fast` or `Slow` update ring. If configured to update as part of the Fast ring, the cache node will be silently updated by Microsoft soon after the update is made available. If configured to update as part of the `Slow` ring, the cache node is silently updated by Microsoft within five weeks of the update becoming available.
+
+In other words, configuring cache nodes to update as part of the `Slow` ring provides users with the option to delay the update process until they have validated that the latest Connected Cache update works within their environment. For example, a user could configure a test cache node to update as part of the `Fast` ring and validate that clients can successfully interact with the test cache node after the latest Connected Cache update has been applied. This builds confidence that service won't be interrupted when the production cache nodes are updated as part of the `Slow` ring.
+
+### Update ring options
+
+>[!IMPORTANT]
+> In the event of a critical security patch, Microsoft may elect to initiate a Connected Cache update to your cache node as soon as possible (even if the cache node has been set to the `Slow` Ring). Visit the [Release notes](mcc-ent-release-notes.md) page for a detailed changelog of each Connected Cache update.
+
+#### Fast Ring
+
+All Connected Cache nodes are configured to update as part of the `Fast` ring by default. Connected Cache nodes in the `Fast` ring will be updated soon after an update is made available. The update will silently update cache nodes at a time of day when update traffic is likely to be minimal, such as 3:00 AM (local time) on Saturday.
+
+#### Slow Ring
+
+Configuring a Connected Cache node to update as part of the `Slow` ring provides users with the option to delay Connected Cache software updates until the update can be validated. There are three settings that control when Connected Cache updates will be applied to Connected Cache nodes. All update ring settings can be managed from the Azure portal or through the Azure CLI.
+
+| Setting | Description |
+| --- | --- |
+| Week of the month | 1st to 4th week can be selected. There are three to four months in a year that could have a fifth week. If there's a fifth week, the update could be applied during that fifth week if the day of the week falls near the last day of the month.|
+| Day of the week | Monday through Sunday can be selected. |
+| Time of day | Time of day is based on UTC and a 24 hour clock. |
+
+## Update process
+
+When Microsoft publishes a Connected Cache update, the Connected Cache service attempts to update all Connected Cache nodes based on their **Update Ring** membership. If a cache node can't complete the silent Connected Cache update within 6 hours of starting, an error message is surfaced in the Azure portal.
+
+## Update terminology, criteria, and information
+
+Connected Cache updates are released based on need instead of on a set cadence.
+
+| Update type | Criteria and information |
+| --- | --- |
+| Security | Security updates are the highest priority and are released based on the severity rating of the vulnerability. Updates for [Critical and High](https://nvd.nist.gov/vuln-metrics/cvss) vulnerabilities are released by Microsoft within 60 days of discovery. Updates for [Medium and Low](https://nvd.nist.gov/vuln-metrics/cvss) vulnerabilities are released by Microsoft within 120 days. |
+| Quality | Quality updates fix a specific problem and addresses a noncritical, non-security-related bug. Quality updates could include performance fixes for a specific problem or changes related to cache efficiency or maximum egress for example. Quality updates are released along with security updates or when necessary to ensure proper functioning of the Microsoft Connected Cache software. |
+
+For information on all released Microsoft Connected Cache updates, see the [Connected Cache release notes](mcc-ent-release-notes.md).

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

@@ -0,0 +1,46 @@
+---
+title: Verify Microsoft Connected Cache for Enterprise and Education cache node functionality
+description: Details on how to verify functionality of Microsoft Connected Cache for Enterprise and Education cache nodes.
+author: chrisjlin
+ms.author: lichris
+manager: naengler
+ms.service: windows-client
+ms.subservice: itpro-updates
+ms.topic: how-to
+ms.date: 10/30/2024
+appliesto: 
+- ✅ Windows-hosted Connected Cache cache nodes
+- ✅ Linux-hosted Connected Cache cache nodes
+- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>	
+---
+
+# Verify Connected Cache node functionality
+
+This article describes how to verify that a Microsoft Connected Cache for Enterprise and Education cache node is functioning correctly.
+
+These steps should be taken after deploying Connected Cache software to a [Windows](mcc-ent-deploy-to-windows.md) or [Linux](mcc-ent-deploy-to-linux.md) host machine.
+
+## Steps to verify functionality of Connected Cache node
+
+1. To verify that the Connected Cache container on the host machine is running and reachable, run the following command from the host machine:
+
+    ```powershell
+    wget http://localhost/filestreamingservice/files/7bc846e0-af9c-49be-a03d-bb04428c9bb5/Microsoft.png?cacheHostOrigin=dl.delivery.mp.microsoft.com
+    ```
+
+    If successful, there should be an HTTP response with StatusCode 200.
+
+1. To verify that Windows clients in your network can reach the Connected Cache node, visit the following address from a web browser on a Windows client device:
+
+    `http://[HostMachine-IP-address]/filestreamingservice/files/7bc846e0-af9c-49be-a03d-bb04428c9bb5/Microsoft.png?cacheHostOrigin=dl.delivery.mp.microsoft.com`
+
+    If successful, the Windows client device should begin to download a small image file from the Connected Cache node.
+
+1. To check how much content an individual Windows client has downloaded from a Connected Cache node, open the [Delivery Optimization activity monitor](/microsoft-365-apps/updates/delivery-optimization#viewing-data-about-the-use-of-delivery-optimization) on the Windows client device.
+
+    You should see a donut chart titled **Download Statistics**. If the Windows client has downloaded content from the cache node, you'll see a segment of the donut labeled **From Microsoft cache server**.
+
+## Related content
+
+- [Monitor cache node usage](mcc-ent-monitoring.md)
+- [Troubleshoot cache node](mcc-ent-troubleshooting.md)

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

@@ -1,138 +0,0 @@
----
-title: Appendix for MCC for Enterprise and Education
-description: This article contains reference information for Microsoft Connected Cache (MCC) for Enterprise and Education.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: reference
-ms.author: carmenf
-author: cmknox
-manager: aaroncz
-ms.reviewer: mstewart
-ms.collection:
-  - tier3
-  - must-keep
-appliesto: 
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
-- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>
-ms.date: 05/23/2024
----
-
-# Appendix
-
-## Steps to obtain an Azure subscription ID
-
-<!--Using include file, get-azure-subscription.md, do/mcc-isp.md for shared content-->
-[!INCLUDE [Get Azure subscription](includes/get-azure-subscription.md)]
-
-### Troubleshooting
-
-If you're not able to sign up for a Microsoft Azure subscription with the **Account belongs to a directory that cannot be associated with an Azure subscription. Please sign in with a different account.** error, see the following articles:
-
-- [Can't sign up for a Microsoft Azure subscription](/troubleshoot/azure/general/cannot-sign-up-subscription).
-- [Troubleshoot issues when you sign up for a new account in the Azure portal](/azure/cost-management-billing/manage/troubleshoot-azure-sign-up).
-
-## Hardware specifications
-
-Most customers choose to install their cache node on a Windows Server with a nested Hyper-V VM. If this isn't supported in your network, some customers have also opted to install their cache node using VMware. At this time, a Linux-only solution isn't available and Azure VMs don't support the standalone Microsoft Connected Cache.
-
-### Installing on VMware
-
-Microsoft Connected Cache for Enterprise and Education can be successfully installed on VMware. To do so, there are a couple of additional configurations to be made. Ensure the VM is turned off before making the following configuration changes:
-
-1. Ensure that you're using ESX. In the VM settings, turn on the option **Expose hardware assisted virtualization to the guest OS**.
-1. Using the Hyper-V Manager, create an external switch. For the external switch to have internet connection, ensure **"Allow promiscuous mode"** and **"Forged transmits"** are switched to **Yes**.
-
-### Installing on Hyper-V
-
-To learn more about how to configure Intel and AMD processors to support nested virtualization, see [Run Hyper-V in a Virtual Machine with Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization).
-
-## Diagnostics Script
-
-If you're having issues with your MCC, we included a diagnostics script. The script collects all your logs and zips 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.
-
-## 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, see the [Azure IoT Edge documentation](/azure/iot-edge/about-iot-edge).
-
-## 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:
-
-    ```powershell
-        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." lightbox="./images/ent-mcc-group-policy-hostname.png":::
-
-## 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." lightbox="./images/ent-mcc-get-deliveryoptimizationstatus.png":::
-
-    - 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.":::
-
-## 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)

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

@@ -1,418 +0,0 @@
----
-title: Deploying your cache node
-description: How to deploy a Microsoft Connected Cache (MCC) for Enterprise and Education cache node from the Azure portal.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: how-to
-ms.author: carmenf
-author: cmknox
-ms.reviewer: mstewart
-manager: aaroncz
-ms.collection: tier3
-appliesto: 
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
-- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>	
-ms.date: 05/23/2024
----
-
-# Deploy your cache node
-
-This article describes how to deploy a Microsoft Connected Cache (MCC) for Enterprise and Education cache node.
-
-## 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 MCC functionality](#verify-mcc-server-functionality)
-1. [Review common Issues](#common-issues) if needed.
-
-### 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]
-> As we near the release of public preview, we have paused onboarding. Please continue to submit the form to express interest so we can follow up with you once public preview of Microsoft Connected Cache for Enteprise and Education is available. To register your interest, fill out the form located at [https://aka.ms/MSConnectedCacheSignup](https://aka.ms/MSConnectedCacheSignup).
-
-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. The create a resource option is 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." lightbox="./images/ent-mcc-azure-cache-created.png":::
-
-#### 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 early 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.
-
-1. **If you're installing MCC on a local virtual machine**, turn the virtual machine **off** while you enable nested virtualization and MAC spoofing.
-   1. Enable nested virtualization:
-
-      ```powershell
-      Set-VMProcessor -VMName "VM name" -ExposeVirtualizationExtensions $true
-      ```
-
-   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 external virtual switch or select an existing external virtual switch.
-
-   If creating a new external virtual switch, name your switch and be sure to choose a Local Area Connection (USB adapters work as well however, we do not recommend using Wi-Fi). 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 to step 5.
-
-   If you opt to use an existing external switch, select the switch from the presented options. Local Area Connection (or USB) is preferable to Wi-Fi.
-
-   :::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. If you choose to use a static IP, do not use the IP address of the server. It is a VM, and it will have its own IP.
-
-    :::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.
-
-   The IP address you assign to the EFLOW VM should be within the same subnet as the host server (based on the subnet mask) and not used by any other machine on the network.
-   For example, for host configuration where the server IP Address is 192.168.1.202 and the subnet mask is 255.255.255.0, the static IP can be anything 192.168.1.* except 192.168.1.202.
-   <!-- Insert Image 1 & 2. Remove ent-mcc-script-dynamic-address.png image (it is replaced by image 2) -->
-    :::image type="content" source="./images/external-switch-1.jpg" alt-text="Screenshot of a sample output of ipconfig command showing example of subnet mask." lightbox="./images/external-switch-1.jpg":::
-
-    :::image type="content" source="./images/assigning-ip-2.png" alt-text="Screenshot of multiple installer questions about ipv4 address for Eflow." lightbox="./images/assigning-ip-2.png":::
-
-   If you would like to use your own DNS server instead of Google DNS 8.8.8.8, select **n** and set your own DNS server IP.
-
-   :::image type="content" source="./images/use-custom-dns-3.png" alt-text="Screenshot of multiple installer questions about setting an alternate DNS server." lightbox="./images/use-custom-dns-3.png":::
-
-   If you use a dynamic IP address, the DHCP server will automatically configure the IP address and DNS settings.
-
-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 download path, install path, and virtual hard disk path.
-
-   <!-- Insert Image 4 -->
-   :::image type="content" source="./images/installation-info-4.png" alt-text="Screenshot of multiple installer questions about memory and storage for EFLOW." lightbox="./images/installation-info-4.png":::
-
-   For more information, see [Sizing Recommendations](mcc-enterprise-prerequisites.md#sizing-recommendations) for memory, virtual storage, and CPU cores. For this example we chose the recommended values for a Branch Office/Small Enterprise deployment.
-
-   <!-- Insert Image 5 -->
-   :::image type="content" source="./images/memory-storage-5.png" alt-text="Screenshot of multiple installer questions about memory and storage." lightbox="./images/memory-storage-5.png":::
-   <!-- Remove: 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":::
-       -->
-1. When the installation is complete, you should see the following output (the values below will be your own)
-
-    :::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":::
-       <!-- Insert Image 7 -->
-
-    :::image type="content" source="./images/installation-complete-7.png" alt-text="Screenshot of expected output when installation is complete." lightbox="./images/installation-complete-7.png":::
-
-1. Your MCC deployment is now complete.
-
-   If you don't see any errors, continue to the next section to validate your MCC deployment. Your VM will not appear in Hyper-V Manager as it is an EFLOW VM.
-   - 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.
-   - If you had errors during your deployment, see the [Common Issues](#common-issues) section in this article.
-
-## Verify MCC server functionality
-
-#### 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, try this command in a few minutes. The MCC container can take a few minutes to deploy. If iotedge list times out, you can run docker ps -a to list the running containers.
-If the 3 containers are still not running, run the following commands to check if DNS resolution is working correctly:
-
-```bash
-ping www.microsoft.com
-resolvectl query microsoft.com
-```
-
-See the [common issues](#common-issues) section for more information.
-
-#### Verify server side
-
-To validate that MCC is properly functioning, 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 error: `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 by using the command:
-
-```bash
-sudo journalctl -u iotedge -f
-```
-
-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":::
-
-> [!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.
-
-
-### DNS needs to be configured
-
-Run the following IoT Edge install state check:
-
-```bash
-sudo iotedge check --verbose
-```
-
-If you see issues with ports 5671, 443, and 8883, your IoT Edge device needs to update the DNS for Docker.
-
-To configure the device to work with your DNS, use the following steps:
-
-1. Use `ifconfig` to find the appropriate NIC adapter name.
-
-   ```bash
-   ifconfig
-   ```
-
-1. Run `nmcli device show <network adapter name>` to show the DNS name for the ethernet adapter. For example, to show DNS information for **eno1**:
-
-   ```bash
-   nmcli device show eno1 
-   ```
-
-   :::image type="content" source="images/mcc-isp-nmcli.png" alt-text="Screenshot of a sample output of nmcli command to show network adapter information." lightbox="./images/mcc-isp-nmcli.png":::
-
-1. Open or create the Docker configuration file used to configure the DNS server.
-
-   ```bash
-   sudo nano /etc/docker/daemon.json
-   ```
-
-1. Paste the following string into the **daemon.json** file, and include the appropriate DNS server address. For example, in the previous screenshot, `IP4.DNS[1]` is `10.50.10.50`.
-
-   ```bash
-   { "dns": ["x.x.x.x"]}
-   ```
-
-1. Save the changes to daemon.json. If you need to change permissions on this file, use the following command:
-
-   ```bash
-   sudo chmod 555 /etc/docker/daemon.json
-   ```
-
-1. Restart Docker to pick up the new DNS setting. Then restart IoT Edge.
-
-   ```bash
-   sudo systemctl restart docker
-   sudo systemctl daemon-reload
-   sudo restart IoTEdge
-   ```
-
-### Resolve DNS issues
-
-Follow these steps if you see a DNS error when trying to resolve hostnames during the provisioning or download of container:
-Run `Get-EflowVmEndpoint` to get interface name
-
-Once you get the name:
-
-```bash
-Set-EflowVmDNSServers -vendpointName "interface name from above" -dnsServers @("DNS_IP_ADDRESS")
-Stop-EflowVm
-Start-EflowVm
-```

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

@@ -1,61 +0,0 @@
----
-title: Requirements for MCC for Enterprise and Education
-description: Overview of prerequisites and recommendations for using Microsoft Connected Cache (MCC) for Enterprise and Education.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: conceptual
-ms.author: carmenf
-author: cmknox
-manager: aaroncz
-ms.reviewer: mstewart
-ms.collection: tier3
-appliesto: 
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
-- - ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a>
-ms.date: 05/23/2024
----
-
-# Requirements of Microsoft Connected Cache for Enterprise and Education (early preview)
-
-> [!NOTE]
-> As we near the release of public preview, we have paused onboarding. Please continue to submit the form to express interest so we can follow up with you once public preview of Microsoft Connected Cache for Enteprise and Education is available. To register your interest, fill out the form located at [https://aka.ms/MSConnectedCacheSignup](https://aka.ms/MSConnectedCacheSignup).
-
-## Enterprise requirements for MCC
-
-1. **Azure subscription**: MCC management portal is hosted within Azure and is used to create the Connected Cache [Azure resource](/azure/cloud-adoption-framework/govern/resource-consistency/resource-access-management) and IoT Hub resource. Both are free services.
-
-    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 costs you nothing. If you don't 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 free to you, like other caching solutions.
-1. **Hardware to host MCC**: The recommended configuration serves approximately 35,000 managed devices, downloading a 2-GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps.
-  
-   > [!NOTE]
-   > Azure VMs are not currently supported. If you'd like to install your cache node on VMWare, see the [Appendix](mcc-enterprise-appendix.md) for a few additional configurations.
-
-    **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.
-    - For more requirements, see [EFLOW requirements](/azure/iot-edge/iot-edge-for-linux-on-windows#prerequisites).
-
-    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)
-1. **Content endpoints**: If you're using a proxy or firewall, certain endpoints must be allowed through in order for your MCC to cache and serve content. See [Delivery Optimization and Microsoft Connected Cache content type endpoints](delivery-optimization-endpoints.md) for the list of required endpoints. 
-
-## 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>50 GB each  |SSD <br>1 drive <br>200 GB each  |
-|Memory | 4 GB | 8 GB |
-|Cores | 4 | 8  |

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

@@ -1,55 +0,0 @@
----
-title: Uninstall MCC for Enterprise and Education
-description: Details on how to uninstall Microsoft Connected Cache (MCC) for Enterprise and Education for your environment.
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: how-to
-ms.author: carmenf
-author: cmknox
-manager: aaroncz
-ms.reviewer: mstewart
-ms.collection:
-  - tier3
-  - must-keep
-appliesto: 
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
-- ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
-- ✅ <a href=https://learn.microsoft.com/windows/deployment/do/waas-microsoft-connected-cache target=_blank>Microsoft Connected Cache for Enterprise and Education</a> 
-ms.date: 05/23/2024
----
-
-<!-- Customers will no longer update the private preview and instead install public preview
-# Update or uninstall Microsoft Connected Cache for Enterprise and Education
-
-Throughout the preview phase, we'll send you security and feature updates for MCC. Follow these steps to perform the update.
-
-## Update MCC
-
-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
-
-Contact the MCC Team before uninstalling to let us know if you're facing issues.
-
-This script removes the following items:
-
-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-isp-cache-node-configuration.md

@@ -27,8 +27,8 @@ All cache node configuration takes place within Azure portal. This article outli
 | 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. |
+| **Server IP address** | IPv4 address  | IP address of your Microsoft Connected Cache 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.|
+| **Max allowable egress (Mbps)** | Integer in Mbps | The maximum egress (Mbps) of your Connected Cache 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
@@ -42,6 +42,6 @@ All cache node configuration takes place within Azure portal. This article outli
 
 | 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 |
+| **Manual routing - Address range/CIDR blocks** | IPv4 CIDR notation | The IP address range (CIDR blocks) that should be routed to the Connected Cache 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-provision-deploy.md

@@ -84,7 +84,7 @@ To set up and enable BGP routing for your cache node, follow the steps below:
 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. Use your ASN, the one used to sign up for MCC. MCC will be automatically assigned as the same ASN as the neighbor.
+    - If you choose **BGP routing**, enter the ASN and IP addresses of the neighborship. Use your ASN, the one used to sign up for Microsoft Connected Cache. Connected Cache will be automatically assigned as the same ASN as the neighbor.
     > [!NOTE]
     > **Prefix count** and **IP Space** will stop displaying `0` when BGP is successfully established.
 
@@ -96,12 +96,12 @@ Once the user executes the cache server provisioning script, resources are creat
 
 #### IoT Edge
 
-IoT Edge performs several functions important to manage MCC on your edge device:
+IoT Edge performs several functions important to manage Connected Cache on your edge device:
 
-1. Installs and updates MCC on your edge device.
+1. Installs and updates Connected Cache on your edge device.
 1. Maintains Azure IoT Edge security standards on your edge device.
-1. Ensures that MCC is always running.
+1. Ensures that Connected Cache is always running.
-1. Reports MCC health and usage to the cloud for remote monitoring.
+1. Reports Connected Cache health and usage to the cloud for remote monitoring.
 
 #### Docker container engine
 
@@ -121,7 +121,7 @@ There are five IDs that the device provisioning script takes as input in order t
 #### Provision your server
 
 > [!IMPORTANT]
-> Have you correctly mounted your disk? Your MCC will not be successfully installed without this important step. Before provisioning your server, ensure your disk is correctly mounted by following the instructions here: [Attach a data disk to a Linux VM](/azure/virtual-machines/linux/attach-disk-portal#find-the-disk).
+> Have you correctly mounted your disk? Your Connected Cache will not be successfully installed without this important step. Before provisioning your server, ensure your disk is correctly mounted by following the instructions here: [Attach a data disk to a Linux VM](/azure/virtual-machines/linux/attach-disk-portal#find-the-disk).
 
 :::image type="content" source="images/mcc-isp-deploy-cache-node-numbered.png" alt-text="Screenshot of the server provisioning tab within cache node configuration in Azure portal.":::
 
@@ -145,8 +145,8 @@ There are five IDs that the device provisioning script takes as input in order t
 | 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. |
+| **Server IP address** | IPv4 address  | IP address of your Connected Cache 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.|
+| **Max allowable egress (Mbps)** | Integer in Mbps | The maximum egress (Mbps) of your Connected Cache 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
@@ -164,6 +164,6 @@ There are five IDs that the device provisioning script takes as input in order t
 
 | 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 |
+| **Manual routing - Address range/CIDR blocks** | IPv4 CIDR notation | The IP address range (CIDR blocks) that should be routed to the Connected Cache 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-faq.yml

@@ -28,7 +28,7 @@ sections:
       - 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: I already peer with Microsoft(8075). What benefit will I receive by adding Microsoft Connected Cache to my network?
-        answer: MCC complements peering by offloading static content that is served off of multiple CDNs such as Akamai, Lumen, Edgecast. Static content such as OS updates, Apps, Software installs etc. can't be served via 8075. So, even if you're peering with Microsoft, you can benefit from installing MCC.  
+        answer: Microsoft Connected Cache complements peering by offloading static content that is served off of multiple CDNs such as Akamai, Lumen, Edgecast. Static content such as OS updates, Apps, Software installs etc. can't be served via 8075. So, even if you're peering with Microsoft, you can benefit from installing Connected Cache.  
       - question: Is there a non-disclosure agreement to sign?
         answer: No, a non-disclosure agreement isn't required.
       - question: What are the prerequisites and hardware requirements?
@@ -79,7 +79,7 @@ sections:
       - 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 and regions 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.
+        answer: We have already successfully onboarded ISPs in many countries and regions 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 Connected Cache 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 CDNs does Microsoft Connected Cache pull content from?
@@ -99,7 +99,7 @@ sections:
         answer: First, check that the email under the NOC role is correct in your PeeringDB page. If the email associated with NOC role is correct, search for an email from the sender "microsoft-noreply@microsoft.com" with the email subject - "Here's your Microsoft Connected Cache verification code" in your Spam folders. Still can't find it? Ensure that your email admin rules allow emails from the sender `microsoft-noreply@microsoft.com`.
       - question: I noticed I can set up BGP for routing. How does BGP routing work for Microsoft Connected Cache?
         answer: BGP routing can be set up as an automatic method of routing traffic. To learn more about how BGP is used with Microsoft Connected Cache, see [BGP Routing](mcc-isp-create-provision-deploy.md#bgp-routing).
-      - question: I have an active MCC, but I'm noticing I hit the message limit for my IoT Hub each day. Does this affect my MCC performance and should I be concerned?
+      - question: I have an active Connected Cache, but I'm noticing I hit the message limit for my IoT Hub each day. Does this affect my Connected Cache performance and should I be concerned?
-        answer: Even when the quota of 8k messages is hit, the MCC functionality isn't affected. Your client devices continue to download content as normal. You also won't be charged above the 8k message limit, so you don't need to worry at all about getting a paid plan. MCC will always be a free service. So if functionality isn't impacted, what is? Instead, messages about the configuration or edge deployment would be impacted. This means that if there was a request to update your MCC and the daily quota was reached, your MCC might not update. In that case, you would just need to wait for the next day to update. This is only a limitation of the early preview and isn't an issue during public preview.
+        answer: Even when the quota of 8k messages is hit, the Connected Cache functionality isn't affected. Your client devices continue to download content as normal. You also won't be charged above the 8k message limit, so you don't need to worry at all about getting a paid plan. Connected Cache will always be a free service. So if functionality isn't impacted, what is? Instead, messages about the configuration or edge deployment would be impacted. This means that if there was a request to update your Connected Cache and the daily quota was reached, your Connected Cache might not update. In that case, you would just need to wait for the next day to update. This is only a limitation of the early preview and isn't an issue during public preview.
       - question: What do I do if I need more support and have more questions even after reading this FAQ page?
         answer: For further support for Microsoft Connected Cache, visit [Troubleshooting Issues for Microsoft Connected Cache for ISP (public preview)](mcc-isp-support.md).

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

@@ -1,6 +1,6 @@
 ---
-title: MCC for ISPs Overview
+title: Microsoft Connected Cache for ISPs Overview
-description: Overview of Microsoft Connected Cache for ISPs. Learn about how MCC works, supported scenarios, and supported content.
+description: Overview of Microsoft Connected Cache for ISPs. Learn about how Connected Cache works, supported scenarios, and supported content.
 ms.service: windows-client
 ms.subservice: itpro-updates
 ms.topic: overview
@@ -18,7 +18,7 @@ ms.date: 05/23/2024
 
 # Microsoft Connected Cache for ISPs overview
 
-Microsoft Connected Cache (MCC) for Internet Service Providers (preview) is a free software-only caching solution that delivers Microsoft content. MCC can be deployed free of charge to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, MCC can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing.
+Microsoft Connected Cache for Internet Service Providers (preview) is a free software-only caching solution that delivers Microsoft content. Connected Cache can be deployed free of charge to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, Connected Cache can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing.
 
 ## Supported scenarios
 
@@ -41,40 +41,40 @@ For the full list of content endpoints that Microsoft Connected Cache for ISPs s
 
 ### Are you already peering with 8075?
 
-MCC complements peering by offloading static content that is served off of multiple CDNs such as Akamai, Lumen, Edgecast. Static content such as OS updates, Apps, Software installs etc. can't be served via 8075. So, even if you're peering with Microsoft, you can benefit from installing MCC.
+Connected Cache complements peering by offloading static content that is served off of multiple CDNs such as Akamai, Lumen, Edgecast. Static content such as OS updates, Apps, Software installs etc. can't be served via 8075. So, even if you're peering with Microsoft, you can benefit from installing Connected Cache.
 
 :::image type="content" source="./media/mcc-isp-overview/mcc-isp-peeringvsmcc.png" alt-text="Chart containing Peering vs Cache Content Traffic." lightbox="./media/mcc-isp-overview/mcc-isp-peeringvsmcc.png":::
 
-## How MCC works
+## How Connected Cache works
 
 :::image type="content" source="./images/mcc-isp-diagram.png" alt-text="Data flow diagram of how Microsoft Connected Cache works." lightbox="./images/mcc-isp-diagram.png":::
 
-The following steps describe how MCC is provisioned and used:
+The following steps describe how Connected Cache is provisioned and used:
 
-1. The Azure portal is used to create and manage MCC nodes.
+1. The Azure portal is used to create and manage Connected Cache nodes.
 
-1. A shell script is used to provision the server and deploy the MCC application.
+1. A shell script is used to provision the server and deploy the Connected Cache application.
 
-1. A combination of the Azure portal and shell script is used to configure Microsoft Delivery Optimization Services to route traffic to the MCC server.
+1. A combination of the Azure portal and shell script is used to configure Microsoft Delivery Optimization Services to route traffic to the Connected Cache server.
 
     - The publicly accessible IPv4 address of the server is configured on the portal.
 
-    - **Manual Routing:** Providing the CIDR blocks that represent the client IP address space, which should be routed to the MCC node.
+    - **Manual Routing:** Providing the CIDR blocks that represent the client IP address space, which should be routed to the Connected Cache node.
 
-    - **BGP Routing:** A shell script is used to initiate a peering session with a router in the operator network, and the operator initiates a session with the MCC node.
+    - **BGP Routing:** A shell script is used to initiate a peering session with a router in the operator network, and the operator initiates a session with the Connected Cache node.
 
         > [!NOTE]
         > Only IPv4 addresses are supported at this time. Entering IPv6 addresses will result in an error.
 
-1. Microsoft end-user devices (clients) periodically connect with Microsoft Delivery Optimization Services, and the services match the IP address of the client with the IP address of the corresponding MCC node.
+1. Microsoft end-user devices (clients) periodically connect with Microsoft Delivery Optimization Services, and the services match the IP address of the client with the IP address of the corresponding Connected Cache node.
 
-1. Microsoft clients make the range requests for content from the MCC node.
+1. Microsoft clients make the range requests for content from the Connected Cache node.
 
-1. An MCC node gets content from the CDN, seeds its local cache stored on disk, and delivers the content to the client.
+1. A Connected Cache node gets content from the CDN, seeds its local cache stored on disk, and delivers the content to the client.
 
 1. Subsequent requests from end-user devices for content will be served from cache.
 
-1. If the MCC node is unavailable, the client gets content from the CDN to ensure uninterrupted service for your subscribers.
+1. If the Connected Cache node is unavailable, the client gets content from the CDN to ensure uninterrupted service for your subscribers.
 
 ### Hardware recommendation
 

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

@@ -36,7 +36,7 @@ During sign-up, a verification code is sent to your NOC email address present in
 
 #### Unable to re-sign up
 
-Delete any MCC resource that you're using before you resign up for the service. Deleting any existing MCC resource unlocks your ASN, which allows you to successfully sign up.
+Delete any Microsoft Connected Cache resource that you're using before you resign up for the service. Deleting any existing Connected Cache resource unlocks your ASN, which allows you to successfully sign up.
 
 ### Cache Node Errors  
 
@@ -100,9 +100,9 @@ iotedge check -verbose
 
 ## Diagnose and Solve Problems
 
-If this article isn't resolving the issue you're facing with your cache node, you can use the **Diagnose and solve problems** functionality within your MCC resource to continue troubleshooting. **Diagnose and solve problems** contains solutions to most common problems that users might face as they onboard.
+If this article isn't resolving the issue you're facing with your cache node, you can use the **Diagnose and solve problems** functionality within your Connected Cache resource to continue troubleshooting. **Diagnose and solve problems** contains solutions to most common problems that users might face as they onboard.
 
-You can find **Diagnose and solve problems** on the left pane within your MCC resource.
+You can find **Diagnose and solve problems** on the left pane within your Connected Cache resource.
 
 :::image type="content" source="images/mcc-isp-diagnose-solve.png" alt-text="A screenshot of Azure portal showing the Diagnose and Solve problems tab on the left hand pane of Azure portal." lightbox="images/mcc-isp-diagnose-solve.png":::
 

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

@@ -33,7 +33,7 @@ To view which version your cache nodes are currently on, navigate to the **Cache
 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. Run the uninstall script to cleanly remove Microsoft Connected Cache from your server
 
 You must complete both steps to ensure a clean uninstall of your cache node.
 
@@ -50,7 +50,7 @@ The **uninstallmcc.sh** script removes the following components:
 - IoT Edge
 - Edge Agent
 - Edge Hub
-- MCC
+- Connected Cache
 - Moby CLI
 - Moby engine
 

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

@@ -49,7 +49,7 @@ Sign into the [Azure portal](https://www.portal.azure.com) and navigate to the *
 
 It can take a few minutes for the container to deploy after you've saved the configuration.
 
-To validate a properly functioning MCC, run the following command in the terminal of the cache server or any device in the network. Replace `<CacheServerIP>` with the IP address of the cache server.
+To validate a properly functioning Microsoft Connected Cache, run the following command in the terminal of the cache server or any device in the network. Replace `<CacheServerIP>` with the IP address of the cache server.
 
 ```bash
 wget http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com

windows/deployment/do/mcc-isp-vm-performance.md

@@ -25,7 +25,7 @@ The Microsoft Connected Cache module is optimized for Ubuntu 20.04 LTS. Install
 
 #### NIC requirements
 
-- Multiple NICs on a single MCC instance are supported using a *link aggregated* configuration.
+- Multiple NICs on a single Microsoft Connected Cache instance are supported using a *link aggregated* configuration.
 - 10 Gbps NIC is the minimum speed recommended, but any NIC is supported.
 
 #### Drive performance
@@ -55,9 +55,9 @@ Change the following settings to maximize the egress in virtual environments:
 
 1. Enable **Single Root I/O Virtualization (SR-IOV)** in the following three locations:
 
-    - The BIOS of the MCC virtual machine
+    - The BIOS of the Connected Cache virtual machine
-    - The network card properties of the MCC virtual machine
+    - The network card properties of the Connected Cache virtual machine
-    - The hypervisor for the MCC virtual machine
+    - The hypervisor for the Connected Cache virtual machine
 
     Microsoft has found these settings to double egress when using a Microsoft Hyper-V deployment.
 

windows/deployment/do/mcc-isp.md

@@ -1,6 +1,6 @@
 ---
 title: Microsoft Connected Cache for ISPs
-description: This article contains details about the early preview for Microsoft Connected Cache (MCC) for Internet Service Providers (ISPs).
+description: This article contains details about the early preview for Microsoft Connected Cache for Internet Service Providers (ISPs).
 ms.service: windows-client
 ms.subservice: itpro-updates
 ms.topic: how-to
@@ -10,7 +10,7 @@ ms.reviewer: mstewart
 manager: aaroncz
 ms.localizationpriority: medium
 ms.collection: tier3
-ms.date: 05/23/2024
+ms.date: 10/30/2024
 appliesto: 
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
@@ -20,594 +20,20 @@ appliesto:
 # Microsoft Connected Cache for Internet Service Providers (early preview)
 
 > [!IMPORTANT]
-> This document is for Microsoft Connected Cache (early preview). Microsoft Connected Cache for ISPs is now in Public Preview - for our early preview customers, we highly encourage you to onboard onto our Public Preview program. For instructions on signing up and onboarding please visit [Operator sign up and service onboarding for Microsoft Connected Cache](mcc-isp-signup.md).
+> Microsoft Connected Cache for ISPs is now in Public Preview - for our early preview customers, the early preview version is no longer supported. We highly encourage you to onboard onto our Public Preview program. For instructions on signing up and onboarding, visit [Operator sign up and service onboarding for Microsoft Connected Cache](mcc-isp-signup.md).
 
 ## Overview
 
-Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within operator networks. MCC can be deployed to as many physical servers or VMs as needed and is managed from a cloud portal. Microsoft cloud services handle routing of consumer devices to the cache server for content downloads.
+Microsoft Connected Cache preview is a software-only caching solution that delivers Microsoft content within operator networks. Connected Cache can be deployed to as many physical servers or VMs as needed and is managed from a cloud portal. Microsoft cloud services handle routing of consumer devices to the cache server for content downloads. For more information, visit [Microsoft Connected Cache for ISP](mcc-isp-overview.md).
 
-Microsoft Connected Cache is a hybrid application, in that it's a mix of on-premises and cloud resources. It's composed of a Docker-compatible Linux container deployed to your server and a cloud management portal. Microsoft chose Azure IoT Edge as a secure and reliable control plane. For more information on IoT Edge, see the [Appendix](#appendix). Even though your scenario isn't related to IoT, Azure IoT Edge is our secure Linux container deployment and management infrastructure.
-
-## How MCC works
-
-:::image type="content" source="./images/mcc-isp-diagram.png" alt-text="Data flow diagram of how Microsoft Connected Cache works." lightbox="./images/mcc-isp-diagram.png":::
-
-The following steps describe how MCC is provisioned and used:
-
-1. The Azure Management Portal is used to create and manage MCC nodes.
-
-1. A shell script is used to provision the server and deploy the MCC application.
-
-1. A combination of the Azure Management Portal and shell script is used to configure Microsoft Delivery Optimization Services to route traffic to the MCC server.
-
-    - The publicly accessible IPv4 address of the server is configured on the portal.
-
-    - **Manual Routing:** Providing the CIDR blocks that represent the client IP address space, which should be routed to the MCC node.
-
-    - **BGP Routing:** A shell script is used to initiate a peering session with a router in the operator network, and the operator initiates a session with the MCC node.
-
-        > [!NOTE]
-        > Only IPv4 addresses are supported at this time. Entering IPv6 addresses will result in an error.
-
-1. Microsoft end-user devices (clients) periodically connect with Microsoft Delivery Optimization Services, and the services match the IP address of the client with the IP address of the corresponding MCC node.
-
-1. Microsoft clients make the range requests for content from the MCC node.
-
-1. An MCC node gets content from the CDN, seeds its local cache stored on disk, and delivers the content to the client.
-
-1. Subsequent requests from end-user devices for content will be served from cache.
-
-1. If the MCC node is unavailable, the client gets content from the CDN to ensure uninterrupted service for your subscribers.
-
-## ISP requirements for MCC
 
 Microsoft Connected Cache for Internet Service Providers is now in Public Preview! To get started, visit  [Azure portal](https://www.portal.azure.com) to sign up for Microsoft Connected Cache for Internet Service Providers. Please see [Operator sign up and service onboarding for Microsoft Connected Cache](mcc-isp-signup.md) for more information on the requirements for sign up and onboarding.
 
-<!-- ### Azure subscription
 
-The MCC management portal is hosted within Azure. It's used to create the Connected Cache Azure resource and IoT Hub resource. Both are *free* services.
 
-> [!NOTE]
-> If you request Exchange or Public peering in the future, business email addresses must be used to register ASNs. Microsoft doesn't accept Gmail or other non-business email addresses.
 
-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 don't 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/). *Don't submit a trial subscription* as you'll lose access to your Azure resources after the trial period ends.
 
-The resources used for the preview, and in the future when this product is ready for production, will be free to you - like other caching solutions.
+<!-- 
-
-### Hardware to host the MCC
-
-This recommended configuration can egress at a rate of 9 Gbps with a 10 Gbps NIC.
-
-#### Disk requirements
-
-- SSDs are recommended due to improved cache read speeds of SSD, compared to HDD.
-- Using multiple disks is recommended to improve cache performance.
-- RAID disk configurations are discouraged because cache performance will be impacted. If you're using RAID disk configurations, ensure striping.
-- The maximum number of disks supported is 10.
-
-#### 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.
-
-### Sizing recommendations
-
-The MCC module is optimized for Ubuntu 20.04 LTS. Install Ubuntu 20.04 LTS on a physical server or VM of your choice. The following recommended configuration can egress at a rate of 9 Gbps with a 10 Gbps NIC.
-
-| Component  | Minimum | Recommended |
-|---|---|---|
-| OS |  Ubuntu 20.04 LTS VM or physical server | Ubuntu 20.04 LTS VM or physical server (preferred) |
-| NIC | 10 Gbps| at least 10 Gbps |
-| Disk | SSD </br>1 drive </br>2 TB each  |SSD </br>2-4 drives </br>at least 2 TB each  |
-| Memory | 8 GB | 32 GB or greater |
-| Cores | 4 | 8 or more  | -->
-
-<!-- ## Steps to deploy MCC
-
-To deploy MCC:
-
-1. [Provide Microsoft with your Azure subscription ID](#provide-microsoft-with-your-azure-subscription-id)
-2. [Create the MCC Resource in Azure](#create-the-mcc-resource-in-azure)
-3. [Create a Cache Node](#create-an-mcc-node-in-azure)
-4. [Configure Cache Node Routing](#edit-cache-node-information)
-5. [Install MCC on a physical server or VM](#install-mcc)
-6. [Verify properly functioning MCC server](#verify-properly-functioning-mcc-server)
-7. [Review common issues if needed](#common-issues)
-
-## Provide Microsoft with your Azure subscription ID
-
-As part of the MCC preview onboarding process, an Azure subscription ID must be provided to Microsoft.
-
-> [!IMPORTANT]
-> For information about creating or locating your subscription ID, see [Steps to obtain an Azure subscription ID](#steps-to-obtain-an-azure-subscription-id).
-
-### Create the MCC resource in Azure
-
-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.
-
-Operators who have been given access to the program will be sent a link to the Azure portal, which will allow you to create this resource.
-
-1. Choose **Create a resource**.
-
-    :::image type="content" source="./images/mcc-isp-create-resource.png" alt-text="Screenshot of the option to 'Create a resource' in the Azure portal.":::
-
-1. Type **Microsoft Connected Cache** into the search box and press **Enter** to show the search results.
-
-1. Select **Microsoft Connected Cache**.
-
-    :::image type="content" source="./images/mcc-isp-search-marketplace.png" alt-text="Screenshot of searching the Azure Marketplace for 'Microsoft Connected Cache'.":::
-
-    > [!IMPORTANT]
-    > Don't select *Connected Cache Resources*, which is different from **Microsoft Connected Cache**.
-
-1. Select **Create** on the next screen to start the process of creating the MCC resource.
-
-    :::image type="content" source="./images/mcc-isp-create.png" alt-text="Screenshot of the Create option for the Microsoft Connected Cache service.":::
-
-1. Fill in the following 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 it.
-
-    - 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.
-
-        > [!NOTE]
-        > Your MCC resource won't create properly if you don't select **(US) West US**.
-
-    - Specify a **Connected Cache Resource Name**.
-
-      :::image type="content" source="./images/mcc-isp-location-west.png" alt-text="Screenshot of entering the required information, including the West US location, to create a Connected Cache in Azure.":::
-
-1. Select **Review + Create**. Once validation is complete, select **Create** to start the resource creation.
-
-    :::image type="content" source="./images/mcc-isp-deployment-complete.png" alt-text="'Screenshot of the 'Your deployment is complete' message displaying deployment details.":::
-
-#### Common Resource Creation Errors
-
-##### Error: Validation failed
-
-If you get the error message "Validation failed" in the Azure portal, it's likely because you selected the **Location** as **US West 2** or another unsupported location. To resolve this error, go to the previous step and choose **(US) West US** for the **Location**.
-
-##### Error: Could not create Marketplace item
-
-If you get the error message "Could not create marketplace item" in the Azure portal, use the following steps to troubleshoot:
-
-- Make sure that you've selected **Microsoft Connected Cache** and not *Connected Cache resources* while trying to create an MCC resource.
-
-- Make sure that you're using the same subscription that you provided to Microsoft and you have privileges to create an Azure resource.
-
-- If the issue persists, clear your browser cache and start in a new window.
-
-### Create an MCC node in Azure
-
-1. After you successfully create the resource, select **Go to resource**.
-
-1. Under the **Cache Node Management** section in the left panel, select **Cache Nodes**.
-
-    :::image type="content" source="./images/mcc-isp-cache-nodes-option.png" alt-text="Screenshot of the 'Cache Nodes' option in the Cache Node Management menu section.":::
-
-1. On the **Cache Nodes** section, select **Create Cache Node**.
-
-    :::image type="content" source="./images/mcc-isp-create-cache-node-option.png" alt-text="Screenshot of the selecting the 'Create Cache Node' option.":::
-
-1. This action opens the **Create Cache Node** page. The only required fields are **Cache Node Name** and **Max Allowable Egress (Mbps)**.
-
-    | Field name | Expected value | Description |
-    |--|--|--|
-    | **Cache Node Name** | Alphanumeric name that includes 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. |
-    | **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` |
-    | **Enable Cache Node** | Enable or Disable | **Enable** permits the cache node to receive content requests. </br>**Disable** prevents the cache node from receiving content requests. </br>Cache nodes are enabled by default. |
-
-    :::image type="content" source="./images/mcc-isp-create-cache-node-fields.png" alt-text="Screenshot of the available fields on the Create Cache Node page.":::
-
-    > [!TIP]
-    > The information icon next to each field provides a description.
-    >
-    > :::image type="content" source="./images/mcc-isp-node-server-ip.png" alt-text="Screenshot of the Create Cache Node page showing the description for the Server IP Address field.":::
-
-   After you create the cache node, if you return to this page, it populates the values for the two read-only fields:
-
-     | Field name | Description |
-     |--|--|
-     | **IP Space** | Number of IP addresses that will be routed to your cache server. |
-    | **Activation Keys** | Set of keys to activate your cache node with the MCC services. Copy the keys for use during install. The CustomerID is your Azure subscription ID. |
-
-1. Enter the information to create the cache node, and then select **Create**.
-
-    :::image type="content" source="./images/mcc-isp-create-new-node.png" alt-text="Screenshot of selecting 'Create' on the Create Cache Node page.":::
-
-If there are errors, the page gives you guidance on how to correct the errors. For example:
-
-- The cache node name is already in use in the resource or is an incorrect format.
-- The CIDR block notation or list is incorrect.
-- The server IP address or CIDR block is already in use.
-
-See the following example with all information entered:
-
-:::image type="content" source="./images/mcc-isp-create-node-form.png" alt-text="Screenshot of the Create Cache Node page with all information entered.":::
-
-Once you create the MCC node, it will display the installer instructions. For more information on the installer instructions, see the [Install Connected Cache](#install-mcc) section.
-
-:::image type="content" source="./images/mcc-isp-success-instructions.png" alt-text="Screenshot of the Cache node successfully created with Connected Cache installer instructions.":::
-
-### IP address space approval
-
-There are three states for IP address space. MCC configuration supports BGP and has automatic routing capabilities.
-
-- **Valid**: The IP address space is approved.
-
-- **In Review**: The IP address space is under review with Microsoft to ensure valid IP address space.
-
-- **Attention Required**: The IP address space has been reviewed and an issue was discovered. For example:
-
-  - The IP address space overlaps with an existing cache node that belongs to another customer
-
-  - The IP address space was exceedingly large.
-
-  If your IP address space has this status, contact Microsoft for more information.
-
-:::image type="content" source="./images/mcc-isp-node-names.png" alt-text="Screenshot of a list of cache node names with example IP address space statuses.":::
-
-## Edit cache node information
-
-:::image type="content" source="./images/mcc-isp-list-nodes.png" alt-text="Screenshot of the Cache Nodes list in the Azure portal.":::
-
-To modify the configuration for existing MCC nodes in the portal, select the cache node name in the cache nodes list. This action opens the **Cache Node Configuration** page. You can edit the **Server IP Address** or **Address Range/CIDR Blocks** field. You can also enable or disable the cache node.
-
-:::image type="content" source="./images/mcc-isp-node-configuration.png" alt-text="Screenshot of the Cache Node Configuration page, highlighting editable fields.":::
-
-To delete a cache node, select it in the cache nodes list, and then select **Delete** in the toolbar. If you delete a cache node, there's no way to recover it or any of the information related to the cache node. -->
-
-<!-- ## Install MCC
-
-To install MCC on your physical server or VM, you use a Bash script installer, which runs the following tasks:
-
-- Installs the Moby engine and CLI.
-- Installs IoT Edge.
-- Installs SSH to support remote access to the server.
-- Enables the firewall and opens port 80 for inbound and outbound traffic. The MCC uses port 80.
-- Configures Connected Cache tuning settings.
-- Creates the necessary free Azure resource: IoT Hub/IoT Edge.
-- Deploys the MCC container to the server.
-
-> [!IMPORTANT]
-> Make sure that the following ports are open so that Microsoft can verify proper functionality of the cache server:
->
-> - 80: content delivery
-> - 179: BGP session
-> - 443: IoT Edge secure communication
-> - 5000: (optional) used to view locally running report
-> - 5671: IoT Edge communication/container management
-> - 8883: IoT Edge communication/container management
-
-### Steps to install MCC
-
-Before you start, make sure that you have a data drive configured on your server. You'll need to specify the location for this cache drive during this process. The minimum size for the data drive is 100 GB. For instructions to mount a disk on a Linux VM, see [Attach a data disk to a Linux VM](/azure/virtual-machines/linux/attach-disk-portal#find-the-disk).
-
-1. From either **Create Cache Node** or **Cache Node Configuration** pages, select **Download Installer** to download the installer file.
-
-    :::image type="content" source="./images/mcc-isp-installer-download.png" alt-text="Screenshot of the Create Cache Node page highlighting the Download Installer action.":::
-
-    Unzip the **mccinstaller.zip** file, which includes the following installation files and folders:
-
-    - Diagnostics folder: Used to create diagnostics support bundle.
-    - **installmcc.sh**: Main installer file.
-    - **installIotEdge.sh**: Installs the necessary prerequisites. For example, IoT Edge runtime and Docker. It also makes necessary host OS settings to optimize caching performance.
-    - **resourceDeploymentForConnectedCache.sh**: Creates Azure cloud resources required to support the MCC control plane.
-    - **mccdeployment.json**: Deployment manifest used by IoT Edge to deploy the MCC container. It also configures settings on the container like cache drives location and sizes.
-    - **mccupdate.json**
-    - **packagever.txt**
-    - **uninstallmcc.sh**: Main uninstaller file.
-    - **updatemcc.sh**: Main update file.
-
-1. Copy all files to your Linux server.
-
-1. Open a terminal window. Change the access permissions to execute on the **installmcc.sh** Bash script file using `chmod`.
-
-    ```bash
-    sudo chmod +x installmcc.sh
-    ```
-
-1. In the Azure portal, in the Connected Cache installer instructions, copy the cache node installer Bash script command. Run the Bash script from the terminal.
-
-    :::image type="content" source="./images/mcc-isp-copy-install-script.png" alt-text="Screenshot of the Copy option for the cache node installer Bash script in the Connected Cache installer instructions.":::
-
-1. Sign in to the Azure portal with a device code.
-
-    :::image type="content" source="./images/mcc-isp-bash-device-code.png" alt-text="Screenshot of the Bash script prompt to sign in to the Azure portal with a device code." lightbox="./images/mcc-isp-bash-device-code.png":::
-
-1. Specify the number of drives to configure. Use an integer value less than 10.
-
-    :::image type="content" source="./images/mcc-isp-bash-drive-number.png" alt-text="Screenshot of the Bash script prompt to enter the number of cache drives to configure." lightbox="./images/mcc-isp-bash-drive-number.png":::
-
-1. Specify the location of the cache drives. For example, `/datadrive/`
-
-    :::image type="content" source="./images/mcc-isp-bash-datadrive.png" alt-text="Screenshot of the Bash script prompt to enter the location for cache drive." lightbox="./images/mcc-isp-bash-datadrive.png":::
-
-    > [!IMPORTANT]
-    > The script changes the permission and ownership on the cache drive to **everyone** with the command `chmod 777`.
-    >
-    > Don't point the cache drive to any of the following locations:
-    >
-    > - `.`
-    > - `./var`
-    > - `/`
-    > - `<space>`
-    >
-    > Specifying any of these will corrupt the OS, and you'll need to re-install the image again.
-
-1. Specify an integer value as the size in GB for each cache drive. The minimum is `100` GB.
-
-    :::image type="content" source="./images/mcc-isp-bash-allocate-space.png" alt-text="Screenshot of the Bash script prompt to enter the amount of space to allocate to the cache drive." lightbox="./images/mcc-isp-bash-allocate-space.png":::
-
-1. Specify whether you have an existing IoT Hub.
-
-    - If this process is for your *first MCC deployment*, enter `n`.
-
-    - If you already have an MCC deployment, you can use an existing IoT Hub from your previous installation. Select `Y` to see your existing IoT Hubs. You can copy and paste the resulting IoT Hub name to continue.
-
-    :::image type="content" source="./images/mcc-isp-bash-iot-prompt.png" alt-text="Screenshot of the Bash script output with steps for existing IoT Hub." lightbox="./images/mcc-isp-bash-iot-prompt.png":::
-
-1. If you want to configure BGP, enter `y`. If you want to use manual entered prefixes for routing, enter `n` and skip to Step 16. You can always configure BGP at a later time using the Update Script.
-
-    1. Enter the number of BGP neighbors you want to configure.
-    1. Enter the IP address for the neighbor.
-    1. Enter the ASN corresponding to that neighbor. This value should be the same ASN as the MCC -iBGP connection.
-    1. Repeat these steps for each neighbor you need to configure.
-
-    > [!NOTE]
-    > With the BGP configuration, you're essentially setting up an iBGP neighbor in your public ASN. For example, when you initiate the BGP session from the router to the cache node, you would use your own ASN.
-
-1. BGP is now configured from the MCC side. From your end, establish a neighborship from your router to MCC's host machine. Use the IP address of the host machine that's running the MCC container.
-
-    1. Make sure there aren't any firewall rules blocking this connection.
-    1. Verify that the BGP connection has been established and that you're advertising routes to the MCC.
-    1. Wait five minutes to refresh the cache node page in the Azure portal to see the BGP routes.
-
-1. Confirm the update is complete by running the following command.
-
-    ```bash
-    sudo iotedge list
-    ```
-
-    Make sure MCC is running on the latest version. If you only see **edgeAgent** and **edgeHub**, wait five minutes and run this command again.
-
-1. Make sure MCC is reachable. Replace `<CacheServerIp>` with the IP address of your MCC or localhost.
-
-    ```bash
-    wget http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com
-    ```
-
-1. After you successfully complete the update, go to the Azure portal. To check the routes being reported, select **Download JSON**.
-
-1. To start routing using BGP, change the **Prefix Source** from **Manually Entered** to **Use BGP**.
-
-    :::image type="content" source="./images/mcc-isp-use-bgp.png" alt-text="Screenshot of the Cache Node Configuration page with the Prefix Source set to Use BGP.":::
-
-1. If there are no errors, go to the next section to verify the MCC server.
-
-    If there are errors:
-
-    - Inspect the installer logs, which are in the following path: `/etc/mccresourcecreation/`
-
-    - For more information, see [Troubleshoot your IoT Edge device](/azure/iot-edge/troubleshoot). -->
-
-## Verify properly functioning MCC server
-
-### Verify client side
-
-Sign in to the Connected Cache server or use SSH. Run the following command from a terminal to see the running modules (containers):
-
-```bash
-sudo iotedge list
-```
-
-:::image type="content" source="./images/mcc-isp-running-containers.png" alt-text="Screenshot of the terminal output of iotedge list command, showing the running containers." lightbox="./images/mcc-isp-running-containers.png":::
-
-If it lists the **edgeAgent** and **edgeHub** containers, but doesn't include **MCC**, view the status of the IoT Edge security manager using the command:
-
-```bash
-sudo journalctl -u iotedge -f
-```
-
-For example, this command provides the current status of the starting and stopping of a container, or the container pull and start:
-
-:::image type="content" source="./images/mcc-isp-edge-journalctl.png" alt-text="Terminal output of journalctl command for iotedge." lightbox="./images/mcc-isp-edge-journalctl.png":::
-
-### Verify server side
-
-It can take a few minutes for the container to deploy.
-
-To validate a properly functioning MCC, run the following command in the terminal of the cache server or any device in the network. Replace `<CacheServerIP>` with the IP address of the cache server.
-
-```bash
-wget http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com
-```
-
-The following screenshot shows a successful test result:
-
-:::image type="content" source="./images/mcc-isp-wget.png" alt-text="Screenshot of the terminal output of successful test result with wget command to validate a Microsoft Connected Cache." lightbox="./images/mcc-isp-wget.png":::
-
-Similarly, enter the following URL into a web browser on any device on the network:
-
-```http
-http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com
-```
-
-If the test fails, for more information, see the [common issues](#common-issues) section.
-
-## Common Issues
-
-### Microsoft Connected Cache is no longer serving traffic
-If you did not migrate your cache node then your cache node may still be on early preview version.
-Microsoft Connected Cache for Internet Service Providers is now in Public Preview! To get started, visit  [Azure portal](https://www.portal.azure.com) to sign up for Microsoft Connected Cache for Internet Service Providers. Please see [Operator sign up and service onboarding for Microsoft Connected Cache](mcc-isp-signup.md) for more information on the requirements for sign up and onboarding.
-<br>
-<br>
-<br>
-
-> [!NOTE]
-> This section only lists common issues. For more information on additional issues you may encounter when configuring IoT Edge, see the [IoT Edge troubleshooting guide](/azure/iot-edge/troubleshoot).
-
-Use the following command to check the IoT Edge journal:
-
-```bash
-sudo journalctl -u iotedge -f
-```
-
-### DNS needs to be configured
-
-Run the following IoT Edge install state check:
-
-```bash
-sudo iotedge check --verbose
-```
-
-If you see issues with ports 5671, 443, and 8883, your IoT Edge device needs to update the DNS for Docker.
-
-To configure the device to work with your DNS, use the following steps:
-
-1. Use `ifconfig` to find the appropriate NIC adapter name.
-
-    ```bash
-    ifconfig
-    ```
-
-1. Run `nmcli device show <network adapter name>` to show the DNS name for the ethernet adapter. For example, to show DNS information for **eno1**:
-
-    ```bash
-    nmcli device show eno1 
-    ```
-
-    :::image type="content" source="images/mcc-isp-nmcli.png" alt-text="Screenshot of a sample output of nmcli command to show network adapter information." lightbox="./images/mcc-isp-nmcli.png":::
-
-1. Open or create the Docker configuration file used to configure the DNS server.
-
-    ```bash
-    sudo nano /etc/docker/daemon.json
-    ```
-
-1. Paste the following string into the **daemon.json** file, and include the appropriate DNS server address. For example, in the previous screenshot, `IP4.DNS[1]` is `10.50.10.50`.
-
-    ```bash
-    { "dns": ["x.x.x.x"]}
-    ```
-
-1. Save the changes to daemon.json. If you need to change permissions on this file, use the following command:
-
-    ```bash
-    sudo chmod 555 /etc/docker/daemon.json
-    ```
-
-1. Restart Docker to pick up the new DNS setting. Then restart IoT Edge.
-
-    ```bash
-    sudo systemctl restart docker
-    sudo systemctl daemon-reload
-    sudo restart IoTEdge
-    ```
-
-<!-- ### Diagnostics script
-
-If you're having issues with your MCC, the installer file includes a diagnostics script. The script collects all logs and zips them into a single file. 
-
-To run the script:
-
-1. Navigate to the following folder in the MCC installation files:
-
-    `mccinstaller > MccResourceInstall > Diagnostics`
-
-1. Run the following commands:
-
-    ```bash
-    sudo chmod +x collectMccDiagnostics.sh
-    sudo ./collectMccDiagnostics.sh
-    ```
-
-1. The script stores all the debug files into a folder and creates a tar file. After the script is finished running, it displays the path of the tar file that you can share with the MCC team. The file should be `/etc/mccdiagnostics/support_bundle_\$timestamp.tar.gz`
-
-1. [Email the MCC team](mailto:msconnectedcache@microsoft.com?subject=Debugging%20Support%20Request%20for%20MCC) and attach this tar file, asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during the debugging process. -->
-
-<!-- ## Updating your MCC
-
-Throughout the early preview phase, Microsoft will release security and feature updates for MCC. Follow these steps to update your MCC.
-
-Run the following commands, replacing the variables with the values provided in the email to update your MCC:
-
-```bash
-sudo chmod +x updatemcc.sh
-sudo chmod +x installIoTEdge.sh
-sudo ./updatemcc.sh version="<VERSION>" tenantid="<TENANTID>" customerid="<CUSTOMERID>" cachenodeid="<CACHENODEID>" customerkey="<CUSTOMERKEY>"
-```
-
-For example:
-
-```bash
-sudo ./updatemcc.sh version="msconnectedcacheprod.azurecr.io/mcc/linux/iot/mcc-ubuntu-iot-amd64:1.2.1.981" tenantid="799a999aa-99a1-99aa-99aa-9a9aa099db99" customerid="99a999aa-99a1-99aa-99aa-9aaa9aaa0saa" cachenodeid=" aa99aaaa-999a-9aas-99aa99daaa99 " customerkey="a99d999a-aaaa-aa99-0999aaaa99aa"
-``` -->
-
-<!-- ### Configure BGP on an Existing MCC
-
-If you have an MCC that's already active and running, follow the steps below to configure BGP.
-
-1. Run the Update commands as described above.
-
-1. Sign in with your Azure credentials using the device code.
-
-1. To finish configuring your MCC with BGP routing, continue from Step 10 of [Steps to Install MCC](#steps-to-install-mcc). -->
-
-
-## Uninstalling MCC
-
-In the installer zip file, you'll find the file **uninstallmcc.sh**. This script uninstalls MCC and all the related components. Before you run this script, contact the MCC team. Only run it if you're facing issues with MCC installation.
-
-> [!WARNING]
-> Be cautious before running this script. It will also erase existing IoT workflows in this VM.
-
-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
-```
-
-## Appendix
-
-### Steps to obtain an Azure subscription ID
-
-<!--Using include file, get-azure-subscription.md, for shared content-->
-[!INCLUDE [Get Azure subscription](includes/get-azure-subscription.md)]
-
-### Performance of MCC in virtual environments
-
-In virtual environments, the cache server egress peaks at around 1.1 Gbps. If you want to maximize the egress in virtual environments, it's critical to change the following two settings:
-
-1. Enable **SR-IOV** in the following three locations:
-
-    - The BIOS of the MCC VM
-    - The MCC VM's network card properties
-    - The hypervisor for the MCC VM
-
-    Microsoft has found these settings to double egress when using a Microsoft Hyper-V deployment.
-
-2. Enable "high performance" in the BIOS instead of energy savings. Microsoft has found this setting nearly doubled egress in a Microsoft Hyper-V deployment.
-
-### Grant other users access to manage your MCC
-
-More users can be given access to manage Microsoft Connected Cache, even if they don't have an Azure account. Once you've created the first cache node in the portal, you can add other users as **Owners** of the Microsoft Connected Cache resource group and the Microsoft Connected Cache resource.
-
-For more information on how to add other users as an owner, see [Grant a user access to Azure resources using the Azure portal](/azure/role-based-access-control/quickstart-assign-role-user-portal). Make sure to do this action for both the *MCC resource* and *MCC resource group*.
 
 ### Setting up a VM on Windows Server
 
@@ -708,7 +134,7 @@ You can use hardware that will natively run Ubuntu 20.04 LTS, or you can run an
     >
     > :::image type="content" source="./images/mcc-isp-ubuntu-upgrade.png" alt-text="Screenshot of the Ubuntu install's Upgrade Available prompt with Don't Upgrade selected.":::
 
-Your Ubuntu VM is now ready to install MCC.
+Your Ubuntu VM is now ready to install Connected Cache.
 
 ### IoT Edge runtime
 
@@ -727,3 +153,5 @@ For more information on Azure IoT Edge, see the [Azure IoT Edge documentation](/
 [Microsoft Connected Cache overview](waas-microsoft-connected-cache.md)
 
 [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/waas-delivery-optimization-faq.yml

@@ -113,8 +113,8 @@ sections:
           For more information, see [Endpoints for Delivery Optimization and Microsoft Connected Cache](../do/delivery-optimization-endpoints.md) for a list of all content endpoints needed.
       - question: My firewall requires IP addresses and can't process FQDNs. How do I configure it to download content with Delivery Optimization?
         answer: | 
-          Microsoft content, such as Windows updates, are hosted and delivered globally via Content Delivery Networks (CDNs) and [Microsoft Connected Cache](waas-microsoft-connected-cache.md) (MCC) servers, which are hosted within Internet Service Provider (ISP) networks. 
+          Microsoft content, such as Windows updates, are hosted and delivered globally via Content Delivery Networks (CDNs) and [Microsoft Connected Cache](waas-microsoft-connected-cache.md) servers, which are hosted within Internet Service Provider (ISP) networks. 
-          The network of CDNs and MCCs allows Microsoft to reach the scale required to meet the demand of the Windows user base. Given this delivery infrastructure changes dynamically, providing an exhaustive list of IPs and keeping it up to date isn't feasible.  
+          The network of CDNs and Microsoft Connected Caches allows Microsoft to reach the scale required to meet the demand of the Windows user base. Given this delivery infrastructure changes dynamically, providing an exhaustive list of IPs and keeping it up to date isn't feasible.  
       - question: What is the recommended configuration for Delivery Optimization used with cloud proxies?
         answer: |
           The recommended configuration for Delivery Optimization peer-to-peer to work most efficiently along with cloud proxy solutions (for example, Zscaler) is to allow traffic to the Delivery Optimization services to go directly to the internet and not through the cloud proxy.
@@ -131,8 +131,8 @@ sections:
           Delivery Optimization uses the cache content on the device to determine what's available for peering. For the upload source device, there's a limited number (4) of slots for cached content that's available for peering at a given time. Delivery Optimization contains logic that rotates the cached content in those slots.
       - question: Where does Delivery Optimization get content from first?
         answer: |
-          When Delivery Optimization client is configured to use peers and Microsoft Connected Cache (MCC), the client connects to both MCC and peers in parallel. There is no prioritization between the two. Once downloading starts in parallel, Delivery Optimization 
+          When Delivery Optimization client is configured to use peers and Microsoft Connected Cache, the client connects to both Connected Cache and peers in parallel. There is no prioritization between the two. Once downloading starts in parallel, Delivery Optimization 
-          will taper off requests to the HTTP source (CDN or MCC) when the peer connections are able to reach the target download speed. For background downloads, Delivery Optimization will drop HTTP connections if peers are meeting the minimum QoS speed. To manage delaying the default behavior
+          will taper off requests to the HTTP source (CDN or Connected Cache) when the peer connections are able to reach the target download speed. For background downloads, Delivery Optimization will drop HTTP connections if peers are meeting the minimum QoS speed. To manage delaying the default behavior
           there are a collection of policies that can be used. For more information, see [Delivery Optimization delay policies](waas-delivery-optimization-reference.md#policies-to-prioritize-the-use-of-peer-to-peer-and-cache-server-sources).
       - question: Does Delivery Optimization use multicast?
         answer: |

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

@@ -24,7 +24,7 @@ To monitor Delivery Optimization, you can use either the Windows Update for Busi
 
 ## Monitor with Windows Update for Business Delivery Optimization report
 
-Windows Update for Business Delivery Optimization Report provides you with information about your Delivery Optimization configuration, including the observed bandwidth savings across all devices that used peer-to-peer, Microsoft Connected Cache (MCC), HTTP source/CDN distribution over the past 28 days.
+Windows Update for Business Delivery Optimization Report provides you with information about your Delivery Optimization configuration, including the observed bandwidth savings across all devices that used peer-to-peer, Microsoft Connected Cache, HTTP source/CDN distribution over the past 28 days.
 
 :::image type="content" source="../update/media/wufb-do-overview.png" alt-text="This screenshot shows the Windows Update for Business report, Delivery Optimization status in Update Compliance." lightbox= "../update/media/wufb-do-overview.png":::
 
@@ -49,7 +49,7 @@ For details, see [Windows Update for Business Delivery Optimization Report](/win
 | BytesFromHTTP | Total number of bytes received over HTTP. This metric represents all HTTP sources, **which includes BytesFromCacheServer** |
 | Status | Current state of the operation. Possible values are: **Downloading** (download in progress); **Complete** (download completed, but isn't uploading yet); **Caching** (download completed successfully and is ready to upload or uploading); **Paused** (download/upload paused by caller) |
 | Priority | Priority of the download; values are **foreground** or **background** |
-| BytesFromCacheServer | Total number of bytes received from cache server (MCC) |
+| BytesFromCacheServer | Total number of bytes received from cache server (Connected Cache) |
 | BytesFromLanPeers | Total number of bytes received from peers found on the LAN |
 | BytesFromGroupPeers | Total number of bytes received from peers found in the group. (Note: Group mode is LAN + Group. If peers are found on the LAN, those bytes are registered in 'BytesFromLANPeers'.)  |
 | BytesFromInternetPeers | Total number of bytes received from internet peers |

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

@@ -96,19 +96,19 @@ More options available that control the impact Delivery Optimization has on your
 
 #### Policies to prioritize the use of peer-to-peer and cache server sources
 
-When Delivery Optimization client is configured to use peers and Microsoft Connected Cache (MCC), to achieve the best possible content delivery experience, the client connects to both MCC and peers in parallel. If the desired content can't be obtained from MCC or peers, Delivery Optimization will automatically fall back to the HTTP source to get the requested content. There are four settings that allow you to prioritize peer-to-peer or MCC sources by delaying the immediate fallback to HTTP source, which is the default behavior.
+When Delivery Optimization client is configured to use peers and Microsoft Connected Cache, to achieve the best possible content delivery experience, the client connects to both Connected Cache and peers in parallel. If the desired content can't be obtained from Connected Cache or peers, Delivery Optimization will automatically fall back to the HTTP source to get the requested content. There are four settings that allow you to prioritize peer-to-peer or Connected Cache sources by delaying the immediate fallback to HTTP source, which is the default behavior.
 
 ##### Peer-to-peer delay fallback settings
 
 - [Delay foreground download from HTTP (in secs)](#delay-foreground-download-from-http-in-secs) allows you to delay the use of an HTTP source in a foreground (interactive) download that is allowed to use P2P.
 - [Delay background download from HTTP (in secs)](#delay-background-download-from-http-in-secs) allows you to delay the use of an HTTP source in a background download that is allowed to use P2P.
 
-##### Microsoft Connected Cache (MCC) delay fallback settings
+##### Microsoft Connected Cache delay fallback settings
 
 - [Delay foreground download cache server fallback (in secs)](#delay-foreground-download-cache-server-fallback-in-secs) allows you to delay the use of an HTTP source in a foreground (interactive) download that is allowed to use a cache server.
 - [Delay background download cache server fallback (in secs)](#delay-background-download-cache-server-fallback-in-secs) allows you to delay the use of an HTTP source in a background  download that is allowed to use a cache server.
 
-**If both peer-to-peer and MCC are configured, the peer-to-peer delay settings will take precedence over the cache server delay settings.** This setting allows Delivery Optimization to discover peers first then recognize the fallback setting for the MCC cache server.
+**If both peer-to-peer and Connected Cache are configured, the peer-to-peer delay settings will take precedence over the cache server delay settings.** This setting allows Delivery Optimization to discover peers first then recognize the fallback setting for the Connected Cache cache server.
 
 #### System resource usage
 

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

@@ -24,7 +24,7 @@ ms.date: 05/23/2024
 
 Windows updates, upgrades, and applications can contain packages with large files. Downloading and distributing updates can consume quite a bit of network resources on the devices receiving them. Delivery Optimization is a reliable HTTP downloader with a cloud-managed solution that allows Windows devices to download those packages from alternate sources if desired (such as other devices on the network and/or a dedicated cache server) in addition to the traditional internet-based servers (referred to as 'HTTP sources' throughout Delivery Optimization documents). You can use Delivery Optimization to reduce bandwidth consumption by sharing the work of downloading these packages among multiple devices in your deployment however, the use of peer-to-peer is optional.
 
-To use either the peer-to-peer functionality or the Microsoft Connected Cache features, devices must have access to the Internet and Delivery Optimization cloud services. When Delivery Optimization is configured to use peers and Microsoft Connected Cache (MCC), to achieve the best possible content delivery experience, the client connects to MCC and peers in parallel. If the desired content can't be obtained from MCC or peers, Delivery Optimization seamlessly falls back to the HTTP source to get the requested content.
+To use either the peer-to-peer functionality or the Microsoft Connected Cache features, devices must have access to the Internet and Delivery Optimization cloud services. When Delivery Optimization is configured to use peers and Microsoft Connected Cache, to achieve the best possible content delivery experience, the client connects to Connected Cache and peers in parallel. If the desired content can't be obtained from Connected Cache or peers, Delivery Optimization seamlessly falls back to the HTTP source to get the requested content.
 
 You can use Delivery Optimization with Windows Update, Windows Server Update Services (WSUS), Microsoft Intune/Windows Update for Business, or Microsoft Configuration Manager (when installation of Express Updates is enabled).
 
@@ -47,7 +47,7 @@ The following table lists the minimum Windows 10 version that supports Delivery
 
 #### Windows Client
 
-| Windows Client | Minimum Windows version | HTTP Downloader | Peer to Peer | Microsoft Connected Cache (MCC) |
+| Windows Client | Minimum Windows version | HTTP Downloader | Peer to Peer | Microsoft Connected Cache |
 |------------------|---------------|----------------|----------|----------------|
 | Windows Update ([feature updates quality updates, language packs, drivers](../update/get-started-updates-channels-tools.md#types-of-updates)) | Windows 10 1511, Windows 11 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Windows 10/11 UWP Store apps | Windows 10 1511, Windows 11 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
@@ -66,14 +66,14 @@ The following table lists the minimum Windows 10 version that supports Delivery
 
 #### Windows Server
 
-| Windows Server | Minimum Windows version | HTTP Downloader | Peer to Peer | Microsoft Connected Cache (MCC) |
+| Windows Server | Minimum Windows version | HTTP Downloader | Peer to Peer | Microsoft Connected Cache |
 |----------------|--------------------------|----------------|----------|----------------|
 | Windows Update | Windows Server 2019 (1809) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Edge Browser Updates | Windows Server 2019 (1809) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 
 #### Linux (Public Preview)
 
-| Linux ([Public Preview](https://github.com/microsoft/do-client)) | Linux versions | HTTP Downloader | Peer to Peer | Microsoft Connected Cache (MCC) |
+| Linux ([Public Preview](https://github.com/microsoft/do-client)) | Linux versions | HTTP Downloader | Peer to Peer | Microsoft Connected Cache |
 |------------------------|----------------|-----------------|--------------|---------------|
 | Device Update for IoT Hub | Ubuntu 18.04, 20.04 / Debian 9, 10 | :heavy_check_mark: |  | :heavy_check_mark: |
 > [!NOTE]

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

@@ -1,6 +1,6 @@
 ---
 title: Microsoft Connected Cache overview
-description: This article provides information about Microsoft Connected Cache (MCC), a software-only caching solution.
+description: This article provides information about Microsoft Connected Cache, a software-only caching solution.
 ms.service: windows-client
 ms.subservice: itpro-updates
 ms.topic: overview
@@ -13,7 +13,7 @@ ms.localizationpriority: medium
 appliesto: 
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
-ms.date: 05/23/2024
+ms.date: 10/30/2024
 ---
 
 # What is Microsoft Connected Cache?
@@ -24,7 +24,7 @@ ms.date: 05/23/2024
 Microsoft Connected Cache is a software-only caching solution that delivers Microsoft content. Microsoft Connected Cache has two main offerings:
 
 - Microsoft Connected Cache for Internet Service Providers
-- Microsoft Connected Cache for Enterprise and Education (early preview)
+- Microsoft Connected Cache for Enterprise and Education (preview)
 
 Both products are created and managed in the cloud portal.
 
@@ -33,16 +33,16 @@ Both products are created and managed in the cloud portal.
 > [!NOTE]
 > Microsoft Connected Cache for Internet Service Providers is now in public preview. To onboard, follow the instructions in the [Operator sign up and service onboarding](mcc-isp-signup.md) article.
 
-Microsoft Connected Cache (MCC) for Internet Service Providers is currently in preview. MCC can be deployed to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, MCC can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing. Learn more at [Microsoft Connected Cache for ISPs Overview](mcc-isp-overview.md).
+Microsoft Connected Cache for Internet Service Providers is currently in preview. Connected Cache can be deployed to as many bare-metal servers or VMs as needed and is managed from a cloud portal. When deployed, Connected Cache can help to reduce your network bandwidth usage for Microsoft software content and updates. Cache nodes are created in the cloud portal and are configured to deliver traffic to customers by manual CIDR or BGP routing. Learn more at [Microsoft Connected Cache for ISPs Overview](mcc-isp-overview.md).
 
-## Microsoft Connected Cache for Enterprise and Education (early preview)
+## Microsoft Connected Cache for Enterprise and Education (preview)
 
 > [!NOTE]
-> As we near the release of public preview, we have paused onboarding. Please continue to submit the form to express interest so we can follow up with you once public preview of Microsoft Connected Cache for Enteprise and Education is available. To register your interest, fill out the form located at [https://aka.ms/MSConnectedCacheSignup](https://aka.ms/MSConnectedCacheSignup).
+> Microsoft Connected Cache for Enterprise and Education is now in public preview. To get started, follow the instructions in the [Create Microsoft Connected Cache Azure resource and cache nodes](mcc-ent-create-resource-and-cache.md) article.
 
-Microsoft Connected Cache (MCC) for Enterprise and Education (early preview) is a software-only caching solution that delivers Microsoft content within Enterprise and Education networks. MCC can be deployed to as many Windows servers, bare-metal servers, or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune. Learn more at [Microsoft Connected Cache for Enterprise and Education Overview](mcc-ent-edu-overview.md).
+Microsoft Connected Cache for Enterprise and Education is a software-only caching solution that delivers Microsoft content within Enterprise and Education networks. Connected Cache can be deployed to as many Windows servers, bare-metal servers, or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune. Learn more at [Microsoft Connected Cache for Enterprise and Education Overview](mcc-ent-edu-overview.md).
 
-Microsoft Connected Cache (MCC) for Enterprise and Education (early preview) is a standalone cache for customers moving towards modern management and away from Configuration Manager distribution points. For Microsoft Connected Cache in Configuration Manager (generally available starting Configuration Manager version 2111), see [Microsoft Connected Cache in Configuration Manager](/mem/configmgr/core/plan-design/hierarchy/microsoft-connected-cache)
+Microsoft Connected Cache for Enterprise and Education (preview) is a standalone cache for customers moving towards modern management and away from Configuration Manager distribution points. For Microsoft Connected Cache in Configuration Manager (generally available starting Configuration Manager version 2111), see [Microsoft Connected Cache in Configuration Manager](/mem/configmgr/core/plan-design/hierarchy/microsoft-connected-cache)
 
 ## Next steps
 

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

@@ -22,9 +22,9 @@ This article contains information about what's new in Delivery Optimization, a p
 
 ## Microsoft Connected Cache (early preview)
 
-Microsoft Connected Cache (MCC) is a software-only caching solution that delivers Microsoft content within Enterprise networks. MCC can be deployed to as many bare-metal servers or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune.
+Microsoft Connected Cache is a software-only caching solution that delivers Microsoft content within Enterprise networks. Connected Cache can be deployed to as many bare-metal servers or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune.
 
-For more information about MCC, see [Microsoft Connected Cache overview](waas-microsoft-connected-cache.md).
+For more information about Connected Cache, see [Microsoft Connected Cache overview](waas-microsoft-connected-cache.md).
 
 There are two different versions:
 
@@ -39,12 +39,12 @@ There are two different versions:
 
 - -HealthCheck: Provides an overall check of the device setup to ensure Delivery Optimization communication is possible on the device.
 - -P2P: Provides output specific to P2P settings, efficiency, and errors.
-- -MCC: Provides output specific to MCC settings and verifies the client can access the cache server.
+- -MCC: Provides output specific to Connected Cache settings and verifies the client can access the cache server.
 
 ### Windows 11 22H2
 
 - New setting: Customize VPN detection by choosing custom keywords. Now, you don't have to rely on Delivery Optimization keywords to detect your VPN. By using the new VpnKeywords setting, you can add keywords for Delivery Optimization to use to detect when a VPN is in use. You can find this configuration **[VPN Keywords](waas-delivery-optimization-reference.md#vpn-keywords)** in Group Policy or MDM under **DOVpnKeywords**.
-- New setting: Use the disallow downloads from a connected cache server, when a VPN is detected and you want to prevent the download from the connected cache server. You can find this configuration **[Disallow download from MCC over VPN](waas-delivery-optimization-reference.md#disallow-cache-server-downloads-on-vpn)** in Group Policy or MDM under **DODisallowCacheServerDownloadsOnVPN**.
+- New setting: Use the disallow downloads from a connected cache server, when a VPN is detected and you want to prevent the download from the connected cache server. You can find this configuration **[Disallow download from Connected Cache over VPN](waas-delivery-optimization-reference.md#disallow-cache-server-downloads-on-vpn)** in Group Policy or MDM under **DODisallowCacheServerDownloadsOnVPN**.
 - Delivery Optimization introduced support for receiver side ledbat (rLEDBAT).
 - New setting: Local Peer Discovery, a new option for **[Restrict Peer Selection By](waas-delivery-optimization-reference.md#select-a-method-to-restrict-peer-selection)** in Group Policy or MDM **DORestrictPeerSelectionBy**. This option restricts the discovery of local peers using the DNS-SD protocol. When you set Option 2, Delivery Optimization restricts peer selection to peers that are locally discovered (using DNS-SD).
 

windows/deployment/index.yml

@@ -15,7 +15,7 @@ metadata:
   author: aczechowski
   ms.author: aaroncz
   manager: aaroncz
-  ms.date: 08/27/2024
+  ms.date: 11/05/2024
   ms.localizationpriority: medium
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -34,6 +34,8 @@ landingContent:
       url: volume-activation/plan-for-volume-activation-client.md
     - text: Windows compatibility cookbook
       url: /windows/compatibility/
+    - text: Cloud-native Windows
+      url: /mem/solutions/cloud-native-endpoints/cloud-native-endpoints-overview
 
 - title: Prepare
   linkLists:

windows/deployment/update/media-dynamic-update.md

@@ -13,7 +13,7 @@ appliesto:
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/windows-server-release-info target=_blank>Windows Server</a>
-ms.date: 10/15/2024
+ms.date: 11/06/2024
 ---
 
 # Update Windows installation media with Dynamic Update
@@ -121,7 +121,7 @@ Optional Components, along with the .NET feature, can be installed offline, howe
 
 
 ### Checkpoint cumulative updates
-Starting with Windows 11, version 24H2, the latest cumulative update may have a prerequisite cumulative update that is required to be installed first. These are known as checkpoint cumulative updates. In these cases, the cumulative update file level differentials are based on a previous cumulative update instead of the Windows RTM release. The benefit is a smaller update package and faster installation. When you obtain the latest cumulative update from the [Microsoft Update Catalog](https://catalog.update.microsoft.com), checkpoint cumulative updates will be available from the download button. In addition, the knowledge base article for the cumulative update will provide additional information. 
+Starting with Windows 11, version 24H2, and Windows Server 2025, the latest cumulative update may have a prerequisite cumulative update that is required to be installed first. These are known as checkpoint cumulative updates. In these cases, the cumulative update file level differentials are based on a previous cumulative update instead of the Windows RTM release. The benefit is a smaller update package and faster installation. When you obtain the latest cumulative update from the [Microsoft Update Catalog](https://catalog.update.microsoft.com), checkpoint cumulative updates will be available from the download button. In addition, the knowledge base article for the cumulative update will provide additional information. 
 
 To install the checkpoint(s) when servicing the Windows OS (steps 9 & 12) and WinPE (steps 17 & 23), call `Add-WindowsPackage` with the target cumulative update. The folder from `-PackagePath` will be used to discover and install one or more checkpoints as needed. Only the target cumulative update and checkpoint cumulative updates should be in the `-PackagePath` folder. Cumulative update packages with a revision <= the target cumulative update will be processed. If you are not customizing the image with additional languages and/or optional features, then separate calls to `Add-WindowsPackage` (checkpoint cumulative updates first) can be used for steps 9 & 17 above. Separate calls cannot be used for steps 12 and 23.
 

windows/deployment/update/update-policies.md

@@ -94,7 +94,7 @@ options must be **Disabled** in order to take advantage of intelligent active ho
 If you do set active hours, we recommend setting the following policies to **Disabled** in order to increase update
 velocity:
 
-- [Delay automatic reboot](waas-restart.md#delay-automatic-reboot). While it's possible to set the system to delay restarts for users who are logged in, this setting might delay an update indefinitely if a user is always either logged in or shut down. Instead, we recommend setting the following polices to **Disabled**:
+- [Delay automatic reboot](waas-restart.md#delay-automatic-restart). While it's possible to set the system to delay restarts for users who are logged in, this setting might delay an update indefinitely if a user is always either logged in or shut down. Instead, we recommend setting the following polices to **Disabled**:
     - **Turn off auto-restart during active hours**
     - **No auto-restart with logged on users for scheduled automatic updates**
 
@@ -194,4 +194,4 @@ Updates** rather than setting a deferral policy. You can choose a longer period
 - **Pause Quality Updates Start Time**. Set to **Disabled** unless there's a known issue requiring time for a resolution.
 - **Deadline No Auto Reboot**. Default is **Disabled - Set to 0** . We recommend that devices automatically try to restart when an update is received. Windows uses user interactions to dynamically identify the least disruptive time to restart.
 
-There are also additional policies are no longer supported or have been superseded.
+There are also additional policies that are no longer supported or have been superseded.

windows/deployment/update/waas-restart.md

@@ -1,6 +1,6 @@
 ---
 title: Manage device restarts after updates
-description: Use Group Policy settings, mobile device management (MDM), or Registry to configure when devices will restart after a Windows update is installed.
+description: Use group policy settings, mobile device management (MDM), or registry to configure when devices will restart after a Windows update is installed.
 ms.service: windows-client
 ms.subservice: itpro-updates
 ms.topic: how-to
@@ -14,38 +14,42 @@ ms.localizationpriority: medium
 appliesto:
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
 - ✅ <a href=https://learn.microsoft.com/windows/release-health/supported-versions-windows-client target=_blank>Windows 10</a>
-ms.date: 10/04/2024
+ms.date: 10/25/2024
 ---
 
 # Manage device restarts after updates
 
-> **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
+> **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/windows/windows-update-faq-8a903416-6f45-0718-f5c7-375e92dddeb2)
 
-You can use Group Policy settings, mobile device management (MDM), or Registry (not recommended) to configure when devices will restart after a Windows update is installed. You can schedule update installation and set policies for restart, configure active hours for when restarts won't occur, or you can do both.
+You can use group policy settings, mobile device management (MDM), or the Windows registry to configure when devices will restart after a Windows update is installed. You can schedule update installation and set policies for restart, configure active hours for when restarts shouldn't occur, or you can do both.
+
+> [!NOTE]
+> Directly editing the Windows registry isn't recommended.
 
 ## Schedule update installation
 
-In Group Policy, within **Configure Automatic Updates**, you can configure a forced restart after a specified installation time.
+In group policy, within **Configure Automatic Updates**, you can configure a forced restart after a specified installation time.
 
-To set the time, you need to go to **Configure Automatic Updates**, select option **4 - Auto download and schedule the install**, and then enter a time in the **Scheduled install time** dropdown. Alternatively, you can specify that installation occurs during the automatic maintenance time (configured using **Computer Configuration\Administrative Templates\Windows Components\Maintenance Scheduler**).
+To set the time, go to **Configure Automatic Updates**, select option **4 - Auto download and schedule the install**, and then use **Scheduled install time** to enter a time. Alternatively, you can specify that installation occurs during the automatic maintenance time. To configure this alternative method, use **Computer Configuration\Administrative Templates\Windows Components\Maintenance Scheduler**.
 
-**Always automatically restart at the scheduled time** forces a restart after the specified installation time and lets you configure a timer to warn a signed-in user that a restart is going to occur.
+The setting to **Always automatically restart at the scheduled time** forces a restart after the specified installation time. It lets you configure a timer to warn a signed-in user that a restart is going to occur.
 
-While not recommended, the same result can be achieved through Registry. Under **HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU**, set **AuOptions** to **4**, set the install time with **ScheduledInstallTime**, enable **AlwaysAutoRebootAtScheduledTime** and specify the delay in minutes through **AlwaysAutoRebootAtScheduledTimeMinutes**. Similar to Group Policy, **AlwaysAutoRebootAtScheduledTimeMinutes** sets the timer to warn a signed-in user that a restart is going to occur.
+While not recommended, you can achieve the same result with the Windows registry. Under `HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU`, set `AuOptions` to `4` and set the install time with `ScheduledInstallTime`. Enable `AlwaysAutoRebootAtScheduledTime` and specify the delay in minutes through `AlwaysAutoRebootAtScheduledTimeMinutes`. Similar to group policy, `AlwaysAutoRebootAtScheduledTimeMinutes` sets the timer to warn a signed-in user that a restart is going to occur.
 
 For a detailed description of these registry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart).
 
-## Delay automatic reboot
+## Delay automatic restart
 
-When **Configure Automatic Updates** is enabled in Group Policy, you can also enable one of the following policies to delay an automatic reboot after update installation:
+When you enable **Configure Automatic Updates** in group policy, you can also enable one of the following policies to delay an automatic restart after update installation:
 
 - **Turn off auto-restart for updates during active hours** prevents automatic restart during active hours.
-- **No auto-restart with logged on users for scheduled automatic updates installations** prevents automatic restart when a user is signed in. If a user schedules the restart in the update notification, the device restarts at the time the user specifies even if a user is signed in at the time. This policy only applies when **Configure Automatic Updates** is set to option **4-Auto download and schedule the install**.
+
+- **No auto-restart with logged on users for scheduled automatic updates installations** prevents automatic restart when a user is signed in. If a user schedules the restart in the update notification, the device restarts at the time the user specifies even if a user is signed in at the time. This policy only applies when **Configure Automatic Updates** is set to option **4 - Auto download and schedule the install**.
 
 > [!NOTE]
-> When using Remote Desktop Protocol connections, only active RDP sessions are considered as logged on users. Devices that do not have locally logged on users, or active RDP sessions, will be restarted.
+> When using Remote Desktop Protocol (RDP) connections, only active RDP sessions are considered signed-in users. Devices that don't have locally signed-in users, or active RDP sessions, are restarted.
 
-You can also use Registry, to prevent automatic restarts when a user is signed in. Under **HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU**, set **AuOptions** to **4** and enable **NoAutoRebootWithLoggedOnUsers**. As with Group Policy, if a user schedules the restart in the update notification, it overrides this setting.
+You can also use the Windows registry, to prevent automatic restarts when a user is signed in. Under `HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU`, set `AuOptions` to `4` and enable `NoAutoRebootWithLoggedOnUsers`. As with group policy, if a user schedules the restart in the update notification, it overrides this setting.
 
 For a detailed description of these registry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart).
 
@@ -53,166 +57,177 @@ For a detailed description of these registry keys, see [Registry keys used to ma
 
 *Active hours* identify the period of time when you expect the device to be in use. Automatic restarts after an update occur outside of the active hours.
 
-By default, active hours are from 8 AM to 5 PM on PCs and from 5 AM to 11 PM on phones. Users can change the active hours manually.
+By default, active hours are from 8 AM to 5 PM on PCs. Users can manually change the active hours.
 
-Starting with Windows 10, version 1703, you can also specify the max active hours range. The specified range is counted from the active hours start time.
+You can also specify the max active hours range. The specified range is counted from the active hours start time.
 
-Administrators can use multiple ways to set active hours for managed devices:
+### Configure active hours with group policy
 
-- You can use Group Policy, as described in the procedure that follows.
+To configure active hours using group policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and open the **Turn off auto-restart for updates during active hours** policy setting. When the policy is enabled, you can set the start and end times for active hours.
-- You can use MDM, as described in [Configuring active hours with MDM](#configuring-active-hours-with-mdm).
-- While not recommended, you can also configure active hours, as described in [Configuring active hours through Registry](#configuring-active-hours-through-registry).
 
-### Configuring active hours with Group Policy
+:::image type="content" source="images/waas-active-hours-policy.png" alt-text="A screenshot of the group policy setting to 'Turn off auto-restart for updates during active hours' set to Enabled and the default active hours specified." lightbox="images/waas-active-hours-policy.png":::
 
-To configure active hours using Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and open the **Turn off auto-restart for updates during active hours** policy setting. When the policy is enabled, you can set the start and end times for active hours.
+### Configure active hours with MDM
 
-![Use Group Policy to configure active hours.](images/waas-active-hours-policy.png)
+To configure active hours, MDM uses the following settings in the [Update Policy CSP](/windows/client-management/mdm/policy-csp-update):
 
-### Configuring active hours with MDM
+- [ActiveHoursStart](/windows/client-management/mdm/policy-csp-update#activehoursstart)
+- [ActiveHoursEnd](/windows/client-management/mdm/policy-csp-update#activehoursend)
+- [ActiveHoursMaxRange](/windows/client-management/mdm/policy-csp-update#activehoursmaxrange)
 
-MDM uses the [Update/ActiveHoursStart and Update/ActiveHoursEnd](/windows/client-management/mdm/policy-configuration-service-provider#Update_ActiveHoursEnd)  and [Update/ActiveHoursMaxRange](/windows/client-management/mdm/policy-configuration-service-provider#update-activehoursmaxrange) settings in the [Policy CSP](/windows/client-management/mdm/policy-configuration-service-provider) to configure active hours.
+### Configure active hours through the Windows registry
 
-### Configuring active hours through Registry
+This method isn't recommended, and should only be used when you can't use group policy or MDM. Any settings configured through the registry might conflict with any existing configuration that uses any of the other methods.
-
-This method isn't recommended, and should only be used when you can't use Group Policy or MDM.
-Any settings configured through Registry may conflict with any existing configuration that uses any of the methods mentioned above.
 
 Configure active hours by setting a combination of the following registry values:
 
-Under **HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate** use **SetActiveHours** to enable or disable active hours and **ActiveHoursStart** and **ActiveHoursEnd** to specify the range of active hours.
+Under `HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate` use `SetActiveHours` to enable or disable active hours and `ActiveHoursStart` and `ActiveHoursEnd` to specify the range of active hours.
 
 For a detailed description of these registry keys, see [Registry keys used to manage restart](#registry-keys-used-to-manage-restart).
 
->[!NOTE]
+> [!TIP]
->To configure active hours manually on a single device, go to **Settings** > **Update & security** > **Windows Update** and select **Change active hours**.
+> To manually configure active hours on a device, go to **Settings** > **Windows Update** > **Advanced options** and select **Active hours**.
->
->![Change active hours.](images/waas-active-hours.png)
 
-### Configuring active hours max range
+### Configure active hours maximum range
 
-With Windows 10, version 1703, administrators can specify the max active hours range users can set. This option gives you additional flexibility to leave some of the decision for active hours on the user's side, while making sure you allow enough time for updating. The max range is calculated from active hours start time.
+You can specify the maximum active hours range that users can set. This option gives you flexibility to leave some of the decision for active hours on the user's side, while making sure you allow enough time for updates to install. The maximum range is calculated from the active hours start time.
 
-To configure active hours max range through Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and open the **Specify active hours range for auto-restarts**.
+To configure the maximum range for active hours through group policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and open the setting to **Specify active hours range for auto-restarts**.
 
-To configure active hours max range through MDM, use [**Update/ActiveHoursMaxRange**](/windows/client-management/mdm/policy-configuration-service-provider#update-activehoursmaxrange).
+To configure the maximum range for active hours through MDM, use [ActiveHoursMaxRange](/windows/client-management/mdm/policy-csp-update#activehoursmaxrange).
 
 ## Limit restart delays
 
-After an update is installed, Windows attempts automatic restart outside of active hours. If the restart doesn't succeed after seven days (by default), the user will see a notification that restart is required. You can use the **Specify deadline before auto-restart for update installation** policy to change the delay from seven days to any number of days between 2 and 14.
+After Windows installs an update, it attempts to automatically restart outside of active hours. If the restart doesn't succeed after a default period of seven days, the user sees a notification that a restart is required. To change the delay, use the setting to **Specify deadline before auto-restart for update installation**. The minimum value is two days and the maximum value is two weeks (14 days).
 
 ## Control restart notifications
 
 ### Display options for update notifications
 
-Starting in Windows 10 version 1809, you can define which Windows Update notifications are displayed to the user. This policy doesn't control how and when updates are downloaded and installed. You can use **Computer Configuration > Administrative Templates > Windows Components > Windows Update > Display options for update notifications** with these values:
+You can define which Windows Update notifications are displayed to the user. This policy doesn't control how and when updates are downloaded and installed.
 
-**0** (default) - Use the default Windows Update notifications </br>
+To configure this behavior through group policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select the policy for **Display options for update notifications**. Configure the following values:
-**1** - Turn off all notifications, excluding restart warnings </br>
-**2** - Turn off all notifications, including restart warnings </br>
 
-To configure this behavior through MDM, use [**Update/UpdateNotificationLevel**](/windows/client-management/mdm/policy-configuration-service-provider#update-updatenotificationlevel).
+- `0` (default): Use the default Windows Update notifications.
+- `1`: Turn off most notifications but keep restart warnings.
+- `2`: Turn off all notifications including restart warnings.
 
-Starting in Windows 11, version 22H2, **Apply only during active hours** was added as an additional option for **Display options for update notifications**. When **Apply only during active hours** is selected, the notifications will only be disabled during active hours when options `1` or `2` are used. To ensure that the device stays updated, a notification will still be shown during active hours if **Apply only during active hours** is selected, and once a deadline has been reached when [Specify deadlines for automatic updates and restarts](wufb-compliancedeadlines.md) is configured. <!--6286260-->
+To configure this behavior through MDM, use [UpdateNotificationLevel](/windows/client-management/mdm/policy-csp-update#updatenotificationlevel).
 
-To configure this behavior through MDM, use [**Update/UpdateNotificationLevel**](/windows/client-management/mdm/policy-csp-update#update-NoUpdateNotificationDuringActiveHours).
+Starting in Windows 11, version 22H2, **Apply only during active hours** was added as another option for **Display options for update notifications**. When you select **Apply only during active hours**, the notifications are only disabled during active hours when you use options `1` or `2`. To ensure that the device stays updated, a notification is still shown during active hours if you select **Apply only during active hours**, and once a deadline is reached when you configure [Specify deadlines for automatic updates and restarts](wufb-compliancedeadlines.md). <!--6286260-->
 
-### Auto restart notifications
+To configure this behavior through MDM, use [UpdateNotificationLevel](/windows/client-management/mdm/policy-csp-update#updatenotificationlevel).
 
-Administrators can override the default behavior for the auto restart required notification. By default, this notification dismisses automatically. This setting was added in Windows 10, version 1703.
+### Automatic restart notifications
 
-To configure this behavior through Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select **Configure auto-restart required notification for updates**. When configured to **2 - User Action**, a user that gets this notification must manually dismiss it.
+You can override the default behavior for the automatic restart required notification. By default, this notification dismisses automatically.
 
-To configure this behavior through MDM, use [**Update/AutoRestartRequiredNotificationDismissal**](/windows/client-management/mdm/policy-configuration-service-provider#update-AutoRestartRequiredNotificationDismissal)
+- To configure this behavior through group policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select the policy to **Configure auto-restart required notification for updates**. When configured to **2 - User Action**, a user that gets this notification must manually dismiss it.
 
-You can also configure the period prior to an update that this notification shows up. The default value is 15 minutes.
+- To configure this behavior through MDM, use [AutoRestartRequiredNotificationDismissal](/windows/client-management/mdm/policy-csp-update#autorestartrequirednotificationdismissal).
 
-To change it through Group Policy, select **Configure auto-restart-reminder notifications for updates** under **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select the period in minutes.
+You can also configure the period before an update that this notification shows up. The default value is 15 minutes.
 
-To change it through MDM, use [**Update/AutoRestartNotificationSchedule**](/windows/client-management/mdm/policy-configuration-service-provider#update-AutoRestartNotificationSchedule).
+- To change it through group policy, select **Configure auto-restart-reminder notifications for updates** under **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select the period in minutes.
 
+- To change it through MDM, use [AutoRestartNotificationSchedule](/windows/client-management/mdm/policy-csp-update#autorestartnotificationschedule).
 
 In some cases, you don't need a notification to show up.
 
-To do so through Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select **Turn off auto-restart notifications for update installations**.
+- To do so through group policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and select the setting to **Turn off auto-restart notifications for update installations**.
 
-To do so through MDM, use [**Update/SetAutoRestartNotificationDisable**](/windows/client-management/mdm/policy-configuration-service-provider#update-setautorestartnotificationdisable).
+- To do so through MDM, use [SetAutoRestartNotificationDisable](/windows/client-management/mdm/policy-csp-update#setautorestartnotificationdisable).
 
-### Scheduled auto restart warnings
+### Scheduled automatic restart warnings
 
-Since users aren't able to postpone a scheduled restart once the deadline has been reached, you can configure a warning reminder prior to the scheduled restart. You can also configure a warning prior to the restart, to notify users once the restart is imminent and allow them to save their work.
+Since users aren't able to postpone a scheduled restart once the deadline is reached, you can configure a warning reminder before the scheduled restart. You can also configure a warning before the restart, to notify users once the restart is imminent and allow them to save their work.
 
-To configure both through Group Policy, find **Configure auto-restart warning notifications schedule for updates** under **Computer Configuration\Administrative Templates\Windows Components\Windows Update**. The warning reminder can be configured by **Reminder (hours)** and the warning prior to an imminent auto restart can be configured by **Warning (mins)**.
+To configure both through group policy, find the setting to **Configure auto-restart warning notifications schedule for updates** under **Computer Configuration\Administrative Templates\Windows Components\Windows Update**. The warning reminder can be configured by **Reminder (hours)** and the warning before an imminent automatic restart can be configured by **Warning (mins)**.
 
-In MDM, the warning reminder is configured using [**Update/ScheduleRestartWarning**](/windows/client-management/mdm/policy-configuration-service-provider#update-ScheduleRestartWarning) and the auto restart imminent warning is configured using [**Update/ScheduleImminentRestartWarning**](/windows/client-management/mdm/policy-configuration-service-provider#update-ScheduleImminentRestartWarning).
+In MDM, to configure the warning reminder, use [ScheduleRestartWarning](/windows/client-management/mdm/policy-csp-update#schedulerestartwarning). To configure the automatic restart imminent warning, use [ScheduleImminentRestartWarning](/windows/client-management/mdm/policy-csp-update#scheduleimminentrestartwarning).
 
 ### Engaged restart
 
-Engaged restart is the period of time when users are required to schedule a restart. Initially, Windows auto-restarts outside of working hours. Once the set period ends (seven days by default), Windows transitions to user scheduled restarts.
+Engaged restart is the period of time when users are required to schedule a restart. Initially, Windows auto-restarts outside of working hours. Once the default seven day period ends, Windows transitions to user scheduled restarts.
 
-The following settings can be adjusted for engaged restart:
+You can adjust the following settings for engaged restart:
-* Period of time before auto restart transitions to engaged restart.
-* The number of days that users can snooze engaged restart reminder notifications.
-* The number of days before a pending restart automatically executes outside of working hours.
 
-In Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and pick **Specify Engaged restart transition and notification schedule for updates**.
+- Period of time before automatic restart transitions to engaged restart.
 
-In MDM, use [**Update/EngagedRestartTransitionSchedule**](/windows/client-management/mdm/policy-configuration-service-provider#update-EngagedRestartTransitionSchedule), [**Update/EngagedRestartSnoozeSchedule**](/windows/client-management/mdm/policy-configuration-service-provider#update-EngagedRestartSnoozeSchedule) and [**Update/EngagedRestartDeadline**](/windows/client-management/mdm/policy-configuration-service-provider#update-EngagedRestartDeadline) respectively.
+- The number of days that users can snooze engaged restart reminder notifications.
 
-## Group Policy settings for restart
+- The number of days before a pending restart automatically executes outside of working hours.
 
-In the Group Policy editor, you'll see policy settings that pertain to restart behavior in **Computer Configuration\Administrative Templates\Windows Components\Windows Update**. The following table shows which policies apply to Windows 10.
+In group policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update** and use the setting to **Specify engaged restart transition and notification schedule for updates**.
+
+In MDM, use the following policies:
+
+- [EngagedRestartTransitionSchedule](/windows/client-management/mdm/policy-csp-update#engagedrestarttransitionschedule)
+- [EngagedRestartSnoozeSchedule](/windows/client-management/mdm/policy-csp-update#engagedrestartsnoozeschedule)
+- [EngagedRestartDeadline](/windows/client-management/mdm/policy-csp-update#engagedrestartdeadline)
+
+## Group policy settings for restart
+
+In the group policy editor, the policy settings for restart behavior are in **Computer Configuration\Administrative Templates\Windows Components\Windows Update**. The following table shows which policies apply to Windows 10.
 
 | Policy | Applies to Windows 10 | Notes |
 | --- | --- | --- |
-| Turn off auto-restart for updates during active hours | Yes | Use this policy to configure active hours, during which the device won't be restarted. This policy has no effect if the **No auto-restart with logged on users for scheduled automatic updates installations** or **Always automatically restart at the scheduled time** policies are enabled.  |
+| Turn off auto-restart for updates during active hours | Yes | Use this policy to configure active hours, during which the device won't restart. This policy has no effect if the **No auto-restart with logged on users for scheduled automatic updates installations** or **Always automatically restart at the scheduled time** policies are enabled.  |
 | Always automatically restart at the scheduled time | Yes | Use this policy to configure a restart timer (between 15 and 180 minutes) that will start immediately after Windows Update installs important updates. This policy has no effect if the **No auto-restart with logged on users for scheduled automatic updates installations** policy is enabled. |
 | Specify deadline before auto-restart for update installation | Yes | Use this policy to specify how many days (between 2 and 14) an automatic restart can be delayed. This policy has no effect if the **No auto-restart with logged on users for scheduled automatic updates installations** or **Always automatically restart at the scheduled time** policies are enabled.  |
-| No auto-restart with logged on users for scheduled automatic updates installations | Yes | Use this policy to prevent automatic restart when a user is logged on. This policy applies only when the **Configure Automatic Updates** policy is configured to perform scheduled installations of updates. |
+| No auto-restart with logged on users for scheduled automatic updates installations | Yes | Use this policy to prevent automatic restart when a user is logged on. This policy applies only when you configure the policy to **Configure Automatic Updates** to schedule the installation. |
 | Re-prompt for restart with scheduled installations | No |   |
 | Delay Restart for scheduled installations | No |   |
 | Reschedule Automatic Updates scheduled installations | No |   |
 
-
+> [!NOTE]
->[!NOTE]
+>
->You can only choose one path for restart behavior.
+> - You can only choose one path for restart behavior.
->If you set conflicting restart policies, the actual restart behavior may not be what you expected.
+> - If you set conflicting restart policies, the actual restart behavior may not be what you expected.
->When using RDP, only active RDP sessions are considered as logged on users.
+> - When using RDP, only active RDP sessions are considered as signed-in users.
-
 
 ## Registry keys used to manage restart
-The following tables list registry values that correspond to the Group Policy settings for controlling restarts after updates in Windows 10.
 
-**HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate**
+The following tables list registry values that correspond to the group policy settings for controlling restarts after updates in Windows 10.
 
-| Registry key |	Key type | Value |
+### `HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate`
-| --- | --- | --- |
-| ActiveHoursEnd	| REG_DWORD | 0-23: set active hours to end at a specific hour </br> starts with 12 AM (0) and ends with 11 PM (23) |
-| ActiveHoursStart | REG_DWORD | 0-23: set active hours to start at a specific hour </br> starts with 12 AM (0) and ends with 11 PM (23) |
-| SetActiveHours | REG_DWORD | 0: disable automatic restart after updates outside of active hours</br>1: enable automatic restart after updates outside of active hours |
-
-**HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU**
 
 | Registry key | Key type | Value |
 | --- | --- | --- |
-| AlwaysAutoRebootAtScheduledTime | REG_DWORD | 0: disable automatic reboot after update installation at scheduled time</br>1: enable automatic reboot after update installation at a scheduled time |
+| `ActiveHoursEnd` | `REG_DWORD` | `0-23`: Set active hours to end at a specific hour. </br>It starts with 12 AM (`0`) and ends with 11 PM (`23`). |
-| AlwaysAutoRebootAtScheduledTimeMinutes | REG_DWORD | 15-180: set automatic reboot to occur after given minutes |
+| `ActiveHoursStart` | `REG_DWORD` | `0-23`: Set active hours to start at a specific hour. </br>It starts with 12 AM (`0`) and ends with 11 PM (`23`.) |
-| AUOptions | REG_DWORD | 2: notify for download and notify for installation of updates</br>3: automatically download and notify for installation of updates</br>4: Automatically download and schedule installation of updates</br>5: allow the local admin to configure these settings</br>**Note:** To configure restart behavior, set this value to **4** |
+| `SetActiveHours` | `REG_DWORD` | `0`: Disable automatic restart after updates outside of active hours. </br>`1`: Enable automatic restart after updates outside of active hours. |
-| NoAutoRebootWithLoggedOnUsers | REG_DWORD | 0: disable don't reboot if users are logged on</br>1: don't reboot after an update installation if a user is logged on</br>**Note:** If disabled: Automatic Updates will notify the user that the computer will automatically restart in 5 minutes to complete the installation  |
+
-| ScheduledInstallTime | REG_DWORD | 0-23: schedule update installation time to a specific hour </br> starts with 12 AM (0) and ends with 11 PM (23) |
+### `HKLM\Software\Policies\Microsoft\Windows\WindowsUpdate\AU`
+
+| Registry key | Key type | Value |
+| --- | --- | --- |
+| `AlwaysAutoRebootAtScheduledTime` | `REG_DWORD` | `0`: Disable automatic restart after update installation at the scheduled time. </br>`1`: Enable automatic restart after update installation at a scheduled time. |
+| `AlwaysAutoRebootAtScheduledTimeMinutes` | `REG_DWORD` | `15-180`: Set automatic restart to occur after the specified number of minutes. |
+| `AUOptions` | `REG_DWORD` | `2`: Notify for download and notify for installation of updates. </br>`3`: Automatically download and notify for installation of updates. </br>`4`: Automatically download and schedule installation of updates. </br>`5`: Allow the local administrator to configure these settings. </br>**Note:** To configure restart behavior, set this value to `4`. |
+| `NoAutoRebootWithLoggedOnUsers` | `REG_DWORD` | `0`: If users are signed in, automatically restart ("disable don't reboot"). </br>`1`: If a user is signed in, don't restart after an update installation. </br>**Note:** If disabled (`0`), Automatic Updates notifies the user that the computer is scheduled to automatically restart in five minutes to complete the installation. |
+| `ScheduledInstallTime` | `REG_DWORD` | `0-23`: Schedule update installation time to a specific hour. </br>It starts with 12 AM (`0`) and ends with 11 PM (`23`). |
 
 There are three different registry combinations for controlling restart behavior:
 
-- To set active hours, **SetActiveHours** should be **1**, while **ActiveHoursStart** and **ActiveHoursEnd** should define the time range.
+- To set active hours:
-- To schedule a specific installation and reboot time, **AUOptions** should be **4**, **ScheduledInstallTime** should specify the installation time, and **AlwaysAutoRebootAtScheduledTime** set to **1** and **AlwaysAutoRebootAtScheduledTimeMinutes** should specify number of minutes to wait before rebooting.
+  - `SetActiveHours` should be `1`.
-- To delay rebooting if a user is logged on, **AUOptions** should be **4**, while **NoAutoRebootWithLoggedOnUsers** is set to **1**.
+  - Then to define the time range, use `ActiveHoursStart` and `ActiveHoursEnd`.
+
+- To schedule a specific installation and restart time:
+  - `AUOptions` should be `4`.
+  - `ScheduledInstallTime` should specify the installation time.
+  - Set `AlwaysAutoRebootAtScheduledTime` to `1`.
+  - `AlwaysAutoRebootAtScheduledTimeMinutes` should specify the number of minutes to wait before restarting.
+
+- To delay restarting if a user is signed in:
+  - `AUOptions` should be `4`.
+  - Set `NoAutoRebootWithLoggedOnUsers` to `1`.
 
 ## More resources
 
 - [Overview of Windows as a service](waas-overview.md)
 - [Configure Delivery Optimization for Windows updates](../do/waas-delivery-optimization.md)
-- [Configure BranchCache for Windows updates](waas-branchcache.md)
 - [Configure Windows Update for Business](waas-configure-wufb.md)
-- [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
+- [Walkthrough: use group policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
+- [Manage Windows software updates in Microsoft Intune](/mem/intune/protect/windows-update-for-business-configure)
-- [Manage Windows 10 and Windows 11 software updates in Intune](/mem/intune/protect/windows-update-for-business-configure)

windows/deployment/update/wufb-compliancedeadlines.md

@@ -37,7 +37,7 @@ With a current version, it's best to use the new policy introduced in June 2019
 
 | Policy | Location | Quality updates deadline in days | Quality updates grace period in days | Feature updates deadline in days | Feature updates grace period in days |
 |-|-|-|-|-|-|
-| Specify deadlines for automatic updates and restarts | GPO: Computer Configuration > Administrative Templates > Windows Components > Windows Update > Specify deadlines for automatic updates and restarts | 7 | 2 | 2 | 7 |
+| Specify deadlines for automatic updates and restarts | GPO: Computer Configuration > Administrative Templates > Windows Components > Windows Update > Specify deadlines for automatic updates and restarts | 2 | 3 | 2 | 3 |
 
 When **Specify deadlines for automatic updates and restarts** is set:
 
@@ -60,7 +60,7 @@ The grace period for both quality and feature updates starts its countdown from
 
 |Policy|Location|Quality update deadline in days|Feature update deadline in days|Grace period in days|
 |-|-|-|-|-|
-|(Windows 10, version 1709 and later) Specify deadlines for automatic updates and restarts | GPO: Computer Configuration > Administrative Templates > Windows Components > Windows Update > Specify deadlines for automatic updates and restarts  | 2 | 7 | 2 |
+|(Windows 10, version 1709 and later) Specify deadlines for automatic updates and restarts | GPO: Computer Configuration > Administrative Templates > Windows Components > Windows Update > Specify deadlines for automatic updates and restarts  | 2 | 2 | 3 |
 
 When **Specify deadlines for automatic updates and restarts** is set (Windows 10, version 1709 and later):
 

windows/deployment/update/wufb-reports-do.md

@@ -42,12 +42,12 @@ Windows Update for Business reports uses the following Delivery Optimization ter
   - HTTP Only (0)
   - Simple Mode (99)
   - Bypass (100), deprecated in Windows 11
-- **Bandwidth savings**: The percentage of bandwidth that was downloaded from alternate sources (Peers or Microsoft Connected Cache (MCC) out of the total amount of data downloaded.
+- **Bandwidth savings**: The percentage of bandwidth that was downloaded from alternate sources (Peers or Microsoft Connected Cache) out of the total amount of data downloaded.
 - If bandwidth savings are <= 60%, a *Warning* icon is displayed
 - When bandwidth savings are <10%, an *Error* icon is displayed.
 - **Configurations**: Based on the DownloadMode configuration set via MDM, Group Policy, or end-user via the user interface.
 - **P2P Device Count**: The device count is the number of devices configured to use peering.
-- **Microsoft Connected Cache (MCC)**: Microsoft Connected Cache is a software-only caching solution that delivers Microsoft content. For more information, see [Microsoft Connected Cache overview](../do/waas-microsoft-connected-cache.md).
+- **Microsoft Connected Cache**: Microsoft Connected Cache is a software-only caching solution that delivers Microsoft content. For more information, see [Microsoft Connected Cache overview](../do/waas-microsoft-connected-cache.md).
 - **MCC Device Count**: The device count is the number of devices that have received bytes from the cache server, for supported content types.
 - **Total # of Devices**: The total number of devices with activity in last 28 days.
 - **LAN Bytes**: Bytes delivered from LAN peers.
@@ -68,7 +68,7 @@ The calculated values used in the Delivery Optimization report are listed below.
   - [UCDOAggregatedStatus](wufb-reports-schema-ucdostatus.md) table
 - % P2P Efficiency = 100 * (BytesFromPeers + BytesFromGroupPeers) / (BytesFromPeers + BytesFromGroupPeers+BytesFromCDN+BytesFromCache)
   - [UCDOStatus](wufb-reports-schema-ucdostatus.md) table
-- % MCC Efficiency = 100 * BytesFromCache / (BytesFromPeers + BytesFromGroupPeers+BytesFromCDN+BytesFromCache)
+- % Connected Cache Efficiency = 100 * BytesFromCache / (BytesFromPeers + BytesFromGroupPeers+BytesFromCDN+BytesFromCache)
   - [UCDOStatus](wufb-reports-schema-ucdostatus.md) table
 
 **Bytes Calculations**:
@@ -88,7 +88,7 @@ The calculated values used in the Delivery Optimization report are listed below.
 
 - Volume by P2P = BytesFromPeers + BytesFromGroupPeers
   - [UCDOStatus](wufb-reports-schema-ucdostatus.md) table
-- Volume by MCC = BytesFromCache
+- Volume by Connected Cache = BytesFromCache
   - [UCDOStatus](wufb-reports-schema-ucdostatus.md) table
 - Volume by CDN = BytesFrom CDN
   - [UCDOStatus](wufb-reports-schema-ucdostatus.md) table
@@ -150,7 +150,7 @@ DeviceCount = count_distinct(GlobalDeviceId) by GroupID | top 10 by DeviceCount
 
 ### Delivery Optimization Supported Content Types
 
-There are many Microsoft [content types](waas-delivery-optimization.md#types-of-download-content-supported-by-delivery-optimization) that are supported by Delivery Optimization. All of these content types show up in the 'Content Distribution' section in the Delivery Optimization report. See the [complete table](waas-delivery-optimization.md#windows-client) for P2P/MCC support types.
+There are many Microsoft [content types](waas-delivery-optimization.md#types-of-download-content-supported-by-delivery-optimization) that are supported by Delivery Optimization. All of these content types show up in the 'Content Distribution' section in the Delivery Optimization report. See the [complete table](waas-delivery-optimization.md#windows-client) for P2P/Connected Cache support types.
 
 | Content Category | Content Types Included |
 | --- | --- |