diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index d2662faa3b..8dada868e0 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -5182,7 +5182,7 @@
},
{
"source_path": "education/windows/switch-to-pro-education.md",
-"redirect_url": "/education/windows/s-mode-switch-to-edu",
+"redirect_url": "/education/windows/change-to-pro-education",
"redirect_document_id": true
},
{
@@ -6406,6 +6406,11 @@
"redirect_document_id": true
},
{
+"source_path": "windows/configuration/configure-devices-without-mdm.md",
+"redirect_url": "/windows/configuration/provisioning-packages/provisioning-packages",
+"redirect_document_id": true
+},
+{
"source_path": "windows/configure/configure-mobile.md",
"redirect_url": "/windows/configuration/mobile-devices/configure-mobile",
"redirect_document_id": true
@@ -13619,5 +13624,62 @@
"source_path": "windows/security/threat-protection/windows-defender-atp/settings-windows-defender-advanced-threat-protection.md",
"redirect_url": "/windows/security/threat-protection/windows-defender-atp/time-settings-windows-defender-advanced-threat-protection",
"redirect_document_id": true
-}]
+},
+{
+"source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1703.md",
+"redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1709.md",
+"redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields.md",
+"redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/configure-windows-diagnostic-data-in-your-organization.md",
+"redirect_url": "/windows/privacy/configure-windows-diagnostic-data-in-your-organization",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/diagnostic-data-viewer-overview.md",
+"redirect_url": "/windows/privacy/diagnostic-data-viewer-overview",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/enhanced-diagnostic-data-windows-analytics-events-and-fields.md",
+"redirect_url": "/windows/privacy/enhanced-diagnostic-data-windows-analytics-events-and-fields",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/gdpr-win10-whitepaper.md",
+"redirect_url": "/windows/privacy/gdpr-win10-whitepaper",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md",
+"redirect_url": "/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/manage-windows-endpoints-version-1709.md",
+"redirect_url": "/windows/privacy/manage-windows-endpoints",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/windows-diagnostic-data-1703.md",
+"redirect_url": "/windows/privacy/windows-diagnostic-data-1703",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/configuration/windows-diagnostic-data.md",
+"redirect_url": "/windows/privacy/windows-diagnostic-data",
+"redirect_document_id": true
+},
+
+]
}
diff --git a/browsers/edge/available-policies.md b/browsers/edge/available-policies.md
index 8cc05b0bf9..8003e7237c 100644
--- a/browsers/edge/available-policies.md
+++ b/browsers/edge/available-policies.md
@@ -14,14 +14,14 @@ ms.date: 4/30/2018
# Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge
-> Applies to: Windows 10, Windows 10 Mobile
+> Applies to: 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 (GPOs) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences.
By using Group Policy and Intune, you can set up a policy setting once, and then copy that setting onto many computers. For example, you can set up multiple security settings in a GPO that is linked to a domain, and then apply all of those settings to every computer in the domain.
> [!NOTE]
-> 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).
+> 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).
Microsoft Edge works with the following Group Policy settings to help you manage your company's web browser configurations. The Group Policy settings are found in the Group Policy Editor in the following location:
@@ -36,7 +36,7 @@ You can configure Microsoft Edge to use a shared folder to store books from the
If enabled, a shared books folder is allowed.
-If disabled, a shared books folder not allowed.
+If disabled, a shared books folder not allowed.
**MDM settings in Microsoft Intune**
| | |
@@ -82,7 +82,7 @@ Adobe Flash is integrated with Microsoft Edge and is updated via Windows Update.
## Allow clearing browsing data on exit
>*Supported versions: Windows 10, version 1703*
-Your browsing data is the information that Microsoft Edge remembers and stores as you browse websites. Browsing data includes information you entered into forms, passwords, and the websites you visited. By default, this policy is disabled or not configured, the browsing data is not cleared when exiting. When this policy is disabled or not configured, you can turn on and configure the Clear browsing data option under Settings.
+Your browsing data is the information that Microsoft Edge remembers and stores as you browse websites. Browsing data includes information you entered forms, passwords, and the websites you visited. By default, this policy is disabled or not configured, the browsing data is not cleared when exiting. When this policy is disabled or not configured, you can turn on and configure the Clear browsing data option under Settings.
**Microsoft Intune to manage your MDM settings**
@@ -115,7 +115,7 @@ not configured. If disabled, Microsoft Edge does not retrieve the Books configur
## Allow Cortana
>*Supported versions: Windows 10, version 1607 or later*
-Cortana is integrated with Microsoft Edge, and when enabled, Cortana allows you use the voice assistant on your device. If disabled, Cortana is not available for use, but you can search to find items on your device.
+Cortana is integrated with Microsoft Edge, and when enabled, Cortana allows you to use the voice assistant on your device. If disabled, Cortana is not available for use, but you can search to find items on your device.
**Microsoft Intune to manage your MDM settings**
| | |
@@ -130,7 +130,7 @@ Cortana is integrated with Microsoft Edge, and when enabled, Cortana allows you
## Allow Developer Tools
>*Supported versions: Windows 10, version 1511 or later*
-F12 developer tools is a suite of tools to help you build and debug your webpage. By default, this policy is enabled making the F12 Developer Tools availabe to use.
+F12 developer tools is a suite of tools to help you build and debug your webpage. By default, this policy is enabled making the F12 Developer Tools available to use.
**Microsoft Intune to manage your MDM settings**
| | |
@@ -205,7 +205,7 @@ Microsoft Edge uses the compatibility list that helps websites with known compat
## Allow search engine customization
>*Supported versions: Windows 10, version 1703 or later*
-This policy setting allows search engine customization for domain-joined or MDM-enrolled devices only. For example, you can change the default search engine or add a new search engine. By default, this setting is enabled allowing you to add new search engines and change the default under Settings. If disabled, you cannot add search enginess or change the default.
+This policy setting allows search engine customization for domain-joined or MDM-enrolled devices only. For example, you can change the default search engine or add a new search engine. By default, this setting is enabled allowing you to add new search engines and change the default under Settings. If disabled, you cannot add search engines or change the default.
For more information, see [Microsoft browser extension policy](https://docs.microsoft.com/en-us/legal/windows/agreements/microsoft-browser-extension-policy).
@@ -216,7 +216,7 @@ For more information, see [Microsoft browser extension policy](https://docs.micr
|Supported devices |Desktop
Mobile |
|URI full path |./Vendor/MSFT/Policy/Config/Browser/AllowSearchEngineCustomization |
|Data type | Integer |
-|Allowed values |
After the new Internet Explorer 11 package is available for download, you should manually synchronize the new package to your WSUS server, so that when you re-enable auto-approval it won’t be automatically installed.
+
+8. Click **Start**, click **Administrative Tools**, and then click **Microsoft Windows Server Update Services 3.0**.
+
+9. Expand *ComputerName*, and then click **Synchronizations**.
+
+10. Click **Synchronize Now**.
+
+11. Expand *ComputerName*, expand **Updates**, and then click **All Updates**.
+
+12. Choose **Unapproved** in the **Approval**drop down box.
+
+13. Check to make sure that Microsoft Internet Explorer 11 is listed as an unapproved update.
+
+ >[!Note]
+ >There may be multiple updates, depending on the imported language and operating system updates.
+
+**Optional**
+
+If you need to reset your Update Rollups packages to auto-approve, do this:
+
+1. Click **Start**, click **Administrative Tools**, and then click **Microsoft Windows Server Update Services 3.0**.
+
+2. Expand *ComputerName*, and then click **Options**.
+
+3. Click **Automatic Approvals**.
+
+4. Click the rule that automatically approves updates of different classifications, and then click **Edit**.
+
+5. Click the **Update Rollups** property under the **Step 2: Edit the properties (click an underlined value)** section.
+
+6. Check the **Update Rollups** check box, and then click **OK**.
+
+7. Click **OK** to close the **Automatic Approvals** dialog box.
+
+>[!Note]
+>Because auto-approval rules are only evaluated when an update is first imported into WSUS, turning this rule back on after the Internet Explorer 11 update has been imported and synchronized to the server won’t cause this update to be auto-approved.
+
+
+## Additional resources
+
+- [Automatic delivery process](what-is-the-internet-explorer-11-blocker-toolkit.md#automatic-delivery-process)
+
+- [Internet Explorer 11 Blocker Toolkit download](https://www.microsoft.com/download/details.aspx?id=40722)
+
+- [Internet Explorer 11 FAQ for IT pros](https://docs.microsoft.com/internet-explorer/ie11-faq/faq-for-it-pros-ie11)
+
+- [Internet Explorer 11 delivery through automatic updates](https://technet.microsoft.com/microsoft-edge/dn449235)
+
+- [Internet Explorer 11 deployment guide](https://docs.microsoft.com/internet-explorer/ie11-deploy-guide/index)
diff --git a/browsers/internet-explorer/ie11-deploy-guide/images/img-enterprise-mode-site-list-xml.jpg b/browsers/internet-explorer/ie11-deploy-guide/images/img-enterprise-mode-site-list-xml.jpg
new file mode 100644
index 0000000000..0bcfd3b650
Binary files /dev/null and b/browsers/internet-explorer/ie11-deploy-guide/images/img-enterprise-mode-site-list-xml.jpg differ
diff --git a/browsers/internet-explorer/ie11-deploy-guide/images/img-f12-developer-tools-emulation.jpg b/browsers/internet-explorer/ie11-deploy-guide/images/img-f12-developer-tools-emulation.jpg
new file mode 100644
index 0000000000..48ed75b701
Binary files /dev/null and b/browsers/internet-explorer/ie11-deploy-guide/images/img-f12-developer-tools-emulation.jpg differ
diff --git a/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md b/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md
index 9bcd6e6ec8..8b6848b28d 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md
+++ b/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md
@@ -3,12 +3,13 @@ ms.localizationpriority: low
ms.mktglfcycl: deploy
ms.pagetype: security
description: Use out-of-date ActiveX control blocking to help you know when IE prevents a webpage from loading outdated ActiveX controls and to update the outdated control, so that it’s safer to use.
-author: eross-msft
+author: shortpatti
+ms.author: pashort
ms.prod: ie11
ms.assetid: e61866bb-1ff1-4a8d-96f2-61d3534e8199
title: Out-of-date ActiveX control blocking (Internet Explorer 11 for IT Pros)
ms.sitesec: library
-ms.date: 07/27/2017
+ms.date: 05/10/2018
---
@@ -47,7 +48,8 @@ It also works with these operating system and IE combinations:
|Windows Server 2008 SP2 |Windows Internet Explorer 9 only |
|Windows Vista SP2 |Windows Internet Explorer 9 only |
-For more info about this new feature, see the [Internet Explorer begins blocking out-of-date ActiveX controls](https://go.microsoft.com/fwlink/p/?LinkId=507691) blog. To see the complete list of out-of-date Active controls blocked by this feature, see [Blocked out-of-date ActiveX controls](https://go.microsoft.com/fwlink/p/?LinkId=517023).
+For more info about this new feature, see the [Internet Explorer begins blocking out-of-date ActiveX controls](https://go.microsoft.com/fwlink/p/?LinkId=507691) blog. To see the complete list of out-of-date Active controls blocked by this feature, see [Blocked out-of-date ActiveX controls](blocked-out-of-date-activex-controls.md).
+
## What does the out-of-date ActiveX control blocking notification look like?
When IE blocks an outdated ActiveX control, you’ll see a notification bar similar to this, depending on your version of IE:
diff --git a/browsers/internet-explorer/ie11-deploy-guide/tips-and-tricks-to-manage-ie-compatibility.md b/browsers/internet-explorer/ie11-deploy-guide/tips-and-tricks-to-manage-ie-compatibility.md
new file mode 100644
index 0000000000..378bcf0af5
--- /dev/null
+++ b/browsers/internet-explorer/ie11-deploy-guide/tips-and-tricks-to-manage-ie-compatibility.md
@@ -0,0 +1,133 @@
+---
+ms.localizationpriority: low
+ms.mktglfcycl: deploy
+ms.pagetype: appcompat
+description: Find out how to achieve better backward compatibility for your legacy web applications with the Enterprise Mode Site List.
+author: shortpatti
+ms.author: pashort
+ms.prod: ie11
+ms.assetid:
+title: Tips and tricks to manage Internet Explorer compatibility
+ms.sitesec: library
+ms.date: 05/10/2018
+---
+
+# Tips and tricks to manage Internet Explorer compatibility
+
+Find out how to achieve better backward compatibility for your legacy web applications with the Enterprise Mode Site List.
+
+Jump to:
+- [Tips for IT professionals](#tips-for-it-professionals)
+- [Tips for web developers](#tips-for-web-developers)
+
+[Enterprise Mode for Internet Explorer 11](enterprise-mode-overview-for-ie11.md) can be very effective in providing backward compatibility for older web apps. The Enterprise Mode Site List includes the ability to put any web app in any document mode, include IE8 and IE7 Enterprise Modes, without changing a single line of code on the website.
+
+
+
+Sites in the \ Microsoft SQL Server 2016 Standard, Enterprise, or Datacenter SP1 64-bit 64-bit Microsoft SQL Server 2014 Standard, Enterprise, or Datacenter Learn about GDPR and how Microsoft helps you get started towards compliance Make informed decisions about how you can configure diagnostic data in your organization Review the diagnostic data sent to Microsoft by device in your organization Learn more about basic diagnostics events and fields collected Learn more about diagnostics events and fields used by Windows Analytics Learn more about all diagnostics data collected Manage Windows 10 connection endpoints Manage connections from Windows to Microsoft services GDPR on Microsoft365 Compliance solutions
-Yes. The Internet Explorer Administration Kit 11 (IEAK 11) is available for download. IEAK 11 lets you create custom versions of IE11 for use in your organization. For more information, see the following resources:
-
-- [Internet Explorer Administration Kit Information and Downloads](https://go.microsoft.com/fwlink/p/?LinkId=214250) on the Internet Explorer TechCenter.
-
-- [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
**Q: Where can I get more information about IE11 for IT pros?**
Visit the [Springboard Series for Microsoft Browsers](https://go.microsoft.com/fwlink/p/?LinkId=313191) webpage on TechNet.
-**Q: Is there a version of the Internet Explorer Blocker Toolkit that will prevent automatic installation of IE11?**
-Yes. The IE11 Blocker Toolkit is available for download. For more information, see [Toolkit to Disable Automatic Delivery of IE11](https://go.microsoft.com/fwlink/p/?LinkId=328195) on the Microsoft Download Center.
+
**Q: Can I customize settings for IE on Windows 8.1?**
Settings can be customized in the following ways:
@@ -146,7 +139,6 @@ Group Policy settings can be set to open either IE or Internet Explorer for the
|Always in Internet Explorer for the desktop |Links always open in Internet Explorer for the desktop. |
-
**Q. Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?**
Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
@@ -164,6 +156,7 @@ IEAK 11 is available in 24 languages but can build customized Internet Explorer
+
**Q. What are the different modes available for the Internet Explorer Customization Wizard?**
The IEAK Customization Wizard displays pages based on your licensing mode selection, either **Internal** or **External**. For more information on IEAK Customization Wizard modes, see [Determine the licensing version and features to use in IEAK 11](../ie11-ieak/licensing-version-and-features-ieak11.md).
diff --git a/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.md b/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.md
new file mode 100644
index 0000000000..5aa814af97
--- /dev/null
+++ b/browsers/internet-explorer/ie11-faq/faq-ie11-blocker-toolkit.md
@@ -0,0 +1,118 @@
+---
+ms.localizationpriority: low
+ms.mktglfcycl: explore
+description: Get answers to commonly asked questions about the Internet Explorer 11 Blocker Toolkit.
+author: shortpatti
+ms.author: pashort
+ms.prod: ie11
+ms.assetid:
+title: Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions
+ms.sitesec: library
+ms.date: 05/10/2018
+---
+
+# Internet Explorer 11 Blocker Toolkit - Frequently Asked Questions
+
+Get answers to commonly asked questions about the Internet Explorer 11 Blocker Toolkit.
+
+>[!Important]
+>If you administer your company’s environment using an update management solution, such as Windows Server Update Services (WSUS) or System Center 2012 Configuration Manager, you don’t need to use the Internet Explorer 11 Blocker Toolkit. Update management solutions let you completely manage your Windows Updates and Microsoft Updates, including your Internet Explorer 11 deployment.
+
+- [Automatic updates delivery process]()
+
+- [How the Internet Explorer 11 Blocker Toolkit works]()
+
+- [Internet Explorer 11 Blocker Toolkit and other update services]()
+
+## Automatic Updates delivery process
+
+
+**Q. Which users will receive Internet Explorer 11 as an important update?**
+A. Users running either Windows 7 with Service Pack 1 (SP1) or the 64-bit version of Windows Server 2008 R2 with Service Pack 1 (SP1) will receive Internet Explorer 11 as an important update, if Automatic Updates are turned on. Windows Update is manually run. Automatic Updates will automatically download and install the Internet Explorer 11 files if it’s turned on. For more information about how Internet Explorer works with Automatic Updates and information about other deployment blocking options, see [Internet Explorer 11 Delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md).
+
+**Q. When is the Blocker Toolkit available?**
+A. The Blocker Toolkit is currently available from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=40722).
+
+**Q. What tools can I use to manage Windows Updates and Microsoft Updates in my company?**
+A. We encourage anyone who wants full control over their company’s deployment of Windows Updates and Microsoft Updates, to use [Windows Server Update Services (WSUS)](https://docs.microsoft.com/windows-server/administration/windows-server-update-services/get-started/windows-server-update-services-wsus), a free tool for users of Windows Server. You can also use the more advanced configuration management tool, [System Center 2012 Configuration Manager](https://technet.microsoft.com/library/gg682041.aspx).
+
+**Q. How long does the blocker mechanism work?**
+A. The Internet Explorer 11 Blocker Toolkit uses a registry key value to permanently turn off the automatic delivery of Internet Explorer 11. This behavior lasts as long as the registry key value isn’t removed or changed.
+
+**Q. Why should I use the Internet Explorer 11 Blocker Toolkit to stop delivery of Internet Explorer 11? Why can’t I just disable all of Automatic Updates?**
+A. Automatic Updates provide you with ongoing critical security and reliability updates. Turning this feature off can leave your computers more vulnerable. Instead, we suggest that you use an update management solution, such as WSUS, to fully control your environment while leaving this feature running, managing how and when the updates get to your user’s computers.
+
+The Internet Explorer 11 Blocker Toolkit safely allows Internet Explorer 11 to download and install in companies that can’t use WSUS, Configuration Manager, or
+other update management solution.
+
+**Q. Why don’t we just block URL access to Windows Update or Microsoft Update?**
+A. Blocking the Windows Update or Microsoft Update URLs also stops delivery of critical security and reliability updates for all of the supported versions of the Windows operating system; leaving your computers more vulnerable.
+
+How the Internet Explorer 11 Blocker Toolkit works
+
+**Q. How should I test the Internet Explorer 11 Blocker Toolkit in my company?**
+A. Because the toolkit only sets a registry key to turn on and off the delivery of Internet Explorer 11, there should be no additional impact or side effects to your environment. No additional testing should be necessary.
+
+**Q. What’s the registry key used to block delivery of Internet Explorer 11?**
+A. HKLM\\SOFTWARE\\Microsoft\\Internet Explorer\\Setup\\11.0
+
+**Q. What’s the registry key name and values?**
+The registry key name is **DoNotAllowIE11**, where:
+
+- A value of **1** turns off the automatic delivery of Internet Explorer 11 using Automatic Updates and turns off the Express install option.
+
+- Not providing a registry key, or using a value of anything other than **1**, lets the user install Internet Explorer 11 through Automatic Updates or a
+ manual update.
+
+**Q. Does the Internet Explorer 11 Blocker Toolkit stop users from manually installing Internet Explorer 11?**
+A. No. The Internet Explorer 11 Blocker Toolkit only stops computers from automatically installing Internet Explorer 11 through Automatic Updates. Users can still download and install Internet Explorer 11 from the Microsoft Download Center or from external media.
+
+**Q. Does the Internet Explorer 11 Blocker Toolkit stop users from automatically upgrading to Internet Explorer 11?**
+A. Yes. The Internet Explorer 11 Blocker Toolkit also prevents Automatic Updates from automatically upgrading a computer from Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 to Internet Explorer 11.
+
+**Q. How does the provided script work?**
+A. The script accepts one of two command line options:
+
+- **Block:** Creates the registry key that stops Internet Explorer 11 from installing through Automatic Updates.
+
+- **Unblock:** Removes the registry key that stops Internet Explorer 11 from installing through Automatic Updates.
+
+**Q. What’s the ADM template file used for?**
+A. The Administrative Template (.adm file) lets you import the new Group Policy environment and use Group Policy Objects to centrally manage all of the computers in your company.
+
+**Q. Is the tool localized?**
+A. No. The tool isn’t localized, it’s only available in English (en-us). However, it does work, without any modifications, on any language edition of the supported operating systems.
+
+## Internet Explorer 11 Blocker Toolkit and other update services
+
+**Q: Is there a version of the Internet Explorer Blocker Toolkit that will prevent automatic installation of IE11?**
+Yes. The IE11 Blocker Toolkit is available for download. For more information, see [Toolkit to Disable Automatic Delivery of IE11](https://go.microsoft.com/fwlink/p/?LinkId=328195) on the Microsoft Download Center.
+
+**Q. Does the Internet Explorer 11 blocking mechanism also block delivery of Internet Explorer 11 through update management solutions, like WSUS?**
+A. No. You can still deploy Internet Explorer 11 using one of the upgrade management solutions, even if the blocking mechanism is activated. The Internet Explorer 11 Blocker Toolkit is only intended for companies that don’t use upgrade management solutions.
+
+**Q. If WSUS is set to 'auto-approve' Update Rollup packages (this is not the default configuration), how do I stop Internet Explorer 11 from automatically installing throughout my company?**
+A. You only need to change your settings if:
+
+- You use WSUS to manage updates and allow auto-approvals for Update Rollup installation.
+
+ -and-
+
+- You have computers running either Windows 7 SP1 or Windows Server 2008 R2 (SP1) with Internet Explorer 8, Internet Explorer 9, or Internet Explorer 10 installed.
+
+ -and-
+
+- You don’t want to upgrade your older versions of Internet Explorer to Internet Explorer 11 right now.
+
+If these scenarios apply to your company, see [Internet Explorer 11 delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md) for more information on how to prevent automatic installation.
+
+
+## Additional resources
+
+- [Internet Explorer 11 Blocker Toolkit download](https://www.microsoft.com/download/details.aspx?id=40722)
+
+- [Internet Explorer 11 FAQ for IT pros](https://docs.microsoft.com/internet-explorer/ie11-faq/faq-for-it-pros-ie11)
+
+- [Internet Explorer 11 delivery through automatic updates](../ie11-deploy-guide/ie11-delivery-through-automatic-updates.md)
+
+- [Internet Explorer 11 deployment guide](https://docs.microsoft.com/internet-explorer/ie11-deploy-guide/index)
diff --git a/browsers/internet-explorer/ie11-faq/faq-ieak11.md b/browsers/internet-explorer/ie11-faq/faq-ieak11.md
new file mode 100644
index 0000000000..092cf003e6
--- /dev/null
+++ b/browsers/internet-explorer/ie11-faq/faq-ieak11.md
@@ -0,0 +1,117 @@
+---
+ms.localizationpriority: low
+ms.mktglfcycl: support
+ms.pagetype: security
+description: Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
+author: shortpatti
+ms.author: pashort
+ms.manager: elizapo
+ms.prod: ie11
+ms.assetid:
+title: IEAK 11 - Frequently Asked Questions
+ms.sitesec: library
+ms.date: 05/10/2018
+---
+
+# IEAK 11 - Frequently Asked Questions
+
+Get answers to commonly asked questions about the Internet Explorer Administration Kit 11 (IEAK 11), and find links to additional material you might find helpful.
+
+**What is IEAK 11?**
+
+IEAK 11 enables you to customize, brand, and distribute customized Internet Explorer 11 browser packages across an organization. Download the kit from the [Internet Explorer Administration Kit (IEAK) information and downloads](../ie11-ieak/ieak-information-and-downloads.md).
+
+**What are the supported operating systems?**
+
+You can customize and install IEAK 11 on the following supported operating systems:
+
+- Windows 8
+
+- Windows Server 2012
+
+- Windows 7 Service Pack 1 (SP1)
+
+- Windows Server 2008 R2 Service Pack 1 (SP1)
+
+>[!Note]
+>IEAK 11 does not support building custom packages for Windows RT.
+
+
+**What can I customize with IEAK 11?**
+
+The IEAK 11 enables you to customize branding and settings for Internet Explorer 11. For PCs running Windows 7, the custom package also includes the Internet Explorer executable.
+
+>[!Note]
+>Internet Explorer 11 is preinstalled on PCs running Windows 8. Therefore, the executable is not included in the customized package.
+
+**Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?**
+Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
+
+>[!Note]
+>IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. To download IEAK 11, see [Internet Explorer Administration Kit (IEAK) information and downloads](../ie11-ieak/ieak-information-and-downloads.md).
+
+**Q: Is there a version of the Internet Explorer Administration Kit (IEAK) supporting IE11?**
+Yes. The Internet Explorer Administration Kit 11 (IEAK 11) is available for download. IEAK 11 lets you create custom versions of IE11 for use in your organization. For more information, see the following resources:
+
+- [Internet Explorer Administration Kit Information and Downloads](https://go.microsoft.com/fwlink/p/?LinkId=214250) on the Internet Explorer TechCenter.
+
+- [Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](../ie11-ieak/index.md)
+
+**What are the different modes available for the Internet Explorer Customization Wizard?**
+The IEAK Customization Wizard displays pages based on your licensing mode selection, either **Internal** or **External**. For more information on IEAK Customization Wizard modes, see [What IEAK can do for you](../ie11-ieak/what-ieak-can-do-for-you.md).
+
+The following table displays which pages are available in IEAK 11, based on the licensing mode:
+
+| **Wizard Pages** | **External** | **Internal** |
+|-------------------------------------------|--------------|--------------|
+| Welcome to the IEAK | Yes | Yes |
+| File Locations | Yes | Yes |
+| Platform Selection | Yes | Yes |
+| Language Selection | Yes | Yes |
+| Package Type Selection | Yes | Yes |
+| Feature Selection | Yes | Yes |
+| Automatic Version Synchronization | Yes | Yes |
+| Custom Components | Yes | Yes |
+| Corporate Install | No | Yes |
+| User Experience | No | Yes |
+| Browser User Interface | Yes | Yes |
+| Search Providers | Yes | Yes |
+| Important URLs - Home page and Support | Yes | Yes |
+| Accelerators | Yes | Yes |
+| Favorites, Favorites Bar, and Feeds | Yes | Yes |
+| Browsing Options | No | Yes |
+| First Run Wizard and Welcome Page Options | Yes | Yes |
+| Compatibility View | Yes | Yes |
+| Connection Manager | Yes | Yes |
+| Connection Settings | Yes | Yes |
+| Automatic Configuration | No | Yes |
+| Proxy Settings | Yes | Yes |
+| Security and Privacy Settings | No | Yes |
+| Add a Root Certificate | Yes | No |
+| Programs | Yes | Yes |
+| Additional Settings | No | Yes |
+| Wizard Complete | Yes | Yes |
+
+
+**Q. Can IEAK 11 build custom Internet Explorer 11 packages in languages other than the language of the in-use IEAK 11 version?**
+Yes. You can use IEAK 11 to build custom Internet Explorer 11 packages in any of the supported 24 languages. You'll select the language for the custom package on the Language Selection page of the customization wizard.
+
+IEAK 11 is available in 24 languages but can build customized Internet Explorer 11 packages in all languages of the supported operating systems. Select a language below and download IEAK 11 from the download center:
+| | | |
+|---------|---------|---------|
+|[English](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/en-us/ieak.msi) |[French](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fr-fr/ieak.msi) |[Norwegian (Bokmål)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nb-no/ieak.msi) |
+|[Arabic](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ar-sa/ieak.msi) |[Chinese (Simplified)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-cn/ieak.msi) |[Chinese(Traditional)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-tw/ieak.msi) |
+|[Czech](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/cs-cz/ieak.msi) |[Danish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/da-dk/ieak.msi) |[Dutch](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nl-nl/ieak.msi) |
+|[Finnish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fi-fi/ieak.msi) |[German](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/de-de/ieak.msi) |[Greek](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/el-gr/ieak.msi) |
+|[Hebrew](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/he-il/ieak.msi) |[Hungarian](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/hu-hu/ieak.msi) |[Italian](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/it-it/ieak.msi) |
+|[Japanese](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ja-jp/ieak.msi) |[Korean](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ko-kr/ieak.msi) |[Polish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pl-pl/ieak.msi) |
+|[Portuguese (Brazil)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-br/ieak.msi) |[Portuguese (Portugal)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-pt/ieak.msi) |[Russian](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ru-ru/ieak.msi) |
+|[Spanish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/es-es/ieak.msi) |[Swedish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/sv-se/ieak.msi) |[Turkish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/tr-tr/ieak.msi) |
+
+
+## Additional resources
+
+[Download IEAK 11](https://technet.microsoft.com/microsoft-edge/bb219517)
+[IEAK 11 overview](https://technet.microsoft.com/microsoft-edge/dn532244)
+[IEAK 11 product documentation](https://docs.microsoft.com/internet-explorer/ie11-ieak/index)
+[IEAK 11 licensing guidelines](../ie11-ieak/licensing-version-and-features-ieak11.md)
diff --git a/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md b/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md
new file mode 100644
index 0000000000..ad6689257a
--- /dev/null
+++ b/browsers/internet-explorer/ie11-ieak/ieak-information-and-downloads.md
@@ -0,0 +1,46 @@
+---
+ms.localizationpriority: low
+ms.mktglfcycl: support
+ms.pagetype: security
+description: The Internet Explorer Administration Kit (IEAK) simplifies the creation, deployment, and management of customized Internet Explorer packages. You can use the IEAK to configure the out-of-box Internet Explorer experience or to manage user settings after Internet Explorer deployment.
+author: shortpatti
+ms.author: pashort
+ms.manager: elizapo
+ms.prod: ie11
+ms.assetid:
+title: Internet Explorer Administration Kit (IEAK) information and downloads
+ms.sitesec: library
+ms.date: 05/10/2018
+---
+
+# Internet Explorer Administration Kit (IEAK) information and downloads
+
+The Internet Explorer Administration Kit (IEAK) simplifies the creation, deployment, and management of customized Internet Explorer packages. You can use the IEAK to configure the out-of-box Internet Explorer experience or to manage user settings after Internet Explorer deployment. To find more information on the IEAK, see [What IEAK can do for you](what-ieak-can-do-for-you.md).
+
+## Internet Explorer Administration Kit 11 (IEAK 11)
+
+[IEAK 11 documentation](index.md)
+
+[IEAK 11 licensing guidelines](licensing-version-and-features-ieak11.md)
+
+[IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.md)
+
+[Internet Explorer Administration Kit 11 (IEAK 11) - Administrator's Guide](before-you-create-custom-pkgs-ieak11.md)
+
+## Download IEAK
+
+To download, choose to **Open** the download or **Save** it to your hard drive first.
+
+
+| | | |
+|---------|---------|---------|
+|[English](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/en-us/ieak.msi) |[French](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fr-fr/ieak.msi) |[Norwegian (Bokmål)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nb-no/ieak.msi) |
+|[Arabic](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ar-sa/ieak.msi) |[German](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/de-de/ieak.msi) |[Polish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pl-pl/ieak.msi) |
+|[Chinese (Simplified)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-cn/ieak.msi) |[Greek](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/el-gr/ieak.msi) |[Portuguese (Brazil)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-br/ieak.msi) |
+|[Chinese (Traditional)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/zh-tw/ieak.msi) |[Hebrew](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/he-il/ieak.msi) |[Portuguese (Portugal)](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/pt-pt/ieak.msi) |
+|[Czech](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/cs-cz/ieak.msi) |[Hungarian](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/hu-hu/ieak.msi) |[Russian](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ru-ru/ieak.msi) |
+|[Danish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/da-dk/ieak.msi) |[Italian](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/it-it/ieak.msi) |[Spanish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/es-es/ieak.msi) |
+|[Dutch](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/nl-nl/ieak.msi) |[Japanese](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ja-jp/ieak.msi) |[Swedish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/sv-se/ieak.msi) |
+|[Finnish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/fi-fi/ieak.msi) |[Korean](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/ko-kr/ieak.msi) |[Turkish](http://download.microsoft.com/download/A/B/1/AB1954BF-8B20-4F01-808A-FE5EE5269F08/MSI/tr-tr/ieak.msi) |
+
+
diff --git a/browsers/internet-explorer/ie11-ieak/index.md b/browsers/internet-explorer/ie11-ieak/index.md
index b0edeae7c4..998e7264d7 100644
--- a/browsers/internet-explorer/ie11-ieak/index.md
+++ b/browsers/internet-explorer/ie11-ieak/index.md
@@ -17,38 +17,9 @@ The Internet Explorer Administration Kit (IEAK) simplifies the creation, deploym
Use this guide to learn about the several options and processes you'll need to consider while you're using the Internet Explorer Administration Kit 11 (IEAK 11) to customize, deploy, and manage Internet Explorer 11 for your employee's devices.
->[!IMPORTANT}
+>[!IMPORTANT]
>Because this content isn't intended to be a step-by-step guide, not all of the steps are necessary.
-## IEAK 11 users
-Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
-
-IEAK 10 and newer includes the ability to install using one of the following installation modes:
-- Internal
-- External
-
->[!NOTE]
->IEAK 11 works in network environments, with or without Microsoft Active Directory service.
-
-### Corporations
-IEAK helps corporate administrators establish version control, centrally distribute and manage browser installation, configure automatic connection profiles, and customize large portions of Internet Explorer, including features, security, communications settings, and other important functionality.
-
-Corporate administrators install IEAK using Internal mode (for Internet Explorer 10 or newer) or Corporate mode (for Internet Explorer 9 or older).
-
-### Internet service providers
-IEAK helps ISPs customize, deploy and distribute, add third-party add-ons, search providers, and custom components, as well as include web slices and accelerators all as part of a custom Internet Explorer installation package.
-
-ISPs install IEAK using External mode (for Internet Explorer 10 or newer) or Internet Service Provider (ISP) mode (for Internet Explorer 9 or older).
-
-### Internet content providers
-IEAK helps ICPs customize the appearance of Internet Explorer and its Setup program, including letting you add your company name or specific wording to the Title bar, set up a customer support webpage, set up the user home page and search providers, add links to the Favorites and the Explorer bars, add optional components, web slices and accelerators, and determine which compatibility mode Internet Explorer should use.
-
-ICPs install IEAK using External mode (for Internet Explorer 10 or newer) or Internet Content Provider (ICP) mode (for Internet Explorer 9 or older)
-
-### Independent software vendors
-IEAK helps ISVs distribute (and redistribute) a custom version of Internet Explorer that can include custom components, programs, and controls (like the web browser control) that you create for your users. ISVs can also determine home pages, search providers, and add websites to the Favorites bar.
-
-ISVs install IEAK using External mode (for Internet Explorer 10 or newer) or Internet Content Provider (ICP) mode (for Internet Explorer 9 or older).
## Included technology
IEAK 11 includes the following technology:
@@ -68,7 +39,10 @@ IE11 and IEAK 11 offers differing experiences between Windows 7 and Windows 8.1
|Internet Explorer Customization Wizard 11 |Step-by-step wizard screens that help you create custom IE11 installation packages. |
## Related topics
+- [IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.md)
+- [Download IEAK 11](ieak-information-and-downloads.md)
+- [IEAK 11 administrators guide](https://docs.microsoft.com/internet-explorer/ie11-ieak/index)
+- [IEAK 11 licensing guidelines](licensing-version-and-features-ieak11.md)
- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.md)
- [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](../ie11-deploy-guide/index.md)
-- [Microsoft Edge - Deployment Guide for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760643)
-
+- [Microsoft Edge - Deployment Guide for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760643)
\ No newline at end of file
diff --git a/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md b/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md
new file mode 100644
index 0000000000..afa8430977
--- /dev/null
+++ b/browsers/internet-explorer/ie11-ieak/what-ieak-can-do-for-you.md
@@ -0,0 +1,66 @@
+---
+ms.localizationpriority: low
+ms.mktglfcycl: support
+ms.pagetype: security
+description: Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
+author: shortpatti
+ms.author: pashort
+ms.manager: elizapo
+ms.prod: ie11
+ms.assetid:
+title: What IEAK can do for you
+ms.sitesec: library
+ms.date: 05/10/2018
+---
+
+# What IEAK can do for you
+
+Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
+
+IEAK 10 and newer includes the ability to install using one of the following installation modes:
+
+- Internal
+
+- External
+
+## IEAK 11 users
+Internet Explorer Administration Kit (IEAK) helps corporations, Internet service providers (ISPs), Internet content providers (ICPs), and independent software vendors (ISVs) to deploy and manage web-based solutions.
+
+IEAK 10 and newer includes the ability to install using one of the following installation modes:
+- Internal
+- External
+
+>[!NOTE]
+>IEAK 11 works in network environments, with or without Microsoft Active Directory service.
+
+
+### Corporations
+IEAK helps corporate administrators establish version control, centrally distribute and manage browser installation, configure automatic connection profiles, and customize large portions of Internet Explorer, including features, security, communications settings, and other important functionality.
+
+Corporate administrators install IEAK using Internal mode (for Internet Explorer 10 or newer) or Corporate mode (for Internet Explorer 9 or older).
+
+### Internet service providers
+IEAK helps ISPs customize, deploy and distribute, add third-party add-ons, search providers, and custom components, as well as include web slices and accelerators all as part of a custom Internet Explorer installation package.
+
+ISPs install IEAK using External mode (for Internet Explorer 10 or newer) or Internet Service Provider (ISP) mode (for Internet Explorer 9 or older).
+
+### Internet content providers
+IEAK helps ICPs customize the appearance of Internet Explorer and its Setup program, including letting you add your company name or specific wording to the Title bar, set up a customer support webpage, set up the user home page and search providers, add links to the Favorites and the Explorer bars, add optional components, web slices and accelerators, and determine which compatibility mode Internet Explorer should use.
+
+ICPs install IEAK using External mode (for Internet Explorer 10 or newer) or Internet Content Provider (ICP) mode (for Internet Explorer 9 or older)
+
+### Independent software vendors
+IEAK helps ISVs distribute (and redistribute) a custom version of Internet Explorer that can include custom components, programs, and controls (like the web browser control) that you create for your users. ISVs can also determine home pages, search providers, and add websites to the Favorites bar.
+
+ISVs install IEAK using External mode (for Internet Explorer 10 or newer) or Internet Content Provider (ICP) mode (for Internet Explorer 9 or older).
+
+## Additional resources
+
+- [IEAK 11 - Frequently Asked Questions](../ie11-faq/faq-ieak11.md)
+- [Download IEAK 11](ieak-information-and-downloads.md)
+- [IEAK 11 overview](index.md)
+- [IEAK 11 administrators guide](https://docs.microsoft.com/internet-explorer/ie11-ieak/index)
+- [IEAK 11 licensing guidelines](licensing-version-and-features-ieak11.md)
+- [Internet Explorer 11 - FAQ for IT Pros](../ie11-faq/faq-for-it-pros-ie11.md)
+- [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](../ie11-deploy-guide/index.md)
+- [Microsoft Edge - Deployment Guide for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760643)
\ No newline at end of file
diff --git a/devices/hololens/change-history-hololens.md b/devices/hololens/change-history-hololens.md
index 6b277cfa47..f6aa6b8e4b 100644
--- a/devices/hololens/change-history-hololens.md
+++ b/devices/hololens/change-history-hololens.md
@@ -7,14 +7,24 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
-ms.date: 04/30/2018
+ms.date: 05/07/2018
---
# Change history for Microsoft HoloLens documentation
This topic lists new and updated topics in the [Microsoft HoloLens documentation](index.md).
+## May 2018
+
+New or changed topic | Description
+--- | ---
+[Get ready to preview new mixed reality apps for HoloLens](hololens-public-preview-apps.md) | New
+
+
+
## Windows 10 Holographic for Business, version 1803
The topics in this library have been updated for Windows 10 Holographic for Business, version 1803. The following new topics have been added:
diff --git a/devices/hololens/hololens-encryption.md b/devices/hololens/hololens-encryption.md
index a673506578..c600771609 100644
--- a/devices/hololens/hololens-encryption.md
+++ b/devices/hololens/hololens-encryption.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 12/20/2017
---
diff --git a/devices/hololens/hololens-enroll-mdm.md b/devices/hololens/hololens-enroll-mdm.md
index db28187680..fde1f15636 100644
--- a/devices/hololens/hololens-enroll-mdm.md
+++ b/devices/hololens/hololens-enroll-mdm.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
---
diff --git a/devices/hololens/hololens-install-apps.md b/devices/hololens/hololens-install-apps.md
index badec3873c..d33b78b2a9 100644
--- a/devices/hololens/hololens-install-apps.md
+++ b/devices/hololens/hololens-install-apps.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 12/20/2017
---
diff --git a/devices/hololens/hololens-kiosk.md b/devices/hololens/hololens-kiosk.md
index d17932da87..9f27559d39 100644
--- a/devices/hololens/hololens-kiosk.md
+++ b/devices/hololens/hololens-kiosk.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
---
diff --git a/devices/hololens/hololens-multiple-users.md b/devices/hololens/hololens-multiple-users.md
index b4ed3c8b1c..ff75a10254 100644
--- a/devices/hololens/hololens-multiple-users.md
+++ b/devices/hololens/hololens-multiple-users.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
---
@@ -21,7 +23,7 @@ A HoloLens device can be shared by multiple Azure Active Directory (Azure AD) ac
During setup, you must select **My work or school owns it** and sign in with an Azure AD account. After setup, ensure that **Other People** appears in **Settings** > **Accounts**.
-Other people can use the HoloLens device by signing in with their Azure AD account credentials. To switch users, press the power button once to go to standby and then press the power button again to return to the lock screen, or select the user tile on the upper right of th epins panel to sign out the current user.
+Other people can use the HoloLens device by signing in with their Azure AD account credentials. To switch users, press the power button once to go to standby and then press the power button again to return to the lock screen, or select the user tile on the upper right of the pins panel to sign out the current user.
>[!NOTE]
>Each subsequent user will need to perform [Calibration](https://developer.microsoft.com/windows/mixed-reality/calibration) in order to set their correct interpupillary distance (PD) for the device while signed in.
diff --git a/devices/hololens/hololens-provisioning.md b/devices/hololens/hololens-provisioning.md
index 8054d4f82d..107374e956 100644
--- a/devices/hololens/hololens-provisioning.md
+++ b/devices/hololens/hololens-provisioning.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
---
diff --git a/devices/hololens/hololens-public-preview-apps.md b/devices/hololens/hololens-public-preview-apps.md
index 9d4a7d277a..c01de8249e 100644
--- a/devices/hololens/hololens-public-preview-apps.md
+++ b/devices/hololens/hololens-public-preview-apps.md
@@ -6,46 +6,48 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: alhopper
+ms.author: alhopper
+ms.topic: article
ms.localizationpriority: medium
-ms.date: 05/07/2018
+ms.date: 05/08/2018
---
# Get ready to preview new mixed reality apps for HoloLens
Microsoft has just announced two new mixed reality apps coming to HoloLens: Microsoft Remote Assist and Microsoft Layout.
-On May 22, 2018, these apps will be available to download for free for a limited time from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store). At that time you'll be able to distribute the apps across your organization as part of a public preview. In the meantime, here's what you need to know to prepare for the public preview of each app, to make sure your roll-out is smooth and seamless.
+On May 22, 2018, these apps will be available to download for free for a limited time from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store) as part of a public preview. During public preview, you'll be able to distribute the apps across your organization. In the meantime, here's what you need to know to prepare for the public preview of each app, to make sure your roll-out is smooth and seamless.
## Microsoft Remote Assist
Microsoft Remote Assist enables collaboration in mixed reality to solve problems faster. Firstline workers can collaborate remotely with heads-up, hands-free video calling, image sharing, and mixed reality annotations. They can share what they see with an expert on Microsoft Teams, while staying hands-on to solve problems and complete tasks together, faster.
-Below, you'll find the technical requirements you'll need to meet in order to distribute Microsoft Remote Assist throughout your organization when it's available from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store) on May 22, 2018.
+Below are the technical requirements to distribute Microsoft Remote Assist throughout your organization when it's available from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store) on May 22, 2018.
### Device requirements
| Device | OS requirements | Details |
|:---------------------------|:----------------------------------|:-----------------------------------------------------------|
-| HoloLens | RS1, build 10.0.14393.0 | See [Manage updates to HoloLens](https://docs.microsoft.com/en-us/HoloLens/hololens-updates) for instructions on using Windows Update for Business, MDM, and Windows Server Update Service (WSUS) to deploy updates to HoloLens. |
+| HoloLens | Build 10.0.14393.0 or above | See [Manage updates to HoloLens](https://docs.microsoft.com/en-us/HoloLens/hololens-updates) for instructions on using Windows Update for Business, MDM, and Windows Server Update Service (WSUS) to deploy updates to HoloLens. |
| Windows 10 PC (optional) | Any Windows 10 build | You can use a Windows 10 PC to collaborate with the HoloLens. |
| Mobile device (optional) | Android or iOS | You can use a mobile device to collaborate with the HoloLens. Inking, annotations, and image insertion are not currently available on mobile. |
> [!Note]
-> RS1 OS build 10.0.14393.0 is the minimum HoloLens build that supports Remote Assist. We recommend updating the HoloLens to newer versions when they are available.
+> HoloLens build 10.0.14393.0 is the minimum that supports Remote Assist. We recommend updating the HoloLens to newer versions when they are available.
### Licensing & product requirements
| Product required | Details | Learn more |
|:----------------------------------|:------------------|:------------------|
-| Azure Active Directory (Azure AD) | Required to log users into the Remote Assist app through Microsoft Teams. Also required for app distribution through the [Microsoft Store for Business](https://docs.microsoft.com/en-us/microsoft-store/sign-up-microsoft-store-for-business). If you choose not to distribute the app through the Microsoft Store for Business, users can also install Remote Assist on a HoloLens or PC from the [Microsoft store](https://www.microsoft.com/en-us/store/apps) using their Microsoft Account credentials (MSA). | [Get started with Azure AD](https://docs.microsoft.com/en-us/azure/active-directory/get-started-azure-ad) |
-| Microsoft Teams | Microsoft Teams is the backbone that facilitates communication in Remote Assist. All devices that will make calls to the HoloLens will need to have Microsoft Teams installed. | [Overview of Microsoft Teams](https://docs.microsoft.com/en-us/MicrosoftTeams/teams-overview) |
-| Microsoft Office 365 | Because Microsoft Teams is part of Office 365, all users who will make calls from their PC/phone to the HoloLens will need an Office 365 license. | [Office 365 licensing for Microsoft Teams](https://docs.microsoft.com/en-us/MicrosoftTeams/office-365-licensing) |
+| Azure Active Directory (Azure AD) | Required to log users into the Remote Assist app through Microsoft Teams. Also required for app distribution through the [Microsoft Store for Business](https://docs.microsoft.com/en-us/microsoft-store/sign-up-microsoft-store-for-business). If you choose not to distribute the app through the Microsoft Store for Business, users can alternately install Remote Assist on a HoloLens or PC from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) using their Microsoft Account credentials (MSA). | [Get started with Azure AD](https://docs.microsoft.com/en-us/azure/active-directory/get-started-azure-ad) |
+| Microsoft Teams | Microsoft Teams facilitates communication in Remote Assist. Microsoft Teams must be installed on any device that will make calls to the HoloLens. | [Overview of Microsoft Teams](https://docs.microsoft.com/en-us/MicrosoftTeams/teams-overview) |
+| Microsoft Office 365 | Because Microsoft Teams is part of Office 365, each user who will make calls from their PC/phone to the HoloLens will need an Office 365 license. | [Office 365 licensing for Microsoft Teams](https://docs.microsoft.com/en-us/MicrosoftTeams/office-365-licensing) |
### Network requirements
-1.5 MB/s is the recommended bandwidth for optimal performance of Microsoft Remote Assist. Though audio/video calls may be possible in environments with reduced bandwidth, you may experience HoloLens feature degradation, limiting the user experience. To test your company’s network bandwidth, we suggest following the steps outlined below:
+1.5 MB/s is the recommended bandwidth for optimal performance of Microsoft Remote Assist. Though audio/video calls may be possible in environments with reduced bandwidth, you may experience HoloLens feature degradation, limiting the user experience. To test your company’s network bandwidth, follow these steps:
1. Have a mobile Teams user (iOS or Android) video call a desktop Teams user.
- 2. Once the video call has been successfully connected between user 1 and 2, add another separate video call between a 3rd and 4th user, and another for a 5th and 6th user.
+ 2. Add another separate video call between a 3rd and 4th user, and another for a 5th and 6th user.
3. Continue adding video callers to stress test your network bandwidth until confident that multiple users can successfully connect on video calls at the same time.
See [Preparing your organization's network for Microsoft Teams](https://docs.microsoft.com/en-us/MicrosoftTeams/prepare-network) to learn more.
@@ -54,21 +56,21 @@ See [Preparing your organization's network for Microsoft Teams](https://docs.mic
Bring designs from concept to completion with confidence and speed using Microsoft Layout. Import 3D models to easily create room layouts in real-world scale. Experience designs as high-quality holograms in physical or virtual space and edit in real time. With Microsoft Layout, see ideas in context, saving valuable time and money.
-Below, you'll find the device options, and technical requirements, you'll need to consider in order to distribute Layout throughout your organization when it's available from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store) on May 22, 2018.
+Below you'll find the device options, and technical requirements to consider, before distributing Layout throughout your organization when it's available from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store) on May 22, 2018.
### Device options
-You can use Microsoft Layout with a HoloLens, or with a Windows Mixed Reality immersive headset with motion controllers.
+You can use Microsoft Layout with a HoloLens, or with a Windows Mixed Reality headset with motion controllers.
#### HoloLens requirements
| OS requirements | Details |
|:----------------------------------|:-----------------------------------------------------------|
-| HoloLens, with RS4 build | This build will be available as a HoloLens update on May 22, to align with the app release. Instructions for upgrading to the RS4 OS build are forthcoming. |
+| Build 10.0.17134.77 or above | This build will be available as a HoloLens update on May 22, to align with the app release. Instructions for upgrading to this build are forthcoming. |
-Alternately, you can get started testing out the RS4 build in advance of May 22. See [HoloLens RS4 Preview](https://docs.microsoft.com/en-us/windows/mixed-reality/hololens-rs4-preview) for instructions on flashing the RS4 build to your device. Be advised that doing so will erase all content on the device, and will put the device on track to receive future pre-released versions of the OS which may exhibit bugs and issues. We recommend using preview builds for testing only.
+Alternately, you can get started testing out HoloLens build 10.0.17134.77 in advance of May 22. See [HoloLens RS4 Preview](https://docs.microsoft.com/en-us/windows/mixed-reality/hololens-rs4-preview) for instructions on flashing the upcoming build to your device. Be advised that doing so will erase all content on the device, and will put the device on track to receive future pre-released versions of the OS which may exhibit bugs and issues. We recommend using preview builds for testing only.
-#### Windows Mixed Reality immersive headset requirements
+#### Windows Mixed Reality headset requirements
| OS requirements | Details |
|:----------------------------------------------|:-----------------------------------------------------------|
@@ -83,7 +85,7 @@ Have the following technical requirements in place to start using Microsoft Layo
|:----------------------------------|:------------------|:------------------|
| Azure Active Directory (Azure AD) | Required for app distribution through the [Microsoft Store for Business](https://docs.microsoft.com/en-us/microsoft-store/sign-up-microsoft-store-for-business). If you choose not to distribute the app through the Microsoft Store for Business, users can also install Layout on a HoloLens or PC from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) using their Microsoft Account credentials (MSA). | [Get started with Azure AD](https://docs.microsoft.com/en-us/azure/active-directory/get-started-azure-ad) |
| Network connectivity | Internet access is required to download the app, and utilize all of its features. There are no bandwidth requirements. | |
-| Apps for sharing | Video calling or screen sharing requires a separate app, such as Microsoft Remote Assist on HoloLens, or Skype or Skype for Business on Windows Mixed Reality headsets.
A Windows 10 PC that meets the Windows Mixed Reality Ultra specifications is also required for video calling or screen sharing when using Layout with a Windows Mixed Reality headset. | [Remote Assist](#remote-assist)
[Windows Mixed Reality PC hardware guidelines](https://support.microsoft.com/en-us/help/4039260/windows-10-mixed-reality-pc-hardware-guidelines) |
+| Apps for sharing | Video calling or screen sharing requires a separate app, such as Microsoft Remote Assist on HoloLens, or Skype or Skype for Business on Windows Mixed Reality headsets.
A Windows 10 PC that meets the Windows Mixed Reality Ultra specifications is also required for video calling or screen sharing when using Layout with a Windows Mixed Reality headset. | [Remote Assist](#microsoft-remote-assist)
[Windows Mixed Reality PC hardware guidelines](https://support.microsoft.com/en-us/help/4039260/windows-10-mixed-reality-pc-hardware-guidelines) |
| Import Tool for Microsoft Layout | The Import Tool for Microsoft Layout is a companion app for Layout that makes model optimization and management easy. The Import Tool is required to transfer existing 3D models from your PC to Microsoft Layout, for viewing and editing on HoloLens or a Windows Mixed Reality headset. To import 3D models, users must download and launch the Import Tool for Microsoft Layout on their PC, available for free from the [Microsoft Store](https://www.microsoft.com/en-us/store/apps) and [Microsoft Store for Business](https://businessstore.microsoft.com/en-us/store) starting May 22nd. The Import Tool is also required to transfer Visio space dimensions to the HoloLens or Windows Mixed Reality headset. | |
### Visio Add-in for Microsoft Layout
diff --git a/devices/hololens/hololens-requirements.md b/devices/hololens/hololens-requirements.md
index c6061e863f..d9d44b45ba 100644
--- a/devices/hololens/hololens-requirements.md
+++ b/devices/hololens/hololens-requirements.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
---
diff --git a/devices/hololens/hololens-setup.md b/devices/hololens/hololens-setup.md
index 3fa1130923..513cc01e01 100644
--- a/devices/hololens/hololens-setup.md
+++ b/devices/hololens/hololens-setup.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 07/27/2017
---
diff --git a/devices/hololens/hololens-updates.md b/devices/hololens/hololens-updates.md
index e7e0c89ac7..7edc38eadb 100644
--- a/devices/hololens/hololens-updates.md
+++ b/devices/hololens/hololens-updates.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
---
diff --git a/devices/hololens/hololens-upgrade-enterprise.md b/devices/hololens/hololens-upgrade-enterprise.md
index 3beed8592e..8a242444e4 100644
--- a/devices/hololens/hololens-upgrade-enterprise.md
+++ b/devices/hololens/hololens-upgrade-enterprise.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
---
diff --git a/devices/hololens/hololens-whats-new.md b/devices/hololens/hololens-whats-new.md
index 00e18e5b12..ca33540e0c 100644
--- a/devices/hololens/hololens-whats-new.md
+++ b/devices/hololens/hololens-whats-new.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 04/30/2018
---
diff --git a/devices/hololens/index.md b/devices/hololens/index.md
index e362576abb..e55d7d272d 100644
--- a/devices/hololens/index.md
+++ b/devices/hololens/index.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: hololens, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.localizationpriority: medium
ms.date: 05/07/2018
---
diff --git a/devices/surface-hub/accessibility-surface-hub.md b/devices/surface-hub/accessibility-surface-hub.md
index 0e4f926262..3fbf1e269e 100644
--- a/devices/surface-hub/accessibility-surface-hub.md
+++ b/devices/surface-hub/accessibility-surface-hub.md
@@ -9,6 +9,7 @@ ms.pagetype: surfacehub
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 08/16/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/admin-group-management-for-surface-hub.md b/devices/surface-hub/admin-group-management-for-surface-hub.md
index cd6644429f..2803f47304 100644
--- a/devices/surface-hub/admin-group-management-for-surface-hub.md
+++ b/devices/surface-hub/admin-group-management-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, security
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
index 4f299c72fd..36df6680a5 100644
--- a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
+++ b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 01/10/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md b/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md
index 3ea97cffed..cd10c695db 100644
--- a/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md
+++ b/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/change-history-surface-hub.md b/devices/surface-hub/change-history-surface-hub.md
index c3ab437724..65ebd4f756 100644
--- a/devices/surface-hub/change-history-surface-hub.md
+++ b/devices/surface-hub/change-history-surface-hub.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 03/06/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/change-surface-hub-device-account.md b/devices/surface-hub/change-surface-hub-device-account.md
index 5b3d1e35db..9e7f3c004d 100644
--- a/devices/surface-hub/change-surface-hub-device-account.md
+++ b/devices/surface-hub/change-surface-hub-device-account.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/connect-and-display-with-surface-hub.md b/devices/surface-hub/connect-and-display-with-surface-hub.md
index dd8d127472..225d3e235a 100644
--- a/devices/surface-hub/connect-and-display-with-surface-hub.md
+++ b/devices/surface-hub/connect-and-display-with-surface-hub.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/create-a-device-account-using-office-365.md b/devices/surface-hub/create-a-device-account-using-office-365.md
index 5fc4dd60a1..cc1d0ec9cd 100644
--- a/devices/surface-hub/create-a-device-account-using-office-365.md
+++ b/devices/surface-hub/create-a-device-account-using-office-365.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 05/04/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md
index cc5d233b08..cc60ff723c 100644
--- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md
+++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 03/06/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/device-reset-surface-hub.md b/devices/surface-hub/device-reset-surface-hub.md
index a595ea198c..bf70666e38 100644
--- a/devices/surface-hub/device-reset-surface-hub.md
+++ b/devices/surface-hub/device-reset-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md b/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
index 61120d6a25..40c7b012de 100644
--- a/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
+++ b/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: isaiahng
ms.author: jdecker
+ms.topic: article
ms.date: 11/01/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/enable-8021x-wired-authentication.md b/devices/surface-hub/enable-8021x-wired-authentication.md
index e23860d5ba..ff69e90418 100644
--- a/devices/surface-hub/enable-8021x-wired-authentication.md
+++ b/devices/surface-hub/enable-8021x-wired-authentication.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 11/15/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md b/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md
index 1c936f687a..40f93af750 100644
--- a/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md
+++ b/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/finishing-your-surface-hub-meeting.md b/devices/surface-hub/finishing-your-surface-hub-meeting.md
index 7ef7ca904e..bfc104fa22 100644
--- a/devices/surface-hub/finishing-your-surface-hub-meeting.md
+++ b/devices/surface-hub/finishing-your-surface-hub-meeting.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/first-run-program-surface-hub.md b/devices/surface-hub/first-run-program-surface-hub.md
index b0d0d183ef..d488122210 100644
--- a/devices/surface-hub/first-run-program-surface-hub.md
+++ b/devices/surface-hub/first-run-program-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md
index b464e456dc..eabfb6c6cd 100644
--- a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md
+++ b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 04/12/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/index.md b/devices/surface-hub/index.md
index 06c8519cfc..e966b4a42f 100644
--- a/devices/surface-hub/index.md
+++ b/devices/surface-hub/index.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 09/07/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/install-apps-on-surface-hub.md b/devices/surface-hub/install-apps-on-surface-hub.md
index b0737d1f6b..69f12c9881 100644
--- a/devices/surface-hub/install-apps-on-surface-hub.md
+++ b/devices/surface-hub/install-apps-on-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, store
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 10/20/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/local-management-surface-hub-settings.md b/devices/surface-hub/local-management-surface-hub-settings.md
index c59fd9ac8a..9bff610bcf 100644
--- a/devices/surface-hub/local-management-surface-hub-settings.md
+++ b/devices/surface-hub/local-management-surface-hub-settings.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md
index d81d9cfc72..a21025c060 100644
--- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md
+++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, mobility
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 03/07/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/manage-surface-hub-settings.md b/devices/surface-hub/manage-surface-hub-settings.md
index c79f175559..a4a53440fb 100644
--- a/devices/surface-hub/manage-surface-hub-settings.md
+++ b/devices/surface-hub/manage-surface-hub-settings.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/manage-surface-hub.md b/devices/surface-hub/manage-surface-hub.md
index 612bdeb704..6f90968880 100644
--- a/devices/surface-hub/manage-surface-hub.md
+++ b/devices/surface-hub/manage-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 01/17/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/manage-windows-updates-for-surface-hub.md b/devices/surface-hub/manage-windows-updates-for-surface-hub.md
index 0de4ed8d77..d3e78f1ff7 100644
--- a/devices/surface-hub/manage-windows-updates-for-surface-hub.md
+++ b/devices/surface-hub/manage-windows-updates-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 11/03/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/miracast-over-infrastructure.md b/devices/surface-hub/miracast-over-infrastructure.md
index 341ce3a1d0..a6a44e2d03 100644
--- a/devices/surface-hub/miracast-over-infrastructure.md
+++ b/devices/surface-hub/miracast-over-infrastructure.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 08/03/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/miracast-troubleshooting.md b/devices/surface-hub/miracast-troubleshooting.md
index f8843ffe57..3c6c085881 100644
--- a/devices/surface-hub/miracast-troubleshooting.md
+++ b/devices/surface-hub/miracast-troubleshooting.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/monitor-surface-hub.md b/devices/surface-hub/monitor-surface-hub.md
index 7fe0d6aeff..6b10bdc4c5 100644
--- a/devices/surface-hub/monitor-surface-hub.md
+++ b/devices/surface-hub/monitor-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md b/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md
index 7c6a90015d..6b3031daf5 100644
--- a/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md
+++ b/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 04/13/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md b/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md
index 9456eb9891..dd4e285e06 100644
--- a/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md
+++ b/devices/surface-hub/on-premises-deployment-surface-hub-multi-forest.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/online-deployment-surface-hub-device-accounts.md b/devices/surface-hub/online-deployment-surface-hub-device-accounts.md
index 6a314c317a..c253d82d11 100644
--- a/devices/surface-hub/online-deployment-surface-hub-device-accounts.md
+++ b/devices/surface-hub/online-deployment-surface-hub-device-accounts.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 02/21/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/password-management-for-surface-hub-device-accounts.md b/devices/surface-hub/password-management-for-surface-hub-device-accounts.md
index 859034da95..c17507564e 100644
--- a/devices/surface-hub/password-management-for-surface-hub-device-accounts.md
+++ b/devices/surface-hub/password-management-for-surface-hub-device-accounts.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, security
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/physically-install-your-surface-hub-device.md b/devices/surface-hub/physically-install-your-surface-hub-device.md
index dc9cdf25ad..fb4c19723b 100644
--- a/devices/surface-hub/physically-install-your-surface-hub-device.md
+++ b/devices/surface-hub/physically-install-your-surface-hub-device.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, readiness
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md
index cef7042de1..5ac57b764e 100644
--- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md
+++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 12/04/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/provisioning-packages-for-surface-hub.md b/devices/surface-hub/provisioning-packages-for-surface-hub.md
index b357f97f9c..8646da068a 100644
--- a/devices/surface-hub/provisioning-packages-for-surface-hub.md
+++ b/devices/surface-hub/provisioning-packages-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/remote-surface-hub-management.md b/devices/surface-hub/remote-surface-hub-management.md
index e57046e72c..d4b921b254 100644
--- a/devices/surface-hub/remote-surface-hub-management.md
+++ b/devices/surface-hub/remote-surface-hub-management.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/save-bitlocker-key-surface-hub.md b/devices/surface-hub/save-bitlocker-key-surface-hub.md
index a872c380d5..5fedc2bf80 100644
--- a/devices/surface-hub/save-bitlocker-key-surface-hub.md
+++ b/devices/surface-hub/save-bitlocker-key-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, security
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/set-up-your-surface-hub.md b/devices/surface-hub/set-up-your-surface-hub.md
index 4a88209a97..876fd56138 100644
--- a/devices/surface-hub/set-up-your-surface-hub.md
+++ b/devices/surface-hub/set-up-your-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/setup-worksheet-surface-hub.md b/devices/surface-hub/setup-worksheet-surface-hub.md
index 06234fe14a..f74f466fe8 100644
--- a/devices/surface-hub/setup-worksheet-surface-hub.md
+++ b/devices/surface-hub/setup-worksheet-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/skype-hybrid-voice.md b/devices/surface-hub/skype-hybrid-voice.md
index 4f3303c2c2..8ad23c643f 100644
--- a/devices/surface-hub/skype-hybrid-voice.md
+++ b/devices/surface-hub/skype-hybrid-voice.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/support-solutions-surface-hub.md b/devices/surface-hub/support-solutions-surface-hub.md
index 6b03449a2e..b40eaef7de 100644
--- a/devices/surface-hub/support-solutions-surface-hub.md
+++ b/devices/surface-hub/support-solutions-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: kaushika-msft
ms.author: jdecker
+ms.topic: article
ms.date: 10/24/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/surface-hub-authenticator-app.md b/devices/surface-hub/surface-hub-authenticator-app.md
index 4e76e525e0..b4bbecf00d 100644
--- a/devices/surface-hub/surface-hub-authenticator-app.md
+++ b/devices/surface-hub/surface-hub-authenticator-app.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 08/28/2017
localizationpriority: medium
---
diff --git a/devices/surface-hub/surface-hub-downloads.md b/devices/surface-hub/surface-hub-downloads.md
index 71706b04fe..0f35d022a9 100644
--- a/devices/surface-hub/surface-hub-downloads.md
+++ b/devices/surface-hub/surface-hub-downloads.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 08/22/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/surface-hub-start-menu.md b/devices/surface-hub/surface-hub-start-menu.md
index 07671c8e12..1be0ee8978 100644
--- a/devices/surface-hub/surface-hub-start-menu.md
+++ b/devices/surface-hub/surface-hub-start-menu.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 01/17/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/surface-hub-wifi-direct.md b/devices/surface-hub/surface-hub-wifi-direct.md
index 87de677e90..3f933415fc 100644
--- a/devices/surface-hub/surface-hub-wifi-direct.md
+++ b/devices/surface-hub/surface-hub-wifi-direct.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/surfacehub-whats-new-1703.md b/devices/surface-hub/surfacehub-whats-new-1703.md
index 59ced8ff5d..5c18d5d2d8 100644
--- a/devices/surface-hub/surfacehub-whats-new-1703.md
+++ b/devices/surface-hub/surfacehub-whats-new-1703.md
@@ -7,6 +7,7 @@ ms.pagetype: devices
ms.sitesec: library
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 01/18/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/troubleshoot-surface-hub.md b/devices/surface-hub/troubleshoot-surface-hub.md
index 1056ed9472..d33bb2ca55 100644
--- a/devices/surface-hub/troubleshoot-surface-hub.md
+++ b/devices/surface-hub/troubleshoot-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 03/16/2018
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md b/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
index b108f07936..8ae6d82f72 100644
--- a/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
+++ b/devices/surface-hub/use-fully-qualified-domain-name-surface-hub.md
@@ -4,6 +4,7 @@ description: Troubleshoot common problems, including setup issues, Exchange Acti
keywords: ["Troubleshoot common problems", "setup issues", "Exchange ActiveSync errors"]
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
ms.prod: w10
diff --git a/devices/surface-hub/use-room-control-system-with-surface-hub.md b/devices/surface-hub/use-room-control-system-with-surface-hub.md
index 2ab4e26c88..8bcdde0580 100644
--- a/devices/surface-hub/use-room-control-system-with-surface-hub.md
+++ b/devices/surface-hub/use-room-control-system-with-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/whiteboard-collaboration.md b/devices/surface-hub/whiteboard-collaboration.md
index 7ad560c77e..dd9606c9c3 100644
--- a/devices/surface-hub/whiteboard-collaboration.md
+++ b/devices/surface-hub/whiteboard-collaboration.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 10/20/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface-hub/wireless-network-management-for-surface-hub.md b/devices/surface-hub/wireless-network-management-for-surface-hub.md
index b9348bc48d..c7aac74ce4 100644
--- a/devices/surface-hub/wireless-network-management-for-surface-hub.md
+++ b/devices/surface-hub/wireless-network-management-for-surface-hub.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub, networking
author: jdeckerms
ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface/advanced-uefi-security-features-for-surface-pro-3.md b/devices/surface/advanced-uefi-security-features-for-surface-pro-3.md
index 4e5dde8200..0ee3c45774 100644
--- a/devices/surface/advanced-uefi-security-features-for-surface-pro-3.md
+++ b/devices/surface/advanced-uefi-security-features-for-surface-pro-3.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices, security
ms.sitesec: library
author: miladCA
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/change-history-for-surface.md b/devices/surface/change-history-for-surface.md
index 443f787ea4..7b010ca138 100644
--- a/devices/surface/change-history-for-surface.md
+++ b/devices/surface/change-history-for-surface.md
@@ -5,13 +5,22 @@ ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerms
-ms.date: 02/12/2018
+ms.author: jdecker
+ms.topic: article
+ms.date: 05/15/2018
---
# Change history for Surface documentation
This topic lists new and updated topics in the Surface documentation library.
+## May 2018
+
+|New or changed topic | Description |
+| --- | --- |
+|[Microsoft Surface Data Eraser](microsoft-surface-data-eraser.md) | Added version 3.2.58.0 information |
+|[Surface device compatibility with Windows 10 Long-Term Servicing Channel (LTSC)](surface-device-compatibility-with-windows-10-ltsc.md) | Removed note box around content |
+
## February 2018
|New or changed topic | Description |
diff --git a/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md b/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md
index 7f1ca137fd..1160b8cacc 100644
--- a/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md
+++ b/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: Scottmca
+ms.author: jdecker
+ms.topic: article
ms.date: 10/16/2017
---
diff --git a/devices/surface/customize-the-oobe-for-surface-deployments.md b/devices/surface/customize-the-oobe-for-surface-deployments.md
index b05c06e3ef..1f60319e04 100644
--- a/devices/surface/customize-the-oobe-for-surface-deployments.md
+++ b/devices/surface/customize-the-oobe-for-surface-deployments.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/deploy-surface-app-with-windows-store-for-business.md b/devices/surface/deploy-surface-app-with-windows-store-for-business.md
index 00d28623aa..491ca43c11 100644
--- a/devices/surface/deploy-surface-app-with-windows-store-for-business.md
+++ b/devices/surface/deploy-surface-app-with-windows-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, store
ms.sitesec: library
author: miladCA
+ms.author: jdecker
+ms.topic: article
ms.date: 09/21/2017
---
diff --git a/devices/surface/deploy-the-latest-firmware-and-drivers-for-surface-devices.md b/devices/surface/deploy-the-latest-firmware-and-drivers-for-surface-devices.md
index 0759f97b9a..288ad5d68c 100644
--- a/devices/surface/deploy-the-latest-firmware-and-drivers-for-surface-devices.md
+++ b/devices/surface/deploy-the-latest-firmware-and-drivers-for-surface-devices.md
@@ -11,6 +11,7 @@ ms.sitesec: library
author: brecords
ms.date: 12/07/2017
ms.author: jdecker
+ms.topic: article
---
# Download the latest firmware and drivers for Surface devices
diff --git a/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md b/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md
index d0ec9f01fe..1f84f574f3 100644
--- a/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md
+++ b/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface
ms.sitesec: library
author: Scottmca
+ms.author: jdecker
+ms.topic: article
ms.date: 10/16/2017
---
diff --git a/devices/surface/deploy.md b/devices/surface/deploy.md
index 70879513fa..00e7dc22e0 100644
--- a/devices/surface/deploy.md
+++ b/devices/surface/deploy.md
@@ -8,6 +8,7 @@ ms.sitesec: library
author: brecords
ms.date: 01/29/2018
ms.author: jdecker
+ms.topic: article
---
# Deploy Surface devices
diff --git a/devices/surface/enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md b/devices/surface/enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md
index e5e7084262..34439da53f 100644
--- a/devices/surface/enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md
+++ b/devices/surface/enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: miladCA
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/enroll-and-configure-surface-devices-with-semm.md b/devices/surface/enroll-and-configure-surface-devices-with-semm.md
index 1b21185ebd..086d18eead 100644
--- a/devices/surface/enroll-and-configure-surface-devices-with-semm.md
+++ b/devices/surface/enroll-and-configure-surface-devices-with-semm.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices, security
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 01/06/2017
---
diff --git a/devices/surface/ethernet-adapters-and-surface-device-deployment.md b/devices/surface/ethernet-adapters-and-surface-device-deployment.md
index 70a83684af..835ce1fdb0 100644
--- a/devices/surface/ethernet-adapters-and-surface-device-deployment.md
+++ b/devices/surface/ethernet-adapters-and-surface-device-deployment.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/index.md b/devices/surface/index.md
index e9007ff9b0..477f6aaedf 100644
--- a/devices/surface/index.md
+++ b/devices/surface/index.md
@@ -8,6 +8,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices
ms.sitesec: library
author: heatherpoulsen
+ms.author: jdecker
+ms.topic: article
ms.date: 10/16/2017
---
diff --git a/devices/surface/ltsb-for-surface.md b/devices/surface/ltsb-for-surface.md
index a4c9d85f83..8c54cb0ffd 100644
--- a/devices/surface/ltsb-for-surface.md
+++ b/devices/surface/ltsb-for-surface.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices
ms.sitesec: library
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.date: 04/25/2017
---
diff --git a/devices/surface/manage-surface-dock-firmware-updates.md b/devices/surface/manage-surface-dock-firmware-updates.md
index e25ba31621..b68eb061ba 100644
--- a/devices/surface/manage-surface-dock-firmware-updates.md
+++ b/devices/surface/manage-surface-dock-firmware-updates.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/manage-surface-pro-3-firmware-updates.md b/devices/surface/manage-surface-pro-3-firmware-updates.md
index 69e97eaf87..35087de606 100644
--- a/devices/surface/manage-surface-pro-3-firmware-updates.md
+++ b/devices/surface/manage-surface-pro-3-firmware-updates.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/manage-surface-uefi-settings.md b/devices/surface/manage-surface-uefi-settings.md
index 4b154c0a9a..bb2c6d516d 100644
--- a/devices/surface/manage-surface-uefi-settings.md
+++ b/devices/surface/manage-surface-uefi-settings.md
@@ -8,6 +8,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: devices, surface
author: miladCA
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/microsoft-surface-data-eraser.md b/devices/surface/microsoft-surface-data-eraser.md
index b1f7c26052..ad9c11f469 100644
--- a/devices/surface/microsoft-surface-data-eraser.md
+++ b/devices/surface/microsoft-surface-data-eraser.md
@@ -10,7 +10,8 @@ ms.pagetype: surface, devices, security
ms.sitesec: library
author: brecords
ms.author: jdecker
-ms.date: 02/12/2018
+ms.topic: article
+ms.date: 05/15/2018
---
# Microsoft Surface Data Eraser
@@ -146,6 +147,12 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo
Microsoft Surface Data Eraser is periodically updated by Microsoft. For information about the changes provided in each new version, see the following:
+### Version 3.2.58.0
+This version of Microsoft Surface Data Eraser adds support for the following:
+
+- • Additional storage devices (drives) for Surface Pro and Surface Laptop devices
+
+
### Version 3.2.46.0
This version of Microsoft Surface Data Eraser adds support for the following:
diff --git a/devices/surface/microsoft-surface-deployment-accelerator.md b/devices/surface/microsoft-surface-deployment-accelerator.md
index 631198f085..095c142f16 100644
--- a/devices/surface/microsoft-surface-deployment-accelerator.md
+++ b/devices/surface/microsoft-surface-deployment-accelerator.md
@@ -10,6 +10,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: miladCA
+ms.author: jdecker
+ms.topic: article
---
# Microsoft Surface Deployment Accelerator
diff --git a/devices/surface/step-by-step-surface-deployment-accelerator.md b/devices/surface/step-by-step-surface-deployment-accelerator.md
index 33683b5d6c..38f84d491f 100644
--- a/devices/surface/step-by-step-surface-deployment-accelerator.md
+++ b/devices/surface/step-by-step-surface-deployment-accelerator.md
@@ -9,6 +9,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: miladCA
+ms.author: jdecker
+ms.topic: article
ms.date: 07/27/2017
---
diff --git a/devices/surface/support-solutions-surface.md b/devices/surface/support-solutions-surface.md
index 3525ce34a9..2ee030e7da 100644
--- a/devices/surface/support-solutions-surface.md
+++ b/devices/surface/support-solutions-surface.md
@@ -9,6 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub
author: kaushika-msft
ms.author: jdecker
+ms.topic: article
ms.date: 09/08/2017
ms.localizationpriority: medium
---
diff --git a/devices/surface/surface-device-compatibility-with-windows-10-ltsc.md b/devices/surface/surface-device-compatibility-with-windows-10-ltsc.md
index 0d4409c657..52bef60ccd 100644
--- a/devices/surface/surface-device-compatibility-with-windows-10-ltsc.md
+++ b/devices/surface/surface-device-compatibility-with-windows-10-ltsc.md
@@ -8,6 +8,7 @@ ms.pagetype: surface, devices
ms.sitesec: library
author: brecords
ms.author: jdecker
+ms.topic: article
ms.date: 01/03/2018
---
@@ -35,8 +36,7 @@ The LTSC servicing option is designed for device types and scenarios where the k
>[!NOTE]
>For general information about Windows servicing branches, including LTSC, see [Overview of Windows as a service](https://technet.microsoft.com/itpro/windows/update/waas-overview#long-term-servicing-branch).
->[!NOTE]
->As a general guideline, devices that fulfill the following criteria are considered general-purpose devices and should be paired with Windows 10 Pro or Windows 10 Enterprise using the Semi-Annual Channel servicing option:
+As a general guideline, devices that fulfill the following criteria are considered general-purpose devices and should be paired with Windows 10 Pro or Windows 10 Enterprise using the Semi-Annual Channel servicing option:
* Devices that run productivity software such as Microsoft Office
diff --git a/devices/surface/surface-dock-updater.md b/devices/surface/surface-dock-updater.md
index 55d7b233dc..977bbaebc7 100644
--- a/devices/surface/surface-dock-updater.md
+++ b/devices/surface/surface-dock-updater.md
@@ -11,6 +11,7 @@ ms.sitesec: library
author: brecords
ms.date: 02/23/2018
ms.author: jdecker
+ms.topic: article
---
# Microsoft Surface Dock Updater
diff --git a/devices/surface/surface-enterprise-management-mode.md b/devices/surface/surface-enterprise-management-mode.md
index bcf6b4b60c..42df3fd641 100644
--- a/devices/surface/surface-enterprise-management-mode.md
+++ b/devices/surface/surface-enterprise-management-mode.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices, security
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 01/06/2017
---
diff --git a/devices/surface/unenroll-surface-devices-from-semm.md b/devices/surface/unenroll-surface-devices-from-semm.md
index 4e8cb226f3..323624a34f 100644
--- a/devices/surface/unenroll-surface-devices-from-semm.md
+++ b/devices/surface/unenroll-surface-devices-from-semm.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices, security
ms.sitesec: library
author: jobotto
+ms.author: jdecker
+ms.topic: article
ms.date: 01/06/2017
---
diff --git a/devices/surface/update.md b/devices/surface/update.md
index 7c1b86fbb8..29e0b9517b 100644
--- a/devices/surface/update.md
+++ b/devices/surface/update.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices
ms.sitesec: library
author: heatherpoulsen
+ms.author: jdecker
+ms.topic: article
ms.date: 12/01/2016
---
diff --git a/devices/surface/upgrade-surface-devices-to-windows-10-with-mdt.md b/devices/surface/upgrade-surface-devices-to-windows-10-with-mdt.md
index 20b66668b4..4e13cfd089 100644
--- a/devices/surface/upgrade-surface-devices-to-windows-10-with-mdt.md
+++ b/devices/surface/upgrade-surface-devices-to-windows-10-with-mdt.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface
ms.sitesec: library
author: Scottmca
+ms.author: jdecker
+ms.topic: article
ms.date: 10/16/2017
---
diff --git a/devices/surface/use-system-center-configuration-manager-to-manage-devices-with-semm.md b/devices/surface/use-system-center-configuration-manager-to-manage-devices-with-semm.md
index 9234eb04c3..c5de082d9e 100644
--- a/devices/surface/use-system-center-configuration-manager-to-manage-devices-with-semm.md
+++ b/devices/surface/use-system-center-configuration-manager-to-manage-devices-with-semm.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.pagetype: surface, devices
ms.sitesec: library
author: KiranDavane
+ms.author: jdecker
+ms.topic: article
ms.date: 02/01/2017
---
diff --git a/devices/surface/using-the-sda-deployment-share.md b/devices/surface/using-the-sda-deployment-share.md
index b65fc91fb5..75bb5c6f65 100644
--- a/devices/surface/using-the-sda-deployment-share.md
+++ b/devices/surface/using-the-sda-deployment-share.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: deploy
ms.pagetype: surface, devices
ms.sitesec: library
author: Scottmca
+ms.author: jdecker
+ms.topic: article
ms.date: 10/16/2017
---
diff --git a/devices/surface/wake-on-lan-for-surface-devices.md b/devices/surface/wake-on-lan-for-surface-devices.md
index b9d7b5d2e3..c584cc40bb 100644
--- a/devices/surface/wake-on-lan-for-surface-devices.md
+++ b/devices/surface/wake-on-lan-for-surface-devices.md
@@ -8,6 +8,7 @@ ms.pagetype: surface, devices
ms.sitesec: library
author: brecords
ms.author: jdecker
+ms.topic: article
ms.date: 01/03/2018
---
diff --git a/devices/surface/windows-autopilot-and-surface-devices.md b/devices/surface/windows-autopilot-and-surface-devices.md
index bc678a28bd..3550f35fd6 100644
--- a/devices/surface/windows-autopilot-and-surface-devices.md
+++ b/devices/surface/windows-autopilot-and-surface-devices.md
@@ -9,6 +9,7 @@ ms.sitesec: library
author: brecords
ms.date: 01/31/2018
ms.author: jdecker
+ms.topic: article
---
# Windows Autopilot and Surface devices
diff --git a/education/get-started/change-history-ms-edu-get-started.md b/education/get-started/change-history-ms-edu-get-started.md
index 0110254868..97ddde85fb 100644
--- a/education/get-started/change-history-ms-edu-get-started.md
+++ b/education/get-started/change-history-ms-edu-get-started.md
@@ -2,7 +2,8 @@
title: Change history for Microsoft Education Get Started
description: New and changed topics in the Microsoft Education get started guide.
keywords: Microsoft Education get started guide, IT admin, IT pro, school, education, change history
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/get-started/configure-microsoft-store-for-education.md b/education/get-started/configure-microsoft-store-for-education.md
index ec173a261d..021052c85b 100644
--- a/education/get-started/configure-microsoft-store-for-education.md
+++ b/education/get-started/configure-microsoft-store-for-education.md
@@ -2,7 +2,8 @@
title: Configure Microsoft Store for Education
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/enable-microsoft-teams.md b/education/get-started/enable-microsoft-teams.md
index 6c74c506b0..bc2a138036 100644
--- a/education/get-started/enable-microsoft-teams.md
+++ b/education/get-started/enable-microsoft-teams.md
@@ -2,7 +2,8 @@
title: Enable Microsoft Teams for your school
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/finish-setup-and-other-tasks.md b/education/get-started/finish-setup-and-other-tasks.md
index 55a52faa11..8b1e03783b 100644
--- a/education/get-started/finish-setup-and-other-tasks.md
+++ b/education/get-started/finish-setup-and-other-tasks.md
@@ -2,7 +2,8 @@
title: Finish Windows 10 device setup and other tasks
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/get-started-with-microsoft-education.md b/education/get-started/get-started-with-microsoft-education.md
index 4746bcc249..136ad9ac13 100644
--- a/education/get-started/get-started-with-microsoft-education.md
+++ b/education/get-started/get-started-with-microsoft-education.md
@@ -2,7 +2,8 @@
title: Deploy and manage a full cloud IT solution with Microsoft Education
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: hero-article
diff --git a/education/get-started/set-up-office365-edu-tenant.md b/education/get-started/set-up-office365-edu-tenant.md
index 59d939c2eb..71ea282542 100644
--- a/education/get-started/set-up-office365-edu-tenant.md
+++ b/education/get-started/set-up-office365-edu-tenant.md
@@ -2,7 +2,8 @@
title: Set up an Office 365 Education tenant
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/set-up-windows-10-education-devices.md b/education/get-started/set-up-windows-10-education-devices.md
index ac9f52c84f..4fdd5ca5a5 100644
--- a/education/get-started/set-up-windows-10-education-devices.md
+++ b/education/get-started/set-up-windows-10-education-devices.md
@@ -2,7 +2,8 @@
title: Set up Windows 10 education devices
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/set-up-windows-education-devices.md b/education/get-started/set-up-windows-education-devices.md
index edb76d6448..e1c82b393d 100644
--- a/education/get-started/set-up-windows-education-devices.md
+++ b/education/get-started/set-up-windows-education-devices.md
@@ -2,7 +2,8 @@
title: Set up Windows 10 devices using Windows OOBE
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/use-intune-for-education.md b/education/get-started/use-intune-for-education.md
index 646d7b8e16..e33b8f69c3 100644
--- a/education/get-started/use-intune-for-education.md
+++ b/education/get-started/use-intune-for-education.md
@@ -2,7 +2,8 @@
title: Use Intune for Education to manage groups, apps, and settings
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/get-started/use-school-data-sync.md b/education/get-started/use-school-data-sync.md
index c5392b41b9..24fe1b1421 100644
--- a/education/get-started/use-school-data-sync.md
+++ b/education/get-started/use-school-data-sync.md
@@ -2,7 +2,8 @@
title: Use School Data Sync to import student data
description: Learn how to use the new Microsoft Education system to set up a cloud infrastructure for your school, acquire devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, School Data Sync, Microsoft Teams, Microsoft Store for Education, Azure AD, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
diff --git a/education/trial-in-a-box/educator-tib-get-started.md b/education/trial-in-a-box/educator-tib-get-started.md
index 1995443537..1a1f2a36e8 100644
--- a/education/trial-in-a-box/educator-tib-get-started.md
+++ b/education/trial-in-a-box/educator-tib-get-started.md
@@ -3,6 +3,7 @@ title: Educator Trial in a Box Guide
description: Need help or have a question about using Microsoft Education? Start here.
keywords: support, troubleshooting, education, Microsoft Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, Microsoft Store for Education, Set up School PCs
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: article
@@ -26,7 +27,8 @@ ms.date: 03/18/2018
| [](#edu-task2) | **Interested in significantly improving your students' reading speed and comprehension?[1](#footnote1)** Try the [Learning Tools Immersive Reader](#edu-task2) to see how kids can learn to read faster, using text read aloud, and highlighting words for syntax. |
| [](#edu-task3) | **Looking to foster collaboration, communication, and critical thinking in the classroom?** Launch [Microsoft Teams](#edu-task3) and learn how to set up digital classroom discussions, respond to student questions, and organize class content. |
| [](#edu-task4) | **Trying to expand classroom creativity and interaction between students?** Open [OneNote](#edu-task4) and create an example group project for your class. |
-| [](#edu-task5) | **Want to teach kids to further collaborate and problem solve?** Play with [Minecraft: Education Edition](#edu-task5) to see how it can be used as a collaborative and versatile platform across subjects to encourage 21st century skills. |
+| [](#edu-task5) | **Curious about telling stories through video?** Try the [Photos app](#edu-task5) to make your own example video. |
+| [](#edu-task6) | **Want to teach kids to further collaborate and problem solve?** Play with [Minecraft: Education Edition](#edu-task6) to see how it can be used as a collaborative and versatile platform across subjects to encourage 21st century skills. |
| | |
@@ -42,8 +44,8 @@ ms.date: 03/18/2018
To try out the educator tasks, start by logging in as a teacher.
1. Turn on **Device A** and ensure you plug in the PC to an electrical outlet.
-2. Connect to your school's Wi-Fi network or connect with a local Ethernet connection.
- >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet you should connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration you should consider using Device A from a different network.
+2. Connect **Device A** to your school's Wi-Fi network or connect with a local Ethernet connection using the Ethernet adapter included in this kit.
+ >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet, connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration, consider connecting **Device A** to a different network.
3. Log in to **Device A** using the **Teacher Username** and **Teacher Password** included in the **Credentials Sheet** located in your kit.
@@ -67,13 +69,17 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse
**Try this!**
1. On the **Start** menu, click the Word document titled **Design Think**.
+
2. Click **Edit Document** and select **Edit in Browser**.
+
3. Select the **View** menu.
+
4. Select the **Immersive Reader** button.

5. Press the **Play** button to hear text read aloud.
+
6. Select these various settings to see different ways to configure Immersive Reader for your students.
| Text to Speech | Text Preferences | Grammar Options | Line Focus |
@@ -100,6 +106,7 @@ Take a guided tour of Microsoft Teams and test drive this digital hub.
**Try this!**
1. Take a guided tour of Microsoft Teams and test drive some teaching tasks. Open the Microsoft Edge browser and navigate to https://msteamsdemo.azurewebsites.net.
+
2. Use your school credentials provided in the **Credentials Sheet**.
@@ -120,7 +127,9 @@ See how a group project comes together with opportunities to interact with other
When you're not using the pen, just use the magnet to stick it to the left side of the screen until you need it again.
1. On the **Start** menu, click the OneNote shortcut named **Imagine Giza** to open the **Reimagine the Great Pyramid of Giza project**.
+
2. Take the digital pen out of the box and make notes or draw.
+
3. Follow the instructions for the project. Look for the **Try this!** callouts to experiment with these engaging activities.
- Discover the power of digital ink by selecting the Draw tab. Choose your pen and get scribbling.
@@ -138,10 +147,11 @@ When you're not using the pen, just use the magnet to stick it to the left side
-
+

-## 5. Get kids to further collaborate and problem solve
+## 6. Get kids to further collaborate and problem solve
> [!VIDEO https://www.youtube.com/embed/QI_bRNUugog]
@@ -197,24 +219,31 @@ Minecraft: Education Edition provides an immersive environment to develop creati
Today, we'll explore a Minecraft world through the eyes of a student.
1. Connect the included mouse to your computer for optimal interaction.
+
2. Open Microsoft Edge and visit https://aka.ms/lessonhub.
+
3. Scroll down to the **Details** section and select **Download World**.

4. When prompted, save the world.
+
5. Enter your same teacher username and password and click **Accept**.
+
6. Click **OK** on the **Minecraft: Education Edition Free Trial** box.
+
7. Click **Play**.
+
8. Click **Lesson Hub Vol 1** to enter the downloaded world.
+
9. Explore the world by using the keys on your keyboard.
* **W** moves forward.
* **A** moves left.
* **S** moves right.
* **D** moves backward.
-
10. Use your mouse as your "eyes". Just move it to look around.
+
11. For a bird's eye view, double-tap the SPACE BAR. Now press the SPACE BAR to fly higher. And then hold the SHIFT key to safely land.
To try more advanced movements or building within Minecraft, use the Minecraft Controls Diagram.
@@ -232,6 +261,45 @@ Today, we'll explore a Minecraft world through the eyes of a student.

+
+
+
+
**Watch what Educators say about Microsoft Education delivering better learning outcomes**
Bring out the best in students by providing a platform for collaborating, exploring, personalized learning, and getting things done across all devices.
diff --git a/education/trial-in-a-box/images/Math1.png b/education/trial-in-a-box/images/Math1.png
new file mode 100644
index 0000000000..70891c9c29
Binary files /dev/null and b/education/trial-in-a-box/images/Math1.png differ
diff --git a/education/trial-in-a-box/images/Math2.png b/education/trial-in-a-box/images/Math2.png
new file mode 100644
index 0000000000..9ffd2638ac
Binary files /dev/null and b/education/trial-in-a-box/images/Math2.png differ
diff --git a/education/trial-in-a-box/images/edu-tib-setp-6-v4.png b/education/trial-in-a-box/images/edu-tib-setp-6-v4.png
index c46d7861af..72393bc1ea 100644
Binary files a/education/trial-in-a-box/images/edu-tib-setp-6-v4.png and b/education/trial-in-a-box/images/edu-tib-setp-6-v4.png differ
diff --git a/education/trial-in-a-box/images/edu-tib-setp-7-jump.png b/education/trial-in-a-box/images/edu-tib-setp-7-jump.png
new file mode 100644
index 0000000000..1287f292b8
Binary files /dev/null and b/education/trial-in-a-box/images/edu-tib-setp-7-jump.png differ
diff --git a/education/trial-in-a-box/images/edu-tib-setp-7-v1.png b/education/trial-in-a-box/images/edu-tib-setp-7-v1.png
new file mode 100644
index 0000000000..2d113beeaa
Binary files /dev/null and b/education/trial-in-a-box/images/edu-tib-setp-7-v1.png differ
diff --git a/education/trial-in-a-box/index.md b/education/trial-in-a-box/index.md
index 486c9358c7..c44eeb37fb 100644
--- a/education/trial-in-a-box/index.md
+++ b/education/trial-in-a-box/index.md
@@ -2,7 +2,8 @@
title: Microsoft Education Trial in a Box
description: For IT admins, educators, and students, discover what you can do with Microsoft 365 Education. Try it out with our Trial in a Box program.
keywords: education, Microsoft 365 Education, trial, full cloud IT solution, school, deploy, setup, IT admin, educator, student, explore, Trial in a Box
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: article
diff --git a/education/trial-in-a-box/itadmin-tib-get-started.md b/education/trial-in-a-box/itadmin-tib-get-started.md
index d450bc8dea..9381310f46 100644
--- a/education/trial-in-a-box/itadmin-tib-get-started.md
+++ b/education/trial-in-a-box/itadmin-tib-get-started.md
@@ -3,6 +3,7 @@ title: IT Admin Trial in a Box Guide
description: Try out Microsoft 365 Education to implement a full cloud infrastructure for your school, manage devices and apps, and configure and deploy policies to your Windows 10 devices.
keywords: education, Microsoft 365 Education, trial, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, Microsoft Store for Education
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: get-started
@@ -44,12 +45,13 @@ If you run into any problems while following the steps in this guide, or you hav
## 1. Log in to Device A with your IT Admin credentials and connect to the school network
To try out the IT admin tasks, start by logging in as an IT admin.
-1. Turn on **Device A** and ensure you plug in the PC to an electrical outlet.
-2. Connect to your school's Wi-Fi network or connect with a local Ethernet connection.
- >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet you should connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration you should consider using Device A from a different network.
+1. Set up **Device A** first, then set up **Device B**.
+2. Turn on **Device A** and ensure you plug in the PC to an electrical outlet.
+3. Connect **Device A** to your school's Wi-Fi network or connect with a local Ethernet connection using the Ethernet adapter included in this kit.
+ >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet, connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration, consider connecting **Device A** to a different network.
-3. Log in to **Device A** using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
-4. Note the serial numbers on the Trial in a Box devices and register both devices with the hardware manufacturer to activate the manufacturer's warranty.
+4. Log in to **Device A** using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
+5. Note the serial numbers on the Trial in a Box devices and register both devices with the hardware manufacturer to activate the manufacturer's warranty.
diff --git a/education/trial-in-a-box/support-options.md b/education/trial-in-a-box/support-options.md
index 9df3ab2015..bc8718b81a 100644
--- a/education/trial-in-a-box/support-options.md
+++ b/education/trial-in-a-box/support-options.md
@@ -2,7 +2,8 @@
title: Microsoft Education Trial in a Box Support
description: Need help or have a question about using Microsoft Education Trial in a Box? Start here.
keywords: support, troubleshooting, education, Microsoft 365 Education, full cloud IT solution, school, deploy, setup, manage, Windows 10, Intune for Education, Office 365 for Education, Microsoft Store for Education, Set up School PCs
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.topic: article
diff --git a/education/windows/autopilot-reset.md b/education/windows/autopilot-reset.md
index caf4a7f2c0..f5acaf2f91 100644
--- a/education/windows/autopilot-reset.md
+++ b/education/windows/autopilot-reset.md
@@ -2,7 +2,8 @@
title: Reset devices with Autopilot Reset
description: Gives an overview of Autopilot Reset and how you can enable and use it in your schools.
keywords: Autopilot Reset, Windows 10, education
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/change-history-edu.md b/education/windows/change-history-edu.md
index 2c31544cc6..b65a448e31 100644
--- a/education/windows/change-history-edu.md
+++ b/education/windows/change-history-edu.md
@@ -2,7 +2,8 @@
title: Change history for Windows 10 for Education (Windows 10)
description: New and changed topics in Windows 10 for Education
keywords: Windows 10 education documentation, change history
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/change-to-pro-education.md b/education/windows/change-to-pro-education.md
index 190b45e980..1508eb05f4 100644
--- a/education/windows/change-to-pro-education.md
+++ b/education/windows/change-to-pro-education.md
@@ -3,6 +3,7 @@ title: Change to Windows 10 Education from Windows 10 Pro
description: Learn how IT Pros can opt into changing to Windows 10 Pro Education from Windows 10 Pro.
keywords: change, free change, Windows 10 Pro to Windows 10 Pro Education, Windows 10 Pro to Windows 10 Pro Education, education customers, Windows 10 Pro Education, Windows 10 Pro
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
@@ -12,12 +13,11 @@ ms.author: MikeBlodge
ms.date: 04/30/2018
---
-# Change to Windows 10 Education from Windows 10 Pro
+# Change to Windows 10 Pro Education from Windows 10 Pro
Windows 10 Pro Education is a new offering in Windows 10, version 1607. This edition builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools by providing education-specific default settings.
If you have an education tenant and use devices with Windows 10 Pro, global administrators can opt-in to a free change to Windows 10 Pro Education depending on your scenario.
-- [Switch from Windows 10 Pro in S mode to Windows 10 Pro Education in S mode](https://www.microsoft.com/en-us/education/windows/s-mode-change-to-edu)
-- [Switch from Windows 10 Pro to Windows 10 Pro Education](#switch-from-windows-10-pro-to-windows-10-pro-education)
+- [Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode](https://docs.microsoft.com/en-us/education/windows/s-mode-switch-to-edu)
To take advantage of this offering, make sure you meet the [requirements for changing](#requirements-for-changing). For academic customers who are eligible to change to Windows 10 Pro Education, but are unable to use the above methods, contact Microsoft Support for assistance.
@@ -90,7 +90,7 @@ You can use Windows Configuration Designer to create a provisioning package that
## Education customers with Azure AD joined devices
-Academic institutions can easily move from Windows 10 Pro to Windows 10 Pro Education without using activation keys or reboots. When one of your users enters their Azure AD credentials associated with a Windows 10 Pro Education license, the operating system changees to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have an Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
+Academic institutions can easily move from Windows 10 Pro to Windows 10 Pro Education without using activation keys or reboots. When one of your users enters their Azure AD credentials associated with a Windows 10 Pro Education license, the operating system changes to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have an Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
When you change to Windows 10 Pro Education, you get the following benefits:
@@ -284,10 +284,10 @@ Once the automatic change to Windows 10 Pro Education is turned off, the change

-4. You will be asked if you're sure that you want to turn off automatic changees to Windows 10 Pro Education. Click **Yes**.
+4. You will be asked if you're sure that you want to turn off automatic changes to Windows 10 Pro Education. Click **Yes**.
5. Click **Close** in the **Success** page.
- All global admins get a confirmation email that a request was made to roll back your organization to Windows 10 Pro. If you, or another global admin, decide later that you want to turn on automatic changees again, you can do this by selecting **change to Windows 10 Pro Education for free** from the **Manage > Benefits** in the Microsoft Store for Education.
+ All global admins get a confirmation email that a request was made to roll back your organization to Windows 10 Pro. If you, or another global admin, decide later that you want to turn on automatic changes again, you can do this by selecting **change to Windows 10 Pro Education for free** from the **Manage > Benefits** in the Microsoft Store for Education.
## Preparing for deployment of Windows 10 Pro Education licenses
diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md
index bdc7935944..0b6473c667 100644
--- a/education/windows/chromebook-migration-guide.md
+++ b/education/windows/chromebook-migration-guide.md
@@ -4,6 +4,7 @@ description: In this guide you will learn how to migrate a Google Chromebook-bas
ms.assetid: 7A1FA48A-C44A-4F59-B895-86D4D77F8BEA
keywords: migrate, automate, device, Chromebook migration
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu, devices
diff --git a/education/windows/configure-windows-for-education.md b/education/windows/configure-windows-for-education.md
index 2c12c48915..e3d0114db7 100644
--- a/education/windows/configure-windows-for-education.md
+++ b/education/windows/configure-windows-for-education.md
@@ -4,7 +4,8 @@ description: Provides guidance on ways to configure the OS diagnostic data, cons
keywords: Windows 10 deployment, recommendations, privacy settings, school, education, configurations, accessibility, assistive technology
ms.mktglfcycl: plan
ms.sitesec: library
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.pagetype: edu
ms.localizationpriority: high
author: CelesteDG
diff --git a/education/windows/create-tests-using-microsoft-forms.md b/education/windows/create-tests-using-microsoft-forms.md
index a5fdfd4970..3b0c7b4e62 100644
--- a/education/windows/create-tests-using-microsoft-forms.md
+++ b/education/windows/create-tests-using-microsoft-forms.md
@@ -2,7 +2,8 @@
title: Create tests using Microsoft Forms
description: Learn how to use Microsoft Forms with the Take a Test app to prevent access to other computers or online resources while completing a test.
keywords: school, Take a Test, Microsoft Forms
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/deploy-windows-10-in-a-school-district.md b/education/windows/deploy-windows-10-in-a-school-district.md
index af5f429e0c..ab3bedaa0b 100644
--- a/education/windows/deploy-windows-10-in-a-school-district.md
+++ b/education/windows/deploy-windows-10-in-a-school-district.md
@@ -3,6 +3,7 @@ title: Deploy Windows 10 in a school district (Windows 10)
description: Learn how to deploy Windows 10 in a school district. Integrate the school environment with Office 365, Active Directory Domain Services (AD DS), and Microsoft Azure Active Directory (Azure AD), use System Center Configuration Manager, Intune, and Group Policy to manage devices.
keywords: configure, tools, device, school district, deploy Windows 10
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.pagetype: edu
ms.sitesec: library
diff --git a/education/windows/deploy-windows-10-in-a-school.md b/education/windows/deploy-windows-10-in-a-school.md
index 996d28b59a..20552e300d 100644
--- a/education/windows/deploy-windows-10-in-a-school.md
+++ b/education/windows/deploy-windows-10-in-a-school.md
@@ -3,6 +3,7 @@ title: Deploy Windows 10 in a school (Windows 10)
description: Learn how to integrate your school environment with Microsoft Office 365, Active Directory Domain Services (AD DS), and Microsoft Azure Active Directory (Azure AD). Deploy Windows 10 and apps to new devices or upgrade existing devices to Windows 10. Manage faculty, students, and devices by using Microsoft Intune and Group Policy.
keywords: configure, tools, device, school, deploy Windows 10
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.pagetype: edu
ms.sitesec: library
diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md
index 707c3f7956..b65f7776f4 100644
--- a/education/windows/edu-deployment-recommendations.md
+++ b/education/windows/edu-deployment-recommendations.md
@@ -9,6 +9,7 @@ author: CelesteDG
ms.author: celested
ms.date: 10/13/2017
ms.prod: W10
+ms.technology: Windows
---
# Deployment recommendations for school IT administrators
diff --git a/education/windows/education-scenarios-store-for-business.md b/education/windows/education-scenarios-store-for-business.md
index fad685b3d2..7818bc8ecf 100644
--- a/education/windows/education-scenarios-store-for-business.md
+++ b/education/windows/education-scenarios-store-for-business.md
@@ -11,6 +11,7 @@ searchScope:
author: trudyha
ms.author: trudyha
ms.date: 3/30/2018
+ms.technology: Windows
---
# Working with Microsoft Store for Education
diff --git a/education/windows/get-minecraft-device-promotion.md b/education/windows/get-minecraft-device-promotion.md
index 5250c1f8df..45c3a1d2d0 100644
--- a/education/windows/get-minecraft-device-promotion.md
+++ b/education/windows/get-minecraft-device-promotion.md
@@ -11,6 +11,7 @@ searchScope:
- Store
ms.author: trudyha
ms.date: 07/27/2017
+ms.technology: Windows
---
# Get Minecraft: Education Edition with Windows 10 device promotion
diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md
index 1abe2df826..2354f8351b 100644
--- a/education/windows/get-minecraft-for-education.md
+++ b/education/windows/get-minecraft-for-education.md
@@ -11,6 +11,8 @@ searchScope:
- Store
ms.author: trudyha
ms.date: 07/27/2017
+ms.technology: Windows
+ms.topic: conceptual
---
# Get Minecraft: Education Edition
diff --git a/education/windows/index.md b/education/windows/index.md
index d579704f5f..3c74f8e5ab 100644
--- a/education/windows/index.md
+++ b/education/windows/index.md
@@ -2,7 +2,8 @@
title: Windows 10 for Education (Windows 10)
description: Learn how to use Windows 10 in schools.
keywords: Windows 10, education
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/s-mode-switch-to-edu.md b/education/windows/s-mode-switch-to-edu.md
index 4fc7cd0c9e..f46cbe5a83 100644
--- a/education/windows/s-mode-switch-to-edu.md
+++ b/education/windows/s-mode-switch-to-edu.md
@@ -5,13 +5,14 @@ keywords: Windows 10 Pro Education in S mode, S mode, system requirements, Overv
ms.mktglfcycl: deploy
ms.localizationpriority: high
ms.prod: w10
+ms.technology: Windows
ms.sitesec: library
ms.pagetype: edu
ms.date: 04/30/2018
author: Mikeblodge
---
-# Windows 10 Pro in S mode for Education
+# Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode
S mode is an enhanced security mode of Windows 10 – streamlined for security and superior performance. With Windows 10 in S mode, everyone can download and install Microsoft-verified apps from the Microsoft Store for Education – this keep devices running fast and secure day in and day out.
diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md
index f0c3df0aea..8b1cd7033a 100644
--- a/education/windows/school-get-minecraft.md
+++ b/education/windows/school-get-minecraft.md
@@ -11,6 +11,8 @@ searchScope:
- Store
ms.author: trudyha
ms.date: 1/5/2018
+ms.technology: Windows
+ms.topic: conceptual
---
# For IT administrators - get Minecraft: Education Edition
diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md
index 8164b32aca..4494eb052d 100644
--- a/education/windows/set-up-school-pcs-technical.md
+++ b/education/windows/set-up-school-pcs-technical.md
@@ -3,6 +3,7 @@ title: Set up School PCs app technical reference
description: Describes the changes that the Set up School PCs app makes to a PC.
keywords: shared cart, shared PC, school, set up school pcs
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/set-up-students-pcs-to-join-domain.md b/education/windows/set-up-students-pcs-to-join-domain.md
index 76079be7ff..92ad941be7 100644
--- a/education/windows/set-up-students-pcs-to-join-domain.md
+++ b/education/windows/set-up-students-pcs-to-join-domain.md
@@ -3,6 +3,7 @@ title: Set up student PCs to join domain
description: Learn how to use Configuration Designer to easily provision student devices to join Active Directory.
keywords: school, student PC setup, Windows Configuration Designer
ms.prod: W10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.localizationpriority: high
diff --git a/education/windows/set-up-students-pcs-with-apps.md b/education/windows/set-up-students-pcs-with-apps.md
index 80bc4c8bfe..cd215a1424 100644
--- a/education/windows/set-up-students-pcs-with-apps.md
+++ b/education/windows/set-up-students-pcs-with-apps.md
@@ -2,7 +2,8 @@
title: Provision student PCs with apps
description: Learn how to use Configuration Designer to easily provision student devices to join Active Directory.
keywords: shared cart, shared PC, school, provision PCs with apps, Windows Configuration Designer
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.pagetype: edu
ms.mktglfcycl: plan
ms.sitesec: library
diff --git a/education/windows/set-up-windows-10.md b/education/windows/set-up-windows-10.md
index 6c68f0eee5..4ffaef6cf5 100644
--- a/education/windows/set-up-windows-10.md
+++ b/education/windows/set-up-windows-10.md
@@ -2,7 +2,8 @@
title: Set up Windows devices for education
description: Decide which option for setting up Windows 10 is right for you.
keywords: school, Windows device setup, education device setup
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/take-a-test-app-technical.md b/education/windows/take-a-test-app-technical.md
index 937dfe5d9d..ab9a8051ac 100644
--- a/education/windows/take-a-test-app-technical.md
+++ b/education/windows/take-a-test-app-technical.md
@@ -2,7 +2,8 @@
title: Take a Test app technical reference
description: The policies and settings applied by the Take a Test app.
keywords: take a test, test taking, school, policies
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/take-a-test-multiple-pcs.md b/education/windows/take-a-test-multiple-pcs.md
index f83c1e7773..1e0d000611 100644
--- a/education/windows/take-a-test-multiple-pcs.md
+++ b/education/windows/take-a-test-multiple-pcs.md
@@ -3,6 +3,7 @@ title: Set up Take a Test on multiple PCs
description: Learn how to set up and use the Take a Test app on multiple PCs.
keywords: take a test, test taking, school, set up on multiple PCs
ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/take-a-test-single-pc.md b/education/windows/take-a-test-single-pc.md
index 630e913e2d..f9565e53d3 100644
--- a/education/windows/take-a-test-single-pc.md
+++ b/education/windows/take-a-test-single-pc.md
@@ -2,7 +2,8 @@
title: Set up Take a Test on a single PC
description: Learn how to set up and use the Take a Test app on a single PC.
keywords: take a test, test taking, school, set up on single PC
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/take-tests-in-windows-10.md b/education/windows/take-tests-in-windows-10.md
index f41a994602..74b379ba75 100644
--- a/education/windows/take-tests-in-windows-10.md
+++ b/education/windows/take-tests-in-windows-10.md
@@ -2,7 +2,8 @@
title: Take tests in Windows 10
description: Learn how to set up and use the Take a Test app.
keywords: take a test, test taking, school, how to, use Take a Test
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md
index 14bbe54561..eb7e30081b 100644
--- a/education/windows/teacher-get-minecraft.md
+++ b/education/windows/teacher-get-minecraft.md
@@ -3,6 +3,7 @@ title: For teachers get Minecraft Education Edition
description: Learn how teachers can get and distribute Minecraft.
keywords: school, Minecraft, Education Edition, educators, teachers, acquire, distribute
ms.prod: W10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.localizationpriority: high
@@ -11,6 +12,8 @@ searchScope:
- Store
ms.author: trudyha
ms.date: 1/5/2018
+ms.topic: conceptual
+---
# For teachers - get Minecraft: Education Edition
diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md
index 8361320231..306c4127ed 100644
--- a/education/windows/test-windows10s-for-edu.md
+++ b/education/windows/test-windows10s-for-edu.md
@@ -3,7 +3,8 @@ title: Test Windows 10 in S mode on existing Windows 10 education devices
description: Provides guidance on downloading and testing Windows 10 in S mode for existing Windows 10 education devices.
keywords: Windows 10 in S mode, try, download, school, education, Windows 10 in S mode installer, existing Windows 10 education devices
ms.mktglfcycl: deploy
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.pagetype: edu
ms.sitesec: library
ms.localizationpriority: high
diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md
index 2c8ac8ab6f..24bde1c0c2 100644
--- a/education/windows/use-set-up-school-pcs-app.md
+++ b/education/windows/use-set-up-school-pcs-app.md
@@ -2,7 +2,8 @@
title: Use Set up School PCs app
description: Learn how the Set up School PCs app works and how to use it.
keywords: shared cart, shared PC, school, Set up School PCs, overview, how to use
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: edu
diff --git a/education/windows/windows-editions-for-education-customers.md b/education/windows/windows-editions-for-education-customers.md
index 8ceb104dc8..48fe5c1cf7 100644
--- a/education/windows/windows-editions-for-education-customers.md
+++ b/education/windows/windows-editions-for-education-customers.md
@@ -2,7 +2,8 @@
title: Windows 10 editions for education customers
description: Provides an overview of the two Windows 10 editions that are designed for the needs of K-12 institutions.
keywords: Windows 10 Pro Education, Windows 10 Education, Windows 10 editions, education customers
-ms.prod: w10
+ms.prod: w10
+ms.technology: Windows
ms.mktglfcycl: plan
ms.sitesec: library
ms.pagetype: edu
diff --git a/mdop/agpm/use-a-test-environment.md b/mdop/agpm/use-a-test-environment.md
index c9543a0a0c..a7ebad6170 100644
--- a/mdop/agpm/use-a-test-environment.md
+++ b/mdop/agpm/use-a-test-environment.md
@@ -20,7 +20,7 @@ If you use a testing organizational unit (OU) to test Group Policy objects (GPOs
1. While you have the GPO checked out for editing, in the **Group Policy Management Console**, click **Group Policy Objects** in the forest and domain in which you are managing GPOs.
-2. Click the checked out copy of the GPO to be tested. The name will be preceded with **\[Checked Out\]**. (If it is not listed, click **Action**, then **Refresh**. Sort the names alphabetically, and **\[Checked Out\]** GPOs will typically appear at the top of the list.)
+2. Click the checked out copy of the GPO to be tested. The name will be preceded with **\[AGPM\]**. (If it is not listed, click **Action**, then **Refresh**. Sort the names alphabetically, and **\[AGPM\]** GPOs will typically appear at the top of the list.)
3. Drag and drop the GPO to the test OU.
diff --git a/mdop/mbam-v25/mbam-25-supported-configurations.md b/mdop/mbam-v25/mbam-25-supported-configurations.md
index 1c9cdc239c..8c4076c276 100644
--- a/mdop/mbam-v25/mbam-25-supported-configurations.md
+++ b/mdop/mbam-v25/mbam-25-supported-configurations.md
@@ -339,7 +339,7 @@ You must install SQL Server with the **SQL\_Latin1\_General\_CP1\_CI\_AS** coll
-
+https://www.microsoft.com/en-us/download/details.aspx?id=54967
@@ -359,6 +359,8 @@ You must install SQL Server with the **SQL\_Latin1\_General\_CP1\_CI\_AS** coll
+**Note**
+In order to support SQL 2016 you must install the March 2017 Servicing Release for MDOP https://www.microsoft.com/en-us/download/details.aspx?id=54967 . In general stay current by always using the most recent servicing update as it also includes all bugfixes and new features.
### SQL Server processor, RAM, and disk space requirements – Stand-alone topology
diff --git a/store-for-business/acquire-apps-microsoft-store-for-business.md b/store-for-business/acquire-apps-microsoft-store-for-business.md
index 3c59ec92f0..c33748b67a 100644
--- a/store-for-business/acquire-apps-microsoft-store-for-business.md
+++ b/store-for-business/acquire-apps-microsoft-store-for-business.md
@@ -6,7 +6,9 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
ms.date: 11/01/2017
+ms.topic: conceptual
ms.localizationpriority: high
---
diff --git a/store-for-business/add-profile-to-devices.md b/store-for-business/add-profile-to-devices.md
index 411a0ae2cd..7dbd97369e 100644
--- a/store-for-business/add-profile-to-devices.md
+++ b/store-for-business/add-profile-to-devices.md
@@ -8,6 +8,7 @@ ms.pagetype: store
author: TrudyHa
ms.author: TrudyHa
ms.date: 2/9/2018
+ms.topic: conceptual
ms.localizationpriority: high
---
diff --git a/store-for-business/add-unsigned-app-to-code-integrity-policy.md b/store-for-business/add-unsigned-app-to-code-integrity-policy.md
index 74835df001..b98108019e 100644
--- a/store-for-business/add-unsigned-app-to-code-integrity-policy.md
+++ b/store-for-business/add-unsigned-app-to-code-integrity-policy.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store, security
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/app-inventory-management-microsoft-store-for-business.md b/store-for-business/app-inventory-management-microsoft-store-for-business.md
index 2471527f23..378577a85c 100644
--- a/store-for-business/app-inventory-management-microsoft-store-for-business.md
+++ b/store-for-business/app-inventory-management-microsoft-store-for-business.md
@@ -8,6 +8,7 @@ ms.sitesec: library
ms.pagetype: store
author: TrudyHa
ms.author: TrudyHa
+ms.topic: conceptual
ms.date: 10/16/2017
---
diff --git a/store-for-business/apps-in-microsoft-store-for-business.md b/store-for-business/apps-in-microsoft-store-for-business.md
index c1dd888a79..ee7ce7e0b1 100644
--- a/store-for-business/apps-in-microsoft-store-for-business.md
+++ b/store-for-business/apps-in-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/assign-apps-to-employees.md b/store-for-business/assign-apps-to-employees.md
index 0b7230b467..3af69fb912 100644
--- a/store-for-business/assign-apps-to-employees.md
+++ b/store-for-business/assign-apps-to-employees.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/13/2017
---
diff --git a/store-for-business/configure-mdm-provider-microsoft-store-for-business.md b/store-for-business/configure-mdm-provider-microsoft-store-for-business.md
index 9cbc2e2676..65cc6bfbe9 100644
--- a/store-for-business/configure-mdm-provider-microsoft-store-for-business.md
+++ b/store-for-business/configure-mdm-provider-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 1/6/2018
---
diff --git a/store-for-business/device-guard-signing-portal.md b/store-for-business/device-guard-signing-portal.md
index 19d5c5bfa6..583e67fbd7 100644
--- a/store-for-business/device-guard-signing-portal.md
+++ b/store-for-business/device-guard-signing-portal.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store, security
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/distribute-apps-from-your-private-store.md b/store-for-business/distribute-apps-from-your-private-store.md
index 2228ac8f3e..468df4a05e 100644
--- a/store-for-business/distribute-apps-from-your-private-store.md
+++ b/store-for-business/distribute-apps-from-your-private-store.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 3/19/2018
---
diff --git a/store-for-business/distribute-apps-to-your-employees-microsoft-store-for-business.md b/store-for-business/distribute-apps-to-your-employees-microsoft-store-for-business.md
index cab6dfb6e3..c6426e7ed9 100644
--- a/store-for-business/distribute-apps-to-your-employees-microsoft-store-for-business.md
+++ b/store-for-business/distribute-apps-to-your-employees-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/13/2017
---
diff --git a/store-for-business/distribute-apps-with-management-tool.md b/store-for-business/distribute-apps-with-management-tool.md
index 34e541c6e4..59c3458632 100644
--- a/store-for-business/distribute-apps-with-management-tool.md
+++ b/store-for-business/distribute-apps-with-management-tool.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/distribute-offline-apps.md b/store-for-business/distribute-offline-apps.md
index 0aacda9288..8885087daa 100644
--- a/store-for-business/distribute-offline-apps.md
+++ b/store-for-business/distribute-offline-apps.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/find-and-acquire-apps-overview.md b/store-for-business/find-and-acquire-apps-overview.md
index 99e13fa7c0..cdfab14a7f 100644
--- a/store-for-business/find-and-acquire-apps-overview.md
+++ b/store-for-business/find-and-acquire-apps-overview.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/index.md b/store-for-business/index.md
index 5c2990c742..71a8c271d1 100644
--- a/store-for-business/index.md
+++ b/store-for-business/index.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/manage-access-to-private-store.md b/store-for-business/manage-access-to-private-store.md
index 9b10d08550..dcf2a8f992 100644
--- a/store-for-business/manage-access-to-private-store.md
+++ b/store-for-business/manage-access-to-private-store.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.date: 10/17/2017
---
@@ -30,7 +32,7 @@ Organizations can use either an MDM policy, or Group Policy to show only their p
## Show private store only using MDM policy
-Organizations using an MDM to manage apps can use a policy to show only the private store. When your MDM supports Microsoft Store for Business, the MDM can use the [Policy CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx). More specifically, the [ApplicationManagement/RequirePrivateStoreOnly](https://msdn.microsoft.com/en-us/library/windows/hardware/dn904962.aspx#ApplicationManagement_RequirePrivateStoreOnly) policy.
+Organizations using an MDM to manage apps can use a policy to show only the private store. When your MDM supports Microsoft Store for Business, the MDM can use the [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx). More specifically, the [ApplicationManagement/RequirePrivateStoreOnly](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#ApplicationManagement_RequirePrivateStoreOnly) policy.
**ApplicationManagement/RequirePrivateStoreOnly** policy is supported on the following Windows 10 editions:
- Enterprise
diff --git a/store-for-business/manage-apps-microsoft-store-for-business-overview.md b/store-for-business/manage-apps-microsoft-store-for-business-overview.md
index 85fb5deed0..0659ad86dc 100644
--- a/store-for-business/manage-apps-microsoft-store-for-business-overview.md
+++ b/store-for-business/manage-apps-microsoft-store-for-business-overview.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/manage-mpsa-software-microsoft-store-for-business.md b/store-for-business/manage-mpsa-software-microsoft-store-for-business.md
index 970b3c783f..8f1ca2e3ce 100644
--- a/store-for-business/manage-mpsa-software-microsoft-store-for-business.md
+++ b/store-for-business/manage-mpsa-software-microsoft-store-for-business.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 3/20/2018
---
diff --git a/store-for-business/manage-orders-microsoft-store-for-business.md b/store-for-business/manage-orders-microsoft-store-for-business.md
index 2bc147f08b..f568a374eb 100644
--- a/store-for-business/manage-orders-microsoft-store-for-business.md
+++ b/store-for-business/manage-orders-microsoft-store-for-business.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 11/10/2017
---
diff --git a/store-for-business/manage-private-store-settings.md b/store-for-business/manage-private-store-settings.md
index e851331cdb..1ffbe49b5b 100644
--- a/store-for-business/manage-private-store-settings.md
+++ b/store-for-business/manage-private-store-settings.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.date: 3/29/2018
ms.localizationpriority: high
---
diff --git a/store-for-business/manage-settings-microsoft-store-for-business.md b/store-for-business/manage-settings-microsoft-store-for-business.md
index 7462859380..f3416cdec4 100644
--- a/store-for-business/manage-settings-microsoft-store-for-business.md
+++ b/store-for-business/manage-settings-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/manage-users-and-groups-microsoft-store-for-business.md b/store-for-business/manage-users-and-groups-microsoft-store-for-business.md
index 800ab20f14..d38bfadd62 100644
--- a/store-for-business/manage-users-and-groups-microsoft-store-for-business.md
+++ b/store-for-business/manage-users-and-groups-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
@@ -35,8 +37,8 @@ For more information on Azure AD, see [About Office 365 and Azure Active Directo
## Add user accounts to your Azure AD directory
If you created a new Azure AD directory when you signed up for Store for Business, you'll have a directory set up with one user account - the global administrator. That global administrator can add user accounts to your Azure AD directory. However, adding user accounts to your Azure AD directory will not give those employees access to Store for Business. You'll need to assign Store for Business roles to your employees. For more information, see [Roles and permissions in the Store for Business.](roles-and-permissions-microsoft-store-for-business.md)
-You can use the [Office 365 admin dashboard](https://go.microsoft.com/fwlink/p/?LinkId=708616) or [Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=691086) to add user accounts to your Azure AD directory. If you'll be using Azure management portal, you'll need an active subscription to [Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708617).
+You can use the [Office 365 admin dashboard](https://portal.office.com/adminportal) or [Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=691086) to add user accounts to your Azure AD directory. If you'll be using Azure management portal, you'll need an active subscription to [Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708617).
For more information, see:
-- [Add user accounts using Office 365 admin dashboard](https://go.microsoft.com/fwlink/p/?LinkId=708618)
-- [Add user accounts using Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708619)
\ No newline at end of file
+- [Add user accounts using Office 365 admin dashboard](https://support.office.com/en-us/article/add-users-individually-or-in-bulk-to-office-365-admin-help-1970f7d6-03b5-442f-b385-5880b9c256ec)
+- [Add user accounts using Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708619)
diff --git a/store-for-business/microsoft-store-for-business-education-powershell-module.md b/store-for-business/microsoft-store-for-business-education-powershell-module.md
index acc4768d86..294c61aa0a 100644
--- a/store-for-business/microsoft-store-for-business-education-powershell-module.md
+++ b/store-for-business/microsoft-store-for-business-education-powershell-module.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
localizationpriority: high
ms.author:
ms.date: 10/22/2017
diff --git a/store-for-business/microsoft-store-for-business-overview.md b/store-for-business/microsoft-store-for-business-overview.md
index 3dd01700a4..c9e7c8d541 100644
--- a/store-for-business/microsoft-store-for-business-overview.md
+++ b/store-for-business/microsoft-store-for-business-overview.md
@@ -7,6 +7,8 @@ ms.pagetype: store, mobile
ms.mktglfcycl: manage
ms.sitesec: library
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/notifications-microsoft-store-business.md b/store-for-business/notifications-microsoft-store-business.md
index 57ea2652f3..f48f641211 100644
--- a/store-for-business/notifications-microsoft-store-business.md
+++ b/store-for-business/notifications-microsoft-store-business.md
@@ -8,6 +8,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 07/27/2017
---
diff --git a/store-for-business/prerequisites-microsoft-store-for-business.md b/store-for-business/prerequisites-microsoft-store-for-business.md
index 48adf681cf..f6c1d85c7c 100644
--- a/store-for-business/prerequisites-microsoft-store-for-business.md
+++ b/store-for-business/prerequisites-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/13/2017
---
diff --git a/store-for-business/release-history-microsoft-store-business-education.md b/store-for-business/release-history-microsoft-store-business-education.md
index bb8c98ae04..59e3fc2354 100644
--- a/store-for-business/release-history-microsoft-store-business-education.md
+++ b/store-for-business/release-history-microsoft-store-business-education.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.date: 4/26/2018
---
diff --git a/store-for-business/roles-and-permissions-microsoft-store-for-business.md b/store-for-business/roles-and-permissions-microsoft-store-for-business.md
index e5c032895c..c784530f81 100644
--- a/store-for-business/roles-and-permissions-microsoft-store-for-business.md
+++ b/store-for-business/roles-and-permissions-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 3/30/2018
---
diff --git a/store-for-business/settings-reference-microsoft-store-for-business.md b/store-for-business/settings-reference-microsoft-store-for-business.md
index 334a1f8ed5..2e66f7c1d2 100644
--- a/store-for-business/settings-reference-microsoft-store-for-business.md
+++ b/store-for-business/settings-reference-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 11/01/2017
---
diff --git a/store-for-business/sfb-change-history.md b/store-for-business/sfb-change-history.md
index 0d80d2e32a..61ba68f8b6 100644
--- a/store-for-business/sfb-change-history.md
+++ b/store-for-business/sfb-change-history.md
@@ -7,6 +7,7 @@ ms.sitesec: library
ms.pagetype: store
author: TrudyHa
ms.author: TrudyHa
+ms.topic: conceptual
ms.date: 4/26/2018
ms.localizationpriority: high
---
diff --git a/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md b/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
index c042b9fa38..3401fb7506 100644
--- a/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
+++ b/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store, security
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/sign-up-microsoft-store-for-business-overview.md b/store-for-business/sign-up-microsoft-store-for-business-overview.md
index cf0109c335..322f58f498 100644
--- a/store-for-business/sign-up-microsoft-store-for-business-overview.md
+++ b/store-for-business/sign-up-microsoft-store-for-business-overview.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/13/2017
---
diff --git a/store-for-business/sign-up-microsoft-store-for-business.md b/store-for-business/sign-up-microsoft-store-for-business.md
index 2de6dc6f94..92588ae4b9 100644
--- a/store-for-business/sign-up-microsoft-store-for-business.md
+++ b/store-for-business/sign-up-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/troubleshoot-microsoft-store-for-business.md b/store-for-business/troubleshoot-microsoft-store-for-business.md
index cc5eefa7a5..85d37c28cb 100644
--- a/store-for-business/troubleshoot-microsoft-store-for-business.md
+++ b/store-for-business/troubleshoot-microsoft-store-for-business.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/13/2017
---
diff --git a/store-for-business/update-microsoft-store-for-business-account-settings.md b/store-for-business/update-microsoft-store-for-business-account-settings.md
index 26d293ea41..498e98ef45 100644
--- a/store-for-business/update-microsoft-store-for-business-account-settings.md
+++ b/store-for-business/update-microsoft-store-for-business-account-settings.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 10/17/2017
---
diff --git a/store-for-business/whats-new-microsoft-store-business-education.md b/store-for-business/whats-new-microsoft-store-business-education.md
index 92debb23e2..22f2d481f3 100644
--- a/store-for-business/whats-new-microsoft-store-business-education.md
+++ b/store-for-business/whats-new-microsoft-store-business-education.md
@@ -6,6 +6,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.date: 4/26/2018
---
diff --git a/store-for-business/working-with-line-of-business-apps.md b/store-for-business/working-with-line-of-business-apps.md
index 0c12c3b9f9..c4c5fb0ad1 100644
--- a/store-for-business/working-with-line-of-business-apps.md
+++ b/store-for-business/working-with-line-of-business-apps.md
@@ -7,6 +7,8 @@ ms.mktglfcycl: manage
ms.sitesec: library
ms.pagetype: store
author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
ms.localizationpriority: high
ms.date: 3/19/2018
---
diff --git a/windows/application-management/TOC.md b/windows/application-management/TOC.md
index 310d18137e..e726c4d38f 100644
--- a/windows/application-management/TOC.md
+++ b/windows/application-management/TOC.md
@@ -108,3 +108,4 @@
## [Disabling System Services in Windows Server](https://docs.microsoft.com/windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server)
## [Deploy app upgrades on Windows 10 Mobile](deploy-app-upgrades-windows-10-mobile.md)
## [Change history for Application management](change-history-for-application-management.md)
+## [How to keep apps removed from Windows 10 from returning during an update](remove-provisioned-apps-during-update.md)
\ No newline at end of file
diff --git a/windows/application-management/change-history-for-application-management.md b/windows/application-management/change-history-for-application-management.md
index 933bf0e0ab..580efc16c4 100644
--- a/windows/application-management/change-history-for-application-management.md
+++ b/windows/application-management/change-history-for-application-management.md
@@ -8,6 +8,8 @@ ms.sitesec: library
ms.pagetype: security
ms.localizationpriority: medium
author: jdeckerms
+ms.author: jdecker
+ms.topic: article
ms.date: 10/24/2017
---
diff --git a/windows/application-management/manage-windows-mixed-reality.md b/windows/application-management/manage-windows-mixed-reality.md
index d00670af75..f6af0d88a5 100644
--- a/windows/application-management/manage-windows-mixed-reality.md
+++ b/windows/application-management/manage-windows-mixed-reality.md
@@ -8,7 +8,8 @@ ms.sitesec: library
ms.localizationpriority: medium
author: jdeckerms
ms.author: jdecker
-ms.date: 04/30/2018
+ms.topic: article
+ms.date: 05/16/2018
---
# Enable or block Windows Mixed Reality apps in the enterprise
@@ -43,7 +44,7 @@ Organizations that use Windows Server Update Services (WSUS) must take action to
```
Add-Package
- Dism /Image:C:\test\offline /Add-Package /PackagePath:*path to the cab file*
+ Dism /Online /add-package /packagepath:(path)
```
c. In **Settings** > **Update & Security** > **Windows Update**, select **Check for updates**.
diff --git a/windows/application-management/remove-provisioned-apps-during-update.md b/windows/application-management/remove-provisioned-apps-during-update.md
new file mode 100644
index 0000000000..23057f6df2
--- /dev/null
+++ b/windows/application-management/remove-provisioned-apps-during-update.md
@@ -0,0 +1,127 @@
+---
+title: How to keep apps removed from Windows 10 from returning during an update
+description: How to keep provisioned apps that were removed from your machine from returning during an update.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.author: helohr
+author: HeidiLohr
+ms.date: 05/10/2018
+---
+# How to keep apps removed from Windows 10 from returning during an update
+
+>Applies to: Windows 10 (Semi-Annual Channel)
+
+When you update a computer running Windows 10, version 1703 or 1709, you might see provisioned apps that you previously removed return post-update. This can happen if the computer was offline when you removed the apps. This issue was fixed in Windows 10, version 1803.
+
+>[!NOTE]
+>* This issue only occurs after a feature update (from one version to the next), not monthly updates or security-related updates.
+>* This only applies to first-party apps that shipped with Windows 10. This doesn't apply to third-party apps, Microsoft Store apps, or LOB apps.
+
+To remove a provisioned app, you need to remove the provisioning package. The apps might reappear if you removed the packages in one of the following ways:
+
+* If you removed the packages while the wim file was mounted when the device was offline.
+* If you removed the packages by running a PowerShell cmdlet on the device while Windows was online. Although the apps won't appear for new users, you'll still see the apps for the user account you signed in as.
+
+When you remove a provisioned app, we create a registry key that tells Windows not to reinstall or update that app the next time Windows is updated. If the computer isn't online when you deprovision the app, then we don't create that registry key. (This behavior is fixed in Windows 10, version 1803. If you're running Windows 10, version 1709, apply the latest security update to fix it.)
+
+>[!NOTE]
+>If you remove a provisioned app while Windows is online, it's only removed for *new users*—the user that you signed in as will still have that provisioned app. That's because the registry key created when you deprovision the app only applies to new users created *after* the key is created. This doesn't happen if you remove the provisioned app while Windows is offline.
+
+To prevent these apps from reappearing at the next update, manually create a registry key for each app, then update the computer.
+
+## Create registry keys for deprovisioned apps
+
+Use the following steps to create a registry key:
+
+1. Identify any provisioned apps you want removed. Record the package name for each app.
+2. Create a .reg file to generate a registry key for each app. Use [this list of Windows 10, version 1709 registry keys](#registry-keys-for-provisioned-apps) as your starting point.
+ 1. Paste the list of registry keys into Notepad (or a text editor).
+ 2. Remove the registry keys belonging to the apps you want to keep. For example, if you want to keep the Bing Weather app, delete this registry key:
+ ```
+ HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\A ppxAllUserStore\Deprovisioned\Microsoft.BingWeather_8wekyb3d8bbwe]
+ ```
+ 3. Save the file with a .txt extension, then right-click the file and change the extension to .reg.
+3. Double-click the .reg file to create the registry keys. You can see the new keys in HKLM\\path-to-reg-keys.
+
+You're now ready to update your computer. After the update, check the list of apps in the computer to confirm the removed apps are still gone.
+
+## Package names for apps provisioned in Windows 10, version 1709
+
+|Displayed app name|Package name|
+|---|---|
+|Microsoft.3DBuilder|Microsoft.3DBuilder_15.2.10821.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.BingWeather|Microsoft.BingWeather_4.23.10923.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.DesktopAppInstaller|Microsoft.DesktopAppInstaller_1.10.16004.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.GetHelp|Microsoft.GetHelp_10.1706.1811.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Getstarted|Microsoft.Getstarted_5.12.2691.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.HEVCVideoExtension|Microsoft.HEVCVideoExtension_1.0.2512.0_x64__8wekyb3d8bbwe|
+|Microsoft.Messaging|Microsoft.Messaging_2018.124.707.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Microsoft3DViewer|Microsoft.Microsoft3DViewer_3.1803.29012.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.MicrosoftOfficeHub|Microsoft.MicrosoftOfficeHub_2017.715.118.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.MicrosoftSolitaireCollection|Microsoft.MicrosoftSolitaireCollection_3.18.12091.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.MicrosoftStickyNotes|Microsoft.MicrosoftStickyNotes_2.1.18.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.MSPaint|Microsoft.MSPaint_4.1803.21027.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Office.OneNote|Microsoft.Office.OneNote_2015.9126.21251.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.OneConnect|Microsoft.OneConnect_3.1708.2224.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.People|Microsoft.People_2017.1006.1846.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Print3D|Microsoft.Print3D_1.0.2422.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.SkypeApp|Microsoft.SkypeApp_12.1811.248.1000_neutral_~_kzf8qxf38zg5c|
+|Microsoft.StorePurchaseApp|Microsoft.StorePurchaseApp_11802.1802.23014.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Wallet|Microsoft.Wallet_1.0.16328.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Windows.Photos|Microsoft.Windows.Photos_2018.18022.15810.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsAlarms|Microsoft.WindowsAlarms_2017.920.157.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsCalculator|Microsoft.WindowsCalculator_2017.928.0.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsCamera|Microsoft.WindowsCamera_2017.1117.10.1000_neutral_~_8wekyb3d8bbwe|
+|microsoft.windowscommunicationsapps|microsoft.windowscommunicationsapps_2015.9126.21425.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsFeedbackHub|Microsoft.WindowsFeedbackHub_2018.323.50.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsMaps|Microsoft.WindowsMaps_2017.1003.1829.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsSoundRecorder|Microsoft.WindowsSoundRecorder_2017.928.5.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.WindowsStore|Microsoft.WindowsStore_11803.1001.613.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.Xbox.TCUI|Microsoft.Xbox.TCUI_1.8.24001.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.XboxApp|Microsoft.XboxApp_39.39.21002.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.XboxGameOverlay|Microsoft.XboxGameOverlay_1.24.5001.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.XboxIdentityProvider|Microsoft.XboxIdentityProvider_2017.605.1240.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.XboxSpeechToTextOverlay|Microsoft.XboxSpeechToTextOverlay_1.21.13002.0_neutral_~_8wekyb3d8bbwe|
+|Microsoft.ZuneMusic|Microsoft.ZuneMusic_2019.18011.13411.1000_neutral_~_8wekyb3d8bbwe|
+|Microsoft.ZuneVideo|Microsoft.ZuneVideo_2019.17122.16211.1000_neutral_~_8wekyb3d8bbwe|
+
+## Registry keys for provisioned apps
+
+```syntax
+1709 Registry Keys
+Windows Registry Editor Version 5.00
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.BingWeather_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.GetHelp_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Getstarted_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Microsoft3DViewer_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.MicrosoftOfficeHub_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.MicrosoftSolitaireCollection_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.MicrosoftStickyNotes_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.MSPaint_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Office.OneNote_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.OneConnect_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.People_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Print3D_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.SkypeApp_kzf8qxf38zg5c]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.StorePurchaseApp_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Wallet_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Windows.Photos_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsAlarms_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsCalculator_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsCamera_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\microsoft.windowscommunicationsapps_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsFeedbackHub_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsMaps_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsSoundRecorder_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.WindowsStore_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.Xbox.TCUI_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.XboxApp_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.XboxGameOverlay_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.XboxIdentityProvider_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.XboxSpeechToTextOverlay_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.ZuneMusic_8wekyb3d8bbwe]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Appx\AppxAllUserStore\Deprovisioned\Microsoft.ZuneVideo_8wekyb3d8bbwe]
+```
diff --git a/windows/client-management/mdm/accountmanagement-csp.md b/windows/client-management/mdm/accountmanagement-csp.md
index 0575027aa8..866c9e3470 100644
--- a/windows/client-management/mdm/accountmanagement-csp.md
+++ b/windows/client-management/mdm/accountmanagement-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/23/2018
---
diff --git a/windows/client-management/mdm/accountmanagement-ddf.md b/windows/client-management/mdm/accountmanagement-ddf.md
index a7703a14e8..4e6eb780a7 100644
--- a/windows/client-management/mdm/accountmanagement-ddf.md
+++ b/windows/client-management/mdm/accountmanagement-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/23/2018
---
diff --git a/windows/client-management/mdm/accounts-csp.md b/windows/client-management/mdm/accounts-csp.md
index a5bb5e5ab5..08b59f469e 100644
--- a/windows/client-management/mdm/accounts-csp.md
+++ b/windows/client-management/mdm/accounts-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/17/2018
---
diff --git a/windows/client-management/mdm/accounts-ddf-file.md b/windows/client-management/mdm/accounts-ddf-file.md
index 0153899c28..a6e5b3ded3 100644
--- a/windows/client-management/mdm/accounts-ddf-file.md
+++ b/windows/client-management/mdm/accounts-ddf-file.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/17/2018
---
diff --git a/windows/client-management/mdm/activesync-csp.md b/windows/client-management/mdm/activesync-csp.md
index 80431db230..aed29f1f97 100644
--- a/windows/client-management/mdm/activesync-csp.md
+++ b/windows/client-management/mdm/activesync-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/activesync-ddf-file.md b/windows/client-management/mdm/activesync-ddf-file.md
index 51c1385789..a1c9d4cb8d 100644
--- a/windows/client-management/mdm/activesync-ddf-file.md
+++ b/windows/client-management/mdm/activesync-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
index 281dc44c70..5065235319 100644
--- a/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
+++ b/windows/client-management/mdm/add-an-azure-ad-tenant-and-azure-ad-subscription.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/alljoynmanagement-csp.md b/windows/client-management/mdm/alljoynmanagement-csp.md
index c8e1153a75..8745e5a972 100644
--- a/windows/client-management/mdm/alljoynmanagement-csp.md
+++ b/windows/client-management/mdm/alljoynmanagement-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/alljoynmanagement-ddf.md b/windows/client-management/mdm/alljoynmanagement-ddf.md
index 2356c2dd90..c9da82f50a 100644
--- a/windows/client-management/mdm/alljoynmanagement-ddf.md
+++ b/windows/client-management/mdm/alljoynmanagement-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/application-csp.md b/windows/client-management/mdm/application-csp.md
index a8eaca5a12..2f3b7f1d06 100644
--- a/windows/client-management/mdm/application-csp.md
+++ b/windows/client-management/mdm/application-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/applicationrestrictions-xsd.md b/windows/client-management/mdm/applicationrestrictions-xsd.md
index 54e3d3c6b5..1a54b6702f 100644
--- a/windows/client-management/mdm/applicationrestrictions-xsd.md
+++ b/windows/client-management/mdm/applicationrestrictions-xsd.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/applocker-csp.md b/windows/client-management/mdm/applocker-csp.md
index e380c4b6bf..f1f1e0aaaa 100644
--- a/windows/client-management/mdm/applocker-csp.md
+++ b/windows/client-management/mdm/applocker-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/30/2018
---
diff --git a/windows/client-management/mdm/applocker-ddf-file.md b/windows/client-management/mdm/applocker-ddf-file.md
index fe6e6c167c..b61780ae9e 100644
--- a/windows/client-management/mdm/applocker-ddf-file.md
+++ b/windows/client-management/mdm/applocker-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/applocker-xsd.md b/windows/client-management/mdm/applocker-xsd.md
index ecce16aabf..ea7901dc45 100644
--- a/windows/client-management/mdm/applocker-xsd.md
+++ b/windows/client-management/mdm/applocker-xsd.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/appv-deploy-and-config.md b/windows/client-management/mdm/appv-deploy-and-config.md
index 1a3dce230a..5b7d449cb7 100644
--- a/windows/client-management/mdm/appv-deploy-and-config.md
+++ b/windows/client-management/mdm/appv-deploy-and-config.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/assign-seats.md b/windows/client-management/mdm/assign-seats.md
index dfe0baab52..1033a9f800 100644
--- a/windows/client-management/mdm/assign-seats.md
+++ b/windows/client-management/mdm/assign-seats.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/assignedaccess-csp.md b/windows/client-management/mdm/assignedaccess-csp.md
index 7287b515ba..9ee6c9171a 100644
--- a/windows/client-management/mdm/assignedaccess-csp.md
+++ b/windows/client-management/mdm/assignedaccess-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/25/2018
---
diff --git a/windows/client-management/mdm/assignedaccess-ddf.md b/windows/client-management/mdm/assignedaccess-ddf.md
index f57c98d76e..a76545fe53 100644
--- a/windows/client-management/mdm/assignedaccess-ddf.md
+++ b/windows/client-management/mdm/assignedaccess-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 02/22/2018
---
diff --git a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
index 87f7c33162..e4e4f8910a 100644
--- a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
+++ b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/05/2017
---
diff --git a/windows/client-management/mdm/azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md b/windows/client-management/mdm/azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
index f93d78ce36..c0a57334bc 100644
--- a/windows/client-management/mdm/azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
+++ b/windows/client-management/mdm/azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 01/17/2018
---
diff --git a/windows/client-management/mdm/bitlocker-csp.md b/windows/client-management/mdm/bitlocker-csp.md
index ce295ef0c7..a1a2dd3a81 100644
--- a/windows/client-management/mdm/bitlocker-csp.md
+++ b/windows/client-management/mdm/bitlocker-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 01/04/2018
---
diff --git a/windows/client-management/mdm/bitlocker-ddf-file.md b/windows/client-management/mdm/bitlocker-ddf-file.md
index 2e799e20dd..b3df788f7c 100644
--- a/windows/client-management/mdm/bitlocker-ddf-file.md
+++ b/windows/client-management/mdm/bitlocker-ddf-file.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/bootstrap-csp.md b/windows/client-management/mdm/bootstrap-csp.md
index 91c374f17b..e59f02fc74 100644
--- a/windows/client-management/mdm/bootstrap-csp.md
+++ b/windows/client-management/mdm/bootstrap-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/browserfavorite-csp.md b/windows/client-management/mdm/browserfavorite-csp.md
index 5dc4046e6f..de3a4c2736 100644
--- a/windows/client-management/mdm/browserfavorite-csp.md
+++ b/windows/client-management/mdm/browserfavorite-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
index 1bf6f155f5..953ec2e528 100644
--- a/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
+++ b/windows/client-management/mdm/bulk-assign-and-reclaim-seats-from-user.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
index ea6b39ee4f..63c22e0fb2 100644
--- a/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
+++ b/windows/client-management/mdm/bulk-enrollment-using-windows-provisioning-tool.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/cellularsettings-csp.md b/windows/client-management/mdm/cellularsettings-csp.md
index 21a3bbbdc4..19669fb1b1 100644
--- a/windows/client-management/mdm/cellularsettings-csp.md
+++ b/windows/client-management/mdm/cellularsettings-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/certificate-authentication-device-enrollment.md b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
index a7b94f6b27..6562fc73d0 100644
--- a/windows/client-management/mdm/certificate-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/certificate-authentication-device-enrollment.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/certificate-renewal-windows-mdm.md b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
index b2241c0952..a857467f1a 100644
--- a/windows/client-management/mdm/certificate-renewal-windows-mdm.md
+++ b/windows/client-management/mdm/certificate-renewal-windows-mdm.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/certificatestore-csp.md b/windows/client-management/mdm/certificatestore-csp.md
index 21a4fb28c2..cde5940e24 100644
--- a/windows/client-management/mdm/certificatestore-csp.md
+++ b/windows/client-management/mdm/certificatestore-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/certificatestore-ddf-file.md b/windows/client-management/mdm/certificatestore-ddf-file.md
index ab234ad8a1..820779ea14 100644
--- a/windows/client-management/mdm/certificatestore-ddf-file.md
+++ b/windows/client-management/mdm/certificatestore-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/cleanpc-csp.md b/windows/client-management/mdm/cleanpc-csp.md
index 78bcc6d494..4ce39d12fb 100644
--- a/windows/client-management/mdm/cleanpc-csp.md
+++ b/windows/client-management/mdm/cleanpc-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/cleanpc-ddf.md b/windows/client-management/mdm/cleanpc-ddf.md
index af04d6e6d4..1c1c3ded0a 100644
--- a/windows/client-management/mdm/cleanpc-ddf.md
+++ b/windows/client-management/mdm/cleanpc-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/clientcertificateinstall-csp.md b/windows/client-management/mdm/clientcertificateinstall-csp.md
index 1183e5b3d6..bf01d38374 100644
--- a/windows/client-management/mdm/clientcertificateinstall-csp.md
+++ b/windows/client-management/mdm/clientcertificateinstall-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 11/03/2017
---
diff --git a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
index 10617e23a2..977dd79898 100644
--- a/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
+++ b/windows/client-management/mdm/clientcertificateinstall-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/cm-cellularentries-csp.md b/windows/client-management/mdm/cm-cellularentries-csp.md
index 22bb311265..adffb8bef0 100644
--- a/windows/client-management/mdm/cm-cellularentries-csp.md
+++ b/windows/client-management/mdm/cm-cellularentries-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 08/02/2017
---
diff --git a/windows/client-management/mdm/cm-proxyentries-csp.md b/windows/client-management/mdm/cm-proxyentries-csp.md
index 59956b5db5..50b393f039 100644
--- a/windows/client-management/mdm/cm-proxyentries-csp.md
+++ b/windows/client-management/mdm/cm-proxyentries-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/cmpolicy-csp.md b/windows/client-management/mdm/cmpolicy-csp.md
index 1eeee323ba..6b1ae02496 100644
--- a/windows/client-management/mdm/cmpolicy-csp.md
+++ b/windows/client-management/mdm/cmpolicy-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/cmpolicyenterprise-csp.md b/windows/client-management/mdm/cmpolicyenterprise-csp.md
index 75a6658d5e..46f6724edb 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-csp.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
index 17d660ee81..8082e19a7b 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md
index dbd55b06f3..1bc5f854f8 100644
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/24/2018
---
diff --git a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
index 97eba5a985..e9e64f8c54 100644
--- a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
+++ b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/customdeviceui-csp.md b/windows/client-management/mdm/customdeviceui-csp.md
index b813a4a4d1..06c4308457 100644
--- a/windows/client-management/mdm/customdeviceui-csp.md
+++ b/windows/client-management/mdm/customdeviceui-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/customdeviceui-ddf.md b/windows/client-management/mdm/customdeviceui-ddf.md
index 265fa33a9b..d862212b6c 100644
--- a/windows/client-management/mdm/customdeviceui-ddf.md
+++ b/windows/client-management/mdm/customdeviceui-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/data-structures-windows-store-for-business.md b/windows/client-management/mdm/data-structures-windows-store-for-business.md
index 4f63cd3e06..3b6a66593b 100644
--- a/windows/client-management/mdm/data-structures-windows-store-for-business.md
+++ b/windows/client-management/mdm/data-structures-windows-store-for-business.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/defender-csp.md b/windows/client-management/mdm/defender-csp.md
index 3abe24d7f7..3e9c038842 100644
--- a/windows/client-management/mdm/defender-csp.md
+++ b/windows/client-management/mdm/defender-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 01/29/2018
---
diff --git a/windows/client-management/mdm/defender-ddf.md b/windows/client-management/mdm/defender-ddf.md
index 1a0438dc8e..c0f90952b5 100644
--- a/windows/client-management/mdm/defender-ddf.md
+++ b/windows/client-management/mdm/defender-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 01/29/20178
---
diff --git a/windows/client-management/mdm/design-a-custom-windows-csp.md b/windows/client-management/mdm/design-a-custom-windows-csp.md
index de5fb5efed..66df907c0c 100644
--- a/windows/client-management/mdm/design-a-custom-windows-csp.md
+++ b/windows/client-management/mdm/design-a-custom-windows-csp.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/devdetail-csp.md b/windows/client-management/mdm/devdetail-csp.md
index 786d02beff..4537f2c630 100644
--- a/windows/client-management/mdm/devdetail-csp.md
+++ b/windows/client-management/mdm/devdetail-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 08/25/2017
---
diff --git a/windows/client-management/mdm/devdetail-ddf-file.md b/windows/client-management/mdm/devdetail-ddf-file.md
index 9ae9264eea..7a3c0a14cc 100644
--- a/windows/client-management/mdm/devdetail-ddf-file.md
+++ b/windows/client-management/mdm/devdetail-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/developersetup-csp.md b/windows/client-management/mdm/developersetup-csp.md
index de3145a84f..6562f29006 100644
--- a/windows/client-management/mdm/developersetup-csp.md
+++ b/windows/client-management/mdm/developersetup-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/developersetup-ddf.md b/windows/client-management/mdm/developersetup-ddf.md
index 6560f47d5a..6ca207820f 100644
--- a/windows/client-management/mdm/developersetup-ddf.md
+++ b/windows/client-management/mdm/developersetup-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/device-update-management.md b/windows/client-management/mdm/device-update-management.md
index d00d0a4d57..f20da5c4c5 100644
--- a/windows/client-management/mdm/device-update-management.md
+++ b/windows/client-management/mdm/device-update-management.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 11/15/2017
---
diff --git a/windows/client-management/mdm/deviceinstanceservice-csp.md b/windows/client-management/mdm/deviceinstanceservice-csp.md
index daa68b5f98..9c8435dbaa 100644
--- a/windows/client-management/mdm/deviceinstanceservice-csp.md
+++ b/windows/client-management/mdm/deviceinstanceservice-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/devicelock-csp.md b/windows/client-management/mdm/devicelock-csp.md
index d70696fa67..8d44aca043 100644
--- a/windows/client-management/mdm/devicelock-csp.md
+++ b/windows/client-management/mdm/devicelock-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/devicelock-ddf-file.md b/windows/client-management/mdm/devicelock-ddf-file.md
index b28ed962ce..11ec6e0bf0 100644
--- a/windows/client-management/mdm/devicelock-ddf-file.md
+++ b/windows/client-management/mdm/devicelock-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/devicemanageability-csp.md b/windows/client-management/mdm/devicemanageability-csp.md
index 3ddbb3dcaa..fb86e76896 100644
--- a/windows/client-management/mdm/devicemanageability-csp.md
+++ b/windows/client-management/mdm/devicemanageability-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 11/01/2017
---
diff --git a/windows/client-management/mdm/devicemanageability-ddf.md b/windows/client-management/mdm/devicemanageability-ddf.md
index ebb83615c2..44440337e3 100644
--- a/windows/client-management/mdm/devicemanageability-ddf.md
+++ b/windows/client-management/mdm/devicemanageability-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/devicestatus-csp.md b/windows/client-management/mdm/devicestatus-csp.md
index 25e45dfb80..89a798ab13 100644
--- a/windows/client-management/mdm/devicestatus-csp.md
+++ b/windows/client-management/mdm/devicestatus-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/devicestatus-ddf.md b/windows/client-management/mdm/devicestatus-ddf.md
index 7e4a7a5933..8f0e5a3364 100644
--- a/windows/client-management/mdm/devicestatus-ddf.md
+++ b/windows/client-management/mdm/devicestatus-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/devinfo-csp.md b/windows/client-management/mdm/devinfo-csp.md
index b7a165df3b..bbff58b76c 100644
--- a/windows/client-management/mdm/devinfo-csp.md
+++ b/windows/client-management/mdm/devinfo-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/devinfo-ddf-file.md b/windows/client-management/mdm/devinfo-ddf-file.md
index 114a481554..8b88fb1918 100644
--- a/windows/client-management/mdm/devinfo-ddf-file.md
+++ b/windows/client-management/mdm/devinfo-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
index 8301049541..9fc4d5138f 100644
--- a/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
+++ b/windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/diagnosticlog-csp.md b/windows/client-management/mdm/diagnosticlog-csp.md
index 106105c026..4b9157ad49 100644
--- a/windows/client-management/mdm/diagnosticlog-csp.md
+++ b/windows/client-management/mdm/diagnosticlog-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/diagnosticlog-ddf.md b/windows/client-management/mdm/diagnosticlog-ddf.md
index 31cee8e1de..4fb7edff7c 100644
--- a/windows/client-management/mdm/diagnosticlog-ddf.md
+++ b/windows/client-management/mdm/diagnosticlog-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
index 03e23b59f5..13878c6f74 100644
--- a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
+++ b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/dmacc-csp.md b/windows/client-management/mdm/dmacc-csp.md
index e0a6c7450e..8db057501d 100644
--- a/windows/client-management/mdm/dmacc-csp.md
+++ b/windows/client-management/mdm/dmacc-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/dmacc-ddf-file.md b/windows/client-management/mdm/dmacc-ddf-file.md
index 31b0c6a655..93a041f3d1 100644
--- a/windows/client-management/mdm/dmacc-ddf-file.md
+++ b/windows/client-management/mdm/dmacc-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/dmclient-csp.md b/windows/client-management/mdm/dmclient-csp.md
index 6adcc5b415..bde1f8c70d 100644
--- a/windows/client-management/mdm/dmclient-csp.md
+++ b/windows/client-management/mdm/dmclient-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 11/01/2017
---
diff --git a/windows/client-management/mdm/dmclient-ddf-file.md b/windows/client-management/mdm/dmclient-ddf-file.md
index e4a11620fa..1c171bbb0f 100644
--- a/windows/client-management/mdm/dmclient-ddf-file.md
+++ b/windows/client-management/mdm/dmclient-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/dmprocessconfigxmlfiltered.md b/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
index 880ca3e6ec..f035ff93d4 100644
--- a/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
+++ b/windows/client-management/mdm/dmprocessconfigxmlfiltered.md
@@ -16,7 +16,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/dmsessionactions-csp.md b/windows/client-management/mdm/dmsessionactions-csp.md
index 6b098de192..6e8aa70785 100644
--- a/windows/client-management/mdm/dmsessionactions-csp.md
+++ b/windows/client-management/mdm/dmsessionactions-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/dmsessionactions-ddf.md b/windows/client-management/mdm/dmsessionactions-ddf.md
index d04dff87aa..e587b4c69f 100644
--- a/windows/client-management/mdm/dmsessionactions-ddf.md
+++ b/windows/client-management/mdm/dmsessionactions-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/dynamicmanagement-csp.md b/windows/client-management/mdm/dynamicmanagement-csp.md
index cbe6465b8c..4d50badd48 100644
--- a/windows/client-management/mdm/dynamicmanagement-csp.md
+++ b/windows/client-management/mdm/dynamicmanagement-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/dynamicmanagement-ddf.md b/windows/client-management/mdm/dynamicmanagement-ddf.md
index 91f179d6ce..0ca27a4ec0 100644
--- a/windows/client-management/mdm/dynamicmanagement-ddf.md
+++ b/windows/client-management/mdm/dynamicmanagement-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/eap-configuration.md b/windows/client-management/mdm/eap-configuration.md
index 87bea65441..4c66aef7db 100644
--- a/windows/client-management/mdm/eap-configuration.md
+++ b/windows/client-management/mdm/eap-configuration.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/email2-csp.md b/windows/client-management/mdm/email2-csp.md
index 60e492ca69..dce5177a0f 100644
--- a/windows/client-management/mdm/email2-csp.md
+++ b/windows/client-management/mdm/email2-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/email2-ddf-file.md b/windows/client-management/mdm/email2-ddf-file.md
index f550a0c9c7..cad330322f 100644
--- a/windows/client-management/mdm/email2-ddf-file.md
+++ b/windows/client-management/mdm/email2-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md b/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md
index 3cbe681524..acb4952dea 100644
--- a/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md
+++ b/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 11/01/2017
---
diff --git a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
index d5799f4611..4c21520591 100644
--- a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
+++ b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md b/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
index 86fa8a02b9..5e60eb85a2 100644
--- a/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
+++ b/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 10/04/2017
---
diff --git a/windows/client-management/mdm/enterprise-app-management.md b/windows/client-management/mdm/enterprise-app-management.md
index 8aaf17e2a9..755b31d58e 100644
--- a/windows/client-management/mdm/enterprise-app-management.md
+++ b/windows/client-management/mdm/enterprise-app-management.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/22/2017
---
diff --git a/windows/client-management/mdm/enterpriseapn-csp.md b/windows/client-management/mdm/enterpriseapn-csp.md
index 9795891e62..ecf0ae28ec 100644
--- a/windows/client-management/mdm/enterpriseapn-csp.md
+++ b/windows/client-management/mdm/enterpriseapn-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/22/2017
---
diff --git a/windows/client-management/mdm/enterpriseapn-ddf.md b/windows/client-management/mdm/enterpriseapn-ddf.md
index 99d327d3d4..ebd171a390 100644
--- a/windows/client-management/mdm/enterpriseapn-ddf.md
+++ b/windows/client-management/mdm/enterpriseapn-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enterpriseappmanagement-csp.md b/windows/client-management/mdm/enterpriseappmanagement-csp.md
index 64e6e98dcb..a17fca7628 100644
--- a/windows/client-management/mdm/enterpriseappmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappmanagement-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterpriseappvmanagement-csp.md b/windows/client-management/mdm/enterpriseappvmanagement-csp.md
index 9b0c5cf24b..006a9353a2 100644
--- a/windows/client-management/mdm/enterpriseappvmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappvmanagement-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterpriseappvmanagement-ddf.md b/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
index 1946bb8358..bc28fee863 100644
--- a/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
+++ b/windows/client-management/mdm/enterpriseappvmanagement-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-csp.md b/windows/client-management/mdm/enterpriseassignedaccess-csp.md
index 222f582e36..e5f202eacb 100644
--- a/windows/client-management/mdm/enterpriseassignedaccess-csp.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 07/12/2017
---
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md b/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
index 58a3bf5f04..890112e13c 100644
--- a/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md b/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
index a95eed6af8..cb651d8548 100644
--- a/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
+++ b/windows/client-management/mdm/enterpriseassignedaccess-xsd.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterprisedataprotection-csp.md b/windows/client-management/mdm/enterprisedataprotection-csp.md
index c79f4f55e9..f76ebb330b 100644
--- a/windows/client-management/mdm/enterprisedataprotection-csp.md
+++ b/windows/client-management/mdm/enterprisedataprotection-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 08/09/2017
---
diff --git a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
index eb9a7eb29d..15c68b54d0 100644
--- a/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedataprotection-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md b/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
index 89037bff06..2c036e00e7 100644
--- a/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 07/11/2017
---
diff --git a/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md b/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
index 9b847cedfb..26ff1f5785 100644
--- a/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md b/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
index 82d8fb2f13..79f6ff63e1 100644
--- a/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
+++ b/windows/client-management/mdm/enterprisedesktopappmanagement2-xsd.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterpriseext-csp.md b/windows/client-management/mdm/enterpriseext-csp.md
index 376700561f..fe887a54e4 100644
--- a/windows/client-management/mdm/enterpriseext-csp.md
+++ b/windows/client-management/mdm/enterpriseext-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterpriseext-ddf.md b/windows/client-management/mdm/enterpriseext-ddf.md
index 39bca734e1..72451bab66 100644
--- a/windows/client-management/mdm/enterpriseext-ddf.md
+++ b/windows/client-management/mdm/enterpriseext-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enterpriseextfilessystem-csp.md b/windows/client-management/mdm/enterpriseextfilessystem-csp.md
index ead94360c1..b7afdf089e 100644
--- a/windows/client-management/mdm/enterpriseextfilessystem-csp.md
+++ b/windows/client-management/mdm/enterpriseextfilessystem-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md b/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
index b3bd10d28c..eafe9dc1ab 100644
--- a/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
+++ b/windows/client-management/mdm/enterpriseextfilesystem-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
index 0921c036c4..b4f3ce2304 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/01/2018
---
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md b/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
index 12cb46b485..08075cd45e 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/01/2018
---
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md b/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
index b962018dfd..3c81c009ea 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-xsd.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/euiccs-csp.md b/windows/client-management/mdm/euiccs-csp.md
index eb5f1186ce..8e493b7fa5 100644
--- a/windows/client-management/mdm/euiccs-csp.md
+++ b/windows/client-management/mdm/euiccs-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/02/2018
---
diff --git a/windows/client-management/mdm/euiccs-ddf-file.md b/windows/client-management/mdm/euiccs-ddf-file.md
index 06be1ba347..6649a7a42d 100644
--- a/windows/client-management/mdm/euiccs-ddf-file.md
+++ b/windows/client-management/mdm/euiccs-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/02/2018
---
diff --git a/windows/client-management/mdm/federated-authentication-device-enrollment.md b/windows/client-management/mdm/federated-authentication-device-enrollment.md
index 891a590e8b..22ee108fb4 100644
--- a/windows/client-management/mdm/federated-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/federated-authentication-device-enrollment.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 07/28/2017
---
diff --git a/windows/client-management/mdm/filesystem-csp.md b/windows/client-management/mdm/filesystem-csp.md
index cf58cd9eec..5e2ce038a2 100644
--- a/windows/client-management/mdm/filesystem-csp.md
+++ b/windows/client-management/mdm/filesystem-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/firewall-csp.md b/windows/client-management/mdm/firewall-csp.md
index 8140375101..1a552c057a 100644
--- a/windows/client-management/mdm/firewall-csp.md
+++ b/windows/client-management/mdm/firewall-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 01/26/2018
---
diff --git a/windows/client-management/mdm/firewall-ddf-file.md b/windows/client-management/mdm/firewall-ddf-file.md
index 6dbc4367bb..f9a9e98d71 100644
--- a/windows/client-management/mdm/firewall-ddf-file.md
+++ b/windows/client-management/mdm/firewall-ddf-file.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/get-inventory.md b/windows/client-management/mdm/get-inventory.md
index 996288488b..b40c8c4274 100644
--- a/windows/client-management/mdm/get-inventory.md
+++ b/windows/client-management/mdm/get-inventory.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-localized-product-details.md b/windows/client-management/mdm/get-localized-product-details.md
index 9c23d4096b..990c816be4 100644
--- a/windows/client-management/mdm/get-localized-product-details.md
+++ b/windows/client-management/mdm/get-localized-product-details.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-offline-license.md b/windows/client-management/mdm/get-offline-license.md
index 44417ff92c..65ae6a7b6a 100644
--- a/windows/client-management/mdm/get-offline-license.md
+++ b/windows/client-management/mdm/get-offline-license.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-product-details.md b/windows/client-management/mdm/get-product-details.md
index c1d6da5658..30ec8b7d37 100644
--- a/windows/client-management/mdm/get-product-details.md
+++ b/windows/client-management/mdm/get-product-details.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-product-package.md b/windows/client-management/mdm/get-product-package.md
index f851fbc6e7..15dd879715 100644
--- a/windows/client-management/mdm/get-product-package.md
+++ b/windows/client-management/mdm/get-product-package.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-product-packages.md b/windows/client-management/mdm/get-product-packages.md
index 115cc191c9..cda326c9e5 100644
--- a/windows/client-management/mdm/get-product-packages.md
+++ b/windows/client-management/mdm/get-product-packages.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-seat.md b/windows/client-management/mdm/get-seat.md
index 0ac45f69ca..ae6f05d26d 100644
--- a/windows/client-management/mdm/get-seat.md
+++ b/windows/client-management/mdm/get-seat.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-seats-assigned-to-a-user.md b/windows/client-management/mdm/get-seats-assigned-to-a-user.md
index 4c1e6bb379..1209d5aa2a 100644
--- a/windows/client-management/mdm/get-seats-assigned-to-a-user.md
+++ b/windows/client-management/mdm/get-seats-assigned-to-a-user.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/get-seats.md b/windows/client-management/mdm/get-seats.md
index 029fc4f030..f65e6988e2 100644
--- a/windows/client-management/mdm/get-seats.md
+++ b/windows/client-management/mdm/get-seats.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 09/18/2017
---
diff --git a/windows/client-management/mdm/healthattestation-csp.md b/windows/client-management/mdm/healthattestation-csp.md
index dcb5b491fd..2ebb1b49fe 100644
--- a/windows/client-management/mdm/healthattestation-csp.md
+++ b/windows/client-management/mdm/healthattestation-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/healthattestation-ddf.md b/windows/client-management/mdm/healthattestation-ddf.md
index 5268078e48..8296982379 100644
--- a/windows/client-management/mdm/healthattestation-ddf.md
+++ b/windows/client-management/mdm/healthattestation-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/hotspot-csp.md b/windows/client-management/mdm/hotspot-csp.md
index 20ac4822c5..87aa4a054e 100644
--- a/windows/client-management/mdm/hotspot-csp.md
+++ b/windows/client-management/mdm/hotspot-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/iconfigserviceprovider2.md b/windows/client-management/mdm/iconfigserviceprovider2.md
index 6ddf6d6d93..fbdb51d309 100644
--- a/windows/client-management/mdm/iconfigserviceprovider2.md
+++ b/windows/client-management/mdm/iconfigserviceprovider2.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md b/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md
index 74f076cc41..1ae5155478 100644
--- a/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md
+++ b/windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/iconfigserviceprovider2getnode.md b/windows/client-management/mdm/iconfigserviceprovider2getnode.md
index 4fd62bc432..df315b2ba4 100644
--- a/windows/client-management/mdm/iconfigserviceprovider2getnode.md
+++ b/windows/client-management/mdm/iconfigserviceprovider2getnode.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnode.md b/windows/client-management/mdm/icspnode.md
index 23e39b227c..dedf93e0b1 100644
--- a/windows/client-management/mdm/icspnode.md
+++ b/windows/client-management/mdm/icspnode.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodeadd.md b/windows/client-management/mdm/icspnodeadd.md
index 81fb9d967d..504d0751e1 100644
--- a/windows/client-management/mdm/icspnodeadd.md
+++ b/windows/client-management/mdm/icspnodeadd.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodeclear.md b/windows/client-management/mdm/icspnodeclear.md
index 355577e43e..2c0e45ea99 100644
--- a/windows/client-management/mdm/icspnodeclear.md
+++ b/windows/client-management/mdm/icspnodeclear.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodecopy.md b/windows/client-management/mdm/icspnodecopy.md
index b9822fc38b..1061d2b6b9 100644
--- a/windows/client-management/mdm/icspnodecopy.md
+++ b/windows/client-management/mdm/icspnodecopy.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodedeletechild.md b/windows/client-management/mdm/icspnodedeletechild.md
index 92497291bf..147c0f4af3 100644
--- a/windows/client-management/mdm/icspnodedeletechild.md
+++ b/windows/client-management/mdm/icspnodedeletechild.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodedeleteproperty.md b/windows/client-management/mdm/icspnodedeleteproperty.md
index 3b2c6743d4..b771500d38 100644
--- a/windows/client-management/mdm/icspnodedeleteproperty.md
+++ b/windows/client-management/mdm/icspnodedeleteproperty.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodeexecute.md b/windows/client-management/mdm/icspnodeexecute.md
index b1fba31565..12c428de69 100644
--- a/windows/client-management/mdm/icspnodeexecute.md
+++ b/windows/client-management/mdm/icspnodeexecute.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodegetchildnodenames.md b/windows/client-management/mdm/icspnodegetchildnodenames.md
index 3ea4793494..72d72c56ac 100644
--- a/windows/client-management/mdm/icspnodegetchildnodenames.md
+++ b/windows/client-management/mdm/icspnodegetchildnodenames.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodegetproperty.md b/windows/client-management/mdm/icspnodegetproperty.md
index daaffe8564..0778b71554 100644
--- a/windows/client-management/mdm/icspnodegetproperty.md
+++ b/windows/client-management/mdm/icspnodegetproperty.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodegetpropertyidentifiers.md b/windows/client-management/mdm/icspnodegetpropertyidentifiers.md
index 5ede9f4479..d0c557b04f 100644
--- a/windows/client-management/mdm/icspnodegetpropertyidentifiers.md
+++ b/windows/client-management/mdm/icspnodegetpropertyidentifiers.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodegetvalue.md b/windows/client-management/mdm/icspnodegetvalue.md
index 6446023340..6207cb507c 100644
--- a/windows/client-management/mdm/icspnodegetvalue.md
+++ b/windows/client-management/mdm/icspnodegetvalue.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodemove.md b/windows/client-management/mdm/icspnodemove.md
index 4f146bc36c..5540b3727d 100644
--- a/windows/client-management/mdm/icspnodemove.md
+++ b/windows/client-management/mdm/icspnodemove.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodesetproperty.md b/windows/client-management/mdm/icspnodesetproperty.md
index 2bbf25984e..6f455d56f5 100644
--- a/windows/client-management/mdm/icspnodesetproperty.md
+++ b/windows/client-management/mdm/icspnodesetproperty.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodesetvalue.md b/windows/client-management/mdm/icspnodesetvalue.md
index 87308b0f06..eff2b58e9e 100644
--- a/windows/client-management/mdm/icspnodesetvalue.md
+++ b/windows/client-management/mdm/icspnodesetvalue.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspnodetransactioning.md b/windows/client-management/mdm/icspnodetransactioning.md
index abb73632ec..4bb80100aa 100644
--- a/windows/client-management/mdm/icspnodetransactioning.md
+++ b/windows/client-management/mdm/icspnodetransactioning.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/icspvalidate.md b/windows/client-management/mdm/icspvalidate.md
index d981ff560b..f1c05d21fd 100644
--- a/windows/client-management/mdm/icspvalidate.md
+++ b/windows/client-management/mdm/icspvalidate.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/implement-server-side-mobile-application-management.md b/windows/client-management/mdm/implement-server-side-mobile-application-management.md
index 2c178ee251..3fe6fa5ee0 100644
--- a/windows/client-management/mdm/implement-server-side-mobile-application-management.md
+++ b/windows/client-management/mdm/implement-server-side-mobile-application-management.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/index.md b/windows/client-management/mdm/index.md
index 85f15ea285..350fa8e7f2 100644
--- a/windows/client-management/mdm/index.md
+++ b/windows/client-management/mdm/index.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/management-tool-for-windows-store-for-business.md b/windows/client-management/mdm/management-tool-for-windows-store-for-business.md
index 17a5ef28d6..933ae47c17 100644
--- a/windows/client-management/mdm/management-tool-for-windows-store-for-business.md
+++ b/windows/client-management/mdm/management-tool-for-windows-store-for-business.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 10/27/2017
---
diff --git a/windows/client-management/mdm/maps-csp.md b/windows/client-management/mdm/maps-csp.md
index 6c33cbb2b3..85296234bf 100644
--- a/windows/client-management/mdm/maps-csp.md
+++ b/windows/client-management/mdm/maps-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/maps-ddf-file.md b/windows/client-management/mdm/maps-ddf-file.md
index ac17e5b0f5..b0788414da 100644
--- a/windows/client-management/mdm/maps-ddf-file.md
+++ b/windows/client-management/mdm/maps-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md b/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md
index 72566a2607..c841ddef41 100644
--- a/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md
+++ b/windows/client-management/mdm/mdm-enrollment-of-windows-devices.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 11/15/2017
---
diff --git a/windows/client-management/mdm/messaging-csp.md b/windows/client-management/mdm/messaging-csp.md
index e9562286e3..a8b9de322a 100644
--- a/windows/client-management/mdm/messaging-csp.md
+++ b/windows/client-management/mdm/messaging-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/messaging-ddf.md b/windows/client-management/mdm/messaging-ddf.md
index f5d34d958c..67dc397e58 100644
--- a/windows/client-management/mdm/messaging-ddf.md
+++ b/windows/client-management/mdm/messaging-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/mobile-device-enrollment.md b/windows/client-management/mdm/mobile-device-enrollment.md
index 2fe9ccfab5..635e45fd2f 100644
--- a/windows/client-management/mdm/mobile-device-enrollment.md
+++ b/windows/client-management/mdm/mobile-device-enrollment.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 08/11/2017
---
diff --git a/windows/client-management/mdm/multisim-csp.md b/windows/client-management/mdm/multisim-csp.md
index 3b07d6a98c..1b3e56a680 100644
--- a/windows/client-management/mdm/multisim-csp.md
+++ b/windows/client-management/mdm/multisim-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/22/2018
---
diff --git a/windows/client-management/mdm/multisim-ddf.md b/windows/client-management/mdm/multisim-ddf.md
index b75b123630..54c76ae742 100644
--- a/windows/client-management/mdm/multisim-ddf.md
+++ b/windows/client-management/mdm/multisim-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 02/27/2018
---
diff --git a/windows/client-management/mdm/nap-csp.md b/windows/client-management/mdm/nap-csp.md
index 8543181e2c..ba2ef8f0b2 100644
--- a/windows/client-management/mdm/nap-csp.md
+++ b/windows/client-management/mdm/nap-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/napdef-csp.md b/windows/client-management/mdm/napdef-csp.md
index 0e8a673820..f94af70c0f 100644
--- a/windows/client-management/mdm/napdef-csp.md
+++ b/windows/client-management/mdm/napdef-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/networkproxy-csp.md b/windows/client-management/mdm/networkproxy-csp.md
index 6348228427..9b846e226a 100644
--- a/windows/client-management/mdm/networkproxy-csp.md
+++ b/windows/client-management/mdm/networkproxy-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/12/2018
---
diff --git a/windows/client-management/mdm/networkproxy-ddf.md b/windows/client-management/mdm/networkproxy-ddf.md
index 096ec6d25a..b8fbd90dbc 100644
--- a/windows/client-management/mdm/networkproxy-ddf.md
+++ b/windows/client-management/mdm/networkproxy-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/networkqospolicy-csp.md b/windows/client-management/mdm/networkqospolicy-csp.md
index c231223bc4..4ccc4536e2 100644
--- a/windows/client-management/mdm/networkqospolicy-csp.md
+++ b/windows/client-management/mdm/networkqospolicy-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/networkqospolicy-ddf.md b/windows/client-management/mdm/networkqospolicy-ddf.md
index fa7dc5e2fc..12c6572869 100644
--- a/windows/client-management/mdm/networkqospolicy-ddf.md
+++ b/windows/client-management/mdm/networkqospolicy-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
index 132b7389b6..da109b141c 100644
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@@ -9,7 +9,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/26/2018
---
diff --git a/windows/client-management/mdm/nodecache-csp.md b/windows/client-management/mdm/nodecache-csp.md
index d4883064aa..7c55d4f21c 100644
--- a/windows/client-management/mdm/nodecache-csp.md
+++ b/windows/client-management/mdm/nodecache-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/nodecache-ddf-file.md b/windows/client-management/mdm/nodecache-ddf-file.md
index 2a7b87e71c..3fd58485ce 100644
--- a/windows/client-management/mdm/nodecache-ddf-file.md
+++ b/windows/client-management/mdm/nodecache-ddf-file.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/office-csp.md b/windows/client-management/mdm/office-csp.md
index 5386096239..1a415c4fc3 100644
--- a/windows/client-management/mdm/office-csp.md
+++ b/windows/client-management/mdm/office-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/25/2018
---
diff --git a/windows/client-management/mdm/office-ddf.md b/windows/client-management/mdm/office-ddf.md
index caf080ce06..99b5afb5b6 100644
--- a/windows/client-management/mdm/office-ddf.md
+++ b/windows/client-management/mdm/office-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/oma-dm-protocol-support.md b/windows/client-management/mdm/oma-dm-protocol-support.md
index 2d1ff691c4..acfda5630f 100644
--- a/windows/client-management/mdm/oma-dm-protocol-support.md
+++ b/windows/client-management/mdm/oma-dm-protocol-support.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/on-premise-authentication-device-enrollment.md b/windows/client-management/mdm/on-premise-authentication-device-enrollment.md
index 682cf89c7d..4649e684c3 100644
--- a/windows/client-management/mdm/on-premise-authentication-device-enrollment.md
+++ b/windows/client-management/mdm/on-premise-authentication-device-enrollment.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/passportforwork-csp.md b/windows/client-management/mdm/passportforwork-csp.md
index ab3145df41..d54a1fb5cf 100644
--- a/windows/client-management/mdm/passportforwork-csp.md
+++ b/windows/client-management/mdm/passportforwork-csp.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/passportforwork-ddf.md b/windows/client-management/mdm/passportforwork-ddf.md
index f0d64040aa..e9891e841e 100644
--- a/windows/client-management/mdm/passportforwork-ddf.md
+++ b/windows/client-management/mdm/passportforwork-ddf.md
@@ -6,7 +6,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/personalization-csp.md b/windows/client-management/mdm/personalization-csp.md
index 8911582570..dd19365596 100644
--- a/windows/client-management/mdm/personalization-csp.md
+++ b/windows/client-management/mdm/personalization-csp.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 06/26/2017
---
diff --git a/windows/client-management/mdm/personalization-ddf.md b/windows/client-management/mdm/personalization-ddf.md
index ce6baf1be0..ccdfdff645 100644
--- a/windows/client-management/mdm/personalization-ddf.md
+++ b/windows/client-management/mdm/personalization-ddf.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 12/05/2017
---
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 71f83755e0..4b7797c7be 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -6,8 +6,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP
@@ -1950,10 +1950,10 @@ The following diagram shows the Policy configuration service provider in tree fo
KioskBrowser/DefaultURL
-
+
@@ -105,7 +105,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -163,7 +163,7 @@ The following list shows the supported values:
1
-
+
diff --git a/windows/client-management/mdm/policy-csp-accountpoliciesaccountlockoutpolicy.md b/windows/client-management/mdm/policy-csp-accountpoliciesaccountlockoutpolicy.md
index 32daf8fcb7..0a646789df 100644
--- a/windows/client-management/mdm/policy-csp-accountpoliciesaccountlockoutpolicy.md
+++ b/windows/client-management/mdm/policy-csp-accountpoliciesaccountlockoutpolicy.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-accounts.md b/windows/client-management/mdm/policy-csp-accounts.md
index 5eb439322d..64e6764b0a 100644
--- a/windows/client-management/mdm/policy-csp-accounts.md
+++ b/windows/client-management/mdm/policy-csp-accounts.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Accounts
@@ -53,7 +53,7 @@ ms.date: 03/12/2018
-
+
@@ -108,7 +108,7 @@ The following list shows the supported values:
-
+
@@ -210,7 +210,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-activexcontrols.md b/windows/client-management/mdm/policy-csp-activexcontrols.md
index 2563d21bc2..64bdd52d8f 100644
--- a/windows/client-management/mdm/policy-csp-activexcontrols.md
+++ b/windows/client-management/mdm/policy-csp-activexcontrols.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-applicationdefaults.md b/windows/client-management/mdm/policy-csp-applicationdefaults.md
index c203a66f41..1698ec45a7 100644
--- a/windows/client-management/mdm/policy-csp-applicationdefaults.md
+++ b/windows/client-management/mdm/policy-csp-applicationdefaults.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-applicationmanagement.md b/windows/client-management/mdm/policy-csp-applicationmanagement.md
index e96fc68705..a89cb1074a 100644
--- a/windows/client-management/mdm/policy-csp-applicationmanagement.md
+++ b/windows/client-management/mdm/policy-csp-applicationmanagement.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - ApplicationManagement
+
@@ -79,7 +80,7 @@ ms.date: 04/16/2018
-
+
@@ -140,7 +141,7 @@ The following list shows the supported values:
-
+
@@ -201,7 +202,7 @@ The following list shows the supported values:
-
+
@@ -262,7 +263,7 @@ The following list shows the supported values:
-
+
@@ -325,7 +326,7 @@ The following list shows the supported values:
-
+
@@ -385,7 +386,7 @@ The following list shows the supported values:
-
+
@@ -437,7 +438,7 @@ The following list shows the supported values:
-
+
@@ -502,7 +503,7 @@ Value evaluation rule - The information for PolicyManager is opaque. There is no
-
+ 1
1
1
@@ -687,7 +688,7 @@ This setting supports a range of values between 0 and 1.
-
+
@@ -749,7 +750,7 @@ The following list shows the supported values:
-
+
@@ -809,7 +810,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-appruntime.md b/windows/client-management/mdm/policy-csp-appruntime.md
index f37e5b4640..5bddec2b4c 100644
--- a/windows/client-management/mdm/policy-csp-appruntime.md
+++ b/windows/client-management/mdm/policy-csp-appruntime.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-appvirtualization.md b/windows/client-management/mdm/policy-csp-appvirtualization.md
index 562a5224dc..ed8ae05a5c 100644
--- a/windows/client-management/mdm/policy-csp-appvirtualization.md
+++ b/windows/client-management/mdm/policy-csp-appvirtualization.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-attachmentmanager.md b/windows/client-management/mdm/policy-csp-attachmentmanager.md
index 7b97a87a4b..65d3b9a405 100644
--- a/windows/client-management/mdm/policy-csp-attachmentmanager.md
+++ b/windows/client-management/mdm/policy-csp-attachmentmanager.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-authentication.md b/windows/client-management/mdm/policy-csp-authentication.md
index f83bb3905c..ac278a4b86 100644
--- a/windows/client-management/mdm/policy-csp-authentication.md
+++ b/windows/client-management/mdm/policy-csp-authentication.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Authentication
@@ -106,7 +106,7 @@ The following list shows the supported values:
-
+
@@ -156,7 +156,7 @@ The following list shows the supported values:
-
+
@@ -262,7 +262,7 @@ The following list shows the supported values:
1
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-autoplay.md b/windows/client-management/mdm/policy-csp-autoplay.md
index c748e76ae7..efefb6de1e 100644
--- a/windows/client-management/mdm/policy-csp-autoplay.md
+++ b/windows/client-management/mdm/policy-csp-autoplay.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-bitlocker.md b/windows/client-management/mdm/policy-csp-bitlocker.md
index fa358dcb81..bdbbdbb143 100644
--- a/windows/client-management/mdm/policy-csp-bitlocker.md
+++ b/windows/client-management/mdm/policy-csp-bitlocker.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Bitlocker
@@ -44,7 +44,7 @@ ms.date: 03/12/2018
1
-
+
diff --git a/windows/client-management/mdm/policy-csp-bluetooth.md b/windows/client-management/mdm/policy-csp-bluetooth.md
index 762903da37..519bdfeb1f 100644
--- a/windows/client-management/mdm/policy-csp-bluetooth.md
+++ b/windows/client-management/mdm/policy-csp-bluetooth.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/06/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Bluetooth
+
@@ -58,7 +59,7 @@ ms.date: 04/06/2018
-
+
@@ -112,7 +113,7 @@ The following list shows the supported values:
-
+
@@ -166,7 +167,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -245,12 +246,6 @@ The following list shows the supported values:
- 1 - Allow. Allow users on these managed devices to use Quick Pair and other proximity based scenarios
-
-
-
-
-
-
1
@@ -272,7 +267,7 @@ The following list shows the supported values:
-
+
@@ -319,7 +314,7 @@ If this policy is not set or it is deleted, the default local radio name is used
-
+
diff --git a/windows/client-management/mdm/policy-csp-browser.md b/windows/client-management/mdm/policy-csp-browser.md
index ab3d44948e..8672f1e47e 100644
--- a/windows/client-management/mdm/policy-csp-browser.md
+++ b/windows/client-management/mdm/policy-csp-browser.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Browser
+
@@ -224,7 +225,7 @@ The following list shows the supported values:
-
+
@@ -294,7 +295,7 @@ To verify AllowAutofill is set to 0 (not allowed):
-
+
@@ -404,7 +405,7 @@ The following list shows the supported values:
-
+
@@ -477,7 +478,7 @@ To verify AllowCookies is set to 0 (not allowed):
-
+
@@ -542,7 +543,7 @@ The following list shows the supported values:
-
+
@@ -612,7 +613,7 @@ To verify AllowDoNotTrack is set to 0 (not allowed):
- 1
+ 1
1
1
@@ -671,7 +672,7 @@ The following list shows the supported values:
-
+
@@ -730,7 +731,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -789,7 +790,7 @@ The following list shows the supported values:
-
+
@@ -914,7 +915,7 @@ The following list shows the supported values:
-
+
@@ -984,7 +985,7 @@ To verify AllowPasswordManager is set to 0 (not allowed):
-
+
@@ -1117,7 +1118,7 @@ The following list shows the supported values:
-
+
@@ -1178,7 +1179,7 @@ The following list shows the supported values:
-
+
@@ -1575,7 +1576,7 @@ The following list shows the supported values:
-
+
@@ -1639,7 +1640,7 @@ The following list shows the supported values:
-
+
@@ -1684,7 +1685,7 @@ The following list shows the supported values:
-
+
@@ -1736,7 +1737,7 @@ The default value is an empty string. Otherwise, the string should contain the U
-
+
@@ -1867,7 +1868,7 @@ The following list shows the supported values:
-
+
@@ -2048,7 +2049,7 @@ The following list shows the supported values:
-
+
@@ -2109,7 +2110,7 @@ The following list shows the supported values:
-
+
@@ -2227,7 +2228,7 @@ The following list shows the supported values:
-
+
@@ -2356,7 +2357,7 @@ ADMX Info:
-
+
@@ -2491,7 +2492,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-camera.md b/windows/client-management/mdm/policy-csp-camera.md
index 3cbf216e52..bb7caec67c 100644
--- a/windows/client-management/mdm/policy-csp-camera.md
+++ b/windows/client-management/mdm/policy-csp-camera.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Camera
@@ -44,7 +44,7 @@ ms.date: 03/12/2018
-
+
diff --git a/windows/client-management/mdm/policy-csp-cellular.md b/windows/client-management/mdm/policy-csp-cellular.md
index 9c86945186..b44471df4c 100644
--- a/windows/client-management/mdm/policy-csp-cellular.md
+++ b/windows/client-management/mdm/policy-csp-cellular.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-connectivity.md b/windows/client-management/mdm/policy-csp-connectivity.md
index bfd371ead5..26bd1f5d3e 100644
--- a/windows/client-management/mdm/policy-csp-connectivity.md
+++ b/windows/client-management/mdm/policy-csp-connectivity.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/14/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Connectivity
+
@@ -85,7 +86,7 @@ ms.date: 03/14/2018
-
+
@@ -143,7 +144,7 @@ The following list shows the supported values:
-
+
@@ -194,7 +195,7 @@ The following list shows the supported values:
-
+
@@ -318,7 +319,7 @@ The following list shows the supported values:
-
+
@@ -411,17 +412,14 @@ This setting supports a range of values between 0 and 1.
- 0 - Do not link
- 1 (default) - Allow phone-PC linking
-
-
-
-
Validation:
If the Connectivity/AllowPhonePCLinking policy is configured to value 0, the add a phone button in the Phones section in settings will be greyed out and clicking it will not launch the window for a user to enter their phone number.
Device that has previously opt-in to MMX will also stop showing on the device list.
+
@@ -444,7 +442,7 @@ Device that has previously opt-in to MMX will also stop showing on the device li
-
+
@@ -502,7 +500,7 @@ The following list shows the supported values:
-
+
@@ -554,7 +552,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
index b777062185..0cef60bd72 100644
--- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
+++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-credentialproviders.md b/windows/client-management/mdm/policy-csp-credentialproviders.md
index f3f12c6f73..e79cd8b3f5 100644
--- a/windows/client-management/mdm/policy-csp-credentialproviders.md
+++ b/windows/client-management/mdm/policy-csp-credentialproviders.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-credentialsdelegation.md b/windows/client-management/mdm/policy-csp-credentialsdelegation.md
index 71806982ff..309848708a 100644
--- a/windows/client-management/mdm/policy-csp-credentialsdelegation.md
+++ b/windows/client-management/mdm/policy-csp-credentialsdelegation.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-credentialsui.md b/windows/client-management/mdm/policy-csp-credentialsui.md
index 900ad6176a..12f8698b09 100644
--- a/windows/client-management/mdm/policy-csp-credentialsui.md
+++ b/windows/client-management/mdm/policy-csp-credentialsui.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-cryptography.md b/windows/client-management/mdm/policy-csp-cryptography.md
index 7dadd07af1..69f8321a8b 100644
--- a/windows/client-management/mdm/policy-csp-cryptography.md
+++ b/windows/client-management/mdm/policy-csp-cryptography.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Cryptography
@@ -47,7 +47,7 @@ ms.date: 03/12/2018
-
+
@@ -103,7 +103,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-dataprotection.md b/windows/client-management/mdm/policy-csp-dataprotection.md
index 28ad8aaca3..a03fac3671 100644
--- a/windows/client-management/mdm/policy-csp-dataprotection.md
+++ b/windows/client-management/mdm/policy-csp-dataprotection.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - DataProtection
@@ -47,7 +47,7 @@ ms.date: 03/12/2018
-
+
@@ -99,7 +99,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-datausage.md b/windows/client-management/mdm/policy-csp-datausage.md
index 89086b22bb..3fa83ab1c8 100644
--- a/windows/client-management/mdm/policy-csp-datausage.md
+++ b/windows/client-management/mdm/policy-csp-datausage.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-defender.md b/windows/client-management/mdm/policy-csp-defender.md
index a0edded74d..e9f70080d3 100644
--- a/windows/client-management/mdm/policy-csp-defender.md
+++ b/windows/client-management/mdm/policy-csp-defender.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Defender
@@ -146,7 +146,7 @@ ms.date: 03/12/2018
-
+
@@ -208,7 +208,7 @@ The following list shows the supported values:
-
+
@@ -270,7 +270,7 @@ The following list shows the supported values:
-
+
@@ -333,7 +333,7 @@ The following list shows the supported values:
-
+
@@ -395,7 +395,7 @@ The following list shows the supported values:
-
+
@@ -457,7 +457,7 @@ The following list shows the supported values:
-
+
@@ -519,7 +519,7 @@ The following list shows the supported values:
-
+
@@ -581,7 +581,7 @@ The following list shows the supported values:
-
+
@@ -635,7 +635,7 @@ The following list shows the supported values:
-
+
@@ -697,7 +697,7 @@ The following list shows the supported values:
-
+
@@ -759,7 +759,7 @@ The following list shows the supported values:
-
+
@@ -821,7 +821,7 @@ The following list shows the supported values:
-
+
@@ -875,7 +875,7 @@ The following list shows the supported values:
-
+
@@ -936,7 +936,7 @@ The following list shows the supported values:
-
+ 3
3
@@ -994,7 +994,7 @@ ADMX Info:
3
-
+ 3
3
@@ -1055,7 +1055,7 @@ ADMX Info:
3
-
+
@@ -1362,7 +1362,7 @@ ADMX Info:
-
+
@@ -1557,7 +1557,7 @@ The following list shows the supported values:
-
+
@@ -1613,7 +1613,7 @@ ADMX Info:
-
+
@@ -1669,7 +1669,7 @@ ADMX Info:
-
+
@@ -1731,7 +1731,7 @@ ADMX Info:
-
+
@@ -1786,7 +1786,7 @@ The following list shows the supported values:
-
+
@@ -1853,7 +1853,7 @@ The following list shows the supported values:
-
+
@@ -1916,7 +1916,7 @@ The following list shows the supported values:
-
+
@@ -1985,7 +1985,7 @@ Valid values: 0–1380
-
+
@@ -2058,7 +2058,7 @@ The following list shows the supported values:
-
+
@@ -2127,7 +2127,7 @@ Valid values: 0–1380.
-
+
@@ -2192,7 +2192,7 @@ Valid values: 0–24.
-
+
@@ -2257,7 +2257,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md
index 29a7886fbb..104c932ccf 100644
--- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md
+++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - DeliveryOptimization
+
@@ -112,7 +113,7 @@ ms.date: 04/16/2018
- 1
+ 1
1
1
@@ -353,7 +354,7 @@ The following list shows the supported values as number of seconds:
-
+
@@ -420,7 +421,7 @@ The following list shows the supported values:
-
+
@@ -548,7 +549,7 @@ The following list shows the supported values:
-
+
@@ -606,7 +607,7 @@ ADMX Info:
-
+
@@ -664,7 +665,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -722,7 +723,7 @@ ADMX Info:
-
+
@@ -780,7 +781,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -1072,7 +1073,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -1130,7 +1131,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -1230,6 +1231,7 @@ ADMX Info:
**DeliveryOptimization/DOPercentageMaxDownloadBandwidth**
+
[Scope](./policy-configuration-service-provider.md#policy-scope):
diff --git a/windows/client-management/mdm/policy-csp-desktop.md b/windows/client-management/mdm/policy-csp-desktop.md
index 36afbf2a08..8e395ec5f7 100644
--- a/windows/client-management/mdm/policy-csp-desktop.md
+++ b/windows/client-management/mdm/policy-csp-desktop.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-deviceguard.md b/windows/client-management/mdm/policy-csp-deviceguard.md
index b541578089..345a36f617 100644
--- a/windows/client-management/mdm/policy-csp-deviceguard.md
+++ b/windows/client-management/mdm/policy-csp-deviceguard.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-deviceinstallation.md b/windows/client-management/mdm/policy-csp-deviceinstallation.md
index 38941fd46b..7fd6d96493 100644
--- a/windows/client-management/mdm/policy-csp-deviceinstallation.md
+++ b/windows/client-management/mdm/policy-csp-deviceinstallation.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-devicelock.md b/windows/client-management/mdm/policy-csp-devicelock.md
index 98974c6cb0..17b97cc938 100644
--- a/windows/client-management/mdm/policy-csp-devicelock.md
+++ b/windows/client-management/mdm/policy-csp-devicelock.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - DeviceLock
+
@@ -94,7 +95,7 @@ ms.date: 04/16/2018
-
+
@@ -151,7 +152,7 @@ The following list shows the supported values:
-
+
@@ -213,7 +214,7 @@ The following list shows the supported values:
-
+
@@ -270,7 +271,7 @@ The following list shows the supported values:
-
+
@@ -333,7 +334,7 @@ The following list shows the supported values:
-
+
@@ -424,7 +425,7 @@ The following list shows the supported values:
-
+
@@ -483,7 +484,7 @@ The following list shows the supported values:
-
+
@@ -593,7 +594,7 @@ Value type is a string, which is the full image filepath and filename.
-
+
@@ -642,7 +643,7 @@ Value type is a string, which is the AppID.
1
-
+
@@ -708,7 +709,7 @@ The following list shows the supported values:
-
+
@@ -818,7 +819,7 @@ The following list shows the supported values:
-
+
@@ -932,7 +933,7 @@ For additional information about this policy, see [Exchange ActiveSync Policy En
-
+
@@ -1171,7 +1172,7 @@ ADMX Info:
-
+
diff --git a/windows/client-management/mdm/policy-csp-display.md b/windows/client-management/mdm/policy-csp-display.md
index 3ff482c3d6..060689251b 100644
--- a/windows/client-management/mdm/policy-csp-display.md
+++ b/windows/client-management/mdm/policy-csp-display.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-education.md b/windows/client-management/mdm/policy-csp-education.md
index e1fb1b9965..aba6597add 100644
--- a/windows/client-management/mdm/policy-csp-education.md
+++ b/windows/client-management/mdm/policy-csp-education.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-enterprisecloudprint.md b/windows/client-management/mdm/policy-csp-enterprisecloudprint.md
index 4b5b961ad9..e8f2b997fc 100644
--- a/windows/client-management/mdm/policy-csp-enterprisecloudprint.md
+++ b/windows/client-management/mdm/policy-csp-enterprisecloudprint.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - EnterpriseCloudPrint
diff --git a/windows/client-management/mdm/policy-csp-errorreporting.md b/windows/client-management/mdm/policy-csp-errorreporting.md
index d2a31d1077..04063822ba 100644
--- a/windows/client-management/mdm/policy-csp-errorreporting.md
+++ b/windows/client-management/mdm/policy-csp-errorreporting.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-eventlogservice.md b/windows/client-management/mdm/policy-csp-eventlogservice.md
index 6c9a23cd61..991eab8855 100644
--- a/windows/client-management/mdm/policy-csp-eventlogservice.md
+++ b/windows/client-management/mdm/policy-csp-eventlogservice.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-experience.md b/windows/client-management/mdm/policy-csp-experience.md
index 528d2b70fb..aca458292c 100644
--- a/windows/client-management/mdm/policy-csp-experience.md
+++ b/windows/client-management/mdm/policy-csp-experience.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Experience
+
@@ -106,7 +107,7 @@ ms.date: 04/16/2018
-
+
@@ -161,7 +162,7 @@ The following list shows the supported values:
-
+
@@ -221,7 +222,7 @@ The following list shows the supported values:
-
+
@@ -337,7 +338,7 @@ The following list shows the supported values:
-
+
@@ -393,7 +394,7 @@ The following list shows the supported values:
-
+
@@ -467,7 +468,7 @@ This policy is deprecated.
-
+
@@ -543,7 +544,7 @@ This policy is deprecated.
-
+
@@ -660,7 +661,7 @@ The following list shows the supported values:
-
+
@@ -776,7 +777,7 @@ The following list shows the supported values:
-
+
@@ -1270,7 +1271,7 @@ The following list shows the supported values:
1
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-exploitguard.md b/windows/client-management/mdm/policy-csp-exploitguard.md
index bdf443d549..1d88286ceb 100644
--- a/windows/client-management/mdm/policy-csp-exploitguard.md
+++ b/windows/client-management/mdm/policy-csp-exploitguard.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-fileexplorer.md b/windows/client-management/mdm/policy-csp-fileexplorer.md
index 91fe973551..d427a7ed5c 100644
--- a/windows/client-management/mdm/policy-csp-fileexplorer.md
+++ b/windows/client-management/mdm/policy-csp-fileexplorer.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-games.md b/windows/client-management/mdm/policy-csp-games.md
index d14fd92fed..4b7c9efb2d 100644
--- a/windows/client-management/mdm/policy-csp-games.md
+++ b/windows/client-management/mdm/policy-csp-games.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-handwriting.md b/windows/client-management/mdm/policy-csp-handwriting.md
index bdbcb764ae..07582f80bf 100644
--- a/windows/client-management/mdm/policy-csp-handwriting.md
+++ b/windows/client-management/mdm/policy-csp-handwriting.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-internetexplorer.md b/windows/client-management/mdm/policy-csp-internetexplorer.md
index 580431a0ff..3cac24872a 100644
--- a/windows/client-management/mdm/policy-csp-internetexplorer.md
+++ b/windows/client-management/mdm/policy-csp-internetexplorer.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - InternetExplorer
diff --git a/windows/client-management/mdm/policy-csp-kerberos.md b/windows/client-management/mdm/policy-csp-kerberos.md
index 974db5f350..2c1b567f4b 100644
--- a/windows/client-management/mdm/policy-csp-kerberos.md
+++ b/windows/client-management/mdm/policy-csp-kerberos.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-kioskbrowser.md b/windows/client-management/mdm/policy-csp-kioskbrowser.md
index cfe6ce478c..fb8a4b73e9 100644
--- a/windows/client-management/mdm/policy-csp-kioskbrowser.md
+++ b/windows/client-management/mdm/policy-csp-kioskbrowser.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/11/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - KioskBrowser
+
These policies currently only apply to Kiosk Browser app. Kiosk Browser is a Microsoft Store app, added in Windows 10 version 1803, that provides IT a way to customize the end user’s browsing experience to fulfill kiosk, signage, and shared device scenarios. Application developers can also create their own kiosk browser and read these policies using [NamedPolicy.GetPolicyFromPath(String, String) Method](https://docs.microsoft.com/en-us/uwp/api/windows.management.policies.namedpolicy.getpolicyfrompath#Windows_Management_Policies_NamedPolicy_GetPolicyFromPath_System_String_System_String_).
@@ -224,15 +225,6 @@ Added in Windows 10, version 1803. Configures the default URL kiosk browsers to
Shows the Kiosk Browser's end session button. When the policy is enabled, the Kiosk Browser app shows a button to reset the browser. When the user clicks on the button, the app will prompt the user for confirmation to end the session. When the user confirms, the Kiosk broswser will clear all browsing data (cache, cookies, etc.) and navigate back to the default URL.
-
-
-
-
-
-
-
-
-
1
diff --git a/windows/client-management/mdm/policy-csp-lanmanworkstation.md b/windows/client-management/mdm/policy-csp-lanmanworkstation.md
index 13e2299224..18bcc8cfed 100644
--- a/windows/client-management/mdm/policy-csp-lanmanworkstation.md
+++ b/windows/client-management/mdm/policy-csp-lanmanworkstation.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-licensing.md b/windows/client-management/mdm/policy-csp-licensing.md
index eae5cdc5d7..79d19dcdbb 100644
--- a/windows/client-management/mdm/policy-csp-licensing.md
+++ b/windows/client-management/mdm/policy-csp-licensing.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Licensing
@@ -47,7 +47,7 @@ ms.date: 03/12/2018
- 1
+ 1
1
1
@@ -105,7 +105,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-localpoliciessecurityoptions.md b/windows/client-management/mdm/policy-csp-localpoliciessecurityoptions.md
index 1daf3d8ae0..7f888cd8b6 100644
--- a/windows/client-management/mdm/policy-csp-localpoliciessecurityoptions.md
+++ b/windows/client-management/mdm/policy-csp-localpoliciessecurityoptions.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/06/2018
---
diff --git a/windows/client-management/mdm/policy-csp-location.md b/windows/client-management/mdm/policy-csp-location.md
index 8117114323..10663ef1ad 100644
--- a/windows/client-management/mdm/policy-csp-location.md
+++ b/windows/client-management/mdm/policy-csp-location.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-lockdown.md b/windows/client-management/mdm/policy-csp-lockdown.md
index 228d2f75ec..afa30b7b07 100644
--- a/windows/client-management/mdm/policy-csp-lockdown.md
+++ b/windows/client-management/mdm/policy-csp-lockdown.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - LockDown
@@ -44,7 +44,7 @@ ms.date: 03/12/2018
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-maps.md b/windows/client-management/mdm/policy-csp-maps.md
index 8b44913146..37f9f79bdb 100644
--- a/windows/client-management/mdm/policy-csp-maps.md
+++ b/windows/client-management/mdm/policy-csp-maps.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Maps
@@ -47,7 +47,7 @@ ms.date: 03/12/2018
- 1
+ 1
1
1
@@ -100,7 +100,7 @@ The following list shows the supported values:
1
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-messaging.md b/windows/client-management/mdm/policy-csp-messaging.md
index f1862d266d..e5f9888352 100644
--- a/windows/client-management/mdm/policy-csp-messaging.md
+++ b/windows/client-management/mdm/policy-csp-messaging.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-mssecurityguide.md b/windows/client-management/mdm/policy-csp-mssecurityguide.md
index f20149e9f0..5b9f201e0a 100644
--- a/windows/client-management/mdm/policy-csp-mssecurityguide.md
+++ b/windows/client-management/mdm/policy-csp-mssecurityguide.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-msslegacy.md b/windows/client-management/mdm/policy-csp-msslegacy.md
index c6727fa700..dd2518efdf 100644
--- a/windows/client-management/mdm/policy-csp-msslegacy.md
+++ b/windows/client-management/mdm/policy-csp-msslegacy.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-networkisolation.md b/windows/client-management/mdm/policy-csp-networkisolation.md
index d5d98f64b1..2e5574d79b 100644
--- a/windows/client-management/mdm/policy-csp-networkisolation.md
+++ b/windows/client-management/mdm/policy-csp-networkisolation.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - NetworkIsolation
@@ -65,7 +65,7 @@ ms.date: 03/12/2018
1
-
+
@@ -117,7 +117,7 @@ ADMX Info:
-
+
@@ -182,7 +182,7 @@ fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-
+
@@ -233,7 +233,7 @@ ADMX Info:
-
+
@@ -285,7 +285,7 @@ ADMX Info:
-
+
@@ -338,7 +338,7 @@ Here are the steps to create canonical domain names:
-
+
@@ -390,7 +390,7 @@ ADMX Info:
-
+
@@ -441,7 +441,7 @@ ADMX Info:
-
+
diff --git a/windows/client-management/mdm/policy-csp-notifications.md b/windows/client-management/mdm/policy-csp-notifications.md
index 51caa36965..013458bdd1 100644
--- a/windows/client-management/mdm/policy-csp-notifications.md
+++ b/windows/client-management/mdm/policy-csp-notifications.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Notifications
+
@@ -98,7 +99,6 @@ Validation:
3. Ensure that you can't receive a notification from Facebook app while FB app isn't running
-
@@ -120,7 +120,7 @@ Validation:
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-power.md b/windows/client-management/mdm/policy-csp-power.md
index 9b6886930d..6a7dbb8a95 100644
--- a/windows/client-management/mdm/policy-csp-power.md
+++ b/windows/client-management/mdm/policy-csp-power.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-printers.md b/windows/client-management/mdm/policy-csp-printers.md
index be94af174b..ae57e495a7 100644
--- a/windows/client-management/mdm/policy-csp-printers.md
+++ b/windows/client-management/mdm/policy-csp-printers.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-privacy.md b/windows/client-management/mdm/policy-csp-privacy.md
index 18b6e20034..eb2b36eac7 100644
--- a/windows/client-management/mdm/policy-csp-privacy.md
+++ b/windows/client-management/mdm/policy-csp-privacy.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/19/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Privacy
@@ -272,11 +272,11 @@ ms.date: 04/19/2018
1
@@ -328,7 +328,7 @@ The following list shows the supported values:
3
- 3
3
- 3
-
+
+ 3
+ 3
3
-
+
@@ -388,7 +388,7 @@ The following list shows the supported values:
1
- 1
+ 1
1
1
@@ -507,7 +507,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -570,7 +570,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -622,7 +622,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -674,7 +674,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -726,7 +726,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -789,7 +789,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -841,7 +841,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -893,7 +893,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -945,7 +945,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1008,7 +1008,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -1060,7 +1060,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1112,7 +1112,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1164,7 +1164,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1227,7 +1227,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -1279,7 +1279,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1331,7 +1331,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1383,7 +1383,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1446,7 +1446,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -1498,7 +1498,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1550,7 +1550,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1602,7 +1602,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1665,7 +1665,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -1717,7 +1717,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1769,7 +1769,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1821,7 +1821,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1884,7 +1884,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -1936,7 +1936,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -1988,7 +1988,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2040,7 +2040,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2103,7 +2103,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -2155,7 +2155,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2207,7 +2207,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2259,7 +2259,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2322,7 +2322,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -2374,7 +2374,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2426,7 +2426,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2478,7 +2478,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2541,7 +2541,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -2593,7 +2593,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2645,7 +2645,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2697,7 +2697,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2760,7 +2760,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -2812,7 +2812,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2864,7 +2864,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2916,7 +2916,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -2979,7 +2979,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -3031,7 +3031,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3083,7 +3083,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3135,7 +3135,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3198,7 +3198,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -3250,7 +3250,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3302,7 +3302,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3562,7 +3562,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3625,7 +3625,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -3677,7 +3677,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3729,7 +3729,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -3781,7 +3781,7 @@ ADMX Info:
1
2
- 2
+ 2
2
2
@@ -3844,7 +3844,7 @@ The following list shows the supported values:
2
2
- 2
+ 2
2
2
@@ -3896,7 +3896,7 @@ ADMX Info:
2
2
- 2
+ 2
2
2
@@ -3948,7 +3948,7 @@ ADMX Info:
2
2
- 2
+ 2
2
2
@@ -4000,7 +4000,7 @@ ADMX Info:
2
2
- 2
+ 2
2
2
@@ -4065,7 +4065,7 @@ The following list shows the supported values:
2
2
- 2
+ 2
2
2
@@ -4117,7 +4117,7 @@ ADMX Info:
2
2
- 2
+ 2
2
2
@@ -4169,7 +4169,7 @@ ADMX Info:
2
2
- 2
+ 2
2
2
@@ -4221,7 +4221,7 @@ ADMX Info:
2
1
- 1
+ 1
1
1
@@ -4284,7 +4284,7 @@ The following list shows the supported values:
1
1
- 1
+ 1
1
1
@@ -4336,7 +4336,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
@@ -4388,7 +4388,7 @@ ADMX Info:
1
1
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-remoteassistance.md b/windows/client-management/mdm/policy-csp-remoteassistance.md
index 01e2f7e4b7..d66ad8a1f8 100644
--- a/windows/client-management/mdm/policy-csp-remoteassistance.md
+++ b/windows/client-management/mdm/policy-csp-remoteassistance.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-remotedesktopservices.md b/windows/client-management/mdm/policy-csp-remotedesktopservices.md
index 0e4be98697..6621ddedd2 100644
--- a/windows/client-management/mdm/policy-csp-remotedesktopservices.md
+++ b/windows/client-management/mdm/policy-csp-remotedesktopservices.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-remotemanagement.md b/windows/client-management/mdm/policy-csp-remotemanagement.md
index 96324dc5cc..39752ff60e 100644
--- a/windows/client-management/mdm/policy-csp-remotemanagement.md
+++ b/windows/client-management/mdm/policy-csp-remotemanagement.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-remoteprocedurecall.md b/windows/client-management/mdm/policy-csp-remoteprocedurecall.md
index 295bf5c56e..3422d53682 100644
--- a/windows/client-management/mdm/policy-csp-remoteprocedurecall.md
+++ b/windows/client-management/mdm/policy-csp-remoteprocedurecall.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-remoteshell.md b/windows/client-management/mdm/policy-csp-remoteshell.md
index cbb9717f73..300e4c4f1f 100644
--- a/windows/client-management/mdm/policy-csp-remoteshell.md
+++ b/windows/client-management/mdm/policy-csp-remoteshell.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-restrictedgroups.md b/windows/client-management/mdm/policy-csp-restrictedgroups.md
index e18e0e6de6..78ef27da14 100644
--- a/windows/client-management/mdm/policy-csp-restrictedgroups.md
+++ b/windows/client-management/mdm/policy-csp-restrictedgroups.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/15/2018
---
diff --git a/windows/client-management/mdm/policy-csp-search.md b/windows/client-management/mdm/policy-csp-search.md
index aea6133ba1..90d61b4f33 100644
--- a/windows/client-management/mdm/policy-csp-search.md
+++ b/windows/client-management/mdm/policy-csp-search.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Search
+
1
@@ -199,7 +200,7 @@ The following list shows the supported values:
-
+
@@ -263,7 +264,7 @@ The following list shows the supported values:
-
+
@@ -343,7 +344,7 @@ This policy has been deprecated.
-
+
@@ -404,7 +405,7 @@ The following list shows the supported values:
-
+
@@ -447,7 +448,7 @@ Allow Windows indexer. Value type is integer.
-
+
@@ -508,7 +509,7 @@ The following list shows the supported values:
-
+
@@ -566,7 +567,7 @@ The following list shows the supported values:
-
+
@@ -691,7 +692,7 @@ The following list shows the supported values:
-
+
@@ -753,7 +754,7 @@ The following list shows the supported values:
-
+
@@ -811,7 +812,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-security.md b/windows/client-management/mdm/policy-csp-security.md
index 1549210b82..8ef9ad1c3f 100644
--- a/windows/client-management/mdm/policy-csp-security.md
+++ b/windows/client-management/mdm/policy-csp-security.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Security
+
@@ -73,7 +74,7 @@ ms.date: 03/12/2018
-
+
@@ -173,7 +174,7 @@ The following list shows the supported values:
-
+
@@ -229,7 +230,7 @@ The following list shows the supported values:
-
+
@@ -279,7 +280,7 @@ The following list shows the supported values:
-
+
@@ -448,7 +449,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -560,7 +561,7 @@ The following list shows the supported values:
-
+
@@ -610,7 +611,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-settings.md b/windows/client-management/mdm/policy-csp-settings.md
index 1c445ea4d5..ba5cc1e9ef 100644
--- a/windows/client-management/mdm/policy-csp-settings.md
+++ b/windows/client-management/mdm/policy-csp-settings.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Settings
+
@@ -82,7 +83,7 @@ ms.date: 03/12/2018
-
+
@@ -139,7 +140,7 @@ The following list shows the supported values:
-
+
@@ -189,7 +190,7 @@ The following list shows the supported values:
-
+
@@ -239,7 +240,7 @@ The following list shows the supported values:
-
+
@@ -289,7 +290,7 @@ The following list shows the supported values:
1
-
+
@@ -343,7 +344,7 @@ The following list shows the supported values:
- 3
+ 3
3
3
@@ -397,7 +398,7 @@ ADMX Info:
-
+
@@ -451,7 +452,7 @@ The following list shows the supported values:
-
+
@@ -505,7 +506,7 @@ The following list shows the supported values:
-
+
@@ -559,7 +560,7 @@ The following list shows the supported values:
-
+
@@ -609,7 +610,7 @@ The following list shows the supported values:
-
+
@@ -663,7 +664,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-smartscreen.md b/windows/client-management/mdm/policy-csp-smartscreen.md
index 3eea69f19b..20b484e71e 100644
--- a/windows/client-management/mdm/policy-csp-smartscreen.md
+++ b/windows/client-management/mdm/policy-csp-smartscreen.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-speech.md b/windows/client-management/mdm/policy-csp-speech.md
index 33cdd64750..f499ec5037 100644
--- a/windows/client-management/mdm/policy-csp-speech.md
+++ b/windows/client-management/mdm/policy-csp-speech.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Speech
@@ -44,7 +44,7 @@ ms.date: 03/12/2018
1
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-start.md b/windows/client-management/mdm/policy-csp-start.md
index d9d149dd3a..c455ddc0b7 100644
--- a/windows/client-management/mdm/policy-csp-start.md
+++ b/windows/client-management/mdm/policy-csp-start.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Start
@@ -128,7 +128,7 @@ ms.date: 03/12/2018
1
- 2
+ 2
2
2
@@ -179,7 +179,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -230,7 +230,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -281,7 +281,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -332,7 +332,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -383,7 +383,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -434,7 +434,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -485,7 +485,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -536,7 +536,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -587,7 +587,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -638,7 +638,7 @@ The following list shows the supported values:
-
+
@@ -696,7 +696,7 @@ The following list shows the supported values:
- 3
+ 3
3
3
@@ -762,7 +762,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -819,7 +819,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -883,7 +883,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -944,7 +944,7 @@ To validate on Laptop, do the following:
- 2
+ 2
2
2
@@ -1054,7 +1054,7 @@ ADMX Info:
- 2
+ 2
2
2
@@ -1114,7 +1114,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1181,7 +1181,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1253,7 +1253,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1310,7 +1310,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1367,7 +1367,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1424,7 +1424,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1481,7 +1481,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1538,7 +1538,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1659,7 +1659,7 @@ To validate on Desktop, do the following:
- 2
+ 2
2
2
@@ -1719,7 +1719,7 @@ To validate on Desktop, do the following:
-
+
diff --git a/windows/client-management/mdm/policy-csp-storage.md b/windows/client-management/mdm/policy-csp-storage.md
index b27f3af35b..45727b2535 100644
--- a/windows/client-management/mdm/policy-csp-storage.md
+++ b/windows/client-management/mdm/policy-csp-storage.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-system.md b/windows/client-management/mdm/policy-csp-system.md
index 5aa3adb08a..343d589daa 100644
--- a/windows/client-management/mdm/policy-csp-system.md
+++ b/windows/client-management/mdm/policy-csp-system.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - System
+
@@ -85,7 +86,7 @@ ms.date: 03/12/2018
-
+
@@ -150,7 +151,7 @@ The following list shows the supported values:
-
+
@@ -202,7 +203,7 @@ The following list shows the supported values:
-
+
@@ -330,7 +331,7 @@ To verify if System/AllowFontProviders is set to true:
-
+
@@ -398,7 +399,7 @@ The following list shows the supported values:
-
+
@@ -450,7 +451,7 @@ The following list shows the supported values:
-
+
@@ -578,7 +579,7 @@ ADMX Info:
-
+
@@ -1008,7 +1009,7 @@ ADMX Info:
-
+
diff --git a/windows/client-management/mdm/policy-csp-systemservices.md b/windows/client-management/mdm/policy-csp-systemservices.md
index 800090eaf1..89a649fe5c 100644
--- a/windows/client-management/mdm/policy-csp-systemservices.md
+++ b/windows/client-management/mdm/policy-csp-systemservices.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-taskscheduler.md b/windows/client-management/mdm/policy-csp-taskscheduler.md
index 7a05f84ffc..94c33279b8 100644
--- a/windows/client-management/mdm/policy-csp-taskscheduler.md
+++ b/windows/client-management/mdm/policy-csp-taskscheduler.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-textinput.md b/windows/client-management/mdm/policy-csp-textinput.md
index affd6a36ac..b82a760086 100644
--- a/windows/client-management/mdm/policy-csp-textinput.md
+++ b/windows/client-management/mdm/policy-csp-textinput.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - TextInput
+
@@ -98,29 +99,6 @@ ms.date: 04/16/2018
**TextInput/AllowHardwareKeyboardTextSuggestions**
-
-
-
-
-
[Scope](./policy-configuration-service-provider.md#policy-scope):
@@ -134,9 +112,6 @@ ms.date: 04/16/2018
Added in Windows 10, version 1803. Placeholder only. Do not use in production environment.
-
-
-
-
-Home
- Pro
- Business
- Enterprise
- Education
- Mobile
- Mobile Enterprise
-
-
-
-
-
-
-
-
-
-
@@ -158,7 +133,7 @@ Added in Windows 10, version 1803. Placeholder only. Do not use in production e
-
+
@@ -268,7 +243,7 @@ The following list shows the supported values:
-
+
@@ -324,7 +299,7 @@ The following list shows the supported values:
-
+
@@ -381,7 +356,7 @@ The following list shows the supported values:
-
+
@@ -437,7 +412,7 @@ The following list shows the supported values:
-
+
@@ -493,7 +468,7 @@ The following list shows the supported values:
-
+
@@ -623,7 +598,7 @@ This policy has been deprecated.
-
+
@@ -683,6 +658,7 @@ The following list shows the supported values:
+This policy setting controls the ability to send inking and typing data to Microsoft to improve the language recognition and suggestion capabilities of apps and services running on Windows.
@@ -774,7 +750,7 @@ The following list shows the supported values:
-
+
@@ -828,7 +804,7 @@ The following list shows the supported values:
-
+
@@ -882,7 +858,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-timelanguagesettings.md b/windows/client-management/mdm/policy-csp-timelanguagesettings.md
index 731fc2ae63..cac8f316bb 100644
--- a/windows/client-management/mdm/policy-csp-timelanguagesettings.md
+++ b/windows/client-management/mdm/policy-csp-timelanguagesettings.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md
index 9d34d6f2cc..9394eca520 100644
--- a/windows/client-management/mdm/policy-csp-update.md
+++ b/windows/client-management/mdm/policy-csp-update.md
@@ -5,13 +5,14 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Update
+
@@ -184,7 +185,7 @@ ms.date: 04/16/2018
- 1
+ 1
1
1
@@ -299,7 +300,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -358,7 +359,7 @@ ADMX Info:
-
+
@@ -492,7 +493,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -551,7 +552,7 @@ The following list shows the supported values:
-
+
@@ -605,7 +606,7 @@ The following list shows the supported values:
-
+
@@ -670,7 +671,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -843,7 +844,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -948,7 +949,7 @@ Added in Windows 10, version 1803. Enable IT admin to configure feature update
- 1
+ 1
1
1
@@ -1007,7 +1008,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -1061,7 +1062,7 @@ ADMX Info:
-
+
@@ -1204,7 +1205,7 @@ ADMX Info:
-
+
@@ -1550,7 +1551,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -1611,7 +1612,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -1863,7 +1864,7 @@ The following list shows the supported values:
-
+
@@ -1929,7 +1930,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -1991,7 +1992,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -2045,7 +2046,7 @@ ADMX Info:
- 1
+ 1
1
1
@@ -2104,7 +2105,7 @@ The following list shows the supported values:
- 2
+ 2
2
2
@@ -2178,7 +2179,7 @@ This policy is deprecated. Use [Update/RequireUpdateApproval](#update-requireupd
-
+
@@ -2239,7 +2240,7 @@ The following list shows the supported values:
-
+
@@ -2415,7 +2416,7 @@ Supported values are 2, 4, 8, 12, or 24 (hours).
-
+
@@ -2764,7 +2765,7 @@ ADMX Info:
-
+
@@ -2828,7 +2829,7 @@ ADMX Info:
- 2
+ 2
2
2
@@ -2945,7 +2946,7 @@ The following list shows the supported values:
-
+
@@ -3029,7 +3030,7 @@ Example
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-userrights.md b/windows/client-management/mdm/policy-csp-userrights.md
index e8f878d742..00b49c54f7 100644
--- a/windows/client-management/mdm/policy-csp-userrights.md
+++ b/windows/client-management/mdm/policy-csp-userrights.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-wifi.md b/windows/client-management/mdm/policy-csp-wifi.md
index 358dc3fc01..8d16e2c852 100644
--- a/windows/client-management/mdm/policy-csp-wifi.md
+++ b/windows/client-management/mdm/policy-csp-wifi.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - Wifi
@@ -73,7 +73,7 @@ This policy has been deprecated.
-
+
@@ -133,7 +133,7 @@ The following list shows the supported values:
-
+
@@ -193,7 +193,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -248,7 +248,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -350,7 +350,7 @@ The following list shows the supported values:
-
+
diff --git a/windows/client-management/mdm/policy-csp-windowsconnectionmanager.md b/windows/client-management/mdm/policy-csp-windowsconnectionmanager.md
index 0dfb797f32..8f02a364ba 100644
--- a/windows/client-management/mdm/policy-csp-windowsconnectionmanager.md
+++ b/windows/client-management/mdm/policy-csp-windowsconnectionmanager.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md b/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md
index 62f0031a6e..b8322c4c8e 100644
--- a/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md
+++ b/windows/client-management/mdm/policy-csp-windowsdefendersecuritycenter.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 03/12/2018
---
diff --git a/windows/client-management/mdm/policy-csp-windowsinkworkspace.md b/windows/client-management/mdm/policy-csp-windowsinkworkspace.md
index 27f04f2813..200331150b 100644
--- a/windows/client-management/mdm/policy-csp-windowsinkworkspace.md
+++ b/windows/client-management/mdm/policy-csp-windowsinkworkspace.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - WindowsInkWorkspace
@@ -47,7 +47,7 @@ ms.date: 03/12/2018
- 1
+ 1
1
1
@@ -105,7 +105,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
diff --git a/windows/client-management/mdm/policy-csp-windowslogon.md b/windows/client-management/mdm/policy-csp-windowslogon.md
index 5029554ef7..fe63238f62 100644
--- a/windows/client-management/mdm/policy-csp-windowslogon.md
+++ b/windows/client-management/mdm/policy-csp-windowslogon.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 04/16/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - WindowsLogon
@@ -242,7 +242,7 @@ ADMX Info:
- 2
+ 2
2
2
diff --git a/windows/client-management/mdm/policy-csp-windowspowershell.md b/windows/client-management/mdm/policy-csp-windowspowershell.md
index 3ca5b0ea63..9fc4dd7314 100644
--- a/windows/client-management/mdm/policy-csp-windowspowershell.md
+++ b/windows/client-management/mdm/policy-csp-windowspowershell.md
@@ -5,7 +5,7 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
+author: MariciaAlforque
ms.date: 04/16/2018
---
diff --git a/windows/client-management/mdm/policy-csp-wirelessdisplay.md b/windows/client-management/mdm/policy-csp-wirelessdisplay.md
index cafb7be12e..6c1ca5bd2d 100644
--- a/windows/client-management/mdm/policy-csp-wirelessdisplay.md
+++ b/windows/client-management/mdm/policy-csp-wirelessdisplay.md
@@ -5,8 +5,8 @@ ms.author: maricia
ms.topic: article
ms.prod: w10
ms.technology: windows
-author: nickbrower
-ms.date: 03/12/2018
+author: MariciaAlforque
+ms.date: 05/14/2018
---
# Policy CSP - WirelessDisplay
@@ -265,7 +265,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
@@ -404,7 +404,7 @@ The following list shows the supported values:
- 1
+ 1
1
1
backgroundtaskhost | HTTPS | www.bing.com/threshold/xls.aspx |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| searchui
backgroundtaskhost | HTTPS | www.bing.com/threshold/xls.aspx | 1709 |
## Certificates
The following endpoint is used by the Automatic Root Certificates Update component to automatically check the list of trusted authorities on Windows Update to see if an update is available. It is possible to [turn off traffic to this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#automatic-root-certificates-update), but that is not recommended because when root certificates are updated over time, applications and websites may stop working because they did not receive an updated root certificate the application uses.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTP | ctldl.windowsupdate.com/msdownload/update/v3/static/trustedr/en/authrootstl.cab?1ba0e83cae791f0d |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTP | ctldl.windowsupdate.com | 1709 |
The following endpoints are used to download certificates that are publicly known to be fraudulent.
These settings are critical for both Windows security and the overall security of the Internet.
We do not recommend blocking this endpoint.
If traffic to this endpoint is turned off, Windows no longer automatically downloads certificates known to be fraudulent, which increases the attack vector on the device.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTP | ctldl.windowsupdate.com/msdownload/update/v3/static/trustedr/en/disallowedcertstl.cab?03376e5589b4a188 |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTP | ctldl.windowsupdate.com | 1709 |
## Device authentication
The following endpoint is used to authenticate a device.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-feedback), the device will not be authenticated.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTPS | login.live.com/ppsecure/deviceaddcredential.srf |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTPS | login.live.com/ppsecure | 1709 |
## Device metadata
The following endpoint is used to retrieve device metadata.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-devinst), metadata will not be updated for the device.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | dmd.metaservices.microsoft.com.akadns.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | dmd.metaservices.microsoft.com.akadns.net | 1709 |
+| | HTTP | dmd.metaservices.microsoft.com | 1803 |
## Diagnostic Data
The following endpoint is used by the Connected User Experiences and Telemetry component and connects to the Microsoft Data Management service.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-feedback), diagnostic and usage information, which helps Microsoft find and fix problems and improve our products and services, will not be sent back to Microsoft.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | | cy2.vortex.data.microsoft.com.akadns.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | | cy2.vortex.data.microsoft.com.akadns.net | 1709 |
The following endpoint is used by the Connected User Experiences and Telemetry component and connects to the Microsoft Data Management service.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-feedback), diagnostic and usage information, which helps Microsoft find and fix problems and improve our products and services, will not be sent back to Microsoft.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | | v10.vortex-win.data.microsoft.com/collect/v1 |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | | v10.vortex-win.data.microsoft.com/collect/v1 | 1709 |
The following endpoints are used by Windows Error Reporting.
To turn off traffic for these endpoints, enable the following Group Policy: Administrative Templates > Windows Components > Windows Error Reporting > Disable Windows Error Reporting. This means error reporting information will not be sent back to Microsoft.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| wermgr | | watson.telemetry.microsoft.com/Telemetry.Request |
-| |TLS v1.2 |modern.watson.data.microsoft.com.akadns.net|
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| wermgr | | watson.telemetry.microsoft.com | 1709 |
+| | TLS v1.2 | modern.watson.data.microsoft.com.akadns.net | 1709 |
## Font streaming
The following endpoints are used to download fonts on demand.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#font-streaming), you will not be able to download fonts on demand.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | | fs.microsoft.com |
-| | | fs.microsoft.com/fs/windows/config.json |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | | fs.microsoft.com | 1709 |
+| | | fs.microsoft.com/fs/windows/config.json | 1709 |
## Licensing
The following endpoint is used for online activation and some app licensing.
To turn off traffic for this endpoint, disable the Windows License Manager Service. This will also block online activation and app licensing may not work.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| licensemanager | HTTPS | licensing.mp.microsoft.com/v7.0/licenses/content |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| licensemanager | HTTPS | licensing.mp.microsoft.com/v7.0/licenses/content | 1709 |
## Location
The following endpoint is used for location data.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-location), apps cannot use location data.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTP | location-inference-westus.cloudapp.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTP | location-inference-westus.cloudapp.net | 1709 |
## Maps
The following endpoint is used to check for updates to maps that have been downloaded for offline use.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-offlinemaps), offline maps will not be updated.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTPS | *g.akamaiedge.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTPS | *g.akamaiedge.net | 1709 |
## Microsoft account
The following endpoints are used for Microsoft accounts to sign in.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-microsoft-account), users cannot sign in with Microsoft accounts.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | login.msa.akadns6.net |
-| system32\Auth.Host.exe | HTTPS | auth.gfx.ms |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | login.msa.akadns6.net | 1709 |
+| system32\Auth.Host.exe | HTTPS | auth.gfx.ms | 1709 |
## Microsoft Store
The following endpoint is used for the Windows Push Notification Services (WNS). WNS enables third-party developers to send toast, tile, badge, and raw updates from their own cloud service. This provides a mechanism to deliver new updates to your users in a power-efficient and dependable way.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#live-tiles), push notifications will no longer work, including MDM device management, mail synchronization, settings synchronization.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | *.wns.windows.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | *.wns.windows.com | 1709 |
The following endpoint is used to revoke licenses for malicious apps in the Microsoft Store.
To turn off traffic for this endpoint, either uninstall the app or [disable the Microsoft Store](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-windowsstore). If you disable the Microsoft store, other Microsoft Store apps cannot be installed or updated. Additionally, the Microsoft Store won't be able to revoke malicious apps and users will still be able to open them.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTP | storecatalogrevocation.storequality.microsoft.com/applications/revoked.json/ |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTP | storecatalogrevocation.storequality.microsoft.com | 1709 |
The following endpoints are used to download image files that are called when applications run (Microsoft Store or Inbox MSN Apps).
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-windowsstore), the image files won't be downloaded, and apps cannot be installed or updated from the Microsoft Store. Additionally, the Microsoft Store won't be able to revoke malicious apps and users will still be able to open them.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTPS | img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RE1ARmA?ver=e6f4 |
-| | HTTPS | img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RWbW71?ver=c090 |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTPS | img-prod-cms-rt-microsoft-com.akamaized.net | 1709 |
+| backgroundtransferhost | HTTPS | store-images.microsoft.com | 1803 |
The following endpoints are used to communicate with Microsoft Store.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-windowsstore), apps cannot be installed or updated from the Microsoft Store. Additionally, the Microsoft Store won't be able to revoke malicious apps and users will still be able to open them.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTP | storeedgefd.dsx.mp.microsoft.com |
-| | HTTP | pti.store.microsoft.com |
-||TLS v1.2|cy2.\*.md.mp.microsoft.com.\*.|
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTP | storeedgefd.dsx.mp.microsoft.com | 1709 |
+| | HTTP | pti.store.microsoft.com | 1709 |
+||TLS v1.2|cy2.\*.md.mp.microsoft.com.\*.| 1709 |
+| svchost | HTTPS | displaycatalog.mp.microsoft.com | 1803 |
## Network Connection Status Indicator (NCSI)
Network Connection Status Indicator (NCSI) detects Internet connectivity and corporate network connectivity status. NCSI sends a DNS request and HTTP query to this endpoint to determine if the device can communicate with the Internet.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-ncsi), NCSI won't be able to determine if the device is connected to the Internet and the network status tray icon will show a warning.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTP | www.msftconnecttest.com/connecttest.txt |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTP | www.msftconnecttest.com/connecttest.txt | 1709 |
## Office
@@ -294,89 +299,74 @@ The following endpoints are used to connect to the Office 365 portal's shared in
You can turn this off by removing all Microsoft Office apps and the Mail and Calendar apps.
If you turn off traffic for these endpoints, users won't be able to save documents to the cloud or see their recently used documents.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | *.a-msedge.net |
-| hxstr | | *.c-msedge.net |
-| | | *.e-msedge.net |
-| | | *.s-msedge.net |
-
-The following endpoint is used to connect to the Office 365 portal's shared infrastructure, including Office Online. For more info, see [Office 365 URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2?ui=en-US&rs=en-US&ad=US#BKMK_Portal-identity).
-You can turn this off by removing all Microsoft Office apps and the Mail and Calendar apps.
-If you turn off traffic for this endpoint, users won't be able to save documents to the cloud or see their recently used documents.
-
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| hxstr | | *.c-msedge.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | *.a-msedge.net | 1709 |
+| hxstr | | *.c-msedge.net | 1709 |
+| | | *.e-msedge.net | 1709 |
+| | | *.s-msedge.net | 1709 |
+| | HTTPS | ocos-office365-s2s.msedge.net | 1803 |
The following endpoint is used to connect to the Office 365 portal's shared infrastructure, including Office Online. For more info, see [Office 365 URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2?ui=en-US&rs=en-US&ad=US#BKMK_Portal-identity).
You can turn this off by removing all Microsoft Office apps and the Mail and Calendar apps.
If you turn off traffic for these endpoints, users won't be able to save documents to the cloud or see their recently used documents.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| system32\Auth.Host.exe | HTTPS | outlook.office365.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| system32\Auth.Host.exe | HTTPS | outlook.office365.com | 1709 |
The following endpoint is OfficeHub traffic used to get the metadata of Office apps. To turn off traffic for this endpoint, either uninstall the app or [disable the Microsoft Store](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-windowsstore). If you disable the Microsoft store, other Microsoft Store apps cannot be installed or updated. Additionally, the Microsoft Store won't be able to revoke malicious apps and users will still be able to open them.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-|Windows Apps\Microsoft.Windows.Photos|HTTPS|client-office365-tas.msedge.net|
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+|Windows Apps\Microsoft.Windows.Photos|HTTPS|client-office365-tas.msedge.net| 1709 |
## OneDrive
The following endpoint is a redirection service that’s used to automatically update URLs.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-onedrive), anything that relies on g.live.com to get updated URL information will no longer work.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| onedrive | HTTP | g.live.com/1rewlive5skydrive/ODSUProduction |
-
-
-The following endpoint is a redirection service that’s used to automatically update URLs.
-If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-onedrive), anything that relies on g.live.com to get updated URL information will no longer work.
-
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| onedrive | HTTPS | g.live.com/1rewlive5skydrive/OneDriveProduction?OneDriveUpdate=1303f1898483a527eab1d8f57af6 |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| onedrive | HTTP \ HTTPS | g.live.com/1rewlive5skydrive/ODSUProduction | 1709 |
The following endpoint is used by OneDrive for Business to download and verify app updates. For more info, see [Office 365 URLs and IP address ranges](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2?ui=en-US&rs=en-US&ad=US).
To turn off traffic for this endpoint, uninstall OneDrive for Business. In this case, your device will not able to get OneDrive for Business app updates.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| onedrive | HTTPS | oneclient.sfx.ms/PreSignInSettings/Prod/PreSignInSettingsConfig.json?OneDriveUpdate=3253474af747a19de2a72deb9a75 |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| onedrive | HTTPS | oneclient.sfx.ms | 1709 |
## Settings
The following endpoint is used as a way for apps to dynamically update their configuration. Apps such as System Initiated User Feedback and the Xbox app use it.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-feedback), an app that uses this endpoint may stop working.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| dmclient | | cy2.settings.data.microsoft.com.akadns.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| dmclient | | cy2.settings.data.microsoft.com.akadns.net | 1709 |
The following endpoint is used as a way for apps to dynamically update their configuration. Apps such as System Initiated User Feedback and the Xbox app use it.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-feedback), an app that uses this endpoint may stop working.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| dmclient | HTTPS | settings.data.microsoft.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| dmclient | HTTPS | settings.data.microsoft.com | 1709 |
The following endpoint is used as a way for apps to dynamically update their configuration. Apps such as Windows Connected User Experiences and Telemetry component and Windows Insider Program use it.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-priv-feedback), an app that uses this endpoint may stop working.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTPS | settings-win.data.microsoft.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTPS | settings-win.data.microsoft.com | 1709 |
## Skype
The following endpoint is used to retrieve Skype configuration values. To turn off traffic for this endpoint, either uninstall the app or [disable the Microsoft Store](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-windowsstore). If you disable the Microsoft store, other Microsoft Store apps cannot be installed or updated. Additionally, the Microsoft Store won't be able to revoke malicious apps and users will still be able to open them.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-|microsoft.windowscommunicationsapps.exe | HTTPS | config.edge.skype.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+|microsoft.windowscommunicationsapps.exe | HTTPS | config.edge.skype.com | 1709 |
@@ -385,112 +375,102 @@ The following endpoint is used to retrieve Skype configuration values. To turn o
The following endpoint is used for Windows Defender when Cloud-based Protection is enabled.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-defender), the device will not use Cloud-based Protection.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | wdcp.microsoft.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | wdcp.microsoft.com | 1709 |
The following endpoints are used for Windows Defender definition updates.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-defender), definitions will not be updated.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | definitionupdates.microsoft.com |
-|MpCmdRun.exe|HTTPS|go.microsoft.com|
-
-## Windows Insider Preview builds
-
-The following endpoint is used to retrieve Windows Insider Preview builds.
-If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-previewbuilds), the device will not be notified about new Windows Insider Preview builds.
-
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTPS | insiderppe.cloudapp.net/windows-app-web-link |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | definitionupdates.microsoft.com | 1709 |
+|MpCmdRun.exe|HTTPS|go.microsoft.com | 1709 |
## Windows Spotlight
The following endpoints are used to retrieve Windows Spotlight metadata that describes content, such as references to image locations, as well as suggested apps, Microsoft account notifications, and Windows tips.
-If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-spotlight), Windows Spotlight will still try to deliver new lock screen images and updated content but it will fail; suggested apps, Microsoft account notifications, and Windows tips will not be downloaded. For more information, see [Windows Spotlight](windows-spotlight.md).
+If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-spotlight), Windows Spotlight will still try to deliver new lock screen images and updated content but it will fail; suggested apps, Microsoft account notifications, and Windows tips will not be downloaded. For more information, see [Windows Spotlight](/windows/configuration/windows-spotlight).
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| backgroundtaskhost | HTTPS | arc.msn.com |
-| backgroundtaskhost | | g.msn.com.nsatc.net |
-| |TLS v1.2| *.search.msn.com |
-| | HTTPS | ris.api.iris.microsoft.com/v1/a/impression?CID=116000000000270658®ion=US&lang=EN-US&oem=&devFam=WINDOWS.DESKTOP&ossku=ENTERPRISE&cmdVer=10.0.15063.0&mo=&cap=&EID=&&PID=400051553&UIT=G&TargetID=700090861&AN=275357688&PG=PC000P0FR5.0000000G4I&REQASID=D17E3C737583496F8C4CE6553F7395C5&UNID=202914&ANID=&MUID=&ASID=a81b259b93e2425e801d0bb5a5ec2741&PERSID=&AUID=71FA96C64367722E210169966CE8D919&TIME=20170721T015831Z |
-| | HTTPS | query.prod.cms.rt.microsoft.com/cms/api/am/binary/RWaHxi |
-| | HTTPS | query.prod.cms.rt.microsoft.com/cms/api/am/binary/RWaML4 |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| backgroundtaskhost | HTTPS | arc.msn.com | 1709 |
+| backgroundtaskhost | | g.msn.com.nsatc.net | 1709 |
+| |TLS v1.2| *.search.msn.com | 1709 |
+| | HTTPS | ris.api.iris.microsoft.com | 1709 |
+| | HTTPS | query.prod.cms.rt.microsoft.com | 1709 |
## Windows Update
The following endpoint is used for Windows Update downloads of apps and OS updates, including HTTP downloads or HTTP downloads blended with peers.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-updates), Windows Update downloads will not be managed, as critical metadata that is used to make downloads more resilient is blocked. Downloads may be impacted by corruption (resulting in re-downloads of full files). Additionally, downloads of the same update by multiple devices on the same local network will not use peer devices for bandwidth reduction.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTPS | *.prod.do.dsp.mp.microsoft.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTPS | *.prod.do.dsp.mp.microsoft.com | 1709 |
The following endpoints are used to download operating system patches and updates.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), the device will not be able to download updates for the operating system.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | | au.download.windowsupdate.com |
-| svchost | HTTP | *.windowsupdate.com |
-| | HTTP | fg.download.windowsupdate.com.c.footprint.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTP | *.windowsupdate.com | 1709 |
+| | HTTP | fg.download.windowsupdate.com.c.footprint.net | 1709 |
The following endpoint is used by the Highwinds Content Delivery Network to perform Windows updates.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), the device will not perform updates.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | cds.d2s7q6s2.hwcdn.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | cds.d2s7q6s2.hwcdn.net | 1709 |
The following endpoints are used by the Verizon Content Delivery Network to perform Windows updates.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), the device will not perform updates.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | HTTP | *wac.phicdn.net |
-| | | *wac.edgecastcdn.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | HTTP | *wac.phicdn.net | 1709 |
+| | | *wac.edgecastcdn.net | 1709 |
The following endpoint is used to download apps and Windows Insider Preview builds from the Microsoft Store. Time Limited URL (TLU) is a mechanism for protecting the content. For example, it prevents someone from copying the URL and then getting access to the app that the person has not acquired).
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), the updating functionality on this device is essentially in a disabled state, resulting in user unable to get apps from the Store, get latest version of Windows, and so on.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | | *.tlu.dl.delivery.mp.microsoft.com.c.footprint.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | | *.tlu.dl.delivery.mp.microsoft.com.c.footprint.net | 1709 |
The following endpoint is used to download apps from the Microsoft Store. It's used as part of calculating the right ranges for apps.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), users of the device will not able to get apps from the Microsoft Store.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | | emdl.ws.microsoft.com/emdl/c/doc/ph/prod1/msdownload/update/software/defu/2017/07/1024/am_base_82267ed19fb382d07106d5f64257fb815c664b31.exe.json |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | | emdl.ws.microsoft.com | 1709 |
The following endpoints enable connections to Windows Update, Microsoft Update, and the online services of the Store.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), the device will not be able to connect to Windows Update and Microsoft Update to help keep the device secure. Also, the device will not be able to acquire and update apps from the Store.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTPS | fe2.update.microsoft.com/v6/ClientWebService/client.asmx |
-| svchost | | fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx |
-| | | fe3.delivery.dsp.mp.microsoft.com.nsatc.net (an alias for fe3.delivery.mp.microsoft.com) |
-| svchost | HTTPS | sls.update.microsoft.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTPS | fe2.update.microsoft.com | 1709 |
+| svchost | | fe3.delivery.mp.microsoft.com | 1709 |
+| | | fe3.delivery.dsp.mp.microsoft.com.nsatc.net | 1709 |
+| svchost | HTTPS | sls.update.microsoft.com | 1709 |
+| | HTTP | *.dl.delivery.mp.microsoft.com | 1803 |
The following endpoint is used for content regulation.
If you [turn off traffic for this endpoint](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), the Windows Update Agent will be unable to contact the endpoint and fallback behavior will be used. This may result in content being either incorrectly downloaded or not downloaded at all.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| svchost | HTTPS | tsfe.trafficshaping.dsp.mp.microsoft.com |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| svchost | HTTPS | tsfe.trafficshaping.dsp.mp.microsoft.com | 1709 |
The following endpoints are used to download content.
If you [turn off traffic for these endpoints](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-wu), you will block any content from being downloaded.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-| | | a122.dscd.akamai.net |
-| | | a1621.g.akamai.net |
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+| | | a122.dscd.akamai.net | 1709 |
+| | | a1621.g.akamai.net | 1709 |
## Microsoft forward link redirection service (FWLink)
@@ -498,9 +478,9 @@ The following endpoint is used by the Microsoft forward link redirection service
If you disable this endpoint, Windows Defender won't be able to update its malware definitions; links from Windows and other Microsoft products to the Web won't work; and PowerShell updateable Help won't update. To disable the traffic, instead disable the traffic that's getting forwarded.
-| Source process | Protocol | Destination |
-|----------------|----------|------------|
-|Various|HTTPS|go.microsoft.com|
+| Source process | Protocol | Destination | Applies from Windows 10 version |
+|----------------|----------|------------|----------------------------------|
+|Various|HTTPS|go.microsoft.com| 1709 |
## Endpoints for other Windows editions
diff --git a/windows/configuration/windows-diagnostic-data-1703.md b/windows/privacy/windows-diagnostic-data-1703.md
similarity index 100%
rename from windows/configuration/windows-diagnostic-data-1703.md
rename to windows/privacy/windows-diagnostic-data-1703.md
diff --git a/windows/configuration/windows-diagnostic-data.md b/windows/privacy/windows-diagnostic-data.md
similarity index 100%
rename from windows/configuration/windows-diagnostic-data.md
rename to windows/privacy/windows-diagnostic-data.md
diff --git a/windows/privacy/windows-personal-data-services-configuration.md b/windows/privacy/windows-personal-data-services-configuration.md
new file mode 100644
index 0000000000..4b824f3b1d
--- /dev/null
+++ b/windows/privacy/windows-personal-data-services-configuration.md
@@ -0,0 +1,400 @@
+---
+title: Windows 10 personal data services configuration
+description: An overview of Windows 10 services configuration settings that are used for personal data privacy protection relevant for regulations, such as the General Data Protection Regulation (GDPR)
+keywords: privacy, GDPR, windows, IT
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.pagetype: security
+ms.localizationpriority: high
+author: danihalfin
+ms.author: daniha
+ms.date: 05/11/2018
+---
+# Windows 10 personal data services configuration
+
+Applies to:
+- Windows 10, version 1803
+
+Microsoft assembled a list of Windows 10 services configuration settings that are useful for personal data privacy protection and related regulations, such as the General Data Protection Regulation (GDPR). There is one section with settings for service data that is managed at Microsoft and a section for local data that is managed by an IT organization.
+
+IT Professionals that are interested in applying these settings via group policies can find the configuration for download [here](https://go.microsoft.com/fwlink/?linkid=874149).
+
+## Introduction
+
+Microsoft collects data from or generates it through interactions with users of Windows 10 devices. This information can contain personal data that may be used to provide, support, and improve Windows 10 services.
+
+Many Windows 10 services are controller services. A user can manage data collection settings, for example by opening *Start > Settings > Privacy* or by visiting the [Microsoft Privacy dashboard](https://account.microsoft.com/privacy). While this relationship between Microsoft and a user is evident in a consumer type scenario, an IT organization can influence that relationship. For example, the IT department has the ability to configure the Windows diagnostic data level across their organization by using Group Policy, registry, or Mobile Device Management (MDM) settings.
+
+Below is a collection of settings related to the Windows 10 personal data services configuration that IT Professionals can use as guidance for influencing Windows diagnostic data collection and personal data protection.
+
+## Windows diagnostic data
+
+Windows 10 collects Windows diagnostic data—such as usage data, performance data, inking, typing, and utterance data—and sends it back to Microsoft. That data is used for keeping the operating system secure and up-to-date, to troubleshoot problems, and to make product improvements. For users who have turned on "Tailored experiences", that data can also be used to offer personalized tips, ads, and recommendations to enhance Microsoft products and services for your needs.
+
+The following options for configuring Windows diagnostic data are relevant in this context.
+
+### Diagnostic level
+
+This setting determines the amount of Windows diagnostic data sent to Microsoft.
+
+>[!NOTE]
+>In Windows 10, version 1709, Microsoft introduced a new feature: “Limit Enhanced diagnostic data to the minimum required by Windows Analytics”. When enabled, this feature limits the operating system diagnostic data events included in the Enhanced level to the smallest set of data required by [Windows Analytics](https://www.microsoft.com/windowsforbusiness/windows-analytics). For more information on the Enhanced level, see [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md).
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Data Collection and Preview Builds |
+>| **Policy Name** | Allow Telemetry |
+>| **Default setting** | 2 - Enhanced |
+>| **Recommended** | 2 - Enhanced |
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | User Configuration\Administrative Templates\Windows Components\Data Collection and Preview Builds |
+>| **Policy Name** | Allow Telemetry |
+>| **Default setting** | 2 - Enhanced |
+>| **Recommended** | 2 - Enhanced |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\Windows\DataCollection |
+>| **Value** | AllowTelemetry |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000002" |
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKCU\Software\Policies\Microsoft\Windows\DataCollection |
+>| **Value** | AllowTelemetry |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000002" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | System |
+>| **Policy** | AllowTelemetry (scope: device and user) |
+>| **Default setting** | 2 – Enhanced |
+>| **Recommended** | 2 – Allowed |
+
+### Diagnostic opt-in change notifications
+
+This setting determines whether a device shows notifications about Windows diagnostic data levels to people on first logon or when changes occur in the diagnostic configuration.
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Data Collection and Preview Builds |
+>| **Policy Name** | Configure telemetry opt-in change notifications |
+>| **Default setting** | Enabled |
+>| **Recommended** | Enabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\Windows\DataCollection |
+>| **Value** | DisableTelemetryOptInChangeNotification |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000001" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | System |
+>| **Policy** | ConfigureTelemetryOptInChangeNotification |
+>| **Default setting** | 0 – Enabled |
+>| **Recommended** | 0 – Enabled |
+
+### Configure telemetry opt-in setting user interface
+
+This setting determines whether people can change their own Windows diagnostic data level in in *Start > Settings > Privacy > Diagnostics & feedback*.
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Data Collection and Preview Builds |
+>| **Policy Name** | Configure telemetry opt-in setting user interface |
+>| **Default setting** | Enabled |
+>| **Recommended** | Enabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\Windows\DataCollection |
+>| **Value** | DisableTelemetryOptInSettingsUx |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000001" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | System |
+>| **Policy** | ConfigureTelemetryOptInSettingsUx |
+>| **Default setting** | 0 – Enabled |
+>| **Recommended** | 0 – Enabled |
+
+## Policies affecting personal data protection managed by the Enterprise IT
+
+There are additional settings usually managed by the Enterprise IT that also affect the protection of personal data.
+
+The following options for configuring these policies are relevant in this context.
+
+### BitLocker
+
+The following settings determine whether fixed and removable drives are protected by the BitLocker Drive Encryption.
+
+#### Fixed Data Drives
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Bitlocker Drive Encryption\Fixed Data Drives |
+>| **Policy Name** | Deny write access to fixed drives not protected by BitLocker |
+>| **Default setting** | Not configured |
+>| **Recommended** | Enabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\System\CurrentControlSet\Policies\Microsoft\FVE |
+>| **Value** | FDVDenyWriteAccess |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000001" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | BitLocker |
+>| **Policy** | RemovableDrivesRequireEncryption |
+>| **Default setting** | Disabled |
+>| **Recommended** | Enabled (see [instructions](/windows/client-management/mdm/bitlocker-csp#fixeddrivesrequireencryption)) |
+
+#### Removable Data Drives
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Bitlocker Drive Encryption\Removable Data Drives |
+>| **Policy Name** | Deny write access to removable drives not protected by BitLocker |
+>| **Default setting** | Not configured |
+>| **Recommended** | Enabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\System\CurrentControlSet\Policies\Microsoft\FVE |
+>| **Value** | RDVDenyWriteAccess |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000001" |
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\FVE |
+>| **Value** | RDVDenyCrossOrg |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000000" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | BitLocker |
+>| **Policy** | RemovableDrivesRequireEncryption |
+>| **Default setting** | Disabled |
+>| **Recommended** | Enabled (see [instructions](/windows/client-management/mdm/bitlocker-csp#removabledrivesrequireencryption)) |
+
+### Privacy – AdvertisingID
+
+This setting determines if the advertising ID, which preventing apps from using the ID for experiences across apps, is turned off.
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\System\User Profiles |
+>| **Policy Name** | Turn off the advertising ID |
+>| **Default setting** | Not configured |
+>| **Recommended** | Enabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\Windows\AdvertisingInfo |
+>| **Value** | DisabledByGroupPolicy |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000001" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | Privacy |
+>| **Policy** | DisableAdvertisingId |
+>| **Default setting** | 65535 (default) - Not configured |
+>| **Recommended** | 1 – Enabled |
+
+### Edge
+
+These settings whether employees send “Do Not Track” from the Microsoft Edge web browser to websites.
+
+>[!NOTE]
+>Please see [this Microsoft blog post](https://blogs.microsoft.com/on-the-issues/2015/04/03/an-update-on-microsofts-approach-to-do-not-track/) for more details on why the “Do Not Track” is no longer the default setting.
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Microsoft Edge |
+>| **Policy Name** | Configure Do Not Track |
+>| **Default setting** | Disabled |
+>| **Recommended** | Disabled |
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | User Configuration\Administrative Templates\Windows Components\Microsoft Edge |
+>| **Policy Name** | Configure Do Not Track |
+>| **Default setting** | Disabled |
+>| **Recommended** | Disabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\MicrosoftEdge\Main |
+>| **Value** | DoNotTrack |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000000" |
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Registry key** | HKCU\Software\Policies\Microsoft\MicrosoftEdge\Main |
+>| **Value** | DoNotTrack |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000000" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **MDM CSP** | Browser |
+>| **Policy** | AllowDoNotTrack (scope: device + user) |
+>| **Default setting** | 0 (default) – Not allowed |
+>| **Recommended** | 0 – Not allowed |
+
+### Internet Explorer
+
+These settings whether employees send “Do Not Track” header from the Microsoft Explorer web browser to websites.
+
+#### Group Policy
+
+> [!div class="mx-tableFixed"]
+>| | |
+>|:-|:-|
+>| **Group Policy** | Computer Configuration\Administrative Templates\Windows Components\Internet Explorer\Internet Control Panel\Advanced Page |
+>| **Policy Name** | Always send Do Not Track header |
+>| **Default setting** | Disabled |
+>| **Recommended** | Disabled |
+
+> [!div class="mx-tableFixed"]
+>|||
+>|:-|:-|
+>| **Group Policy** | User Configuration\Administrative Templates\Windows Components\Internet Explorer\Internet Control Panel\Advanced Page |
+>| **Policy Name** | Always send Do Not Track header |
+>| **Default setting** | Disabled |
+>| **Recommended** | Disabled |
+
+#### Registry
+
+> [!div class="mx-tableFixed"]
+>|||
+>|:-|:-|
+>| **Registry key** | HKLM\Software\Policies\Microsoft\Internet Explorer\Main |
+>| **Value** | DoNotTrack |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000000" |
+
+> [!div class="mx-tableFixed"]
+>|||
+>|:-|:-|
+>| **Registry key** | HKCU\Software\Policies\Microsoft\Internet Explorer\Main |
+>| **Value** | DoNotTrack |
+>| **Type** | REG_DWORD |
+>| **Setting** | "00000000" |
+
+#### MDM
+
+> [!div class="mx-tableFixed"]
+>|||
+>|:-|:-|
+>| **MDM CSP** | N/A |
+
+## Additional resources
+
+### FAQs
+
+* [Windows 10 feedback, diagnostics, and privacy](https://privacy.microsoft.com/windows-10-feedback-diagnostics-and-privacy)
+* [Microsoft Edge and privacy](https://privacy.microsoft.com/windows-10-microsoft-edge-and-privacy)
+* [Windows Hello and privacy](https://privacy.microsoft.com/windows-10-windows-hello-and-privacy)
+* [Wi-Fi Sense](https://privacy.microsoft.com/windows-10-about-wifi-sense)
+
+### Blogs
+
+* [Privacy and Windows 10](https://blogs.windows.com/windowsexperience/2015/09/28/privacy-and-windows-10)
+
+### Privacy Statement
+
+* [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement)
+
+### Windows Privacy on docs.microsoft.com
+
+* [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.md)
+* [Understanding Windows diagnostic data](configure-windows-diagnostic-data-in-your-organization.md#understanding-windows-diagnostic-data)
+* [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md)
+
+### Other resources
+
+* [Privacy at Microsoft](http://privacy.microsoft.com/)
diff --git a/windows/security/hardware-protection/tpm/tpm-recommendations.md b/windows/security/hardware-protection/tpm/tpm-recommendations.md
index a9f0a616d2..5b220439f0 100644
--- a/windows/security/hardware-protection/tpm/tpm-recommendations.md
+++ b/windows/security/hardware-protection/tpm/tpm-recommendations.md
@@ -8,7 +8,7 @@ ms.sitesec: library
ms.pagetype: security
ms.localizationpriority: high
author: brianlic-msft
-ms.date: 10/27/2017
+ms.date: 05/16/2018
---
# TPM recommendations
@@ -102,7 +102,9 @@ The following table defines which Windows features require TPM support.
| Measured Boot | Yes | Yes | Yes | Measured Boot requires TPM 1.2 or 2.0 and UEFI Secure Boot |
| BitLocker | Yes | Yes | Yes | TPM 1.2 or 2.0 is required |
| Device Encryption | Yes | N/A | Yes | Device Encryption requires Modern Standby/Connected Standby certification, which requires TPM 2.0. |
-| Device Guard | No | Yes | Yes | |
+| Windows Defender Application Control (Device Guard) | No | Yes | Yes | |
+| Windows Defender Exploit Guard | Yes | Yes | Yes | |
+| Windows Defender System Guard | Yes | Yes | Yes | |
| Credential Guard | No | Yes | Yes | Windows 10, version 1507 (End of Life as of May 2017) only supported TPM 2.0 for Credential Guard. Beginning with Windows 10, version 1511, TPM 1.2 and 2.0 are supported. |
| Device Health Attestation| Yes | Yes | Yes | |
| Windows Hello/Windows Hello for Business| No | Yes | Yes | Azure AD join supports both versions of TPM, but requires TPM with keyed-hash message authentication code (HMAC) and Endorsement Key (EK) certificate for key attestation support. |
diff --git a/windows/security/identity-protection/hello-for-business/hello-cert-trust-deploy-mfa.md b/windows/security/identity-protection/hello-for-business/hello-cert-trust-deploy-mfa.md
index 99a39e91b2..2cadf0703a 100644
--- a/windows/security/identity-protection/hello-for-business/hello-cert-trust-deploy-mfa.md
+++ b/windows/security/identity-protection/hello-for-business/hello-cert-trust-deploy-mfa.md
@@ -25,7 +25,7 @@ On-premises deployments must use the On-premises Azure MFA Server using the AD F
## Prerequisites
-The Azure MFA Server and User Portal servers have several perquisites and must have connectivity to the Internet.
+The Azure MFA Server and User Portal servers have several prerequisites and must have connectivity to the Internet.
### Primary MFA Server
@@ -540,4 +540,4 @@ The Multi-Factor Authentication server communicates with the Azure MFA cloud ser
2. [Validate and Configure Public Key Infrastructure](hello-cert-trust-validate-pki.md)
3. [Prepare and Deploy Windows Server 2016 Active Directory Federation Services](hello-cert-trust-adfs.md)
4. [Validate and Deploy Multifactor Authentication Services (MFA)](hello-cert-trust-validate-deploy-mfa.md)
-5. [Configure Windows Hello for Business Policy settings](hello-cert-trust-policy-settings.md)
\ No newline at end of file
+5. [Configure Windows Hello for Business Policy settings](hello-cert-trust-policy-settings.md)
diff --git a/windows/security/identity-protection/vpn/images/custom-vpn-profile.png b/windows/security/identity-protection/vpn/images/custom-vpn-profile.png
new file mode 100644
index 0000000000..0dc0c88880
Binary files /dev/null and b/windows/security/identity-protection/vpn/images/custom-vpn-profile.png differ
diff --git a/windows/security/identity-protection/vpn/vpn-profile-options.md b/windows/security/identity-protection/vpn/vpn-profile-options.md
index 4f1b8870a5..68985981af 100644
--- a/windows/security/identity-protection/vpn/vpn-profile-options.md
+++ b/windows/security/identity-protection/vpn/vpn-profile-options.md
@@ -6,9 +6,10 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
ms.pagetype: security, networking
-author: jdeckerms
+author: shortpatti
+ms.author: pashort
ms.localizationpriority: high
-ms.date: 07/27/2017
+ms.date: 05/17/2018
---
# VPN profile options
@@ -37,10 +38,10 @@ The following table lists the VPN settings and whether the setting can be config
| Name resolution: persistent | no |
| Auto-trigger: app trigger | yes |
| Auto-trigger: name trigger | yes |
-| Auto-trigger: Always On | no |
+| Auto-trigger: Always On | yes |
| Auto-trigger: trusted network detection | no |
| LockDown | no |
-| Windows Information Protection (WIP) | no |
+| Windows Information Protection (WIP) | yes |
| Traffic filters | yes |
The ProfileXML node was added to the VPNv2 CSP to allow users to deploy VPN profile as a single blob. This is particularly useful for deploying profiles with features that are not yet supported by MDMs. You can get additional examples in the [ProfileXML XSD](https://msdn.microsoft.com/library/windows/hardware/mt755930.aspx) topic.
@@ -296,9 +297,30 @@ The following is a sample plug-in VPN profile. This blob would fall under the Pr
After you configure the settings that you want using ProfileXML, you can apply it using Intune and a **Custom Configuration (Windows 10 Desktop and Mobile and later)** policy.
-The OMS-URI setting to apply ProfileXML is **./user/vendor/MSFT/*VPN profile name*/ProfileXML**.
+1. Sign into the [Azure portal](https://portal.azure.com).
+2. Click **Intune** > **Device Configuration** > **Profiles**.
+3. Click **Create Profile**.
+4. Enter a name and (optionally) a description.
+5. Choose **Windows 10 and later** as the platform.
+6. Choose **Custom** as the profile type.
+7. Click **Add**.
+8. Configure the custom setting:
+
+ a. Enter a name and (optionally) a description.
+
+ b. Enter the OMA-URI: **./user/vendor/MSFT/_VPN profile name_/ProfileXML**.
+
+ c. Set Data type to **String (XML file)**.
+
+ d. Upload the file with the profile XML.
+
+ e. Click **OK**.
+
+ 
+
+9. Click **OK**, then click **Create**.
+10. Assign the profile.
-
## Learn more
diff --git a/windows/security/threat-protection/windows-defender-antivirus/configure-server-exclusions-windows-defender-antivirus.md b/windows/security/threat-protection/windows-defender-antivirus/configure-server-exclusions-windows-defender-antivirus.md
index 3b5d442956..1b9179c6b3 100644
--- a/windows/security/threat-protection/windows-defender-antivirus/configure-server-exclusions-windows-defender-antivirus.md
+++ b/windows/security/threat-protection/windows-defender-antivirus/configure-server-exclusions-windows-defender-antivirus.md
@@ -11,7 +11,7 @@ ms.pagetype: security
ms.localizationpriority: medium
author: andreabichsel
ms.author: v-anbic
-ms.date: 04/30/2018
+ms.date: 05/17/2018
---
# Configure exclusions in Windows Defender AV on Windows Server
@@ -55,6 +55,9 @@ In Windows Server 2016 the predefined exclusions delivered by definition updates
> [!WARNING]
> Opting out of automatic exclusions may adversely impact performance, or result in data corruption. The exclusions that are delivered automatically are optimized for Windows Server 2016 roles.
+> [!NOTE]
+> This setting is only supported on Windows Server 2016. While this setting exists in Windows 10, it doesn't have an effect on exclusions.
+
You can disable the auto-exclusions lists with Group Policy, PowerShell cmdlets, and WMI.
**Use Group Policy to disable the auto-exclusions list on Windows Server 2016:**
@@ -89,9 +92,6 @@ See the following for more information and allowed parameters:
- [Windows Defender WMIv2 APIs](https://msdn.microsoft.com/en-us/library/dn439477(v=vs.85).aspx)
-
-
-
## List of automatic exclusions
The following sections contain the exclusions that are delivered with automatic exclusions file paths and file types.
diff --git a/windows/security/threat-protection/windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md b/windows/security/threat-protection/windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md
index 5b1594fd3c..fb0e204c91 100644
--- a/windows/security/threat-protection/windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md
+++ b/windows/security/threat-protection/windows-defender-antivirus/deploy-manage-report-windows-defender-antivirus.md
@@ -11,7 +11,7 @@ ms.pagetype: security
ms.localizationpriority: medium
author: andreabichsel
ms.author: v-anbic
-ms.date: 04/30/2018
+ms.date: 05/17/2018
---
# Deploy, manage, and report on Windows Defender Antivirus
@@ -47,7 +47,7 @@ PowerShell|Deploy with Group Policy, System Center Configuration Manager, or man
Group Policy and Active Directory (domain-joined)|Use a Group Policy Object to deploy configuration changes and ensure Windows Defender Antivirus is enabled.|Use Group Policy Objects (GPOs) to [Configure update options for Windows Defender Antivirus][] and [Configure Windows Defender features][]|Endpoint reporting is not available with Group Policy. You can generate a list of [Group Policies to determine if any settings or policies are not applied][]
Microsoft Azure|Deploy Microsoft Antimalware for Azure in the [Azure portal, by using Visual Studio virtual machine configuration, or using Azure PowerShell cmdlets](https://docs.microsoft.com/en-us/azure/security/azure-security-antimalware#antimalware-deployment-scenarios). You can also [Install Endpoint protection in Azure Security Center](https://docs.microsoft.com/en-us/azure/security-center/security-center-install-endpoint-protection)|Configure [Microsoft Antimalware for Virtual Machines and Cloud Services with Azure PowerShell cmdlets](https://docs.microsoft.com/en-us/powershell/servicemanagement/azure.antimalware/v3.4.0/azure.antimalware) or [use code samples](https://gallery.technet.microsoft.com/Antimalware-For-Azure-5ce70efe)|Use [Microsoft Antimalware for Virtual Machines and Cloud Services with Azure PowerShell cmdlets](https://docs.microsoft.com/en-us/powershell/servicemanagement/azure.antimalware/v3.4.0/azure.antimalware) to enable monitoring. You can also review usage reports in Azure Active Directory to determine suspicious activity, including the [Possibly infected devices][] report and configure an SIEM tool to report on [Windows Defender Antivirus events][] and add that tool as an app in AAD.
-1. The availability of some functions and features, especially related to cloud-delivered protection, differ between System Center Configuration Manager, current branch (for example, System Center Configuration Manager 2016) and System Center Configuration Manager 2012. In this library, we've focused on Windows 10, Windows Server 2016, and System Center Configuration Manager, current branch (2016). See the [Utilize Microsoft cloud-provided protection in Windows Defender Antivirus](utilize-microsoft-cloud-protection-windows-defender-antivirus.md) topic for a table that describes the major differences. [(Return to table)](#ref2)
+1. The availability of some functions and features, especially related to cloud-delivered protection, differ between System Center Configuration Manager 2016 and System Center Configuration Manager 2012. In this library, we've focused on Windows 10, Windows Server 2016, and System Center Configuration Manager 2016. See [Use Microsoft cloud-provided protection in Windows Defender Antivirus](utilize-microsoft-cloud-protection-windows-defender-antivirus.md) for a table that describes the major differences. [(Return to table)](#ref2)
2. In Windows 10, Windows Defender Antivirus is a component available without installation or deployment of an additional client or service. It will automatically be enabled when third-party antivirus products are either uninstalled or out of date ([except on Windows Server 2016](windows-defender-antivirus-on-windows-server-2016.md)). Traditional deployment therefore is not required. Deployment here refers to ensuring the Windows Defender Antivirus component is available and enabled on endpoints or servers. [(Return to table)](#ref2)
diff --git a/windows/security/threat-protection/windows-defender-antivirus/utilize-microsoft-cloud-protection-windows-defender-antivirus.md b/windows/security/threat-protection/windows-defender-antivirus/utilize-microsoft-cloud-protection-windows-defender-antivirus.md
index dc9a8ef5b0..2287ad83a6 100644
--- a/windows/security/threat-protection/windows-defender-antivirus/utilize-microsoft-cloud-protection-windows-defender-antivirus.md
+++ b/windows/security/threat-protection/windows-defender-antivirus/utilize-microsoft-cloud-protection-windows-defender-antivirus.md
@@ -67,8 +67,7 @@ Feature | Windows 8.1 (Group Policy) | Windows 10, version 1607 (Group Policy) |
---|---|---|---|---|---|---
Cloud-protection service label | Microsoft Advanced Protection Service | Microsoft Advanced Protection Service | Cloud-based Protection | NA | Cloud protection service | Microsoft Advanced Protection Service
Reporting level (MAPS membership level) | Basic, Advanced | Advanced | Advanced | Dependent on Windows version | Dependent on Windows version | Dependent on Windows version
-Block at first sight availability | No | Yes | Yes | Not configurable | Configurable | No
-Cloud block timeout period | No | No | Configurable | Not configurable | Configurable | No
+Cloud block timeout period | No | No | Configurable | Not configurable | Configurable | Configurable
You can also [configure Windows Defender AV to automatically receive new protection updates based on reports from our cloud service](manage-event-based-updates-windows-defender-antivirus.md#cloud-report-updates).
@@ -81,4 +80,4 @@ You can also [configure Windows Defender AV to automatically receive new protect
[Specify the cloud-delivered protection level](specify-cloud-protection-level-windows-defender-antivirus.md) | You can specify the level of protection offered by the cloud with Group Policy and System Center Configuration Manager. The protection level will affect the amount of information shared with the cloud and how aggressively new files are blocked.
[Configure and validate network connections for Windows Defender Antivirus](configure-network-connections-windows-defender-antivirus.md) | There are certain Microsoft URLs that your network and endpoints must be able to connect to for cloud-delivered protection to work effectively. This topic lists the URLs that should be allowed via firewall or network filtering rules, and instructions for confirming your network is properly enrolled in cloud-delivered protection.
[Configure the Block at First Sight feature](configure-block-at-first-sight-windows-defender-antivirus.md) | The Block at First Sight feature can block new malware within seconds, without having to wait hours for a traditional signature. You can enable and configure it with System Center Configuration Manager and Group Policy.
-[Configure the cloud block timeout period](configure-cloud-block-timeout-period-windows-defender-antivirus.md) | Windows Defender Antivirus can block suspicious files from running while it queries our cloud-delivered protection service. You can configure the amount of time the file will be prevented from running with System Center Configuration Manager and Group Policy.
\ No newline at end of file
+[Configure the cloud block timeout period](configure-cloud-block-timeout-period-windows-defender-antivirus.md) | Windows Defender Antivirus can block suspicious files from running while it queries our cloud-delivered protection service. You can configure the amount of time the file will be prevented from running with System Center Configuration Manager and Group Policy.
diff --git a/windows/security/threat-protection/windows-defender-application-control/TOC.md b/windows/security/threat-protection/windows-defender-application-control/TOC.md
index ecceb40ef9..4bf7c5ff89 100644
--- a/windows/security/threat-protection/windows-defender-application-control/TOC.md
+++ b/windows/security/threat-protection/windows-defender-application-control/TOC.md
@@ -11,14 +11,15 @@
## [Windows Defender Application Control deployment guide](windows-defender-application-control-deployment-guide.md)
### [Types of devices](types-of-devices.md)
-### [Use WDAC with a managed installer](use-windows-defender-application-control-with-managed-installer.md)
###Use WDAC with custom policies
#### [Create an initial default policy](create-initial-default-policy.md)
#### [Microsoft recommended block rules](microsoft-recommended-block-rules.md)
### [Audit WDAC policies](audit-windows-defender-application-control-policies.md)
### [Merge WDAC policies](merge-windows-defender-application-control-policies.md)
### [Enforce WDAC policies](enforce-windows-defender-application-control-policies.md)
-### [Deploy WDAC policies](deploy-windows-defender-application-control-policies-using-group-policy.md)
+### [Deploy WDAC with a managed installer](use-windows-defender-application-control-with-managed-installer.md)
+### [Deploy WDAC policies using Group Policy](deploy-windows-defender-application-control-policies-using-group-policy.md)
+### [Deploy WDAC policies using Intune](deploy-windows-defender-application-control-policies-using-intune.md)
### [Use code signing to simplify application control for classic Windows applications](use-code-signing-to-simplify-application-control-for-classic-windows-applications.md)
#### [Optional: Use the Device Guard Signing Portal in the Microsoft Store for Business](use-device-guard-signing-portal-in-microsoft-store-for-business.md)
#### [Optional: Create a code signing cert for WDAC](create-code-signing-cert-for-windows-defender-application-control.md)
diff --git a/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md b/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md
new file mode 100644
index 0000000000..8031bc1bbf
--- /dev/null
+++ b/windows/security/threat-protection/windows-defender-application-control/deploy-windows-defender-application-control-policies-using-intune.md
@@ -0,0 +1,33 @@
+---
+title: Deploy Windows Defender Application Control (WDAC) policies by using Microsoft Intune (Windows 10)
+description: Windows Defender Application Control restricts which applications users are allowed to run and the code that runs in the system core.
+ms.assetid: 8d6e0474-c475-411b-b095-1c61adb2bdbb
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: justinha
+ms.date: 05/17/2018
+---
+
+# Deploy Windows Defender Application Control policies by using Microsoft Intune
+
+**Applies to:**
+
+- Windows 10
+- Windows Server 2016
+
+You can use Microsoft Intune to configure Windows Defender Application Control (WDAC). You can configure Windows 10 client computers to only run Windows components and Microsoft Store apps, or let them also run reputable apps defined by the Intelligent Security Graph.
+
+1. Open the Microsoft Intune portal and click **Device configuration** > **Profiles** > **Creae profile**.
+
+3. Type a name for the new profile, select **Windows 10 and later** as the **Platform** and **Endpoint protection** as the **Profile type**.
+
+ 
+
+4. Click **Configure** > **Windows Defender Application Control**. for the following settings and then click **OK**:
+
+ - **Application control code intergity policies**: Select **Audit only** to log events but not block any apps from running or select **Enforce** to allow only Windows components and Store apps to run.
+ - **Trust apps with good reputation**: Select **Enable** to allow reputable apps as defined by the Intelligent Security Graph to run in addition to Windows components and Store apps.
+
+ 
diff --git a/windows/security/threat-protection/windows-defender-application-control/images/wdac-intune-create-profile-name.png b/windows/security/threat-protection/windows-defender-application-control/images/wdac-intune-create-profile-name.png
new file mode 100644
index 0000000000..1b5483103b
Binary files /dev/null and b/windows/security/threat-protection/windows-defender-application-control/images/wdac-intune-create-profile-name.png differ
diff --git a/windows/security/threat-protection/windows-defender-application-control/images/wdac-intune-wdac-settings.png b/windows/security/threat-protection/windows-defender-application-control/images/wdac-intune-wdac-settings.png
new file mode 100644
index 0000000000..55f5173b03
Binary files /dev/null and b/windows/security/threat-protection/windows-defender-application-control/images/wdac-intune-wdac-settings.png differ
diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md
index 4f483a970d..4bbf440bbc 100644
--- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md
+++ b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-block-rules.md
@@ -79,30 +79,30 @@ Microsoft recommends that you block the following Microsoft-signed applications
```
--
**-AND-**
One of the following virtualization extensions for VBS:
VT-x (Intel)
**-OR-**
AMD-V|
-|Hardware memory|Microsoft recommends 8GB RAM for optimal performance|
+|Hardware memory|Microsoft requires a minimum of 8GB RAM|
|Hard disk|5 GB free space, solid state disk (SSD) recommended|
|Input/Output Memory Management Unit (IOMMU) support|Not required, but strongly recommended|
diff --git a/windows/security/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md
index d74d21d178..f12f23cc7e 100644
--- a/windows/security/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md
+++ b/windows/security/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md
@@ -10,7 +10,7 @@ ms.pagetype: security
ms.author: macapara
author: mjcaparas
ms.localizationpriority: high
-ms.date: 04/24/2018
+ms.date: 05/08/2018
---
# Configure advanced features in Windows Defender ATP
@@ -87,6 +87,11 @@ When you enable this feature, you'll be able to share Windows Defender ATP devic
>You'll need to enable the integration on both Intune and Windows Defender ATP to use this feature.
+## Preview features
+Learn about new features in the Windows Defender ATP preview release and be among the first to try upcoming features by turning on the preview experience.
+
+You'll have access to upcoming features which you can provide feedback on to help improve the overall experience before features are generally available.
+
## Enable advanced features
1. In the navigation pane, select **Preferences setup** > **Advanced features**.
2. Select the advanced feature you want to configure and toggle the setting between **On** and **Off**.
diff --git a/windows/security/threat-protection/windows-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md b/windows/security/threat-protection/windows-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md
index 6b4dfc59d6..584da22c52 100644
--- a/windows/security/threat-protection/windows-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md
+++ b/windows/security/threat-protection/windows-defender-atp/automated-investigations-windows-defender-advanced-threat-protection.md
@@ -10,7 +10,7 @@ ms.pagetype: security
ms.author: macapara
author: mjcaparas
ms.localizationpriority: high
-ms.date: 05/03/2018
+ms.date: 05/08/2018
---
# Use Automated investigations to investigate and remediate threats
@@ -65,15 +65,24 @@ While an investigation is running, any other alert generated from the machine wi
If an incriminated entity is seen in another machine, the Automated investigation will expand the investigation to include that machine and a generic machine playbook will start on that machine. If 10 or more machines are found during this expansion process from the same entity, then that expansion action will require an approval and will be seen in the **Pending actions** view.
### How threats are remediated
-Depending on how you set up the machine groups and their level of automation, the Automated investigation will either automatically remediate threats or require user approval (this is the default). For more information, see [Create and manage machine groups](machine-groups-windows-defender-advanced-threat-protection.md).
+Depending on how you set up the machine groups and their level of automation, the Automated investigation will either require user approval (default) or automatically remediate threats.
+
+You can configure the following levels of automation:
+
+Automation level | Description
+:---|:---
+Semi - require approval for any remediation | This is the default automation level.
An approval is needed for any remediation action.
+Semi - require approval for non-temp folders remediation | An approval is required on files or executables that are not in temporary folders.
Files or executables in temporary folders, such as the user's download folder or the user's temp folder, will automatically be remediated if needed.
+Semi - require approval for non-temp folders remediation | An approval is required on files or executables that are in the operating system directories such as Windows folder and Program files folder.
Files or executables in all other folders will automatically be remediated if needed.
+Semi - require approval for core folders remediation | An approval is required on files or executables that are in the operating system directories such as Windows folder and Program files folder.
Files or executables in all other folders will automatically be remediated if needed.
+Full - remediate threats automatically | All remediation actions will be performed automatically.
+
+For more information on how to configure these automation levels, see [Create and manage machine groups](machine-groups-windows-defender-advanced-threat-protection.md).
The default machine group is configured for semi-automatic remediation. This means that any malicious entity that needs to be remediated requires an approval and the investigation is added to the **Pending actions** section, this can be changed to fully automatic so that no user approval is needed.
When a pending action is approved, the entity is then remediated and this new state is reflected in the **Entities** tab of the investigation.
-### How an Automated investigation is completed
-When the Automated investigation completes its analysis, and all pending actions are resolved, an investigation is considered complete. It's important to understand that an investigation is only considered complete if there are no pending actions on it.
-
## Manage Automated investigations
By default, the Automated investigations list displays investigations initiated in the last week. You can also choose to select other time ranges from the drop-down menu or specify a custom range.
@@ -103,19 +112,15 @@ Status | Description
| No threats found | No malicious entities found during the investigation.
| Failed | A problem has interrupted the investigation, preventing it from completing. |
| Partially remediated | A problem prevented the remediation of some malicious entities. |
-| Action required | Remediation actions require review and approval. |
+| Pending | Remediation actions require review and approval. |
| Waiting for machine | Investigation paused. The investigation will resume as soon as the machine is available. |
| Queued | Investigation has been queued and will resume as soon as other remediation activities are completed. |
| Running | Investigation ongoing. Malicious entities found will be remediated. |
| Remediated | Malicious entities found were successfully remediated. |
| Terminated by system | Investigation was stopped due to