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

Merged PR 13714: clean up after merge conflict

Browse Source
This commit is contained in:
Jeanie Decker
2019-01-10 15:54:57 +00:00
parent 8a22f713d1
commit e9f6928dfa
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
windows/configuration/kiosk-methods.md
View File

@ -7,11 +7,6 @@ ms.sitesec: library
ms.pagetype: security
ms.localizationpriority: medium
author: jdeckerms
<<<<<<< HEAD
ms.date: 01/08/2019
=======
ms.date: 01/09/2019
>>>>>>> origin/master
---
# Configure kiosks and digital signs on Windows desktop editions

2
windows/configuration/kiosk-prepare.md
View File

@ -28,6 +28,7 @@ ms.date: 01/09/2019
>
>Kiosk mode is not supported over a remote desktop connection. Your kiosk users must sign in on the physical device that is set up as a kiosk.
## Configuration recommendations
For a more secure kiosk experience, we recommend that you make the following configuration changes to the device before you configure it as a kiosk:
@ -237,3 +238,4 @@ The following table describes some features that have interoperability issues we