From edc8c3cbdbecd85a820bcc05a3a2fc3d4947e9b5 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Mar 2025 12:51:16 -0400 Subject: [PATCH 1/5] split csp and Intune tabs --- windows/configuration/images/icons/csp.svg | 10 ++++++++++ windows/configuration/taskbar/pinned-apps.md | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 windows/configuration/images/icons/csp.svg diff --git a/windows/configuration/images/icons/csp.svg b/windows/configuration/images/icons/csp.svg new file mode 100644 index 0000000000..6baa611d0f --- /dev/null +++ b/windows/configuration/images/icons/csp.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/windows/configuration/taskbar/pinned-apps.md b/windows/configuration/taskbar/pinned-apps.md index f8ec2fe588..f9fdbdc5dd 100644 --- a/windows/configuration/taskbar/pinned-apps.md +++ b/windows/configuration/taskbar/pinned-apps.md @@ -165,7 +165,7 @@ In the following XML example, two regions are added: `US|UK` and `DE|FR|IT`: [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#intune) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: @@ -176,15 +176,15 @@ To configure devices with Microsoft Intune, [create a Settings catalog policy](/ [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [Start CSP][WIN-1]. Use one of the following settings: +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp) + +You can configure devices using the [Start CSP][WIN-1]. Use one of the following settings: | Setting | |--| | - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **String:**
- **Value:** content of the XML file | | - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:**
- **Value:** content of the XML file | -[!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] - #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg) [!INCLUDE [provisioning-package-1](../../../includes/configure/provisioning-package-1.md)] From 7ff18d8b9c45ce308662bdba8ac7ed7efbdd23fc Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Mar 2025 12:56:43 -0400 Subject: [PATCH 2/5] fix tab --- windows/configuration/taskbar/pinned-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/configuration/taskbar/pinned-apps.md b/windows/configuration/taskbar/pinned-apps.md index f9fdbdc5dd..7d0d423145 100644 --- a/windows/configuration/taskbar/pinned-apps.md +++ b/windows/configuration/taskbar/pinned-apps.md @@ -165,7 +165,7 @@ In the following XML example, two regions are added: `US|UK` and `DE|FR|IT`: [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#intune) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: From 872309646aae7934b16c2a17203ad3872b678814 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Mar 2025 13:21:29 -0400 Subject: [PATCH 3/5] updates --- windows/configuration/start/layout.md | 20 +++++++++++-------- .../configuration/start/policy-settings.md | 1 - windows/configuration/taskbar/pinned-apps.md | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/windows/configuration/start/layout.md b/windows/configuration/start/layout.md index 2bd6d4e1aa..a927c5f059 100644 --- a/windows/configuration/start/layout.md +++ b/windows/configuration/start/layout.md @@ -446,7 +446,7 @@ Learn how to [Find the Application User Model ID of an installed app](../store/f ::: zone pivot="windows-10" -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune-10) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune-10) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: @@ -457,12 +457,14 @@ To configure devices with Microsoft Intune, [create a Settings catalog policy](/ [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [Start CSP][WIN-1]. Use one of the following settings: +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-10) + +You can configure devices using the [Start CSP][WIN-1]. Use one of the following settings: | Setting | |--| -| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **String:**
- **Value:** content of the XML file | -| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:**
- **Value:** content of the XML file | +| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | +| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | [!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] @@ -572,7 +574,7 @@ The GPO applies the Start and taskbar layout at the next user sign-in. Each time > [!IMPORTANT] > The JSON file can be applied to devices using the [Start policy CSP][WIN-1] only. It's not possible to apply the JSON file using group policy. -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune-11) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune-11) To configure devices with Microsoft Intune, [create a Settings catalog policy](/mem/intune/configuration/settings-catalog) and use one of the following settings: @@ -583,12 +585,14 @@ To configure devices with Microsoft Intune, [create a Settings catalog policy](/ [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [Start CSP][WIN-1]. Use one of the following settings: +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11) + +You can configure devices using the [Start CSP][WIN-1]. Use one of the following settings: | Setting | |--| -| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **String:**
- **Value:** content of the JSON file | -| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:**
- **Value:** content of the JSON file | +| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:** String
- **Value:** content of the JSON file | +| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:** String
- **Value:** content of the JSON file | [!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] diff --git a/windows/configuration/start/policy-settings.md b/windows/configuration/start/policy-settings.md index 08a7751472..7b70363330 100644 --- a/windows/configuration/start/policy-settings.md +++ b/windows/configuration/start/policy-settings.md @@ -191,7 +191,6 @@ Select one of the tabs to see the list of available settings: #### [:::image type="icon" source="../images/icons/power.svg"::: **Power options**](#tab/power) - ::: zone pivot="windows-11" |Policy name| CSP | GPO | |-|-|-| diff --git a/windows/configuration/taskbar/pinned-apps.md b/windows/configuration/taskbar/pinned-apps.md index 7d0d423145..55c18953c5 100644 --- a/windows/configuration/taskbar/pinned-apps.md +++ b/windows/configuration/taskbar/pinned-apps.md @@ -182,8 +182,8 @@ You can configure devices using the [Start CSP][WIN-1]. Use one of the following | Setting | |--| -| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **String:**
- **Value:** content of the XML file | -| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:**
- **Value:** content of the XML file | +| - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | +| - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg) From b1ff4cfc7f172947d80f3aea650616959c277393 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Mar 2025 13:31:01 -0400 Subject: [PATCH 4/5] updates --- windows/configuration/start/layout.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/windows/configuration/start/layout.md b/windows/configuration/start/layout.md index a927c5f059..42002f195e 100644 --- a/windows/configuration/start/layout.md +++ b/windows/configuration/start/layout.md @@ -466,8 +466,6 @@ You can configure devices using the [Start CSP][WIN-1]. Use one of the following | - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | | - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-Start#startlayout)
- **Data type:** String
- **Value:** content of the XML file | -[!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] - #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg-10) [!INCLUDE [provisioning-package-1](../../../includes/configure/provisioning-package-1.md)] @@ -594,8 +592,6 @@ You can configure devices using the [Start CSP][WIN-1]. Use one of the following | - **OMA-URI:** `./User/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:** String
- **Value:** content of the JSON file | | - **OMA-URI:** `./Device/Vendor/MSFT/Policy/Config/Start/`[ConfigureStartPins](/windows/client-management/mdm/policy-csp-Start#configurestartpins)
- **Data type:** String
- **Value:** content of the JSON file | -[!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] - #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg-11) [!INCLUDE [provisioning-package-1](../../../includes/configure/provisioning-package-1.md)] From f189c8362f879016dfc3d2996e560aa85dcd8e2b Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Mar 2025 13:58:28 -0400 Subject: [PATCH 5/5] updates --- .../start/includes/clear-tile-notifications-during-log-on.md | 2 +- windows/configuration/start/includes/configure-start-layout.md | 2 +- ...se-the-search-based-method-when-resolving-shell-shortcuts.md | 2 +- ...-the-tracking-based-method-when-resolving-shell-shortcuts.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md b/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md index 59c2b07132..314755f244 100644 --- a/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md +++ b/windows/configuration/start/includes/clear-tile-notifications-during-log-on.md @@ -11,5 +11,5 @@ If you enable this policy setting, the system deletes tile notifications when th | | Path | |--|--| -| **CSP** | ./Device/Vendor/MSFT/[Setting]() | +| **CSP** | Not available. | | **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** | diff --git a/windows/configuration/start/includes/configure-start-layout.md b/windows/configuration/start/includes/configure-start-layout.md index fca0c5315d..cff404744d 100644 --- a/windows/configuration/start/includes/configure-start-layout.md +++ b/windows/configuration/start/includes/configure-start-layout.md @@ -11,7 +11,7 @@ This policy setting lets you specify the Start layout for users, preventing them | | Path | |--|--| -| **CSP** | [Configure start layout](/windows/client-management/mdm/policy-csp-start#startlayout) | +| **CSP** | `./Device/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-start#configurestartpins)

`./User/Vendor/MSFT/Policy/Config/Start/`[StartLayout](/windows/client-management/mdm/policy-csp-start#configurestartpins)| | **GPO** | **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar**

**User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** | For more information, see [Customize the Start layout](../layout.md). diff --git a/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md b/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md index 55a74cc190..079c195b45 100644 --- a/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md +++ b/windows/configuration/start/includes/do-not-use-the-search-based-method-when-resolving-shell-shortcuts.md @@ -11,5 +11,5 @@ This policy setting prevents the system from conducting a comprehensive search o | | Path | |--|--| -| **CSP** | ./Device/Vendor/MSFT/[Setting]() | +| **CSP** | Not available. | | **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Do not use the search-based method when resolving shell shortcuts** | diff --git a/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md b/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md index a877effc15..33fbcdea70 100644 --- a/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md +++ b/windows/configuration/start/includes/do-not-use-the-tracking-based-method-when-resolving-shell-shortcuts.md @@ -11,5 +11,5 @@ This policy setting prevents the system from using NTFS tracking features to res | | Path | |--|--| -| **CSP** | ./Device/Vendor/MSFT/[Setting]() | +| **CSP** | Not available. | | **GPO** | **User Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Do not use the tracking-based method when resolving shell shortcuts** |