diff --git a/windows/deployment/windows-autopilot/enrollment-status.md b/windows/deployment/windows-autopilot/enrollment-status.md index 1e4210ada6..fe8a3e7d65 100644 --- a/windows/deployment/windows-autopilot/enrollment-status.md +++ b/windows/deployment/windows-autopilot/enrollment-status.md @@ -6,7 +6,7 @@ ms.prod: w10 ms.technology: Windows ms.mktglfcycl: deploy ms.sitesec: library -ms.pagetype: +ms.pagetype: deploy ms.localizationpriority: medium author: greg-lindsay ms.author: greg-lindsay diff --git a/windows/deployment/windows-autopilot/existing-devices.md b/windows/deployment/windows-autopilot/existing-devices.md index 345d878ea7..3f06543ea7 100644 --- a/windows/deployment/windows-autopilot/existing-devices.md +++ b/windows/deployment/windows-autopilot/existing-devices.md @@ -9,7 +9,7 @@ ms.sitesec: library ms.pagetype: deploy author: greg-lindsay ms.author: greg-lindsay -ms.date: 10/19/2018 +ms.date: 10/22/2018 --- # Windows Autopilot for existing devices @@ -38,7 +38,13 @@ If desired, you can set up an [enrollment status page](https://docs.microsoft.co To enable and configure the enrollment and status page: 1. Open [Intune in the Azure portal](https://aka.ms/intuneportal). -2. [Set up an enrollment status page](https://docs.microsoft.com/intune/windows-enrollment-status). +2. Access **Intune > Device enrollment > Windows enrollment** and [Set up an enrollment status page](https://docs.microsoft.com/intune/windows-enrollment-status). +3. Access **Azure Active Directory > Mobility (MDM and MAM) > Microsoft Intune** and [Configure automatic MDM enrollment](https://docs.microsoft.com/en-us/sccm/mdm/deploy-use/enroll-hybrid-windows#enable-windows-10-automatic-enrollment) and configure the MDM user scope for some or all users. + +See the following examples. + +![enrollment status page](images/esp-config.png)

+![mdm](images/mdm-config.png) ### Create the JSON file diff --git a/windows/deployment/windows-autopilot/images/esp-config.png b/windows/deployment/windows-autopilot/images/esp-config.png new file mode 100644 index 0000000000..eb9f94661f Binary files /dev/null and b/windows/deployment/windows-autopilot/images/esp-config.png differ diff --git a/windows/deployment/windows-autopilot/images/mdm-config.png b/windows/deployment/windows-autopilot/images/mdm-config.png new file mode 100644 index 0000000000..0b2dd14a53 Binary files /dev/null and b/windows/deployment/windows-autopilot/images/mdm-config.png differ diff --git a/windows/security/threat-protection/auditing/how-to-list-xml-elements-in-eventdata.md b/windows/security/threat-protection/auditing/how-to-list-xml-elements-in-eventdata.md index dac39f14cd..7bfef9f9db 100644 --- a/windows/security/threat-protection/auditing/how-to-list-xml-elements-in-eventdata.md +++ b/windows/security/threat-protection/auditing/how-to-list-xml-elements-in-eventdata.md @@ -7,7 +7,7 @@ ms.sitesec: library ms.pagetype: security ms.localizationpriority: medium author: tedhardyMSFT -ms.date: 10/18/2018 +ms.date: 10/22/2018 --- # How to get a list of XML data name elements in EventData @@ -85,9 +85,9 @@ PS C:\WINDOWS\system32> $SecEvents.events[100].Template ## Mapping data name elements to the names in an event description -You can use the