From d51211ecb56f418d3906d522363a53065f9fae15 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Wed, 15 Feb 2017 13:29:04 -0800 Subject: [PATCH] sync --- windows/configure/index.md | 3 +-- windows/configure/kiosk-shared-pc.md | 17 +++++++++++++---- .../set-up-a-device-for-anyone-to-use.md | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/windows/configure/index.md b/windows/configure/index.md index 26c1b134bf..bbe9b61e15 100644 --- a/windows/configure/index.md +++ b/windows/configure/index.md @@ -24,8 +24,7 @@ Enterprises often need to apply custom configurations to devices for their users | [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md) | These topics help you configure Windows 10 devices to be shared by multiple users or to run as a kiosk device that runs a single app. | | [Configure Windows 10 Mobile devices](configure-mobile.md) | These topics help you configure the features and apps and Start screen for a device running Windows 10 Mobile, as well as how to configure a kiosk device that runs a single app. | | [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md) | A standard, customized Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. Configuring the taskbar allows the organization to pin useful apps for their employees and to remove apps that are pinned by default. | -| [Cortana integration in your business or enterprise](cortana-at-work-overview.md) | The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. - | +| [Cortana integration in your business or enterprise](cortana-at-work-overview.md) | The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. | | [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md) | IT Pros can configure access to Windows Store for client computers in their organization. For some organizations, business policies require blocking access to Windows Store. | | [Provisioning packages for Windows 10](provisioning-packages.md) | Learn how to use the Windows Configuration Designer and provisioning packages to easily configure multiple devices. | | [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md) | Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. | diff --git a/windows/configure/kiosk-shared-pc.md b/windows/configure/kiosk-shared-pc.md index e434735152..2afc67e022 100644 --- a/windows/configure/kiosk-shared-pc.md +++ b/windows/configure/kiosk-shared-pc.md @@ -1,14 +1,23 @@ --- -title: kiosk shared pc (Windows 10) +title: Configure kiosk and shared devices running Windows desktop editions (Windows 10) description: -keywords: Windows 10, MDM, WSUS, Windows update ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library ms.pagetype: security -localizationpriority: high +localizationpriority: medium author: jdeckerMS --- -# kiosk shared pc +# Configure kiosk and shared devices running Windows desktop editions +Some desktop devices in an enterprise serve a special purpose, such as a common PC in a touchdown space that any employee can sign in to, or a PC in the lobby that customers can use to view your product catalog. Windows 10 is easy to configure for shared use or for use as a kiosk (single app). + +## In this section + +| Topic | Description | +| --- | --- | +| [Set up a shared or guest PC with Windows 10](set-up-a-device-for-anyone-to-use.md) | Windows 10, version 1607, introduced *shared PC mode*, which optimizes Windows 10 for shared use scenarios, such as touchdown spaces in an enterprise and temporary customer use in retail. | +| [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | You can configure a device running Windows 10 Pro, Windows 10 Enterprise, or Windows 10 Education as a kiosk device, so that users can only interact with a single application that you select. | +| [Guidelines for choosing an app for assigned access (kiosk mode)](guidelines-for-assigned-access-app.md) | You can choose almost any Windows app for assigned access; however, some apps may not provide a good user experience. This topic provides guidelines to help you choose an approprate app for a kiosk device. | +| [Lock down Windows 10 to specific apps (AppLocker)](lock-down-windows-10-to-specific-apps.md) | Learn how to configure a device running Windows 10 Enterprise or Windows 10 Education so that users can only run a few specific apps. The result is similar to a kiosk device, but with multiple apps available. For example, you might set up a library computer so that users can search the catalog and browse the Internet, but can't run any other apps or change computer settings. | \ No newline at end of file diff --git a/windows/configure/set-up-a-device-for-anyone-to-use.md b/windows/configure/set-up-a-device-for-anyone-to-use.md index f274498ed1..a9f38ff67a 100644 --- a/windows/configure/set-up-a-device-for-anyone-to-use.md +++ b/windows/configure/set-up-a-device-for-anyone-to-use.md @@ -1,5 +1,5 @@ --- -title: Set up a device for anyone to use (kiosk mode) (Windows 10) +title: Set up a device for anyone to use in kiosk mode (Windows 10) description: You can configure Windows 10 as a kiosk device, so that users can only interact with a single app. ms.assetid: F1F4FF19-188C-4CDC-AABA-977639C53CA8 keywords: ["kiosk", "lockdown", "assigned access"]