Merge branch 'master' into v-anbic-081418

.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
@@ -5261,11 +5271,6 @@
 "redirect_document_id": true
 },
 {
-"source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1803.md",
-"redirect_url": "/windows/configuration/basic-level-windows-diagnostic-events-and-fields",
-"redirect_document_id": true
-},
-{
 "source_path": "windows/configuration/windows-diagnostic-data-1709.md",
 "redirect_url": "/windows/configuration/windows-diagnostic-data",
 "redirect_document_id": true
@@ -13731,6 +13736,11 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields.md",
+"redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1803",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1703.md",
 "redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
 "redirect_document_id": true

browsers/edge/TOC.md

@@ -1,5 +1,9 @@
 # [Microsoft Edge deployment for IT Pros](index.yml)
 
+## [System requirements and supported languages](about-microsoft-edge.md)
+
+## [Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
+
 ## [(Preview) New Microsoft Edge Group Policies and MDM settings](new-policies.md)
 
 ## [(Preview) Deploy Microsoft Edge kiosk mode](microsoft-edge-kiosk-mode-deploy.md)
@@ -27,13 +31,6 @@
 
 ## [Change history for Microsoft Edge](change-history-for-microsoft-edge.md)
 
-## [System requirements](about-microsoft-edge.md#minimum-system-requirements)
-
-## [Supported languages](about-microsoft-edge.md#supported-languages)
-
-
-## [Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
-
 ## [Microsoft Edge Frequently Asked Questions (FAQs)](microsoft-edge-faq.md)
 
 

browsers/edge/about-microsoft-edge.md

@@ -1,4 +1,5 @@
 ---
+title: Microsoft Edge system and language requirements
 description: Overview information about Microsoft Edge, the default browser for Windows 10. This topic includes links to other Microsoft Edge topics.
 ms.assetid: 70377735-b2f9-4b0b-9658-4cf7c1d745bb
 author: shortpatti
@@ -10,7 +11,7 @@ ms.localizationpriority: medium
 ms.date: 07/29/2018
 ---
 
-# Microsoft Edge deployment for IT Pros
+# Microsoft Edge system and language requirements
 >Applies to:  Microsoft Edge on Windows 10 and Windows 10 Mobile
 
 Microsoft Edge is the new, default web browser for Windows 10, helping you to experience modern web standards, better performance, improved security, and increased reliability. Microsoft Edge lets you stay up-to-date through the Microsoft Store and to manage your enterprise through Group Policy or your mobile device management (MDM) tools.

browsers/edge/emie-to-improve-compatibility.md

@@ -64,12 +64,14 @@ You must turn on the **Configure the Enterprise Mode Site List** Group Policy se
 
     -   **HTTP location**: *“SiteList”=”http://localhost:8080/sites.xml”*
 
-    -   **Local network**: *"SiteList"="\\\\network\\shares\\sites.xml"*
+    -   **Local network**: *"SiteList"="\\\network\\shares\\sites.xml"*
 
-    -   **Local file**: *"SiteList"="file:///c:\\\\Users\\\\<user>\\\\Documents\\\\testList.xml"*
+    -   **Local file**: *"SiteList"="file:///c:/Users/<username>/Documents/testList.xml"*
 
         All of your managed devices must have access to this location if you want them to be able to access and use Enterprise Mode and your site list.
 
+
+
 3.  Refresh your policy in your organization and then view the affected sites in Microsoft Edge.<p>The site shows a message in Microsoft Edge, saying that the page needs IE. At the same time, the page opens in IE11; in a new frame if it's not yet running, or in a new tab if it is.
 
 ## Fix your intranet sites
@@ -96,6 +98,3 @@ You can add the **Send all intranet traffic over to Internet Explorer** Group Po
 * [Enterprise Mode for Internet Explorer 11 (IE11)](https://go.microsoft.com/fwlink/p/?linkid=618377)
 * [Set the default browser using Group Policy]( https://go.microsoft.com/fwlink/p/?LinkId=620714)
  
-
-
-

browsers/edge/group-policies/address-bar-settings-gp.md

@@ -13,8 +13,6 @@ ms.sitesec: library
 ---
 
 # Address bar settings
->*Supported versions: Microsoft Edge on Windows 10*  
-
 
 
 

browsers/edge/group-policies/adobe-settings-gp.md

@@ -13,7 +13,6 @@ ms.sitesec: library
 ---
 
 # Adobe settings
->*Supported versions: Microsoft Edge on Windows 10*  
 
 
 

browsers/edge/group-policies/books-library-management-gp.md

@@ -13,7 +13,6 @@ ms.sitesec: library
 ---
 
 # Books Library management
->*Supported versions: Microsoft Edge on Windows 10*  
 
 
 

browsers/edge/group-policies/browser-settings-management-gp.md

@@ -13,7 +13,6 @@ ms.sitesec: library
 ---
 
 # Browser settings management
->*Supported versions: Microsoft Edge on Windows 10*  
 
 
 

browsers/edge/group-policies/developer-settings-gp.md

@@ -13,7 +13,7 @@ ms.sitesec: library
 ---
 
 # Developer settings
->*Supported versions: Microsoft Edge on Windows 10*  
+
 
 
 

browsers/edge/group-policies/extensions-management-gp.md

@@ -13,7 +13,6 @@ ms.sitesec: library
 ---
 
 # Extensions management
->*Supported versions: Microsoft Edge on Windows 10*  
 
 
 

browsers/edge/group-policies/favorites-management-gp.md

@@ -13,8 +13,6 @@ ms.sitesec: library
 ---
 
 # Favorites management
->*Supported versions: Microsoft Edge on Windows 10*  
-
 
 
 

browsers/edge/group-policies/home-button-gp.md

@@ -12,13 +12,13 @@ ms.sitesec: library
 # Home button configuration options
 >*Supported versions: Microsoft Edge on Windows 10, next major update to Windows*
 
-Microsoft Edge shows the home button and by clicking it the Start page loads by default. You can configure the Home button to load the New tab page or a URL defined in the Set Home button URL policy. You can also configure Microsoft Edge to hide the home button. 
+Microsoft Edge shows the home button and by clicking it the Start page loads by default. You can configure the Home button to load the New tab page or a URL defined in the Set Home Button URL policy. You can also configure Microsoft Edge to hide the home button. 
 
 ## Relevant group policies
 
-- [Configure Home button](#configure-home-button)
+- [Configure Home Button](#configure-home-button)
-- [Set Home button URL](#set-home-button-url)
+- [Set Home Button URL](#set-home-button-url)
-- [Unlock Home button](#unlock-home-button)
+- [Unlock Home Button](#unlock-home-button)
 
 
 ## Configuration options
@@ -30,12 +30,12 @@ Microsoft Edge shows the home button and by clicking it the Start page loads by
 ![Hide home button](../images/home-button-hide-v4-sm.png)
 
 
-## Configure Home button
+## Configure Home Button
 [!INCLUDE [configure-home-button-include.md](../includes/configure-home-button-include.md)]
 
-## Set Home button URL
+## Set Home Button URL
 [!INCLUDE [set-home-button-url-include](../includes/set-home-button-url-include.md)]
 
-## Unlock Home button
+## Unlock Home Button
 [!INCLUDE [unlock-home-button-include.md](../includes/unlock-home-button-include.md)]
 

browsers/edge/group-policies/new-tab-page-settings-gp.md

@@ -11,7 +11,6 @@ ms.sitesec: library
 
 
 # New tab page 
->*Supported versions: Microsoft Edge on Windows 10*
 
 
 Microsoft Edge loads the default New tab page by default. You can configure Microsoft Edge to load a New tab page URL and prevent users from changing it.  When you enable this policy, and you disable the Allow web content on New tab page policy, Microsoft Edge ignores any URL specified in this policy and opens about:blank. 

browsers/edge/group-policies/prelaunch-preload-gp.md

@@ -7,7 +7,7 @@ ms.date: 07/25/2018
 ---
 
 # Prelaunch Microsoft Edge and preload tabs in the background  
->*Supported versions: Microsoft Edge on Windows 10, next major update to Windows*
+
 
 
 Microsoft Edge pre-launches as a background process during Windows startup when the system is idle waiting to be launched by the user.  Pre-launching helps the performance of Microsoft Edge and minimizes the amount of time required to start up Microsoft Edge. You can also configure Microsoft Edge to prevent Microsoft Edge from pre-launching.  

browsers/edge/group-policies/security-privacy-management-gp.md

@@ -7,7 +7,6 @@ ms.date: 07/27/2018
 ---
 
 # Security and privacy management
->*Supported versions: Microsoft Edge on Windows 10*
 
 Microsoft Edge is designed with improved security in mind, helping to defend people from increasingly sophisticated and prevalent web-based attacks against Windows. Because Microsoft Edge is designed like a Universal Windows app, changing the browser to an app, it fundamentally changes the process model so that both the outer manager process and the different content processes all live within app container sandboxes. 
 

browsers/edge/group-policies/sync-browser-settings-gp.md

@@ -7,7 +7,7 @@ ms.date: 08/06/2018
 ---
 
 # Sync browser settings options 
->*Supported versions: Microsoft Edge on Windows 10, next major update to Windows* 
+
 
 By default, the “browser” group syncs automatically between the user’s devices, letting users make changes. The “browser” group uses the Sync your Settings option in Settings to sync information like history and favorites. You can configure Microsoft Edge to prevent the “browser” group from syncing and prevent users from turning on the _Sync your Settings_ toggle in Settings. If you want syncing turned off by default but not disabled, select the _Allow users to turn “browser” syncing_ option in the Do not sync browser policy. 
 

browsers/edge/group-policies/telemetry-management-gp.md

@@ -7,7 +7,6 @@ ms.date: 07/29/2018
 ---
 
 # Telemetry and data collection
->*Supported versions: Microsoft Edge on Windows 10, next major update to Windows* 
 
 
 

browsers/edge/includes/allow-address-bar-suggestions-include.md

@@ -7,11 +7,11 @@
 
 ### Supported values
 
->[!div class="mx-tableFixed"]
+
->|Group Policy  |MDM |Registry |Description |Most restricted |
+|Group Policy  |MDM |Registry |Description |Most restricted |
->|---|:---:|:---:|---|:---:|
+|---|:---:|:---:|---|:---:|
->|Disabled |0 |0 |Prevented/not allowed. Hide the Address bar drop-down functionality and disable the _Show search and site suggestions as I type_ toggle in Settings.  |![Most restricted value](../images/check-gn.png) |
+|Disabled |0 |0 |Prevented/not allowed. Hide the Address bar drop-down functionality and disable the _Show search and site suggestions as I type_ toggle in Settings.  |![Most restricted value](../images/check-gn.png) |
->|Enabled or not configured **(default)** |1 |1 |Allowed. Show the Address bar drop-down list and make it available. | |
+|Enabled or not configured **(default)** |1 |1 |Allowed. Show the Address bar drop-down list and make it available. | |
 ---
 
 ### ADMX info and settings

browsers/edge/includes/allow-adobe-flash-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Addons 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Addons 
 - **Value name:** FlashPlayerEnabled
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-clearing-browsing-data-include.md

@@ -6,11 +6,11 @@
 
 ### Supported values
 
->[!div class="mx-tableFixed"]
+
->|Group Policy  |MDM |Registry |Description |Most restricted |
+|Group Policy  |MDM |Registry |Description |Most restricted |
->|---|:---:|:---:|---|:---:|
+|---|:---:|:---:|---|:---:|
->|Disabled or not configured **(default)** |0 |0 |Prevented/not allowed. Users can configure the _Clear browsing data_ option in Settings. | |
+|Disabled or not configured **(default)** |0 |0 |Prevented/not allowed. Users can configure the _Clear browsing data_ option in Settings. | |
->|Enabled |1 |1 |Allowed. Clear the browsing data upon exit automatically. |![Most restricted value](../images/check-gn.png) |
+|Enabled |1 |1 |Allowed. Clear the browsing data upon exit automatically. |![Most restricted value](../images/check-gn.png) |
 ---
 
 
@@ -28,8 +28,8 @@
 - **URI full path:** ./Vendor/MSFT/Policy/Config/Browser/ClearBrowsingDataOnExit
 - **Data type:** Integer
 
-#### *Registry
+#### Registry
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Privacy
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Privacy
 - **Value name:** ClearBrowsingHistoryOnExit
 - **Value type:** REG_DWORD 
 

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)]
@@ -8,8 +8,8 @@
 
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
-|Disabled or not configured<br>**(default)** |0 |0 |Depending on the device configuration, Microsoft Edge gathers only basic diagnostic data. |![Most restricted value](../images/check-gn.png) |
+|Disabled or not configured<br>**(default)** |0 |0 |Gather and send only basic diagnostic data. |![Most restricted value](../images/check-gn.png) |
-|Enabled |1 |1 |Gathers both basic and additional diagnostic data. | |
+|Enabled |1 |1 |Gather all diagnostic data. For this policy to work correctly, you must set the diagnostic data in _Settings > Diagnostics & feedback_ to **Full**. | |
 ---
 
 ### ADMX info and settings
@@ -27,9 +27,9 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\BooksLibrary
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\BooksLibrary
 - **Value name:** EnableExtendedBooksTelemetry
 - **Value type:** REG_DWORD
 
 
-<hr>
+<hr>

browsers/edge/includes/allow-extensions-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Extensions
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Extensions
 - **Value name:** ExtensionsEnabled
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-full-screen-include.md

@@ -29,7 +29,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Main 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Main 
 - **Value name:** AllowFullScreenMode
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-inprivate-browsing-include.md

@@ -29,7 +29,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main 
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main 
 - **Value name:** AllowInPrivate
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-microsoft-compatibility-list-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\BrowserEmulation
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\BrowserEmulation
 - **Value name:** MSCompatibilityMode
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-prelaunch-include.md

@@ -33,7 +33,7 @@ For more details about configuring the prelaunch and preload options, see [Prela
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\ 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\ 
 - **Value name:** AllowPrelaunch
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-printing-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main 
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main 
 - **Value name:** AllowPrinting
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-saving-history-include.md

@@ -16,7 +16,7 @@
 ### ADMX info and settings
 
 #### ADMX info
-- **GP English name:** Allow saving history
+- **GP English name:** Allow Saving History
 - **GP name:** AllowSavingHistory
 - **GP path:** Windows Components/Microsoft Edge
 - **GP ADMX file name:** MicrosoftEdge.admx
@@ -28,7 +28,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:**  HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
+- **Path:**  HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
 - **Value name:** AllowSavingHistory
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-search-engine-customization-include.md

@@ -32,7 +32,7 @@ For more details about configuring the search engine, see [Search engine customi
 
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Protected
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Protected
 - **Value name:** AllowSearchEngineCustomization
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-shared-folder-books-include.md

@@ -8,9 +8,11 @@
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
 |Disabled or not configured<br>**(default)** |0 |0 |Prevented/not allowed, but Microsoft Edge downloads book files to a per-user folder for each user. |![Most restricted value](../images/check-gn.png) |
-|Enabled |1 |1 |Allowed. Microsoft Edge downloads book files to a shared folder.| |
+|Enabled |1 |1 |Allowed. Microsoft Edge downloads book files to a shared folder. For this policy to work correctly, you must also enable the Allow a Windows app to share application data between users group policy.  Also, the users must be signed in with a school or work account.| |
 ---
 
+![Allow a shared books folder](../images/allow-shared-books-folder_sm.png)
+
 ### ADMX info and settings
 
 #### ADMX info
@@ -26,8 +28,12 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\BooksLibrary
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\BooksLibrary
 - **Value name:** UseSharedFolderForBooks
 - **Value type:** REG_DWORD
 
+### Related policies 
+
+**Allow a Windows app to share application data between users:** [!INCLUDE [allow-windows-app-to-share-data-users-shortdesc](../shortdesc/allow-windows-app-to-share-data-users-shortdesc.md)]
+
 <hr>

browsers/edge/includes/allow-sideloading-extensions-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Extensions 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Extensions 
 - **Value name:** AllowSideloadingOfExtensions
 - **Value type:** REG_DWORD
 

browsers/edge/includes/allow-web-content-new-tab-page-include.md

@@ -30,7 +30,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\ServiceUI
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\ServiceUI
 - **Value name:** AllowWebContentOnNewTabPage
 - **Value type:** REG_DWORD
 

browsers/edge/includes/always-enable-book-library-include.md

@@ -28,7 +28,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
 - **Value name:** AlwaysEnableBooksLibrary
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-additional-search-engines-include.md

@@ -32,7 +32,7 @@ For more details about configuring the search engine, see [Search engine customi
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\OpenSearch
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\OpenSearch
 - **Value name:** ConfigureAdditionalSearchEngines
 - **Value type:** REG_SZ
 

browsers/edge/includes/configure-adobe-flash-click-to-run-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Security
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Security
 - **Value name:** FlashClickToRunMode
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-allow-flash-url-list-include.md

@@ -29,7 +29,7 @@
 - **Data type:** Integer
 
 #### Registry settings 
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\ 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\ 
 - **Value name:** 
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-autofill-include.md

@@ -1,6 +1,6 @@
 <!-- ## Configure Autofill -->
 >*Supported versions: Microsoft Edge on Windows 10*<br>
->*Default setting:  Not configured*
+>*Default setting:  Not configured (Blank)*
 
 [!INCLUDE [configure-autofill-shortdesc](../shortdesc/configure-autofill-shortdesc.md)]
 
@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
 - **Value name:** Use FormSuggest
 - **Value type:** REG_SZ
 

browsers/edge/includes/configure-browser-telemetry-for-m365-analytics-include.md

@@ -10,13 +10,13 @@
 
 ### Supported values
 
->[!div class="mx-tableFixed"]
+
->|Group Policy  |MDM |Registry |Description |Most restricted |
+|Group Policy  |MDM |Registry |Description |Most restricted |
->|---|:---:|:---:|---|:---:|
+|---|:---:|:---:|---|:---:|
->|Disabled or not configured<br>**(default)** |0 |0 |No data collected or sent |![Most restricted value](../images/check-gn.png) |
+|Disabled or not configured<br>**(default)** |0 |0 |No data collected or sent |![Most restricted value](../images/check-gn.png) |
->|Enabled |1 |1 |Send intranet history only | |
+|Enabled |1 |1 |Send intranet history only | |
->|Enabled |2 |2 |Send Internet history only | |
+|Enabled |2 |2 |Send Internet history only | |
->|Enabled |3 |3 |Send both intranet and Internet history | |
+|Enabled |3 |3 |Send both intranet and Internet history | |
 ---
 
 >>You can find this policy and the related policies in the following location of the Group Policy Editor:
@@ -42,7 +42,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection
+- **Path:** HKLM\Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection
 - **Value name:** MicrosoftEdgeDataOptIn
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-do-not-track-include.md

@@ -9,7 +9,7 @@
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
 |Not configured<br>**(default)** |Blank |Blank |Do not send tracking information but let users choose to send tracking information to sites they visit. | |
-|Disabled |1 |1 |Never send tracking information. | |
+|Disabled |0 |0 |Never send tracking information. | |
 |Enabled |1 |1 |Send tracking information. |![Most restricted value](../images/check-gn.png) |
 ---
 
@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
 - **Value name:** DoNotTrack
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-edge-kiosk-reset-idle-timeout-include.md

@@ -28,7 +28,7 @@ You must set the Configure kiosk mode policy to enabled (1 - InPrivate public br
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\KioskMode
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\KioskMode
 - **Value name:**ConfigureKioskResetAfterIdleTimeout
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-enterprise-mode-site-list-include.md

@@ -29,7 +29,7 @@
 - **Data type:** String
  
 #### Registry settings
--  **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Main\EnterpriseMode
+-  **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Main\EnterpriseMode
 - **Value name:** SiteList
 - **Value type:** REG_SZ
 

browsers/edge/includes/configure-favorites-bar-include.md

@@ -8,12 +8,12 @@
 
 ### Supported values
 
->[!div class="mx-tableFixed"]
+
->|Group Policy  |MDM |Registry |Description |
+|Group Policy  |MDM |Registry |Description |
->|---|:---:|:---:|---|
+|---|:---:|:---:|---|
->|Not configured **(default)** |Blank |Blank |Hide the favorites bar but show it on the Start and New tab pages. The favorites bar toggle, in Settings, is set to Off but enabled allowing users to make changes. | 
+|Not configured **(default)** |Blank |Blank |Hide the favorites bar but show it on the Start and New tab pages. The favorites bar toggle, in Settings, is set to Off but enabled allowing users to make changes. | 
->|Disabled |0 |0 |Hide the favorites bar on all pages. Also, the favorites bar toggle, in Settings, is set to Off and disabled preventing users from making changes. Microsoft Edge also hides the “show bar/hide bar” option in the context menu. | 
+|Disabled |0 |0 |Hide the favorites bar on all pages. Also, the favorites bar toggle, in Settings, is set to Off and disabled preventing users from making changes. Microsoft Edge also hides the “show bar/hide bar” option in the context menu. | 
->|Enabled |1 |1 |Show the favorites bar on all pages. Also, the favorites bar toggle, in Settings, is set to On and disabled preventing users from making changes. Microsoft Edge also hides the “show bar/hide bar” option in the context menu. | 
+|Enabled |1 |1 |Show the favorites bar on all pages. Also, the favorites bar toggle, in Settings, is set to On and disabled preventing users from making changes. Microsoft Edge also hides the “show bar/hide bar” option in the context menu. | 
 ---
 
 ### ADMX info and settings
@@ -30,7 +30,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Main
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Main
 - **Value name:** ConfigureFavoritesBar
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-home-button-include.md

@@ -1,5 +1,5 @@
-<!-- ## Configure Home button-->  
+<!-- ## Configure Home Button-->  
->*Supported versions: Microsoft Edge on Windows 10*<br>  
+>*Supported versions: Microsoft Edge on Windows 10, next major update to Windows* 
 >*Default setting: Disabled or not configured (Show home button and load the Start page)*
 
 
@@ -12,7 +12,7 @@
 |---|:---:|:---:|---|
 |Disabled or not configured<br>**(default)** |0 |0 |Show home button and load the Start page. |
 |Enabled |1 |1 |Show home button and load the New tab page. |
-|Enabled |2 |2 |Show home button and load the custom URL defined in the Set Home button URL policy. |
+|Enabled |2 |2 |Show home button and load the custom URL defined in the Set Home Button URL policy. |
 |Enabled |3 |3 |Hide home button. |
 ---
 
@@ -21,12 +21,12 @@
 For more details about configuring the different Home button options, see [Home button configuration options](../group-policies/home-button-gp.md).
 
 >[!TIP]
->If you want to make changes to this policy:<ol><li>Enable the **Unlock Home Button** policy.</li><li>Make changes to the **Configure Home button** policy or **Set Home button URL** policy.</li><li>Disable the **Unlock Home Button** policy.</li></ol>
+>If you want to make changes to this policy:<ol><li>Enable the **Unlock Home Button** policy.</li><li>Make changes to the **Configure Home Button** policy or **Set Home Button URL** policy.</li><li>Disable the **Unlock Home Button** policy.</li></ol>
 
 
 ### ADMX info and settings
 #### ADMX info
-- **GP English name:** Configure Home button
+- **GP English name:** Configure Home Button
 - **GP name:** ConfigureHomeButton
 - **GP element:** ConfigureHomeButtonDropdown
 - **GP path:** Windows Components/Microsoft Edge
@@ -39,15 +39,15 @@ For more details about configuring the different Home button options, see [Home
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Internet Settings 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Internet Settings 
 - **Value name:** ConfigureHomeButton
 - **Value type:** REG_DWORD
 
 ### Related policies
 
-- [Set Home button URL](../new-policies.md#set-home-button-url): [!INCLUDE [set-home-button-url-shortdesc](../shortdesc/set-home-button-url-shortdesc.md)]
+- [Set Home Button URL](../new-policies.md#set-home-button-url): [!INCLUDE [set-home-button-url-shortdesc](../shortdesc/set-home-button-url-shortdesc.md)]
  
-- [Unlock Home button](../new-policies.md#unlock-home-button): [!INCLUDE [unlock-home-button-shortdesc](../shortdesc/unlock-home-button-shortdesc.md)] 
+- [Unlock Home Button](../new-policies.md#unlock-home-button): [!INCLUDE [unlock-home-button-shortdesc](../shortdesc/unlock-home-button-shortdesc.md)] 
 
 
 <hr>

browsers/edge/includes/configure-inprivate-include.md

@@ -25,7 +25,7 @@
 - **Data type:** Integer 
  
 #### Registry settings 
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\ 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\ 
 - **Value name:** 
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-microsoft-edge-kiosk-mode-include.md

@@ -32,7 +32,7 @@ For this policy to work, you must configure Microsoft Edge in assigned access; o
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\KioskMode
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\KioskMode
 - **Value name:** ConfigureKioskMode
 - **Value type:** REG_SZ
 

browsers/edge/includes/configure-open-edge-with-include.md

@@ -44,7 +44,7 @@ For more details about configuring the Start pages, see [Start pages configurati
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Internet Settings
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Internet Settings
 - **Value name:** ConfigureOpenEdgeWith
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-password-manager-include.md

@@ -14,9 +14,8 @@
 ---
 
 Verify not allowed/disabled settings:
-1. In the upper-right corner of Microsoft Edge or Microsoft Edge for Windows 10 Mobile, click or tap ellipses (…).
+1. Click or tap **More** (…) and select **Settings** > **View Advanced settings**.
-2. Click  **Settings** and select **View Advanced settings**.
+2. Verify the settings **Save Password** is toggled off or on and is greyed out.
-3. Verify the settings **Save Password** is toggled off or on and is greyed out.
 
 ### ADMX info and settings
 #### ADMX info
@@ -32,7 +31,7 @@ Verify not allowed/disabled settings:
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Main 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Main 
 - **Value name:** FormSuggest Passwords
 - **Value type:** REG_SZ
 

browsers/edge/includes/configure-pop-up-blocker-include.md

@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 ### Registry
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
 - **Value name:** AllowPopups
 - **Value type:** REG_SZ
 

browsers/edge/includes/configure-search-suggestions-address-bar-include.md

@@ -1,6 +1,6 @@
 <!-- ## Configure search suggestions in Address bar -->
 >*Supported versions: Microsoft Edge on Windows 10*<br>
->*Default setting:  Not configured*
+>*Default setting:  Not configured (Blank)*
 
 [!INCLUDE [configure-search-suggestions-in-address-bar-shortdesc](../shortdesc/configure-search-suggestions-in-address-bar-shortdesc.md)] 
 
@@ -27,7 +27,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\SearchScopes
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\SearchScopes
 - **Value name:** ShowSearchSuggestionsGlobal
 - **Value type:** REG_DWORD
 

browsers/edge/includes/configure-windows-defender-smartscreen-include.md

@@ -8,15 +8,14 @@
 
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
-|Not configured |Blank |Blank |Users can choose to use Windows Defender SmartScreen or not. | |
+|Not configured |Blank |Blank |Users can choose to use Windows Defender SmartScreen. | |
 |Disabled |0 |0 |Turned off. Do not protect users from potential threats and prevent users from turning it on. | |
 |Enabled |1 |1 |Turned on. Protect users from potential threats and prevent users from turning it off. |![Most restricted value](../images/check-gn.png) |
 ---
 
-To verify Windows Defender SmartScreen is turned off (disabled):
+To verify Windows Defender SmartScreen is turned off (disabled): 
-1. In the upper-right corner of Microsoft Edge or Microsoft Edge for Windows 10 Mobile, click or tap the ellipses (**...**).
+1. Click or tap **More** (…) and select **Settings** > **View Advanced settings**.
-2. Click **Settings** and select **View Advanced Settings**.
+2.  Verify the setting **Help protect me from malicious sites and download with SmartScreen Filter** is disabled.<p>![Verify that Windows Defender SmartScreen is turned off (disabled)](../images/allow-smart-screen-validation.PNG)
-3. At the bottom, verify that **Help protect me from malicious sites and download with SmartScreen Filter** is greyed out.<p>![Verify that Windows Defender SmartScreen is turned off (disabled)](../images/allow-smart-screen-validation.PNG)
 
 
 ### ADMX info and settings

browsers/edge/includes/disable-lockdown-of-start-pages-include.md

@@ -8,7 +8,7 @@
 
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
-|Not configured |0 |0 |Lockdown Start pages configured in either the Configure Open Microsoft Edge With policy and Configure Start Pages policy. |![Most restricted value](../images/check-gn.png) |
+|Not configured |0 |0 |Lock down Start pages configured in either the Configure Open Microsoft Edge With policy and Configure Start Pages policy. |![Most restricted value](../images/check-gn.png) |
 |Enabled |1 |1 |Unlocked. Users can make changes to all configured start pages.<p><p>When you enable this policy and define a set of URLs in the Configure Start Pages policy, Microsoft Edge uses the URLs defined in the Configure Open Microsoft Edge With policy. | |
 ---
 

browsers/edge/includes/do-not-prompt-client-cert-if-only-one-exists-include.md

@@ -24,7 +24,7 @@
 - **Data type:** Integer
 
 #### Registry settings 
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\ 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\ 
 - **Value name:** 
 - **Value type:** REG_DWORD
 

browsers/edge/includes/do-not-sync-browser-settings-include.md

@@ -20,7 +20,7 @@ For more details about configuring the browser syncing options, see [Sync browse
 ### ADMX info and settings
 #### ADMX info
 - **GP English name:** Do not sync browser settings
-- **GP name:** DoNotSyncBrowserSettings
+- **GP name:** DisableWebBrowserSettingSync
 - **GP path:** Windows Components/Sync your settings
 - **GP ADMX file name:** SettingSync.admx
 
@@ -31,10 +31,9 @@ For more details about configuring the browser syncing options, see [Sync browse
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\Policies\Microsoft\Windows\SettingSync
+- **Path:** HKLM\\Software\Policies\Microsoft\Windows\SettingSync
 - **Value name:** DisableWebBrowserSettingSyncUserOverride
-- **Value type:** REG_DWORD
+- **Value 
-
 
 ### Related policies
 

browsers/edge/includes/do-not-sync-include.md

@@ -1,6 +1,6 @@
 <!-- ## Do not sync -->
 >*Supported versions: Microsoft Edge on Windows 10*<br>
->*Default setting:  Disabled or not configured (Turned on)*
+>*Default setting:  Disabled or not configured (Allowed/turned on)*
 
 [!INCLUDE [do-not-sync-shortdesc](../shortdesc/do-not-sync-shortdesc.md)]
 
@@ -9,7 +9,7 @@
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
 |Disabled or not configured<br>**(default)** |0 |0 |Allowed/turned on. Users can choose what to sync to their device. | |
-|Enabled |2 |2 |Prevented/turned off. Disables the Sync your Settings toggle and prevents syncing. |![Most restricted value](../images/check-gn.png) |
+|Enabled |2 |2 |Prevented/turned off. Disables the _Sync your Settings_ toggle and prevents syncing. |![Most restricted value](../images/check-gn.png) |
 ---
 
 ### ADMX info and settings
@@ -17,7 +17,7 @@
 - **GP English name:** Do not sync
 - **GP name:** AllowSyncMySettings
 - **GP path:** Windows Components/Sync your settings
-- **GP ADMX file name:** MicrosoftEdge.admx
+- **GP ADMX file name:** SettingSync.admx
 
 #### MDM settings
 - **MDM name:** Experience/[AllowSyncMySettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-allowsyncmysettings)

browsers/edge/includes/edge-respects-applocker-lists-include.md

@@ -15,7 +15,7 @@
 |---|---|
 |ADMX info |<ul><li>**GP English name:** </li><li>**GP name:** </li><li>**GP path:** Windows Components/Microsoft Edge</li><li>**GP ADMX file name:** MicrosoftEdge.admx</li></ul> |
 |MDM settings |<ul><li>**MDM name:** Browser/[]()</li><li>**Supported devices:** Desktop and Mobile</li><li>**URI full path:** ./Vendor/MSFT/Policy/Config/Browser/ </li><li>**Data type:** Integer</li></ul> |
-|Registry |<ul><li>**Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\ </li><li>**Value name:** </li><li>**Value type:** REG_DWORD</li></ul>  |
+|Registry |<ul><li>**Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\ </li><li>**Value name:** </li><li>**Value type:** REG_DWORD</li></ul>  |
 ---
 
 

browsers/edge/includes/keep-fav-sync-ie-edge-include.md

@@ -8,8 +8,8 @@
 
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
-|Disabled or not configured<br>**(default)** |0 |0 |Turned off/not syncing. | |
+|Disabled or not configured<br>**(default)** |0 |0 |Turned off/not syncing | |
-|Enabled |1 |1 |Turned on/syncing.  |![Most restricted value](../images/check-gn.png) |
+|Enabled |1 |1 |Turned on/syncing  |![Most restricted value](../images/check-gn.png) |
 ---
 
 ### ADMX info and settings

browsers/edge/includes/prevent-access-about-flag-include.md

@@ -9,7 +9,7 @@
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
 |Disabled or not configured<br>**(default)** |0 |0 |Allowed. | |
-|Enabled |1 |1 |Prevents users from access the about:flags page. |![Most restricted value](../images/check-gn.png) |
+|Enabled |1 |1 |Prevents users from accessing the about:flags page. |![Most restricted value](../images/check-gn.png) |
 ---
 
 ### ADMX info and settings

browsers/edge/includes/prevent-first-run-webpage-open-include.md

@@ -8,7 +8,7 @@
 
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
-|Disabled or not configured<br>**(default)** |0 |0 |Allowed. Microsoft Edge loads the welcome page. | |
+|Disabled or not configured<br>**(default)** |0 |0 |Allowed. Load the First Run webpage. | |
 |Enabled |1 |1 |Prevented. |![Most restricted value](../images/check-gn.png) |
 ---
 

browsers/edge/includes/prevent-live-tile-pinning-start-include.md

@@ -9,7 +9,7 @@
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
 |Disabled or not configured<br>**(default)** |0 |0 |Collect and send Live Tile metadata. | |
-|Enabled |1 |1 |Do not collect. |![Most restricted value](../images/check-gn.png) |
+|Enabled |1 |1 |No data collected. |![Most restricted value](../images/check-gn.png) |
 ---
 
 ### ADMX info and settings

browsers/edge/includes/prevent-turning-off-required-extensions-include.md

@@ -10,7 +10,7 @@
 |Group Policy  |Description |
 |---|---|
 |Disabled or not configured<br>**(default)** |Allowed. Users can uninstall extensions. If you previously enabled this policy and you decide to disable it, the list of extension PFNs defined in this policy get ignored.  | 
-|Enabled |Provide a semi-colon delimited list of extension PFNs. For example, adding the following OneNote Web Clipper and Office Online extension prevents users from turning it off:<p><p>_Microsoft.OneNoteWebClipper8wekyb3d8bbwe;Microsoft.OfficeOnline8wekyb3d8bbwe_ <p>After defining the list of extensions, you deploy them through any available enterprise deployment channel, such as Microsoft Intune. Removing extensions from the list does not uninstall the extension from the user’s computer automatically. To uninstall the extension, use any available enterprise deployment channel. If you enable the Allow Developer Tools policy, then this policy does not prevent users from debugging and altering the logic on an extension. | 
+|Enabled |Provide a semi-colon delimited list of extension PFNs. For example, adding the following OneNote Web Clipper and Office Online extension prevents users from turning it off:<p><p>_Microsoft.OneNoteWebClipper8wekyb3d8bbwe;Microsoft.OfficeOnline8wekyb3d8bbwe_ <p>After defining the list of extensions, you deploy them through any available enterprise deployment channel, such as Microsoft Intune.<p>Removing extensions from the list does not uninstall the extension from the user’s computer automatically. To uninstall the extension, use any available enterprise deployment channel. If you enable the [Allow Developer Tools](../available-policies.md#allow-developer-tools) policy, then this policy does not prevent users from debugging and altering the logic on an extension. | 
 ---
 
 ### ADMX info and settings
@@ -21,13 +21,13 @@
 - **GP ADMX file name:** MicrosoftEdge.admx
 
 #### MDM settings
-- **MDM name:** Browser/[PreventTurningOffRequiredExtensions](../new-policies.md#prevent-turning-off-required-extensions)
+- **MDM name:** Browser/[PreventTurningOffRequiredExtensions](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-preventturningoffrequiredextensions)
 - **Supported devices:** Desktop 
 - **URI full path:** ./Vendor/MSFT/Policy/Config/Browser/PreventTurningOffRequiredExtensions 
 - **Data type:** String
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Extensions 
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Extensions 
 - **Value name:** PreventTurningOffRequiredExtensions
 - **Value type:** REG_SZ
 

browsers/edge/includes/prevent-users-to-turn-on-browser-syncing-include.md

@@ -20,8 +20,8 @@ For more details about configuring the browser syncing options, see [Sync browse
 #### ADMX info
 - **GP English name:** Prevent users from turning on browser syncing
 - **GP name:** PreventUsersFromTurningOnBrowserSyncing
-- **GP path:** Windows Components/Microsoft Edge
+- **GP path:** Windows Components/Sync your settings
-- **GP ADMX file name:** MicrosoftEdge.admx
+- **GP ADMX file name:** SettingSync.admx
 
 #### MDM settings
 - **MDM name:** Experience/[PreventUsersFromTurningOnBrowserSyncing](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-preventusersfromturningonbrowsersyncing)

browsers/edge/includes/provision-favorites-include.md

@@ -11,8 +11,8 @@
 
 |Group Policy  |Description |Most restricted |
 |---|---|:---:|
-|Disabled or not configured<br>**(default)** |Default list of favorites not defined in Microsoft Edge. In this case, the Favorites list is customizable, such as adding folders, or adding and removing favorites. | |
+|Disabled or not configured<br>**(default)** |Users can customize the favorites list, such as adding folders, or adding and removing favorites. | |
-|Enabled |Define a default list of favorites in Microsoft Edge. In this case, the Save a Favorite, Import settings, and context menu options (such as Create a new folder) are turned off.<p>To define a default list of favorites, do the following:<ol><li>In the upper-right corner of Microsoft Edge, click the ellipses (**...**) and select **Settings**.</li><li>Click **Import from another browser**, click **Export to file**, and save the file.</li><li>In the **Options** section of the Group Policy Editor, provide the location that points the file with the list of favorites to provision.  Specify the URL as: <ul><li>HTTP location: "SiteList"=http://localhost:8080/URLs.html</li><li>Local network: "SiteList"="\network\shares\URLs.html"</li><li>Local file: "SiteList"=file:///c:\Users\\Documents\URLs.html</li></ul></li></ol> |![Most restricted value](../images/check-gn.png) | 
+|Enabled |Define a default list of favorites in Microsoft Edge. In this case, the Save a Favorite, Import settings, and context menu options (such as Create a new folder) are turned off.<p>To define a default list of favorites, do the following:<ol><li>In the upper-right corner of Microsoft Edge, click the ellipses (**...**) and select **Settings**.</li><li>Click **Import from another browser**, click **Export to file**, and save the file.</li><li>In the **Options** section of the Group Policy Editor, provide the location that points the file with the list of favorites to provision.  Specify the URL as: <ul><li>HTTP location: "SiteList"=http://localhost:8080/URLs.html</li><li>Local network: "SiteList"="\network\shares\URLs.html"</li><li>Local file: "SiteList"=file:///c:/Users/Documents/URLs.html</li></ul></li></ol> |![Most restricted value](../images/check-gn.png) | 
 ---
 
 ### ADMX info and settings
@@ -30,7 +30,7 @@
 - **Data type:** String
 
 #### Registry settings
-- **Path:** HLKM\Software\Policies\Microsoft\MicrosoftEdge\Favorites
+- **Path:** HKLM\Software\Policies\Microsoft\MicrosoftEdge\Favorites
 - **Value name:** ConfiguredFavorites
 - **Value type:** REG_SZ
 

browsers/edge/includes/send-all-intranet-sites-ie-include.md

@@ -5,7 +5,7 @@
 [!INCLUDE [send-all-intranet-sites-to-ie-shortdesc](../shortdesc/send-all-intranet-sites-to-ie-shortdesc.md)] 
 
 >[!TIP]
->Microsoft Edge does not support ActiveX controls, Browser Helper Objects, VBScript, or other legacy technology. If you have websites or web apps that still use this technology and needs IE11 to run, you can add them to the Enterprise Mode site list, using Enterprise Mode Site List Manager. Allowed values.
+>Microsoft Edge does not support ActiveX controls, Browser Helper Objects, VBScript, or other legacy technology. If you have websites or web apps that still use this technology and needs IE11 to run, you can add them to the Enterprise Mode site list, using Enterprise Mode Site List Manager. 
 
 
 ### Supported values
@@ -13,7 +13,7 @@
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
 |Disabled or not configured<br>**(default)** |0 |0 |All sites, including intranet sites, open in Microsoft Edge automatically. |![Most restricted value](../images/check-gn.png) |
-|Enabled |1 |1 |Only intranet sites open in Internet Explorer 11 automatically.<p><p>Enabling this policy automatically opens all intranet sites in IE11, even if the users have Microsoft Edge as their default browser.<ol><li>In Group Policy Editor, navigate to:<br><br>**Computer Configuration\\Administrative Templates\\Windows Components\\File Explorer\\Set a default associations configuration file**<p></li><li>Click **Enabled**, refresh the policy, and then view the affected sites in Microsoft Edge.<p><p>A message displays saying that the page needs to open in IE. At the same time, the page opens in IE11 automatically; in a new frame if it is not yet running, or in a new tab.</li></ol>| |
+|Enabled |1 |1 |Only intranet sites open in Internet Explorer 11 automatically.<p><p>Enabling this policy automatically opens all intranet sites in IE11, even if the users have Microsoft Edge as their default browser.<ol><li>In Group Policy Editor, navigate to:<br><br>**Computer Configuration\\Administrative Templates\\Windows Components\\File Explorer\\Set a default associations configuration file** and click **Enable**.<p></li><li>Refresh the policy and then view the affected sites in Microsoft Edge.<p><p>A message displays saying that the page needs to open in IE. At the same time, the page opens in IE11 automatically; in a new frame if it is not yet running, or in a new tab.</li></ol>| |
 ---
 
 
@@ -31,7 +31,7 @@
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\Main
 - **Value name:** SendIntranetTraffictoInternetExplorer
 - **Value type:** REG_DWORD
 

browsers/edge/includes/set-default-search-engine-include.md

@@ -8,7 +8,7 @@
 
 |Group Policy  |MDM |Registry |Description |Most restricted |
 |---|:---:|:---:|---|:---:|
-|Not configured<br>**(default)** |Blank |Blank |Microsoft Edge uses the default search engine specified in App settings. If you don't configure this policy and disable the [Allow search engine customization](#allow-search-engine-customization-include) policy, users cannot make changes. | |
+|Not configured<br>**(default)** |Blank |Blank |Microsoft Edge uses the default search engine specified in App settings. If you don't configure this policy and disable the [Allow search engine customization](../available-policies.md#allow-search-engine-customization) policy, users cannot make changes. | |
 |Disabled |0 |0 |Microsoft Edge removes the policy-set search engine and uses the Microsoft Edge specified engine for the market. | |
 |Enabled |1 |1 |Microsoft Edge uses the policy-set search engine specified in the OpenSearch XML file. Users cannot change the default search engine.<p><p>Specify a link to the OpenSearch XML file that contains, at a minimum, the short name and the URL template (HTTPS) of the search engine. For more information about creating the OpenSearch XML file, see [Search provider discovery](https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/browser/search-provider-discovery). Use this format to specify the link you want to add.<p><p>If you want users to use the default Microsoft Edge settings for each market set the string to **EDGEDEFAULT**.<p><p>If you would like users to use Microsoft Bing as the default search engine set the string to **EDGEBING**. |![Most restricted value](../images/check-gn.png) |
 ---
@@ -33,7 +33,7 @@ For more details about configuring the search engine, see [Search engine customi
 - **Data type:** Integer
 
 #### Registry settings
-- **Path:** HLKM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\OpenSearch
+- **Path:** HKLM\\Software\\Policies\\Microsoft\\MicrosoftEdge\\OpenSearch
 - **Value name:** SetDefaultSearchEngine
 - **Value type:** REG_SZ
 

browsers/edge/includes/set-home-button-url-include.md

@@ -1,4 +1,4 @@
-<!-- ## Set Home button URL--> 
+<!-- ## Set Home Button URL--> 
 >*Supported versions: Microsoft Edge on Windows 10, next major update to Windows*<br> 
 >*Default setting: Disabled or not configured (Blank)*
 
@@ -9,7 +9,7 @@
 |Group Policy  |MDM |Registry |Description |
 |---|:---:|:---:|---|
 |Disabled or not configured<br>**(default)** |Blank |Blank |Show the home button and loads the Start page and locks down the home button to prevent users from changing what page loads. |
-|Enabled - String |String |String |Load a custom URL for the home button. You must also enable the [Configure Home button](../new-policies.md#configure-home-button) policy and select the _Show home button & set a specific page_ option.<p>Enter a URL in string format, for example, https://www.msn.com.   |
+|Enabled - String |String |String |Load a custom URL for the home button. You must also enable the [Configure Home Button](../new-policies.md#configure-home-button) policy and select the _Show home button & set a specific page_ option.<p>Enter a URL in string format, for example, https://www.msn.com.   |
 ---
 
 
@@ -20,7 +20,7 @@ For more details about configuring the different Home button options, see [Home
 
 ### ADMX info and settings
 #### ADMX info
-- **GP English name:** Set Home button URL
+- **GP English name:** Set Home Button URL
 - **GP name:** SetHomeButtonURL
 - **GP element:** SetHomeButtonURLPrompt
 - **GP path:** Windows Components/Microsoft Edge
@@ -39,8 +39,8 @@ For more details about configuring the different Home button options, see [Home
 
 ### Related policies
 
-- [Configure Home button](../new-policies.md#configure-home-button): [!INCLUDE [configure-home-button-shortdesc](../shortdesc/configure-home-button-shortdesc.md)]
+- [Configure Home Button](../new-policies.md#configure-home-button): [!INCLUDE [configure-home-button-shortdesc](../shortdesc/configure-home-button-shortdesc.md)]
 
-- [Unlock Home button](../new-policies.md#unlock-home-button): [!INCLUDE [unlock-home-button-shortdesc](../shortdesc/unlock-home-button-shortdesc.md)]
+- [Unlock Home Button](../new-policies.md#unlock-home-button): [!INCLUDE [unlock-home-button-shortdesc](../shortdesc/unlock-home-button-shortdesc.md)]
 
 <hr>

browsers/edge/includes/show-message-opening-sites-ie-include.md

@@ -12,7 +12,7 @@
 |---|:---:|:---:|---|:---:|
 |Disabled or not configured<br>**(default)** |0 |0 |No additional message displays. |![Most restricted value](../images/check-gn.png) |
 |Enabled |1 |1 |Show an additional message stating that a site has opened in IE11. | |
-|Enabled |2 |2 |Show an additional message with a "Keep going in Microsoft Edge" link to allow users to open the site in Microsoft Edge. | |
+|Enabled |2 |2 |Show an additional message with a _Keep going in Microsoft Edge_ link to allow users to open the site in Microsoft Edge. | |
 ---
 
 ### Configuration options  

browsers/edge/includes/unlock-home-button-include.md

@@ -8,7 +8,7 @@
 
 |Group Policy  |MDM |Registry |Description |
 |---|:---:|:---:|---|
-|Disabled or not configured<br>**(default)** |0 |0 |Lock down the home button to prevent users from making changes to the home button settings. | 
+|Disabled or not configured<br>**(default)** |0 |0 |Lock down and prevent users from making changes to the home button settings. | 
 |Enabled |1 |1 |Let users make changes. | 
 ---
 
@@ -37,9 +37,9 @@ For more details about configuring the different Home button options, see [Home
 
 ### Related policies
 
-- [Configure Home button](../new-policies.md#configure-home-button): [!INCLUDE [configure-home-button-shortdesc](../shortdesc/configure-home-button-shortdesc.md)] 
+- [Configure Home Button](../new-policies.md#configure-home-button): [!INCLUDE [configure-home-button-shortdesc](../shortdesc/configure-home-button-shortdesc.md)] 
  
-- [Set Home button URL](../new-policies.md#set-home-button-url): [!INCLUDE [set-home-button-url-shortdesc](../shortdesc/set-home-button-url-shortdesc.md)]
+- [Set Home Button URL](../new-policies.md#set-home-button-url): [!INCLUDE [set-home-button-url-shortdesc](../shortdesc/set-home-button-url-shortdesc.md)]
 
 
 <hr>

browsers/edge/index.yml

@@ -52,13 +52,13 @@ sections:
 
     - href: https://docs.microsoft.com/en-us/microsoft-edge/deploy/about-microsoft-edge
 
-      html: <p>Learn about Microsoft Edge, including system requirements and language support</p>
+      html: <p>Learn about the system requirements and language support for Microsoft Edge.</p>
 
       image:
 
         src: https://docs.microsoft.com/media/common/i_overview.svg
       
-      title: Microsoft Edge overview
+      title: System requirements and supported languages
 
     - href: https://docs.microsoft.com/en-us/microsoft-edge/deploy/new-policies
 

browsers/edge/microsoft-edge-kiosk-mode-deploy.md

@@ -309,7 +309,7 @@ In the following table, we show you the features available in both Microsoft Edg
 | Multi-tab support    | ![Supported](images/148767.png)   | ![Not supported](images/148766.png)   |
 | Allow URL support    | ![Supported](images/148767.png) <p>*\*For Microsoft Edge kiosk mode use* [Windows Defender Firewall](#_*Windows_Defender_Firewall)*. Microsoft kiosk browser has custom policy support.* | ![Supported](images/148767.png)  |
 | Block URL support    | ![Supported](images/148767.png)<p>*\*For Microsoft Edge kiosk mode use* [Windows Defender Firewall](#_*Windows_Defender_Firewall)*. Microsoft kiosk browser has custom policy support.* | ![Supported](images/148767.png)     |
-| Configure Home button   | ![Supported](images/148767.png)   | ![Supported](images/148767.png)      |
+| Configure Home Button   | ![Supported](images/148767.png)   | ![Supported](images/148767.png)      |
 | Set Start page(s) URL    | ![Supported](images/148767.png)      | ![Supported](images/148767.png) <p>*Same as Home button URL*     |
 | Set New Tab page URL  | ![Supported](images/148767.png)    | ![Not supported](images/148766.png)   |
 | Favorites management     | ![Supported](images/148767.png)     | ![Not supported](images/148766.png) |

browsers/edge/new-policies.md

@@ -40,18 +40,18 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis
 | [Allow web content on new tab page](available-policies.md#allow-web-content-on-new-tab-page) | -- | [AllowWebContentOnNewTabPage](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-allowwebcontentonnewtabpage) | New |
 | [Configure collection of browsing data for Microsoft 365 Analytics](#configure-collection-of-browsing-data-for-microsoft-365-analytics) | New | [ConfigureTelemetryForMicrosoft365Analytics](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configuretelemetryformicrosoft365analytics) | New |
 | [Configure Favorites Bar](#configure-favorites-bar) | New | [ConfigureFavoritesBar](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurefavoritesbar) | New |
-| [Configure Home button](#configure-home-button) | New | [ConfigureHomeButton](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurehomebutton) | New |
+| [Configure Home Button](#configure-home-button) | New | [ConfigureHomeButton](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurehomebutton) | New |
 | [Configure kiosk mode](#configure-kiosk-mode) | New |  [ConfigureKioskMode](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskmode) | New |
 | [Configure kiosk reset after idle timeout](#configure-kiosk-reset-after-idle-timeout) | New |  [ConfigureKioskResetAfterIdleTimeout](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskresetafteridletimeout) | New |
 | [Configure Open Microsoft Edge With](#configure-open-microsoft-edge-with) | New | [ConfigureOpenEdgeWith](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configureopenmicrosoftedgewith) | New |
 | [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | [Experience/DoNotSyncBrowserSettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-donotsyncbrowsersetting)  | New |
 | [Prevent certificate error overrides](#prevent-certificate-error-overrides) | New | [PreventCertErrorOverrides](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-preventcerterroroverrides) | New |
-| [Prevent users from turning on browser syncing](#preventusersfromturningonbrowsersyncing) | New | Experience/PreventUsersFromTurningOnBrowserSyncing | New |
+| [Prevent users from turning on browser syncing](#preventusersfromturningonbrowsersyncing) | New | [Experience/PreventUsersFromTurningOnBrowserSyncing](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-preventusersfromturningonbrowsersyncing) | New |
 | [Prevent turning off required extensions](#prevent-turning-off-required-extensions) | New | [PreventTurningOffRequiredExtensions](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-preventusersfromturningonbrowsersyncing) | New |
-| [Set Home button URL](#set-home-button-url) | New | [SetHomeButtonURL](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-sethomebuttonurl) | New |
+| [Set Home Button URL](#set-home-button-url) | New | [SetHomeButtonURL](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-sethomebuttonurl) | New |
 | [Set New Tab page URL](#set-new-tab-page-url) | New | [SetNewTabPageURL](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-setnewtabpageurl) | New |
 | [Show message when opening sites in Internet Explorer](#showmessagewhenopeninginteretexplorersites) | Updated | [ShowMessageWhenOpeningSitesInInternetExplorer](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-showmessagewhenopeningsitesininternetexplorer) | Updated |
-| [Unlock Home button](#unlock-home-button) | New | [UnlockHomeButton](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-unlockhomebutton) | New |
+| [Unlock Home Button](#unlock-home-button) | New | [UnlockHomeButton](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-unlockhomebutton) | New |
 ---
 
  
@@ -81,7 +81,7 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis
 ## Configure Favorites Bar
 [!INCLUDE [configure-favorites-bar-include.md](includes/configure-favorites-bar-include.md)]
 
-## Configure Home button
+## Configure Home Button
 [!INCLUDE [configure-home-button-include.md](includes/configure-home-button-include.md)]
 
 ## Configure kiosk mode
@@ -102,7 +102,7 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis
 ## Prevent users from turning on browser syncing
 [!INCLUDE [prevent-users-to-turn-on-browser-syncing-include](includes/prevent-users-to-turn-on-browser-syncing-include.md)]
 
-## Set Home button URL
+## Set Home Button URL
 [!INCLUDE [set-home-button-url-include](includes/set-home-button-url-include.md)]
 
 ## Set New Tab page URL
@@ -111,6 +111,6 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis
 ## Show message when opening sites in Internet Explorer
 [!INCLUDE [show-message-opening-sites-ie-include](includes/show-message-opening-sites-ie-include.md)]
 
-## Unlock Home button
+## Unlock Home Button
 [!INCLUDE [unlock-home-button-include.md](includes/unlock-home-button-include.md)]
 

browsers/edge/shortdesc/allow-a-shared-books-folder-shortdesc.md

@@ -1 +1 @@
-You can configure Microsoft Edge to store books from the Books Library to a default, shared folder in Windows, which decreases the amount of storage used by book files. When you enable this policy, Microsoft Edge downloads book files automatically to a common, shared folder, and prevents users from removing the book from the library. When disabled, Microsoft Edge does not use a shared folder but downloads book files to a folder for each user. For this policy to work properly, users must be signed in with a school or work account.  
+Microsoft Edge does not use a shared folder by default but downloads book files to a per-user folder for each user. With this policy, you can configure Microsoft Edge to store books from the Books Library to a default, shared folder in Windows, which decreases the amount of storage used by book files. When you enable this policy, Microsoft Edge downloads books to a shared folder after user action to download the book to their device, which allows them to remove downloaded books at any time. For this policy to work correctly, you must also enable the Allow a Windows app to share application data between users group policy.  Also, the users must be signed in with a school or work account.

browsers/edge/shortdesc/allow-prelaunch-shortdesc.md

@@ -1 +1 @@
-Microsoft Edge pre-launches as a background process during Windows startup when the system is idle waiting to be launched by the user.  Pre-launching helps the performance of Microsoft Edge and minimizes the amount of time required to start up Microsoft Edge. You can also configure Microsoft Edge to prevent Microsoft Edge from pre-launching.
+Microsoft Edge pre-launches as a background process during Windows startup when the system is idle waiting to be launched by the user.  Pre-launching helps the performance of Microsoft Edge and minimizes the amount of time required to start Microsoft Edge. You can also configure Microsoft Edge to prevent from pre-launching.

browsers/edge/shortdesc/allow-printing-shortdesc.md

@@ -1 +1 @@
-Microsoft Edge allows users to print web content by default. With this policy though, you can configure Microsoft Edge to prevent users from printing web content. 
+Microsoft Edge allows users to print web content by default. With this policy, you can configure Microsoft Edge to prevent users from printing web content. 

browsers/edge/shortdesc/allow-web-content-on-new-tab-page-shortdesc.md

@@ -1 +1 @@
-Microsoft Edge loads the default New tab page by default. Disabling this policy loads a blank page instead of the New tab page and prevents users from changing it. Not configuring this policy lets users choose how the New tab page appears.
+By default, Microsoft Edge loads the default New tab page. Disabling this policy loads a blank page instead of the New tab page and prevents users from changing it. Not configuring this policy lets users choose what loads on the New tab page.

browsers/edge/shortdesc/allow-windows-app-to-share-data-users-shortdesc.md

@@ -0,0 +1 @@
+With this policy, you can configure Windows 10 to share application data among multiple users on the system and with other instances of that app.  Data is shared through the SharedLocal folder, which is available through the Windows.Storage API. If you previously enabled this policy and now want to disable it, any shared app data remains in the SharedLocal folder.

browsers/edge/shortdesc/configure-favorites-shortdesc.md

@@ -1 +1 @@
-Use the **[Provision Favorites](../available-policies.md#provision-favorites)** in place of Configure Favorites. 
+Discontinued in Windows 10, version 1810.  Use the **[Provision Favorites](../available-policies.md#provision-favorites)** policy instead. 

browsers/edge/shortdesc/configure-home-button-shortdesc.md

@@ -1 +1 @@
-Microsoft Edge shows the home button and by clicking it the Start page loads by default. With this policy, you can configure the Home button to load the New tab page or a URL defined in the Set Home button URL policy. You can also configure Microsoft Edge to hide the home button. 
+Microsoft Edge shows the home button and by clicking it the Start page loads by default. With this policy, you can configure the home button to load the New tab page or a URL defined in the Set Home Button URL policy. You can also configure Microsoft Edge to hide the home button. 

browsers/edge/shortdesc/do-not-sync-shortdesc.md

@@ -1 +1 @@
-By default, Microsoft Edge turns on the Sync your Settings toggle in Settings and let users choose what to sync on their device. Enabling this policy turns off and disables the Sync your Settings toggle in Settings, preventing syncing of user’s settings between their devices. If you want syncing turned off by default in Microsoft Edge but not disabled, enable this policy and select the _Allow users to turn syncing on_ option. 
+By default, Microsoft Edge turns on the Sync your Settings toggle in Settings and let users choose what to sync on their device. Enabling this policy turns off and disables the Sync your Settings toggle in Settings, preventing syncing of user’s settings between their devices. If you want syncing turned off by default in Microsoft Edge but not disabled, enable this policy and select the _Allow users to turn syncing on_ option in this policy. 

browsers/edge/shortdesc/set-home-button-url-shortdesc.md

@@ -1 +1 @@
-By default, Microsoft Edge shows the home button and loads the Start page, and locks down the home button to prevent users from changing what page loads. Enabling this policy loads a custom URL for the home button. When you enable this policy, and enable the Configure Home button policy with the _Show home button & set a specific page_ option selected, a custom URL loads when the user clicks the home button.
+By default, Microsoft Edge shows the home button and loads the Start page, and locks down the home button to prevent users from changing what page loads. Enabling this policy loads a custom URL for the home button. When you enable this policy, and enable the Configure Home Button policy with the _Show home button & set a specific page_ option selected, a custom URL loads when the user clicks the home button.

browsers/edge/shortdesc/show-message-when-opening-sites-in-ie-shortdesc.md

@@ -1 +1 @@
-Microsoft Edge does not show a notification before opening sites in Internet Explorer 11. However, with this policy, you can configure Microsoft Edge to display a notification before a site opens in IE11 or let users continue in Microsoft Edge.  If you want users to continue in Microsoft Edge, enable this policy to show the “Keep going in Microsoft Edge” link in the notification. For this policy to work correctly, you must also enable the Configure the Enterprise Mode Site List or Send all intranet sites to Internet Explorer 11, or both.
+Microsoft Edge does not show a notification before opening sites in Internet Explorer 11. However, with this policy, you can configure Microsoft Edge to display a notification before a site opens in IE11 or let users continue in Microsoft Edge.  If you want users to continue in Microsoft Edge, enable this policy to show the _Keep going in Microsoft Edge_ link in the notification. For this policy to work correctly, you must also enable the Configure the Enterprise Mode Site List or Send all intranet sites to Internet Explorer 11, or both.

browsers/edge/shortdesc/unlock-home-button-shortdesc.md

@@ -1 +1 @@
-By default, when you enable the Configure Home button policy or provide a URL in the Set Home button URL policy, Microsoft Edge locks down the home button to prevent users from changing the settings.  When you enable this policy, users can make changes to the home button even if you enabled the Configure Home button or Set Home button URL policies. 
+By default, when you enable the Configure Home Button policy or provide a URL in the Set Home Button URL policy, Microsoft Edge locks down the home button to prevent users from changing the settings.  When you enable this policy, users can make changes to the home button even if you enabled the Configure Home Button or Set Home Button URL policies. 

devices/hololens/hololens-kiosk.md

@@ -7,7 +7,7 @@ author: jdeckerms
 ms.author: jdecker
 ms.topic: article
 ms.localizationpriority: medium
-ms.date: 05/22/2018
+ms.date: 08/14/2018
 ---
 
 # Set up HoloLens in kiosk mode
@@ -145,8 +145,7 @@ Use the following snippet in your kiosk configuration XML to enable the **Guest*
 
   ![Screenshot of the MultiAppAssignedAccessSettings field in Windows Configuration Designer](images/multiappassignedaccesssettings.png)
 
-8. (**Optional**: If you want to apply the provisioning package after device initial setup and there is an admin user already available on the kiosk device, skip this step.) Create an admin user account in **Runtime settings** > **Accounts** > **Users**. Provide a **UserName** and **Password**, and select **UserGroup** as **Administrators**. With this account, you can view the provisioning status and logs if needed.   
+
-8. (**Optional**: If you already have a non-admin account on the kiosk device, skip this step.) Create a local standard user account in **Runtime settings** > **Accounts** > **Users**. Make sure the **UserName** is the same as the account that you specify in the configuration XML. Select **UserGroup** as **Standard Users**.
 8.  On the **File** menu, select **Save.**
 9.  On the **Export** menu, select **Provisioning package**.
 10. Change **Owner** to **IT Admin**, which will set the precedence of this provisioning package higher than provisioning packages applied to this device from other sources, and then select **Next.**

devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md

@@ -282,7 +282,7 @@ Use this procedure if you use Exchange online.
 
 5.  Add email address for your on-premises domain account.
 
-    For this procedure, you'll be using AD admin tools to add an email address for your on-preises domain account.
+    For this procedure, you'll be using AD admin tools to add an email address for your on-premises domain account.
     
     - In **Active Directory Users and Computers** AD tool, right-click on the folder or Organizational Unit that your Surface Hub accounts will be created in, click **New**, and **User**.
     - Type the display name from the previous cmdlet into the **Full name** box, and the alias into the **User logon name** box. Click **Next**.

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

@@ -26,10 +26,10 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea
 ## <a name="features"></a>Inclusive Classroom features
 |Reading 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)  |
 |---|---|---|---|---|---|---|
-| 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;">(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>  | 
+| 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;">(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>  | 
+| 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 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>  | 
+| 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>  | 
 </br>
@@ -40,18 +40,18 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea
 | Spelling suggestions for phonetic misspellings  | <ul><li>Word 2016, Word Online, Word for Mac</li><li>Outlook 2016</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |  
 | Synonyms alongside spelling suggestions that can be read aloud  | <ul><li>Word 2016</li><li>Outlook 2016</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |  
 | Grammar checks  | <ul><li>Word 2016, Word Online, Word for Mac</li><li>Outlook 2016</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   |  
-| Customizable writing critiques  | <ul><li>Word 2016, Word for Mac</li><li>Outlook 2016</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   |  
+| Customizable writing critiques  | <ul><li>Word 2016, Word for Mac</li><li>Outlook 2016</li></ul>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   |  
-| Tell me what you want to do  | <ul><li>Office 2016</li><li>Office Online</li><li>Office on iOS, Android, Windows 10</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   | 
+| Tell me what you want to do  | <ul><li>Office 2016</li><li>Office Online</li><li>Office on iOS, Android, Windows 10</li></ul>  | <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;">X</p>  |   | 
 | Editor  | <ul><li>Word 2016</li></ul>  |   | <p style="text-align: center;">X</p>  | <p style="text-align: center;">X</p>  |   |   |  
 </br>
 
 | 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>  |   |   |   |  
+| 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>  |   |   |   | 
+| 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>  |   |   |   | 
+| 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>  |   |   | 
 | Ability to add captions to videos  | <ul><li>PowerPoint for PCs</li><li>Sway on iOS, Web, Windows 10</li><li>Microsoft Stream (includes ability to have captions auto-generated for videos in English and Spanish)</li></ul>  |   | <p style="text-align: center;">X</p>  |   |   |   |  
-| Export as tagged PDF  | <ul><li>Word for PCs, Mac</li><li>Sway on iOS, Web, Windows 10</li></ul>  |   |   |   |   |   |  
+| Export as tagged PDF  | <ul><li>Word 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 request accessible content  | <ul><li>Outlook Web Access</li></ul>  |   |   |   |   |   |  
 </br>
 
@@ -79,4 +79,4 @@ Depending on how you plan to do billing, you can have Office 365 accounts that a
 1. Sign-in to your <a href="https://account.microsoft.com/services" target="_blank">services and subscriptions<a/> with your Microsoft account.
 2. Find the subscription in the list, then select **Change how you pay**. 
     >**Note:** If you don't see **Change how you pay**, it could be because auto-renew is not turned on. You won't be able to change how you pay if auto-renew is off because the subscription has already been paid and will end when its duration expires.
-3. Choose a new way to pay from the list or select **Add a new way to pay** and follow the instructions. 
+3. Choose a new way to pay from the list or select **Add a new way to pay** and follow the instructions. 

education/windows/TOC.md

@@ -21,6 +21,7 @@
 ### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md)
 ### [Get Minecraft: Education Edition with Windows 10 device promotion](get-minecraft-device-promotion.md)
 ## [Test Windows 10 in S mode on existing Windows 10 education devices](test-windows10s-for-edu.md)
+## [Enable Windows 10 in S mode on Surface Go devices](enable-s-mode-on-surface-go-devices.md)
 ## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md)
 ## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md)
 ## [Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode](s-mode-switch-to-edu.md)

education/windows/enable-s-mode-on-surface-go-devices.md

@@ -0,0 +1,145 @@
+---
+title: Enable S mode on Surface Go devices for Education
+description: Steps that an education customer can perform to enable S mode on Surface Go devices
+keywords: Surface Go for Education, S mode
+ms.prod: w10
+ms.technology: Windows
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: edu
+ms.localizationpriority: medium
+author: kaushika-msft
+ms.author: 
+ms.date: 07/30/2018
+---
+
+# Surface Go for Education - Enabling S mode
+
+Surface Go devices are available with both Windows 10 Home in S mode and Windows 10 Pro configurations. Education customers who purchase Surface Go devices with Windows 10 Pro may wish to take advantage of S mode on their Pro devices. These customers can create their own S mode image for Surface Go or enable S mode on a per-device basis.
+
+## Prerequisites
+
+Here are some things you’ll need before attempting any of these procedures:
+
+-   A Surface Go device or Surface Go device image based on Windows 10 Pro
+    (1803)
+-   General understanding of [Windows deployment scenarios and related
+    tools](https://docs.microsoft.com/windows/deployment/windows-deployment-scenarios-and-tools)
+-   [Windows ADK for Windows 10
+    1803](https://docs.microsoft.com/windows/deployment/windows-adk-scenarios-for-it-pros)
+-   [Bootable Windows Preinstall Environment
+    (WinPE)](https://docs.microsoft.com/windows-hardware/manufacture/desktop/winpe-create-usb-bootable-drive)
+
+## Enabling S Mode – Windows Image (WIM)
+
+Like enterprise administrators performing large-scale deployment of customized Windows images, education customers can create their own customized Windows images for deployment to multiple classroom devices. An education customer who plans to follow [a traditional image-based deployment
+process](https://docs.microsoft.com/windows/deployment/windows-10-deployment-scenarios#traditional-deployment) using a Windows 10 Pro (1803) image for Surface Go devices can enable S mode as follows:
+
+1.  Use DISM to mount your offline Windows 10 Pro (1803) image.
+
+   ```
+   dism /Mount-image /imagefile:\<path_to_Image_file\> {/Index:\<image_index\> | /Name:\<image_name\>} /MountDir:\<local_target_directory\>
+   ```
+
+2.  Create an unattend.xml answer file, adding the
+    amd64_Microsoft_Windows_CodeIntegrity component to Pass 2 offline Servicing
+    and setting amd64_Microsoft_Windows_CodeIntegrity\\SkuPolicyRequired to “1”.
+    The resulting xml should look like this…
+
+   Copy
+   ``` 
+    <settings pass=”offlineServicing”>
+     <component name=”Microsoft-Windows-CodeIntegrity” 
+              processorArchitecture=”amd64” 
+              publicKeyToken=”31bf3856ad364e35” 
+              language=”neutral” 
+              versionScope=”nonSxS”
+              xmlns:wcm=”http://schemas.microsoft.com/WMIConfig/2002/State” 
+              xmlns:xsi=”http://www.w3.org/2001/XMLSchema-instance”>
+         <SkuPolicyRequired>1</SkuPolicyRequired>
+      </component>
+     </settings>
+   ```
+3. Save the answer file in the **Windows\Panther** folder of your mounted image as unattend.xml.
+4. Use DISM to apply the unattend.xml file and enable S Mode:
+
+   Copy
+      ```
+         dism /image:C:\mount\windows /apply-unattend:C:\mount\windows\windows\panther\unattend.xml
+      ```
+
+   >   Note: in the above example, C:\\mount\\ is the local directory used to mount
+   >   the offline image.   
+5. Commit the image changes and unmount the image
+
+   Copy
+      ```
+         dism /Unmount-image /MountDir:C:\\mount /Commit
+      ```
+>Note: don’t forget the /Commit parameter to ensure you don’t lose your
+    changes.
+
+Your Windows 10 Pro (1803) image now has S mode enabled and is ready to deploy to Surface Go devices.
+
+## Enabling S Mode – Per Device
+
+Education customers who wish to avoid the additional overhead associated with Windows image creation, customization, and deployment can enable S mode on a per-device basis. Performing the following steps on a Surface Go device will enable S mode on an existing installation of Windows 10 Pro (1803).
+
+1.  Create a bootable WinPE media. See [Create a bootable Windows PE USB
+    drive](http://msdn.microsoft.com/library/windows/hardware/dn938386.aspx) for details.
+
+2. Create an unattend.xml answer file, adding the
+    amd64_Microsoft_Windows_CodeIntegrity component to Pass 2 offline Servicing
+    and setting amd64_Microsoft_Windows_CodeIntegrity\\SkuPolicyRequired to “1”. The resulting xml should look like this…
+
+   Copy
+   ```
+      <settings pass=”offlineServicing”>
+        <component name=”Microsoft-Windows-CodeIntegrity” 
+              processorArchitecture=”amd64” 
+              publicKeyToken=”31bf3856ad364e35” 
+              language=”neutral” 
+              versionScope=”nonSxS”
+              xmlns:wcm=”http://schemas.microsoft.com/WMIConfig/2002/State” 
+              xmlns:xsi=”http://www.w3.org/2001/XMLSchema-instance”>
+         <SkuPolicyRequired>1</SkuPolicyRequired>
+     </component>
+   </settings>
+   ```
+
+3. Attach your bootable WinPE USB drive to a Surface Go device and perform a USB boot (hold the **volume down** button while powering on the device… continue to hold until the Surface logo appears)
+4. Wait for WinPE to launch a command window     (*X:\\windows\\system32\\cmd.exe*).
+5. Apply the unattend.xml created in step 2 using DISM.
+
+   Copy
+   ```
+      dism /image:C:\ /apply-unattend:D:\unattend.xml
+   ```
+   >  Note: in the above example, C:\\ is the local OS drive (offline). D:\ is where the S mode unattend.xml file (from Step 2) resides.
+
+6.  Once DISM has successfully applied the unattend.xml, reboot the Surface Go device.
+Upon reboot, you should find your Surface Go device now is now in S mode.
+
+## Troubleshooting
+
+|ISSUE | RESOLUTION |
+|------------------------ |-----------------------|
+|DISM fails to apply the unattend.xml because the OS drive is encrypted. | This is one reason why it’s best to enable S mode before setting up and configuring a device. If the OS drive has already been encrypted, you’ll need to fully decrypt the drive before you can enable S mode. |
+|Unattend.xml has been applied and dism reports success. However, when I boot the device, it’s not in S mode. This can happen when a device was booted to Windows 10 Pro before S mode was enabled. To resolve this issue, do the following: | 1.  **Run** “shutdown.exe -p -f” to force a complete shutdown. <br> 2.  Hold the **vol-up** button while pressing the **power** button to power on the device. Continue to hold **vol-up** until you see the Surface UEFI settings. <br> 3.  Under **Security** find the **Secure Boot** option and disable it. <br> 4.  With SecureBoot disabled choose **exit** -\> **restart now** to exit UEFI settings and reboot the device back to Windows. <br> 5.  Confirm that S mode is now properly enabled. <br> 6.  Once you’ve confirmed S mode, you should re-enable Secure Boot… repeat the above steps, choosing to **Enable** Secure Boot from the UEFI securitysettings.
+    
+## Additional Info
+
+[Windows 10 deployment scenarios](https://docs.microsoft.com/en-us/windows/deployment/windows-10-deployment-scenarios)
+
+[Windows 10 deployment scenarios and tools](https://docs.microsoft.com/en-us/windows/deployment/windows-deployment-scenarios-and-tools)
+
+[Download and install the Windows ADK](https://docs.microsoft.com/en-us/windows-hardware/get-started/adk-install)
+
+[Windows ADK for Windows 10 scenarios for IT Pros](https://docs.microsoft.com/en-us/windows/deployment/windows-adk-scenarios-for-it-pros)
+
+[Modify a Windows Image Using DISM](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/mount-and-modify-a-windows-image-using-dism)
+
+[Service a Windows Image Using DISM](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/service-a-windows-image-using-dism)
+
+[DISM Image Management Command-Line Options](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/dism-image-management-command-line-options-s14)
+

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**  
+**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. 
-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.
 
  
 
-### 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**  
+    **NOTE**<br>The workstation does not have to be a dedicated computer.
-    The workstation does not have to be a dedicated computer.
 
      
 

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/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
 > ```
 
@@ -38,66 +38,116 @@ 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?                                  |
+| Name             | Full name                                  | 1703 | 1709 | 1803 |Uninstall through UI?             |
-|------------------|-------------------------------------------|:------:|:------:|:------:|-------------------------------------------------------|
+|------------------|--------------------------------------------|:----:|:----:|:----:|:----------------------------------:|
-| Cortana UI       | CortanaListenUIApp                        | x    |      |      |No                                                     |
+| Cortana UI       | CortanaListenUIApp                         | x    |      |      |No                                |
-|                  | Desktop Learning                          | x    |      |      |No                                                     |
+|                  | Desktop Learning                           | x    |      |      |No                                |
-|                  | DesktopView                               | x    |      |      |No                                                     |
+|                  | DesktopView                                | x    |      |      |No                                |
-|                  | EnvironmentsApp                           | x    |      |      |No                                                     |
+|                  | EnvironmentsApp                            | x    |      |      |No                                |
-| Mixed Reality +  | HoloCamera                                | x    |      |      |No                                                     |
+| Mixed Reality +  | HoloCamera                                 | x    |      |      |No                                |
-| Mixed Reality +  | HoloItemPlayerApp                         | x    |      |      |No                                                     |
+| Mixed Reality +  | HoloItemPlayerApp                          | x    |      |      |No                                |
-| Mixed Reality +  | HoloShell                                 | x    |      |      |No                                                     |
+| Mixed Reality +  | HoloShell                                  | x    |      |      |No                                |
-|                  | InputApp                                  |      |  x   | 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                                                     |
+|                  | Microsoft.AccountsControl                  | x    | x    | x    |No                                |
-| Hello setup UI   | Microsoft.BioEnrollment                   | x    |  x   | x    |No                                                     |
+| Hello setup UI   | Microsoft.BioEnrollment                    | x    | x    | x    |No                                |
-|                  | Microsoft.CredDialogHost                  | x    |  x   | x    |No                                                     |
+|                  | Microsoft.CredDialogHost                   | x    | x    | x    |No                                |
-|                  | Microsoft.ECApp                           |      |  x   | x    |No                                                     |
+|                  | Microsoft.ECApp                            |      | x    | x    |No                                |
-|                  | Microsoft.LockApp                         | x    |  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.PPIProjection                    | x    | x    | x    |No                                |
-|                  | Microsoft.Windows. Apprep.ChxApp           | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.Apprep.ChxApp            | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. AssignedAccessLockApp   | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.AssignedAccessLockApp    | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. CloudExperienceHost     | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.CloudExperienceHost      | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. ContentDeliveryManager  | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.ContentDeliveryManager   | x    | x    | x    |No                                 |
-| Cortana          | Microsoft.Windows.Cortana                  | x    |  x  | x    |No                                                     |
+| Cortana          | Microsoft.Windows.Cortana                  | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. Holographic.FirstRun    | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.Holographic.FirstRun     | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. ModalSharePickerHost    | x    |     |      |No                                                     |
+|                  | Microsoft.Windows.ModalSharePickerHost     | x    |      |      |No                                 |
-|                  | Microsoft.Windows. OOBENetworkCaptivePort  | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.OOBENetworkCaptivePort   | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. OOBENetworkConnectionFlow  | x |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.OOBENetworkConnectionFlow| x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. ParentalControls        | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.ParentalControls         | x    | x    | x    |No                                 |
-| People Hub       | Microsoft.Windows. PeopleExperienceHost    |      |  x  | x    |No                                                     |
+| People Hub       | Microsoft.Windows.PeopleExperienceHost     |      | x    | x    |No                                 |
-|                  | Microsoft.Windows. PinningConfirmationDialog  |   |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.PinningConfirmationDialog|      | x    | x    |No                                 |
-|                  | Microsoft.Windows. SecHealthUI             | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.SecHealthUI              | x    | x    | x    |No                                 |
-|                  | Microsoft.Windows. SecondaryTileExperience | x    |  x  |      |No                                                     |
+|                  | Microsoft.Windows.SecondaryTileExperience  | x    | x    |      |No                                 |
-|                  | Microsoft.Windows. SecureAssessmentBrowser | x    |  x  | x    |No                                                     |
+|                  | Microsoft.Windows.SecureAssessmentBrowser  | x    | x    | x    |No                                 |
-| Start            | Microsoft.Windows. ShellExperienceHost     | x    |  x  | x    |No                                                     |
+| Start            | Microsoft.Windows.ShellExperienceHost      | x    | x    | x    |No                                 |
-| Windows Feedback | Microsoft.WindowsFeedback                  | *    |  *  |      |No                                                     |
+| Windows Feedback | Microsoft.WindowsFeedback                  | *    | *    |      |No                                |
-|                  | Microsoft.XboxGameCallableUI               | x    |  x  |  x   |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                                                     |
+| Settings         | Windows.ImmersiveControlPanel              | x    | x    |      |No                                |
-| Connect          | Windows.MiracastView                       | x    |     |      |No                                                     |
+| Connect          | Windows.MiracastView                       | x    |      |      |No                                |
-| Print 3D         | Windows.Print3D                            |      |  x  |      |Yes                                                    |
+| Print 3D         | Windows.Print3D                            |      | x    |      |Yes                               |
-| Print UI         | Windows.PrintDialog                        | x    |  x  |  x   |No                                                     |
+| Print UI         | Windows.PrintDialog                        | x    | x    | x    |No                                |
-| Purchase UI      | Windows.PurchaseDialog                     |      |     | x    |No                                                     |
+| Purchase UI      | Windows.PurchaseDialog                     |      |      | x    |No                                |
-|                  | Microsoft.AsyncTextService                 |      |     | x    |No                                                     |
+|                  | Microsoft.AsyncTextService                 |      |      | x    |No                                |
-|                  | Microsoft.MicrosoftEdgeDevToolsClient      |      |     | x    |No                                                     |
+|                  | Microsoft.MicrosoftEdgeDevToolsClient      |      |      | x    |No                                |
-|                  | Microsoft.Win32WebViewHost                 |      |     | x    |No                                                     |
+|                  | Microsoft.Win32WebViewHost                 |      |      | x    |No                                |
-|                  | Microsoft.Windows.CapturePicker            |      |     | x    |No                                                     |
+|                  | Microsoft.Windows.CapturePicker            |      |      | x    |No                                |
-|                  | Windows.CBSPreview                         |      |     | x    |No                                                     |
+|                  | Windows.CBSPreview                         |      |      | x    |No                                |
-|File Picker       | 1527c705-839a-4832-9118-54d4Bd6a0c89       |      |     | x    |No                                                     |
+|File Picker       | 1527c705-839a-4832-9118-54d4Bd6a0c89       |      |      | x    |No                                |
-|File Explorer     | c5e2524a-ea46-4f67-841f-6a9465d9d515       |      |     | x    |No                                                     |
+|File Explorer     | c5e2524a-ea46-4f67-841f-6a9465d9d515       |      |      | x    |No                                |
-|App Resolver      | E2A4F912-2574-4A75-9BB0-0D023378592B       |      |     | x    |No                                                     |
+|App Resolver      | E2A4F912-2574-4A75-9BB0-0D023378592B       |      |      | x    |No                                |
-|Add Suggested folder Dialog box| F46D4000-FD22-4DB4-AC8E-4E1DDDE828FE||     | x    |No                                                     |
+|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).
+
+## 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.
+
+
 
-> [!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).
 
 ## 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                  |
@@ -106,7 +156,7 @@ Here are the typical installed Windows apps in Windows 10 versions 1703, 1709, a
 | Photoshop Express  | AdobeSystemIncorporated. AdobePhotoshop  | x    | x    | x    | Yes                  |
 | Duolingo           | D5EA27B7.Duolingo- LearnLanguagesforFree | x    | x    | x    | Yes                  |
 | Network Speed Test | Microsoft.NetworkSpeedTest               | x    | x    | x    | Yes                  |
-| News               | Microsoft.BingNews                       | x    |  x   | x    | Yes                  |
+| News               | Microsoft.BingNews                       | x    | x    | x    | Yes                  |
 | Flipboard          |                                          |      |      |      | Yes                  |
 |                    | Microsoft.Advertising.Xaml               | x    | x    | x    | Yes                  |
 |                    | Microsoft.NET.Native.Framework.1.2       | 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/application-management/msix-app-packaging-tool.md

@@ -23,14 +23,19 @@ The MSIX Packaging Tool (Preview) is now available to install from the Microsoft
 - A valid MSA alias (to access the app from the Store) 
 
 ## What's new
-v1.2018.808.0
+v1.2018.821.0
+- Command Line Support
+- Ability to use existing local virtual machines for packaging environment.
+- Ability to cross check publisher information in the manifest with a signing certificate to avoid signing issues.
+- Minor updates to the UI for added clarity.
+
+v1.2018.807.0
 - Ability to add/edit/remove file and registry exclusion items is now supported in Settings menu.
-- Fixed an issue where signing in with password protected certificates would fail in the tool.
+- Fixed an issue where signing with password protected certificates would fail in the tool.
 - Fixed an issue where the tool was crashing when editing an existing MSIX package.
 - Fixed an issue where the tool was injecting whitespaces programmatically to install location paths that was causing conversion failures.
 - Minor UI tweaks to add clarity.
-- Minor updates to the logs for added clarity.
+- Minor updates to the logs to add clarity.
-
 
 
 ## Installing the MSIX Packaging Tool
@@ -45,12 +50,169 @@ This is an early preview build and not all features are supported. Here is what
 - Create a modification package for a newly created Application MSIX Package by launching the tool and selecting the **Modification package** icon.
 - Open your MSIX package to view and edit its content/properties by navigating to the **Open package editor** tab. Browse to the MSIX package and select **Open package**. 
 
-Features not supported in the tool are currently greyed out. Here are some of the highlighted missing features: 
+## Creating an application package using the Command line interface
+To create a new MSIX package for your application, run the MsixPackagingTool.exe create-package command in a Command prompt window. 
 
-- Package Support Framework integration. For more detail on how you can use Package Support Framework today, check out the article posted on the [MSIX blog](https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftechcommunity.microsoft.com%2Ft5%2FMSIX-Blog%2FMSIX-Package-Support-Framework-is-now-available-on-GitHub%2Fba-p%2F214548&data=02%7C01%7Cpezan%40microsoft.com%7Cbe2761c174cd465136ce08d5f1252d8a%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636680064344941094&sdata=uW3oOOEYQxd0iVgsJkZXZTQwlvf%2FimVCaOdFUXcRoeY%3D&reserved=0). 
+Here are the parameters that can be passed as command line arguments:
-- Packaging on existing virtual machines. You can still install the Tool on a fresh VM, but the tool cannot currently spawn off a conversion from a local machine to an existing VM. 
+
-- Command Line Interface support  
+
-- Conversion of App-V 4.x packages 
+|Parameter   |Description  |
+|---------|---------|
+|-? <br> --help     |   Show help information      |
+|--template     | [required] path to the conversion template XML file containing package information and settings for this conversion    |
+|--virtualMachinePassword     |    [optional] The password for the Virtual Machine to be used for the conversion environment. Notes: The template file must contain a VirtualMachine element and the Settings::AllowPromptForPassword attribute must not be set to true.     |
+
+Examples:
+
+- MsixPackagingTool.exe create-package --template c:\users\documents\ConversionTemplate.xml
+- MSIXPackagingTool.exe create-package --template c:\users\documents\ConversionTemplate.xml  --virtualMachinePassword pswd112893
+
+## Conversion template file
+
+
+```xml
+<MsixPackagingToolTemplate
+    xmlns="http://schemas.microsoft.com/appx/msixpackagingtool/template/2018">
+
+    <Settings
+        AllowTelemetry="true"
+        ApplyAllPrepareComputerFixes="true"
+        GenerateCommandLineFile="true"
+        AllowPromptForPassword="false" >
+
+        <ExclusionItems>
+            <FileExclusion ExcludePath="[{CryptoKeys}]" />
+            <FileExclusion ExcludePath="[{Common AppData}]\Microsoft\Crypto" />
+            <FileExclusion ExcludePath="[{Common AppData}]\Microsoft\Search\Data" />
+            <FileExclusion ExcludePath="[{Cookies}]" />
+            <FileExclusion ExcludePath="[{History}]" />
+            <FileExclusion ExcludePath="[{Cache}]" />
+            <FileExclusion ExcludePath="[{Personal}]" />
+            <FileExclusion ExcludePath="[{Profile}]\Local Settings" />
+            <FileExclusion ExcludePath="[{Profile}]\NTUSER.DAT.LOG1" />
+            <FileExclusion ExcludePath="[{Profile}]\ NTUSER.DAT.LOG2" />
+            <FileExclusion ExcludePath="[{Recent}]" />
+            <FileExclusion ExcludePath="[{Windows}]\debug" />
+            <FileExclusion ExcludePath="[{Windows}]\Logs\CBS" />
+            <FileExclusion ExcludePath="[{Windows}]\Temp" />
+            <FileExclusion ExcludePath="[{Windows}]\WinSxS\ManifestCache" />
+            <FileExclusion ExcludePath="[{Windows}]\WindowsUpdate.log" />
+            <FileExclusion ExcludePath="[{AppVPackageDrive}]\$Recycle.Bin " />
+            <FileExclusion ExcludePath="[{AppVPackageDrive}]\System Volume Information" />
+            <FileExclusion ExcludePath="[{AppData}]\Microsoft\AppV" />
+            <FileExclusion ExcludePath="[{Common AppData}]\Microsoft\Microsoft Security Client" />
+            <FileExclusion ExcludePath="[{Common AppData}]\Microsoft\Microsoft Antimalware" />
+            <FileExclusion ExcludePath="[{Common AppData}]\Microsoft\Windows Defender" />
+            <FileExclusion ExcludePath="[{ProgramFiles}]\Microsoft Security Client" />
+            <FileExclusion ExcludePath="[{ProgramFiles}]\Windows Defender" />
+            <FileExclusion ExcludePath="[{Local AppData}]\Temp" />
+
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Wow6432Node\Microsoft\Cryptography" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Microsoft\Cryptography" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Microsoft\Microsoft Antimalware Setup" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Microsoft\Microsoft Security Client" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Policies\Microsoft\Microsoft Antimalware" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" />
+            <RegistryExclusion ExcludePath= "REGISTRY\USER\[{AppVCurrentUserSID}]\Software\Microsoft\Windows\CurrentVersion\Explorer\StreamMRU" />
+            <RegistryExclusion ExcludePath= "REGISTRY\USER\[{AppVCurrentUserSID}]\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\StreamMRU" />
+            <RegistryExclusion ExcludePath= "REGISTRY\USER\[{AppVCurrentUserSID}]\Software\Microsoft\Windows\CurrentVersion\Explorer\Streams" />
+            <RegistryExclusion ExcludePath= "REGISTRY\USER\[{AppVCurrentUserSID}]\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\Streams" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Microsoft\AppV" />
+            <RegistryExclusion ExcludePath= "REGISTRY\MACHINE\SOFTWARE\Wow6432Node\Microsoft\AppV" />
+            <RegistryExclusion ExcludePath= "REGISTRY\USER\[{AppVCurrentUserSID}]\Software\Microsoft\AppV" />
+            <RegistryExclusion ExcludePath= "REGISTRY\USER\[{AppVCurrentUserSID}]\Software\Wow6432Node\Microsoft\AppV" />
+        </ExclusionItems>
+    </Settings>
+
+
+    <PrepareComputer
+        DisableDefragService="true"
+        DisableWindowsSearchService="true"
+        DisableSmsHostService="true"
+        DisableWindowsUpdateService ="true"/>
+    <!--Note: this section takes precedence over the Settings::ApplyAllPrepareComputerFixes attribute -->
+
+    <SaveLocation Path="C:\users\user\Desktop" />
+
+    <Installer
+        Path="C:\MyAppInstaller.msi"
+        Arguments="/quiet"
+        InstallLocation="C:\Program Files\MyAppInstallLocation" />
+
+    <VirtualMachine Name="vmname" Username="vmusername" />
+
+    <PackageInformation
+        PackageName="MyAppPackageName"
+        PackageDisplayName="MyApp Display Name"
+        PublisherName="CN=MyPublisher"
+        PublisherDisplayName="MyPublisher Display Name"
+        Version="1.1.0.0"
+        MainPackageNameForModificationPackage="MainPackageIdentityName">
+
+        <Applications>
+            <Application
+                Id="MyApp1"
+                Description="MyApp"
+                DisplayName="My App"
+                ExecutableName="MyApp.exe"/>
+        </Applications>
+
+        <Capabilities>
+            <Capability Name="runFullTrust" />
+        </Capabilities>
+
+    </PackageInformation>
+</MsixPackagingToolTemplate>
+
+```
+
+## Conversion template parameter reference
+Here is the complete list of parameters that you can use in the Conversion template file.
+
+
+|ConversionSettings entries  |Description  |
+|---------|---------|
+|Settings:: AllowTelemetry     |[optional] Enables telemetry logging for this invocation of the tool.       |
+|Settings:: ApplyAllPrepareComputerFixes     |[optional] Applies all recommended prepare computer fixes. Cannot be set when other attributes are used.         |
+|Settings:: GenerateCommandLineFile     |[optional] Copies the template file input to the SaveLocation directory for future use.         |
+|Settings:: AllowPromptForPassword     |[optional] Instructs the tool to prompt the user to enter passwords for the Virtual Machine and for the signing certificate if it is required and not specified.         |
+|ExclusionItems     |[optional] 0 or more FileExclusion or RegistryExclusion elements. All FileExclusion elements must appear before any RegistryExclusion elements.         |
+|ExclusionItems::FileExclusion     |[optional] A file to exclude for packaging.         |
+|ExclusionItems::FileExclusion::ExcludePath     |Path to file to exclude for packaging.         |
+|ExclusionItems::RegistryExclusion     |[optional] A registry key to exclude for packaging.          |
+|ExclusionItems::RegistryExclusion:: ExcludePath     |Path to registry to exclude for packaging.         |
+|PrepareComputer::DisableDefragService     |[optional] Disables Windows Defragmenter while the app is being converted. If set to false, overrides ApplyAllPrepareComputerFixes.         |
+|PrepareComputer:: DisableWindowsSearchService     |[optional] Disables Windows Search while the app is being converted. If set to false, overrides ApplyAllPrepareComputerFixes.         |
+|PrepareComputer:: DisableSmsHostService     |[optional] Disables SMS Host while the app is being converted. If set to false, overrides ApplyAllPrepareComputerFixes.         |
+|PrepareComputer:: DisableWindowsUpdateService     |[optional] Disables Windows Update while the app is being converted. If set to false, overrides ApplyAllPrepareComputerFixes.         |
+|SaveLocation     |[optional] An element to specify the save location of the tool. If not specified, the package will be saved under the Desktop folder.         |
+|SaveLocation::Path     |The path to the folder where the resulting MSIX package is saved.         |
+|Installer::Path     |The path to the application installer.         |
+|Installer::Arguments     |The arguments to pass to the installer. You must pass the arguments to force your installer to run unattended/silently.         |
+|Installer::InstallLocation     |[optional] The full path to your application's root folder for the installed files if it were installed (e.g. "C:\Program Files (x86)\MyAppInstalllocation").         |
+|VirtualMachine     |[optional] An element to specify that the conversion will be run on a local Virtual Machine.         |
+|VrtualMachine::Name     |The name of the Virtual Machine to be used for the conversion environment.         |
+|VirtualMachine::Username     |[optional] The user name for the Virtual Machine to be used for the conversion environment.         |
+|PackageInformation::PackageName     |The Package Name for your MSIX package.         |
+|PackageInformation::PackageDisplayName     |The Package Display Name for your MSIX package.         |
+|PackageInformation::PublisherName     |The Publisher for your MSIX package.         |
+|PackageInformation::PublisherDisplayName     |The Publisher Display Name for your MSIX package.         |
+|PackageInformation::Version     |The version number for your MSIX package.         |
+|PackageInformation:: MainPackageNameForModificationPackage     |[optional] The Package identity name of the main package name. This is used when creating a modification package that takes a dependency on a main (parent) application.         |
+|Applications     |[optional] 0 or more Application elements to configure the Application entries in your MSIX package.         |
+|Application::Id     |The App ID for your MSIX application. This ID will be used for the Application entry detected that matches the specified ExecutableName. You can have multiple Application ID for executables in the package         |
+|Application::ExecutableName     |The executable name for the MSIX application that will be added to the package manifest. The corresponding application entry will be ignored if no application with this name is detected.         |
+|Application::Description     |[optional] The App Description for your MSIX application. If not used, the Application DisplayName will be used. This description will be used for the application entry detected that matches the specified ExecutableName         |
+|Application::DisplayName     |The App Display Name for your MSIX package. This Display Name will be used for the application entry detected that matches the specified ExecutableName         |
+|Capabilities     |[optional] 0 or more Capability elements to add custom capabilities to your MSIX package. “runFullTrust” capability is added by default during conversion.         |
+|Capability::Name     |The capability to add to your MSIX package.          |
+
+## Delete temporary conversion files using Command line interface
+To delete all the temporary package files, logs, and artifacts created by the tool, run the MsixPackagingTool.exe cleanup command in the Command line window.
+
+Example:
+- MsixPackagingTool.exe cleanup 
 
 ## How to file feedback
 

windows/client-management/mdm/configuration-service-provider-reference.md

@@ -7,7 +7,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: MariciaAlforque
-ms.date: 07/27/2018
+ms.date: 08/17/2018
 ---
 
 # Configuration service provider reference
@@ -22,7 +22,6 @@ Additional lists:
 - [List of CSPs supported in Windows Holographic](#hololens)
 - [List of CSPs supported in Microsoft Surface Hub ](#surfacehubcspsupport)
 - [List of CSPs supported in Windows 10 IoT Core](#iotcoresupport)
-- [List of CSPs supported in Windows 10 S](#windows10s)
 
 The following tables show the configuration service providers support in Windows 10.  
 Footnotes: 
@@ -2752,59 +2751,4 @@ The following list shows the configuration service providers supported in Window
 - [VPNv2 CSP](vpnv2-csp.md)
 - [WiFi CSP](wifi-csp.md)
 
-## <a href="" id="windows10s"></a>CSPs supported in Windows 10 S
 
-The CSPs supported in Windows 10 S is the same as in Windows 10 Pro except that Office CSP and EnterpriseDesktop CSP are not available in Windows 10 S. Here is the list:
-
-- [ActiveSync CSP](activesync-csp.md)
-- [APPLICATION CSP](application-csp.md)
-- [AppLocker CSP](applocker-csp.md)
-- [AssignedAccess CSP](assignedaccess-csp.md)
-- [BOOTSTRAP CSP](bootstrap-csp.md)
-- [CellularSettings CSP](cellularsettings-csp.md)
-- [CertificateStore CSP](certificatestore-csp.md)
-- [ClientCertificateInstall CSP](clientcertificateinstall-csp.md)
-- [CMPolicy CSP](cmpolicy-csp.md)
-- [CM_ProxyEntries CSP](cm-proxyentries-csp.md)
-- [CM_CellularEntries CSP](cm-cellularentries-csp.md)
-- [Defender CSP](defender-csp.md)
-- [DevDetail CSP](devdetail-csp.md)
-- [DeviceManageability CSP](devicemanageability-csp.md)
-- [DeviceStatus CSP](devicestatus-csp.md)
-- [DevInfo CSP](devinfo-csp.md)
-- [DiagnosticLog CSP](diagnosticlog-csp.md)
-- [DMAcc CSP](dmacc-csp.md)
-- [DMClient CSP](dmclient-csp.md)
-- [eUICCs CSP](euiccs-csp.md)
-- [Firewall CSP](firewall-csp.md)
-- [EMAIL2 CSP](email2-csp.md)
-- [EnterpriseAPN CSP](enterpriseapn-csp.md)
-- [EnterpriseDataProtection CSP](enterprisedataprotection-csp.md)
-- [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md)
-- [HealthAttestation CSP](healthattestation-csp.md)
-- [NAP CSP](nap-csp.md)
-- [NAPDEF CSP](napdef-csp.md)
-- [NetworkProxy CSP](networkproxy-csp.md)
-- [NodeCache CSP](nodecache-csp.md)
-- [PassportForWork CSP](passportforwork-csp.md)
-- [Policy CSP](policy-configuration-service-provider.md)
-- [Provisioning CSP](provisioning-csp.md)
-- [PROXY CSP](proxy-csp.md)
-- [PXLOGICAL CSP](pxlogical-csp.md)
-- [Reboot CSP](reboot-csp.md)
-- [RemoteFind CSP](remotefind-csp.md)
-- [RemoteWipe CSP](remotewipe-csp.md)
-- [Reporting CSP](reporting-csp.md)
-- [RootCATrustedCertificates CSP](rootcacertificates-csp.md)
-- [SecureAssessment CSP](secureassessment-csp.md)
-- [SecurityPolicy CSP](securitypolicy-csp.md)
-- [SharedPC CSP](sharedpc-csp.md)
-- [Storage CSP](storage-csp.md)
-- [SUPL CSP](supl-csp.md)
-- [Update CSP](update-csp.md)
-- [VPNv2 CSP](vpnv2-csp.md)
-- [WiFi CSP](wifi-csp.md)
-- [Win32AppInventory CSP](win32appinventory-csp.md)
-- [WindowsAdvancedThreatProtection CSP](windowsadvancedthreatprotection-csp.md)
-- [WindowsDefenderApplicationGuard CSP](windowsdefenderapplicationguard-csp.md)
-- [WindowsLicensing CSP](windowslicensing-csp.md)

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

@@ -7,7 +7,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: MariciaAlforque
-ms.date: 07/24/2018
+ms.date: 08/21/2018
 ---
 
 # EnterpriseModernAppManagement CSP
@@ -395,23 +395,6 @@ Add an app to the nonremovable app policy list
 </SyncML> 
 ```
 
-Delete an app from the nonremovable app policy list 
-```
-<SyncML xmlns="SYNCML:SYNCML1.2"> 
-    <SyncBody> 
-        <Delete> 
-            <CmdID>1</CmdID> 
-                <Item> 
-                    <Target> 
-                        <LocURI>./Device/Vendor/MSFT/EnterpriseModernAppManagement/AppManagement/AppStore/PackageFamilyName/NonRemovable</LocURI> 
-                    </Target> 
-                </Item> 
-        </Delete> 
-        <Final/> 
-    </SyncBody> 
-</SyncML> 
-```
-
 Get the status for a particular app  
 ```
 <SyncML xmlns="SYNCML:SYNCML1.2"> 

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>