deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-27 08:13:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #9956 from paolomatarazzo/pm-240616-kiosk

Browse Source 
[Kiosk] Restructured OS Edition tables.
This commit is contained in:
Jeff Borsecnik
2024-06-19 10:14:03 -07:00
committed by GitHub
parent 0edfd1d7a4 dd64db4778
commit 60a9213226
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/licensing/assigned-access.md
View File

@ -5,14 +5,23 @@ ms.date: 09/18/2023
ms.topic: include ms.topic: include
--- ---
## Windows edition and licensing requirements <!--## Windows edition and licensing requirements-->
## Windows edition requirements
The following table lists the Windows editions that support Assigned Access: The following table lists the Windows editions that support Assigned Access:
|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |Edition|Assigned Access support|
|:---:|:---:|:---:|:---:| |:---|:---:|
|Yes|Yes|Yes|Yes| |Education|✅|
|Enterprise |✅|
|Enterprise LTSC|✅|
|IoT Enterprise | ✅|
|IoT Enterprise LTSC|✅|
|Pro Education|✅|
|Pro|✅|
<!--
Assigned Access license entitlements are granted by the following licenses: Assigned Access license entitlements are granted by the following licenses:
|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5|
@ -20,3 +29,4 @@ Assigned Access license entitlements are granted by the following licenses:
|Yes|Yes|Yes|Yes|Yes| |Yes|Yes|Yes|Yes|Yes|
For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing).
-->

19
includes/licensing/shell-launcher.md
View File

@ -5,14 +5,23 @@ ms.date: 09/18/2023
ms.topic: include ms.topic: include
--- ---
## Windows edition and licensing requirements <!--## Windows edition and licensing requirements-->
## Windows edition requirements
The following table lists the Windows editions that support Shell Launcher: The following table lists the Windows editions that support Shell Launcher:
|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |Edition|Shell Launcher support|
|:---:|:---:|:---:|:---:| |:---|:---:|
|No|Yes|No|Yes| |Education|✅|
|Enterprise |✅|
|Enterprise LTSC|✅|
|IoT Enterprise | ✅|
|IoT Enterprise LTSC|✅|
|Pro Education|❌|
|Pro|❌|
<!--
Shell Launcher license entitlements are granted by the following licenses: Shell Launcher license entitlements are granted by the following licenses:
|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5|
@ -20,3 +29,5 @@ Shell Launcher license entitlements are granted by the following licenses:
|No|Yes|Yes|Yes|Yes| |No|Yes|Yes|Yes|Yes|
For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing).
-->

4
windows/configuration/assigned-access/shell-launcher/index.md
View File

@ -1,7 +1,7 @@
--- ---
title: What is Shell Launcher? title: What is Shell Launcher?
description: Learn how to configure devices with Shell Launcher. description: Learn how to configure devices with Shell Launcher.
ms.date: 02/29/2024 ms.date: 06/18/2024
ms.topic: overview ms.topic: overview
--- ---
@ -127,3 +127,5 @@ Depending on your configuration, you can have a user to automatically sign in to
<!--links--> <!--links-->
[MEM-1]: /mem/intune/configuration/custom-settings-windows-10 [MEM-1]: /mem/intune/configuration/custom-settings-windows-10
[MEM-2]: /mem/intune/fundamentals/licenses#device-only-licenses
[WIN-3]: /windows/client-management/mdm/assignedaccess-csp