merge

windows/configuration/assigned-access/configuration-file.md

@@ -90,7 +90,7 @@ A configuration file can contain one or more profiles. Each profile is identifie
 
 A profile can be one of two types:
 
-- `KioskModeApp`: is used to configure a kiosk experience. Users assigned this profile don't access the desktop, but only the Universal Windows Platform (UWP) application or Microsoft Edge running in full-screen above the Lock screen
+- `KioskModeApp`: is used to configure a kiosk experience. Users assigned this profile execute a Universal Windows Platform (UWP) application or Microsoft Edge running in full-screen
 - `AllAppList` is used to configure a restricted user experience. Users assigned this profile, access the desktop with the specific apps on the Start menu
 
 > [!IMPORTANT]

windows/configuration/assigned-access/configure-single-app-kiosk.md

@@ -7,7 +7,36 @@ ms.topic: overview
 
 # Configure a single-app kiosk with Assigned Access
 
+<<<<<<< HEAD:windows/configuration/assigned-access/configure-single-app-kiosk.md
 A single-app kiosk uses the Assigned Access feature to run a single application above the lock screen. When the kiosk account signs in, the app is launched automatically. The person using the kiosk can't do anything on the device outside of the kiosk app.
+=======
+Assigned Access is a Windows feature that you can use to configure a device as a kiosk or with a restricted user experience.
+
+When you configure a **kiosk experience**, a single Universal Windows Platform (UWP) application or Microsoft Edge is executed in full screen. Users can only use that application and once the kiosk app is closed, it automatically restarts. Practical examples include:
+
+- Public browsing
+- Interactive digital signage
+
+When you configure a **restricted user experience**, users can only execute a defined list of applications, with a tailored Start menu and Taskbar. Different policy settings and AppLocker rules are enforced, creating a locked down experience. The users can access a familiar Windows desktop, while limiting their access, reducing distractions, and potential for inadvertent uses. Ideal for shared devices, you can create different configurations for different users. Practical examples include:
+
+- Frontline worker devices
+- Student devices
+- Lab devices
+
+> [!NOTE]
+> When you configure a restricted user experience, different policy settings are applied to the device. Some policy settings apply to standard users only, and some to administrator accounts too. For more information, see [Assigned Access policy settings](policy-settings.md).
+
+## Requirements
+
+Here are the requirements for Assigned Access:
+
+- To use a kiosk experience, [User account control (UAC)](/windows/security/identity-protection/user-account-control/user-account-control-overview) must be enabled
+- To use a kiosk experience, you must sign in from the console. The kiosk experience isn't supported over a remote desktop connection
+
+[!INCLUDE [assigned-access](../../../includes/licensing/assigned-access.md)]
+
+## Configure a kiosk experience
+>>>>>>> 29fc1e82cb8d18c0059926e1e862a382aa6ae7a9:windows/configuration/assigned-access/overview.md
 
 There are several options to configure a kiosk experience. If you need to configure a single device with a local account, you can use:
 
@@ -145,7 +174,7 @@ Here are the steps to configure a kiosk using the Settings app:
     >[!NOTE]
     >If there are any local standard user accounts already, the **Create an account** dialog offers the option to **Choose an existing account**
 
-1. Choose the application to run when the kiosk account signs in. Only apps that can run above the lock screen are available in the list of apps to choose from. If you select **Microsoft Edge** as the kiosk app, you configure the following options:
+1. Choose the application to run when the kiosk account signs in. If you select **Microsoft Edge** as the kiosk app, you configure the following options:
 
     - Whether Microsoft Edge should display your website full-screen (digital sign) or with some browser controls available (public browser)
     - Which URL should be open when the kiosk accounts signs in

windows/configuration/assigned-access/index.md

@@ -23,7 +23,12 @@ When you configure a **restricted user experience**, users can only execute a de
 > [!NOTE]
 > When you configure a restricted user experience, different policy settings are applied to the device. Some policy settings apply to standard users only, and some to administrator accounts too. For more information, see [Assigned Access policy settings](policy-settings.md).
 
+<<<<<<< HEAD
 ## Requirements
+=======
+- **Assigned Access**: used to execute a single Universal Windows Platform (UWP) app or Microsoft Edge in full screen. When the kiosk account signs in, the kiosk app launches automatically. If the UWP app is closed, it automatically restarts
+- **Shell Launcher**: used to configure a device to execute a Windows desktop application as the user interface. The specified application replaces the default Windows shell (`Explorer.exe`) that usually runs when a user signs in
+>>>>>>> 29fc1e82cb8d18c0059926e1e862a382aa6ae7a9
 
 Here are the requirements for Assigned Access:
 

windows/configuration/assigned-access/quickstart-kiosk.md

@@ -77,7 +77,7 @@ Here are the steps to configure a kiosk using the Settings app:
     >[!NOTE]
     >If there are any local standard user accounts already, the **Create an account** dialog offers the option to **Choose an existing account**
 
-1. Choose the application to run when the kiosk account signs in. Only apps that can run above the lock screen are available in the list of apps to choose from. If you select **Microsoft Edge** as the kiosk app, you configure the following options:
+1. Choose the application to run when the kiosk account signs in. If you select **Microsoft Edge** as the kiosk app, you configure the following options:
 
     - Whether Microsoft Edge should display your website full-screen (digital sign) or with some browser controls available (public browser)
     - Which URL should be open when the kiosk accounts signs in

windows/configuration/assigned-access/recommendations.md

@@ -116,7 +116,7 @@ The following guidelines help you choose an appropriate Windows app for a kiosk
 
 - Windows apps must be provisioned or installed for the Assigned Access account before they can be selected as the Assigned Access app. [Learn how to provision and install apps](/windows/client-management/mdm/enterprise-app-management#install_your_apps)
 - UWP app updates can sometimes change the Application User Model ID (AUMID) of the app. In such scenario, you must update the Assigned Access settings to execute the updated app, because Assigned Access uses the AUMID to determine the app to launch
-- The app must be able to run above the lock screen. If the app can't run above the lock screen, it can't be used as a kiosk app
+- The app must be able to run *above* the lock screen. If the app can't run above the lock screen, it can't be used as a kiosk app
 - Some apps can launch other apps. Assigned Access in kiosk mode prevents Windows apps from launching other apps. Avoid selecting Windows apps that are designed to launch other apps as part of their core functionality
 - Microsoft Edge includes support for kiosk mode. To learn more, see [Microsoft Edge kiosk mode](/microsoft-edge/deploy/microsoft-edge-kiosk-mode-deploy)
 - Don't select Windows apps that might expose information you don't want to show in your kiosk, since kiosk usually means anonymous access and locates in a public setting. For example, an app that has a file picker allows the user to gain access to files and folders on the user's system, avoid selecting these types of apps if they provide unnecessary data access