From a419ae88b1fae278e5cf12bc6808ff005ff392d3 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Thu, 11 Jan 2018 19:56:26 +0000 Subject: [PATCH 1/3] Merged PR 5254: Clarify note for AppLocker rules on kiosk --- windows/configuration/lock-down-windows-10-to-specific-apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/configuration/lock-down-windows-10-to-specific-apps.md b/windows/configuration/lock-down-windows-10-to-specific-apps.md index 1257f7682a..06e04ade22 100644 --- a/windows/configuration/lock-down-windows-10-to-specific-apps.md +++ b/windows/configuration/lock-down-windows-10-to-specific-apps.md @@ -111,7 +111,7 @@ The profile **Id** is a GUID attribute to uniquely identify the profile. You can Based on the purpose of the kiosk device, define the list of applications that are allowed to run. This list can contain both UWP apps and desktop apps. When the mult-app kiosk configuration is applied to a device, AppLocker rules will be generated to allow the apps that are listed in the configuration. >[!NOTE] ->You cannot manage AppLocker rules that are generated by the multi-app kiosk configuration in [MMC snap-ins](https://technet.microsoft.com/library/hh994629.aspx#BKMK_Using_Snapins). Avoid applying AppLocker rules to devices running the multi-app kiosk configuration. +>You cannot manage AppLocker rules that are generated by the multi-app kiosk configuration in [MMC snap-ins](https://technet.microsoft.com/library/hh994629.aspx#BKMK_Using_Snapins). Avoid creating AppLocker rules that conflict with AppLocker rules that are generated by the multi-app kiosk configuration. - For UWP apps, you need to provide the App User Model ID (AUMID). [Learn how to get the AUMID](https://go.microsoft.com/fwlink/p/?LinkId=614867), or [get the AUMID from the Start Layout XML](#startlayout). - For desktop apps, you need to specify the full path of the executable, which can contain one or more system environment variables in the form of %variableName% (i.e. %systemroot%, %windir%). From 80a528774c5bea315e99a8b0666e56d13ee0f034 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Thu, 11 Jan 2018 20:41:44 +0000 Subject: [PATCH 2/3] Merged PR 5256: Fix publish conflict Fix publish conflict --- windows/deployment/windows-10-deployment-scenarios.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/windows/deployment/windows-10-deployment-scenarios.md b/windows/deployment/windows-10-deployment-scenarios.md index 9a5db43f31..5fcff300eb 100644 --- a/windows/deployment/windows-10-deployment-scenarios.md +++ b/windows/deployment/windows-10-deployment-scenarios.md @@ -146,15 +146,9 @@ Modern deployment methods embrace both traditional on-prem and cloud services to ### Windows AutoPilot Windows AutoPilot is a new suite of capabilities designed to simplify and modernize the deployment and management of new Windows 10 PCs. Windows AutoPilot enables IT professionals to customize the Out of Box Experience (OOBE) for Windows 10 PCs and provide end users with a fully configured new Windows 10 device after just a few clicks. There are no images to deploy, no drivers to inject, and no infrastructure to manage. Users can go through the deployment process independently, without the need consult their IT administrator. -<<<<<<< HEAD For more information about Windows AutoPilot, see [Overview of Windows AutoPilot](https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot) and [Modernizing Windows deployment with Windows AutoPilot](https://blogs.technet.microsoft.com/windowsitpro/2017/06/29/modernizing-windows-deployment-with-windows-autopilot/). -======= - -For more information about Windows AutoPilot, see [Overview of Windows AutoPilot](https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot) and [Modernizing Windows deployment with Windows AutoPilot](https://blogs.technet.microsoft.com/windowsitpro/2017/06/29/modernizing-windows-deployment-with-windows-autopilot/). - ->>>>>>> 241cf4ccaccc0d9f3fb395c2bed11796951d7d69 ### In-place upgrade For existing computers running Windows 7, Windows 8, or Windows 8.1, the recommended path for organizations deploying Windows 10 leverages the Windows installation program (Setup.exe) to perform an in-place upgrade, which automatically preserves all data, settings, applications, and drivers from the existing operating system version. This requires the least IT effort, because there is no need for any complex deployment infrastructure. From 559dede7e0ec857c613290c4422278b99228a033 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Fri, 12 Jan 2018 00:35:39 +0000 Subject: [PATCH 3/3] Merged PR 5267: Fixed typo in error code Fixed typo in error code --- .../deployment/upgrade/resolve-windows-10-upgrade-errors.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md index bce822bcc6..f67599ce30 100644 --- a/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md +++ b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md @@ -7,7 +7,7 @@ ms.mktglfcycl: deploy ms.sitesec: library ms.pagetype: deploy author: greg-lindsay -ms.date: 10/16/2017 +ms.date: 01/11/2018 ms.localizationpriority: high --- @@ -571,7 +571,7 @@ For more information, see [How to perform a clean boot in Windows](https://suppo Code -800040005 - 0x20007 +80040005 - 0x20007