Merge remote-tracking branch 'origin/master' into atp-adv-hunting

.openpublishing.redirection.json

@@ -4907,7 +4907,7 @@
 },
 {
 "source_path": "windows/manage/configure-windows-telemetry-in-your-organization.md",
-"redirect_url": "/windows/configuration/configure-windows-telemetry-in-your-organization",
+"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
 "redirect_document_id": true
 },
 {
@@ -5932,7 +5932,12 @@
 },
 {
 "source_path": "windows/configure/configure-windows-telemetry-in-your-organization.md",
-"redirect_url": "/windows/configuration/configure-windows-telemetry-in-your-organization",
+"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/configure-windows-telemetry-in-your-organization.md",
+"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
 "redirect_document_id": true
 },
 {

browsers/edge/available-policies.md

@@ -7,15 +7,14 @@ ms.mktglfcycl: explore
 ms.sitesec: library
 title: Group Policy and Mobile Device Management settings for Microsoft Edge (Microsoft Edge for IT Pros)
 ms.localizationpriority: high
-ms.date: 09/13/2017
+ms.date: 09/13/2017 #Previsou release date
 ---
 
+<!-- pashort 2/9/2018: as per Brian Atman, the documentation descrepancies must be addressed for RS5. Find out what those discrepancies are. Scenario 15403628 -->
+
 # Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge
 
-**Applies to:**
+> Applies to: Windows 10, Windows 10 Mobile
-
-- Windows 10
-- Windows 10 Mobile
 
 Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPO's) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences.
 
@@ -25,348 +24,359 @@ By using Group Policy and Intune, you can set up a policy setting once, and then
 > For more info about the tools you can use to change your Group Policy objects, see the Internet Explorer 11 topics, [Group Policy and the Group Policy Management Console (GPMC)](https://go.microsoft.com/fwlink/p/?LinkId=617921), [Group Policy and the Local Group Policy Editor](https://go.microsoft.com/fwlink/p/?LinkId=617922), [Group Policy and the Advanced Group Policy Management (AGPM)](https://go.microsoft.com/fwlink/p/?LinkId=617923), and [Group Policy and Windows PowerShell](https://go.microsoft.com/fwlink/p/?LinkId=617924).
 
 ## Group Policy settings
+Microsoft Edge works with the following Group Policy settings to help you manager your company's web browser configurations. The Group Policy settings are found in the Group Policy Editor in the following location: 
+
+`Computer Configuration\Administrative Templates\Windows Components\Microsoft Edge\`
+
+<!-- original text 
 Microsoft Edge works with these Group Policy settings (`Computer Configuration\Administrative Templates\Windows Components\Microsoft Edge\`) to help you manage your company's web browser configurations:
+-->
 
 ### Allow Address bar drop-down list suggestions
-- **Supported versions:** Windows 10, version 1703
+>*Supporteded versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you decide whether the Address bar drop-down functionality is available in Microsoft Edge. We recommend disabling this setting if you want to minimize network connections from Microsoft Edge to Microsoft services.
+This policy setting lets you decide whether the Address bar drop-down functionality is available in Microsoft Edge. We recommend disabling this setting if you want to minimize network connections from Microsoft Edge to Microsoft services.
-
+| If you... | Then... |
-    - If you enable or don't configure this setting (default), employees can see the Address bar drop-down functionality in Microsoft Edge.
+| --- | --- |
-
+| Enable this setting (default) | Employees can see the Address bar drop-down functionality in Microsoft Edge. | 
-    - If you disable this setting, employees won't see the Address bar drop-down functionality in Microsoft Edge. This setting also disables the user-defined setting, "Show search and site suggestions as I type".
+| Disable this setting | Employees do not see the Address bar drop-down functionality in Microsoft Edge. This setting also disables the user-defined setting, "Show search and site suggestions as I type."<p>Disabling this setting turns off the Address bar drop-down functionality. Therefore, because search suggestions are shown in the drop-down, this setting takes precedence over the "Configure search suggestions in Address bar" setting. |
-
+|
-        > [!Note]
-        > Disabling this setting turns off the Address bar drop-down functionality. Therefore, because search suggestions are shown in the drop-down, this setting takes precedence over the "Configure search suggestions in Address bar" setting.
  
 ### Allow Adobe Flash
-- **Supported versions:** Windows 10 or later
+>*Supporteded version: Windows 10*
 
-- **Description:** This setting lets you decide whether employees can run Adobe Flash in Microsoft Edge.
+This policy setting lets you decide whether employees can run Adobe Flash on Microsoft Edge.
-
+| If you… | Then… |
-    - If you enable or don't configure this setting (default), employees can use Adobe Flash.
+| --- | --- |
-    
+| Enable or don’t configure this setting (default) | Employees can use Adobe Flash. | 
-    - If you disable this setting, employees can't use Adobe Flash.
+| Disable this setting | Employees cannot use Adobe Flash. |
+| 
 
 ### Allow clearing browsing data on exit
-- **Supported versions:** Windows 10, version 1703
+>*Supporteded versions: Windows 10, version 1703*
 
-- **Description:** This policy setting allows the automatic clearing of browsing data when Microsoft Edge closes.
+This policy setting allows the automatic clearing of browsing data when Microsoft Edge closes.
-
+| If you… | Then… |
-    - If you enable this policy setting, clearing browsing history on exit is turned on.
+| --- | --- |
-
+| Enable this setting | Clear browsing history on exit is turned on. <!-- <span style="background: #ffff99;">[@Reviewer: can employees do anything to this setting at this point? Or is this controlled by the system administrator?]</span> --> |
-    - If you disable or don't configure this policy setting (default), it can be turned on and configured by the employee in the Clear browsing data options area, under Settings.
+| Disable or don’t configure this setting (default) | Employees can turn on and configure the Clear browsing data option under Settings. |
+|
 
 ### Allow Developer Tools
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supporteded versions: Windows 10, version 1511 or later*
 
-- **Description:** This policy setting lets you decide whether F12 Developer Tools are available on Microsoft Edge.
+This policy setting lets you decide whether F12 Developer Tools are available on Microsoft Edge.
-    - If you enable or don’t configure this setting (default), the F12 Developer Tools are available in Microsoft Edge.
+| If you… | Then… | 
-
+| --- | --- |
-    - If you disable this setting, the F12 Developer Tools aren’t available in Microsoft Edge.
+| Enable this setting (default) | F12 Developer Tools are available. |
+| Disable this setting | F12 Developer Tools are not available. |
+|
 
 ### Allow Extensions
-- **Supported versions:** Windows 10, version 1607 or later
+>*Supporteded versions: Windows 10, version 1607 or later*
 
-- **Description:** This policy setting lets you decide whether employees can use Edge Extensions.
+This policy setting lets you decide whether employees can use Edge Extensions.
-
+| If you… | Then… |
-    - If you enable or don’t configure this setting, employees can use Edge Extensions.
+| --- | --- |
-    
+| Enable this setting | Employees can use Edge Extensions. |
-    - If you disable this setting, employees can’t use Edge Extensions.
+| Disable this setting | <!-- <span style="background: #ffff99;">[@Reviewer: why would a company disable this setting? Is this because of potential memory leaks?]</span> --> Employees cannot use Edge Extensions. |
+|
 
 ### Allow InPrivate browsing
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supporteded versions: Windows 10, version 1511 or later*
 
-- **Description:** This policy setting lets you decide whether employees can browse using InPrivate website browsing.
+This policy setting lets you decide whether employees can browse using InPrivate website browsing.
-
+| If you… | Then… |
-    - If you enable or don’t configure this setting (default), employees can use InPrivate website browsing.
+| --- | --- |
-    
+| Enable this setting (default) | Employees can use InPrivate website browsing. |
-    - If you disable this setting, employees can’t use InPrivate website browsing.
+| Disable this setting | <!-- <span style="background: #ffff99;">[@Reviewer: why would a company disable this setting? Is this to discourage users from browser inappropriate websites? What are the use cases for having this turned off?]</span> --> Employees cannot use InPrivate website browsing. |
+|
 
 ### Allow Microsoft Compatibility List
-- **Supported versions:** Windows 10, version 1607 or later
+>*Supporteded versions: Windows 10, version 1607 or later*
 
-- **Description:** This policy setting lets you decide whether to use the Microsoft Compatibility List (a Microsoft-provided list that helps sites with known compatibility issues to display properly) in Microsoft Edge. By default, the Microsoft Compatibility List is enabled and can be viewed by visiting about:compat.
+This policy setting lets you decide whether to use the Microsoft Compatibility List (a Microsoft-provided list that helps sites with known compatibility issues to display properly) in Microsoft Edge. By default, the Microsoft Compatibility List is enabled and can be viewed by visiting about:compat. <!-- <span style="background: #ffff99;">[@Reviewer: Is this supposed to be a link to another topic? Is the topic Use Enterprise Mode to improve compatibility emie-to-improve-compatibility.md?]</span> -->
-
+| If you… | Then… |
-    - If you enable or don’t configure this setting (default), Microsoft Edge periodically downloads the latest version of the list from Microsoft, applying the updates during browser navigation. Visiting any site on the Microsoft Compatibility List prompts the employee to use Internet Explorer 11, where the site is automatically rendered as though it’s in whatever version of IE is necessary for it to appear properly.
+| --- | --- |
-    
+| Enable this setting (default) | Microsoft Edge periodically downloads the latest version of the list from Microsoft, applying the updates during browser navigation <!-- <span style="background: #ffff99;">[@Reviewer: are the updates really applied “during browser navigation?" shouldn't just be as simple as "...applying the updates automatically”?]</span> -->. Visiting any site on the Microsoft Compatibility List prompts the employee to use Internet Explorer 11, where the site renders as though it’s in whatever version of IE is necessary for it to appear properly. |
-    - If you disable this setting, the Microsoft Compatibility List isn’t used during browser navigation.
+| Disable this setting | Browser navigation does not use the Microsoft Compatibility List. |
+|
 
 ### Allow search engine customization
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you decide whether users can change their search engine.
+This policy setting lets you decide whether users can change their search engine. Important. You can only use this setting with domain-joined or MDM-enrolled devices. 
 
-    >[!Important]
+For more info, see the [Microsoft browser extension policy](http://aka.ms/browserpolicy).
-    >This setting can only be used with domain-joined or MDM-enrolled devices. For more info, see the Microsoft browser extension policy (aka.ms/browserpolicy).
 
-    - If you enable or don't configure this policy (default), users can add new search engines and change the default used in the Address bar from within Microsoft Edge Settings.
+| If you… | Then… |
-    
+| --- | --- |
-    - If you disable this setting, users can't add search engines or change the default used in the address bar.
+| Enable or don’t configure this setting (default) | Employees can add new search engines and change the default used in the Address bar from within Microsoft Edge Settings. | 
+| Disable this setting | Employees cannot add search engines or change the default used in the Address bar. | 
+|
 
 ### Allow web content on New Tab page
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you configure what appears when Microsoft Edge opens a new tab. By default, Microsoft Edge opens the New Tab page. If you use this setting, employees can’t change it.
+This policy setting lets you configure what appears when Microsoft Edge opens a new tab. By default, Microsoft Edge opens the New Tab page. If you use this setting, employees can’t change it.
-
+| If you… | Then… |
-    - If you enable this setting, Microsoft Edge opens a new tab with the New Tab page.
+| --- | --- |
-    
+| Enable this setting | Microsoft Edge opens a new tab with the New Tab page. |
-    - If you disable this setting, Microsoft Edge opens a new tab with a blank page.
+| Disable this setting | Microsoft Edge opens a new tab with a blank page. | 
-    
+| Do not configure this setting (default) | Employees can choose how new tabs appear. |
-    - If you don’t configure this setting (default), employees can choose how new tabs appears.
+|
 
 ### Configure additional search engines
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you add up to 5 additional search engines, which can't be removed by your employees, but can be made a personal default engine. This setting doesn't set the default search engine. For that, you must use the "Set default search engine" setting.
+This policy setting lets you add up to 5 additional search engines, which cannot be removed by your employees but can make a personal default engine. This setting does not set the default search engine. For that, you must use the "Set default search engine" setting.
-
+| If you… | Then… |
-    > [!Important]
+| --- | --- |
-    > This setting can only be used with domain-joined or MDM-enrolled devices. For more info, see the Microsoft browser extension policy (aka.ms/browserpolicy).
+| Enable this setting | You can add up to 5 additional search engines. For each additional search engine, you must add a link to your OpenSearch XML file, including at least the short name and https URL of the search engine, using this format:<br><br> `<https://www.contoso.com/opensearch.xml>` <p>For more info about creating the OpenSearch XML file, see the [Understanding OpenSearch Standards](https://msdn.microsoft.com/en-us/library/dd163546.aspx) topic. | Disable this setting (default) | Any added search engines are removed from the employee’s device. <!-- <span style="background: #ffff99;">[@Reviewer: is this implying that Bing is the only search engine on the employee’s device?]</span> --> |
-
+| Do not configure this setting | The search engine list is set to what is specified in App settings. <!-- <span style="background: #ffff99;">[@Reviewer: what’s the difference between “don’t configure this setting”, “Enable this setting”, and “Disable this setting”?]</span> --> |
-    - If you enable this setting, you can add up to 5 additional search engines. For each additional engine, you must also add a link to your OpenSearch XML file, including at least the short name and https: URL of the search engine, using this format:
+|
-    
-            <https://fabrikam.com/opensearch.xml>https://www.contoso.com/opensearch.xml
-
-        For more info about creating the OpenSearch XML file, see the [Understanding OpenSearch Standards](https://msdn.microsoft.com/en-us/library/dd163546.aspx) topic.
-    
-    - If you disable this setting (default), any added search engines are removed from your employee's devices.
-    
-    - If you don't configure this setting, the search engine list is set to what is specified in App settings.
 
 ### Configure Autofill
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you decide whether employees can use Autofill to automatically fill in form fields while using Microsoft Edge. By default, employees can choose whether to use Autofill.
+This policy setting lets you decide whether employees can use Autofill the form fields automatically while using Microsoft Edge. By default, employees can choose whether to use Autofill.
-
+| If you… | Then… |
-    - If you enable this setting, employees can use Autofill to automatically fill in forms while using Microsoft Edge.
+| --- | --- |
-    
+| Enable this setting | Employees can use Autofill to populate form fields automatically. |
-    - If you disable this setting, employees can’t use Autofill to automatically fill in forms while using Microsoft Edge.
+| Disable this setting | Employees cannot use Autofill to populate form fields automatically. |
-    
+| Do not configure this setting (default) | Employees can choose whether to use Autofill to populate the form fields automatically. |
-    - If you don’t configure this setting (default), employees can choose whether to use Autofill to automatically fill in forms while using Microsoft Edge.
+|
 
 ### Configure cookies
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This setting lets you configure how to work with cookies.
+This setting lets you configure how to work with cookies.
-
+| If you… | Then… |
-    - If you enable this setting, you must also decide whether to:
+| --- | --- |
-        - **Allow all cookies (default):** Allows all cookies from all websites.
+| Enable this setting (default) | You must also decide whether to:<ul><li>**Allow all cookies (default)** from all websites.</li><li>**Block all cookies** from all websites.</li><li>**Block only 3rd-party cookies** from 3rd-party websites.</li></ul> |
-        
+| Disable or do not configure this setting | All cookies are allowed from all sites. | 
-        - **Block all cookies:** Blocks all cookies from all websites.
+|
-        
-        - **Block only 3rd-party cookies:** Blocks only cookies from 3rd-party websites.
-    
-    - If you disable or don't configure this setting, all cookies are allowed from all sites.
 
 ### Configure Do Not Track
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you decide whether employees can send Do Not Track requests to websites that ask for tracking info. By default, Do Not Track requests aren’t sent, but employees can choose to turn on and send requests.
+This policy setting lets you decide whether employees can send Do Not Track requests to websites that ask for tracking info. By default, Do Not Track requests are never sent, but employees can choose to turn on and send requests.
-
+| If you… | Then… |
-    - If you enable this setting, Do Not Track requests are always sent to websites asking for tracking info.
+| --- | --- |
-    
+| Enable this setting | Do Not Track requests are always sent to websites asking for tracking information. |
-    - If you disable this setting, Do Not Track requests are never sent to websites asking for tracking info.
+| Disable this setting | Do Not Track requests are never sent to websites asking for tracking information. | 
-    
+| Do not configure this setting (default) | Employees can choose whether to send Do Not Track requests to websites asking for tracking information. |
-    - If you don’t configure this setting (default), employees can choose whether to send Do Not Track requests to websites asking for tracking info.
+|
 
 ### Configure Favorites
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supported versions: Windows 10, version 1511 or later*
 
-- **Description:** This policy setting lets you configure the default list of Favorites that appear for your employees. Employees can change their Favorites by adding or removing items at any time.
+This policy setting lets you configure the default list of Favorites that appear for your employees. Employees can change their Favorites by adding or removing items at any time. <!-- <span style="background: #ffff99;">[@Reviewer: what is the default setting, enabled or disabled? I’m guessing it’s Disabled is the default.]</span> -->
-
+| If you… | Then… |
-    - If you enable this setting, you can configure what default Favorites appear for your employees. If this setting is enabled, you must also provide a list of Favorites in the Options section. This list is imported after your policy is deployed.
+| --- | --- |
-    
+| Enable this setting | You must provide a list of Favorites in the Options section. The list imports automatically after you deploy this policy. |
-    - If you disable or don’t configure this setting, employees will see the Favorites that they set in the Favorites hub.
+| Disable or do not configure this setting | Employees will see the Favorites that they set in the Favorites hub. |
+|
 
 ### Configure Password Manager
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you decide whether employees can save their passwords locally, using Password Manager. By default, Password Manager is turned on.
+This policy setting lets you decide whether employees can save their passwords locally, using Password Manager. By default, Password Manager is turned on.
-
+| If you… | Then… |
-    - If you enable this setting (default), employees can use Password Manager to save their passwords locally.
+| --- | --- |
-    
+| Enable this setting (default) | Employees can use Password Manager to save their passwords locally. |
-    - If you disable this setting, employees can’t use Password Manager to save their passwords locally.
+| Disable this setting | Employees can’t use Password Manager to save their passwords locally. | 
-    
+| Do not configure this setting | Employees can choose whether to use Password Manager to save their passwords locally. |
-    - If you don’t configure this setting, employees can choose whether to use Password Manager to save their passwords locally.
+|
 
 ### Configure Pop-up Blocker
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you decide whether to turn on Pop-up Blocker. By default, Pop-up Blocker is turned on.
+This policy setting lets you decide whether to turn on Pop-up Blocker. By default, Pop-up Blocker is turned on.
-
+| If you… | Then… |
-    - If you enable this setting (default), Pop-up Blocker is turned on, stopping pop-up windows from appearing.
+| --- | --- |
-    
+| Enable this setting (default) | Pop-up Blocker is turned on, stopping pop-up windows from appearing. |
-    - If you disable this setting, Pop-up Blocker is turned off, letting pop-ups windows appear.
+| Disable this setting | Pop-up Blocker is turned off, letting pop-up windows appear. |
-    
+| Do not configure this setting | Employees can choose whether to use Pop-up Blocker. |
-    - If you don’t configure this setting, employees can choose whether to use Pop-up Blocker.
+|
 
 ### Configure search suggestions in Address bar
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you decide whether search suggestions appear in the Address bar of Microsoft Edge. By default, employees can choose whether search suggestions appear in the Address bar of Microsoft Edge.
+This policy setting lets you decide whether search suggestions appear in the Address bar of Microsoft Edge. By default, employees can choose whether search suggestions appear in the Address bar of Microsoft Edge.
-
+| If you… | Then… |
-    - If you enable this setting, employees can see search suggestions in the Address bar of Microsoft Edge.
+| --- | --- |
-
+| Enable this setting | Employees can see search suggestions in the Address bar. |
-    - If you disable this setting, employees can't see search suggestions in the Address bar of Microsoft Edge.
+| Disable this setting | Employees cannot see search suggestions in the Address bar. |
-
+| Do not configure this setting (default) | Employees can choose whether search suggestions appear in the Address bar. |
-    - If you don’t configure this setting (default), employees can choose whether search suggestions appear in the Address bar of Microsoft Edge.
+|
 
 ### Configure Start pages
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supported versions: Windows 10, version 1511 or later*
 
-- **Description:** This policy setting lets you configure one or more Start pages, for domain-joined devices. Your employees won't be able to change this after you set it.
+This policy setting lets you configure one or more Start pages, for domain-joined devices. Your employees will not be able to change this after you set it.
-
+| If you… | Then… |
-    - If you enable this setting, you can configure one or more Start pages. If this setting is enabled, you must also include URLs to the pages, separating multiple pages by using angle brackets in this format: 
+| --- | --- |
-        
+| Enable this setting | You must include URLs to the pages, separating multiple pages by using angle brackets in this format: <br><br>`<support.contoso.com><support.microsoft.com>` |  
-            <support.contoso.com><support.microsoft.com>
+| Disable or do not configure this setting (default) | The default Start page is the webpage specified in App settings. |
-    
+|
-    - If you disable or don’t configure this setting (default), your default Start page is the webpage specified in App settings.
 
 ### Configure the Adobe Flash Click-to-Run setting
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you decide whether employees must take an action, such as clicking the content or a Click-to-Run button, before seeing content in Adobe Flash.
+This policy setting lets you decide whether employees must take action, such as clicking the content or a Click-to-Run button, before seeing content in Adobe Flash. <!-- <span style="background: #ffff99;">[@Reviewer: what is the default, enabled or disabled?]</span> -->
-
+| If you… | Then… |
-    - If you enable or don’t configure the Adobe Flash Click-to-Run setting, an employee must click the content, click a Click-to-Run button, or have the site appear on an auto-allow list before Microsoft Edge loads and runs Adobe Flash content.
+| --- | --- |
-    
+| Enable or don’t configure this setting< | Employees must click the content, click a Click-to-Run button, or have the site appear on an auto-allow list before Microsoft Edge loads and runs Adobe Flash content. |
-    - If you disable this setting, Adobe Flash content is automatically loaded and run by Microsoft Edge.
+| Disable this setting | Adobe Flash loads automatically and runs in Microsoft Edge. |
+|
 
 ### Configure the Enterprise Mode Site List
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you configure whether to use Enterprise Mode and the Enterprise Mode Site List to address common compatibility problems with legacy apps.
+This policy setting lets you configure whether to use Enterprise Mode and the Enterprise Mode Site List to address common compatibility problems with legacy apps.
-
+| If you… | Then… |
-    - If you enable this setting, Microsoft Edge looks for the Enterprise Mode Site List XML file, which includes the sites and domains that need to be viewed using Internet Explorer 11 and Enterprise Mode. If you use this option, you must also add the location to your site list in the **{URI}** box. When configured, any site on the list will always open in Internet Explorer 11.
+| --- | --- |
-    
+| Enable this setting | You must add the location to your site list in the **{URI}** box. When configured, Microsoft Edge looks for the Enterprise Mode Site List XML file, which includes the sites and domains that need to be viewed using Internet Explorer 11 and Enterprise Mode. |
-    - If you disable or don’t configure this setting (default), Microsoft Edge won’t use the Enterprise Mode Site List XML file. In this case, employees might experience compatibility problems while using legacy apps.
+Disable or do not configure this setting (default) | Microsoft Edge won’t use the Enterprise Mode Site List XML file. In this case, employees might experience compatibility problems while using legacy apps. |
+|
 
 >[!Note] 
-    >If there’s an .xml file in the cache container, IE waits 65 seconds and then checks the local cache for a newer version of the file from the server, based on standard caching rules. If the server file has a different version number than the version in the cache container, the server file is used and stored in the cache container.<p>
+>If there is a .xml file in the cache container, IE waits 65 seconds and then checks the local cache for a newer version of the file from the server, based on standard caching rules. If the server has a different version number than the version in the cache container, the server file is used and stored in the cache container.<br><br>
-    >If you’re already using a site list, enterprise mode continues to work during the 65 second wait; it just uses your existing site list instead of your new one.
+>If you already use a site list, enterprise mode continues to work during the 65-second wait; it just uses the existing site list instead of the new one.  
 
 ### Configure Windows Defender SmartScreen
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you configure whether to turn on Windows Defender SmartScreen. Windows Defender SmartScreen provides warning messages to help protect your employees from potential phishing scams and malicious software. By default, Windows Defender SmartScreen is turned on.
+This policy setting lets you configure whether to turn on Windows Defender SmartScreen. Windows Defender SmartScreen provides warning messages to help protect your employees from potential phishing scams and malicious software. By default, Windows Defender SmartScreen is turned on.
-
+| If you… | Then… |
-    - If you enable this setting, Windows Defender SmartScreen is turned on and employees can’t turn it off.
+| --- | --- |
-    
+| Enable this setting | Windows Defender SmartScreen is turned on, and employees cannot turn it off. | 
-    - If you disable this setting, Windows Defender SmartScreen is turned off and employees can’t turn it on.
+| Disable this setting | Windows Defender SmartScreen is turned off, and employees cannot turn it on. |
-    
+| Do not configure this setting | Employees can choose whether to use Windows Defender SmartScreen. |
-    - If you don’t configure this setting (default), employees can choose whether to use Windows Defender SmartScreen.
+|
 
 ### Disable lockdown of Start pages
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you disable the lock down of Start pages, letting employees modify the Start pages when the "Configure Start pages" setting is in effect.
+This policy setting lets you disable the lockdown of Start pages if the Configure Start pages setting is in effect <!-- <span style="background: #ffff99;">[@Reviewer: shouldn't this be “…is enabled” instead of "...is in effect"?]</span> -->. This setting only applies to domain-joined or MDM-enrolled devices. 
 
-    >[!Important]
+For more info, see the [Microsoft browser extension policy](http://aka.ms/browserpolicy).
-    >This setting only applies when you're using the “Configure Start pages" setting and can only be used with domain-joined or MDM-enrolled devices. For more info, see the Microsoft browser extension policy (aka.ms/browserpolicy).
 
-    - If you enable this setting, you can't lock down any Start pages that are configured using the "Configure Start pages" setting, which means that employees can modify them.
+| If you… | Then… |
-    
+| --- | --- |
-    - If you disable or don't configure this setting (default), employees can't change any Start pages configured using the "Configure Start pages" setting, thereby locking down the Start pages.
+| Enable this setting | You cannot lock down Start pages that are configured using the “Configure Start pages” setting. Employees can, therefore, modify the pages. |
+| Disable or do not configure this setting (default) | Employees cannot change Start pages configured using the “Configure Start pages” setting. | 
+|                                                                 
 
 ### Keep favorites in sync between Internet Explorer and Microsoft Edge
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This setting lets you decide whether people can sync their favorites between Internet Explorer and Microsoft Edge, including additions, deletions, changes, and position.
+This policy setting lets you decide whether people can sync their favorites between Internet Explorer and Microsoft Edge, including additions, deletions, changes, and position.
 
-    >[!Note]
+<!-- 
-    >Enabling this setting stops Edge favorites from syncing between connected Windows 10 devices.
+<span style="background: #ffff99;">[@Reviewer: what is the default: enable or disable?]</span> -->
-
+| If you… | Then… |
-    - If you enable this setting, employees can sync their favorites between Internet Explorer and Microsoft Edge.
+| --- | --- |
-    
+| Enable this setting | Employees can sync their favorites between Internet Explorer and Microsoft Edge.<br><br>Enabling this setting stops Edge favorites from syncing between connected Windows 10 devices. <!-- <span style="background: #ffff99;">[@Reviewer: what does this mean? I want to know more about what this is saying. More details and maybe an example or scenario.]</span> --> |
-    - If you disable or don't configure this setting (default), employees can’t sync their favorites between Internet Explorer and Microsoft Edge.
+| Disable or do not configure this setting | Employees cannot sync their favorites between Internet Explorer and Microsoft Edge. |
+|
 
 ### Prevent access to the about:flags page
-- **Supported versions:** Windows 10, version 1607 or later
+>*Supported versions: Windows 10, version 1607 or later*
 
-- **Description:** This policy setting lets you decide whether employees can access the about:flags page, which is used to change developer settings and to enable experimental features.
+This policy setting lets you decide whether employees can access the about:flags page, which is used to change developer settings and to enable experimental features.
-
+| If you… | Then… |
-    - If you enable this policy setting, employees can’t access the about:flags page.
+| --- | --- |
-    
+| Enable this setting | Employees cannot access the about:flags page. |
-    - If you disable or don’t configure this setting (default), employees can access the about:flags page.
+| Disable or do not configure this setting (default) | Employees can access the about:flags page. |
+|                                                                 
 
 ### Prevent bypassing Windows Defender SmartScreen prompts for files
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supported versions: Windows 10, version 1511 or later*
-
-- **Description:** This policy setting lets you decide whether employees can override the Windows Defender SmartScreen warnings about downloading unverified files.
-
-    - If you enable this setting, employees can’t ignore Windows Defender SmartScreen warnings and they’re blocked from downloading the unverified files.
-
-    - If you disable or don’t configure this setting (default), employees can ignore Windows Defender SmartScreen warnings and continue the download process.
 
+This policy setting lets you decide whether employees can override the Windows Defender SmartScreen warnings about downloading unverified files.
+| If you… | Then… |
+| --- | --- |
+| Enable this setting | Employees cannot ignore Windows Defender SmartScreen warnings when downloading files. |
+| Disable or do not configure this setting (default) | Employees can ignore Windows Defender SmartScreen warnings and can continue the download process. |
+|                                                                                                                                                  
 ### Prevent bypassing Windows Defender SmartScreen prompts for sites
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supported versions: Windows 10, version 1511 or later*
 
-- **Description:** This policy setting lets you decide whether employees can override the Windows Defender SmartScreen warnings about potentially malicious websites.
+This policy setting lets you decide whether employees can override the Windows Defender SmartScreen warnings about potentially malicious websites.
-
+| If you… | Then… |
-    - If you enable this setting, employees can’t ignore Windows Defender SmartScreen warnings and they’re blocked from continuing to the site.
+| --- | --- |
-    
+| Enable this setting | Employees cannot ignore Windows Defender SmartScreen warnings and prevents them from continuing to the site. |
-    - If you disable or don’t configure this setting (default), employees can ignore Windows Defender SmartScreen warnings and continue to the site.
+| Disable or do not configure this setting (default) | Employees can ignore Windows Defender SmartScreen warnings, allowing them to continue to the site. |
+|
 
 ### Prevent Microsoft Edge from gathering Live Tile information when pinning a site to Start
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy lets you decide whether Microsoft Edge can gather Live Tile metadata from the ieonline.microsoft.com service to provide a better experience while pinning a Live Tile to the Start menu.
+This policy lets you decide whether Microsoft Edge can gather Live Tile metadata from the ieonline.microsoft.com service to provide a better experience while pinning a Live Tile to the Start menu.
+| If you… | Then… |
+| --- | --- |
+| Enable this setting | Microsoft Edge does not gather the Live Tile metadata, providing a minimal experience. | 
+| Disable or do not configure this setting (default) | Microsoft Edge gathers the Live Tile metadata, providing a fuller and complete experience. |
+|
 
-    - If you enable this setting, Microsoft Edge won't gather the Live Tile metadata, providing a minimal experience when a user pins a Live Tile to the Start menu.
-    
-    - If you disable or don't configure this setting (default), Microsoft Edge gathers the Live Tile metadata, providing a fuller and more complete experience when a user pins a Live Tile to the Start menu.
 
 ### Prevent the First Run webpage from opening on Microsoft Edge
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you decide whether employees see Microsoft's First Run webpage when opening Microsoft Edge for the first time.
+This policy setting lets you decide whether employees see Microsoft's First Run webpage when opening Microsoft Edge for the first time.
-
+| If you… | Then… |
-    - If you enable this setting, employees won't see the First Run page when opening Microsoft Edge for the first time.
+| --- | --- |
-    
+| Enable this settin | Employees do not see the First Run page. |
-    - If you disable or don't configure this setting (default), employees will see the First Run page when opening Microsoft Edge for the first time.
+| Disable or do not configure this setting (default) | Employees see the First Run page. |
+|
 
 ### Prevent using Localhost IP address for WebRTC
-- **Supported versions:** Windows 10, version 1511 or later
+>*Supported versions: Windows 10, version 1511 or later*
 
-- **Description:** This policy setting lets you decide whether an employee’s Localhost IP address shows while making calls using the WebRTC protocol. By default, this setting is turned off.
+This policy setting lets you decide whether localhost IP addresses are visible or hidden while making calls to the WebRTC protocol.
-
+| If you… | Then… |
-    - If you enable this setting, Localhost IP addresses are hidden while making calls using the WebRTC protocol.
+| --- | --- |
-    
+| Enable this setting | Localhost IP addresses are hidden. |
-    - If you disable or don’t configure this setting (default), Localhost IP addresses are shown while making calls using the WebRTC protocol.
+| Disable or do not configure this setting (default) | Localhost IP addresses are visible. |
+|
 
 ### Send all intranet sites to Internet Explorer 11
-- **Supported versions:** Windows 10 or later
+>*Supported versions: Windows 10*
 
-- **Description:** This policy setting lets you decide whether your intranet sites should all open using Internet Explorer 11. This setting should only be used if there are known compatibility problems with Microsoft Edge.
+This policy setting lets you decide whether your intranet sites should all open using Internet Explorer 11. This setting should only be used if there are known compatibility problems with Microsoft Edge.
-
+| If you… | Then… |
-    - If you enable this setting, all intranet sites are automatically opened using Internet Explorer 11.
+| --- | --- |
-    
+| Enable this setting | All intranet sites are opened in Internet Explorer 11 automatically. |
-    - If you disable or don’t configure this setting (default), all websites, including intranet sites, are automatically opened using Microsoft Edge.
+| Disable or do not configure this setting (default) | All websites, including intranet sites, open in Microsoft Edge. | 
+|
 
 ### Set default search engine
-- **Supported versions:** Windows 10, version 1703
+>*Supported versions: Windows 10, version 1703*
 
-- **Description:** This policy setting lets you configure the default search engine for your employees. Employees can change the default search engine at any time unless you disable the "Allow search engine customization" setting, which restricts any changes.
+This policy setting applies only to domain-joined or MDM-enrolled devices and lets you configure the default search engine for Microsoft Edge. Employees can change the default search engine at any time unless you disable the "Allow search engine customization" setting, which restricts any changes. 
 
+For more info, see the [Microsoft browser extension policy](http://aka.ms/browserpolicy).
+
+| If you… | Then… |
+| --- | --- |
+| Enable this setting | To set a default search engine, you must add a link to your OpenSearch XML file, including at least the short name and https URL of the search engine, using this format:<br><br>`https://fabrikam.com/opensearch.xml` |
+| Disable this setting | The policy-set default search engine is removed. If this is also the current in-use default, the search engine changes to the Microsoft Edge specified engine for the market <!-- <span style="background: #ffff99;">[@Reviewer: what does “market” mean in this context?]</span> -->. |
+| Do not configure this setting | The default search engine is set to the one specified in App settings. |
+|
 >[!Important]
-    >This setting can only be used with domain-joined or MDM-enrolled devices. For more info, see the Microsoft browser extension policy (aka.ms/browserpolicy).<p>
+>If you'd like your employees to use the default Microsoft Edge settings for each market <!-- <span style="background: #ffff99;">[@Reviewer: what does “each market” refer to in this context?]</span> -->, you can set the string to EDGEDEFAULT. If you'd like your employees to use Microsoft Bing as the default search engine, you can set the string to EDGEBING.
-    >If you'd like your employees to use the default Microsoft Edge settings for each market, you can set the string to EDGEDEFAULT. If you'd like your employees to use Microsoft Bing as the default search engine, you can set the string to EDGEBING.
-
-    - If you enable this setting, you can choose a default search engine for your employees. To choose the default engine, you must add a link to your OpenSearch XML file, including at least the short name and https: URL of the search engine, using this format:
-    
-            https://fabrikam.com/opensearch.xml
-    
-    - If you disable this setting, the policy-set default search engine is removed. If this is also the current in-use default, the engine changes to the Microsoft Edge specified engine for the market.
-
-    - If you don't configure this setting (default), the default search engine is set to the one specified in App settings.
 
 ### Show message when opening sites in Internet Explorer
-- **Supported versions:** Windows 10, version 1607 and later
+>*Supported versions: Windows 10, version 1607 and later*
 
-- **Description:** This policy setting lets you decide whether employees see an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11.
+This policy setting lets you decide whether employees see an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11.
-
+| If you… | Then… |
-    - If you enable this setting, employees see an additional page in Microsoft Edge, stating that a site has been opened using Internet Explorer 11.
+| --- | --- |
-    
+| Enable this setting | Employees see an additional page. |
-    - If you disable or don’t configure this setting (default), the default app behavior occurs and no additional page appears.
+| Disable or do not configure this setting (default) | No additional pages display. |
+|
 
 ## Using Microsoft Intune to manage your Mobile Device Management (MDM) settings for Microsoft Edge
 If you manage your policies using Intune, you'll want to use these MDM policy settings. You can see the full list of available policies, on the [Policy CSP]( https://go.microsoft.com/fwlink/p/?LinkId=722885) page.
@@ -397,7 +407,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         - **1 (default).** Allowed. Address bar drop-down is enabled.
 
 ### AllowAutofill
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Desktop
 
@@ -414,7 +424,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         - **1 (default).** Employees can use Autofill to complete form fields.
 
 ### AllowBrowser
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Mobile
 
@@ -431,7 +441,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         - **1 (default).** Employees can use Microsoft Edge. 
 
 ### AllowCookies
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Both
 
@@ -462,12 +472,12 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
     - **Allowed values:**
 
-        - **0.** Employees can't use the F12 Developer Tools.
+        - **0.** Employees cannot use the F12 Developer Tools.
         
         - **1 (default).** Employees can use the F12 Developer Tools.
 
 ### AllowDoNotTrack
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Both
 
@@ -501,7 +511,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         - **1 (default).** Employees can use Edge Extensions.    
 
 ### AllowFlash
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Desktop
 
@@ -564,12 +574,12 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
     - **Allowed values:** 
 
-        - **0.** Additional search engines aren't allowed and the default can’t be changed in the Address bar.
+        - **0.** Additional search engines are not allowed and the default can’t be changed in the Address bar.
         
         - **1 (default).** Additional search engines are allowed and the default can be changed in the Address bar.
 
 ### AllowPasswordManager
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Both
 
@@ -581,12 +591,12 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
     - **Allowed values:**
 
-        - **0 (default).** Employees can't use Password Manager to save passwords locally.
+        - **0 (default).** Employees cannot use Password Manager to save passwords locally.
         
         - **1.** Employees can use Password Manager to save passwords locally.
 
 ### AllowPopups
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Desktop
 
@@ -621,7 +631,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
 
 ### AllowSearchSuggestionsinAddressBar
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Both
 
@@ -638,7 +648,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         - **1.** Employees can see search suggestions in the Address bar of Microsoft Edge.
 
 ### AllowSmartScreen
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Both
 
@@ -706,7 +716,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
         - **1.** Disable lockdown of the Start pages and allow users to modify them.
 
 ### EnterpriseModeSiteList
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Desktop
 
@@ -747,7 +757,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
                 <contoso.com>
                 <fabrikam.com>
             
-            URLs must be on separate lines and aren't shared between Microsoft Edge and Internet Explorer 11.
+            URLs must be on separate lines and are not shared between Microsoft Edge and Internet Explorer 11.
 
 ### FirstRunURL
 - **Supported versions:** Windows 10, version 1511 or later
@@ -802,7 +812,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
         - **0 (default).** Employees can access the about:flags page in Microsoft Edge.
         
-        - **1.** Employees can't access the about:flags page in Microsoft Edge.
+        - **1.** Employees cannot access the about:flags page in Microsoft Edge.
 
 ### PreventFirstRunPage
 - **Supported versions:** Windows 10, version 1703
@@ -819,7 +829,7 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
         - **0 (default).** Employees see the First Run webpage.
         
-        - **1.** Employees don't see the First Run webpage.
+        - **1.** Employees do not see the First Run webpage.
 
 ### PreventLiveTileDataCollection
 - **Supported versions:** Windows 10, version 1703
@@ -887,10 +897,10 @@ All devices must be enrolled with Intune if you want to use the Windows Custom U
 
         - **0 (default).** Shows an employee's LocalHost IP address while using the WebRTC protocol.
         
-        - **1.** Doesn't show an employee's LocalHost IP address while using the WebRTC protocol.
+        - **1.** Does not show an employee's LocalHost IP address while using the WebRTC protocol.
 
 ### SendIntranetTraffictoInternetExplorer
-- **Supported versions:** Windows 10 or later
+- **Supported versions:** Windows 10
 
 - **Supported devices:** Desktop
 
@@ -968,9 +978,9 @@ These are additional Windows 10-specific Group Policy settings that work with M
 
 - **Description:** This policy settings lets you decide whether employees can use Cortana.
 
-    - If you enable or don't configure this setting, employees can use Cortana on their devices.
+    - If you enable or do not configure this setting, employees can use Cortana on their devices.
     
-    - If you disable this setting, employees won't be able to use Cortana on their devices.
+    - If you disable this setting, employees will not be able to use Cortana on their devices.
     
         >[!Note]
         >Employees can still perform searches even with Cortana turned off.
@@ -982,7 +992,7 @@ These are additional Windows 10-specific Group Policy settings that work with M
 
     - If you enable this setting, the Sync your Settings options are turned off and none of the Sync your Setting groups are synced on the device. You can use the Allow users to turn syncing on option to turn the feature off by default, but to let the employee change this setting.
     
-    - If you disable or don't configure this setting (default), the Sync your Settings options are turned on, letting employees pick what can sync on their device.
+    - If you disable or do not configure this setting (default), the Sync your Settings options are turned on, letting employees pick what can sync on their device.
     
 ### Do not sync browser settings
 - **Location:** Computer Configuration\Administrative Templates\Windows Components\sync your settings\Do not sync browser settings
@@ -991,7 +1001,7 @@ These are additional Windows 10-specific Group Policy settings that work with M
 
     - If you enable this setting, the Sync your Settings options are turned off so that browser groups are unable to sync their settings and info. You can use the Allow users to turn browser syncing on option to turn the feature off by default, but to let the employee change this setting.
     
-    - If you disable or don't configure this setting (default), the Sync your Settings options are turned on, letting browser groups pick what can sync on their device.
+    - If you disable or do not configure this setting (default), the Sync your Settings options are turned on, letting browser groups pick what can sync on their device.
 
 
 ## Microsoft Edge and Windows 10-specific MDM policy settings

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

@@ -13,15 +13,15 @@ ms.date: 07/27/2017
 
 # Use Enterprise Mode to improve compatibility
 
-**Applies to:**
+> Applies to: Windows 10
-
-- Windows 10
 
 If you have specific web sites and apps that you know have compatibility problems with Microsoft Edge, you can use the Enterprise Mode site list so that the web sites will automatically open using Internet Explorer 11. Additionally, if you know that your intranet sites aren't going to work properly with Microsoft Edge, you can set all intranet sites to automatically open using IE11.
 
 Using Enterprise Mode means that you can continue to use Microsoft Edge as your default browser, while also ensuring that your apps continue working on IE11.
 
-> **Note**<br>
+<!-- Will RS5 have the need for the following note? -->
+[@Reviewer: will RS5 have the need for the following note?]
+>[!NOTE]
 >If you want to use Group Policy to set Internet Explorer as your default browser, you can find the info here, [Set the default browser using Group Policy]( https://go.microsoft.com/fwlink/p/?LinkId=620714).
 
 ## Fix specific websites
@@ -98,7 +98,5 @@ You can add the **Send all intranet traffic over to Internet Explorer** Group Po
 * [Set the default browser using Group Policy]( https://go.microsoft.com/fwlink/p/?LinkId=620714)
  
 
- 
-
 
 

browsers/edge/hardware-and-software-requirements.md

@@ -13,15 +13,13 @@ ms.date: 07/27/2017
 
 # Microsoft Edge requirements and language support
 
-**Applies to:**
+>Applies to: Windows 10, Windows 10 Mobile
-
-- Windows 10
-- Windows 10 Mobile
 
 
 Microsoft Edge is pre-installed on all Windows 10-capable devices that meet the minimum system requirements and are on the supported language list.
 
->**Note**<br>The Long-Term Servicing Branch (LTSB) versions of Windows, including Windows Server 2016, don't include Microsoft Edge or many other Universal Windows Platform (UWP) apps. These apps and their services are frequently updated with new functionality, and can't be supported on systems running the LTSB operating systems. For customers who require the LTSB for specialized devices, we recommend using Internet Explorer 11.
+>[!NOTE]
+>The Long-Term Servicing Branch (LTSB) versions of Windows, including Windows Server 2016, don't include Microsoft Edge or many other Universal Windows Platform (UWP) apps. These apps and their services are frequently updated with new functionality, and can't be supported on systems running the LTSB operating systems. For customers who require the LTSB for specialized devices, we recommend using Internet Explorer 11.
 
 ## Minimum system requirements
 Some of the components in this table might also need additional system resources. Check the component's documentation for more information.

browsers/edge/microsoft-edge-faq.md

@@ -12,10 +12,7 @@ ms.date: 09/19/2017
 
 # Microsoft Edge - Frequently Asked Questions (FAQs) for IT Pros
 
-**Applies to:**
+>Applies to: Windows 10, Windows 10 Mobile
-
-- Windows 10
-- Windows 10 Mobile
 
 **Q: What is the difference between Microsoft Edge and Internet Explorer 11? How do I know which one to use?**
 

browsers/edge/security-enhancements-microsoft-edge.md

@@ -11,19 +11,16 @@ ms.date: 10/16/2017
 
 # Security enhancements for Microsoft Edge
 
-**Applies to:**
+>Applies to: Windows 10, Windows 10 Mobile
-
-- Windows 10
-- Windows 10 Mobile
 
 Microsoft Edge is designed with significant security improvements, helping to defend people from increasingly sophisticated and prevalent web-based attacks against Windows.
 
 ## Help to protect against web-based security threats
 While most websites are safe, some sites have been designed to steal personal information or gain access to your system’s resources. Thieves by nature don’t care about rules, and will use any means to take advantage of victims, most often using trickery or hacking:
 
-- **Trickery.** Means using things like “phishing” attacks to convince a person to enter a banking password into a website that looks like the bank, but isn’t.
+- **Trickery** uses things like “phishing” attacks to convince a person to enter a banking password into a website that looks like the bank, but isn’t.
 
-- **Hacking.** Means attacking a system through malformed content that exploits subtle flaws in a browser, or in various browser extensions, such as video decoders. This exploit lets an attacker run code on a device, taking over first a browsing session, and perhaps ultimately the entire device.
+- **Hacking** attacks a system through malformed content that exploits subtle flaws in a browser, or in various browser extensions, such as video decoders. This exploit lets an attacker run code on a device, taking over first a browsing session, and perhaps ultimately the entire device.
 
 While trickery and hacking are threats faced by every browser, it’s important that we explore how Microsoft Edge addresses these threats and is helping make the web a safer experience.
 
@@ -55,8 +52,8 @@ The Microsoft EdgeHTML engine also helps to defend against hacking through these
 
 - Support for the [HTTP Strict Transport Security (HSTS)](https://developer.microsoft.com/microsoft-edge/platform/documentation/dev-guide/security/HSTS/) security feature (IETF-standard compliant). This helps ensure that connections to important sites, such as to your bank, are always secured.
 
-    **Note**<br>
+>[!NOTE]
-    Both Microsoft Edge and Internet Explorer 11 support HSTS.
+>Both Microsoft Edge and Internet Explorer 11 support HSTS.
 
 #### All web content runs in an app container sandbox
 Internet Explorer 7 on Windows Vista was the first web browser to provide a browsing sandbox, called [Protected Mode](http://windows.microsoft.com/windows-vista/What-does-Internet-Explorer-protected-mode-do). Protected Mode forced the part of the browser that rendered web content to run with less privilege than the browser controls or the user, providing a level of isolation and protection should a malicious website attempt to exploit a bug in the browser or one of its plug-ins.

devices/hololens/hololens-enroll-mdm.md

@@ -12,7 +12,7 @@ ms.date: 07/27/2017
 
 # Enroll HoloLens in MDM
 
-You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft Intune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. See the [configuration service providers (CSPs) that are supported in Windows Holographic](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/configuration-service-provider-reference#hololens) and the [policies supported by Windows Holographic for Business](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#hololenspolicies).
+You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft Intune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. See [Manage devices running Windows Holographic with Microsoft Intune](https://docs.microsoft.com/intune/windows-holographic-for-business), the [configuration service providers (CSPs) that are supported in Windows Holographic](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/configuration-service-provider-reference#hololens), and the [policies supported by Windows Holographic for Business](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#hololenspolicies).
 
 >[!NOTE]
 >Mobile device management (MDM), including the VPN, Bitlocker, and kiosk mode features, is only available when you [upgrade to Windows Holographic for Business](hololens-upgrade-enterprise.md).

devices/surface-hub/change-history-surface-hub.md

@@ -8,7 +8,7 @@ ms.sitesec: library
 ms.pagetype: surfacehub
 author: jdeckerms
 ms.author: jdecker
-ms.date: 01/17/2018
+ms.date: 02/16/2018
 ms.localizationpriority: medium
 ---
 
@@ -16,6 +16,12 @@ ms.localizationpriority: medium
 
 This topic lists new and updated topics in the [Surface Hub Admin Guide]( surface-hub-administrators-guide.md).
 
+## February 2018
+
+New or changed topic | Description
+--- | ---
+[Manage settings with an MDM provider (Surface Hub)](manage-settings-with-mdm-for-surface-hub.md) | Updated instructions for custom settings using Microsoft Intune.
+
 ## January 2018
 
 New or changed topic | Description

devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md

@@ -9,7 +9,7 @@ ms.sitesec: library
 ms.pagetype: surfacehub, mobility
 author: jdeckerms
 ms.author: jdecker
-ms.date: 01/17/2018
+ms.date: 02/16/2018
 ms.localizationpriority: medium
 ---
 
@@ -212,38 +212,9 @@ The data type is also stated in the CSP documentation. The most common data type
 <span id="example-intune">
 ## Example: Manage Surface Hub settings with Microsoft Intune
 
-You can use Microsoft Intune to manage Surface Hub settings. 
+You can use Microsoft Intune to manage Surface Hub settings. For custom settings, follow the instructions in [How to configure custom device settings in Microsoft Intune](https://docs.microsoft.com/intune/custom-settings-configure). For **Platform**, select **Windows 10 and later**, and in **Profile type**, select **Device restrictions (Windows 10 Team)**.
 
-**To create a configuration policy from a template**
 
-You'll use the **Windows 10 Team general configuration policy** as the template.
-
-1. On the [Intune management portal](https://manage.microsoft.com), sign in with your Intune administrator account.
-2. On the left-hand navigation menu, click **Policy**.
-3. In the Overview page, click **Add Policy**.
-4. On **Select a template for the new policy**, expand **Windows**, select **General Configuration (Windows 10 Team and later)**, and then click **Create Policy**.
-
-    ![template for Windows 10 Team](images/intune-template.png)
-5. Configure your policy, then click **Save Policy**
-   
-    ![save policy](images/intune-save-policy.png)
-6. When prompted, click **Yes** to deploy your new policy to a user or device group. For more information, see [Use groups to manage users and devices in Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/use-groups-to-manage-users-and-devices-with-microsoft-intune).
-
-**To create a custom configuration policy**
-
-You’ll need to create a custom policy using the **Custom Configuration (Windows 10 Desktop and Mobile and later)** template to manage settings that are not available in the **Windows 10 Team general configuration policy** template. 
-
-1. On the [Intune management portal](https://manage.microsoft.com), sign in with your Intune administrator account.
-2. On the left-hand navigation menu, click **Policy**.
-3. On the Overview page, click **Add Policy**.
-4. On **Select a template for the new policy**, expand **Windows**, select **Custom Configuration (Windows 10 Desktop and Mobile and later)**, and then click **Create Policy**.
-5. Type a name and optional description for the policy.
-6. Under OMA-URI Settings, click **Add**.
-7. Complete the form to create a new setting, and then click **OK**.
-
-    ![example of OMA URI form](images/oma-uri.png)
-8. Repeat Steps 6 and 7 for each setting you want to configure with this policy.
-9. After you're done, click **Save Policy** and deploy it to a user or device group. 
 
 <span id="example-sccm">
 ## Example: Manage Surface Hub settings with System Center Configuration Manager

devices/surface-hub/surface-hub-start-menu.md

@@ -28,7 +28,7 @@ The customized Start menu is defined in a Start layout XML file. You have two op
 - Configure the desired Start menu on a desktop (pinning only apps that are available on Surface Hub), and then [export the layout](https://docs.microsoft.com/windows/configuration/customize-and-export-start-layout#export-the-start-layout).
 
 >[!TIP]
->To add a tile with a web link to your desktop start menu, go the the link in Microsoft Edge, select `...` in the top right corner, and select **Pin this page to Start**. See [a Start layout that includes a Microsoft Edge link](#edge) for an example of how links will appear in the XML.
+>To add a tile with a web link to your desktop start menu, go to the link in Microsoft Edge, select `...` in the top right corner, and select **Pin this page to Start**. See [a Start layout that includes a Microsoft Edge link](#edge) for an example of how links will appear in the XML.
 
 To edit the default XML or the exported layout, familiarize yourself with the [Start layout XML](https://docs.microsoft.com/en-us/windows/configuration/start-layout-xml-desktop). There are a few [differences between Start layout on a deskop and a Surface Hub.](#differences)
 

mdop/mbam-v25/TOC.md

@@ -55,6 +55,7 @@
 #### [How to Enable BitLocker by Using MBAM as Part of a Windows Deployment](how-to-enable-bitlocker-by-using-mbam-as-part-of-a-windows-deploymentmbam-25.md)
 #### [How to Deploy the MBAM Client by Using a Command Line](how-to-deploy-the-mbam-client-by-using-a-command-line.md)
 ### [MBAM 2.5 Deployment Checklist](mbam-25-deployment-checklist.md)
+### [Upgrading to MBAM 2.5 SP1 from MBAM 2.5](upgrading-to-mbam-25-sp1-from-mbam-25.md)
 ### [Upgrading to MBAM 2.5 or MBAM 2.5 SP1 from Previous Versions](upgrading-to-mbam-25-or-mbam-25-sp1-from-previous-versions.md)
 ### [Removing MBAM Server Features or Software](removing-mbam-server-features-or-software.md)
 ## [Operations for MBAM 2.5](operations-for-mbam-25.md)

mdop/mbam-v25/upgrading-to-mbam-25-sp1-from-mbam-25.md

@@ -0,0 +1,44 @@
+---
+title: Upgrading to MBAM 2.5 SP1 from MBAM 2.5
+description: Upgrading to MBAM 2.5 SP1 from MBAM 2.5
+author: kaushika-msft
+ms.assetid: 
+ms.pagetype: mdop, security
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.prod: w10
+ms.date: 2/16/2018
+---
+
+# Upgrading to MBAM 2.5 SP1 from MBAM 2.5
+This topic describes the process for upgrading the Microsoft BitLocker Administration and Monitoring (MBAM) Server 2.5 and the MBAM Client from 2.5 to MBAM 2.5 SP1.
+
+### Before you begin, download the September 2017 servicing release
+[Desktop Optimization Pack](https://www.microsoft.com/en-us/download/details.aspx?id=56126)
+
+#### Steps to upgrade the MBAM Database (SQL Server)
+1. Using the MBAM Configurator; remove the Reports roll from the SQL server, or wherever the SSRS database is housed (Could be on the same server or  different one, depending on your environment)
+Note: You will not see an option to remove the Databases; this is expected.  
+2. Install 2.5 SP1 (Located with MDOP - Microsoft Desktop Optimization Pack 2015 from the Volume Licensing Service Center site:  <https://www.microsoft.com/Licensing/servicecenter/default.aspx>
+3. Do not configure it at this time 
+4. Install the September Rollup: https://www.microsoft.com/en-us/download/details.aspx?id=56126
+5. Using the MBAM Configurator; re-add the Reports rollup
+6. This will configure the SSRS connection using the latest MBAM code from the rollup 
+7. Using the MBAM Configurator; re-add the SQL Database roll on the SQL Server.
+- At the end, you will be warned that the DBs already exist and  weren’t created, but this is  expected.
+- This process updates the existing databases to the current version  being installed                  
+
+#### Steps to upgrade the MBAM Server (Running MBAM and IIS)
+1. Using the MBAM Configurator; remove the Admin and Self Service Portals from  the IIS server
+2. Install MBAM 2.5 SP1
+3. Do not configure it at this time  
+4. Install the September 2017 Rollup on the IIS server(https://www.microsoft.com/en-us/download/details.aspx?id=56126)
+5. Using the MBAM Configurator; re-add the Admin and Self Service Portals to the IIS server 
+6. This will configure the sites using the latest MBAM code from the June  Rollup
+- Open an elevated command prompt, Type: **IISRESET** and Hit Enter.
+ 
+#### Steps to upgrade the MBAM Clients/Endpoints
+1. Uninstall the 2.5 Agent from client endpoints
+2. Install the 2.5 SP1 Agent on the client endpoints
+3. Push out the September Rollup Client update to clients running the 2.5 SP1 Agent 
+4. There is no need to uninstall existing client prior to installing the September Rollup.  

store-for-business/manage-private-store-settings.md

@@ -7,7 +7,7 @@ ms.mktglfcycl: manage
 ms.sitesec: library
 ms.pagetype: store
 author: TrudyHa
-ms.date: 11/30/2017
+ms.date: 2/15/2018
 ms.localizationpriority: high
 ---
 
@@ -25,7 +25,7 @@ The name of your private store is shown on a tab in Microsoft Store app, or on [
 ![Image showing Microsoft Store app with private store tab highlighted.](images/wsfb-wsappprivatestore.png)
 
 You can change the name of your private store in Microsoft Store.
-<!---
+
 ## Change private store name
 **To change the name of your private store**
 
@@ -36,10 +36,14 @@ You can change the name of your private store in Microsoft Store.
 
     ![Image showing Private store dialog used to change private store display name.](images/wsfb-renameprivatestore.png)
 
-## Add a Collection
+## Private store collections
 You can create collections of apps within your private store. Collections allow you to group or categorize apps - you might want a group of apps for different job functions in your company, or classes in your school. 
 
-**To add a collection to your private store**
+**To add a Collection to your private store**
+
+You can add a collection to your private store from the private store, or from the details page for an app.
+
+**From private store** 
 1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). 
 2. Click your private store.</br>
 
@@ -48,8 +52,56 @@ You can create collections of apps within your private store. Collections allow
 
     ![Image showing Add a Collection.](images/msfb-add-collection.png)
 
-4. Enter a name for your collection, and then click **Next**. 
+4. Type a name for your collection, and then click **Next**.
-5. Add products to ytour collection, and then click **Done**. 
+5. Add at least one product to your collection, and then click **Done**. 
 
-Currently, it takes about thirty-six hours for new collections to be available in your private store.
+> [!NOTE] 
+> New collections require at least one app, or they will not be created. 
+
+**From app details page** 
+1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then click **Products & services**. 
+3. Under **Apps & software**, choose an app you want to include in a new collection. 
+4. Under **Private Store Collections**, click **Add a collection**. 
+
+![Image showing app details page with Add a Collection.](images/msfb-ps-collection-idp.png)
+
+5. Type a name for your collection, and then click **Next**.
+6. Add at least one product to your collection, and then click **Done**.
+
+Currently, changes to collections will generally show within minutes in the Microsoft Store app on Windows 10. In some cases, it may take up an hour.
+
+## Edit Collections
+If you've already added a Collection to your private store, you can easily add and remove products, or rename the collection. 
+
+**To add or remove products from a collection**  
+1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). 
+2. Click your private store.</br>
+
+![Image showing private store name on MSfB store UI.](images/msfb-click-private-store.png)
+
+3. Click the ellipses next to the collection name, and click **Edit collection**. 
+4. Add or remove products from the collection, and then click **Done**. 
+
+You can also add an app to a collection from the app details page. 
+1. Sign in to [Microsoft Store for Business](http://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then click **Products & services**. 
+3. Under **Apps & software**, choose an app you want to include in a new collection. 
+4. Under **Private Store Collections**, turn on the collection you want to add the app to.
+
+![Image showing app details page with Add a Collection.](images/msfb-ps-collection-idp.png) 
+
+<!---
+## Private store performance
+We've recently made performance improvements for changes in the private store. This table includes common actions, and the current estimate for amount of time required for the change. 
+
+| Action                                                 | Estimated time |
+| ------------------------------------------------------ | -------------- |
+| Add a product to the private store <br> - Apps recently added to your inventory, including line-of-business (LOB) apps and new purchases, will take up to 36 hours to add to the private store. That time begins when the product is purchased, or added to your inventory. <br> - It will take an additional 36 hours for the product to be searchable in private store, even if you see the app available from the private store tab. | - 15 minutes: available on private store tab <br> - 36 hours: searchable in private store <br> - 36 hours: available on private store tab, if the product has just been added to inventory |
+| Remove a product from private store |  - 15 minutes: private store tab <br> - 36 hours: searchable in private store | 
+| Accept a new LOB app into your inventory (under **Products & services)**) | 36 hours |
+| Create a new collection | 15 minutes|
+| Edit or remove a collection | 15 minutes |
+| Create private store tab | 4-6 hours |
+| Rename private store tab | 4-6 hours |
 --> 

store-for-business/whats-new-microsoft-store-business-education.md

@@ -6,7 +6,7 @@ ms.mktglfcycl: manage
 ms.sitesec: library
 ms.pagetype: store
 author: TrudyHa
-ms.date: 2/8/2018
+ms.date: 2/16/2018
 ---
 
 # What's new in Microsoft Store for Business and Education
@@ -15,11 +15,12 @@ Microsoft Store for Business and Education regularly releases new and improved f
 
 ## Latest updates for Store for Business and Education
 
-**January 2018**
+**January & February, 2018**
 
 |  |  |
 |--------------------------------------|---------------------------------|
 | ![Microsoft Store for Business Products &amp; services page.](images/product-and-service-icon.png) |**One place for apps, software, and subscriptions**<br /><br /> The new **Products &amp; services** page in Microsoft Store for Business and Education gives customers a single place to manage all products and services. This includes Apps, Software, and Subscriptions that your organization acquired or manages through Microsoft Store for Business. This change centralizes these products, but the platform changes also improve overall performance. <br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
+| ![Private store collections](images/private-store-icon.png) |**Create collections of apps in your private store**<br /><br /> Use **collections** to customize your private store. Collections allow you to create groups of apps that are commonly used in your organization or school -- you might create a collection for a Finance department, or a 6th-grade class.<br /><br />[Get more info](https://docs.microsoft.com/microsoft-store/manage-private-store-settings#private-store-collections)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 |  ![Upgrade Office 365 trial subscription.](images/office-logo.png) |**Upgrade Office 365 trial subscription**<br /><br> Customers with Office 365 trials can now transition their trial to a paid subscription in Microsoft Store for Business. This works for trials you acquired from Microsoft Store for Business, or Office Admin Portal. <br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 |  ![Image showing Settings icon.](images/mpsa-link.png) |**Supporting Microsoft Product and Services Agreement customers**<br /><br>If you are purchasing under the Microsoft Products and Services Agreement (MPSA), you can use Microsoft Store for Business. Here you will find access to Products & Services purchased, Downloads & Keys, Software Assurance benefits, Order history, and Agreement details. Also, we added the ability to associate your purchasing account to your tenant. <br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 |  ![Image showing Settings icon.](images/invite-people.png) |**Microsoft Product and Services Agreement customers can invite people to take roles**<br /><br> MPSA admins can invite people to take Microsoft Store for Business roles even if the person is not in their tenant. You provide an email address when you assign the role, and we'll add the account to your tenant and assign the role. <br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
@@ -30,6 +31,7 @@ Microsoft Store for Business and Education regularly releases new and improved f
 We’ve been working on bug fixes and performance improvements to provide you a better experience. Stay tuned for new features!
 |  |  |
 |-----------------------|---------------------------------|
+| ![Private store performance icon](images/perf-improvement-icon.png) |**Performance improvements in private store**<br /><br /> We've made it significantly faster for you to update the private store. Many changes to the private store are available immediately after you make them. <br /><br />[Get more info](https://docs.microsoft.com/microsoft-store/manage-private-store-settings#private-store-performance)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 | <iframe width="288" height="232" src="https://www.youtube.com/embed/IpLIZU_j7Z0" frameborder="0" allowfullscreen></iframe>| **Manage Windows device deployment with Windows AutoPilot Deployment** <br /><br /> In Microsoft Store for Business, you can manage devices for your organization and apply an AutoPilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the AutoPilot deployment profile you applied to the device.<br /><br />[Get more info](add-profile-to-devices.md)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education  |
 | ![Microsoft Store for Business Settings page, Distribute tab showing app requests setting.](images/msfb-wn-1709-app-request.png) |**Request an app**<br /><br />People in your organization can reqest additional licenses for apps in your private store, and then Admins or Purchasers can make the purchases. <br /><br />[Get more info](https://docs.microsoft.com/microsoft-store/acquire-apps-microsoft-store-for-business#request-apps)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |
 ||  ![Image showing Add a Collection.](images/msfb-add-collection.png) |**Private store collections**<br /><br> You can groups of apps in your private store with **Collections**. This can help you organize apps and help people find apps for their job or classroom. <br /><br />[Get more info](https://review.docs.microsoft.com/microsoft-store/manage-private-store-settings?branch=msfb-14856406#add-a-collection)<br /><br />**Applies to**:<br /> Microsoft Store for Business <br /> Microsoft Store for Education |

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

@@ -117,7 +117,7 @@ Here are the typical provisioned Windows apps in Windows 10 versions 1607, 1703,
 | 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                        |
+| Mail and Calendar               | microsoft.windowscommunicationsapps    | 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    | No                        |
@@ -132,7 +132,7 @@ Here are the typical provisioned Windows apps in Windows 10 versions 1607, 1703,
 | Sticky Notes                    | Microsoft.MicrosoftStickyNotes         | x    | x    |  x    | No                        |
 | Store                           | Microsoft.WindowsStore                 | x    | x    |  x    | No                        |
 | Sway                            | Microsoft.Office.Sway                  | *    | *    |  x   | Yes                       |
-| Voice Recorder                  | Microsoft.SoundRecorder                | x    | x    |  x    | No                        |
+| Voice Recorder                  | Microsoft.WindowsSoundRecorder         | x    | x    |  x   | No                        |
 | Wallet                          | Microsoft.Wallet                       |      | x    |  x    | No                        |
 | Weather                         | Microsoft.BingWeather                  | x    | x    |  x    | Yes                        |
 | Xbox                            | Microsoft.XboxApp                      | x    | x    |  x    | No                        |

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

@@ -34,14 +34,18 @@ The following diagram shows the WindowsDefenderApplicationGuard configuration se
 <a href="" id="clipboardfiletype"></a>**Settings/ClipboardFileType**  
 <p style="margin-left: 20px">Determines the type of content that can be copied from the host to Application Guard environment and vice versa. Value type is integer. Supported operations are Add, Get, Replace, and Delete.</p>
 
-- 0 - Allow text copying.
+- 0 - Disables content copying. 
-- 1 - Allow text and image copying.
+- 1 - Allow text copying.
+- 2 - Allow image copying.
+- 3 - Allow text and image copying.
 
 <a href="" id="clipboardsettings"></a>**Settings/ClipboardSettings**  
 <p style="margin-left: 20px">This policy setting allows you to decide how the clipboard behaves while in Application Guard. Value type is integer. Supported operations are Add, Get, Replace, and Delete</p>
 
 - 0 (default) - Completely turns Off the clipboard functionality for the Application Guard.
-- 1 - Turns On the clipboard functionality and lets you choose whether to additionally enable copying of certain content from Application Guard into Microsoft Edge and enable copying of certain content from Microsoft Edge into Application Guard.
+- 1 - Turns On clipboard operation from an isolated session to the host
+- 2 - Turns On clipboard operation from the host to an isolated session
+- 3 - Turns On clipboard operation in both the directions
 
 > [!Important]  
 > Allowing copied content to go from Microsoft Edge into Application Guard can cause potential security risks and isn't recommended. 

windows/configuration/TOC.md

@@ -2,9 +2,10 @@
 ## [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md)
 ## [Diagnostic Data Viewer Overview](diagnostic-data-viewer-overview.md)
 ## [Windows 10, version 1709 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md)
-## [Windows 10, version 1709 enhanced diagnostic data events and fields used by Windows Analytics](enhanced-diagnostic-data-windows-analytics-events-and-fields.md)
 ## [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1703.md)
-## [Windows 10 diagnostic data for the Full diagnostic data level](windows-diagnostic-data-1703.md)
+## [Windows 10, version 1709 enhanced telemetry events and fields used by Windows Analytics](enhanced-diagnostic-data-windows-analytics-events-and-fields.md)
+## [Windows 10, version 1709 diagnostic data for the Full telemetry level](windows-diagnostic-data.md)
+## [Windows 10, version 1703 diagnostic data for the Full telemetry level](windows-diagnostic-data-1703.md)
 ## [Beginning your General Data Protection Regulation (GDPR) journey for Windows 10](gdpr-win10-whitepaper.md)
 ## [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md)
 ## [Manage Windows 10 connection endpoints](manage-windows-endpoints-version-1709.md)

windows/configuration/index.md

@@ -22,9 +22,10 @@ Enterprises often need to apply custom configurations to devices for their users
 | [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md) | Use this article to make informed decisions about how you can configure Windows diagnostic data in your organization. |
 |[Diagnostic Data Viewer overview](diagnostic-data-viewer-overview.md) |Learn about the categories of diagnostic data your device is sending to Microsoft, along with how it's being used.|
 | [Windows 10, version 1709 basic diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1709. |
-|[Windows 10, version 1709 enhanced diagnostic data events and fields used by Windows Analytics](enhanced-diagnostic-data-windows-analytics-events-and-fields.md)|Learn about diagnostic data that is collected by Windows Analytics.|
+| [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1703.md)| Learn about diagnostic data that is collected at the basic level in Windows 10, version 1703.|
-| [Windows 10, version 1703 basic diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1703.md) | Learn about diagnostic data that is collected at the basic level in Windows 10, version 1703. |
+| [Windows 10, version 1709 enhanced telemetry events and fields used by Windows Analytics](enhanced-diagnostic-data-windows-analytics-events-and-fields.md)|Learn about diagnostic data that is collected by Windows Analytics.|
-| [Windows 10 diagnostic data for the Full diagnostic data level](windows-diagnostic-data-1703.md) | Learn about the types of data that is collected at the full level in Windows 10, version 1703 and later. |
+| [Windows 10, version 1709 diagnostic data for the Full telemetry level](windows-diagnostic-data.md) | Learn about diagnostic data that is collected at the full level in Windows 10, version 1709. |
+| [Windows 10, version 1703 diagnostic data for the Full telemetry level](windows-diagnostic-data-1703.md) | Learn about diagnostic data that is collected at the full level in Windows 10, version 1703. |
 |[Beginning your General Data Protection Regulation (GDPR) journey for Windows 10](gdpr-win10-whitepaper.md)|Learn about Windows 10 and the upcoming GDPR-compliance requirements.|
 | [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Learn about the network connections that Windows components make to Microsoft and also the privacy settings that affect data that is shared with either Microsoft or apps and how they can be managed by an IT Pro. |
 | [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. It can connect you to open Wi-Fi hotspots it knows about through crowdsourcing, or to Wi-Fi networks your contacts have shared with you by using Wi-Fi Sense. The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10.  |

windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md

@@ -36,6 +36,7 @@ You should not extract this package to the windows\\system32 folder because it w
 
 Applying the Windows Restricted Traffic Limited Functionality Baseline is the same as applying each setting covered in this article. 
 It is recommended that you restart a device after making configuration changes to it. 
+Note that **Get Help** and **Give us Feedback** links no longer work after the Windows Restricted Traffic Limited Functionality Baseline is applied.
 
 We are always striving to improve our documentation and welcome your feedback. You can provide feedback by contacting telmhelp@microsoft.com.
 
@@ -88,17 +89,17 @@ See the following table for a summary of the management settings for Windows 10
 | Setting | UI | Group Policy | MDM policy | Registry | Command line |
 | - | :-: | :-: | :-: | :-: | :-: |
 | [1. Automatic Root Certificates Update](#automatic-root-certificates-update) | | ![Check mark](images/checkmark.png) | | | |
-| [2. Cortana and Search](#bkmk-cortana) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | 
+| [2. Cortana and Search](#bkmk-cortana) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | 
 | [3. Date & Time](#bkmk-datetime) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
 | [4. Device metadata retrieval](#bkmk-devinst) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
 | [5. Find My Device](#find-my-device) | | ![Check mark](images/checkmark.png) | | | |
 | [6. Font streaming](#font-streaming) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
-| [7. Insider Preview builds](#bkmk-previewbuilds) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) |
+| [7. Insider Preview builds](#bkmk-previewbuilds) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) |  |
 | [8. Internet Explorer](#bkmk-ie) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
 | [9. Live Tiles](#live-tiles) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
 | [10. Mail synchronization](#bkmk-mailsync) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
 | [11. Microsoft Account](#bkmk-microsoft-account) | | ![Check mark](images/checkmark.png) |  ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
-| [12. Microsoft Edge](#bkmk-edge) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) |
+| [12. Microsoft Edge](#bkmk-edge) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) |  |
 | [13. Network Connection Status Indicator](#bkmk-ncsi) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
 | [14. Offline maps](#bkmk-offlinemaps) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
 | [15. OneDrive](#bkmk-onedrive) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
@@ -1065,7 +1066,17 @@ To turn off **Choose apps that can use your microphone**:
 
 ### <a href="" id="bkmk-priv-notifications"></a>17.5 Notifications
 
-In the **Notifications** area, you can choose which apps have access to notifications.
+To turn off notifications network usage:
+
+-   Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Notifications** > **Turn off Notifications network usage**
+
+    -   Set to **Enabled**.
+
+        -or-
+
+-   Create a REG\_DWORD registry setting in **HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CurrentVersion\\PushNotifications!NoCloudApplicationNotification**, with a value of 1 (one)
+
+In the **Notifications** area, you can also choose which apps have access to notifications.
 
 To turn off **Let apps access my notifications**:
 

windows/configuration/wcd/wcd-cellcore.md

@@ -425,6 +425,7 @@ The following table shows the scenarios supported by this customization:
 
 
 Multivariant setting set?|SPN provisioned?|MSISDN (last 4 digits: 1234, for example) provisioned?|Default SIM name
+--- | --- | --- | ---
 Yes|Yes|Yes|*MultivariantProvisionedSPN*1234 or *MultivariantProvisionedSPN*" "1234
 Yes|No|No|*MultivariantProvisionedSPN* (up to 16 characters)
 Yes|Yes|No|*MultivariantProvisionedSPN* (up to 16 characters)

windows/configuration/windows-diagnostic-data-1703.md

@@ -8,13 +8,13 @@ ms.sitesec: library
 ms.localizationpriority: high
 author: eross-msft
 ms.author: lizross
-ms.date: 04/05/2017
+ms.date: 11/28/2017
 ---
 
 # Windows 10 diagnostic data for the Full diagnostic data level
 
 **Applies to:**
-- Windows 10, version 1703 and later
+- Windows 10, version 1703
 
 Microsoft collects Windows diagnostic data to keep Windows up-to-date, secure, and operating properly. It also helps us improve Windows and, for users who have turned on “tailored experiences”, can be used to provide more relevant tips and recommendations to tailor Microsoft products to the user’s needs.   This article describes all types diagnostic data collected by Windows at the Full diagnostic data level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1709 Basic level diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md) and [Windows 10, version 1703 Basic level diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1703.md).
 

windows/configuration/windows-diagnostic-data.md

@@ -0,0 +1,262 @@
+---
+title: Windows 10, version 1709 diagnostic data for the Full level (Windows 10)
+description: Use this article to learn about the types of diagnostic data that is collected at the Full level.
+keywords: privacy,Windows 10
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.localizationpriority: high
+author: brianlic-msft
+ms.author: brianlic
+ms.date: 01/30/2018
+---
+
+# Windows 10, version 1709 diagnostic data for the Full level
+
+Applies to:
+- Windows 10, version 1709
+
+Microsoft uses Windows diagnostic data to keep Windows secure and up-to-date, troubleshoot problems, and make product improvements. For users who have turned on "Tailored experiences", it can also be used to offer you personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs. This article describes all types of diagnostic data collected by Windows at the Full level (inclusive of data collected at Basic), with comprehensive examples of data we collect per each type. For additional, detailed technical descriptions of Basic data items, see [Windows 10, version 1709 Basic level diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md).
+
+In addition, this article provides references to equivalent definitions for the data types and examples from [ISO/IEC 19944:2017 Information technology -- Cloud computing -- Cloud services and devices: Data flow, data categories and data use](https://www.iso.org/standard/66674.html). Each data type also has a Data Use statement, for diagnostics and for Tailored experiences on the device, using the terms as defined by the standard. These Data Use statements define the purposes for which Microsoft processes each type of Windows diagnostic data, using a uniform set of definitions referenced at the end of this document and based on the ISO standard. Reference to the ISO standard provides additional clarity about the information collected, and allows easy comparison with other services or guidance that also references the standard.
+
+The data covered in this article is grouped into the following types:
+
+- Common data (diagnostic header information)
+
+- Device, Connectivity, and Configuration data
+
+- Product and Service Usage data
+
+- Product and Service Performance data
+
+- Software Setup and Inventory data
+
+- Browsing History data
+
+- Inking, Typing, and Speech Utterance data
+
+## Common data
+Most diagnostic events contain a header of common data. In each example, the info in parentheses provides the equivalent definition for ISO/IEC 19944:2017.
+
+**Data Use for Common data**
+Header data supports the use of data associated with all diagnostic events. Therefore, Common data is used to [provide](#provide) Windows 10, and may be used to [improve](#improve), [personalize](#personalize), [recommend](#recommend), [offer](#offer), or [promote](#promote) Microsoft and third-party products and services, depending on the uses described in the **Data Use** statements for each data category.
+
+### Data Description for Common data type
+|Sub-type|Description and examples|
+|- |- |
+|Common Data|Information that is added to most diagnostic events, if relevant and available:<ul><li>Diagnostic level -- Basic or Full, Sample level -- for sampled data, what sample level is this device opted into (8.2.3.2.4 Observed Usage of the Service Capability)</li><li>Operating system name, version, build, and locale (8.2.3.2.2 Telemetry data)</li><li>Event collection time (8.2.3.2.2 Telemetry data)</li><li>User ID -- a unique identifier associated with the user's Microsoft Account (if one is used) or local account. The user's Microsoft Account identifier is not collected from devices configured to send Basic diagnostic data (8.2.5 Account data)</li><li>Xbox UserID (8.2.5 Account data)</li><li>Device ID -- This is not the user provided device name, but an ID that is unique for that device. (8.2.3.2.3 Connectivity data)</li><li>Device class -- Desktop, Server, or Mobile (8.2.3.2.3 Connectivity data)</li><li>Environment from which the event was logged -- Application ID of app or component that logged the event, Session GUID. Used to track events over a given period of time, such as the amount of time an app is running or between boots of the operating system (8.2.4 Cloud service provider data)</li><li>Diagnostic event name, Event ID, ETW opcode, version, schema signature, keywords, and flags (8.2.4 Cloud service provider data)</li><li>HTTP header information, including the IP address. This IP address is the source address that’s provided by the network packet header and received by the diagnostics ingestion service (8.2.4 Cloud service provider data)</li><li>Various IDs that are used to correlate and sequence related events together (8.2.4 Cloud service provider data)</li></ul>|
+
+## Device, Connectivity, and Configuration data
+This type of data includes details about the device, its configuration and connectivity capabilities, and status. Device, Connectivity, and Configuration Data is equivalent to ISO/IEC 19944:2017, 8.2.3.2.3 Connectivity data.
+
+### Data Use for Device, Connectivity, and Configuration data 
+
+**For Diagnostics:**<br>
+[Pseudonymized](#pseudo) Device, Connectivity, and Configuration data from Windows 10 is used by Microsoft to [provide](#provide) and [improve](#improve) Windows 10 and related Microsoft products and services. For example:
+
+- Device, Connectivity, and Configuration data is used to understand the unique device characteristics that can contribute to an error experienced on the device, to identify patterns, and to more quickly resolve problems that impact devices with unique hardware, capabilities, or settings. For example:
+
+    - Data about the use of cellular modems and their configuration on your devices is used to troubleshoot cellular modem issues.
+
+    - Data about the use of USB hubs use and their configuration on your devices is used to troubleshoot USB hub issues.
+
+    - Data about the use of connected Bluetooth devices is used to troubleshoot compatibility issues with Bluetooth devices.
+
+- Data about device properties, such as the operating system version and available memory, is used to determine whether the device is due to, and able to, receive a Windows update.
+
+- Data about device peripherals is used to determine whether a device has installed drivers that might be negatively impacted by a Windows update.
+
+- Data about which devices, peripherals, and settings are most-used by customers, is used to prioritize Windows 10 improvements to determine the greatest positive impact to the most Windows 10 users.  
+
+**With (optional) Tailored experiences:**<br>
+If a user has enabled Tailored experiences on the device, [Pseudonymized](#pseudo) Device, Connectivity, and Configuration data from Windows 10 is used by Microsoft to [personalize](#personalize), [recommend](#recommend), and [offer](#offer) Microsoft products and services to Windows 10 users. Also, if a user has enabled Tailored experiences on the device, [Pseudonymized](#pseudo) Device, Connectivity, and Configuration data from Windows 10 is used by Microsoft to [promote](#promote) third-party Windows apps, services, hardware, and peripherals to Windows 10 users. For example:
+
+- Data about device properties and capabilities is used to provide tips about how to use or configure the device to get the best performance and user experience.
+
+- Data about device capabilities, such as whether the device is pen-enabled, is used to recommend (Microsoft and third-party) apps that are appropriate for the device. These may be free or paid apps.  
+  
+### Data Description for Device, Connectivity, and Configuration data type
+|Sub-type|Description and examples|
+|- |- |
+|Device properties |Information about the operating system and device hardware, such as:<br><ul><li>Operating system - version name, edition</li><li>Installation type, subscription status, and genuine operating system status</li><li>Processor architecture, speed, number of cores, manufacturer, and model</li><li>OEM details --manufacturer, model, and serial number</li><li>Device identifier and Xbox serial number</li><li>Firmware/BIOS operating system -- type, manufacturer, model, and version</li><li>Memory -- total memory, video memory, speed, and how much memory is available after the device has reserved memory</li><li>Storage -- total capacity and disk type</li><li>Battery -- charge capacity and InstantOn support</li><li>Hardware chassis type, color, and form factor</li><li>Is this a virtual machine?</li></ul>|
+|Device capabilities|Information about the specific device capabilities, such as:<br/><ul><li>Camera -- whether the device has a front facing camera, a rear facing camera, or both.</li><li>Touch screen -- Whether the device has a touch screen? If yes, how many hardware touch points are supported?</li><li>Processor capabilities -- CompareExchange128, LahfSahf, NX, PrefetchW, and SSE2</li><li>Trusted Platform Module (TPM) -- whether a TPM exists and if yes, what version</li><li>Virtualization hardware -- whether an IOMMU exists, whether it includes SLAT support, and whether virtualization is enabled in the firmware</li><li>Voice -- whether voice interaction is supported and the number of active microphones</li><li>Number of displays, resolutions, and DPI</li><li>Wireless capabilities</li><li>OEM or platform face detection</li><li>OEM or platform video stabilization and quality-level set</li><li>Advanced Camera Capture mode (HDR versus Low Light), OEM versus platform implementation, HDR probability, and Low Light probability</li></ul>|
+|Device preferences and settings |Information about the device settings and user preferences, such as:<br><ul><li>User Settings -- System, Device, Network &amp; Internet, Personalization, Cortana, Apps, Accounts, Time &amp; Language, Gaming, Ease of Access, Privacy, Update &amp; Security</li><li>User-provided device name</li><li>Whether device is domain-joined, or cloud-domain joined (for example, part of a company-managed network)</li><li>Hashed representation of the domain name</li><li>MDM (mobile device management) enrollment settings and status</li><li>BitLocker, Secure Boot, encryption settings, and status</li><li>Windows Update settings and status</li><li>Developer Unlock settings and status</li><li>Default app choices</li><li>Default browser choice</li><li>Default language settings for app, input, keyboard, speech, and display</li><li>App store update settings</li><li>Enterprise OrganizationID, Commercial ID</li></ul>|
+|Device peripherals |Information about the device peripherals, such as:<br><ul><li>Peripheral name, device model, class, manufacturer, and description</li><li>Peripheral device state, install state, and checksum</li><li>Driver name, package name, version, and manufacturer</li><li>HWID - A hardware vendor-defined ID to match a device to a driver [INF file](https://msdn.microsoft.com/windows/hardware/drivers/install/hardware-ids)</li><li>Driver state, problem code, and checksum</li><li>Whether driver is kernel mode, signed, and image size</li></ul>|
+|Device network info |Information about the device network configuration, such as:<br><ul><li>Network system capabilities</li><li>Local or Internet connectivity status</li><li>Proxy, gateway, DHCP, DNS details, and addresses</li><li>Whether it's a paid or free network</li><li>Whether the wireless driver is emulated</li><li>Whether it's access point mode-capable</li><li>Access point manufacturer, model, and MAC address</li><li>WDI Version</li><li>Name of networking driver service</li><li>Wi-Fi Direct details</li><li>Wi-Fi device hardware ID and manufacturer</li><li>Wi-Fi scan attempt  and item counts</li><li>Whether MAC randomization is supported and enabled</li><li>Number of supported spatial streams and channel frequencies</li><li>Whether Manual or Auto-connect is enabled</li><li>Time and result of each connection attempt</li><li>Airplane mode status and attempts</li><li>Interface description provided by the manufacturer</li><li>Data transfer rates</li><li>Cipher algorithm</li><li>Mobile Equipment ID (IMEI) and Mobile Country Code (MCCO)</li><li>Mobile operator and service provider name</li><li>Available SSIDs and BSSIDs</li><li>IP Address type -- IPv4 or IPv6</li><li>Signal Quality percentage and changes</li><li>Hotspot presence detection and success rate</li><li>TCP connection performance</li><li>Miracast device names</li><li>Hashed IP address</li></ul>
+
+## Product and Service Usage data
+This type of data includes details about the usage of the device, operating system, applications and services. Product and Service Usage data is equivalent to ISO/IEC 19944:2017, 8.2.3.2.4 Observed Usage of the Service Capability.
+
+### Data Use for Product and Service Usage data
+
+**For Diagnostics:**<br>
+[Pseudonymized](#pseudo) Product and Service Usage data from Windows 10 is used by Microsoft to [provide](#provide) and [improve](#improve) Windows 10 and related Microsoft product and services. For example:
+
+- Data about the specific apps that are in-use when an error occurs is used to troubleshoot and repair issues with Windows features and Microsoft apps. 
+
+- Data about the specific apps that are most-used by customers, is used to prioritize Windows 10 improvements to determine the greatest positive impact to the most Windows 10 users.
+
+- Data about whether devices have Suggestions turned off from the **Settings Phone** screen is to improve the Suggestions feature.
+
+- Data about whether a user canceled the authentication process in their browser is used to help troubleshoot issues with and improve the authentication process.
+
+- Data about when and what feature invoked Cortana is used to prioritize efforts for improvement and innovation in Cortana.
+
+- Data about when a context menu in the photo app is closed is used to troubleshoot and improve the photo app.
+
+**With (optional) Tailored experiences:**<br>
+If a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Product and Service Usage data from Windows 10 is used by Microsoft to [personalize](#personalize), [recommend](#recommend), and [offer](#offer) Microsoft products and services to Windows 10 users. Also, if a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Product and Service Usage data from Windows 10 is used by Microsoft to [promote](#promote) third-party Windows apps, services, hardware, and peripherals to Windows 10 users. For example:
+
+- If data shows that a user has not used a particular feature of Windows, we may recommend that the user try that feature.
+
+- Data about which apps are most-used on a device is used to provide recommendations for similar or complementary (Microsoft or third-party) apps. These may be free or paid apps.
+
+
+### Data Description for Product and Service Usage data type
+|Sub-type|Description and examples |
+|- |- |
+|App usage|Information about Windows and application usage, such as:<ul><li>Operating system component and app feature usage</li><li>User navigation and interaction with app and Windows features. This could potentially include user input, such as name of a new alarm set, user menu choices, or user favorites</li><li>Time of and count of app and component launches, duration of use, session GUID, and process ID</li><li>App time in various states –- running in the foreground or background, sleeping, or receiving active user interaction</li><li>User interaction method and duration –- whether the user used a keyboard, mouse, pen, touch, speech, or game controller, and for how long</li><li>Cortana launch entry point and reason</li><li>Notification delivery requests and status</li><li>Apps used to edit images and videos</li><li>SMS, MMS, VCard, and broadcast message usage statistics on primary or secondary lines</li><li>Incoming and outgoing calls and voicemail usage statistics on primary or secondary lines</li><li>Emergency alerts are received or displayed statistics</li><li>Content searches within an app</li><li>Reading activity -- bookmarked, printed, or had the layout changed</li></ul>|
+|App or product state|Information about Windows and application state, such as:<ul><li>Start Menu and Taskbar pins</li><li>Online and offline status</li><li>App launch state –- with deep-links, such as Groove launching with an audio track to play or MMS launching to share a picture</li><li>Personalization impressions delivered</li><li>Whether the user clicked on, or hovered over, UI controls or hotspots</li><li>User provided feedback, such as Like, Dislike or a rating</li><li>Caret location or position within documents and media files -- how much has been read in a book in a single session, or how much of a song has been listened to.</li></ul>|
+|Purchasing|Information about purchases made on the device, such as:<br><ul><li>Product ID, edition ID and product URI</li><li>Offer details -- price</li><li>Date and time an order was requested</li><li>Microsoft Store client type -- web or native client</li><li>Purchase quantity and price</li><li>Payment type -- credit card type and PayPal</li></ul> |
+|Login properties|Information about logins on the device, such as:<ul><li>Login success or failure</li><li>Login sessions and state</li></ul>|
+
+## Product and Service Performance data
+This type of data includes details about the health of the device, operating system, apps, and drivers. Product and Service Performance data is equivalent to ISO/IEC 19944:2017 8.2.3.2.2 EUII Telemetry data.
+
+### Data Use for Product and Service Performance data
+
+**For Diagnostics:**<br>
+[Pseudonymized](#pseudo) Product and Service Performance data from Windows 10 is used by Microsoft to [provide](#provide) and [improve](#improve) Windows 10 and related Microsoft product and services. For example:
+
+- Data about the reliability of content that appears in the [Windows Spotlight](https://docs.microsoft.com/en-us/windows/configuration/windows-spotlight) (rotating lock screen images) is used for Windows Spotlight reliability investigations.
+
+- Timing data about how quickly Cortana responds to voice commands is used to improve Cortana listening peformance.
+
+- Timing data about how quickly the facial recognition feature starts up and finishes is used to improve facial recognition performance.
+
+- Data about when an Application Window fails to appear is used to investigate issues with Application Window reliability and performance.
+
+**With (optional) Tailored experiences:**<br>
+If a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Product and Service Performance data from Windows 10 is used by Microsoft to [personalize](#personalize), [recommend](#recommend), and [offer](#offer) Microsoft products and services to Windows 10 users. Also, if a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Product and Service Performance data from Windows 10 is used by Microsoft to [promote](#promote) third-party Windows apps, services, hardware, and peripherals to Windows 10 users.
+
+- Data about battery performance on a device may be used to recommend settings changes that can improve battery performance.
+
+- If data shows a device is running low on file storage, we may recommend Windows-compatible cloud storage solutions to free up space.
+
+- If data shows the device is experiencing performance issues, we may provide recommendations for Windows apps that can help diagnose or resolve these issues. These may be free or paid apps.
+
+**Microsoft doesn't use crash and hang dump data to [personalize](#personalize), [recommend](#recommend), [offer](#offer), or [promote](#promote) any product or service.**
+
+### Data Description for Product and Service Performance data type
+|Sub-type|Description and examples |
+|- |- |
+|Device health and crash data|Information about the device and software health, such as:<br><ul><li>Error codes and error messages, name and ID of the app, and process reporting the error</li><li>DLL library predicted to be the source of the error -- for example, xyz.dll</li><li>System generated files -- app or product logs and trace files to help diagnose a crash or hang</li><li>System settings, such as registry keys</li><li>User generated files -- files that are indicated as a potential cause for a crash or hang. For example, .doc, .ppt, .csv files</li><li>Details and counts of abnormal shutdowns, hangs, and crashes</li><li>Crash failure data -- operating system, operating system component, driver, device, and 1st and 3rd-party app data</li><li>Crash and hang dumps, including:<ul><li>The recorded state of the working memory at the point of the crash</li><li>Memory in-use by the kernel at the point of the crash.</li><li>Memory in-use by the application at the point of the crash</li><li>All the physical memory used by Windows at the point of the crash</li><li>Class and function name within the module that failed.</li></li></ul>|
+|Device performance and reliability data|Information about the device and software performance, such as:<br><ul><li>User interface interaction durations -- Start menu display times, browser tab switch times, app launch and switch times, and Cortana and Search performance and reliability</li><li>Device on and off performance -- Device boot, shutdown, power on and off, lock and unlock times, and user authentication times (fingerprint and face recognition durations)</li><li>In-app responsiveness -- time to set alarm, time to fully render in-app navigation menus, time to sync reading list, time to start GPS navigation, time to attach picture MMS, and time to complete a Microsoft Store transaction</li><li>User input responsiveness -- onscreen keyboard invocation times for different languages, time to show auto-complete words, pen or touch latencies, latency for handwriting recognition to words, Narrator screen reader responsiveness, and CPU score</li><li>UI and media performance and glitches versus smoothness -- video playback frame rate, audio glitches, animation glitches (stutter when bringing up Start), graphics score, time to first frame, play/pause/stop/seek responsiveness, time to render PDF, dynamic streaming of video from OneDrive performance</li><li>Disk footprint -- Free disk space, out of memory conditions, and disk score</li><li>Excessive resource utilization -- components impacting performance or battery life through high CPU usage during different screen and power states</li><li>Background task performance -- download times, Windows Update scan duration, Windows Defender Antivirus scan times, disk defrag times, mail fetch times, service startup and state transition times, and time to index on-device files for search results</li><li>Peripheral and devices -- USB device connection times, time to connect to a wireless display, printing times, network availability and connection times (time to connect to Wi-Fi, time to get an IP address from DHCP etc.), smart card authentication times, automatic brightness, and environmental response times</li><li>Device setup -- first setup experience times (time to install updates, install apps, connect to network, and so on), time to recognize connected devices (printer and monitor), and time to set up a Microsoft Account</li><li>Power and Battery life -- power draw by component (Process/CPU/GPU/Display), hours of time the screen is off, sleep state transition details, temperature and thermal throttling, battery drain in a power state (screen off or screen on), processes and components requesting power use while the screen is off, auto-brightness details, time device is plugged into AC versus battery, and battery state transitions</li><li>Service responsiveness -- Service URI, operation, latency, service success and error codes, and protocol</li><li>Diagnostic heartbeat -- regular signal used to validate the health of the diagnostics system</li></ul>|
+|Movies|Information about movie consumption functionality on the device. This isn't intended to capture user viewing, listening, or habits.<ul><li>Video Width, height, color palette, encoding (compression) type, and encryption type</li><li>Instructions about how to stream content for the user -- the smooth streaming manifest of content file chunks that must be pieced together to stream the content based on screen resolution and bandwidth</li><li>URL for a specific two-second chunk of content if there is an error</li><li>Full-screen viewing mode details</li></ul>|
+|Music &amp; TV|Information about music and TV consumption on the device. This isn't intended to capture user viewing, listening, or habits.<ul><li>Service URL for song being downloaded from the music service -- collected when an error occurs to facilitate restoration of service</li><li>Content type (video, audio, or surround audio)</li><li>Local media library collection statistics -- number of purchased tracks and number of playlists</li><li>Region mismatch -- User's operating system region and Xbox Live region</li></ul>|
+|Reading|Information about reading consumption functionality on the device. This isn't intended to capture user viewing, listening, or habits.<ul><li>App accessing content and status and options used to open a Microsoft Store book</li><li>Language of the book</li><li>Time spent reading content</li><li>Content type and size details</li></ul>|
+|Photos App|Information about photos usage on the device. This isn't intended to capture user viewing, listening, or habits.<ul><li>File source data -- local, SD card, network device, and OneDrive</li><li>Image and video resolution, video length, file sizes types, and encoding</li><li>Collection view or full screen viewer use and duration of view</li></ul>|
+|On-device file query |Information about local search activity on the device, such as: <ul><li>Kind of query issued and index type (ConstraintIndex or SystemIndex)</li><li>Number of items requested and retrieved</li><li>File extension of search result with which the user interacted</li><li>Launched item type, file extension, index of origin, and the App ID of the opening app</li><li>Name of process calling the indexer and the amount of time to service the query</li><li>A hash of the search scope (file, Outlook, OneNote, or IE history). The state of the indices (fully optimized, partially optimized, or being built)</li></ul> |
+|Entitlements |Information about entitlements on the device, such as:<ul><li>Service subscription status and errors</li><li>DRM and license rights details -- Groove subscription or operating system volume license</li><li>Entitlement ID, lease ID, and package ID of the install package</li><li>Entitlement revocation</li><li>License type (trial, offline versus online) and duration</li><li>License usage session</li></ul>|
+
+## Software Setup and Inventory data
+This type of data includes software installation and update information on the device. Software Setup and Inventory Data is a sub-type of ISO/IEC 19944:2017 8.2.3.2.4 Observed Usage of the Service Capability.
+
+### Data Use for Software Setup and Inventory data
+
+**For Diagnostics:**<br>
+[Pseudonymized](#pseudo) Software Setup and Inventory data from Windows 10 is used by Microsoft to [provide](#provide) and [improve](#improve) Windows 10 and related Microsoft product and services. For example:
+
+- Data about the specific drivers that are installed on a device is used to understand whether there are any hardware or driver compatibility issues which should block or delay a Windows update.
+
+- Data about when a download starts and finishes on a device is used to understand and address download problems.
+
+- Data about the specific Microsoft Store apps that are installed on a device is used to determine which app updates to provide to the device.
+
+- Data about the antimalware installed on a device is used to understand malware transmissions vectors.
+
+**With (optional) Tailored experiences:**<br>
+If a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Software Setup and Inventory data from Windows 10 is used by Microsoft to [personalize](#personalize), [recommend](#recommend), and [offer](#offer) Microsoft products and services to Windows 10 users. Also, if a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Software Setup and Inventory data from Windows 10 is used by Microsoft to [promote](#promote) third-party Windows apps, services, hardware, and peripherals to Windows 10 users. For example:
+
+- Data about the specific apps that are installed on a device is used to provide recommendations for similar or complementary apps in the Microsoft Store.
+
+### Data Description for Software Setup and Inventory data type
+|Sub-type|Description and examples |
+|- |- |
+|Installed Applications and Install History|Information about apps, drivers, update packages, or operating system components installed on the device, such as:<ul><li>App, driver, update package, or component’s Name, ID, or Package Family Name</li><li>Product, SKU, availability, catalog, content, and Bundle IDs</li><li>Operating system component, app or driver publisher, language, version and type (Win32 or UWP)</li><li>Install date, method, install directory, and count of install attempts</li><li>MSI package and product code</li><li>Original operating system version at install time</li><li>User, administrator, or mandatory installation or update</li><li>Installation type -- clean install, repair, restore, OEM, retail, upgrade, or update</li></ul>|
+|Device update information |Information about Windows Update, such as:<ul><li>Update Readiness analysis of device hardware, operating system components, apps, and drivers (progress, status, and results)</li><li>Number of applicable updates, importance, and type</li><li>Update download size and source -- CDN or LAN peers</li><li>Delay upgrade status and configuration</li><li>Operating system uninstall and rollback status and count</li><li>Windows Update server and service URL</li><li>Windows Update machine ID</li><li>Windows Insider build details</li></ul>|
+
+## Browsing History data
+This type of data includes details about web browsing in the Microsoft browsers. Browsing History data is equivalent to ISO/IEC 19944:2017 8.2.3.2.8 Client side browsing history.
+
+### Data Use for Browsing History data
+
+**For Diagnostics:**<br>
+[Pseudonymized](#pseudo) Browsing History data from Windows 10 is used by Microsoft to [provide](#provide) and [improve](#improve) Windows 10 and related Microsoft product and services. For example:
+
+- Data about when the **Block Content** dialog box has been shown is used for investigations of blocked content.
+
+- Data about potentially abusive or malicious domains is used to make updates to Microsoft Edge and Windows Defender SmartScreen to warn users about the domain.
+
+- Data about when the **Address** bar is used for navigation purposes is used to improve the Suggested Sites feature and to understand and address problems arising from navigation.
+
+- Data about when a Web Notes session starts is used to measure popular domains and URLs for the Web Notes feature.
+
+- Data about when a default **Home** page is changed by a user is used to measure which default **Home** pages are the most popular and how often users change the default **Home** page.
+
+**With (optional) Tailored experiences:**<br> 
+If a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Browsing History data from Windows 10 is used by Microsoft to [personalize](#personalize), [recommend](#recommend), and [offer](#offer) Microsoft products and services to Windows 10 users. Also, if a user has enabled Tailored experiences on the device, [pseudonymized](#pseudo) Browsing History data from Windows 10 is used by Microsoft to [promote](#promote) third-party Windows apps, services, hardware, and peripherals to Windows 10 users. For example:
+
+- We may recommend that a user download a compatible app from the Microsoft Store if they have browsed to the related website. For example, if a user uses the Facebook website, we may recommend the Facebook app.
+
+### Data Description for Browsing History data type
+|Sub-type|Description and examples |
+|- |- |
+|Microsoft browser data|Information about **Address** bar and **Search** box performance on the device, such as:<ul><li>Text typed in **Address** bar and **Search** box</li><li>Text selected for an **Ask Cortana** search</li><li>Service response time</li><li>Auto-completed text, if there was an auto-complete</li><li>Navigation suggestions provided based on local history and favorites</li><li>Browser ID</li><li>URLs (may include search terms)</li><li>Page title</li></ul>|
+
+## Inking Typing and Speech Utterance data
+This type of data gathers details about the voice, inking, and typing input features on the device. Inking, Typing and Speech Utterance data is a sub-type of ISO/IEC 19944:2017 8.2.3.2.1 End User Identifiable information.
+
+### Data Use for Inking, Typing, and Speech Utterance data
+
+**For Diagnostics:**<br>
+[Anonymized](#anon) Inking, Typing, and Speech Utterance data from Windows 10 is used by Microsoft to [improve](#improve) natural language capabilities in Microsoft products and services. For example:
+
+- Data about words marked as spelling mistakes and replaced with another word from the context menu is used to improve the spelling feature.
+
+- Data about alternate words shown and selected by the user after right-clicking is used to improve the word recommendation feature.
+
+- Data about auto-corrected words that were restored back to the original word by the user is used to improve the auto-correct feature.
+
+- Data about whether Narrator detected and recognized a touch gesture is used to improve touch gesture recognition.
+
+- Data about handwriting samples sent from the Handwriting Panel is used to help Microsoft improve handwriting recognition. 
+
+**With (optional) Tailored experiences:**
+
+**Microsoft doesn't use Windows Inking, Typing, and Speech Utterance data for Tailored experiences.**
+
+### Data Description for Inking, Typing, and Speech Utterance data type
+|Sub-type|Description and examples |
+|- |- |
+|Voice, inking, and typing|Information about voice, inking and typing features, such as:<ul><li>Type of pen used (highlighter, ball point, or pencil), pen color, stroke height and width, and how long it is used</li><li>Pen gestures (click, double click, pan, zoom, or rotate)</li><li>Palm Touch x,y coordinates</li><li>Input latency, missed pen signals, number of frames, strokes, first frame commit time, and sample rate</li><li>Ink strokes written, text before and after the ink insertion point, recognized text entered, input language -- processed to remove identifiers, sequencing information, and other data (such as email addresses and numeric values), which could be used to reconstruct the original content or associate the input to the user</li><li>Text input from Windows 10 Mobile on-screen keyboards, except from password fields and private sessions -- processed to remove identifiers, sequencing information, and other data (such as email addresses and numeric values), which could be used to reconstruct the original content or associate the input to the user</li><li>Text of speech recognition results -- result codes and recognized text</li><li>Language and model of the recognizer and the System Speech language</li><li>App ID using speech features</li><li>Whether user is known to be a child</li><li>Confidence and success or failure of speech recognition</li></ul>|
+
+## ISO/IEC 19944:2017-specific terminology
+This table provides the ISO/IEC 19944:2017-specific definitions for use and de-identification qualifiers used in this article.
+
+|Term |ISO/IEC 19944:2017 Reference |Microsoft usage notes |
+|-|-|-|
+|<a name="#provide">Provide</a> |9.3.2 Provide |Use of a specified data category by a Microsoft product or service to protect and provide the described service, including, (i) troubleshoot and fix issues with the product or service or (ii) provide product or service updates.|
+|<a name="#improve">Improve</a> |9.3.3 Improve |Use of a specified data category to improve or increase the quality of a Microsoft product or service. Those improvements may be available to end users.|
+|<a name="#personalize">Personalize</a> |9.3.4 Personalize |Use of the specified data categories to create a customized experience for the end user in any Microsoft product or service.|
+|<a name="#recommend">Recommend</a> |9.3.4 Personalize |“Recommend” means use of the specified data categories to Personalize (9.3.4) the end user’s experience by recommending Microsoft products or services that can be accessed without the need to make a purchase or pay money.<br><br>Use of the specified data categories give recommendations about Microsoft products or services the end user may act on where the recommendation is (i) contextually relevant to the product or service in which it appears, (ii) that can be accessed without the need to make a purchase or pay money, and (iii) Microsoft receives no compensation for the placement.|
+|<a name="#offer">Offer</a> |9.3.5 Offer upgrades or upsell |Implies the source of the data is Microsoft products and services, and the upgrades offered come from Microsoft products and services that are relevant to the context of the current capability. The target audience for the offer is Microsoft customers.<br><br>Specifically, use of the specified data categories to make an offer or upsell new capability or capacity of a Microsoft product or service which is (i) contextually relevant to the product or service in which it appears; (ii) likely to result in additional future revenue for Microsoft from end user; and (iii) Microsoft receives no consideration for placement.|
+|<a name="#promote">Promote</a>|9.3.6 Market/advertise/promote|Use of the specified data categories to promote a product or service in or on a first-party Microsoft product or service.|
+
+<br><br>
+|Data identification qualifiers |ISO/IEC 19944:2017 Reference |Microsoft usage notes |
+|-|-|-|
+|<a name="#pseudo">Pseudonymized Data</a> |8.3.3 Pseudonymized data|As defined|
+|<a name="#anon">Anonymized Data</a> |8.3.5 Anonymized data|As defined|
+|<a name="#aggregate">Aggregated Data</a> |8.3.6 Aggregated data|As defined|

windows/deployment/TOC.md

@@ -15,6 +15,7 @@
 ### [Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md)
 
 ### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
+#### [Windows 10 downgrade paths](upgrade/windows-10-downgrade-paths.md)
 ### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md)
 ### [Windows 10 volume license media](windows-10-media.md)
 

windows/deployment/update/olympia/olympia-enrollment-guidelines.md

@@ -31,7 +31,7 @@ To request an Olympia Corp account, please fill out the survey at [https://aka.m
 
 ## Enrollment guidelines
 
-Welcome to Olympia Corp. Here are the steps to add your account to your PC.
+Welcome to Olympia Corp. Here are the steps needed to Enroll.
 
 As part of Windows Insider Lab for Enterprise, you can upgrade to Windows 10 Enterprise from Windows 10 Pro. This upgrade is optional. Since certain features such as Windows Defender Application Guard are only available on Windows 10 Enterprise, we recommend you to upgrade.
 
@@ -43,7 +43,9 @@ Choose one of the following two enrollment options:
 
 <a id="enrollment-keep-current-edition"></a>
 
-### Keep your current Windows 10 edition
+### Set up an Azure Active Directory REGISTERED Windows 10 device
+
+-   This is the Bring Your Own Device (BYOD) method - your device will receive Olympia policies and features, but a new account will not be created ([additional info]).(https://docs.microsoft.com/en-us/azure/active-directory/device-management-azuread-registered-devices-windows10-setup)
 
 1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your PC (see [local administrator](https://support.microsoft.com/en-us/instantanswers/5de907f1-f8ba-4fd9-a89d-efd23fee918c/create-a-local-user-or-administrator-account-in-windows-10)).
 
@@ -77,7 +79,9 @@ Choose one of the following two enrollment options:
 
 <a id="enrollment-upgrade-to-enterprise"></a>
 
-### Upgrade your Windows 10 edition from Pro to Enterprise
+### Set up Azure Active Directory JOINED Windows 10 device
+
+-   This method will upgrade your Windows 10 Pro license to Enterprise and create a new account ([additional info]).(https://docs.microsoft.com/en-us/azure/active-directory/device-management-azuread-joined-devices-setup)
 
 1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your PC (see [local administrator](https://support.microsoft.com/en-us/instantanswers/5de907f1-f8ba-4fd9-a89d-efd23fee918c/create-a-local-user-or-administrator-account-in-windows-10)).
 

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

@@ -57,7 +57,6 @@ If you are not using OMS:
 
 5.  To add the Upgrade Readiness solution to your workspace, go to the **Solutions Gallery**. Select the **Upgrade Readiness** tile in the gallery and then select **Add** on the solution’s details page. The solution is now visible on your workspace. Note that you may need to scroll to find Upgrade Readiness.
 
-
 ### Copy your commercial ID key
 
 Microsoft uses a unique commercial ID to map information from user computers to your OMS workspace. This should be generated for you automatically. Copy your commercial ID key in OMS and then deploy it to user computers.
@@ -85,7 +84,7 @@ To enable data sharing, whitelist the following endpoints. Note that you may nee
 | `https://v10.vortex-win.data.microsoft.com` | Connected User Experience and Telemetry component endpoint for Windows 10 computers. User computers send data to Microsoft through this endpoint.
 | `https://vortex-win.data.microsoft.com` | Connected User Experience and Telemetry component endpoint for operating systems older than Windows 10
 | `https://settings-win.data.microsoft.com` | Enables the compatibility update to send data to Microsoft. 
-| `https://adl.windows.com` | Allows the compatibility update to receive the latest compatibility data from Microsoft. |
+| `http://adl.windows.com` | Allows the compatibility update to receive the latest compatibility data from Microsoft. |
 
 Note: The compatibility update KB runs under the computer’s system account. 
 

windows/deployment/upgrade/windows-10-downgrade-paths.md

@@ -0,0 +1,160 @@
+---
+title: Windows 10 downgrade paths (Windows 10)
+description: You can downgrade Windows 10 if the downgrade path is supported.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.localizationpriority: high
+ms.pagetype: mobile
+author: greg-lindsay
+ms.date: 02/15/2018
+---
+
+# Windows 10 downgrade paths
+**Applies to**
+
+-   Windows 10
+
+## Downgrading Windows 10
+
+This topic provides a summary of supported Windows 10 downgrade paths. You might need to downgrade the edition of Windows 10, for example, if an Enterprise license is expired. 
+
+If a downgrade is supported, then your apps and settings can be migrated from the current edition to the downgraded edition. If a path is not supported, then a clean install is required.
+
+To perform a downgrade, you can use the same methods as when performing an [edition upgrade](windows-10-edition-upgrades.md).
+
+Downgrading from any edition of Windows 10 to Windows 7, 8, or 8.1 is not supported, unless you are performing a rollback of a previous upgrade.  You also cannot downgrade from a later version to an earlier version of the same edition (Ex: Windows 10 Pro 1709 to 1703) unless the rollback process is used.
+
+>**Windows 10 LTSC/LTSB**: Due to [naming changes](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#naming-changes), product versions that display Windows 10 LTSB will be replaced with Windows 10 LTSC in subsequent feature updates. The term LTSC is used here to refer to all long term servicing versions.
+
+>**Windows N/KN**: Windows "N" and "KN" SKUs follow the same rules shown below.
+
+### Supported Windows 10 downgrade paths
+
+>[!NOTE]
+>Edition changes that are considered upgrades (Ex: Pro to Enterprise) are not shown here. Switching between different editions of Pro is supported. This is not strictly considered an edition downgrade, but is included here for clarity. 
+
+✔ = Supported downgrade path<br>
+
+<br>
+<table border="0" cellpadding="1">
+    <tr>
+        <td colspan="10" align="center">Destination edition</td>
+    </tr>
+    <tr>
+        <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+        <td></td>
+        <td>Home</td>
+        <td>Pro</td>
+        <td>Pro for Workstations</td>
+        <td>Pro Education</td>
+        <td>S</td>
+        <td>Education</td>
+        <td>Enterprise LTSC</td>
+        <td>Enterprise</td>
+    </tr>
+    <tr>
+        <td rowspan="9" nowrap="nowrap" valign="middle">Starting edition</td>
+    </tr>
+    <tr>
+        <td>Home</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>Pro</td>
+        <td></td>
+        <td></td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>Pro for Workstations</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>Pro Education</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>S</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>Education</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>Enterprise LTSC</td>
+        <td></td>
+        <td align="center"></td>
+        <td align="center"></td>
+        <td align="center"></td>
+        <td align="center"></td>
+        <td align="center"></td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>Enterprise</td>
+        <td></td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td align="center">✔</td>
+        <td></td>
+        <td></td>
+    </tr>
+</table>
+
+
+## Related Topics
+
+[Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)<br>
+[Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md)<br>
+[Windows 10 edition upgrade](windows-10-edition-upgrades.md)<br>
+[Windows 10 upgrade paths](windows-10-upgrade-paths.md)
+
+
+
+
+

windows/deployment/upgrade/windows-10-edition-upgrades.md

@@ -91,6 +91,11 @@ You can run the changepk.exe command-line tool to upgrade devices to a supported
 
 `changepk.exe /ProductKey <enter your new product key here>`
 
+You can also upgrade using slmgr.vbs and a [KMS client setup key](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/jj612867(v%3dws.11)).  For example, the following command will upgrade to Windows 10 Enterprise.
+
+`Cscript.exe c:\windows\system32\slmgr.vbs /ipk NPPR9-FWDCX-D2C8J-H872K-2YT43`
+
+
 ## Upgrade by manually entering a product key
 If you are upgrading only a few devices, you may want to enter a product key for the upgraded edition manually.
 

windows/deployment/upgrade/windows-10-upgrade-paths.md

@@ -29,6 +29,7 @@ This topic provides a summary of available upgrade paths to Windows 10. You can
 ✔ = Full upgrade is supported including personal data, settings, and applications.<BR>
 D = Edition downgrade; personal data is maintained, applications and settings are removed.
 
+<br>
 <table border="0" cellpadding="1">
     <tr>
         <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -380,7 +381,8 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
 
 [Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)<br>
 [Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md)<br>
-[Windows 10 edition upgrade](windows-10-edition-upgrades.md)
+[Windows 10 edition upgrade](windows-10-edition-upgrades.md)<br>
+[Windows 10 downgrade paths](windows-10-downgrade-paths.md)
 
 
 

windows/deployment/windows-10-enterprise-subscription-activation.md

@@ -68,7 +68,7 @@ With Windows 10 Enterprise, businesses can benefit from enterprise-level securit
 You can benefit by moving to Windows as an online service in the following ways:
 
 1. Licenses for Windows 10 Enterprise are checked based on Azure Active Directory (Azure AD) credentials, so now businesses have a systematic way to assign licenses to end users and groups in their organization.
-2. Azure AD logon triggers a silent edition upgrade, with no reboot required 
+2. User logon triggers a silent edition upgrade, with no reboot required 
 3. Support for mobile worker/BYOD activation; transition away from on-prem KMS and MAK keys. 
 4. Compliance support via seat assignment.  
 

windows/security/threat-protection/TOC.md

@@ -189,9 +189,6 @@
 #### [Review events and errors on endpoints with Event Viewer](windows-defender-atp\event-error-codes-windows-defender-advanced-threat-protection.md)
 ### [Windows Defender Antivirus compatibility with Windows Defender ATP](windows-defender-atp\defender-compatibility-windows-defender-advanced-threat-protection.md)
 
-
-##	[Windows Defender Antivirus in Windows 10](windows-defender-antivirus\windows-defender-antivirus-in-windows-10.md)
-### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-antivirus\windows-defender-security-center-antivirus.md)
 ##	[Windows Defender Antivirus in Windows 10](windows-defender-antivirus\windows-defender-antivirus-in-windows-10.md)
 ### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-antivirus\windows-defender-security-center-antivirus.md)
 

windows/security/threat-protection/change-history-for-threat-protection.md

@@ -12,6 +12,12 @@ ms.date: 10/31/2017
 # Change history for threat protection
 This topic lists new and updated topics in the [Threat protection](index.md) documentation.
 
+## February 2018
+
+New or changed topic | Description
+---------------------|------------
+[Security Compliance Toolkit](security-compliance-toolkit-10.md) | Added Office 2016 Security Baseline.
+
 ## January 2018
 |New or changed topic |Description |
 |---------------------|------------|

windows/security/threat-protection/security-compliance-toolkit-10.md

@@ -7,7 +7,7 @@ ms.mktglfcycl: deploy
 ms.localizationpriority: high
 ms.author: sagaudre
 author: brianlic-msft
-ms.date: 10/16/2017
+ms.date: 02/16/2018
 ---
 
 # Microsoft Security Compliance Toolkit 1.0
@@ -32,6 +32,9 @@ The Security Compliance Toolkit consists of:
     -   Windows Server 2016
     -   Windows Server 2012 R2
 
+-   Microsoft Office Security Baselines
+    -   Office 2016 
+
 -   Tools
     -   Policy Analyzer tool
     -   Local Group Policy Object (LGPO) tool

windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md

@@ -7,7 +7,7 @@ ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: security
 author: tedhardyMSFT
-ms.date: 10/27/2017
+ms.date: 02/16/2018
 ---
 
 # Use Windows Event Forwarding to help with intrusion detection

windows/security/threat-protection/windows-defender-atp/security-analytics-dashboard-windows-defender-advanced-threat-protection.md

@@ -72,7 +72,7 @@ The numbers beside the green triangle icon on each recommended action represents
 >[!IMPORTANT]
 >Recommendations that do not display a green triangle icon are informational only and no action is required. 
 
-Clicking **View machines** in a specific recommendation opens up the **Machines list** with filters applied to show only the list of machines where the the recommendation is applicable. You can export the list in Excel to create a target collection and apply relevant policies using a management solution of your choice. 
+Clicking **View machines** in a specific recommendation opens up the **Machines list** with filters applied to show only the list of machines where the recommendation is applicable. You can export the list in Excel to create a target collection and apply relevant policies using a management solution of your choice. 
 
 The following image shows an example list of machines where the EDR sensor is not turned on.