diff --git a/education/windows/configure-aad-google-trust.md b/education/windows/configure-aad-google-trust.md
index 00367e56dc..54bf350d77 100644
--- a/education/windows/configure-aad-google-trust.md
+++ b/education/windows/configure-aad-google-trust.md
@@ -18,7 +18,7 @@ To configure Google Workspace as an IdP for Microsoft Entra ID, the following pr
1. A Microsoft Entra tenant, with one or multiple custom DNS domains (that is, domains that aren't in the format \**.onmicrosoft.com*)
- If the federated domain hasn't yet been added to Microsoft Entra ID, you must have access to the DNS domain to create a DNS record. This is required to verify the ownership of the DNS namespace
- Learn how to [Add your custom domain name using the Microsoft Entra admin center](/azure/active-directory/fundamentals/add-custom-domain)
-1. Access to Microsoft Entra ID with an account with the *Global Administrator* role
+1. Access to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least a [External Identity Provider Administrator](/entra/identity/role-based-access-control/permissions-reference#external-identity-provider-administrator)
1. Access to Google Workspace with an account with *super admin* privileges
To test federation, the following prerequisites must be met:
@@ -56,7 +56,7 @@ To test federation, the following prerequisites must be met:
|Basic Information: Primary Email|App attributes: IDPEmail|
> [!IMPORTANT]
- > You must ensure that your the Microsoft Entra user accounts email match those in your Google Workspace.
+ > You must ensure that your Microsoft Entra user account's email matches that in your Google Workspace.
1. Select **Finish**
@@ -73,7 +73,7 @@ Now that the app is configured, you must enable it for the users in Google Works
## Configure Microsoft Entra ID as a Service Provider (SP) for Google Workspace
The configuration of Microsoft Entra ID consists of changing the authentication method for the custom DNS domains. This configuration can be done using PowerShell.\
-Using the **IdP metadata** XML file downloaded from Google Workspace, modify the *$DomainName* variable of the following script to match your environment, and then run it in a PowerShell session. When prompted to authenticate to Microsoft Entra ID, use the credentials of an account with the *Global Administrator* role.
+Using the **IdP metadata** XML file downloaded from Google Workspace, modify the *$DomainName* variable of the following script to match your environment, and then run it in a PowerShell session. When prompted to authenticate to Microsoft Entra ID, sign in as at least a [External Identity Provider Administrator](/entra/identity/role-based-access-control/permissions-reference#external-identity-provider-administrator)
```powershell
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Force
diff --git a/education/windows/federated-sign-in.md b/education/windows/federated-sign-in.md
index 9c6425ae8e..aca908bb45 100644
--- a/education/windows/federated-sign-in.md
+++ b/education/windows/federated-sign-in.md
@@ -1,7 +1,7 @@
---
title: Configure federated sign-in for Windows devices
description: Learn how federated sign-in in Windows works and how to configure it.
-ms.date: 04/10/2024
+ms.date: 06/03/2024
ms.topic: how-to
appliesto:
- ✅ Windows 11
@@ -87,7 +87,7 @@ Review the following instructions to configure your devices using either Microso
|--|--|--|
| Education | Is Education Environment | Enabled |
| Federated Authentication | Enable Web Sign In For Primary User | Enabled |
-| Authentication | Configure Web Sign In Allowed Urls | Semicolon separated list of domains, for example: `samlidp.clever.com;clever.com;mobile-redirector.clever.com` |
+| Authentication | Configure Web Sign In Allowed Urls | Enter the list of domains, with each URL in a separate row. For example:
- `samlidp.clever.com`
- `clever.com`
- `mobile-redirector.clever.com` |
| Authentication | Configure Webcam Access Domain Names | This setting is optional, and it should be configured if you need to use the webcam during the sign-in process. Specify the list of domains that are allowed to use the webcam during the sign-in process, separated by a semicolon. For example: `clever.com` |
[!INCLUDE [intune-settings-catalog-2](../../includes/configure/intune-settings-catalog-2.md)]
@@ -134,7 +134,7 @@ Review the following instructions to configure your shared devices using either
| Education | Is Education Environment | Enabled |
| SharedPC | Enable Shared PC Mode With OneDrive Sync | True |
| Authentication | Enable Web Sign In | Enabled |
-| Authentication | Configure Web Sign In Allowed Urls | Semicolon separated list of domains, for example: `samlidp.clever.com;clever.com;mobile-redirector.clever.com` |
+| Authentication | Configure Web Sign In Allowed Urls | Enter the list of domains, with each URL in a separate row. For example:
- `samlidp.clever.com`
- `clever.com`
- `mobile-redirector.clever.com` |
| Authentication | Configure Webcam Access Domain Names | This setting is optional, and it should be configured if you need to use the webcam during the sign-in process. Specify the list of domains that are allowed to use the webcam during the sign-in process, separated by a semicolon. For example: `clever.com` |
[!INCLUDE [intune-settings-catalog-2](../../includes/configure/intune-settings-catalog-2.md)]
diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md
index d6b1fa3e62..b7d2153dce 100644
--- a/education/windows/use-set-up-school-pcs-app.md
+++ b/education/windows/use-set-up-school-pcs-app.md
@@ -7,7 +7,7 @@ appliesto:
- ✅ Windows 10
---
-# Use the Set up School PCs app
+# Use the Set up School PCs app
IT administrators and technical teachers can use the **Set up School PCs** app to quickly set up Windows devices for students. The app configures devices with the apps and features students need, and it removes the ones they don't need. During setup, if licensed in your tenant, the app enrolls each student device in Microsoft Intune. You can then manage all the settings the app configures through Intune.
@@ -16,20 +16,20 @@ With Set up School PCs you can:
- Joins student devices to your organization's Microsoft Entra tenant
- Enable the optional Autopilot Reset feature, to return devices to a fully configured or known IT-approved state
- Use Windows Update and maintenance hours to keep student devices up-to-date, without interfering with class time
-- Lock down student devices to prevent activity that aren't beneficial to their education
+- Lock down student devices to prevent activity that aren't beneficial to their education
-This article describes how to use the Set up School PCs app. To learn more about the app's functionality, review the [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md).
+This article describes how to use the Set up School PCs app. To learn more about the app's functionality, review the [Technical reference for the Set up School PCs app](set-up-school-pcs-technical.md).
## Requirements
Before you begin, make sure that your devices and your school's network are configured with the following requirements:
- Microsoft Entra ID and Microsoft 365 licenses
-- [Latest Set up School PCs app](https://apps.microsoft.com/detail/9NBLGGH4LS40)
+- [Latest Set up School PCs app](https://apps.microsoft.com/detail/9NBLGGH4LS40)
- A NTFS-formatted USB drive that is at least 1 GB
- Student devices must either:
- Be within range of the Wi-Fi network that you configured in the app
- - Have a wired Ethernet connection when you set them up
+ - Have a wired Ethernet connection when you set them up
### Prepare existing PC account for new setup
@@ -46,7 +46,7 @@ Alternatively, you can also select **Start** > **Power** icon. Hold down Sh
1. Select **Troubleshoot** > **Reset this PC**
1. Select **Remove everything**
-1. If the option appears, select **Only the drive where Windows is installed**
+1. If the option appears, select **Only the drive where Windows is installed**
1. Select **Just remove my files**
1. Select **Reset**
@@ -58,20 +58,20 @@ This section offers recommendations to prepare you for the best possible setup e
We recommend you run the IT administrator or technical teacher's device on the same Windows build as the student devices.
-### Student devices must meet OS requirements for the app
+### Student devices must meet OS requirements for the app
-Check the OS requirements in the Set up School PCs app. We recommend using the latest Set up School PCs app along with the latest Windows images on the student devices.
+Check the OS requirements in the Set up School PCs app. We recommend using the latest Set up School PCs app along with the latest Windows images on the student devices.
To check the app's OS requirements, go to the Microsoft Store and locate the Set up School PCs app. In the app's description, go to **System Requirements** > **OS**.
-### Use app on a PC that is connected to your school's network
+### Use app on a PC that is connected to your school's network
We recommend that you run the Set up School PCs app on a computer that's connected to your school's network. That way the app can gather accurate information about your school's wireless networks and cloud subscriptions. If it's not connected, you need to enter the information manually.
->[!NOTE]
+>[!NOTE]
>Don't use the **Set up Schools PCs** app for devices that must connect to enterprise or open Wi-Fi networds that require the user to accept Terms of Use.
-### Run app on an open network or network that requires a basic password
+### Run app on an open network or network that requires a basic password
Don't use Set up School PCs over a certificate-based network, or one where you have to enter credentials in a browser. If you need to set up many devices over Wi-Fi, make sure that your network configuration can support it.
@@ -87,57 +87,57 @@ We recommend that you:
To set up more than one PC at the same time, save the provisioning package to additional USB drives. Then plug the USBs in at the same time during setup.
-### Limit changes to school-optimized settings
+### Limit changes to school-optimized settings
-We strongly recommend that you avoid changing preset policies. Changes can slow down setup, performance, and the time it takes to sign in.
+We strongly recommend that you avoid changing preset policies. Changes can slow down setup, performance, and the time it takes to sign in.
-## Create the provisioning package
+## Create the provisioning package
The **Set up School PCs** app guides you through the configuration choices for the student PCs. To begin, open the app on your device and select **Get started**.
-
+
### Package name
-Type a unique name to help distinguish your school's provisioning packages. The name appears:
+Type a unique name to help distinguish your school's provisioning packages. The name appears:
- On the local package folder
- In your tenant's Microsoft Entra account in the Azure portal
-A package expiration date is also attached to the end of each package. For example, *Set_Up_School_PCs (Expires 1-1-2024)*. The expiration date is 180 days after you create your package.
+A package expiration date is also attached to the end of each package. For example, *Set_Up_School_PCs (Expires 1-1-2024)*. The expiration date is 180 days after you create your package.
- 
+ 
-After you select **Next**, you can no longer change the name in the app. To create a package with a different name, reopen the Set up School PCs app.
+After you select **Next**, you can no longer change the name in the app. To create a package with a different name, reopen the Set up School PCs app.
-To change an existing package's name, right-click the package folder on your device and select **Rename**. This action doesn't change the name in Microsoft Entra ID. If you have Global Admin permissions, you can go to Microsoft Entra ID in the Azure portal, and rename the package there.
+To change an existing package's name, right-click the package folder on your device and select **Rename**. This action doesn't change the name in Microsoft Entra ID. You can access to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least a [User Administrator](/entra/identity/role-based-access-control/permissions-reference#user-administrator), and rename the package there.
-### Sign in
+### Sign in
1. Select how you want to sign in
- 1. (Recommended) To enable student device to automatically connect and authenticate to Microsoft Entra ID, and management services like Microsoft Intune, select **Sign-in**. Then go to step 3
+ 1. (Recommended) To enable student device to automatically connect and authenticate to Microsoft Entra ID, and management services like Microsoft Intune, select **Sign-in**. Then go to step 3
1. To complete setup without signing in, select **Continue without account**. Student devices won't connect to your school's cloud services and their management will be more difficult later. Continue to [Wireless network](#wireless-network)
-1. In the new window, select the account you want to use throughout setup.
+1. In the new window, select the account you want to use throughout setup.
- 
+ 
- To add an account not listed:
- 1. Select **Work or school account** > **Continue**.
- 1. Type in the account username and select **Next**.
- 1. Verify the user account and password, if prompted.
+ To add an account not listed:
+ 1. Select **Work or school account** > **Continue**.
+ 1. Type in the account username and select **Next**.
+ 1. Verify the user account and password, if prompted.
1. Select **Accept** to allow Set up School PCs to access your account throughout setup
1. When your account name appears on the page, select **Next**
- 
+ 
### Wireless network
-Add and save the wireless network profile that you want student devices to connect to. Only skip Wi-Fi setup if you have an Ethernet connection.
+Add and save the wireless network profile that you want student devices to connect to. Only skip Wi-Fi setup if you have an Ethernet connection.
-Select your organization's Wi-Fi network from the list of available wireless networks, or select **Add a wireless network** to manually configure it. Then select **Next**
+Select your organization's Wi-Fi network from the list of available wireless networks, or select **Add a wireless network** to manually configure it. Then select **Next**
- 
+ 
### Device names
@@ -147,17 +147,17 @@ To make sure all device names are unique, Set up School PCs automatically append
To keep the default name for your devices, select **Continue with existing names**.
- 
+ 
### Settings
Select more settings to include in the provisioning package. To begin, select the operating system on your student PCs.
-
+
Setting selections vary based on the OS version you select.
-
+
The following table describes each setting and lists the applicable Windows 10 versions. To find out if a setting is available in your version of Windows 10, look for an *X* in the setting row and in the version column.
@@ -172,20 +172,20 @@ The following table describes each setting and lists the applicable Windows 10 v
After you've made your selections, select **Next**.
-### Time zone
+### Time zone
> [!WARNING]
> If you are using the Autounattend.xml file to reimage your school PCs, do not specify a time zone in the file. If you set the time zone in the file *and* in this app, you will encounter an error.
-Choose the time zone where your school's devices are used. This setting ensures that all PCs are provisioned in the same time zone. When you're done, select **Next**.
+Choose the time zone where your school's devices are used. This setting ensures that all PCs are provisioned in the same time zone. When you're done, select **Next**.
-
+
### Product key
Optionally, type in a 25-digit product key to upgrade or change the edition of Windows on your student devices. If you don't have a product key, select **Continue without change**.
-
+
### Take a Test
@@ -195,7 +195,7 @@ Set up the Take a Test app to give online quizzes and high-stakes assessments. D
-1. Select from the advanced settings. Available settings include:
+1. Select from the advanced settings. Available settings include:
- Allow keyboard auto-suggestions: Allows app to suggest words as the student types on the device's keyboard
- Allow teachers to monitor online tests: Enables screen capture in the Take a Test app
1. Enter the URL where the test is hosted. When students log in to the Take a Test account, they'll be able to select or enter the link to view the assessment
@@ -203,11 +203,11 @@ Set up the Take a Test app to give online quizzes and high-stakes assessments. D
### Personalization
-Upload custom images to replace the student devices' default desktop and lock screen backgrounds. Select **Browse** to search for an image file on your computer. Accepted image formats are jpg, jpeg, and png.
+Upload custom images to replace the student devices' default desktop and lock screen backgrounds. Select **Browse** to search for an image file on your computer. Accepted image formats are jpg, jpeg, and png.
-If you don't want to upload custom images or use the images that appear in the app, select **Continue without personalization**. This option doesn't apply any customizations, and instead uses the devices' default or preset images.
+If you don't want to upload custom images or use the images that appear in the app, select **Continue without personalization**. This option doesn't apply any customizations, and instead uses the devices' default or preset images.
-
+
### Summary
@@ -216,7 +216,7 @@ Review all of the settings for accuracy and completeness
1. To make changes now, select any page along the left side of the window
2. When finished, select **Accept**
-
+
> [!NOTE]
> To make changes to a saved package, you have to start over.
@@ -230,34 +230,34 @@ Review all of the settings for accuracy and completeness
1. When the package is ready, you see the filename and package expiration date. You can also select **Add a USB** to save the same provisioning package to another USB drive. When you're done, remove the USB drive and select **Next**
-
+
## Run package - Get PCs ready
Complete each step on the **Get PCs ready** page to prepare student devices for set-up. Then select **Next**.
-
+
## Run package - Install package on PC
The provisioning package on your USB drive is named SetupSchoolPCs_<*devicename*>(Expires <*expiration date*>.ppkg. A provisioning package applies settings to Windows without reimaging the device.
-When used in context of the Set up School PCs app, the word *package* refers to your provisioning package. The word *provisioning* refers to the act of installing the package on the student device. This section describes how to apply the settings to a device in your school.
+When used in context of the Set up School PCs app, the word *package* refers to your provisioning package. The word *provisioning* refers to the act of installing the package on the student device. This section describes how to apply the settings to a device in your school.
> [!IMPORTANT]
-> The devices must have a new or reset Windows image and must not already have been through first-run setup experience (which is referred to as *OOBE*). For instructions about how to reset a devices's image, see [Prepare existing PC account for new setup](use-set-up-school-pcs-app.md#prepare-existing-pc-account-for-new-setup).
+> The devices must have a new or reset Windows image and must not already have been through first-run setup experience (which is referred to as *OOBE*). For instructions about how to reset a devices's image, see [Prepare existing PC account for new setup](use-set-up-school-pcs-app.md#prepare-existing-pc-account-for-new-setup).
1. Start with the student device turned off or with the device on the first-run setup screen. If the device is past the account setup screen, reset the device to start over. To reset the it, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**
-
+
1. Insert the USB drive. Windows automatically recognizes and installs the package
1. When you receive the message that it's okay to remove the USB drive, remove it from the device. If there are more devices to set up, insert the USB drive into the next one
- 
+ 
1. If you didn't set up the package with Microsoft Entra join, continue the Windows device setup experience. If you did configure the package with Microsoft Entra join, the device is ready for use and no further configurations are required
diff --git a/store-for-business/prerequisites-microsoft-store-for-business.md b/store-for-business/prerequisites-microsoft-store-for-business.md
index 1d519c7d26..ac4b271b5d 100644
--- a/store-for-business/prerequisites-microsoft-store-for-business.md
+++ b/store-for-business/prerequisites-microsoft-store-for-business.md
@@ -65,11 +65,10 @@ If your organization restricts computers on your network from connecting to the
- `account.live.com`
- `clientconfig.passport.net`
- `windowsphone.com`
-- `\*.wns.windows.com`
-- `\*.microsoft.com`
-- `\*.s-microsoft.com`
+- `*.wns.windows.com`
+- `*.microsoft.com`
+- `*.s-microsoft.com`
- `www.msftncsi.com` (prior to Windows 10, version 1607)
-- `www.msftconnecttest.com/connecttest.txt` (replaces `www.msftncsi.com`
- starting with Windows 10, version 1607)
+- `www.msftconnecttest.com/connecttest.txt` (replaces `www.msftncsi.com` starting with Windows 10, version 1607)
Store for Business requires Microsoft Windows HTTP Services (WinHTTP) to install, or update apps.
diff --git a/windows/client-management/client-tools/quick-assist.md b/windows/client-management/client-tools/quick-assist.md
index 4e34b509fd..496dfd0024 100644
--- a/windows/client-management/client-tools/quick-assist.md
+++ b/windows/client-management/client-tools/quick-assist.md
@@ -105,23 +105,7 @@ For more information, visit [Install Quick Assist](https://support.microsoft.com
### Install Quick Assist with Intune
-Before installing Quick Assist, you need to set up synchronization between Intune and Microsoft Store for Business. If you've already set up sync, log into [Microsoft Store for Business](https://businessstore.microsoft.com) and skip to step 5.
-
-1. In the [Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431), go to **Tenant administration** / **Connectors and tokens** / **Microsoft Store for Business** and verify that **Microsoft Store for Business sync** is set to **Enable**.
-1. Using your Global Admin account, log into [Microsoft Store for Business](https://businessstore.microsoft.com).
-1. Select **Manage** / **Settings** and enable **Show offline apps**.
-1. Choose the **Distribute** tab and verify that **Microsoft Intune** is **Active**. You might need to use the **+Add management tool** link if it's not.
-1. Search for **Quick Assist** and select it from the Search results.
-1. Choose the **Offline** license and select **Get the app**
-1. In the Intune admin center, choose **Sync**.
-1. Navigate to **Apps** / **Windows** and you should see **Quick Assist (Offline)** in the list.
-1. Select it to view its properties.
-1. By default, the app isn't assigned to any user or device, select the **Edit** link. Assign the app to the required group of devices and choose **Review + save** to complete the application install.
-
-> [!NOTE]
-> Assigning the app to a device or group of devices instead of a user is important because it's the only way to install a store app in device context.
-
-Visit [Add Microsoft Store apps to Microsoft Intune](/mem/intune/apps/store-apps-windows) for more information.
+To deploy Quick Assist with Intune, see [Add Microsoft Store apps to Microsoft Intune](/mem/intune/apps/store-apps-microsoft).
### Install Quick Assist Offline
diff --git a/windows/client-management/wmi-providers-supported-in-windows.md b/windows/client-management/wmi-providers-supported-in-windows.md
index 81c71bd5ba..9afd80ebd2 100644
--- a/windows/client-management/wmi-providers-supported-in-windows.md
+++ b/windows/client-management/wmi-providers-supported-in-windows.md
@@ -76,7 +76,7 @@ For links to these classes, see [**MDM Bridge WMI Provider**](/windows/win32/dmw
| [**MDM_WirelesssProfileXML**](/previous-versions/windows/desktop/mdmsettingsprov/mdm-wirelessprofilexml) | Yes |
| [**MDM_WNSChannel**](/previous-versions/windows/desktop/mdmsettingsprov/mdm-wnschannel) | Yes |
| [**MDM_WNSConfiguration**](/previous-versions/windows/desktop/mdmsettingsprov/mdm-wnsconfiguration) | Yes |
-| [**MSFT_NetFirewallProfile**](/previous-versions/windows/desktop/wfascimprov/msft-netfirewallprofile) | Yes |
+| [**MSFT_NetFirewallProfile**](/windows/win32/fwp/wmi/wfascimprov/msft-netfirewallprofile) | Yes |
| [**MSFT_VpnConnection**](/previous-versions/windows/desktop/vpnclientpsprov/msft-vpnconnection) | Yes |
| [**SoftwareLicensingProduct**](/previous-versions/windows/desktop/sppwmi/softwarelicensingproduct) | |
| [**SoftwareLicensingService**](/previous-versions/windows/desktop/sppwmi/softwarelicensingservice) | |
diff --git a/windows/configuration/assigned-access/xsd.md b/windows/configuration/assigned-access/xsd.md
index 209c3fb81d..5cd75dccbe 100644
--- a/windows/configuration/assigned-access/xsd.md
+++ b/windows/configuration/assigned-access/xsd.md
@@ -259,7 +259,7 @@ Here's the Assigned Access XSD for the features added in Windows 11, version 21H
## Windows 10, version 1909 additions
-Here's the Assigned Access XSD for the features added in Windows 10, version 1909:
+Here are the Assigned Access XSDs for the features added in Windows 10, version 1909:
```xml
```
+```xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
## Windows 10, version 1809 additions
Here's the Assigned Access XSD for the features added in Windows 10, version 1809:
@@ -331,4 +358,4 @@ Here's the Assigned Access XSD for the features added in Windows 10, version 180
-```
\ No newline at end of file
+```
diff --git a/windows/configuration/start/layout.md b/windows/configuration/start/layout.md
index 8a771280ae..30baa389a1 100644
--- a/windows/configuration/start/layout.md
+++ b/windows/configuration/start/layout.md
@@ -649,45 +649,3 @@ When you configure the Start layout with policy settings, you overwrite the enti
[MEM-1]: /mem/intune/configuration/custom-settings-windows-10
[PS-1]: /powershell/module/startlayout/export-startlayout
[WIN-1]: /windows/client-management/mdm/policy-csp-start
-
-
-
diff --git a/windows/configuration/taskbar/includes/allow-widgets.md b/windows/configuration/taskbar/includes/allow-widgets.md
index 83a0bb12e7..7033aec825 100644
--- a/windows/configuration/taskbar/includes/allow-widgets.md
+++ b/windows/configuration/taskbar/includes/allow-widgets.md
@@ -15,4 +15,4 @@ This policy specifies whether the widgets feature is allowed on the device.
| | Path |
|--|--|
| **CSP** | `./Device/Vendor/MSFT/Policy/Config/NewsAndInterests/`[AllowNewsAndInterests](/windows/client-management/mdm/policy-csp-newsandinterests#allownewsandinterests) |
-| **GPO** | **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Widgets** |
+| **GPO** | - **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Widgets** |
diff --git a/windows/configuration/taskbar/includes/configure-start-layout.md b/windows/configuration/taskbar/includes/configure-start-layout.md
index 7edd14def2..ce75e3d6df 100644
--- a/windows/configuration/taskbar/includes/configure-start-layout.md
+++ b/windows/configuration/taskbar/includes/configure-start-layout.md
@@ -13,7 +13,7 @@ This policy setting lets you specify the applications pinned to the taskbar. The
| | Path |
|--|--|
-| **CSP** | - `./Device/Vendor/MSFT/Policy/Config/Start/StartLayout`/[Configure start layout](/windows/client-management/mdm/policy-csp-start#startlayout)
- `./User/Vendor/MSFT/Policy/Config/Start/StartLayout`/[Configure start layout](/windows/client-management/mdm/policy-csp-start#startlayout) |
-| **GPO** | **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
**User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **CSP** | - `./Device/Vendor/MSFT/Policy/Config/Start/StartLayout`/[Configure start layout](/windows/client-management/mdm/policy-csp-start#startlayout)
- `./User/Vendor/MSFT/Policy/Config/Start/StartLayout`/[Configure start layout](/windows/client-management/mdm/policy-csp-start#startlayout) |
+| **GPO** | - **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
For more information, see [Customize the taskbar pinned applications](../pinned-apps.md).
diff --git a/windows/configuration/taskbar/includes/configures-search-on-the-taskbar.md b/windows/configuration/taskbar/includes/configures-search-on-the-taskbar.md
index 3382db1ac7..5e009d1125 100644
--- a/windows/configuration/taskbar/includes/configures-search-on-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/configures-search-on-the-taskbar.md
@@ -18,4 +18,4 @@ This policy setting allows you to configure search on the taskbar.
| | Path |
|--|--|
| **CSP** | `./Device/Vendor/MSFT/Policy/Config/Search/`[ConfigureSearchOnTaskbarMode](/windows/client-management/mdm/policy-csp-search#configuresearchontaskbarmode) |
-| **GPO** | **Computer Configuration** > **Windows Components** > **Search** |
+| **GPO** | - **Computer Configuration** > **Windows Components** > **Search** |
diff --git a/windows/configuration/taskbar/includes/disable-editing-quick-settings.md b/windows/configuration/taskbar/includes/disable-editing-quick-settings.md
index d1f29ba96d..e57bff141e 100644
--- a/windows/configuration/taskbar/includes/disable-editing-quick-settings.md
+++ b/windows/configuration/taskbar/includes/disable-editing-quick-settings.md
@@ -13,4 +13,4 @@ ms.topic: include
| | Path |
|--|--|
| **CSP** | `./Device/Vendor/MSFT/Policy/Config/Start/`[DisableEditingQuickSettings](/windows/client-management/mdm/policy-csp-start#disableeditingquicksettings)|
-| **GPO** | **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Disable editing quick settings** |
+| **GPO** | - **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Disable editing quick settings** |
diff --git a/windows/configuration/taskbar/includes/do-not-allow-pinning-items-in-jump-lists.md b/windows/configuration/taskbar/includes/do-not-allow-pinning-items-in-jump-lists.md
index 22d26069ab..9813a70d10 100644
--- a/windows/configuration/taskbar/includes/do-not-allow-pinning-items-in-jump-lists.md
+++ b/windows/configuration/taskbar/includes/do-not-allow-pinning-items-in-jump-lists.md
@@ -15,4 +15,4 @@ With this policy setting you control the pinning of items in Jump Lists.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/do-not-allow-pinning-programs-to-the-taskbar.md b/windows/configuration/taskbar/includes/do-not-allow-pinning-programs-to-the-taskbar.md
index 70b4320f49..8017676f8c 100644
--- a/windows/configuration/taskbar/includes/do-not-allow-pinning-programs-to-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/do-not-allow-pinning-programs-to-the-taskbar.md
@@ -15,4 +15,4 @@ This policy setting allows you to control pinning programs to the Taskbar.
| | Path |
|--|--|
| **CSP** | `./Device/Vendor/MSFT/Policy/Config/Start/`[NoPinningToTaskbar](/windows/client-management/mdm/policy-csp-start#nopinningtotaskbar) |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/do-not-allow-pinning-store-app-to-the-taskbar.md b/windows/configuration/taskbar/includes/do-not-allow-pinning-store-app-to-the-taskbar.md
index a394034ed7..bdfd18c8cc 100644
--- a/windows/configuration/taskbar/includes/do-not-allow-pinning-store-app-to-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/do-not-allow-pinning-store-app-to-the-taskbar.md
@@ -15,4 +15,4 @@ This policy setting allows you to control pinning the Store app to the Taskbar.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/do-not-allow-taskbars-on-more-than-one-display.md b/windows/configuration/taskbar/includes/do-not-allow-taskbars-on-more-than-one-display.md
index 7766466c8c..4d42fdee7d 100644
--- a/windows/configuration/taskbar/includes/do-not-allow-taskbars-on-more-than-one-display.md
+++ b/windows/configuration/taskbar/includes/do-not-allow-taskbars-on-more-than-one-display.md
@@ -12,4 +12,4 @@ This policy setting allows you to prevent taskbars from being displayed on more
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/do-not-display-or-track-items-in-jump-lists-from-remote-locations.md b/windows/configuration/taskbar/includes/do-not-display-or-track-items-in-jump-lists-from-remote-locations.md
index fb0d96e2d0..a91be73b37 100644
--- a/windows/configuration/taskbar/includes/do-not-display-or-track-items-in-jump-lists-from-remote-locations.md
+++ b/windows/configuration/taskbar/includes/do-not-display-or-track-items-in-jump-lists-from-remote-locations.md
@@ -18,4 +18,4 @@ This policy setting allows you to control displaying or tracking items in Jump L
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/hide-recent-jumplists.md b/windows/configuration/taskbar/includes/hide-recent-jumplists.md
index 67c433344f..8e4ad2a207 100644
--- a/windows/configuration/taskbar/includes/hide-recent-jumplists.md
+++ b/windows/configuration/taskbar/includes/hide-recent-jumplists.md
@@ -19,5 +19,5 @@ Prevents the operating system and installed programs from creating and displayin
| | Path |
|--|--|
-| **CSP** | - `./Device/Vendor/MSFT/Policy/Config/Start/`[HideRecentJumplists](/windows/client-management/mdm/policy-csp-start#hiderecentjumplists)
- `./User/Vendor/MSFT/Policy/Config/Start/`[HideRecentJumplists](/windows/client-management/mdm/policy-csp-start#hiderecentjumplists) |
-| **GPO** | **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **don't keep history of recently opened documents**
**User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **don't keep history of recently opened documents**|
+| **CSP** | - `./Device/Vendor/MSFT/Policy/Config/Start/`[HideRecentJumplists](/windows/client-management/mdm/policy-csp-start#hiderecentjumplists)
- `./User/Vendor/MSFT/Policy/Config/Start/`[HideRecentJumplists](/windows/client-management/mdm/policy-csp-start#hiderecentjumplists) |
+| **GPO** | - **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **don't keep history of recently opened documents**
- **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **don't keep history of recently opened documents**|
diff --git a/windows/configuration/taskbar/includes/hide-the-notification-area.md b/windows/configuration/taskbar/includes/hide-the-notification-area.md
index 1313ae901b..f7f8b3f04d 100644
--- a/windows/configuration/taskbar/includes/hide-the-notification-area.md
+++ b/windows/configuration/taskbar/includes/hide-the-notification-area.md
@@ -12,4 +12,4 @@ This setting affects the notification area (previously called the "system tray")
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/hide-the-taskview-button.md b/windows/configuration/taskbar/includes/hide-the-taskview-button.md
index aa95d9a03f..567f130a95 100644
--- a/windows/configuration/taskbar/includes/hide-the-taskview-button.md
+++ b/windows/configuration/taskbar/includes/hide-the-taskview-button.md
@@ -11,5 +11,5 @@ This policy setting allows you to hide the TaskView button. If you enable this p
| | Path |
|--|--|
-| **CSP** |- `./Device/Vendor/MSFT/Policy/Config/Start/`[HideTaskViewButton](/windows/client-management/mdm/policy-csp-start#hidetaskviewbutton)
- `./User/Vendor/MSFT/Policy/Config/Start/`[HideTaskViewButton](/windows/client-management/mdm/policy-csp-start#hidetaskviewbutton) |
-| **GPO** |- **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **CSP** |- `./Device/Vendor/MSFT/Policy/Config/Start/`[HideTaskViewButton](/windows/client-management/mdm/policy-csp-start#hidetaskviewbutton)
- `./User/Vendor/MSFT/Policy/Config/Start/`[HideTaskViewButton](/windows/client-management/mdm/policy-csp-start#hidetaskviewbutton) |
+| **GPO** |- **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/lock-all-taskbar-settings.md b/windows/configuration/taskbar/includes/lock-all-taskbar-settings.md
index 59e7e89884..981e828059 100644
--- a/windows/configuration/taskbar/includes/lock-all-taskbar-settings.md
+++ b/windows/configuration/taskbar/includes/lock-all-taskbar-settings.md
@@ -15,4 +15,4 @@ With this policy setting you lock all taskbar settings.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/lock-the-taskbar.md b/windows/configuration/taskbar/includes/lock-the-taskbar.md
index 2f5694702d..93986d5626 100644
--- a/windows/configuration/taskbar/includes/lock-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/lock-the-taskbar.md
@@ -12,4 +12,4 @@ This setting affects the taskbar, which is used to switch between running applic
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/prevent-changes-to-taskbar-and-start-menu-settings.md b/windows/configuration/taskbar/includes/prevent-changes-to-taskbar-and-start-menu-settings.md
index a159c12d82..07b9780bb7 100644
--- a/windows/configuration/taskbar/includes/prevent-changes-to-taskbar-and-start-menu-settings.md
+++ b/windows/configuration/taskbar/includes/prevent-changes-to-taskbar-and-start-menu-settings.md
@@ -15,4 +15,4 @@ With this policy setting you prevent changes to taskbar and Start settings.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/prevent-grouping-of-taskbar-items.md b/windows/configuration/taskbar/includes/prevent-grouping-of-taskbar-items.md
index eb97a11ff8..8fdaf1d499 100644
--- a/windows/configuration/taskbar/includes/prevent-grouping-of-taskbar-items.md
+++ b/windows/configuration/taskbar/includes/prevent-grouping-of-taskbar-items.md
@@ -15,4 +15,4 @@ Taskbar grouping consolidates similar applications when there's no room on the t
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/prevent-users-from-adding-or-removing-toolbars.md b/windows/configuration/taskbar/includes/prevent-users-from-adding-or-removing-toolbars.md
index da36dcc670..bfd489e4ba 100644
--- a/windows/configuration/taskbar/includes/prevent-users-from-adding-or-removing-toolbars.md
+++ b/windows/configuration/taskbar/includes/prevent-users-from-adding-or-removing-toolbars.md
@@ -15,4 +15,4 @@ With this policy setting you prevent users from adding or removing toolbars.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/prevent-users-from-moving-taskbar-to-another-screen-dock-location.md b/windows/configuration/taskbar/includes/prevent-users-from-moving-taskbar-to-another-screen-dock-location.md
index 953135ecf3..34d6cbff58 100644
--- a/windows/configuration/taskbar/includes/prevent-users-from-moving-taskbar-to-another-screen-dock-location.md
+++ b/windows/configuration/taskbar/includes/prevent-users-from-moving-taskbar-to-another-screen-dock-location.md
@@ -15,4 +15,4 @@ With this policy setting you prevent users from moving taskbar to another screen
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/prevent-users-from-rearranging-toolbars.md b/windows/configuration/taskbar/includes/prevent-users-from-rearranging-toolbars.md
index 0e64eb8a09..801b804b91 100644
--- a/windows/configuration/taskbar/includes/prevent-users-from-rearranging-toolbars.md
+++ b/windows/configuration/taskbar/includes/prevent-users-from-rearranging-toolbars.md
@@ -15,4 +15,4 @@ With this policy setting you prevent users from rearranging toolbars.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/prevent-users-from-resizing-the-taskbar.md b/windows/configuration/taskbar/includes/prevent-users-from-resizing-the-taskbar.md
index cddb749761..8796175a15 100644
--- a/windows/configuration/taskbar/includes/prevent-users-from-resizing-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/prevent-users-from-resizing-the-taskbar.md
@@ -15,4 +15,4 @@ With this policy setting you prevent users from resizing the taskbar.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-access-to-the-context-menus-for-the-taskbar.md b/windows/configuration/taskbar/includes/remove-access-to-the-context-menus-for-the-taskbar.md
index 5ff72e3932..a79bd60c89 100644
--- a/windows/configuration/taskbar/includes/remove-access-to-the-context-menus-for-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/remove-access-to-the-context-menus-for-the-taskbar.md
@@ -17,4 +17,4 @@ This policy setting doesn't prevent users from using other methods to issue the
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-clock-from-the-system-notification-area.md b/windows/configuration/taskbar/includes/remove-clock-from-the-system-notification-area.md
index 569921f889..ee455afcd7 100644
--- a/windows/configuration/taskbar/includes/remove-clock-from-the-system-notification-area.md
+++ b/windows/configuration/taskbar/includes/remove-clock-from-the-system-notification-area.md
@@ -13,4 +13,4 @@ ms.topic: include
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-notifications-and-action-center.md b/windows/configuration/taskbar/includes/remove-notifications-and-action-center.md
index 850a20179f..d141649c74 100644
--- a/windows/configuration/taskbar/includes/remove-notifications-and-action-center.md
+++ b/windows/configuration/taskbar/includes/remove-notifications-and-action-center.md
@@ -17,4 +17,4 @@ The notification area is located at the far right end of the taskbar, and includ
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-pinned-programs-from-the-taskbar.md b/windows/configuration/taskbar/includes/remove-pinned-programs-from-the-taskbar.md
index 069de94c04..901e8f2402 100644
--- a/windows/configuration/taskbar/includes/remove-pinned-programs-from-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/remove-pinned-programs-from-the-taskbar.md
@@ -15,4 +15,4 @@ This policy setting allows you to remove pinned programs from the taskbar.
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar**
- **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-quick-settings.md b/windows/configuration/taskbar/includes/remove-quick-settings.md
index 55eaca637d..58e2e01069 100644
--- a/windows/configuration/taskbar/includes/remove-quick-settings.md
+++ b/windows/configuration/taskbar/includes/remove-quick-settings.md
@@ -17,4 +17,4 @@ If this setting is enabled, Quick Settings isn't displayed in the Quick Settings
| | Path |
|--|--|
| **CSP** | `./User/Vendor/MSFT/Policy/Config/Start/`[DisableControlCenter](/windows/client-management/mdm/policy-csp-start#disablecontrolcenter) |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-the-battery-meter.md b/windows/configuration/taskbar/includes/remove-the-battery-meter.md
index 445dba6aa5..5eac19f260 100644
--- a/windows/configuration/taskbar/includes/remove-the-battery-meter.md
+++ b/windows/configuration/taskbar/includes/remove-the-battery-meter.md
@@ -15,4 +15,4 @@ With this policy setting you can remove the battery meter from the system contro
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-the-meet-now-icon.md b/windows/configuration/taskbar/includes/remove-the-meet-now-icon.md
index 75cd22365b..e0ed92dcbb 100644
--- a/windows/configuration/taskbar/includes/remove-the-meet-now-icon.md
+++ b/windows/configuration/taskbar/includes/remove-the-meet-now-icon.md
@@ -15,4 +15,4 @@ With this policy setting allows you can remove the Meet Now icon from the system
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-the-networking-icon.md b/windows/configuration/taskbar/includes/remove-the-networking-icon.md
index a1825e5f0e..18f8a0d6ba 100644
--- a/windows/configuration/taskbar/includes/remove-the-networking-icon.md
+++ b/windows/configuration/taskbar/includes/remove-the-networking-icon.md
@@ -15,4 +15,4 @@ With this policy setting you can remove the networking icon from the system cont
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-the-people-bar-from-the-taskbar.md b/windows/configuration/taskbar/includes/remove-the-people-bar-from-the-taskbar.md
index 679df69fde..9a07b3ea06 100644
--- a/windows/configuration/taskbar/includes/remove-the-people-bar-from-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/remove-the-people-bar-from-the-taskbar.md
@@ -12,4 +12,4 @@ With this policy allows you can remove the People Bar from the taskbar and disab
| | Path |
|--|--|
| **CSP** | `./User/Vendor/MSFT/Policy/Config/Start/`[HidePeopleBar](/windows/client-management/mdm/policy-csp-start#hidepeoplebar) |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/remove-the-volume-control-icon.md b/windows/configuration/taskbar/includes/remove-the-volume-control-icon.md
index 8e34ed3d84..b1c847e81c 100644
--- a/windows/configuration/taskbar/includes/remove-the-volume-control-icon.md
+++ b/windows/configuration/taskbar/includes/remove-the-volume-control-icon.md
@@ -15,4 +15,4 @@ With this policy setting you can remove the volume control icon from the system
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/show-additional-calendar.md b/windows/configuration/taskbar/includes/show-additional-calendar.md
index 39ecd45a89..8198012d72 100644
--- a/windows/configuration/taskbar/includes/show-additional-calendar.md
+++ b/windows/configuration/taskbar/includes/show-additional-calendar.md
@@ -19,4 +19,4 @@ By default, the calendar is set according to the locale of the operating system,
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/simplify-quick-settings-layout.md b/windows/configuration/taskbar/includes/simplify-quick-settings-layout.md
index ea3d57141e..bce9e7ab7d 100644
--- a/windows/configuration/taskbar/includes/simplify-quick-settings-layout.md
+++ b/windows/configuration/taskbar/includes/simplify-quick-settings-layout.md
@@ -13,4 +13,4 @@ ms.topic: include
| | Path |
|--|--|
| **CSP** | `./Device/Vendor/MSFT/Policy/Config/Start/`[SimplifyQuickSettings](/windows/client-management/mdm/policy-csp-start#simplifyquicksettings) |
-| **GPO** | **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/turn-off-automatic-promotion-of-notification-icons-to-the-taskbar.md b/windows/configuration/taskbar/includes/turn-off-automatic-promotion-of-notification-icons-to-the-taskbar.md
index 4e9527beef..9642aecd96 100644
--- a/windows/configuration/taskbar/includes/turn-off-automatic-promotion-of-notification-icons-to-the-taskbar.md
+++ b/windows/configuration/taskbar/includes/turn-off-automatic-promotion-of-notification-icons-to-the-taskbar.md
@@ -15,4 +15,4 @@ With this policy setting you can turn off automatic promotion of notification ic
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/includes/turn-off-notification-area-cleanup.md b/windows/configuration/taskbar/includes/turn-off-notification-area-cleanup.md
index 56f39f1f65..6150f80740 100644
--- a/windows/configuration/taskbar/includes/turn-off-notification-area-cleanup.md
+++ b/windows/configuration/taskbar/includes/turn-off-notification-area-cleanup.md
@@ -18,4 +18,4 @@ This setting determines whether the items are always expanded or always collapse
| | Path |
|--|--|
| **CSP** | Not available. |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
+| **GPO** | - **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** |
diff --git a/windows/configuration/taskbar/pinned-apps.md b/windows/configuration/taskbar/pinned-apps.md
index d38c8a7d60..f7cbe59725 100644
--- a/windows/configuration/taskbar/pinned-apps.md
+++ b/windows/configuration/taskbar/pinned-apps.md
@@ -231,3 +231,7 @@ If you apply the taskbar configuration to a clean install or an update, users ca
Learn more about the options available to configure Start menu settings using the Configuration Service Provider (CSP) and Group Policy (GPO):
- [Taskbar policy settings](policy-settings.md)
+
+---
+[WIN-1]: /windows/client-management/mdm/policy-csp-start
+[MEM-1]: /mem/intune/configuration/custom-settings-windows-10
diff --git a/windows/deployment/do/TOC.yml b/windows/deployment/do/TOC.yml
index 933c48b4b8..f0d64329cb 100644
--- a/windows/deployment/do/TOC.yml
+++ b/windows/deployment/do/TOC.yml
@@ -27,6 +27,8 @@
href: delivery-optimization-proxy.md
- name: Testing Delivery Optimization
href: delivery-optimization-test.md
+ - name: Delivery Optimization Troubleshooter
+ href: https://aka.ms/do-fix
- name: Microsoft Connected Cache
items:
- name: What is Microsoft Connected Cache?
diff --git a/windows/deployment/do/delivery-optimization-endpoints.md b/windows/deployment/do/delivery-optimization-endpoints.md
index 11ae7a02fc..782b1650f6 100644
--- a/windows/deployment/do/delivery-optimization-endpoints.md
+++ b/windows/deployment/do/delivery-optimization-endpoints.md
@@ -14,7 +14,7 @@ appliesto:
- ✅ Microsoft Connected Cache for ISPs
- ✅ Microsoft Connected Cache for Enterprise and Education
- ✅ Connected Cache on a Configuration Manager distribution point
-ms.date: 03/31/2023
+ms.date: 05/23/2024
---
# Microsoft Connected Cache content and services endpoints
@@ -22,7 +22,7 @@ ms.date: 03/31/2023
> [!NOTE]
> All ports are outbound.
-This article lists the content and services endpoints to allow in your firewall to be used by Microsoft Connected Cache.
+This article lists the content and services endpoints to allow in your firewall to be used by Microsoft Connected Cache.
Use the table below to reference any particular content types or services endpoints that are required for [Connected Cache on a Configuration Manager distribution point](/mem/configmgr/core/plan-design/hierarchy/microsoft-connected-cache), [Connected Cache managed in Azure](waas-microsoft-connected-cache.md), or both.
|Domain Name |Protocol/Port(s) | Content Type | Additional Information | Microsoft Connected Cache Version |
diff --git a/windows/deployment/do/delivery-optimization-proxy.md b/windows/deployment/do/delivery-optimization-proxy.md
index b300268967..3449e9f030 100644
--- a/windows/deployment/do/delivery-optimization-proxy.md
+++ b/windows/deployment/do/delivery-optimization-proxy.md
@@ -14,7 +14,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Delivery Optimization
-ms.date: 06/02/2023
+ms.date: 05/23/2024
---
# Using a proxy with Delivery Optimization
@@ -36,7 +36,7 @@ If no user is signed in, even if both the Internet Explorer proxy and netsh conf
You can still use netsh to import the proxy setting from Internet Explorer (`netsh winhttp import proxy source=ie`) if your proxy configuration is a static *proxyServerName:Port*. However, the same limitations mentioned previously apply.
-### Summary of settings behavior
+## Summary of settings behavior
These tables summarize the behavior for various combinations of settings:
diff --git a/windows/deployment/do/delivery-optimization-test.md b/windows/deployment/do/delivery-optimization-test.md
index 313d8afd21..8ae1791776 100644
--- a/windows/deployment/do/delivery-optimization-test.md
+++ b/windows/deployment/do/delivery-optimization-test.md
@@ -29,7 +29,7 @@ Delivery Optimization is a powerful and useful tool to help enterprises manage b
One of the most powerful advantages of using Delivery Optimization is the ability to fine-tune settings that empower users to dial in Microsoft content delivery to meet the needs of specific environments.
-## Monitoring The Results
+## Monitoring the Results
Since Delivery Optimization is on by default, you're able to monitor the value either through the Windows Settings for 'Delivery Optimization' using Delivery Optimization PowerShell [cmdlets.](waas-delivery-optimization-setup.md), and/or via the [Windows Update for Business Report](../update/wufb-reports-workbook.md) experience in Azure.
@@ -90,35 +90,39 @@ The following set of instructions will be used for each machine:
1. Open PowerShell console as 'Administrator'.
* Clear the DO cache: 'Delete-DeliveryOptimizationCache'.
* Run 'Get-DeliveryOptimizationStatus'.
+
2. Open MS Store and search for 'Asphalt Legends 9'. Select *Get* to initiate the download of the content (content size: ~3.4 GB).
**On machine #1**
* Run 'Test Instructions'
-|Windows 10 | Windows 11
-|--------|-------------------------------|
-| :::image type="content" source="images/test-scenarios/win10/m1-basic-complete.png" alt-text="Windows 10 21H2 - Machine 1 - Basic Test." lightbox="images/test-scenarios/win10/m1-basic-complete.png"::: | :::image type="content" source="images/test-scenarios/win11/m1-basic-complete.png" alt-text="Windows 11 21H2 - Machine 1 - Basic Test." lightbox="images/test-scenarios/win11/m1-basic-complete.png"::: |
-| **Observations** | |
-| *No peers were found on the first machine downloading the content.
* 'TotalBytesDownloaded' is equal to the file size.
*Status is set to 'Caching' the content so future peers can use it.
* Download was happening in the foreground.
*DownloadMode is set to 'Group' and no peers were found.
* No distinct observations seen between Window 10 and Windows 11 devices. |
+ |Windows 10 | Windows 11 |
+ |--------|-------------------------------|
+ | :::image type="content" source="images/test-scenarios/win10/m1-basic-complete.png" alt-text="Windows 10 21H2 - Machine 1 - Basic Test." lightbox="images/test-scenarios/win10/m1-basic-complete.png"::: | :::image type="content" source="images/test-scenarios/win11/m1-basic-complete.png" alt-text="Windows 11 21H2 - Machine 1 - Basic Test." lightbox="images/test-scenarios/win11/m1-basic-complete.png":::|
+ | **Observations** | |
+ | - No peers were found on the first machine downloading the content.
- 'TotalBytesDownloaded' is equal to the file size.
- Status is set to 'Caching' the content so future peers can use it.
- Download was happening in the foreground.
- DownloadMode is set to 'Group' and no peers were found.
- No distinct observations seen between Window 10 and Windows 11 devices. |
-*Wait 5 minutes*.
+ *Wait 5 minutes*.
**On machine #2**
* Run 'Test Instructions'
-|Windows 10 | Windows 11 |
-|--------|--------------------------------|
-| :::image type="content" source="images/test-scenarios/win10/m2-basic-complete.png" alt-text="Windows 10 21H2 - Machine 2 - Basic Test." lightbox="images/test-scenarios/win10/m2-basic-complete.png"::: | :::image type="content" source="images/test-scenarios/win11/m2-basic-complete.png" alt-text="Windows 11 21H2 - Machine 2 - Basic Test." lightbox="images/test-scenarios/win11/m2-basic-complete.png":::|
-| **Observations** | **Observations**|
-| *A peer was found for the content and 87% of total bytes came from the peer.
* One peer was found for the piece of content, which is expected as there are only two devices in the peering group.
*Download mode was set to 'Group', but since group mode includes both LAN and Group devices, Delivery Optimization prioritizes LAN peers, if found. Therefore, 'BytesFromLanPeers' shows bytes where 'BytesFromGroupPeers' doesn't.
* 'DownloadDuration' is roughly the same between machines.|*A peer was found for the content and 90% of total bytes came from the peer.
* All other points are the same as Windows 10 results. |
+ |Windows 10 | Windows 11 |
+ |--------|--------------------------------|
+ | :::image type="content" source="images/test-scenarios/win10/m2-basic-complete.png" alt-text="Windows 10 21H2 - Machine 2 - Basic Test." lightbox="images/test-scenarios/win10/m2-basic-complete.png"::: | :::image type="content" source="images/test-scenarios/win11/m2-basic-complete.png" alt-text="Windows 11 21H2 - Machine 2 - Basic Test." lightbox="images/test-scenarios/win11/m2-basic-complete.png":::|
+ | **Observations** | **Observations** |
+ | - A peer was found for the content and 87% of total bytes came from the peer.
- One peer was found for the piece of content, which is expected as there are only two devices in the peering group.
- Download mode was set to 'Group', but since group mode includes both LAN and Group devices, Delivery Optimization prioritizes LAN peers, if found. Therefore, 'BytesFromLanPeers' shows bytes where 'BytesFromGroupPeers' doesn't.
- 'DownloadDuration' is roughly the same between machines.| - A peer was found for the content and 90% of total bytes came from the peer.
- All other points are the same as Windows 10 results. |
### Scenario 2: Advance Setup
**Goal:**
+
Demonstrate how Delivery Optimization peer-to-peer technology works in a non-controlled environment and expanding to three machines
+
**Expected Results:**
+
Machine 1 will download zero bytes from peers and Machine 2 will find peers and download 50-99% from peers. Machine 3 will find two peers and download 50-99% from peers.
#### Test Machine Setup
@@ -131,10 +135,10 @@ Machine 1 will download zero bytes from peers and Machine 2 will find peers and
|RAM | 8 GB |
|Disk size | 127 GB |
|Network | Connected to same network, one that is representative of the corporate network. |
-|Delivery Optimization 'Download Mode' Policy| 2 (Group)(set on each machine) |
+|Delivery Optimization 'Download Mode' Policy| 2 (Group)(set on each machine). |
|Delivery Optimization 'Group ID' Policy| Set the *same* 'GUID' on each test machine. A GUID is required value, which can be generated using PowerShell, '[guid]::NewGuid().](https://devblogs.microsoft.com/scripting/powertip-create-a-new-guid-by-using-powershell/)'. |
-|Delivery Optimization 'Delay background download from http' Policy | 60 (set on each machine) |
-|Delivery Optimization 'Delay foreground download from http Policy |60 (set on each machine) |
+|Delivery Optimization 'Delay background download from http' Policy | 60 (set on each machine). |
+|Delivery Optimization 'Delay foreground download from http Policy |60 (set on each machine). |
#### Testing Instructions
@@ -148,25 +152,25 @@ The following set of instructions will be used for each machine:
* Run 'Test Instructions'
-**Output: Windows 10 (21H2)**
+ **Output: Windows 10 (21H2)**
-
+ 
**Observations**
-* The first download in the group of devices shows all bytes coming from HTTP, 'BytesFromHttp'.
-* Download is in the 'Foreground' because the Store app is doing the download and in the foreground on the device because it's initiated by the user in the Store app.
-* No peers are found.
+ * The first download in the group of devices shows all bytes coming from HTTP, 'BytesFromHttp'.
+ * Download is in the 'Foreground' because the Store app is doing the download and in the foreground on the device because it's initiated by the user in the Store app.
+ * No peers are found.
-*Wait 5 minutes*.
+ *Wait 5 minutes*.
**On machine #2:**
* Run 'Test Instructions'
-**Output** Windows 10 (21H2)
+ **Output** Windows 10 (21H2)
-
+ 
**Observations**
@@ -179,9 +183,9 @@ The following set of instructions will be used for each machine:
* Run 'Test Instructions'
-**Output:** Windows 10 (21H2)
+ **Output:** Windows 10 (21H2)
-
+ 
**Observations**
diff --git a/windows/deployment/do/delivery-optimization-workflow.md b/windows/deployment/do/delivery-optimization-workflow.md
index 1c4f4828f2..9635f725c9 100644
--- a/windows/deployment/do/delivery-optimization-workflow.md
+++ b/windows/deployment/do/delivery-optimization-workflow.md
@@ -17,7 +17,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Delivery Optimization
-ms.date: 01/18/2024
+ms.date: 05/23/2024
---
# Delivery Optimization workflow, privacy, security, and endpoints
@@ -41,7 +41,6 @@ This workflow allows Delivery Optimization to securely and efficiently deliver r
5. If Delivery Optimization is unable to obtain the content metadata file, or if the verification of the hash file itself fails, the download will fall back to simple mode. Simple mode will only pull content from the HTTP source and peer-to-peer won't be allowed.
6. Once downloading is complete, Delivery Optimization uses all retrieved pieces of the content to put the file together. At that point, the Delivery Optimization caller (for example, Windows Update) checks the entire file to verify the signature prior to installing it.
-
## Delivery Optimization service endpoint and data information
|Endpoint hostname | Port|Name|Description|Data sent from the computer to the endpoint
diff --git a/windows/deployment/do/index.yml b/windows/deployment/do/index.yml
index 03b2ddc0ac..d4f3409ae7 100644
--- a/windows/deployment/do/index.yml
+++ b/windows/deployment/do/index.yml
@@ -103,4 +103,5 @@ landingContent:
url: delivery-optimization-endpoints.md
- text: Testing Delivery Optimization
url: delivery-optimization-test.md
-
+ - text: Delivery Optimization Troubleshooter
+ url: http://aka.ms/do-fix
diff --git a/windows/deployment/do/mcc-ent-edu-overview.md b/windows/deployment/do/mcc-ent-edu-overview.md
index a6b4c0afed..b17beaa30a 100644
--- a/windows/deployment/do/mcc-ent-edu-overview.md
+++ b/windows/deployment/do/mcc-ent-edu-overview.md
@@ -13,12 +13,13 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for Enterprise and Education
-ms.date: 05/09/2023
+ms.date: 05/23/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/).
> - 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).
diff --git a/windows/deployment/do/mcc-enterprise-appendix.md b/windows/deployment/do/mcc-enterprise-appendix.md
index 9add17a1be..6264ea32c4 100644
--- a/windows/deployment/do/mcc-enterprise-appendix.md
+++ b/windows/deployment/do/mcc-enterprise-appendix.md
@@ -15,7 +15,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for Enterprise and Education
-ms.date: 11/07/2023
+ms.date: 05/23/2024
---
# Appendix
@@ -28,7 +28,8 @@ ms.date: 11/07/2023
### 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).
+
+- [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
@@ -91,15 +92,15 @@ There are multiple methods that can be used to apply a policy to PCs that should
You can either set your MCC IP address or FQDN using:
-1. Registry key (version 1709 and later):
+1. Registry key (version 1709 and later):
`HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization`
"DOCacheHost"=" "
-
+
From an elevated command prompt:
- ```
- reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DeliveryOptimization" /v DOCacheHost /t REG_SZ /d "10.137.187.38" /f
+ ```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):
@@ -110,7 +111,6 @@ You can either set your MCC IP address or FQDN using:
:::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:
@@ -119,7 +119,6 @@ To verify that the Delivery Optimization client can download content using MCC,
:::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*.
@@ -127,7 +126,7 @@ To verify that the Delivery Optimization client can download content using MCC,
:::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
diff --git a/windows/deployment/do/mcc-enterprise-deploy.md b/windows/deployment/do/mcc-enterprise-deploy.md
index b2883ad2fd..5cc7236b51 100644
--- a/windows/deployment/do/mcc-enterprise-deploy.md
+++ b/windows/deployment/do/mcc-enterprise-deploy.md
@@ -1,6 +1,6 @@
---
title: Deploying your cache node
-description: How to deploy a Microsoft Connected Cache (MCC) for Enterprise and Education cache node from the Auzre portal.
+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
@@ -13,7 +13,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for Enterprise and Education
-ms.date: 11/09/2023
+ms.date: 05/23/2024
---
# Deploy your cache node
@@ -32,10 +32,9 @@ To deploy MCC to your server:
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.
+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).
@@ -44,12 +43,13 @@ For information about creating or locating your subscription ID, see [Steps to o
### 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.
+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.
+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.":::
+
+ :::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.
@@ -58,8 +58,9 @@ Once you take the survey above and the MCC team adds your subscription ID to the
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.":::
+ :::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.
@@ -75,8 +76,7 @@ Once you take the survey above and the MCC team adds your subscription ID to the
:::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.
+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":::
@@ -102,7 +102,7 @@ Creating an MCC node is a multi-step process and the first step is to access the
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** |
+ | 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. |
@@ -193,15 +193,16 @@ Installing MCC on your Windows device is a simple process. A PowerShell script p
>
> [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.
+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.
+ > [!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 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.
+ 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":::
@@ -220,16 +221,22 @@ Installing MCC on your Windows device is a simple process. A PowerShell script p
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.
:::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.
+
+ 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.
+
:::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 recommend values for a Branch Office/Small Enterprise deployment.
+
+ 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.
+
:::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":::
-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":::
+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":::
+
:::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.
@@ -267,10 +277,12 @@ Connect to the EFLOW VM and check if MCC is properly running:
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
@@ -285,7 +297,7 @@ A successful test result will display a status code of 200 along with additional
:::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":::
+:::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:
@@ -311,9 +323,9 @@ If you're seeing errors similar to this error: `The term Get- isn't r
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 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)
+ **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
@@ -336,10 +348,9 @@ This command will provide the current status of the starting, stopping of a cont
:::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
@@ -355,53 +366,53 @@ 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
- ```
+ ```bash
+ ifconfig
+ ```
1. Run `nmcli device show ` to show the DNS name for the ethernet adapter. For example, to show DNS information for **eno1**:
- ```bash
- nmcli device show 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":::
+ :::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
- ```
+ ```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"]}
- ```
+ ```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
- ```
+ ```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
- ```
+ ```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
+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
```
-
-
diff --git a/windows/deployment/do/mcc-enterprise-prerequisites.md b/windows/deployment/do/mcc-enterprise-prerequisites.md
index 0671eba29f..1e33e85158 100644
--- a/windows/deployment/do/mcc-enterprise-prerequisites.md
+++ b/windows/deployment/do/mcc-enterprise-prerequisites.md
@@ -13,7 +13,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- - ✅ Microsoft Connected Cache for Enterprise and Education
-ms.date: 11/07/2023
+ms.date: 05/23/2024
---
# Requirements of Microsoft Connected Cache for Enterprise and Education (early preview)
diff --git a/windows/deployment/do/mcc-enterprise-update-uninstall.md b/windows/deployment/do/mcc-enterprise-update-uninstall.md
index b36d56df66..8ffa3c50c7 100644
--- a/windows/deployment/do/mcc-enterprise-update-uninstall.md
+++ b/windows/deployment/do/mcc-enterprise-update-uninstall.md
@@ -15,7 +15,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for Enterprise and Education
-ms.date: 10/12/2022
+ms.date: 05/23/2024
---
# Uninstall MCC
-Please contact the MCC Team before uninstalling to let us know if you're facing issues.
+Contact the MCC Team before uninstalling to let us know if you're facing issues.
-This script will remove the following items:
+This script removes the following items:
1. EFLOW + Linux VM
1. IoT Edge
diff --git a/windows/deployment/do/mcc-isp-cache-node-configuration.md b/windows/deployment/do/mcc-isp-cache-node-configuration.md
index b78fb6bdd2..1b038f6404 100644
--- a/windows/deployment/do/mcc-isp-cache-node-configuration.md
+++ b/windows/deployment/do/mcc-isp-cache-node-configuration.md
@@ -15,12 +15,12 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 08/16/2023
+ms.date: 05/23/2024
---
# Cache node configuration
-All cache node configuration takes place within Azure portal. This article outlines all of the settings that you're able to configure.
+All cache node configuration takes place within Azure portal. This article outlines all of the settings that you're able to configure.
## Settings
@@ -45,4 +45,3 @@ All cache node configuration takes place within Azure portal. This article outli
| **Manual routing - Address range/CIDR blocks** | IPv4 CIDR notation | The IP address range (CIDR blocks) that should be routed to the MCC server as a comma separated list. For example: 2.21.234.0/24, 3.22.235.0/24, 4.23.236.0/24 |
| **BGP - Neighbor ASN** | ASN | When configuring BGP, enter the ASN(s) of your neighbors that you want to establish. |
| **BGP - Neighbor IP address** | IPv4 address | When configuring BGP, enter the IP address(es) of neighbors that you want to establish. |
-
diff --git a/windows/deployment/do/mcc-isp-create-provision-deploy.md b/windows/deployment/do/mcc-isp-create-provision-deploy.md
index 675839a616..4b56a710bb 100644
--- a/windows/deployment/do/mcc-isp-create-provision-deploy.md
+++ b/windows/deployment/do/mcc-isp-create-provision-deploy.md
@@ -13,7 +13,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 05/09/2023
+ms.date: 05/23/2024
---
# Create, configure, provision, and deploy the cache node in Azure portal
@@ -54,12 +54,14 @@ You can manually upload a list of your CIDR blocks in Azure portal to enable man
BGP (Border Gateway Protocol) routing is another method offered for client routing. BGP dynamically retrieves CIDR ranges by exchanging information with routers to understand reachable networks. For an automatic method of routing traffic, you can choose to configure BGP routing in Azure portal.
Microsoft Connected Cache includes Bird BGP, which enables the cache node to:
- - Establish iBGP peering sessions with routers, route servers, or route collectors within operator networks
- - Act as a route collector
+
+- Establish iBGP peering sessions with routers, route servers, or route collectors within operator networks
+- Act as a route collector
The operator starts the iBGP peering session from the Microsoft Connected Cache side using the Azure management portal and then starts the session with the Microsoft Connected Cache node from the router.
In the example configuration below:
+
- The operator ASN is 65100
- The ASN of the Microsoft Connected Cache cache node is 65100 and the IP address is 192.168.8.99
- iBGP peering sessions are established from the portal for ASNs 65100, 65200, and 65300.
@@ -125,7 +127,7 @@ There are five IDs that the device provisioning script takes as input in order t
1. After completing cache node provisioning, navigate to the **Server provisioning** tab. Select **Download provisioning package** to download the installation package to your server.
-1. Open a terminal window in the directory where you would like to deploy your cache node and run the following command to change the access permission to the Bash script:
+1. Open a terminal window in the directory where you would like to deploy your cache node and run the following command to change the access permission to the Bash script:
```bash
sudo chmod +x provisionmcc.sh
diff --git a/windows/deployment/do/mcc-isp-faq.yml b/windows/deployment/do/mcc-isp-faq.yml
index 9f0d502be8..d4b3478551 100644
--- a/windows/deployment/do/mcc-isp-faq.yml
+++ b/windows/deployment/do/mcc-isp-faq.yml
@@ -15,7 +15,7 @@ metadata:
appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ms.date: 03/21/2024
+ ms.date: 05/23/2024
title: Microsoft Connected Cache Frequently Asked Questions
summary: |
Frequently asked questions about Microsoft Connected Cache
diff --git a/windows/deployment/do/mcc-isp-overview.md b/windows/deployment/do/mcc-isp-overview.md
index e3474b59cb..41ecaaaf1c 100644
--- a/windows/deployment/do/mcc-isp-overview.md
+++ b/windows/deployment/do/mcc-isp-overview.md
@@ -13,7 +13,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 03/21/2024
+ms.date: 05/23/2024
---
# Microsoft Connected Cache for ISPs overview
@@ -45,7 +45,6 @@ MCC complements peering by offloading static content that is served off of multi
:::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
:::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":::
@@ -90,4 +89,3 @@ The following are recommended hardware configurations based on traffic ranges:
*Requires systems (chipset, CPU, motherboard) with PCIe version 3, or higher.
**Drive speeds are important and to achieve higher egress, we recommend SSD NVMe in m.2 PCIe slot (version 4, or higher).
-
diff --git a/windows/deployment/do/mcc-isp-signup.md b/windows/deployment/do/mcc-isp-signup.md
index 4959e3160d..284269f52e 100644
--- a/windows/deployment/do/mcc-isp-signup.md
+++ b/windows/deployment/do/mcc-isp-signup.md
@@ -13,12 +13,12 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 07/07/2023
+ms.date: 05/23/2024
---
# Operator sign up and service onboarding for Microsoft Connected Cache
-This article details the process of signing up for Microsoft Connected Cache for Internet Service Providers (public preview).
+This article details the process of signing up for Microsoft Connected Cache for Internet Service Providers (public preview).
> [!NOTE]
> Microsoft Connected Cache is now in public preview. Instead of submitting a survey, you can directly onboard by following the instructions in this article.
@@ -34,7 +34,7 @@ Before you begin sign up, ensure you have the following components:
1. **Access to Azure portal**: Ensure you have the credentials needed to access your organization's Azure portal.
-1. **Peering DB**: Ensure your organization's [Peering DB](https://www.peeringdb.com/) page is up-to-date and active. Check that the NOC email listed is accurate, and that you have access to this email.
+1. **Peering DB**: Ensure your organization's [Peering DB](https://www.peeringdb.com/) page is up-to-date and active. Check that the NOC email listed is accurate, and that you have access to this email.
1. **Server**: Ensure the server you wish to install Microsoft Connected Cache on is ready, and that the server is installed on Ubuntu 20.04 LTS.
1. **Configure cache drive**: Make sure that you have a data drive configured with full permissions on your server. You'll need to specify the location for this cache drive during the cache node configuration 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).
diff --git a/windows/deployment/do/mcc-isp-support.md b/windows/deployment/do/mcc-isp-support.md
index 83f96cb12e..ba0eda79c2 100644
--- a/windows/deployment/do/mcc-isp-support.md
+++ b/windows/deployment/do/mcc-isp-support.md
@@ -13,7 +13,7 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 02/07/2024
+ms.date: 05/23/2024
---
# Support and troubleshooting
@@ -38,51 +38,49 @@ During sign-up, a verification code is sent to your NOC email address present in
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.
-
### Cache Node Errors
#### Network connectivity issues
Updating Docker's DNS can help resolve some connectivity issues.
- Try the following Docker DNS updates until one solves your connectivity problem.
+ Try the following Docker DNS updates until one solves your connectivity problem.
Once connectivity is established, there's no need to continue updating Docker's DNS.
##### Update Docker's DNS to use the Google DNS resolver
-```
+```bash
nano /etc/docker/daemon.json
```
Update the contents of this file to match the following example, which includes the public Google DNS resolver:
-```
+```bash
"log-driver": "json-file", "log-opts": {"max-size": "10m","max-file": "3"},"dns":["8.8.8.8", "8.8.4.4"]
-```
+```
Save and close using the command CTRL-X and then Y(es) to save
-
+
Restart Docker for this change to take effect:
-```
+```bash
systemctl restart docker
```
Rerun the IoT Edge Check command to validate proper connectivity:
-```
+```bash
iotedge check -verbose
```
-
##### Update Docker's DNS to use your company's DNS resolver
-```
+```bash
nano /etc/docker/daemon.json
```
-Update the contents of this file to match the following example, which includes the public Google DNS resolver:
+Update the contents of this file to match the following example, which includes the public Google DNS resolver:
-```
+```bash
"log-driver": "json-file", "log-opts": {"max-size": "10m","max-file": "3"},"dns":[""]
```
@@ -90,13 +88,13 @@ Save and close using the command CTRL-X and then Y(es) to save.
Restart Docker for this change to take effect:
-```
+```bash
systemctl restart docker
```
Rerun the IoT Edge Check command to validate proper connectivity:
-```
+```bash
iotedge check -verbose
```
@@ -122,4 +120,3 @@ To onboard onto Microsoft Connected Cache, you'll need an Azure subscription ID.
- [Pay-as-you-go-subscription](https://azure.microsoft.com/offers/ms-azr-0003p/)
- [Azure free account FAQs](https://azure.microsoft.com/free/free-account-faq/)
-
diff --git a/windows/deployment/do/mcc-isp-update.md b/windows/deployment/do/mcc-isp-update.md
index b5c55362b2..e5140cb315 100644
--- a/windows/deployment/do/mcc-isp-update.md
+++ b/windows/deployment/do/mcc-isp-update.md
@@ -15,16 +15,16 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 10/10/2022
+ms.date: 05/23/2024
---
# Update or uninstall your cache node
-This article details how to update or uninstall your cache node.
+This article details how to update or uninstall your cache node.
## Update cache node
-Microsoft will release updates for Microsoft Connected Cache periodically to improve performance, functionality, and security. Updates won't require any action from the customer. Instead, when an update is available, your cache node will automatically update during low traffic hours with minimal to no impact to your end customers.
+Microsoft will release updates for Microsoft Connected Cache periodically to improve performance, functionality, and security. Updates won't require any action from the customer. Instead, when an update is available, your cache node will automatically update during low traffic hours with minimal to no impact to your end customers.
To view which version your cache nodes are currently on, navigate to the **Cache nodes** tab to view the versions in the list view.
diff --git a/windows/deployment/do/mcc-isp-verify-cache-node.md b/windows/deployment/do/mcc-isp-verify-cache-node.md
index eb44ce86c1..c43bf3738f 100644
--- a/windows/deployment/do/mcc-isp-verify-cache-node.md
+++ b/windows/deployment/do/mcc-isp-verify-cache-node.md
@@ -12,12 +12,12 @@ ms.reviewer: mstewart
ms.collection: tier3
appliesto:
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 02/09/2023
+ms.date: 05/23/2024
---
# Verify cache node functionality and monitor health and performance
-This article details how to verify that your cache node(s) are functioning properly and serving traffic. This article also details how to monitor your cache nodes.
+This article details how to verify that your cache node(s) are functioning properly and serving traffic. This article also details how to monitor your cache nodes.
## Verify cache node installation is complete
@@ -39,7 +39,7 @@ For example, this command provides the current status of the starting and stoppi
:::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":::
-You may need to wait up to 30 minutes for the cache node software to complete downloading and begin caching.
+You may need to wait up to 30 minutes for the cache node software to complete downloading and begin caching.
## Verify functionality on Azure portal
@@ -75,11 +75,11 @@ If the test fails, for more information, see the [FAQ](mcc-isp-faq.yml) article.
## Verify BGP routing configuration
-To verify your BGP routes are correctly configured for a cache node, navigate to **Settings > Cache nodes**. Select the cache node you wish to verify BGP routes for.
+To verify your BGP routes are correctly configured for a cache node, navigate to **Settings > Cache nodes**. Select the cache node you wish to verify BGP routes for.
-Verify that under **Routing Information**, the state of **BGP routes received** is True. Verify the IP space is correct. Lastly, select **Download JSON** next to **Download BGP Routes** to view the BGP routes that your cache node is currently advertising.
+Verify that under **Routing Information**, the state of **BGP routes received** is True. Verify the IP space is correct. Lastly, select **Download JSON** next to **Download BGP Routes** to view the BGP routes that your cache node is currently advertising.
-If **BGP routes received** is False, your **IP Space** is 0, or you're experiencing any BGP routing errors, ensure your **ASN** and **IP address** is entered correctly.
+If **BGP routes received** is False, your **IP Space** is 0, or you're experiencing any BGP routing errors, ensure your **ASN** and **IP address** is entered correctly.
## Monitor cache node health and performance
diff --git a/windows/deployment/do/mcc-isp-vm-performance.md b/windows/deployment/do/mcc-isp-vm-performance.md
index 04c0fa00df..5fafc85e89 100644
--- a/windows/deployment/do/mcc-isp-vm-performance.md
+++ b/windows/deployment/do/mcc-isp-vm-performance.md
@@ -12,7 +12,7 @@ ms.reviewer: mstewart
ms.collection: tier3
appliesto:
- ✅ Microsoft Connected Cache for ISPs
-ms.date: 12/31/2017
+ms.date: 05/23/2024
---
# Enhancing cache performance
@@ -30,7 +30,7 @@ The Microsoft Connected Cache module is optimized for Ubuntu 20.04 LTS. Install
#### Drive performance
-The maximum number of disks supported is 9. When configuring your drives, we recommend SSD drives as cache read speed of SSD is superior to HDD. In addition, using multiple disks is recommended to improve cache performance.
+The maximum number of disks supported is 9. When configuring your drives, we recommend SSD drives as cache read speed of SSD is superior to HDD. In addition, using multiple disks is recommended to improve cache performance.
RAID disk configurations are discouraged as cache performance will be impacted. If using RAID disk configurations, ensure striping.
diff --git a/windows/deployment/do/mcc-isp.md b/windows/deployment/do/mcc-isp.md
index 4191c3cd7f..87b1740400 100644
--- a/windows/deployment/do/mcc-isp.md
+++ b/windows/deployment/do/mcc-isp.md
@@ -10,7 +10,7 @@ ms.reviewer: mstewart
manager: aaroncz
ms.localizationpriority: medium
ms.collection: tier3
-ms.date: 03/07/2023
+ms.date: 05/23/2024
appliesto:
- ✅ Windows 11
- ✅ Windows 10
@@ -114,7 +114,6 @@ To deploy 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.
@@ -388,7 +387,6 @@ Before you start, make sure that you have a data drive configured on your server
:::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:
@@ -567,7 +565,6 @@ To migrate, use the following steps:
:::image type="content" source="images/mcc-isp-migrate.png" alt-text="A screenshot of Azure portal showing the migration instructions for migrating a cache node from the early preview to the public preview." lightbox="images/mcc-isp-migrate.png":::
1. Go to https://portal.azure.com and navigate to your resource to check your migrated cache nodes.
-
## Uninstalling MCC
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.
@@ -592,13 +589,12 @@ sudo ./uninstallmcc.sh
```
## Appendix
-
+
### Steps to obtain an Azure subscription ID
[!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:
diff --git a/windows/deployment/do/waas-delivery-optimization-faq.yml b/windows/deployment/do/waas-delivery-optimization-faq.yml
index 73a6691166..e75c33678a 100644
--- a/windows/deployment/do/waas-delivery-optimization-faq.yml
+++ b/windows/deployment/do/waas-delivery-optimization-faq.yml
@@ -17,7 +17,7 @@ metadata:
- ✅ Windows 10
- ✅ Windows Server 2019, and later
- ✅ Delivery Optimization
- ms.date: 02/16/2024
+ ms.date: 05/23/2024
title: Frequently Asked Questions about Delivery Optimization
summary: |
This article answers frequently asked questions about Delivery Optimization.
@@ -38,7 +38,7 @@ summary: |
- [My firewall requires IP addresses and can't process FQDNs. How do I configure it to download content with Delivery Optimization?How do I configure it to download content with Delivery Optimization?](#my-firewall-requires-ip-addresses-and-can-t-process-fqdns--how-do-i-configure-it-to-download-content-with-delivery-optimization)
- [What is the recommended configuration for Delivery Optimization used with cloud proxies?](#what-is-the-recommended-configuration-for-delivery-optimization-used-with-cloud-proxies)
- **Peer-to-Peer related questions**:
+ **Peer-to-peer related questions**:
- [How does Delivery Optimization determine which content is available for peering?](#how-does-delivery-optimization-determine-which-content-is-available-for-peering)
- [Does Delivery Optimization use multicast?](#does-delivery-optimization-use-multicast)
@@ -77,11 +77,12 @@ sections:
questions:
- question: Which ports does Delivery Optimization use?
answer: |
- Delivery Optimization listens on port 7680 for requests from other peers by using TCP/IP. The service registers and opens this port on the device. The port must be set to accept inbound traffic through your firewall. If you don't allow inbound traffic over port 7680, you can't use the peer-to-peer functionality of Delivery Optimization. However, devices can still successfully download by using HTTP or HTTPS traffic over port 80 (such as for default Windows Update data).
+ Delivery Optimization listens on port 7680 for requests from other peers by using TCP/IP. The service registers and opens this port on the device. The port must be set to accept inbound and outbound TCP traffic through your firewall. If you don't allow traffic over port 7680, you can't use the peer-to-peer functionality of Delivery Optimization. However, devices can still successfully download updates by using HTTP over port 80 (or HTTPS over port 443 where applicable).
- Delivery Optimization uses Teredo to create peer groups, which include devices across NATs (or any form of internal subnet that uses gateways or firewalls between subnets). To enable this scenario, you must allow inbound TCP/IP traffic over port 3544. Look for a "NAT traversal" setting in your firewall to set this up.
+ If you set the "Download Mode" policy to "Group (2)" or "Internet (3)", Teredo will be used by Delivery Optimization to connect to peer devices across NATs. You must allow inbound and outbound UDP traffic over port 3544. Look for a "NAT traversal" setting in your firewall to set this up.
- Delivery Optimization also communicates with its cloud service by using HTTP/HTTPS over port 80.
+ Delivery Optimization also communicates with its cloud service by using HTTPS over port 443.
+
- question: What are the requirements if I use a proxy?
answer: |
For Delivery Optimization to successfully use the proxy, you should set up the proxy by using Windows proxy settings or Internet Explorer proxy settings. For details see [Using a proxy with Delivery Optimization](../do/delivery-optimization-proxy.md). Most content downloaded with Delivery Optimization uses byte range requests. Make sure your proxy allows byte range requests. For more information, see [Proxy requirements for Windows Update](/windows/deployment/update/windows-update-troubleshooting).
diff --git a/windows/deployment/do/waas-delivery-optimization-monitor.md b/windows/deployment/do/waas-delivery-optimization-monitor.md
index a41d6159c2..6c30ab2dc4 100644
--- a/windows/deployment/do/waas-delivery-optimization-monitor.md
+++ b/windows/deployment/do/waas-delivery-optimization-monitor.md
@@ -16,14 +16,14 @@ appliesto:
- ✅ Windows 11
- ✅ Windows 10
- ✅ Delivery Optimization
-ms.date: 08/13/2023
+ms.date: 05/23/2024
---
# Monitor Delivery Optimization
To monitor Delivery Optimization, you can use either the Windows Update for Business Delivery Optimization Report or Windows PowerShell cmdlets.
-## Monitor with Windows Update for Business Delivery Optimization Report
+## 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.
@@ -47,7 +47,7 @@ For details, see [Windows Update for Business Delivery Optimization Report](/win
| TotalBytesDownloaded | The number of bytes from any source downloaded so far |
| PercentPeerCaching |The percentage of bytes downloaded from peers versus over HTTP |
| BytesFromPeers | Total bytes downloaded from peer devices (sum of bytes downloaded from LAN, Group, and Internet Peers) |
-| BytesfromHTTP | Total number of bytes received over HTTP. This metric represents all HTTP sources, **which includes BytesFromCacheServer** |
+| 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) |
@@ -58,17 +58,17 @@ For details, see [Windows Update for Business Delivery Optimization Report](/win
| BytesToGroupPeers | Total number of bytes delivered from peers found in the group |
| BytesToInternetPeers | Total number of bytes delivered from peers found on the LAN |
| DownloadDuration | Total download time in seconds |
-| HttpConnectionCount | |
-| LanConnectionCount | |
-| GroupConnectionCount | |
-| InternetConnectionCount | |
-| DownloadMode | |
+| HttpConnectionCount | Number of connections to HTTP source |
+| LanConnectionCount | Number of connections to LAN peers |
+| GroupConnectionCount | Number of connections to Group peers |
+| InternetConnectionCount | Number of connections to Internet peers |
+| DownloadMode | Delivery Optimization DownloadMode value |
| SourceURL | Http source for the file |
| CacheHost | IP address for the cache server |
| NumPeers | Indicates the total number of peers returned from the service. |
| PredefinedCallerApplication | Indicates the last caller that initiated a request for the file. |
| ExpireOn | The target expiration date and time for the file. |
-| IsPinned | A yes/no value indicating whether an item has been "pinned" in the cache (see `setDeliveryOptmizationStatus`). |
+| IsPinned | A yes/no value indicating whether an item has been "pinned" in the cache (see `Set-DeliveryOptimizationStatus`). |
`Get-DeliveryOptimizationPerfSnap` returns a list of key performance data:
@@ -76,40 +76,36 @@ For details, see [Windows Update for Business Delivery Optimization Report](/win
| --- | --- |
| FilesDownloaded | Number of files downloaded |
| FilesUploaded | Number of files uploaded |
-| Files | |
+| Files | Number of files available in the Delivery Optimization cache |
| TotalBytesDownloaded | Total bytes downloaded |
| TotalBytesUploaded | Total bytes uploaded |
| AverageDownloadSize | Average transfer size (download); that is, the number bytes downloaded divided by the number of files |
| AverageUploadSize | Average transfer size (upload); the number of bytes uploaded divided by the number of files |
-| DownloadMode | Delivery Optimization Download mode used to deliver file |
-| CacheSizeBytes | |
-| TotalDiskBytes | |
-| AvailableDiskBytes | |
-| CpuUsagePct | |
-| MemUsageKB | |
-| NumberOfPeers | |
-| CacheHostConnections | |
-| CdnConnections | |
-| LanConnections | |
-| LinkLocalConnections | |
-| GroupConnections | |
-| InternetConnections | |
-| DownlinkBps | |
-| DownlinkUsageBps | |
-| UplinkBps | |
-| UplinkUsageBps | |
-| ForegroundDownloadRatePct | |
-| BackgroundDownloadRatePct | |
-| UploadRatePct | |
-| UplinkUsageBps | |
-| ForegroundDownloadRatePct | |
-| BackgroundDownloadRatePct | |
-| UploadRatePct | |
-| UploadCount | |
-| ForegroundDownloadCount | |
-| ForegroundDownloadsPending | |
-| BackgroundDownloadCount | |
-| BackgroundDownloadsPending | |
+| DownloadMode | Delivery Optimization Download mode configured for this device |
+| CacheSizeBytes | Total disk space occupied by downloaded files in Delivery Optimization cache |
+| TotalDiskBytes | Total space of the disk volume on which Delivery Optimization cache is currently located |
+| AvailableDiskBytes | Free space of the disk volume on which Delivery Optimization cache is currently located |
+| CpuUsagePct | Average CPU usage by the Delivery Optimization process |
+| MemUsageKB | Amount of committed memory currently used by the Delivery Optimization process |
+| NumberOfPeers | Total number of peers found across all files currently in the cache |
+| CacheHostConnections | Number of connections to Microsoft Connected Cache servers |
+| CdnConnections | Number of connections to CDN servers |
+| LanConnections | Number of connections to LAN peers |
+| LinkLocalConnections | Number of connections to Link Local peers |
+| GroupConnections | Number of connections to Group peers|
+| InternetConnections | Number of connections to Internet peers |
+| DownlinkBps | Average download bandwidth usage currently seen across all network adapters |
+| DownlinkUsageBps | Average bandwidth currently used by Delivery Optimization for downloads |
+| UplinkBps | Average upload bandwidth usage currently seen across all network adapters |
+| UplinkUsageBps | Average bandwidth currently used by Delivery Optimization for uploads |
+| ForegroundDownloadRatePct | Percentage of bandwidth to be used for foreground downloads |
+| BackgroundDownloadRatePct | Percentage of bandwidth to be used for background downloads |
+| UploadRatePct | Percentage of upload bandwidth to be used for uploads |
+| UploadCount | Number of files in Delivery Optimization cache currently eligible for uploading |
+| ForegroundDownloadCount | Number of foreground downloads that are running |
+| ForegroundDownloadsPending | Number of foreground downloads that are waiting in queue |
+| BackgroundDownloadCount | Number of background downloads that are running |
+| BackgroundDownloadsPending | Number of background downloads that are waiting in queue |
Using the `-Verbose` option returns additional information:
@@ -135,17 +131,17 @@ Starting in Windows 10, version 1803, `Get-DeliveryOptimizationPerfSnapThisMonth
**Starting in Windows 10, version 1903:**
-`set-DeliveryOptimizationStatus -ExpireOn [date time]` extends the expiration of all files in the cache. You can set the expiration immediately for all files that are in the "caching" state. For files in progress ("downloading"), the expiration is applied once the download is complete. You can set the expiration up to one year from the current date and time.
+`Set-DeliveryOptimizationStatus -ExpireOn [date time]` extends the expiration of all files in the cache. You can set the expiration immediately for all files that are in the "caching" state. For files in progress ("downloading"), the expiration is applied once the download is complete. You can set the expiration up to one year from the current date and time.
-`set-DeliveryOptimizationStatus -ExpireOn [date time] -FileID [FileID]` extends expiration for a single specific file in the cache.
+`Set-DeliveryOptimizationStatus -ExpireOn [date time] -FileID [FileID]` extends expiration for a single specific file in the cache.
You can now "pin" files to keep them persistent in the cache, only with files that are downloaded in modes 1, 2, or 3.
-`set-DeliveryOptimizationStatus -Pin [True] -File ID [FileID]` keeps a specific file in the cache such that it won't be deleted until the expiration date and time (which you set with `set-DeliveryOptimizationStatus -ExpireOn [date time] -FileID [FileID]`). The file is also excluded from the cache quota calculation.
+`Set-DeliveryOptimizationStatus -Pin [True] -File ID [FileID]` keeps a specific file in the cache such that it won't be deleted until the expiration date and time (which you set with `Set-DeliveryOptimizationStatus -ExpireOn [date time] -FileID [FileID]`). The file is also excluded from the cache quota calculation.
-`set-DeliveryOptimizationStatus -Pin [False] -File ID [FileID]` "unpins" a file, so that it will be deleted when the expiration date and time are reached. The file is included in the cache quota calculation.
+`Set-DeliveryOptimizationStatus -Pin [False] -File ID [FileID]` "unpins" a file, so that it will be deleted when the expiration date and time are reached. The file is included in the cache quota calculation.
-`delete-DeliveryOptimizationCache` lets you clear files from the cache and remove all persisted data related to them. You can use these options with this cmdlet:
+`Delete-DeliveryOptimizationCache` lets you clear files from the cache and remove all persisted data related to them. You can use these options with this cmdlet:
- `-FileID` specifies a particular file to delete.
- `-IncludePinnedFiles` deletes all files that are pinned.
@@ -188,7 +184,6 @@ If `Path` isn't specified, this cmdlet reads all logs from the DoSvc log directo
Log entries are written to the PowerShell pipeline as objects. To dump logs to a text file, run `Get-DeliveryOptimizationLog | Set-Content