Merge remote-tracking branch 'origin/master' into atp-api-danm

windows/client-management/mdm/firewall-csp.md

@@ -266,9 +266,9 @@ Sample syncxml to provision the firewall settings to evaluate
 <li>"DNS"</li>
 <li>"WINS"</li>
 <li>"Intranet"</li>
-<li>"RemoteCorpNetwork"</li>
+<li>"RmtIntranet"</li>
 <li>"Internet"</li>
-<li>"PlayToRenderers"</li>
+<li>"Ply2Renders"</li>
 <li>"LocalSubnet" indicates any local address on the local subnet. This token is not case-sensitive.</li>
 <li>A subnet can be specified using either the subnet mask or network prefix notation. If neither a subnet mask not a network prefix is specified, the subnet mask defaults to 255.255.255.255.</li>
 <li>A valid IPv6 address.</li>

windows/deployment/update/device-health-monitor.md

@@ -45,7 +45,6 @@ Use of Windows Analytics Device Health requires one of the following licenses:
 - Windows 10 Enterprise E3 or E5 per-device or per-user subscription (including Microsoft 365 F1, E3, or E5)
 - Windows 10 Education A3 or A5 (including Microsoft 365 Education A3 or A5)
 - Windows VDA E3 or E5 per-device or per-user subscription
-- Windows Server 2016 and on
 
 
 You don't have to install Windows 10 Enterprise on a per-device basis--you just need enough of the above licenses for the number of devices using Device Health. 

windows/deployment/update/servicing-stack-updates.md

@@ -34,6 +34,6 @@ Typically, the improvements are reliability, security, and performance improveme
 
 ## Installation notes
 
-•	Servicing stack updates contain the full servicing stack; as a result, typically administrators only need to install the latest servicing stack update for the operating system.
+* Servicing stack updates contain the full servicing stack; as a result, typically administrators only need to install the latest servicing stack update for the operating system.
-•	Installing servicing stack update does not require restarting the device, so installation should not be disruptive. 
+* Installing servicing stack update does not require restarting the device, so installation should not be disruptive. 
-•	Servicing stack update releases are specific to the operating system version (build number), much like quality updates.
+* Servicing stack update releases are specific to the operating system version (build number), much like quality updates.

windows/deployment/windows-autopilot/TOC.md

@@ -17,7 +17,6 @@
 ### [Administering Autopilot via Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles)
 ### [Administering Autopilot via Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot)
 ### [Administering Autopilot via Microsoft 365 Business & Office 365 Admin portal](https://support.office.com/article/Create-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa)
-### [Administering Autopilot via Partner Center](https://msdn.microsoft.com/partner-center/autopilot)
 ## Getting started
 ### [Demonstrate Autopilot deployment on a VM](demonstrate-deployment-on-vm.md)
 ## [Troubleshooting](troubleshooting.md)

windows/deployment/windows-autopilot/windows-10-autopilot.md

@@ -1,7 +1,7 @@
 ---
 title: Overview of Windows Autopilot
 description: This topic goes over Windows Autopilot and how it helps setup OOBE Windows 10 devices.
-keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
+keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, msfb, intune
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.localizationpriority: medium
@@ -9,7 +9,7 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: coreyp-at-msft
 ms.author: coreyp
-ms.date: 05/09/2018
+ms.date: 08/22/2018
 ---
 
 # Overview of Windows Autopilot
@@ -89,7 +89,6 @@ For guidance on how to register devices, configure and apply deployment profiles
 * [Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles)
 * [Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot)
 * [Microsoft 365 Business & Office 365 Admin](https://support.office.com/article/Create-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa)
-* [Partner Center](https://msdn.microsoft.com/partner-center/autopilot)
 
 ##### Configure company branding for OOBE
 

windows/privacy/enhanced-diagnostic-data-windows-analytics-events-and-fields.md

@@ -109,7 +109,6 @@ The following fields are available:
 
 - **isSystemManagedAccount:** Indicates if the user's account is System Managed
 - **isUnlockScenario:** Flag indicating whether the event is a Logon or an Unlock
-- **PartA_UserSid:** The security identifier of the user
 - **userType:** Indicates the user type: 0 = unknown; 1 = local; 2 = Active Directory domain user; 3 = Microsoft Account; 4 = Azure Active Directory user
 
 ## Microsoft.Windows.LogonController.SignInFailure
@@ -251,3 +250,8 @@ The following fields are available:
 - **WindowFlags:** Flags denoting runtime properties of an app window
 - **WindowHeight:** Number of vertical pixels in the application window
 - **WindowWidth:** Number of horizontal pixels in the application window
+
+# Revisions to the diagnostic data events and fields
+
+## PartA_UserSid removed
+A previous revision of this list stated that a field named PartA_UserSid was a member of the event Microsoft.Windows.LogonController.LogonAndUnlockSubmit. This was incorrect. The list has been updated to reflect that no such field is present in the event. Note that you can use the Windows Diagnostic Data Viewer to review the contents of the event.

windows/security/identity-protection/vpn/vpn-profile-options.md

@@ -304,7 +304,7 @@ After you configure the settings that you want using ProfileXML, you can apply i
 5. Choose **Windows 10 and later** as the platform.
 6. Choose **Custom** as the profile type and click **Add**.
 8. Enter a name and (optionally) a description.
-9. Enter the OMA-URI **./user/vendor/MSFT/_VPN profile name_/ProfileXML**.
+9. Enter the OMA-URI **./user/vendor/MSFT/VPNv2/_VPN profile name_/ProfileXML**.
 10. Set Data type to **String (XML file)**.
 11. Upload the profile XML file.
 12. Click **OK**.