From f0ad425416025a5f996aebabdf9e78bc1f937abe Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 1 May 2025 10:54:01 -0400 Subject: [PATCH 1/4] Format updates --- windows/configuration/settings/page-visibility.md | 4 +++- windows/configuration/store/index.md | 5 ++++- windows/hub/zone-pivot-groups.yml | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/windows/configuration/settings/page-visibility.md b/windows/configuration/settings/page-visibility.md index c7f798daa6..7423dd6380 100644 --- a/windows/configuration/settings/page-visibility.md +++ b/windows/configuration/settings/page-visibility.md @@ -55,7 +55,9 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`: [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][INT-1] with the [Policy CSP][CSP-1]. +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11) + +You can configure devices using the [Policy CSP][CSP-1]. | Setting | |--| diff --git a/windows/configuration/store/index.md b/windows/configuration/store/index.md index b6b7609319..2fed537573 100644 --- a/windows/configuration/store/index.md +++ b/windows/configuration/store/index.md @@ -27,7 +27,10 @@ You can use configuration service provider (CSP) or group policy (GPO) settings [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -Alternatively, you can configure devices using a [custom policy][INT-1] with the [Policy CSP][CSP-1]. + +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11) + +You can configure devices using the [Policy CSP][CSP-1]. | Setting | |--| diff --git a/windows/hub/zone-pivot-groups.yml b/windows/hub/zone-pivot-groups.yml index d68e890c3d..a4e09a33da 100644 --- a/windows/hub/zone-pivot-groups.yml +++ b/windows/hub/zone-pivot-groups.yml @@ -20,9 +20,9 @@ groups: title: Windows versions prompt: "Select the Windows version you want to learn about:" pivots: - - id: windows-insider - title: Windows Insider - id: windows-11 title: Windows 11 - id: windows-10 - title: Windows 10 \ No newline at end of file + title: Windows 10 + - id: windows-insider + title: Windows Insider \ No newline at end of file From 43c0ffd01f5eebb1f49c96dd6c5a989d917a9f43 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 1 May 2025 11:07:34 -0400 Subject: [PATCH 2/4] updates --- windows/configuration/settings/page-visibility.md | 4 ++-- windows/configuration/shell-launcher/configure.md | 6 +++++- .../shell-launcher/quickstart-kiosk.md | 15 +++++++++------ windows/configuration/store/index.md | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/windows/configuration/settings/page-visibility.md b/windows/configuration/settings/page-visibility.md index 7423dd6380..2bc3491bd8 100644 --- a/windows/configuration/settings/page-visibility.md +++ b/windows/configuration/settings/page-visibility.md @@ -45,7 +45,7 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`: [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] -#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune/CSP**](#tab/intune) +#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune**](#tab/intune) [!INCLUDE [intune-settings-catalog-1](../../../includes/configure/intune-settings-catalog-1.md)] @@ -55,7 +55,7 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`: [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)] -#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11) +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp) You can configure devices using the [Policy CSP][CSP-1]. diff --git a/windows/configuration/shell-launcher/configure.md b/windows/configuration/shell-launcher/configure.md index da5de3ddb3..eaf9c9d380 100644 --- a/windows/configuration/shell-launcher/configure.md +++ b/windows/configuration/shell-launcher/configure.md @@ -233,7 +233,11 @@ Depending on your configuration, you can have a user to automatically sign in to Here are the options to remove Shell Launcher, select the method that best fits your needs: -#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune) +#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune) + +Unassign or delete the policy that contains the configuration. + +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp) Unassign or delete the policy that contains the configuration. diff --git a/windows/configuration/shell-launcher/quickstart-kiosk.md b/windows/configuration/shell-launcher/quickstart-kiosk.md index c7e587aafe..a064bca35f 100644 --- a/windows/configuration/shell-launcher/quickstart-kiosk.md +++ b/windows/configuration/shell-launcher/quickstart-kiosk.md @@ -24,7 +24,7 @@ The examples can be modified to fit your specific requirements. For example, you [!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**](#tab/intune) > [!TIP] > Use the following Graph call to automatically create a custom policy in your Microsoft Intune tenant without assignments nor scope tags. @@ -35,13 +35,16 @@ The examples can be modified to fit your specific requirements. For example, you Assign the policy to a group that contains as members the devices that you want to configure. -Alternatively, you can configure devices using a [custom policy][MEM-1] with the [AssignedAccess CSP][WIN-3]. - -- **Setting:** `./Vendor/MSFT/AssignedAccess/ShellLauncher` -- **Value:** - [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)] +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp) + +You can configure devices using the [AssignedAccess CSP][WIN-3]. + +| Setting | +|--| +|- **OMA-URI:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
- **Data type:** string
- **Value:** [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)] | + #### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps) [!INCLUDE [powershell-wmi-bridge-1](../../../includes/configure/powershell-wmi-bridge-1.md)] diff --git a/windows/configuration/store/index.md b/windows/configuration/store/index.md index 2fed537573..93d20d428c 100644 --- a/windows/configuration/store/index.md +++ b/windows/configuration/store/index.md @@ -17,7 +17,7 @@ You can use configuration service provider (CSP) or group policy (GPO) settings [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] -#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune/CSP**](#tab/intune) +#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune**](#tab/intune) [!INCLUDE [intune-settings-catalog-1](../../../includes/configure/intune-settings-catalog-1.md)] From 6cc50d143e2609e2d5c9918c7071e0eecdfe5dcd Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 1 May 2025 11:21:05 -0400 Subject: [PATCH 3/4] updates --- windows/configuration/shell-launcher/configure.md | 9 ++++++++- windows/configuration/shell-launcher/quickstart-kiosk.md | 4 +++- windows/configuration/toc.yml | 6 ++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/windows/configuration/shell-launcher/configure.md b/windows/configuration/shell-launcher/configure.md index eaf9c9d380..c9b773a3be 100644 --- a/windows/configuration/shell-launcher/configure.md +++ b/windows/configuration/shell-launcher/configure.md @@ -150,7 +150,7 @@ To learn how to configure the Shell Launcher XML file, see [Create a Shell Launc [!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**](#tab/intune) You can configure devices using a [custom policy][MEM-1] with the [AssignedAccess CSP][WIN-3]. @@ -159,6 +159,13 @@ You can configure devices using a [custom policy][MEM-1] with the [AssignedAcces Assign the policy to a group that contains as members the devices that you want to configure. +#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp) + +You can configure devices using the [AssignedAccess CSP][WIN-3]. + +- **Setting:** `./Vendor/MSFT/AssignedAccess/ShellLauncher` +- **Value:** content of the XML configuration file + #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg) You can configure Shell Launcher by creating a provisioning package and then applying the provisioning package during image deployment time or at runtime: diff --git a/windows/configuration/shell-launcher/quickstart-kiosk.md b/windows/configuration/shell-launcher/quickstart-kiosk.md index a064bca35f..600d9df1de 100644 --- a/windows/configuration/shell-launcher/quickstart-kiosk.md +++ b/windows/configuration/shell-launcher/quickstart-kiosk.md @@ -43,7 +43,9 @@ You can configure devices using the [AssignedAccess CSP][WIN-3]. | Setting | |--| -|- **OMA-URI:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
- **Data type:** string
- **Value:** [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)] | +|- **OMA-URI:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
- **Data type:** string
- **Value:** content of the following XML | + + [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)] #### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps) diff --git a/windows/configuration/toc.yml b/windows/configuration/toc.yml index 3905feae74..84222e90c6 100644 --- a/windows/configuration/toc.yml +++ b/windows/configuration/toc.yml @@ -11,8 +11,10 @@ items: href: background/index.md - name: Windows spotlight href: windows-spotlight/index.md -- name: Settings page visibility - href: settings/page-visibility.md +- name: Settings + items: + - name: Page visibility + href: settings/page-visibility.md - name: Microsoft Store href: store/toc.yml - name: Quick machine recovery From 74fceb143b730c6d8ef86127c791931069c30131 Mon Sep 17 00:00:00 2001 From: Gary Moore <5432776+garycentric@users.noreply.github.com> Date: Thu, 1 May 2025 09:40:21 -0700 Subject: [PATCH 4/4] Acrolinx: "exectuing" --- windows/configuration/shell-launcher/configure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/configuration/shell-launcher/configure.md b/windows/configuration/shell-launcher/configure.md index c9b773a3be..474ff83e21 100644 --- a/windows/configuration/shell-launcher/configure.md +++ b/windows/configuration/shell-launcher/configure.md @@ -171,7 +171,7 @@ You can configure devices using the [AssignedAccess CSP][WIN-3]. You can configure Shell Launcher by creating a provisioning package and then applying the provisioning package during image deployment time or at runtime: - If you're creating an installation media with settings for Shell Launcher included in the image, or you're applying a provisioning package during setup, you must enable Shell Launcher on the installation media with DISM for a provisioning package to successfully apply -- If exectuing the provisioning package at runtime, ensure to [enable Shell Launcher](#enable-shell-launcher) before applying the provisioning package +- If executing the provisioning package at runtime, ensure to [enable Shell Launcher](#enable-shell-launcher) before applying the provisioning package [!INCLUDE [provisioning-package-1](../../../includes/configure/provisioning-package-1.md)]