diff --git a/windows/configuration/assigned-access/quickstart-kiosk.md b/windows/configuration/assigned-access/quickstart-kiosk.md index b0583377da..cb39046a70 100644 --- a/windows/configuration/assigned-access/quickstart-kiosk.md +++ b/windows/configuration/assigned-access/quickstart-kiosk.md @@ -98,7 +98,7 @@ After the settings are applied, reboot the device. A local user account is autom > [!div class="nextstepaction"] > Learn more about Assigned Access and how to configure it: > -> [Assigned Access overview](overview.md) +> [Assigned Access overview](index.md) [WIN-3]: /windows/client-management/mdm/assignedaccess-csp [MEM-1]: /mem/intune/configuration/custom-settings-windows-10 diff --git a/windows/configuration/assigned-access/quickstart-restricted-user-experience.md b/windows/configuration/assigned-access/quickstart-restricted-user-experience.md index 75d9bb74c1..efef65296b 100644 --- a/windows/configuration/assigned-access/quickstart-restricted-user-experience.md +++ b/windows/configuration/assigned-access/quickstart-restricted-user-experience.md @@ -85,7 +85,7 @@ After the settings are applied, reboot the device. A local user account is autom > [!div class="nextstepaction"] > Learn more about Assigned Access and how to configure it: > -> [Assigned Access overview](overview.md) +> [Assigned Access overview](index.md) diff --git a/windows/configuration/assigned-access/recommendations.md b/windows/configuration/assigned-access/recommendations.md index 10a4e13dcf..f047d5813d 100644 --- a/windows/configuration/assigned-access/recommendations.md +++ b/windows/configuration/assigned-access/recommendations.md @@ -20,7 +20,7 @@ Consider enabling *automatic sign-in* for your kiosk device. When the device res You can configure the Assigned Access and Shell Launcher XML files with an account to sign-in automatically. For more information, review the articles: - [Create an Assigned Access configuration XML file](configuration-file.md) -- [Create a Shell Launcher configuration file](shell-launcher/configuration-file.md) +- [Create a Shell Launcher configuration file](../shell-launcher/configuration-file.md) Alternatively, you can edit the Registry to have an account sign in automatically: diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json index 22924a43cc..954b3313fb 100644 --- a/windows/configuration/docfx.json +++ b/windows/configuration/docfx.json @@ -84,14 +84,16 @@ "custom-logon//**/*.yml": "terrywarwick", "keyboard-filter//**/*.md": "terrywarwick", "keyboard-filter//**/*.yml": "terrywarwick", + "kiosk//**/*.md": "paolomatarazzo", + "kiosk//**/*.yml": "paolomatarazzo", "lock-screen//**/*.md": "paolomatarazzo", "lock-screen//**/*.yml": "paolomatarazzo", "provisioning-packages//**/*.md": "vinaypamnani-msft", "provisioning-packages//**/*.yml": "vinaypamnani-msft", "shared-pc//**/*.md": "paolomatarazzo", "shared-pc//**/*.yml": "paolomatarazzo", - "shell-launcher//**/*.md": "terrywarwick", - "shell-launcher//**/*.yml": "terrywarwick", + "shell-launcher//**/*.md": "paolomatarazzo", + "shell-launcher//**/*.yml": "paolomatarazzo", "start//**/*.md": "paolomatarazzo", "start//**/*.yml": "paolomatarazzo", "store//**/*.md": "paolomatarazzo", @@ -119,13 +121,15 @@ "lock-screen//**/*.md": "paoloma", "keyboard-filter//**/*.md": "twarwick", "keyboard-filter//**/*.yml": "twarwick", + "kiosk//**/*.md": "paoloma", + "kiosk//**/*.yml": "paoloma", "lock-screen//**/*.yml": "paoloma", "provisioning-packages//**/*.md": "vinpa", "provisioning-packages//**/*.yml": "vinpa", "shared-pc//**/*.md": "paoloma", "shared-pc//**/*.yml": "paoloma", - "shell-launcher//**/*.md": "twarwick", - "shell-launcher//**/*.yml": "twarwick", + "shell-launcher//**/*.md": "paoloma", + "shell-launcher//**/*.yml": "paoloma", "start//**/*.md": "paoloma", "start//**/*.yml": "paoloma", "store//**/*.md": "paoloma", diff --git a/windows/configuration/index.yml b/windows/configuration/index.yml index a1e1606862..c84e3b6be5 100644 --- a/windows/configuration/index.yml +++ b/windows/configuration/index.yml @@ -38,20 +38,18 @@ landingContent: linkLists: - linkListType: concept links: + - text: Kiosk options in Windows + url: kiosk/index.md - text: What is Assigned Access? - url: assigned-access/overview.md - - text: What is Shell Launcher? - url: assigned-access/shell-launcher/index.md - - linkListType: how-to-guide - links: - - text: Configure kiosks and restricted user experiences url: assigned-access/index.md + - text: What is Shell Launcher? + url: shell-launcher/index.md - linkListType: quickstart links: - text: Configure a kiosk with Assigned Access url: assigned-access/quickstart-kiosk.md - text: Configure a kiosk with Shell Launcher - url: assigned-access/shell-launcher/quickstart-kiosk.md + url: shell-launcher/quickstart-kiosk.md - text: Configure a restricted user experience with Assigned Access url: assigned-access/quickstart-restricted-user-experience.md - linkListType: reference @@ -59,7 +57,7 @@ landingContent: - text: Assigned Access XML Schema Definition (XSD) url: assigned-access/xsd.md - text: Shell Launcher XML Schema Definition (XSD) - url: assigned-access/shell-launcher/xsd.md + url: shell-launcher/xsd.md - title: Configure shared devices linkLists: diff --git a/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md b/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md index 80c1a38048..8c63049b2d 100644 --- a/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md +++ b/windows/configuration/provisioning-packages/provision-pcs-for-initial-deployment.md @@ -12,7 +12,7 @@ This article explains how to create and apply a provisioning package that contai The following wizard options provide a simple interface for configuring common settings for desktop and kiosk devices: - [Instructions for the desktop wizard](#start-a-new-project) -- [Instructions for the kiosk wizard](../assigned-access/overview.md) +- [Instructions for the kiosk wizard](../assigned-access/index.md) - [Instructions for the HoloLens wizard](/hololens/hololens-provisioning#provisioning-package-hololens-wizard) - [Instructions for the Surface Hub wizard](/surface-hub/provisioning-packages-for-surface-hub) diff --git a/windows/configuration/provisioning-packages/provisioning-packages.md b/windows/configuration/provisioning-packages/provisioning-packages.md index 14273f9e99..5f4740e31d 100644 --- a/windows/configuration/provisioning-packages/provisioning-packages.md +++ b/windows/configuration/provisioning-packages/provisioning-packages.md @@ -59,7 +59,7 @@ WCD supports the following scenarios for IT administrators: Windows Configuration Designer provides the following simple provisioning scenarios: - [Instructions for the desktop wizard](provision-pcs-for-initial-deployment.md) -- [Instructions for the kiosk wizard](../assigned-access/overview.md) +- [Instructions for the kiosk wizard](../assigned-access/index.md) - [Instructions for the HoloLens wizard](/hololens/hololens-provisioning#provisioning-package-hololens-wizard) - [Instructions for the Surface Hub wizard](/surface-hub/provisioning-packages-for-surface-hub) diff --git a/windows/configuration/shell-launcher/index.md b/windows/configuration/shell-launcher/index.md index ed9e38ff70..71ef605040 100644 --- a/windows/configuration/shell-launcher/index.md +++ b/windows/configuration/shell-launcher/index.md @@ -25,7 +25,7 @@ With Shell Launcher, you can use features and methods to control access to other Shell Launcher is part of the Assigned Access feature, which allows you to configure kiosks or restricted user experiences. To learn about the differences between Shell Launcher and the other options offered by Assigned Access, see [Windows kiosks and restricted user experiences](../kiosk/index.md). -[!INCLUDE [shell-launcher](../../../../includes/licensing/shell-launcher.md)] +[!INCLUDE [shell-launcher](../../../includes/licensing/shell-launcher.md)] ## Limitations @@ -44,7 +44,7 @@ The configuration of Shell Launcher is done using an XML file. The XML file is a To learn how to configure the Shell Launcher XML file, see [Create a Shell Launcher configuration file](configuration-file.md). -[!INCLUDE [tab-intro](../../../../includes/configure/tab-intro.md)] +[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] #### [:::image type="icon" source="../../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune) @@ -57,16 +57,16 @@ Assign the policy to a group that contains as members the devices that you want #### [:::image type="icon" source="../../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg) -[!INCLUDE [provisioning-package-1](../../../../includes/configure/provisioning-package-1.md)] +[!INCLUDE [provisioning-package-1](../../../includes/configure/provisioning-package-1.md)] - **Path:** `SMISettings/ShellLauncher` - **Value:** depends on specific settings -[!INCLUDE [provisioning-package-2](../../../../includes/configure/provisioning-package-2.md)] +[!INCLUDE [provisioning-package-2](../../../includes/configure/provisioning-package-2.md)] -#### [:::image type="icon" source="../../images/icons/powershell.svg"::: **PowerShell**](#tab/ps) +#### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps) -[!INCLUDE [powershell-wmi-bridge-1](../../../../includes/configure/powershell-wmi-bridge-1.md)] +[!INCLUDE [powershell-wmi-bridge-1](../../../includes/configure/powershell-wmi-bridge-1.md)] ```PowerShell $shellLauncherConfiguration = @" @@ -105,7 +105,7 @@ if($cimSetError) { Write-Output "Successfully applied Shell Launcher configuration" ``` -[!INCLUDE [powershell-wmi-bridge-2](../../../../includes/configure/powershell-wmi-bridge-2.md)] +[!INCLUDE [powershell-wmi-bridge-2](../../../includes/configure/powershell-wmi-bridge-2.md)] --- diff --git a/windows/configuration/shell-launcher/quickstart-kiosk.md b/windows/configuration/shell-launcher/quickstart-kiosk.md index c843e767a5..48265cbe86 100644 --- a/windows/configuration/shell-launcher/quickstart-kiosk.md +++ b/windows/configuration/shell-launcher/quickstart-kiosk.md @@ -22,7 +22,7 @@ The examples can be modified to fit your specific requirements. For example, you ## Configure a kiosk device -[!INCLUDE [tab-intro](../../../../includes/configure/tab-intro.md)] +[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)] #### [:::image type="icon" source="../../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune) @@ -42,13 +42,13 @@ Alternatively, you can configure devices using a [custom policy][MEM-1] with the [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)] -#### [:::image type="icon" source="../../images/icons/powershell.svg"::: **PowerShell**](#tab/ps) +#### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps) -[!INCLUDE [powershell-wmi-bridge-1](../../../../includes/configure/powershell-wmi-bridge-1.md)] +[!INCLUDE [powershell-wmi-bridge-1](../../../includes/configure/powershell-wmi-bridge-1.md)] [!INCLUDE [quickstart-ps](includes/quickstart-ps.md)] -[!INCLUDE [powershell-wmi-bridge-2](../../../../includes/configure/powershell-wmi-bridge-2.md)] +[!INCLUDE [powershell-wmi-bridge-2](../../../includes/configure/powershell-wmi-bridge-2.md)] ---