Merged PR 10914: merge from master

.openpublishing.redirection.json

@@ -1,6 +1,16 @@
 {
 "redirections": [
 {
+"source_path": "windows/security/threat-protection/intelligence/av-tests.md",
+"redirect_url": "/windows/security/threat-protection/intelligence/top-scoring-industry-antivirus-tests",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/threat-protection/intelligence/transparency-report.md",
+"redirect_url": "/windows/security/threat-protection/intelligence/av-tests",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/deployment/update/waas-windows-insider-for-business-aad.md",
 "redirect_url": "https://docs.microsoft.com/en-us/windows-insider/at-work-pro/wip-4-biz-add",
 "redirect_document_id": true

education/get-started/inclusive-classroom-it-admin.md

@@ -29,7 +29,6 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea
 | Read aloud with simultaneous highlighting | <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>  | <p style="text-align: center;">X</p> <p style="text-align: center;"><p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Outlook PC)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps or Outlook PC)</p>  | 
 | Adjustable text spacing and font size  | <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word Online, Word Mac, Word for iPad</li><li>Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>  | <p style="text-align: center;">X</p> <p style="text-align: center;"><p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p>  |<p style="text-align: center;">X</p>   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | 
 | Syllabification  | <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word Online</li><li>Outlook Web Access</li></ul>  |   | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word iOS)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word iOS)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps or Word iOS)</p>  | 
-
 | Parts of speech identification  | <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | 
 | Line focus mode  | <ul><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>  |   | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | 
 | Picture Dictionary  | <ul><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>  |   | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>  | 
@@ -48,7 +47,6 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea
 
 | Creating accessible content features  |  Available in which apps|Office 2016 MSI|Office 2019| Office 365 ProPlus Monthly (C2R)  | Office 365 ProPlus Semi Annual (C2R)  | Office 365 ProPlus Annual (C2R)  | 
 |---|---|---|---|---|---|---|
-
 | Accessibility Checker  | <ul><li>All Office 365 authoring applications on PC, Mac, Web</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   |  
 | Accessible Templates  | <ul><li>Word for PCs, Mac</li><li>Excel for PCs, Mac</li><li>PowerPoint for PCs, Mac</li><li>Sway on iOS, Web, Windows 10</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   | 
 | Ability to add alt-text for images  | <ul><li>Word for PCs (includes automatic suggestions for image descriptions)</li><li>SharePoint Online (includes automatic suggestions for image descriptions)</li><li>PowerPoint for PCs (includes automatic suggestions for image descriptions)</li><li>OneNote (includes automatic extraction of text in images)</li><li>All Office 365 authoring applications (include ability to add alt-text manually)</li></ul>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   | 

mdop/mbam-v25/high-level-architecture-of-mbam-25-with-configuration-manager-integration-topology.md

@@ -7,12 +7,12 @@ ms.pagetype: mdop, security
 ms.mktglfcycl: manage
 ms.sitesec: library
 ms.prod: w10
-ms.date: 07/18/2017
+ms.date: 08/23/2018
+ms.author: pashort
 ---
 
 
-# High-Level Architecture of MBAM 2.5 with Configuration Manager Integration Topology
-
+# High-level architecture of MBAM 2.5 with Configuration Manager Integration topology
 
 This topic describes the recommended architecture for deploying Microsoft BitLocker Administration and Monitoring (MBAM) with the Configuration Manager Integration topology. This topology integrates MBAM with System Center Configuration Manager. To deploy MBAM with the Stand-alone topology, see [High-Level Architecture of MBAM 2.5 with Stand-alone Topology](high-level-architecture-of-mbam-25-with-stand-alone-topology.md).
 
@@ -54,7 +54,7 @@ The recommended number of servers and supported number of clients in a productio
 
  
 
-## Differences between Configuration Manager Integration and Stand-alone topologies
+## Differences between Configuration Manager Integration and stand-alone topologies
 
 
 The main differences between the topologies are:
@@ -70,15 +70,15 @@ The following diagram and table describe the recommended high-level architecture
 
 ![mbam2\-5](images/mbam2-5-cmserver.png)
 
-### Database Server
+### Database server
 
-#### Recovery Database
+#### Recovery database
 
 This feature is configured on a computer running Windows Server and supported SQL Server instance.
 
 The **Recovery Database** stores recovery data that is collected from MBAM Client computers.
 
-#### Audit Database
+#### Audit database
 
 This feature is configured on a computer running Windows Server and supported SQL Server instance.
 
@@ -90,7 +90,7 @@ This feature is configured on a computer running Windows Server and supported SQ
 
 The **Reports** provide recovery audit data for the client computers in your enterprise. You can view reports from the Configuration Manager console or directly from SQL Server Reporting Services.
 
-### Configuration Manager Primary Site Server
+### Configuration Manager primary site server
 
 System Center Configuration Manager Integration feature
 
@@ -102,19 +102,19 @@ System Center Configuration Manager Integration feature
 
 -   The **Configuration Manager console** must be installed on the same computer on which you install the MBAM Server software.
 
-### Administration and Monitoring Server
+### Administration and monitoring server
 
-#### Administration and Monitoring Website
+#### Administration and monitoring website
 
 This feature is configured on a computer running Windows Server.
 
-The **Administration and Monitoring Website** is used to:
+The **Administration and monitoring website** is used to:
 
 -   Help end users regain access to their computers when they are locked out. (This area of the Website is commonly called the Help Desk.)
 
 -   View the Recovery Audit Report, which shows recovery activity for client computers. Other reports are viewed from the Configuration Manager console.
 
-#### Self-Service Portal
+#### Self-service portal
 
 This feature is configured on a computer running Windows Server.
 
@@ -126,21 +126,19 @@ This feature is installed 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.
+**Important**<br>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. 
 
  
 
-### Management Workstation
+### Management workstation
 
-#### MBAM Group Policy Templates
+#### MBAM group policy templates
 
 -   The **MBAM Group Policy Templates** are Group Policy settings that define implementation settings for MBAM, which enable you to manage BitLocker drive encryption.
 
 -   Before you run MBAM, you must download the Group Policy Templates from [How to Get MDOP Group Policy (.admx) Templates](https://go.microsoft.com/fwlink/p/?LinkId=393941) and copy them to a server or workstation that is running a supported Windows Server or Windows operating system.
 
-    **Note**  
-    The workstation does not have to be a dedicated computer.
+    **NOTE**<br>The workstation does not have to be a dedicated computer.
 
      
 

windows/application-management/apps-in-windows-10.md

@@ -8,7 +8,7 @@ ms.pagetype: mobile
 ms.author: elizapo
 author: lizap
 ms.localizationpriority: medium
-ms.date: 07/10/2018
+ms.date: 08/23/2018
 ---
 # Understand the different apps included in Windows 10
 
@@ -20,7 +20,7 @@ The following types of apps run on Windows 10:
 Digging into the Windows apps, there are two categories:
 - System apps - Apps that are installed in the c:\Windows\* directory. These apps are integral to the OS.
 - Apps - All other apps, installed in c:\Program Files\WindowsApps. There are two classes of apps:
-   - Provisioned: Installed the first time you sign into Windows. You'll see a tile or Start menu item for these apps, but they aren't installed until the first sign-in.
+   - Provisioned: Installed in user account the first time you sign in with a new user account.
    - Installed: Installed as part of the OS.
 
 The following tables list the system apps, installed Windows apps, and provisioned Windows apps in a standard Windows 10 Enterprise installation. (If you have a custom image, your specific apps might differ.) The tables list the app, the full name, show the app's status in Windows 10 version 1607, 1703, and 1709, and indicate whether an app can be uninstalled through the UI.
@@ -30,7 +30,7 @@ Some of the apps show up in multiple tables - that's because their status change
 > [!TIP]
 > Want to see a list of the apps installed on your specific image? You can run the following PowerShell cmdlet:
 > ```powershell
-> Get-AppxPackage |Select Name,PackageFamilyName
+> Get-AppxPackage | select Name,PackageFamilyName
 > Get-AppxProvisionedPackage -Online | select DisplayName,PackageName
 > ```
 
@@ -39,7 +39,7 @@ Some of the apps show up in multiple tables - that's because their status change
 System apps are integral to the operating system. Here are the typical system apps in Windows 10 versions 1703, 1709, and 1803.
 
 | Name             | Full name                                  | 1703 | 1709 | 1803 |Uninstall through UI?             |
-|------------------|-------------------------------------------|:------:|:------:|:------:|-------------------------------------------------------|
+|------------------|--------------------------------------------|:----:|:----:|:----:|:----------------------------------:|
 | Cortana UI       | CortanaListenUIApp                         | x    |      |      |No                                |
 |                  | Desktop Learning                           | x    |      |      |No                                |
 |                  | DesktopView                                | x    |      |      |No                                |
@@ -48,13 +48,13 @@ System apps are integral to the operating system. Here are the typical system ap
 | Mixed Reality +  | HoloItemPlayerApp                          | x    |      |      |No                                |
 | Mixed Reality +  | HoloShell                                  | x    |      |      |No                                |
 |                  | InputApp                                   |      | x    | x    |No                                |
-|                  | Microsoft.AAD.Broker.Plugin               | x    |  x   | x    |No                                                     |
+|                  | Microsoft.AAD.BrokerPlugin                | x    | x    | x    |No                                |
 |                  | Microsoft.AccountsControl                  | x    | x    | x    |No                                |
 | Hello setup UI   | Microsoft.BioEnrollment                    | x    | x    | x    |No                                |
 |                  | Microsoft.CredDialogHost                   | x    | x    | x    |No                                |
 |                  | Microsoft.ECApp                            |      | x    | x    |No                                |
 |                  | Microsoft.LockApp                          | x    | x    | x    |No                                |
-| Microsoft Edge   | Microsoft.Microsoft.Edge                  | x    |  x   | x    |No                                                     |
+| Microsoft Edge   | Microsoft.MicrosoftEdge                   | x    | x    | x    |No                                |
 |                  | Microsoft.PPIProjection                    | x    | x    | x    |No                                |
 |                  | Microsoft.Windows.Apprep.ChxApp            | x    | x    | x    |No                                 |
 |                  | Microsoft.Windows.AssignedAccessLockApp    | x    | x    | x    |No                                 |
@@ -74,7 +74,7 @@ System apps are integral to the operating system. Here are the typical system ap
 | Start            | Microsoft.Windows.ShellExperienceHost      | x    | x    | x    |No                                 |
 | Windows Feedback | Microsoft.WindowsFeedback                  | *    | *    |      |No                                |
 |                  | Microsoft.XboxGameCallableUI               | x    | x    | x    |No                                |
-| Contact Support* | Windows.ContactSupport                     | x    |  *  |      |Through the Optional Features app                      |
+| Contact Support\* | Windows.ContactSupport                     | x    | *    |      |via Optional Features app |
 | Settings         | Windows.ImmersiveControlPanel              | x    | x    |      |No                                |
 | Connect          | Windows.MiracastView                       | x    |      |      |No                                |
 | Print 3D         | Windows.Print3D                            |      | x    |      |Yes                               |
@@ -91,13 +91,63 @@ System apps are integral to the operating system. Here are the typical system ap
 |Add Suggested folder Dialog box| F46D4000-FD22-4DB4-AC8E-4E1DDDE828FE||      | x    |No                                                     |
 
 >[!NOTE] 
-> - The Contact Support app changed to Get Help in version 1709. Get Help is a provisioned app (instead of system app like Contact Support).
+>\* The Contact Support app changed to Get Help in version 1709. Get Help is a provisioned app (instead of system app like Contact Support).
+
+## Provisioned Windows apps
+
+Here are the typical provisioned Windows apps in Windows 10 versions 1703, 1709, and 1803.
+
+| App Name (Canonical)           | Display Name           | 1703 | 1709 | 1803 | Uninstall via UI? |
+|--------------------------------|------------------------|:-----:|:----:|:----:|:-----------------:|
+| 3D Builder                     | [Microsoft.3DBuilder](ms-windows-store://pdp/?PFN=Microsoft.3DBuilder_8wekyb3d8bbwe)                             | x    |      |      | Yes               |
+| App Installer                  | [Microsoft.DesktopAppInstaller](ms-windows-store://pdp/?PFN=Microsoft.DesktopAppInstaller_8wekyb3d8bbwe)                   | x    | x    | x    | Via Settings App  |
+| Feedback Hub                   | [Microsoft.WindowsFeedbackHub](ms-windows-store://pdp/?PFN=Microsoft.WindowsFeedbackHub_8wekyb3d8bbwe)                    | x    | x    | x    | Yes               |
+| Get Help                       | [Microsoft.GetHelp](ms-windows-store://pdp/?PFN=Microsoft.Gethelp_8wekyb3d8bbwe)                               |      | x    | x    | No                |
+| Get Office                     | [Microsoft.MicrosoftOfficeHub](ms-windows-store://pdp/?PFN=Microsoft.MicrosoftOfficeHub_8wekyb3d8bbwe)                    | x    | x    | x    | Yes               |
+| Groove Music                   | [Microsoft.ZuneMusic](ms-windows-store://pdp/?PFN=Microsoft.ZuneMusic_8wekyb3d8bbwe)                             | x    | x    | x    | No                |
+| Mail and Calendar              | [Microsoft.windowscommunicationsapps](ms-windows-store://pdp/?PFN=microsoft.windowscommunicationsapps_8wekyb3d8bbwe)             | x    | x    | x    | No                |
+| Microsoft Messaging            | [Microsoft.Messaging](ms-windows-store://pdp/?PFN=Microsoft.Messaging_8wekyb3d8bbwe)                             | x    | x    | x    | No                |
+| Microsoft People               | [Microsoft.People](ms-windows-store://pdp/?PFN=Microsoft.People_8wekyb3d8bbwe)                                | x    | x    | x    | No                |
+| Microsoft Photos               | [Microsoft.Windows.Photos](ms-windows-store://pdp/?PFN=Microsoft.Windows.Photos_8wekyb3d8bbwe)                        | x    | x    | x    | No                |
+| Microsoft Solitaire Collection | [Microsoft.MicrosoftSolitaireCollection](ms-windows-store://pdp/?PFN=Microsoft.MicrosoftSolitaireCollection_8wekyb3d8bbwe)          | x    | x    | x    | Yes               |
+| Microsoft Sticky Notes         | [Microsoft.MicrosoftStickyNotes](ms-windows-store://pdp/?PFN=Microsoft.MicrosoftStickyNotes_8wekyb3d8bbwe)                  | x    | x    | x    | No                |
+| Microsoft Tips                 | [Microsoft.Getstarted](ms-windows-store://pdp/?PFN=Microsoft.Getstarted_8wekyb3d8bbwe)                            | x    | x    | x    | Yes               |
+| Mixed Reality Viewer           | [Microsoft.Microsoft3DViewer](ms-windows-store://pdp/?PFN=Microsoft.Microsoft3DViewer_8wekyb3d8bbwe)                     | x    | x    | x    | No                |
+| Movies & TV                    | [Microsoft.ZuneVideo](ms-windows-store://pdp/?PFN=Microsoft.ZuneVideo_8wekyb3d8bbwe)                             | x    | x    | x    | No                |
+| MSN Weather (BingWeather       | [Microsoft.BingWeather](ms-windows-store://pdp/?PFN=Microsoft.BingWeather_8wekyb3d8bbwe)                           | x    | x    | x    | Yes               |
+| One Note                       | [Microsoft.Office.OneNote](ms-windows-store://pdp/?PFN=Microsoft.Office.OneNote_8wekyb3d8bbwe)                        | x    | x    | x    | Yes               |
+| Paid Wi-Fi & Cellular          | [Microsoft.OneConnect](ms-windows-store://pdp/?PFN=Microsoft.OneConnect_8wekyb3d8bbwe)                            | x    | x    | x    | Yes               |
+| Paint 3D                       | [Microsoft.MSPaint](ms-windows-store://pdp/?PFN=Microsoft.MSPaint_8wekyb3d8bbwe)                               | x    | x    | x    | No                |
+| Print 3D                       | [Microsoft.Print3D](ms-windows-store://pdp/?PFN=Microsoft.Print3D_8wekyb3d8bbwe)                               |      | x    | x    | No                |
+| Skype                          | [Microsoft.SkypeApp](ms-windows-store://pdp/?PFN=Microsoft.SkypeApp_kzf8qxf38zg5c)                              | x    | x    | x    | Yes               |
+| Store Purchase App\*             | App not available in store          | x    | x    | x    | No                |
+| Wallet                         | App not available in store                    | x    | x    | x    | No                |
+| Web Media Extensions           | [Microsoft.WebMediaExtensions](ms-windows-store://pdp/?PFN=Microsoft.WebMediaExtensions_8wekyb3d8bbwe)                    |      |      | x    | No                |
+| Windows Alarms & Clock         | [Microsoft.WindowsAlarms](ms-windows-store://pdp/?PFN=Microsoft.WindowsAlarms_8wekyb3d8bbwe)                         | x    | x    | x    | No                |
+| Windows Calculator             | [Microsoft.WindowsCalculator](ms-windows-store://pdp/?PFN=Microsoft.WindowsCalculator_8wekyb3d8bbwe)                     | x    | x    | x    | No                |
+| Windows Camera                 | [Microsoft.WindowsCamera](ms-windows-store://pdp/?PFN=Microsoft.WindowsCamera_8wekyb3d8bbwe)                         | x    | x    | x    | No                |
+| Windows Maps                   | [Microsoft.WindowsMaps](ms-windows-store://pdp/?PFN=Microsoft.WindowsMaps_8wekyb3d8bbwe)                           | x    | x    | x    | No                |
+| Windows Store                  | [Microsoft.WindowsStore](ms-windows-store://pdp/?PFN=Microsoft.WindowsStore_8wekyb3d8bbwe)                          | x    | x    | x    | No                |
+| Windows Voice Recorder         | [Microsoft.SoundRecorder](ms-windows-store://pdp/?PFN=Microsoft.WindowsSoundRecorder_8wekyb3d8bbwe)                  | x    | x    | x    | No                |
+| Xbox                           | [Microsoft.XboxApp](ms-windows-store://pdp/?PFN=Microsoft.XboxApp_8wekyb3d8bbwe)                               | x    | x    | x    | No                |
+| Xbox Game Bar                  | [Microsoft.XboxGameOverlay](ms-windows-store://pdp/?PFN=Microsoft.XboxGameOverlay_8wekyb3d8bbwe)                       | x    | x    | x    | No                |
+| Xbox Gaming Overlay            | [Microsoft.XboxGamingOverlay](ms-windows-store://pdp/?PFN=Microsoft.XboxGamingOverlay_8wekyb3d8bbwe)                     |      |      | x    | No                |
+| Xbox Identity Provider         | [Microsoft.XboxIdentityProvider](ms-windows-store://pdp/?PFN=Microsoft.XboxIdentityProvider_8wekyb3d8bbwe)                  | x    | x    | x    | No                |
+| Xbox Speech to Text Overlay    | App not available in store   | x    | x    | x    | No                |
+| Xbox TCUI                      | [Microsoft.Xbox.TCUI](ms-windows-store://pdp/?PFN=Microsoft.Xbox.TCUI_8wekyb3d8bbwe)                             |      | x    | x    | No                |
+
+>[!NOTE] 
+>\* The Store app can't be removed. If you want to remove and reinstall the Store app, you can only bring Store back by either restoring your system from a backup or resetting your system. Instead of removing the Store app, you should use group policies to hide or disable it.
+
+
+
 
 ## Installed Windows apps
+
 Here are the typical installed Windows apps in Windows 10 versions 1703, 1709, and 1803.
 
-| Name               | Full name                                | 1703 | 1709 | 1803 |Uninstall through UI? |
-|--------------------|------------------------------------------|:----:|:----:|:----:|----------------------|
+| Name               | DisplayName                              | 1703 | 1709 | 1803 |Uninstall through UI? |
+|--------------------|------------------------------------------|:----:|:----:|:----:|:----------------------:|
 | Remote Desktop     | Microsoft.RemoteDesktop                  | x    | x    |      | Yes                  |
 | PowerBI            | Microsoft.Microsoft PowerBIforWindows    | x    |      |      | Yes                  |
 | Code Writer        | ActiproSoftwareLLC.562882FEEB491         | x    | x    | x    | Yes                  |
@@ -126,52 +176,4 @@ Here are the typical installed Windows apps in Windows 10 versions 1703, 1709, a
 |                    | Microsoft.VCLibs.120.00.Universal        |      | x    |      | Yes                  |
 |                    | Microsoft.VCLibs.140.00.UWPDesktop       |      |      | x    | Yes                  |
 |                    | Microsoft.WinJS.2.0                      | x    |      |      | Yes                  |
-
-## Provisioned Windows apps
-
-Here are the typical provisioned Windows apps in Windows 10 versions 1703, 1709, and 1803.
-
-| Name                            | Full name                              | 1703 | 1709 | 1803 | Uninstall through UI?     |
-|---------------------------------|----------------------------------------|:------:|:------:|:------:|---------------------------|
-| 3D Builder                      | Microsoft.3DBuilder                    | x    |      |      | Yes                       |
-| Alarms & Clock                  | Microsoft.WindowsAlarms                | x    |  x   | x    | No                        |
-| App Installer                   | Microsoft.DesktopAppInstaller          | x    |  x   | x    | Via Settings App          |
-| Calculator                      | Microsoft.WindowsCalculator            | x    |  x   | x    | No                        |
-| Camera                          | Microsoft.WindowsCamera                | x    |  x   | x    | No                        |
-| Feedback Hub                    | Microsoft.WindowsFeedbackHub           | x    |  x   | x    | Yes                       |
-| Get Help                        | Microsoft.GetHelp                      |      |  x   | x    | No                        |
-| Get Office/My Office            | Microsoft.Microsoft OfficeHub          | x    |  x   | x    | Yes                       |
-| Get Skype/Skype (preview)/Skype | Microsoft.SkypeApp                     | x    |  x   | x    | Yes                       |
-| Get Started/Tips                | Microsoft.Getstarted                   | x    |  x   | x    | Yes                       |
-| Groove                          | Microsoft.ZuneMusic                    | x    |  x   | x    | No                        |
-| Mail and Calendar               | Microsoft.windows communicationsapps   | x    |  x   | x    | No                        |
-| Maps                            | Microsoft.WindowsMaps                  | x    |  x   | x    | No                        |
-| Messaging                       | Microsoft.Messaging                    | x    |  x   | x    | No                        |
-| Microsoft 3D Viewer             | Microsoft.Microsoft3DViewer            | x    |  x   | x    | No                        |
-| Movies & TV                     | Microsoft.ZuneVideo                    | x    |  x   | x    | No                        |
-| OneNote                         | Microsoft.Office.OneNote               | x    |  x   | x    | Yes                       |
-| Paid Wi-FI                      | Microsoft.OneConnect                   | x    | x    | x    | Yes                       |
-| Paint 3D                        | Microsoft.MSPaint                      | x    |  x   | x    | No                        |
-| People                          | Microsoft.People                       | x    |  x   | x    | No                        |
-| Photos                          | Microsoft.Windows.Photos               | x    |  x   | x    | No                        |
-| Print 3D                        | Microsoft.Print3D                      |      |  x   | x    | No                        |
-| Solitaire                       | Microsoft.Microsoft SolitaireCollection| x    |  x   | x    | Yes                       |
-| Sticky Notes                    | Microsoft.MicrosoftStickyNotes         | x    |  x   | x    | No                        |
-| Store                           | Microsoft.WindowsStore                 | x    |  x   | x    | No                        |
-| Sway                            | Microsoft.Office.Sway                  | *    |  x   | x    | Yes                       |
-| Voice Recorder                  | Microsoft.SoundRecorder                | x    |  x   | x    | No                        |
-| Wallet                          | Microsoft.Wallet                       | x    |  x   | x    | No                        |
-| Weather                         | Microsoft.BingWeather                  | x    |  x   | x    | Yes                       |
-| Xbox                            | Microsoft.XboxApp                      | x    |  x   | x    | No                        |
-|                                 | Microsoft.OneConnect                   | x    |  x   | x    | No                        |
-|                                 | Microsoft.DesktopAppInstaller          |      |      | x    | No                        |
-|                                 | Microsoft.StorePurchaseApp             | x    |  x   | x    | No                        |
-|                                 | Microsoft.WebMediaExtensions           |      |      | x    | No                        |
-|                                 | Microsoft.Xbox.TCUI                    |      |  x   | x    | No                        |
-|                                 | Microsoft.XboxGameOverlay              | x    |  x   | x    | No                        |
-|                                 | Microsoft.XboxGamingOverlay            |      |      | x    | No                        |
-|                                 | Microsoft.XboxIdentityProvider         | x    |  x   | x    | No                        |
-|                                 | Microsoft.XboxSpeech ToTextOverlay     | x    |  x   | x    | No                        |
-
->[!NOTE]
->The Store app can't be removed. If you want to remove and reinstall the Store app, you can only bring Store back by either restoring your system from a backup or resetting your system. Instead of removing the Store app, you should use group policies to hide or disable it.
+---

windows/client-management/mdm/policy-csp-userrights.md

@@ -12,6 +12,61 @@ ms.date: 03/12/2018
 # Policy CSP - UserRights
 
 
+<hr/>
+
+User rights are assigned for user accounts or groups. The name of the policy defines the user right in question, and the values are always users or groups. Values can be represented as SIDs or strings. Here is a list for reference, [Well-Known SID Structures](https://msdn.microsoft.com/en-us/library/cc980032.aspx). Even though strings are supported for well-known accounts and groups, it is better to use SIDs because strings are localized for different languages. Some user rights allow things, like AccessFromNetwork, while others disallow things, like DenyAccessFromNetwork.
+
+Here is an example syncml for setting the user right BackupFilesAndDirectories for Administrators and Authenticated Users groups.
+
+```syntax
+<SyncML xmlns="SYNCML:SYNCML1.2">
+
+<SyncBody>
+    <Replace>
+      <CmdID>2</CmdID>
+      <Item>
+        <Meta>
+          <Format>chr</Format>
+          <Type>text/plain</Type>
+        </Meta>
+        <Target>
+          <LocURI>./Device/Vendor/MSFT/Policy/Config/UserRights/BackupFilesAndDirectories</LocURI>
+        </Target>
+        <Data>Authenticated Users&#xF000;Administrators</Data>
+      </Item>
+    </Replace>
+  <Final/>
+  </SyncBody>
+</SyncML>
+```
+
+Here are examples of data fields. The encoded 0xF000 is the standard delimiter/separator
+
+-  Grant an user right to Administrators group via SID:
+    ```
+    <Data>*S-1-5-32-544</Data>
+    ```
+ 
+-  Grant an user right to multiple groups (Administrators, Authenticated Users) via SID
+    ```
+    <Data>*S-1-5-32-544&#xF000;*S-1-5-11</Data>
+    ```
+
+-  Grant an user right to multiple groups (Administrators, Authenticated Users) via a mix of SID and Strings
+    ```
+    <Data>*S-1-5-32-544&#xF000;Authenticated Users</Data>
+    ```
+ 
+-  Grant an user right to multiple groups (Authenticated Users, Administrators) via strings
+    ```
+    <Data>Authenticated Users&#xF000;Administrators</Data>
+    ```
+
+-  Empty input indicates that there are no users configured to have that user right
+    ```
+    <Data></Data>
+    ```
+
 <hr/>
 
 <!--Policies-->

windows/configuration/set-up-shared-or-guest-pc.md

@@ -108,7 +108,7 @@ $sharedPC.KioskModeAUMID = ""
 $sharedPC.KioskModeUserTileDisplayText = ""
 $sharedPC.InactiveThreshold = 0
 Set-CimInstance -CimInstance $sharedPC
-Get-CimInstance -Namespace $namespaceName -ClassName $MDM_SharedPCClass
+Get-CimInstance -Namespace $namespaceName -ClassName MDM_SharedPC
 ```
 
 ### Create a provisioning package for shared use

windows/deployment/TOC.md

@@ -238,6 +238,7 @@
 ### [Change history for Update Windows 10](update/change-history-for-update-windows-10.md)
 
 ## [Windows Analytics](update/windows-analytics-overview.md)
+### [Windows Analytics in the Azure Portal](update/windows-analytics-azure-portal.md)
 ### [Windows Analytics and privacy](update/windows-analytics-privacy.md)
 ### [Manage Windows upgrades with Upgrade Readiness](upgrade/manage-windows-upgrades-with-upgrade-readiness.md)
 #### [Upgrade Readiness architecture](upgrade/upgrade-readiness-architecture.md)

windows/deployment/planning/act-technical-reference.md

@@ -39,7 +39,7 @@ Use Upgrade Analytics to get:
 
 The Upgrade Analytics workflow steps you through the discovery and rationalization process until you have a list of computers that are ready to be upgraded. For more information about Upgrade Analytics, see [Manage Windows upgrades with Upgrade Analytics](https://technet.microsoft.com/itpro/windows/deploy/manage-windows-upgrades-with-upgrade-analytics)
 
-At the same time, we've kept the Standard User Analyzer tool, which helps you test your apps and to monitor API calls for potential compatibility issues, and the Compatiblility Administrator, which helps you to resolve potential compatibility issues.
+At the same time, we've kept the Standard User Analyzer tool, which helps you test your apps and to monitor API calls for potential compatibility issues, and the Compatibility Administrator, which helps you to resolve potential compatibility issues.
 
 ## In this section
 

windows/deployment/update/device-health-get-started.md

@@ -5,7 +5,7 @@ keywords: Device Health, oms, operations management suite, prerequisites, requir
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
-ms.date: 06/12/2018
+ms.date: 08/21/2018
 ms.pagetype: deploy
 author: jaimeo
 ms.author: jaimeo
@@ -14,6 +14,9 @@ ms.localizationpriority: medium
 
 # Get started with Device Health
 
+>[!IMPORTANT]
+>**The OMS portal has been deprecated; you should start using the [Azure portal](https://portal.azure.com) instead as soon as possible.** Many experiences are the same in the two portals, but there are some key differences. See [Windows Analytics in the Azure Portal](windows-analytics-azure-portal.md) for steps to use Windows Analytics in the Azure portal. For much more information about the transition from OMS to Azure, see [OMS portal moving to Azure](https://docs.microsoft.com/azure/log-analytics/log-analytics-oms-portal-transition).
+
 This topic explains the steps necessary to configure your environment for Windows Analytics: Device Health. 
 
 Steps are provided in sections that follow the recommended setup process:

windows/deployment/update/update-compliance-get-started.md

@@ -8,12 +8,15 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: Jaimeo
 ms.author: jaimeo
-ms.date: 03/15/2018
+ms.date: 08/21/2018
 ms.localizationpriority: medium
 ---
 
 # Get started with Update Compliance
 
+>[!IMPORTANT]
+>**The OMS portal has been deprecated; you should start using the [Azure portal](https://portal.azure.com) instead as soon as possible.** Many experiences are the same in the two portals, but there are some key differences. See [Windows Analytics in the Azure Portal](windows-analytics-azure-portal.md) for steps to use Windows Analytics in the Azure portal. For much more information about the transition from OMS to Azure, see [OMS portal moving to Azure](https://docs.microsoft.com/azure/log-analytics/log-analytics-oms-portal-transition).
+
 This topic explains the steps necessary to configure your environment for Windows Analytics: Update Compliance. 
 
 Steps are provided in sections that follow the recommended setup process:

windows/deployment/update/windows-analytics-FAQ-troubleshooting.md

@@ -8,12 +8,15 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: jaimeo
 ms.author: jaimeo
-ms.date: 07/20/2018
+ms.date: 08/21/2018
 ms.localizationpriority: medium
 ---
 
 # Frequently asked questions and troubleshooting Windows Analytics
 
+>[!IMPORTANT]
+>**The OMS portal has been deprecated; you should start using the [Azure portal](https://portal.azure.com) instead as soon as possible.** Many experiences are the same in the two portals, but there are some key differences. See [Windows Analytics in the Azure Portal](windows-analytics-azure-portal.md) for steps to use Windows Analytics in the Azure portal. For much more information about the transition from OMS to Azure, see [OMS portal moving to Azure](https://docs.microsoft.com/azure/log-analytics/log-analytics-oms-portal-transition).
+
 This topic compiles the most common issues encountered with configuring and using Windows Analytics, as well as general questions. This FAQ, along with the [Windows Analytics Technical Community](https://techcommunity.microsoft.com/t5/Windows-Analytics/ct-p/WindowsAnalytics), are recommended resources to consult before contacting Microsoft support.
 
 ## Troubleshooting common problems

windows/deployment/update/windows-analytics-azure-portal.md

@@ -0,0 +1,63 @@
+---
+title: Windows Analytics in the Azure Portal
+description: Use the Azure Portal to add and configure Windows Analytics solutions 
+keywords: Device Health, oms, Azure, portal, operations management suite, add, manage, configure, Upgrade Readiness, Update Compliance
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.date: 08/21/2018
+ms.pagetype: deploy
+author: jaimeo
+ms.author: jaimeo
+ms.localizationpriority: medium
+---
+
+# Windows Analytics in the Azure portal
+
+Windows Analytics uses Azure Log Analytics (formerly known as Operations Management Suite or OMS), a collection of cloud-based servicing for monitoring and automating your on-premises and cloud environments.
+
+**The OMS portal has been deprecated; you should start using the [Azure portal](https://portal.azure.com) instead as soon as possible.** Many experiences are the same in the two portals, but there are some key differences, which this topic will explain. For much more information about the transition from OMS to Azure, see [OMS portal moving to Azure](https://docs.microsoft.com/azure/log-analytics/log-analytics-oms-portal-transition).
+
+## Navigation and permissions in the Azure portal
+
+Go to the [Azure portal](https://portal.azure.com), select **All services**, and search for *Log Analytics*. Once it appears, you can select the star to add it to your favorites for easy access in the future.
+
+[![Azure portal all services page with Log Analytics found and selected as favorite](images/azure-portal-LAfav1.png)](images/azure-portal-LAfav1.png)
+
+### Permissions
+
+>[!IMPORTANT]
+>Unlike the OMS portal, the Azure portal requires access to both an Azure Log Analytics subscription and a linked Azure subscription.
+
+To check the Log Analytics workspaces you can access, select **Log Analytics**. You should see a grid control listing all workspaces, along with the Azure subscription each is linked to:
+
+[![Log Analytics workspace page showing accessible workspaces and linked Azure subscriptions](images/azure-portal-LAmain-wkspc-subname-sterile.png)](images/azure-portal-LAmain-wkspc-subname-sterile.png)
+
+If you do not see your workspace in this view, you do not have access to the underlying Azure subscription. To view and assign permissions for a workspace, select its name and then, in the flyout that opens, select **Access control (IAM)**. You can view and assign permissions for a subscription similarly by selecting the subscription name and selecting **Access control (IAM)**.
+
+Both the workspace and Azure subscription require at least "read" permissions. To make changes (for example, to set app importantance in Upgrade Readiness), both the subscription and workspace require "contributor" permissions. You can view your current role and make changes in other roles by using the **Access control (IAM)** tab in Azure.
+
+When permissions are configured, you can select the workspace and then select **Workspace summary** to see information similar to what was shown in the OMS overview page.
+
+[![Log Analytics workspace page showing workspace summary](images/azure-portal-LA-wkspcsumm_sterile.png)](images/azure-portal-LA-wkspcsumm_sterile.png)
+
+## Adding Windows Analytics solutions
+
+In the Azure portal, the simplest way to add Windows Analytics solutions (Upgrade Readiness, Update Compliance, and Device Health) is to select **+ Create a resource** and then type the solution name in the search box. In this example, the search is for "Device Health":
+
+[![Add WA solutions with "create a resource"](images/azure-portal-create-resource-boxes.png)](images/azure-portal-create-resource-boxes.png)
+
+Select the solution from the list that is returned by the search, and then select **Create** to add the solution.
+
+## Navigating to Windows Analytics solutions settings
+
+To adjust settings for a Windows Analytics solution, first navigate to the **Solutions** tab for your workspace, and then select the solution to configure. In this example, Upgrade Readiness is being adjusted by selecting **CompatibilityAssessment**:
+
+[![Select WA solution to adjust settings](images/temp-azure-portal-soltn-setting.png)](images/temp-azure-portal-soltn-setting.png)
+
+From there, select the settings page to adjust specific settings:
+
+[![Settings page for Upgrade Readiness in Azure portsl](images/azure-portal-UR-settings.png)](images/azure-portal-UR-settings.png)
+
+>[!NOTE]
+>To adjust these settings, both the subscription and workspace require "contributor" permissions. You can view your current role and make changes in other roles by using the **Access control (IAM)** tab in Azure.

windows/deployment/upgrade/upgrade-readiness-get-started.md

@@ -8,12 +8,15 @@ ms.sitesec: library
 ms.pagetype: deploy
 author: jaimeo
 ms.author: jaimeo
-ms.date: 06/12/2018
+ms.date: 08/21/2018
 ms.localizationpriority: medium
 ---
 
 # Get started with Upgrade Readiness
 
+>[!IMPORTANT]
+>**The OMS portal has been deprecated; you should start using the [Azure portal](https://portal.azure.com) instead as soon as possible.** Many experiences are the same in the two portals, but there are some key differences. See [Windows Analytics in the Azure Portal](../update/windows-analytics-azure-portal.md) for steps to use Windows Analytics in the Azure portal. For much more information about the transition from OMS to Azure, see [OMS portal moving to Azure](https://docs.microsoft.com/azure/log-analytics/log-analytics-oms-portal-transition).
+
 This topic explains how to obtain and configure Upgrade Readiness for your organization. 
 
 You can use Upgrade Readiness to plan and manage your upgrade project end-to-end. Upgrade Readiness works by establishing communications between computers in your organization and Microsoft. Upgrade Readiness collects computer, application, and driver data for analysis. This data is used to identify compatibility issues that can block your upgrade and to suggest fixes that are known to Microsoft.

windows/security/information-protection/tpm/trusted-platform-module-overview.md

@@ -70,7 +70,7 @@ Some things that you can check on the device are:
 > [!NOTE]
 >  Windows 10 and Windows Server 2016 support Device Health Attestation with TPM 2.0. Support for TPM 1.2 was added beginning with Windows version 1607 (RS1).
 
-## Supported versions
+## Supported versions for device health attestation
 
 | TPM version | Windows 10  | Windows Server 2016 |
 |-------------|-------------|---------------------|

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

@@ -34,7 +34,7 @@
 
 ## [Safety Scanner download](safety-scanner-download.md)
 
-## [Industry antivirus tests](transparency-report.md)
+## [Industry antivirus tests](top-scoring-industry-antivirus-tests.md)
 
 ## [Industry collaboration programs](cybersecurity-industry-partners.md)
 

windows/security/threat-protection/intelligence/top-scoring-industry-antivirus-tests.md

@@ -1,7 +1,7 @@
 ---
-title: Industry antivirus tests
+title: Top scoring in industry antivirus tests
 description: Industry antivirus tests landing page
-keywords: security, malware
+keywords: security, malware, av-comparatives, av-test, av, antivirus
 ms.prod: w10
 ms.mktglfcycl: secure
 ms.sitesec: library
@@ -76,7 +76,7 @@ The below scores are the results of AV-Comparatives tests on **Windows Defender
 
 * [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>|
+* [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?
 

windows/security/threat-protection/windows-defender-antivirus/manage-protection-updates-windows-defender-antivirus.md

@@ -29,6 +29,7 @@ ms.date: 04/30/2018
 - System Center Configuration Manager
 - PowerShell cmdlets
 - Windows Management Instruction (WMI)
+- Mobile Device Management (MDM)
 
 <a id="protection-updates"></a>  
 <!-- this has been used as anchor in VDI content -->
@@ -147,6 +148,9 @@ SignatureDefinitionUpdateFileSharesSouce
 See the following for more information:
 - [Windows Defender WMIv2 APIs](https://msdn.microsoft.com/en-us/library/dn439477(v=vs.85).aspx)
 
+**Use Mobile Device Management (MDM) to manage the update location:**
+
+See [Policy CSP - Defender/SignatureUpdateFallbackOrder](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-defender#defender-signatureupdatefallbackorder) for details on configuring MDM.