Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2icd

# Conflicts:
#	windows/deploy/provisioning-apply-package.md
#	windows/deploy/provisioning-create-package.md
#	windows/deploy/provisioning-how-it-works.md
#	windows/deploy/provisioning-install-icd.md
#	windows/deploy/provisioning-packages.md
#	windows/manage/configure-windows-10-taskbar.md
#	windows/manage/customize-and-export-start-layout.md

#	windows/manage/customize-windows-10-start-screens-by-using-group-policy.md

#	windows/manage/customize-windows-10-start-screens-by-using-mobile-device-management.md

#	windows/manage/customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md
#	windows/manage/lockdown-xml.md
#	windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
#	windows/manage/settings-that-can-be-locked-down.md
#	windows/manage/start-layout-xml-desktop.md
#	windows/manage/start-layout-xml-mobile.md
#	windows/manage/windows-10-start-layout-options-and-policies.md
#	windows/manage/windows-spotlight.md
This commit is contained in:
jdeckerMS
2017-02-21 12:07:25 -08:00
parent 24911562e2
commit 99ce7ba725
18 changed files with 1 additions and 3725 deletions

View File

@ -203,7 +203,7 @@ Apps Corner lets you set up a custom Start screen on your Windows 10 Mobile or
 
 ## Email notes
 ## Email notes - temp
from Lily: When you push down a SyncML for Assigned Access xml through the EnterpriseAssignedAccess CSP, it need to be escaped. But if you add the lockdown xml in the provisioning package, you dont need to escape the xml as ICD will do that when building the package. Providing an escaped xml in ICD will cause building the package fail.