Merged PR 10865: from master

browsers/edge/includes/allow-config-updates-books-include.md

@@ -1,5 +1,5 @@
 <!-- ## Allow configuration updates for the Books Library -->
->*Supported versions: Microsoft Edge on Windows 10, version 1802 or later*<br>
+>*Supported versions: Microsoft Edge on Windows 10, version 1803 or later*<br>
 >*Default setting:  Enabled or not configured (Allowed)*
 
 [!INCLUDE [allow-configuration-updates-for-books-library-shortdesc](../shortdesc/allow-configuration-updates-for-books-library-shortdesc.md)]

browsers/edge/includes/allow-ext-telemetry-books-tab-include.md

@@ -1,5 +1,5 @@
 <!-- ## Allow extended telemetry for the Books tab -->
->*Supported versions: Microsoft Edge on Windows 10, version 1802 or later*<br>
+>*Supported versions: Microsoft Edge on Windows 10, version 1803 or later*<br>
 >*Default setting:  Disabled or not configured (Gather and send only basic diagnostic data)*
 
 [!INCLUDE [allow-extended-telemetry-for-books-tab-shortdesc](../shortdesc/allow-extended-telemetry-for-books-tab-shortdesc.md)]
@@ -32,4 +32,4 @@
 - **Value type:** REG_DWORD
 
 
-<hr>
+<hr>

mdop/mbam-v25/high-level-architecture-of-mbam-25-with-stand-alone-topology.md

@@ -109,7 +109,7 @@ This feature is configured on a computer running Windows Server.
 The **monitoring web services** are used by the MBAM Client and the websites to communicate to the database.
 
 **Important**  
-The Monitoring Web Service is no longer available in Microsoft BitLocker Administration and Monitoring (MBAM) 2.5 SP1 since the MBAM Client and the websites communicate directly with the Recovery Database.
+The Monitoring Web Service is no longer available in Microsoft BitLocker Administration and Monitoring (MBAM) 2.5 SP1 since the MBAM websites communicate directly with the Recovery Database.
 
  
 

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**.

windows/security/threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md

@@ -1,15 +1,15 @@
 ---
-title: Windows Defender Application Control Configurable Code Integrity and Virtualization-based security  (Windows 10)
+title: Device Guard is the combination of Windows Defender Application Control and Virtualization-based security (Windows 10)
-description: Microsoft Windows 10 has a feature set that consists of both hardware and software system integrity hardening capabilites that revolutionize the Windows operating system’s security.
+description: Device Guard consists of both hardware and software system integrity hardening capabilites that can be deployed separately or in combination.
 keywords: virtualization, security, malware
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.localizationpriority: medium
 author: mdsakibMSFT
-ms.date: 04/19/2018
+ms.date: 08/23/2018
 ---
 
-# Windows Defender Application Control Configurable Code Integrity and Virtualization-based security (aka Windows Defender Device Guard)
+# Device Guard: Windows Defender Application Control Configurable Code Integrity and Virtualization-based security
 
 **Applies to**
 -   Windows 10

windows/security/threat-protection/intelligence/TOC.md

@@ -34,6 +34,8 @@
 
 ## [Safety Scanner download](safety-scanner-download.md)
 
+## [Industry antivirus tests](transparency-report.md)
+
 ## [Industry collaboration programs](cybersecurity-industry-partners.md)
 
 ### [Virus information alliance](virus-information-alliance-criteria.md)

windows/security/threat-protection/intelligence/transparency-report.md

@@ -0,0 +1,89 @@
+---
+title: Industry antivirus tests
+description: Industry antivirus tests landing page
+keywords: security, malware
+ms.prod: w10
+ms.mktglfcycl: secure
+ms.sitesec: library
+ms.localizationpriority: medium
+ms.author: ellevin
+author: levinec
+ms.date: 08/17/2018
+---
+
+# Top scoring in industry antivirus tests
+
+[Windows Defender Antivirus](https://docs.microsoft.com/windows/security/threat-protection/windows-defender-antivirus/windows-defender-antivirus-in-windows-10?ocid=cx-docs-avreports) **consistently achieves high scores** from independent tests, displaying how it is a top choice in the antivirus market.
+
+We want to be transparent and have gathered top industry reports that demonstrate our enterprise antivirus capabilities. Note that these tests only provide results for antivirus and do not test for additional security protections.
+
+In the real world, millions of devices are protected from cyberattacks every day, sometimes [milliseconds after a campaign starts](https://cloudblogs.microsoft.com/microsoftsecure/2018/03/07/behavior-monitoring-combined-with-machine-learning-spoils-a-massive-dofoil-coin-mining-campaign?ocid=cx-docs-avreports). In many cases, customers might not even know they were protected. That's because Windows Defender Advanced Threat Protection ([Windows Defender ATP](https://www.microsoft.com/WindowsForBusiness/windows-atp?ocid=cx-docs-avreports)) [next generation protection](https://www.youtube.com/watch?v=Xy3MOxkX_o4) detects and stops malware at first sight by using predictive technologies, [machine learning](https://cloudblogs.microsoft.com/microsoftsecure/2018/06/07/machine-learning-vs-social-engineering?ocid=cx-docs-avreports), [artificial intelligence](https://cloudblogs.microsoft.com/microsoftsecure/2018/02/14/how-artificial-intelligence-stopped-an-emotet-outbreak?ocid=cx-docs-avreports), behavioral analysis, and other advanced technologies.
+
+> [!TIP]
+> Learn why [Windows Defender Antivirus is the most deployed in the enterprise](https://cloudblogs.microsoft.com/microsoftsecure/2018/03/22/why-windows-defender-antivirus-is-the-most-deployed-in-the-enterprise?ocid=cx-docs-avreports).
+
+<br></br><br></br>
+![AV-TEST logo](./images/av-test-logo.png)
+
+## AV-TEST: Perfect protection score of 6.0/6.0 in the latest test
+
+**[Analysis of the latest AV-TEST results](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE2v60I?ocid=cx-docs-avreports)**
+
+The AV-TEST Product Review and Certification Report tests on three categories: protection, performance, and usability. The scores listed below are for the protection category which has two scores: real world testing and the AV-TEST reference set (known as "prevalent malware").
+
+**Real-World testing** as defined by AV-TEST attempts to test protection against zero-day malware attacks, inclusive of web and email threats.
+
+**Prevalent malware** as defined by AV-TEST attempts to test detection of widespread and prevalent malware discovered in the last four weeks.
+
+The below scores are the results of AV-TEST's evaluations on **Windows Defender Antivirus**.
+
+|Month (2018)|Real-World test score| Prevalent malware test score | AV-TEST report| Microsoft analysis|
+|---|---|---|---|---|
+|January| 100.00%| 99.92%| [Report (Jan-Feb)](https://www.av-test.org/en/antivirus/home-windows/windows-7/february-2018/kaspersky-lab-internet-security-18.0-180557/)| [Analysis (Jan-Feb)](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE27O5A?ocid=cx-docs-avreports)|
+|February| 100.00% | 100.00%|[Report (Jan-Feb)](https://www.av-test.org/en/antivirus/home-windows/windows-7/february-2018/kaspersky-lab-internet-security-18.0-180557/)| [Analysis (Jan-Feb)](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE27O5A?ocid=cx-docs-avreports)|
+March |98.00%| 100.00%|[Report (Mar-Apr)](https://www.av-test.org/en/antivirus/business-windows-client/windows-10/april-2018/microsoft-windows-defender-antivirus-4.12-181574/)|[Analysis (Mar-Apr)](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE2ouJA?ocid=cx-docs-avreports)|
+April|100.00%| 100.00%|[Report (Mar-Apr)](https://www.av-test.org/en/antivirus/business-windows-client/windows-10/april-2018/microsoft-windows-defender-antivirus-4.12-181574/)|[Analysis (Mar-Apr)](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE2ouJA?ocid=cx-docs-avreports)|
+May|100.00%| 100.00%| [Report (May-Jun)](https://www.av-test.org/en/antivirus/business-windows-client/windows-10/june-2018/microsoft-windows-defender-antivirus-4.12-182374/) |[Analysis (May-Jun)](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE2v60I?ocid=cx-docs-avreports)  <sup>**Latest**</sup>|
+June|100.00%| 100.00%| [Report (May-Jun)](https://www.av-test.org/en/antivirus/business-windows-client/windows-10/june-2018/microsoft-windows-defender-antivirus-4.12-182374/)|[Analysis (May-Jun)](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE2v60I?ocid=cx-docs-avreports) <sup>**Latest**</sup>|
+
+|||
+|---|---|
+|![Graph describing Real-World detection rate](./images/RealWorld-67-percent.png)|![Graph describing Prevalent Malware](./images/PrevalentMalware-67-percent.png)|
+<br></br>
+
+![AV-Comparatives Logo](./images/av-comparatives-logo-3.png)
+
+## AV-Comparatives: Perfect protection rating of 100% in the latest test
+
+AV-Comparatives is an independent organization offering systematic testing for security software such as PC/Mac-based antivirus products and mobile security solutions.
+
+The  **Real-World Protection Test (Enterprise)** as defined by AV-Comparatives attempts to evaluate the “real-world” protection capabilities with default settings. The goal is to find out whether the security software protects the computer by either hindering the malware from changing any systems or remediating all changes if any were made.
+
+The **Malware Protection Test Enterprise** as defined by AV-Comparatives attempts to assesses a security program’s ability to protect a system against infection by malicious files before, during or after execution. It is only tested every six months.
+
+The below scores are the results of AV-Comparatives tests on **Windows Defender Antivirus**. The scores represent the percentage of blocked malware.
+
+|Month (2018)| Real-World test score| Malware test score (every 6 months)|
+|---|---|---|
+|February| 100.00%| N/A|
+|March| 94.40%| 99.90%|
+|April| 96.40%| N/A|
+|May| 100.00%| N/A|
+|June| 99.50%| N/A|
+|July| 100.00%| N/A|
+
+* [Real-World Protection Test (Enterprise) February - June 2018](https://www.av-comparatives.org/tests/real-world-protection-test-february-june-2018/)
+
+* [Malware Protection Test Enterprise March 2018](https://www.av-comparatives.org/tests/malware-protection-test-enterprise-march-2018-testresult/)
+
+* [Real-World Protection Test (Enterprise) July 2018](https://www.av-comparatives.org/tests/real-world-protection-test-july-2018-factsheet/) <sup>**Latest**</sup>|
+
+## To what extent are tests representative of protection in the real world?
+
+It is important to remember that Microsoft sees a wider and broader set of threats beyond just what’s tested in the AV evaluations highlighted above. The capabilities within [Windows Defender ATP](https://www.microsoft.com/WindowsForBusiness/windows-atp?ocid=cx-docs-avreports) also provide [additional layers of protection](https://cloudblogs.microsoft.com/microsoftsecure/2017/12/11/detonating-a-bad-rabbit-windows-defender-antivirus-and-layered-machine-learning-defenses?ocid=cx-docs-avreports) that are not factored into AV tests. Using these tests, customer can view one aspect of their security suite but can't assess the complete protection of all the security features.
+
+There are other technologies in nearly every endpoint security suite not represented in AV tests that address some of the latest and most sophisticated threats. For example, the capabilities such as attack surface reduction and endpoint detection & response help prevent malware from getting onto devices in the first place.
+
+Microsoft is highly engaged in working with several independent testers to evolve security testing to focus on the end-to-end security stack. In the meantime, customers can evaluate Windows Defender Advanced Threat Protection in their own networks by signing up for a [90-day trial of Windows Defender ATP](https://www.microsoft.com/windowsforbusiness/windows-atp?ocid=cx-docs-avreports), or [enabling Preview features on existing tenants](https://docs.microsoft.com/windows/security/threat-protection/windows-defender-atp/preview-settings-windows-defender-advanced-threat-protection?ocid=cx-docs-avreports).
+
+![ATP](./images/wdatp-pillars2.png)