Merge pull request #10838 from MicrosoftDocs/main
Some checks failed
(Scheduled) Publish to live / auto-publish (push) Has been cancelled
(Scheduled) Mark stale pull requests / stale (push) Has been cancelled

[AutoPublish] main to live - 05/01 10:30 PDT | 05/01 23:00 IST
This commit is contained in:
Rebecca Agiewich 2025-05-01 10:35:34 -07:00 committed by GitHub
commit 1c9a270dcf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 41 additions and 18 deletions

View File

@ -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,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)
You can configure devices using the [Policy CSP][CSP-1].
| Setting |
|--|

View File

@ -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,12 +159,19 @@ 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:
- 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)]
@ -233,7 +240,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.

View File

@ -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,18 @@ 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` <br>- **Data type:** string<br>- **Value:** content of the following XML |
[!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)]

View File

@ -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)]
@ -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 |
|--|

View File

@ -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

View File

@ -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
title: Windows 10
- id: windows-insider
title: Windows Insider